From 1665e18edbce98df9dd26a6d84db920bfa53409e Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 13:52:10 +0900 Subject: [PATCH 1/8] fix: remove unused npm command --- docs/build.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/docs/build.md b/docs/build.md index 31bcbdc5..83615468 100644 --- a/docs/build.md +++ b/docs/build.md @@ -29,11 +29,6 @@ $ npm run hot ``` > Actually the app can be start with `npm start`. However, the app will use the compiled script. -If the app gets stuck on load, you may need to run the following. -``` -$ npm run vendor -``` - By this, webpack will watch the code changes and apply it automatically. > ### Notice From 832c43de883835872db22abd5e2760786c620e2b Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 14:36:26 +0900 Subject: [PATCH 2/8] refactor: remove unused option --- package.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/package.json b/package.json index 0f5a972b..4437383f 100644 --- a/package.json +++ b/package.json @@ -117,11 +117,6 @@ "grunt-electron-installer-debian": "^0.2.0" }, "optional": false, - "standard": { - "globals": [ - "localStorage" - ] - }, "ava": { "files": [ "tests/**/*-test.js" From cfa40f3ec11ada51c32e0b21c1576e3a668e74e4 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 14:40:33 +0900 Subject: [PATCH 3/8] refactor: remove unused component --- browser/main/StatusBar/index.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/browser/main/StatusBar/index.js b/browser/main/StatusBar/index.js index 82b4cf76..dc502306 100644 --- a/browser/main/StatusBar/index.js +++ b/browser/main/StatusBar/index.js @@ -59,9 +59,6 @@ class StatusBar extends React.Component { : null } - {/* */} - : null - } + +
+ + {status.updateReady + ? + : null + }
) } From 297553c2401f5f60f4abeab71fd465d5e66918dd Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 14:54:08 +0900 Subject: [PATCH 5/8] modify: move updated string to the bottom of note detail component --- browser/main/Detail/LastUpdatedString.styl | 2 ++ browser/main/Detail/MarkdownNoteDetail.js | 3 +-- browser/main/Detail/SnippetNoteDetail.js | 3 +-- browser/main/StatusBar/index.js | 6 +++++- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/browser/main/Detail/LastUpdatedString.styl b/browser/main/Detail/LastUpdatedString.styl index a6c94c62..e5270dc4 100644 --- a/browser/main/Detail/LastUpdatedString.styl +++ b/browser/main/Detail/LastUpdatedString.styl @@ -1,5 +1,7 @@ .info-right-date display inline + line-height 24px + padding-right 25px font-size 11px color $ui-button-color diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index 17eef19c..dfff72d7 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -4,7 +4,6 @@ import styles from './MarkdownNoteDetail.styl' import MarkdownEditor from 'browser/components/MarkdownEditor' import StarButton from './StarButton' import TagSelect from './TagSelect' -import LastUpdatedString from './LastUpdatedString' import dataApi from 'browser/main/lib/dataApi' import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' @@ -226,7 +225,6 @@ class MarkdownNoteDetail extends React.Component { />
-
) diff --git a/browser/main/Detail/SnippetNoteDetail.js b/browser/main/Detail/SnippetNoteDetail.js index 40d3eb96..29d114ec 100644 --- a/browser/main/Detail/SnippetNoteDetail.js +++ b/browser/main/Detail/SnippetNoteDetail.js @@ -5,7 +5,6 @@ import CodeEditor from 'browser/components/CodeEditor' import MarkdownEditor from 'browser/components/MarkdownEditor' import StarButton from './StarButton' import TagSelect from './TagSelect' -import LastUpdatedString from './LastUpdatedString' import dataApi from 'browser/main/lib/dataApi' import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' @@ -535,7 +534,6 @@ class SnippetNoteDetail extends React.Component { />
-
) diff --git a/browser/main/StatusBar/index.js b/browser/main/StatusBar/index.js index 6b83419a..2e8a4d35 100644 --- a/browser/main/StatusBar/index.js +++ b/browser/main/StatusBar/index.js @@ -2,6 +2,7 @@ import React, { PropTypes } from 'react' import CSSModules from 'browser/lib/CSSModules' import styles from './StatusBar.styl' import ZoomManager from 'browser/main/lib/ZoomManager' +import LastUpdatedString from '../Detail/LastUpdatedString' const electron = require('electron') const { remote, ipcRenderer } = electron @@ -67,6 +68,8 @@ class StatusBar extends React.Component { : null } + + ) } @@ -76,7 +79,8 @@ StatusBar.contextTypes = { status: PropTypes.shape({ updateReady: PropTypes.bool.isRequired }).isRequired, - config: PropTypes.shape({}).isRequired + config: PropTypes.shape({}).isRequired, + date: PropTypes.string } StatusBar.propTypes = { From a148d17ba1b71b1c56c5278e53161f5ca19b2019 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 15:44:28 +0900 Subject: [PATCH 6/8] modify: add folder selector on top of note detail component --- browser/main/Detail/FolderSelect.js | 6 ++---- browser/main/Detail/FolderSelect.styl | 18 ++++++++---------- browser/main/Detail/MarkdownNoteDetail.js | 12 +++++++++++- browser/main/Detail/NoteDetailInfo.styl | 13 +++++++++++++ browser/main/Detail/SnippetNoteDetail.js | 12 +++++++++++- browser/main/Detail/StarButton.styl | 1 - browser/main/Detail/TagSelect.styl | 3 +-- 7 files changed, 46 insertions(+), 19 deletions(-) diff --git a/browser/main/Detail/FolderSelect.js b/browser/main/Detail/FolderSelect.js index 094db239..bec02f3d 100644 --- a/browser/main/Detail/FolderSelect.js +++ b/browser/main/Detail/FolderSelect.js @@ -262,13 +262,11 @@ class FolderSelect extends React.Component { :
- {currentOption.folder.name} - in {currentOption.storage.name} + {currentOption.folder.name} /
-
} diff --git a/browser/main/Detail/FolderSelect.styl b/browser/main/Detail/FolderSelect.styl index 0abe6589..16750fd7 100644 --- a/browser/main/Detail/FolderSelect.styl +++ b/browser/main/Detail/FolderSelect.styl @@ -7,29 +7,27 @@ transition 0.15s user-select none &:hover - background-color white - border-color $ui-borderColor + background-color $ui-button--hover-backgroundColor .root--search, .root--focus @extend .root - background-color white + background-color $ui-noteDetail-backgroundColor = #F4F4F4 border-color $ui-input--focus-borderColor + width 100px &:hover - background-color white border-color $ui-input--focus-borderColor .idle position relative cursor pointer + .idle-label - absolute left top - padding 0 0 0 5px right 20px overflow ellipsis .idle-label-name - border-left solid 4px transparent - padding 2px 5px + padding 2px + .idle-label-name-surfix font-size 10px color $ui-inactive-text-color @@ -60,9 +58,9 @@ max-height 450px overflow auto z-index 200 + border $ui-border background-color white border-radius 2px - box-shadow 2px 2px 10px gray .search-optionList-item height 34px @@ -115,8 +113,8 @@ body[data-theme="dark"] .search-optionList color white + border-color $ui-dark-borderColor background-color $ui-dark-button--hover-backgroundColor - box-shadow 2px 2px 10px black .search-optionList-item &:hover diff --git a/browser/main/Detail/MarkdownNoteDetail.js b/browser/main/Detail/MarkdownNoteDetail.js index dfff72d7..65821962 100644 --- a/browser/main/Detail/MarkdownNoteDetail.js +++ b/browser/main/Detail/MarkdownNoteDetail.js @@ -4,6 +4,7 @@ import styles from './MarkdownNoteDetail.styl' import MarkdownEditor from 'browser/components/MarkdownEditor' import StarButton from './StarButton' import TagSelect from './TagSelect' +import FolderSelect from './FolderSelect' import dataApi from 'browser/main/lib/dataApi' import { hashHistory } from 'react-router' import ee from 'browser/main/lib/eventEmitter' @@ -204,7 +205,7 @@ class MarkdownNoteDetail extends React.Component { } render () { - let { config } = this.props + let { data, config } = this.props let { note } = this.state return ( @@ -218,6 +219,15 @@ class MarkdownNoteDetail extends React.Component { onClick={(e) => this.handleStarButtonClick(e)} isActive={note.isStarred} /> +
+ this.handleFolderChange(e)} + /> +
+ this.handleStarButtonClick(e)} isActive={note.isStarred} /> +
+ this.handleFolderChange(e)} + /> +
+ Date: Sat, 14 Jan 2017 15:52:11 +0900 Subject: [PATCH 7/8] modify: fix font size - folder name --- browser/main/Detail/FolderSelect.styl | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/main/Detail/FolderSelect.styl b/browser/main/Detail/FolderSelect.styl index 16750fd7..b1e3a6c2 100644 --- a/browser/main/Detail/FolderSelect.styl +++ b/browser/main/Detail/FolderSelect.styl @@ -26,6 +26,7 @@ overflow ellipsis .idle-label-name + font-size 16px padding 2px .idle-label-name-surfix From dd8f4d60f03beec2f17f56d374c8a2240a5ae720 Mon Sep 17 00:00:00 2001 From: sota1235 Date: Sat, 14 Jan 2017 16:49:38 +0900 Subject: [PATCH 8/8] fix: do not ignore dist file --- gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gruntfile.js b/gruntfile.js index 1ccf60f2..82f51bbc 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -98,7 +98,7 @@ module.exports = function (grunt) { prune: true, overwrite: true, out: path.join(__dirname, 'dist'), - ignore: /node_modules\/ace-builds\/(?!src-min)|node_modules\/ace-builds\/(?=src-min-noconflict)|node_modules\/devicon\/icons|dist|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/ + ignore: /node_modules\/ace-builds\/(?!src-min)|node_modules\/ace-builds\/(?=src-min-noconflict)|node_modules\/devicon\/icons|^\/browser|^\/secret|\.babelrc|\.gitignore|^\/\.gitmodules|^\/gruntfile|^\/readme.md|^\/webpack|^\/appdmg\.json|^\/node_modules\/grunt/ } switch (platform) { case 'win':