Skip to content

Commit

Permalink
Merge pull request buttercup#268 from buttercup/v0.17-fixes
Browse files Browse the repository at this point in the history
Fix brand selector
  • Loading branch information
sallar authored May 28, 2017
2 parents 5a8cbf0 + 2013287 commit 79b8fa7
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 4 deletions.
4 changes: 2 additions & 2 deletions app/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "buttercup",
"version": "0.16.1",
"version": "0.17.0",
"productName": "Buttercup",
"main": "./dist/app.js",
"description": "Free and Open Source password vault",
"license": "GPL-3.0",
"homepage": "https://buttercup.pw",
"author": "Buttercup <[email protected]>",
"dependencies": {
"buttercup-importer": "~0.8.0",
"buttercup-importer": "~0.9.1",
"dropbox": "^2.3.0",
"webdav": "~0.5.0",
"zxcvbn": "^4.4.2"
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "buttercup",
"productName": "Buttercup",
"version": "0.16.1",
"version": "0.17.0",
"description": "Free and Open Source password vault",
"main": "app/dist/app.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/renderer/components/file-manager/type-selector.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const LogoLink = styled(Link)`
const TypeSelector = () => (
<Wrapper wrap flexAuto alignContent="stretch" justify="space-around">
{
Object.keys(brands).map(brand => (
Object.keys(brands).filter(brand => brands[brand].remote).map(brand => (
<LogoLink key={brand} to={`/${brand}`}>
<img src={brands[brand].logo} />
<span>{brands[brand].name}</span>
Expand Down
5 changes: 5 additions & 0 deletions src/shared/buttercup/brands.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,31 @@ import { ArchiveTypes } from './types';

export const brands = {
[ArchiveTypes.DROPBOX]: {
remote: true,
name: 'Dropbox',
logo: dropboxLogo,
icon: dropboxLogoSquare
},
[ArchiveTypes.OWNCLOUD]: {
remote: true,
name: 'OwnCloud',
logo: ownCloud,
icon: ownCloudSquare
},
[ArchiveTypes.NEXTCLOUD]: {
remote: true,
name: 'Nextcloud',
logo: nextCloud,
icon: nextCloudSquare,
},
[ArchiveTypes.WEBDAV]: {
remote: true,
name: 'WebDAV',
logo: webDAV,
icon: webDAV,
},
[ArchiveTypes.FILE]: {
remote: false,
name: 'File System',
logo: '',
icon: fileSystemLogo
Expand Down

0 comments on commit 79b8fa7

Please sign in to comment.