Skip to content

Commit

Permalink
fix local-storage && update logo icon
Browse files Browse the repository at this point in the history
  • Loading branch information
bukinoshita committed Feb 13, 2018
1 parent 2c751a8 commit d721915
Show file tree
Hide file tree
Showing 8 changed files with 41 additions and 46 deletions.
Binary file modified main/static/icon.icns
Binary file not shown.
Binary file modified main/static/icon.ico
Binary file not shown.
Binary file modified main/static/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
32 changes: 7 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "taskr",
"name": "Taskr",
"version": "0.4.0",
"description": "A simple task manager app",
"main": "main/index.js",
Expand All @@ -17,26 +17,17 @@
},
"build": {
"appId": "taskr",
"files": [
"**/*",
"!renderer",
"renderer/out"
],
"files": ["**/*", "!renderer", "renderer/out"],
"win": {
"target": [
"squirrel"
],
"target": ["squirrel"],
"icon": "main/static/icon.ico"
},
"mac": {
"category": "public.app-category.developer-tools",
"icon": "main/static/icon.icns"
},
"linux": {
"target": [
"AppImage",
"deb"
]
"target": ["AppImage", "deb"]
}
},
"dependencies": {
Expand Down Expand Up @@ -70,11 +61,7 @@
"xo": "^0.18.2"
},
"xo": {
"extends": [
"prettier",
"prettier/react",
"plugin:react/recommended"
],
"extends": ["prettier", "prettier/react", "plugin:react/recommended"],
"rules": {
"react/no-unescaped-entities": 0,
"react/react-in-jsx-scope": 0,
Expand All @@ -85,13 +72,8 @@
"no-return-assign": 0,
"import/prefer-default-export": 0
},
"ignores": [
"node_modules"
],
"globals": [
"localStorage",
"document"
]
"ignores": ["node_modules"],
"globals": ["localStorage", "document"]
},
"lint-staged": {
"*.js": [
Expand Down
29 changes: 29 additions & 0 deletions renderer/components/icons/logo.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
'use strict'

const Logo = () => {
return (
<svg width="80px" height="80px" viewBox="0 0 898 898">
<g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
<g>
<g>
<rect
fill="#000000"
x="0"
y="0"
width="898"
height="898"
rx="175.390625"
/>
<polyline
stroke="#FFFFFF"
strokeWidth="60"
points="289 457.52895 371.528058 555.976529 609.217374 343"
/>
</g>
</g>
</g>
</svg>
)
}

export default Logo
21 changes: 2 additions & 19 deletions renderer/pages/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import Page from './../layouts/page'

// Components
import Row from './../components/row'
import Logo from './../components/icons/logo'

// Services
import { getCookie } from './../services/cookies'
Expand Down Expand Up @@ -42,25 +43,7 @@ class Start extends Component {
<Row>
<section>
<div>
<svg width="70" height="70" viewBox="0 0 256 256">
<g stroke="none" strokeWidth="1" fill="none" fillRule="evenodd">
<g>
<rect
fill={colors.black}
x="0"
y="0"
width="256"
height="256"
rx="50"
/>
<polyline
stroke={colors.white}
strokeWidth="16.8000007"
points="66 133.441579 94.6517837 167.708376 189.594753 88"
/>
</g>
</g>
</svg>
<Logo />

<h1>Taskr</h1>
<h2>A simple task manager app</h2>
Expand Down
3 changes: 2 additions & 1 deletion renderer/services/local-storage.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ export const getUser = () => {
user: {
tasks: [],
createOn: 'Today',
onboard: false
onboard: false,
pro: false
}
}

Expand Down
2 changes: 1 addition & 1 deletion renderer/services/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const { remote } = require('electron')
const { writeJSON, readJson } = require('fs-extra')

// Services
const { getUser, updateUser } = require('./api')
const { getUser, updateUser } = require('./local-storage')
const notify = require('./notify')

export const exportUser = () => {
Expand Down

0 comments on commit d721915

Please sign in to comment.