From 325ae00eeba6d94e1655752d55815d3faaa2cc0f Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Fri, 25 Dec 2015 05:41:10 +0900 Subject: [PATCH] refactor file structure --- {lib => browser}/components/CodeEditor.js | 0 {lib => browser}/components/ExternalLink.js | 0 {lib => browser}/components/FolderMark.js | 0 .../components/MarkdownPreview.js | 0 {lib => browser}/components/ModeIcon.js | 0 {lib => browser}/components/ModeSelect.js | 0 {lib => browser}/components/ProfileImage.js | 0 {lib => browser}/components/TagLink.js | 0 {lib => browser}/components/TagSelect.js | 0 {lib => browser/lib}/activityRecord.js | 0 {lib => browser/lib}/api.js | 1 - {lib => browser/lib}/clientKey.js | 0 {lib => browser/lib}/dataStore.js | 0 {lib => browser/lib}/keygen.js | 0 {lib => browser/lib}/linkState.js | 0 {lib => browser/lib}/markdown.js | 0 {lib => browser/lib}/modal.js | 0 {lib/vars => browser/lib}/modes.js | 0 {lib => browser/lib}/openExternal.js | 0 {lib => browser/lib}/search.js | 0 browser/main/LoginPage.js | 93 ---------------- browser/main/SignupPage.js | 104 ------------------ {lib => browser/main}/actions.js | 0 browser/main/favicon.ico | Bin 15086 -> 0 bytes .../main}/modal/CreateNewFolder.js | 0 .../main}/modal/CreateNewTeam.js | 0 .../main}/modal/EditedAlert.js | 0 .../main}/modal/Preference/AppSettingTab.js | 0 .../main}/modal/Preference/ContactTab.js | 0 .../main}/modal/Preference/FolderRow.js | 0 .../modal/Preference/FolderSettingTab.js | 0 .../main}/modal/Preference/HelpTab.js | 0 .../main}/modal/Preference/MemberRow.js | 0 .../modal/Preference/MemberSettingTab.js | 0 .../main}/modal/Preference/TeamSettingTab.js | 0 .../main}/modal/Preferences.js | 0 .../main}/modal/Tutorial.js | 0 {lib => browser/main}/reducer.js | 0 {lib => browser/main}/store.js | 0 .../main/containers/LoginContainer.styl | 89 --------------- config.js | 3 - lib/auth.js | 34 ------ finder.js => lib/finder-app.js | 0 {atom-lib => lib}/finder-window.js | 0 browser/finder/index.html => lib/finder.html | 0 hotkey.js => lib/hotkey.js | 0 main.js => lib/main-app.js | 0 {atom-lib => lib}/main-window.js | 0 browser/main/index.html => lib/main.html | 0 {atom-lib => lib}/menu-template.js | 20 ++-- lib/socket.js | 52 --------- lib/updater.js | 0 {browser/finder => resources}/favicon.ico | Bin 53 files changed, 10 insertions(+), 386 deletions(-) rename {lib => browser}/components/CodeEditor.js (100%) rename {lib => browser}/components/ExternalLink.js (100%) rename {lib => browser}/components/FolderMark.js (100%) rename {lib => browser}/components/MarkdownPreview.js (100%) rename {lib => browser}/components/ModeIcon.js (100%) rename {lib => browser}/components/ModeSelect.js (100%) rename {lib => browser}/components/ProfileImage.js (100%) rename {lib => browser}/components/TagLink.js (100%) rename {lib => browser}/components/TagSelect.js (100%) rename {lib => browser/lib}/activityRecord.js (100%) rename {lib => browser/lib}/api.js (93%) rename {lib => browser/lib}/clientKey.js (100%) rename {lib => browser/lib}/dataStore.js (100%) rename {lib => browser/lib}/keygen.js (100%) rename {lib => browser/lib}/linkState.js (100%) rename {lib => browser/lib}/markdown.js (100%) rename {lib => browser/lib}/modal.js (100%) rename {lib/vars => browser/lib}/modes.js (100%) rename {lib => browser/lib}/openExternal.js (100%) rename {lib => browser/lib}/search.js (100%) delete mode 100644 browser/main/LoginPage.js delete mode 100644 browser/main/SignupPage.js rename {lib => browser/main}/actions.js (100%) delete mode 100644 browser/main/favicon.ico rename {lib/components => browser/main}/modal/CreateNewFolder.js (100%) rename {lib/components => browser/main}/modal/CreateNewTeam.js (100%) rename {lib/components => browser/main}/modal/EditedAlert.js (100%) rename {lib/components => browser/main}/modal/Preference/AppSettingTab.js (100%) rename {lib/components => browser/main}/modal/Preference/ContactTab.js (100%) rename {lib/components => browser/main}/modal/Preference/FolderRow.js (100%) rename {lib/components => browser/main}/modal/Preference/FolderSettingTab.js (100%) rename {lib/components => browser/main}/modal/Preference/HelpTab.js (100%) rename {lib/components => browser/main}/modal/Preference/MemberRow.js (100%) rename {lib/components => browser/main}/modal/Preference/MemberSettingTab.js (100%) rename {lib/components => browser/main}/modal/Preference/TeamSettingTab.js (100%) rename {lib/components => browser/main}/modal/Preferences.js (100%) rename {lib/components => browser/main}/modal/Tutorial.js (100%) rename {lib => browser/main}/reducer.js (100%) rename {lib => browser/main}/store.js (100%) delete mode 100644 browser/styles/main/containers/LoginContainer.styl delete mode 100644 config.js delete mode 100644 lib/auth.js rename finder.js => lib/finder-app.js (100%) rename {atom-lib => lib}/finder-window.js (100%) rename browser/finder/index.html => lib/finder.html (100%) rename hotkey.js => lib/hotkey.js (100%) rename main.js => lib/main-app.js (100%) rename {atom-lib => lib}/main-window.js (100%) rename browser/main/index.html => lib/main.html (100%) rename {atom-lib => lib}/menu-template.js (88%) delete mode 100644 lib/socket.js delete mode 100644 lib/updater.js rename {browser/finder => resources}/favicon.ico (100%) diff --git a/lib/components/CodeEditor.js b/browser/components/CodeEditor.js similarity index 100% rename from lib/components/CodeEditor.js rename to browser/components/CodeEditor.js diff --git a/lib/components/ExternalLink.js b/browser/components/ExternalLink.js similarity index 100% rename from lib/components/ExternalLink.js rename to browser/components/ExternalLink.js diff --git a/lib/components/FolderMark.js b/browser/components/FolderMark.js similarity index 100% rename from lib/components/FolderMark.js rename to browser/components/FolderMark.js diff --git a/lib/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js similarity index 100% rename from lib/components/MarkdownPreview.js rename to browser/components/MarkdownPreview.js diff --git a/lib/components/ModeIcon.js b/browser/components/ModeIcon.js similarity index 100% rename from lib/components/ModeIcon.js rename to browser/components/ModeIcon.js diff --git a/lib/components/ModeSelect.js b/browser/components/ModeSelect.js similarity index 100% rename from lib/components/ModeSelect.js rename to browser/components/ModeSelect.js diff --git a/lib/components/ProfileImage.js b/browser/components/ProfileImage.js similarity index 100% rename from lib/components/ProfileImage.js rename to browser/components/ProfileImage.js diff --git a/lib/components/TagLink.js b/browser/components/TagLink.js similarity index 100% rename from lib/components/TagLink.js rename to browser/components/TagLink.js diff --git a/lib/components/TagSelect.js b/browser/components/TagSelect.js similarity index 100% rename from lib/components/TagSelect.js rename to browser/components/TagSelect.js diff --git a/lib/activityRecord.js b/browser/lib/activityRecord.js similarity index 100% rename from lib/activityRecord.js rename to browser/lib/activityRecord.js diff --git a/lib/api.js b/browser/lib/api.js similarity index 93% rename from lib/api.js rename to browser/lib/api.js index 729f1456..fe27ae3e 100644 --- a/lib/api.js +++ b/browser/lib/api.js @@ -1,6 +1,5 @@ import superagent from 'superagent' import superagentPromise from 'superagent-promise' -// import auth from 'boost/auth' export const SERVER_URL = 'https://b00st.io/' // export const SERVER_URL = 'http://localhost:3333/' diff --git a/lib/clientKey.js b/browser/lib/clientKey.js similarity index 100% rename from lib/clientKey.js rename to browser/lib/clientKey.js diff --git a/lib/dataStore.js b/browser/lib/dataStore.js similarity index 100% rename from lib/dataStore.js rename to browser/lib/dataStore.js diff --git a/lib/keygen.js b/browser/lib/keygen.js similarity index 100% rename from lib/keygen.js rename to browser/lib/keygen.js diff --git a/lib/linkState.js b/browser/lib/linkState.js similarity index 100% rename from lib/linkState.js rename to browser/lib/linkState.js diff --git a/lib/markdown.js b/browser/lib/markdown.js similarity index 100% rename from lib/markdown.js rename to browser/lib/markdown.js diff --git a/lib/modal.js b/browser/lib/modal.js similarity index 100% rename from lib/modal.js rename to browser/lib/modal.js diff --git a/lib/vars/modes.js b/browser/lib/modes.js similarity index 100% rename from lib/vars/modes.js rename to browser/lib/modes.js diff --git a/lib/openExternal.js b/browser/lib/openExternal.js similarity index 100% rename from lib/openExternal.js rename to browser/lib/openExternal.js diff --git a/lib/search.js b/browser/lib/search.js similarity index 100% rename from lib/search.js rename to browser/lib/search.js diff --git a/browser/main/LoginPage.js b/browser/main/LoginPage.js deleted file mode 100644 index fc01825a..00000000 --- a/browser/main/LoginPage.js +++ /dev/null @@ -1,93 +0,0 @@ -import React, { PropTypes } from 'react' -import { Link } from 'react-router' -import linkState from 'boost/linkState' -import { login } from 'boost/api' -import auth from 'boost/auth' - -export default class LoginPage extends React.Component { - constructor (props) { - super(props) - - this.state = { - user: {}, - isSending: false, - error: null - } - this.linkState = linkState - } - - handleSubmit (e) { - e.preventDefault() - this.setState({ - isSending: true, - error: null - }, function () { - login(this.state.user) - .then(res => { - let { user, token } = res.body - auth.user(user, token) - - this.props.history.pushState('home') - }) - .catch(err => { - console.error(err) - if (err.code === 'ECONNREFUSED') { - return this.setState({ - error: { - name: 'CunnectionRefused', - message: 'Can\'t cznnect to API server.' - }, - isSending: false - }) - } else if (err.status != null) { - return this.setState({ - error: { - name: err.response.body.name, - message: err.response.body.message - }, - isSending: false - }) - } - else throw err - }) - }) - } - - render () { - return ( -
- - - - -
this.handleSubmit(e)}> -
- -
-
- -
- - {this.state.isSending - ? ( -

Logging in...

- ) : null} - - {this.state.error != null ?

{this.state.error.message}

: null} - -
- -
-
-
- ) - } -} - -LoginPage.propTypes = { - history: PropTypes.shape({ - pushState: PropTypes.func - }) -} diff --git a/browser/main/SignupPage.js b/browser/main/SignupPage.js deleted file mode 100644 index 5665b3ad..00000000 --- a/browser/main/SignupPage.js +++ /dev/null @@ -1,104 +0,0 @@ -import React, { PropTypes } from 'react' -import { Link } from 'react-router' -import linkState from 'boost/linkState' -import openExternal from 'boost/openExternal' -import { signup } from 'boost/api' -import auth from 'boost/auth' - -export default class SignupContainer extends React.Component { - constructor (props) { - super(props) - this.state = { - user: {}, - connectionFailed: false, - emailConflicted: false, - nameConflicted: false, - validationFailed: false, - isSending: false, - error: null - } - this.linkState = linkState - this.openExternal = openExternal - } - - handleSubmit (e) { - this.setState({ - isSending: true, - error: null - }, function () { - signup(this.state.user) - .then(res => { - let { user, token } = res.body - auth.user(user, token) - - this.props.history.pushState('home') - }) - .catch(err => { - console.error(err) - if (err.code === 'ECONNREFUSED') { - return this.setState({ - error: { - name: 'CunnectionRefused', - message: 'Can\'t connect to API server.' - }, - isSending: false - }) - } else if (err.status != null) { - return this.setState({ - error: { - name: err.response.body.name, - message: err.response.body.message - }, - isSending: false - }) - } - else throw err - }) - }) - - e.preventDefault() - } - - render () { - return ( -
- - - - -
this.handleSubmit(e)}> -
- -
-
- -
-
- -
-
- -
- - {this.state.isSending ? ( -

Signing up...

- ) : null} - - {this.state.error != null ?

{this.state.error.message}

: null} - -
- -
-
- -

会員登録することで、当サイトの利用規約及びCookieの使用を含むデータに関するポリシーに同意するものとします。

-
- ) - } -} - -SignupContainer.propTypes = { - history: PropTypes.shape({ - pushState: PropTypes.func - }) -} diff --git a/lib/actions.js b/browser/main/actions.js similarity index 100% rename from lib/actions.js rename to browser/main/actions.js diff --git a/browser/main/favicon.ico b/browser/main/favicon.ico deleted file mode 100644 index ad6a19a4d53f71f570ef44d3be5939c5eed57e4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15086 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