From 9a5e4b3f54a4b971088ff5a9a7333759ec8fdb36 Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Tue, 13 Oct 2015 18:07:33 +0900 Subject: [PATCH] restructure DONE --- .bowerrc | 3 - .gitignore | 7 +- finder-window.js => atom-lib/finder-window.js | 0 main-window.js => atom-lib/main-window.js | 5 +- {modules => atom-lib}/menu-template.js | 0 updater.js => atom-lib/updater.js | 0 bower.json | 11 - browser/main/Components/AboutModal.jsx | 38 - browser/main/Components/AddMemberModal.jsx | 99 - browser/main/Components/ArticleDetail.jsx | 209 - browser/main/Components/ArticleList.jsx | 63 - browser/main/Components/CodeDeleteModal.jsx | 55 - browser/main/Components/CodeEditModal.jsx | 26 - browser/main/Components/CodeForm.jsx | 162 - browser/main/Components/CodeViewer.jsx | 53 - browser/main/Components/EditProfileModal.jsx | 168 - browser/main/Components/HomeNavigator.jsx | 109 - browser/main/Components/LaunchModal.jsx | 79 - browser/main/Components/LogoutModal.jsx | 42 - browser/main/Components/NoteDeleteModal.jsx | 55 - browser/main/Components/NoteEditModal.jsx | 27 - browser/main/Components/NoteForm.jsx | 153 - browser/main/Components/PlanetCreateModal.jsx | 111 - browser/main/Components/PlanetHeader.jsx | 86 - browser/main/Components/PlanetNavigator.jsx | 76 - .../main/Components/PlanetSettingModal.jsx | 190 - browser/main/Components/PreferencesModal.jsx | 112 - browser/main/Components/TeamCreateModal.jsx | 89 - browser/main/Components/TeamSettingsModal.jsx | 269 -- browser/main/Components/TopBar.jsx | 30 - browser/main/Containers/PlanetContainer.js | 414 -- .../{HomeContainer/index.js => HomePage.js} | 10 +- .../Components => HomePage}/ArticleDetail.js | 6 +- .../Components => HomePage}/ArticleList.js | 4 +- .../ArticleNavigator.js | 2 +- .../components => HomePage}/ArticleTopBar.js | 2 +- .../Components => HomePage}/UserNavigator.js | 6 +- .../LoginContainer.js => LoginPage.js} | 11 +- .../MainContainer.js => MainPage.js} | 5 +- browser/main/Mixins/ArticleFilter.js | 67 - browser/main/Mixins/AuthFilter.js | 27 - browser/main/Mixins/ExternalLink.js | 8 - browser/main/Mixins/ForceUpdate.js | 14 - browser/main/Mixins/Helper.js | 33 - browser/main/Mixins/KeyCaster.js | 100 - browser/main/Mixins/Markdown.js | 14 - browser/main/Mixins/Modal.jsx | 42 - browser/main/Mixins/linkState.js | 29 - browser/main/Services/Hq.js | 82 - browser/main/Services/socket.js | 17 - .../SignupContainer.js => SignupPage.js} | 9 +- browser/main/{HomeContainer => }/actions.js | 0 browser/main/index.js | 24 +- browser/main/{HomeContainer => }/reducer.js | 0 browser/styles/main/index.css | 3892 ----------------- {modules => lib}/ace-modes.js | 0 .../main/HomeContainer/lib => lib}/api.js | 23 +- .../components/CodeEditor.js | 2 +- .../components}/ExternalLink.js | 0 .../components}/MarkdownPreview.js | 2 +- .../Components => lib/components}/ModeIcon.js | 0 .../components}/ProfileImage.js | 0 .../components/modal/ContactModal.js | 6 +- .../components}/modal/CreateNewTeam.js | 6 +- {browser/main/helpers => lib}/linkState.js | 0 .../HomeContainer/lib => lib}/markdown.js | 0 .../lib/modal/index.js => lib/modal.js | 0 {browser/main/helpers => lib}/openExternal.js | 0 main.js | 8 +- node_modules/boost | 1 + package.json | 3 +- app.icns => resources/app.icns | Bin 72 files changed, 79 insertions(+), 7117 deletions(-) delete mode 100644 .bowerrc rename finder-window.js => atom-lib/finder-window.js (100%) rename main-window.js => atom-lib/main-window.js (74%) rename {modules => atom-lib}/menu-template.js (100%) rename updater.js => atom-lib/updater.js (100%) delete mode 100644 bower.json delete mode 100644 browser/main/Components/AboutModal.jsx delete mode 100644 browser/main/Components/AddMemberModal.jsx delete mode 100644 browser/main/Components/ArticleDetail.jsx delete mode 100644 browser/main/Components/ArticleList.jsx delete mode 100644 browser/main/Components/CodeDeleteModal.jsx delete mode 100644 browser/main/Components/CodeEditModal.jsx delete mode 100644 browser/main/Components/CodeForm.jsx delete mode 100644 browser/main/Components/CodeViewer.jsx delete mode 100644 browser/main/Components/EditProfileModal.jsx delete mode 100644 browser/main/Components/HomeNavigator.jsx delete mode 100644 browser/main/Components/LaunchModal.jsx delete mode 100644 browser/main/Components/LogoutModal.jsx delete mode 100644 browser/main/Components/NoteDeleteModal.jsx delete mode 100644 browser/main/Components/NoteEditModal.jsx delete mode 100644 browser/main/Components/NoteForm.jsx delete mode 100644 browser/main/Components/PlanetCreateModal.jsx delete mode 100644 browser/main/Components/PlanetHeader.jsx delete mode 100644 browser/main/Components/PlanetNavigator.jsx delete mode 100644 browser/main/Components/PlanetSettingModal.jsx delete mode 100644 browser/main/Components/PreferencesModal.jsx delete mode 100644 browser/main/Components/TeamCreateModal.jsx delete mode 100644 browser/main/Components/TeamSettingsModal.jsx delete mode 100644 browser/main/Components/TopBar.jsx delete mode 100644 browser/main/Containers/PlanetContainer.js rename browser/main/{HomeContainer/index.js => HomePage.js} (87%) rename browser/main/{HomeContainer/Components => HomePage}/ArticleDetail.js (92%) rename browser/main/{HomeContainer/Components => HomePage}/ArticleList.js (95%) rename browser/main/{HomeContainer/Components => HomePage}/ArticleNavigator.js (97%) rename browser/main/{HomeContainer/components => HomePage}/ArticleTopBar.js (93%) rename browser/main/{HomeContainer/Components => HomePage}/UserNavigator.js (87%) rename browser/main/{Containers/LoginContainer.js => LoginPage.js} (91%) rename browser/main/{Containers/MainContainer.js => MainPage.js} (90%) delete mode 100644 browser/main/Mixins/ArticleFilter.js delete mode 100644 browser/main/Mixins/AuthFilter.js delete mode 100644 browser/main/Mixins/ExternalLink.js delete mode 100644 browser/main/Mixins/ForceUpdate.js delete mode 100644 browser/main/Mixins/Helper.js delete mode 100644 browser/main/Mixins/KeyCaster.js delete mode 100644 browser/main/Mixins/Markdown.js delete mode 100644 browser/main/Mixins/Modal.jsx delete mode 100644 browser/main/Mixins/linkState.js delete mode 100644 browser/main/Services/Hq.js delete mode 100644 browser/main/Services/socket.js rename browser/main/{Containers/SignupContainer.js => SignupPage.js} (94%) rename browser/main/{HomeContainer => }/actions.js (100%) rename browser/main/{HomeContainer => }/reducer.js (100%) delete mode 100644 browser/styles/main/index.css rename {modules => lib}/ace-modes.js (100%) rename {browser/main/HomeContainer/lib => lib}/api.js (72%) rename browser/main/Components/CodeEditor.jsx => lib/components/CodeEditor.js (98%) rename {browser/main/Components => lib/components}/ExternalLink.js (100%) rename {browser/main/Components => lib/components}/MarkdownPreview.js (95%) rename {browser/main/Components => lib/components}/ModeIcon.js (100%) rename {browser/main/Components => lib/components}/ProfileImage.js (100%) rename browser/main/Components/ContactModal.jsx => lib/components/modal/ContactModal.js (94%) rename {browser/main/HomeContainer/lib => lib/components}/modal/CreateNewTeam.js (98%) rename {browser/main/helpers => lib}/linkState.js (100%) rename {browser/main/HomeContainer/lib => lib}/markdown.js (100%) rename browser/main/HomeContainer/lib/modal/index.js => lib/modal.js (100%) rename {browser/main/helpers => lib}/openExternal.js (100%) create mode 120000 node_modules/boost rename app.icns => resources/app.icns (100%) diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 0c16bd5a..00000000 --- a/.bowerrc +++ /dev/null @@ -1,3 +0,0 @@ -{ - "directory": "browser/vendor/" -} diff --git a/.gitignore b/.gitignore index 3f4e490c..727c5017 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,4 @@ -build/ -node_modules/ -electron_build/ .env -dist/ -vendor/ +node_modules/* +!node_modules/boost Boost-darwin-x64/ diff --git a/finder-window.js b/atom-lib/finder-window.js similarity index 100% rename from finder-window.js rename to atom-lib/finder-window.js diff --git a/main-window.js b/atom-lib/main-window.js similarity index 74% rename from main-window.js rename to atom-lib/main-window.js index b2a5b56d..5c6f70eb 100644 --- a/main-window.js +++ b/atom-lib/main-window.js @@ -1,4 +1,5 @@ var BrowserWindow = require('browser-window') +var path = require('path') var mainWindow = new BrowserWindow({ width: 1080, @@ -10,7 +11,9 @@ var mainWindow = new BrowserWindow({ 'standard-window': false }) -mainWindow.loadUrl('file://' + __dirname + '/browser/main/index.html') +var url = path.resolve(__dirname, '../browser/main/index.html') + +mainWindow.loadUrl('file://' + url) mainWindow.setVisibleOnAllWorkspaces(true) diff --git a/modules/menu-template.js b/atom-lib/menu-template.js similarity index 100% rename from modules/menu-template.js rename to atom-lib/menu-template.js diff --git a/updater.js b/atom-lib/updater.js similarity index 100% rename from updater.js rename to atom-lib/updater.js diff --git a/bower.json b/bower.json deleted file mode 100644 index 85708203..00000000 --- a/bower.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "codexen-app", - "dependencies": { - "react": "~0.13.3", - "fontawesome": "~4.3.0", - "react-router": "~0.13.3", - "reflux": "~0.2.8", - "moment": "~2.10.3", - "markdown-it": "~4.3.1" - } -} diff --git a/browser/main/Components/AboutModal.jsx b/browser/main/Components/AboutModal.jsx deleted file mode 100644 index 030700c0..00000000 --- a/browser/main/Components/AboutModal.jsx +++ /dev/null @@ -1,38 +0,0 @@ -var React = require('react') - -var ExternalLink = require('../Mixins/ExternalLink') -var KeyCaster = require('../Mixins/KeyCaster') - -module.exports = React.createClass({ - mixins: [ExternalLink, KeyCaster('aboutModal')], - propTypes: { - close: React.PropTypes.func - }, - onKeyCast: function (e) { - switch (e.status) { - case 'closeModal': - this.props.close() - break - } - }, - render: function () { - var version = global.version - return ( -
-
- -
Boost {version == null || version.length === 0 ? 'DEV version' : 'v' + version}
-
- -
-
External links
- -
-
- ) - } -}) diff --git a/browser/main/Components/AddMemberModal.jsx b/browser/main/Components/AddMemberModal.jsx deleted file mode 100644 index 9a173f1a..00000000 --- a/browser/main/Components/AddMemberModal.jsx +++ /dev/null @@ -1,99 +0,0 @@ -var React = require('react') -var Select = require('react-select') - -var LinkedState = require('../Mixins/LinkedState') - -var Hq = require('../Services/Hq') - -var KeyCaster = require('../Mixins/KeyCaster') - -var getOptions = function (input, callback) { - Hq.searchUser(input) - .then(function (res) { - callback(null, { - options: res.body.map(function (user) { - return { - label: user.name, - value: user.name - } - }), - complete: false - }) - }) - .catch(function (err) { - console.error(err) - }) -} - -module.exports = React.createClass({ - mixins: [LinkedState, KeyCaster('addMemberModal')], - propTypes: { - team: React.PropTypes.object, - close: React.PropTypes.func - }, - getInitialState: function () { - return { - userName: '', - role: 'member' - } - }, - onKeyCast: function (e) { - switch (e.status) { - case 'closeModal': - this.props.close() - break - case 'submitAddMemberModal': - this.handleSubmit() - break - } - }, - handleSubmit: function () { - this.setState({errorMessage: null}, function () { - Hq - .addMember(this.props.team.name, { - userName: this.state.userName, - role: this.state.role - }) - .then(function (res) { - console.log(res.body) - this.props.close() - }.bind(this)) - .catch(function (err) { - console.error(err) - if (err.status === 403) { - this.setState({errorMessage: err.response.body.message}) - } - }.bind(this)) - }) - }, - handleChange: function (value) { - this.setState({userName: value}) - }, - render: function () { - return ( -
- - - - - role -
- - {this.state.errorMessage != null ? (

{this.state.errorMessage}

) : null} - - - - ) - } -}) diff --git a/browser/main/Components/ArticleDetail.jsx b/browser/main/Components/ArticleDetail.jsx deleted file mode 100644 index 4cb67b75..00000000 --- a/browser/main/Components/ArticleDetail.jsx +++ /dev/null @@ -1,209 +0,0 @@ -var React = require('react') -var moment = require('moment') -var _ = require('lodash') - -var CodeEditor = require('./CodeEditor') -var MarkdownPreview = require('./MarkdownPreview') -var ModeIcon = require('./ModeIcon') -var Select = require('react-select') - -var Modal = require('../Mixins/Modal') -var ForceUpdate = require('../Mixins/ForceUpdate') -var LinkedState = require('../Mixins/LinkedState') - -var aceModes = require('../../../modules/ace-modes') - -var modeOptions = aceModes.map(function (mode) { - return { - label: mode, - value: mode - } -}) - -module.exports = React.createClass({ - mixins: [ForceUpdate(60000), Modal, LinkedState], - propTypes: { - currentArticle: React.PropTypes.object, - showOnlyWithTag: React.PropTypes.func, - planet: React.PropTypes.object, - switchDetailMode: React.PropTypes.func, - user: React.PropTypes.shape({ - id: React.PropTypes.number, - name: React.PropTypes.string, - Folders: React.PropTypes.array - }), - article: React.PropTypes.object, - saveCurrentArticle: React.PropTypes.func, - detailMode: React.PropTypes.string - }, - getInitialState: function () { - var article = this.props.currentArticle != null ? { - id: this.props.currentArticle.id, - title: this.props.currentArticle.title, - content: this.props.currentArticle.CurrentRevision.title, - tags: this.props.currentArticle.Tags.map(function (tag) { - return tag.name - }), - mode: this.props.currentArticle.mode, - status: this.props.currentArticle.status - } : null - // console.log('init staet') - // console.log(article) - return { - isEditModalOpen: false, - article: article - } - }, - componentWillReceiveProps: function (nextProps) { - if (nextProps.detailMode === 'edit') { - var article = { - id: nextProps.currentArticle.id, - title: nextProps.currentArticle.title, - content: nextProps.currentArticle.CurrentRevision.content, - tags: nextProps.currentArticle.Tags.map(function (tag) { - return tag.name - }), - mode: nextProps.currentArticle.mode, - FolderId: nextProps.currentArticle.FolderId, - status: nextProps.currentArticle.status - } - this.setState({article: article}) - } - }, - openDeleteModal: function () { - if (this.props.article == null) return - }, - handleFolderIdChange: function (FolderId) { - this.state.article.FolderId = FolderId - this.setState({article: this.state.article}) - }, - handleTagsChange: function (tag, tags) { - tags = _.uniq(tags, function (tag) { - return tag.value - }) - - this.state.article.tags = tags.map(function (tag) { - return tag.value - }) - this.setState({article: this.state.article}) - }, - handleModeChange: function (mode) { - this.state.article.mode = mode - this.setState({article: this.state.article}) - }, - handleContentChange: function (e, value) { - var article = this.state.article - article.content = value - this.setState({article: article}) - }, - saveArticle: function () { - if (this.state.article.mode === '') { - return this.refs.mode.focus() - } - if (this.state.article.FolderId === '') { - return this.refs.folder.focus() - } - this.props.saveCurrentArticle(this.state.article) - }, - render: function () { - if (this.props.currentArticle == null) { - return ( -
- Nothing selected -
- ) - } - - if (this.props.detailMode === 'show') { - return this.renderViewer() - } - if (this.state.article == null) { - return ( -
- Nothing selected -
- ) - } - return this.renderEditor() - }, - renderEditor: function () { - var article = this.state.article - - var folderOptions = this.props.user.Folders.map(function (folder) { - return { - label: folder.name, - value: folder.id - } - }) - - return ( -
-
-
- -
-
- - -
-
-
-
-
-
- -
-