From 27a442ed2e6d599893b56c812d690c07f69e584a Mon Sep 17 00:00:00 2001 From: Rokt33r Date: Fri, 25 Dec 2015 11:06:00 +0900 Subject: [PATCH] fix path of module & contactform --- browser/components/CodeEditor.js | 2 +- browser/components/MarkdownPreview.js | 2 +- browser/components/ModeSelect.js | 4 +- browser/components/TagSelect.js | 2 +- browser/finder/FinderDetail.js | 6 +- browser/finder/FinderList.js | 2 +- browser/finder/index.js | 4 +- browser/lib/activityRecord.js | 6 +- browser/lib/clientKey.js | 2 +- browser/lib/dataStore.js | 2 +- browser/main/HomePage.js | 7 +- .../HomePage/ArticleDetail/ShareButton.js | 6 +- browser/main/HomePage/ArticleDetail/index.js | 20 +- browser/main/HomePage/ArticleList.js | 8 +- browser/main/HomePage/ArticleNavigator.js | 12 +- browser/main/HomePage/ArticleTopBar.js | 6 +- .../{components => main/HomePage}/TagLink.js | 0 browser/main/HomePage/UserNavigator.js | 15 +- browser/main/index.js | 10 +- browser/main/modal/CreateNewFolder.js | 8 +- browser/main/modal/CreateNewTeam.js | 255 ------------------ browser/main/modal/EditedAlert.js | 4 +- .../main/modal/Preference/AppSettingTab.js | 4 +- browser/main/modal/Preference/ContactTab.js | 10 +- browser/main/modal/Preference/FolderRow.js | 8 +- .../main/modal/Preference/FolderSettingTab.js | 4 +- browser/main/modal/Preference/HelpTab.js | 11 - browser/main/modal/Preference/MemberRow.js | 106 -------- .../main/modal/Preference/MemberSettingTab.js | 149 ---------- .../main/modal/Preference/TeamSettingTab.js | 171 ------------ browser/main/modal/Preferences.js | 7 +- browser/main/modal/Tutorial.js | 4 +- browser/main/reducer.js | 10 +- index.js | 4 +- lib/finder-app.js | 6 +- lib/finder-window.js | 2 +- lib/finder.html | 16 +- lib/hotkey.js | 2 +- lib/main-app.js | 15 +- lib/main-window.js | 2 +- lib/main.html | 20 +- webpack-skeleton.js | 3 +- 42 files changed, 117 insertions(+), 820 deletions(-) rename browser/{components => main/HomePage}/TagLink.js (100%) delete mode 100644 browser/main/modal/CreateNewTeam.js delete mode 100644 browser/main/modal/Preference/HelpTab.js delete mode 100644 browser/main/modal/Preference/MemberRow.js delete mode 100644 browser/main/modal/Preference/MemberSettingTab.js delete mode 100644 browser/main/modal/Preference/TeamSettingTab.js diff --git a/browser/components/CodeEditor.js b/browser/components/CodeEditor.js index 1822be5c..9dd4a452 100644 --- a/browser/components/CodeEditor.js +++ b/browser/components/CodeEditor.js @@ -1,6 +1,6 @@ import React from 'react' import ReactDOM from 'react-dom' -import modes from 'boost/vars/modes' +import modes from '../lib/modes' import _ from 'lodash' var ace = window.ace diff --git a/browser/components/MarkdownPreview.js b/browser/components/MarkdownPreview.js index 814c0e48..4b1b3de6 100644 --- a/browser/components/MarkdownPreview.js +++ b/browser/components/MarkdownPreview.js @@ -1,6 +1,6 @@ var React = require('react') var { PropTypes } = React -import markdown from 'boost/markdown' +import markdown from '../lib/markdown' var ReactDOM = require('react-dom') const electron = require('electron') diff --git a/browser/components/ModeSelect.js b/browser/components/ModeSelect.js index 09dae7e6..e8cfef79 100644 --- a/browser/components/ModeSelect.js +++ b/browser/components/ModeSelect.js @@ -1,7 +1,7 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import ModeIcon from 'boost/components/ModeIcon' -import modes from 'boost/vars/modes' +import ModeIcon from './ModeIcon' +import modes from '../lib/modes' import _ from 'lodash' const IDLE_MODE = 'IDLE_MODE' diff --git a/browser/components/TagSelect.js b/browser/components/TagSelect.js index f000d32d..20814063 100644 --- a/browser/components/TagSelect.js +++ b/browser/components/TagSelect.js @@ -1,7 +1,7 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' import _ from 'lodash' -import linkState from 'boost/linkState' +import linkState from '../lib/linkState' function isNotEmptyString (str) { return _.isString(str) && str.length > 0 diff --git a/browser/finder/FinderDetail.js b/browser/finder/FinderDetail.js index 7d3ad12e..de815e27 100644 --- a/browser/finder/FinderDetail.js +++ b/browser/finder/FinderDetail.js @@ -1,7 +1,7 @@ import React, { PropTypes } from 'react' -import CodeEditor from 'boost/components/CodeEditor' -import MarkdownPreview from 'boost/components/MarkdownPreview' -import ModeIcon from 'boost/components/ModeIcon' +import CodeEditor from 'browser/components/CodeEditor' +import MarkdownPreview from 'browser/components/MarkdownPreview' +import ModeIcon from 'browser/components/ModeIcon' export default class FinderDetail extends React.Component { render () { diff --git a/browser/finder/FinderList.js b/browser/finder/FinderList.js index 1833ee4a..d9f48827 100644 --- a/browser/finder/FinderList.js +++ b/browser/finder/FinderList.js @@ -1,6 +1,6 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import ModeIcon from 'boost/components/ModeIcon' +import ModeIcon from 'browser/components/ModeIcon' import { selectArticle } from './actions' export default class FinderList extends React.Component { diff --git a/browser/finder/index.js b/browser/finder/index.js index a22f9499..571ca72e 100644 --- a/browser/finder/index.js +++ b/browser/finder/index.js @@ -8,10 +8,10 @@ import FinderList from './FinderList' import FinderDetail from './FinderDetail' import actions, { selectArticle, searchArticle } from './actions' import _ from 'lodash' -import dataStore from 'boost/dataStore' +import dataStore from 'browser/lib/dataStore' const electron = require('electron') -const { remote, clipboard, ipcRenderer } = electron +const { clipboard, ipcRenderer } = electron const path = require('path') function hideFinder () { diff --git a/browser/lib/activityRecord.js b/browser/lib/activityRecord.js index 253cdbd6..16c92196 100644 --- a/browser/lib/activityRecord.js +++ b/browser/lib/activityRecord.js @@ -1,8 +1,8 @@ import _ from 'lodash' import moment from 'moment' -import dataStore from 'boost/dataStore' -import { request, SERVER_URL } from 'boost/api' -import clientKey from 'boost/clientKey' +import dataStore from './dataStore' +import { request, SERVER_URL } from './api' +import clientKey from './clientKey' const electron = require('electron') const version = electron.remote.app.getVersion() diff --git a/browser/lib/clientKey.js b/browser/lib/clientKey.js index b76d6bb8..e827b2d8 100644 --- a/browser/lib/clientKey.js +++ b/browser/lib/clientKey.js @@ -1,5 +1,5 @@ import _ from 'lodash' -import keygen from 'boost/keygen' +import keygen from './keygen' function getClientKey () { let clientKey = localStorage.getItem('clientKey') diff --git a/browser/lib/dataStore.js b/browser/lib/dataStore.js index 15017d01..87125832 100644 --- a/browser/lib/dataStore.js +++ b/browser/lib/dataStore.js @@ -1,4 +1,4 @@ -import keygen from 'boost/keygen' +import keygen from './keygen' import _ from 'lodash' const electron = require('electron') diff --git a/browser/main/HomePage.js b/browser/main/HomePage.js index 96e6b704..4de04728 100644 --- a/browser/main/HomePage.js +++ b/browser/main/HomePage.js @@ -1,15 +1,12 @@ import React, { PropTypes} from 'react' import { connect } from 'react-redux' -import { EDIT_MODE, IDLE_MODE, toggleTutorial } from 'boost/actions' +import { EDIT_MODE, IDLE_MODE, toggleTutorial } from './actions' import ArticleNavigator from './HomePage/ArticleNavigator' import ArticleTopBar from './HomePage/ArticleTopBar' import ArticleList from './HomePage/ArticleList' import ArticleDetail from './HomePage/ArticleDetail' import _ from 'lodash' -import { isModalOpen, closeModal } from 'boost/modal' - -const electron = require('electron') -const remote = electron.remote +import { isModalOpen, closeModal } from 'browser/lib/modal' const TEXT_FILTER = 'TEXT_FILTER' const FOLDER_FILTER = 'FOLDER_FILTER' diff --git a/browser/main/HomePage/ArticleDetail/ShareButton.js b/browser/main/HomePage/ArticleDetail/ShareButton.js index b6b9600b..649475d8 100644 --- a/browser/main/HomePage/ArticleDetail/ShareButton.js +++ b/browser/main/HomePage/ArticleDetail/ShareButton.js @@ -1,8 +1,8 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import api from 'boost/api' -import clientKey from 'boost/clientKey' -import activityRecord from 'boost/activityRecord' +import api from 'browser/lib/api' +import clientKey from 'browser/lib/clientKey' +import activityRecord from 'browser/lib/activityRecord' const clipboard = require('electron').clipboard function getDefault () { diff --git a/browser/main/HomePage/ArticleDetail/index.js b/browser/main/HomePage/ArticleDetail/index.js index ab3e4bc3..9d805596 100644 --- a/browser/main/HomePage/ArticleDetail/index.js +++ b/browser/main/HomePage/ArticleDetail/index.js @@ -2,9 +2,9 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' import moment from 'moment' import _ from 'lodash' -import ModeIcon from 'boost/components/ModeIcon' -import MarkdownPreview from 'boost/components/MarkdownPreview' -import CodeEditor from 'boost/components/CodeEditor' +import ModeIcon from 'browser/components/ModeIcon' +import MarkdownPreview from 'browser/components/MarkdownPreview' +import CodeEditor from 'browser/components/CodeEditor' import { IDLE_MODE, EDIT_MODE, @@ -17,13 +17,13 @@ import { updateArticle, destroyArticle, NEW -} from 'boost/actions' -import linkState from 'boost/linkState' -import FolderMark from 'boost/components/FolderMark' -import TagLink from 'boost/components/TagLink' -import TagSelect from 'boost/components/TagSelect' -import ModeSelect from 'boost/components/ModeSelect' -import activityRecord from 'boost/activityRecord' +} from '../../actions' +import linkState from 'browser/lib/linkState' +import FolderMark from 'browser/components/FolderMark' +import TagLink from '../TagLink' +import TagSelect from 'browser/components/TagSelect' +import ModeSelect from 'browser/components/ModeSelect' +import activityRecord from 'browser/lib/activityRecord' import ShareButton from './ShareButton' const electron = require('electron') diff --git a/browser/main/HomePage/ArticleList.js b/browser/main/HomePage/ArticleList.js index db5d596b..719e3b6a 100644 --- a/browser/main/HomePage/ArticleList.js +++ b/browser/main/HomePage/ArticleList.js @@ -1,10 +1,10 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import ModeIcon from 'boost/components/ModeIcon' +import ModeIcon from 'browser/components/ModeIcon' import moment from 'moment' -import { switchArticle, NEW } from 'boost/actions' -import FolderMark from 'boost/components/FolderMark' -import TagLink from 'boost/components/TagLink' +import { switchArticle, NEW } from '../actions' +import FolderMark from 'browser/components/FolderMark' +import TagLink from './TagLink' import _ from 'lodash' export default class ArticleList extends React.Component { diff --git a/browser/main/HomePage/ArticleNavigator.js b/browser/main/HomePage/ArticleNavigator.js index 6b4d5902..b3e82edf 100644 --- a/browser/main/HomePage/ArticleNavigator.js +++ b/browser/main/HomePage/ArticleNavigator.js @@ -1,11 +1,11 @@ import React, { PropTypes } from 'react' import { findWhere } from 'lodash' -import { setSearchFilter, switchFolder, switchMode, switchArticle, updateArticle, clearNewArticle, EDIT_MODE } from 'boost/actions' -import { openModal } from 'boost/modal' -import FolderMark from 'boost/components/FolderMark' -import Preferences from 'boost/components/modal/Preferences' -import CreateNewFolder from 'boost/components/modal/CreateNewFolder' -import keygen from 'boost/keygen' +import { setSearchFilter, switchFolder, switchMode, switchArticle, updateArticle, clearNewArticle, EDIT_MODE } from '../actions' +import { openModal } from 'browser/lib/modal' +import FolderMark from 'browser/components/FolderMark' +import Preferences from '../modal/Preferences' +import CreateNewFolder from '../modal/CreateNewFolder' +import keygen from 'browser/lib/keygen' const BRAND_COLOR = '#18AF90' diff --git a/browser/main/HomePage/ArticleTopBar.js b/browser/main/HomePage/ArticleTopBar.js index 0b6c6c36..888d4232 100644 --- a/browser/main/HomePage/ArticleTopBar.js +++ b/browser/main/HomePage/ArticleTopBar.js @@ -1,7 +1,7 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import ExternalLink from 'boost/components/ExternalLink' -import { setSearchFilter, clearSearch, toggleTutorial } from 'boost/actions' +import ExternalLink from 'browser/components/ExternalLink' +import { setSearchFilter, clearSearch, toggleTutorial } from '../actions' const BRAND_COLOR = '#18AF90' @@ -148,7 +148,7 @@ export default class ArticleTopBar extends React.Component { - + { this.state.isLinksDropdownOpen diff --git a/browser/components/TagLink.js b/browser/main/HomePage/TagLink.js similarity index 100% rename from browser/components/TagLink.js rename to browser/main/HomePage/TagLink.js diff --git a/browser/main/HomePage/UserNavigator.js b/browser/main/HomePage/UserNavigator.js index adf784b4..e260f749 100644 --- a/browser/main/HomePage/UserNavigator.js +++ b/browser/main/HomePage/UserNavigator.js @@ -1,19 +1,8 @@ import React, { Component, PropTypes } from 'react' import { Link } from 'react-router' -import ProfileImage from 'boost/components/ProfileImage' -import { openModal } from 'boost/modal' -import CreateNewTeam from 'boost/components/modal/CreateNewTeam' +import ProfileImage from 'browser/components/ProfileImage' export default class UserNavigator extends Component { - handleClick (e) { - openModal(CreateNewTeam) - } - - // for dev - componentDidMount () { - // openModal(CreateNewTeam) - } - renderUserList () { if (this.props.users == null) return null @@ -38,7 +27,7 @@ export default class UserNavigator extends Component { return (
{this.renderUserList()} - diff --git a/browser/main/index.js b/browser/main/index.js index 9a4ffcae..8a31a255 100644 --- a/browser/main/index.js +++ b/browser/main/index.js @@ -1,16 +1,14 @@ import { Provider } from 'react-redux' -// import { updateUser } from 'boost/actions' import { Router, Route, IndexRoute } from 'react-router' import MainPage from './MainPage' import HomePage from './HomePage' -// import auth from 'boost/auth' -import store from 'boost/store' +import store from './store' import React from 'react' import ReactDOM from 'react-dom' require('../styles/main/index.styl') -import { openModal } from 'boost/modal' -import Tutorial from 'boost/components/modal/Tutorial' -import activityRecord from 'boost/activityRecord' +import { openModal } from 'browser/lib/modal' +import Tutorial from './modal/Tutorial' +import activityRecord from 'browser/lib/activityRecord' const electron = require('electron') const ipc = electron.ipcRenderer const path = require('path') diff --git a/browser/main/modal/CreateNewFolder.js b/browser/main/modal/CreateNewFolder.js index 616f7692..1ec0caa1 100644 --- a/browser/main/modal/CreateNewFolder.js +++ b/browser/main/modal/CreateNewFolder.js @@ -1,9 +1,9 @@ import React, { PropTypes } from 'react' import ReactDOM from 'react-dom' -import linkState from 'boost/linkState' -import { createFolder } from 'boost/actions' -import store from 'boost/store' -import FolderMark from 'boost/components/FolderMark' +import linkState from 'browser/lib/linkState' +import { createFolder } from '../actions' +import store from '../store' +import FolderMark from 'browser/components/FolderMark' export default class CreateNewFolder extends React.Component { constructor (props) { diff --git a/browser/main/modal/CreateNewTeam.js b/browser/main/modal/CreateNewTeam.js deleted file mode 100644 index f72dd52d..00000000 --- a/browser/main/modal/CreateNewTeam.js +++ /dev/null @@ -1,255 +0,0 @@ -import React, { PropTypes } from 'react' -import ProfileImage from 'boost/components/ProfileImage' -import { searchUser, createTeam, setMember, deleteMember } from 'boost/api' -import linkState from 'boost/linkState' -import Select from 'react-select' - -function getUsers (input, cb) { - searchUser(input) - .then(function (res) { - let users = res.body - - cb(null, { - options: users.map(user => { - return { value: user.name, label: user.name } - }), - complete: false - }) - }) - .catch(function (err) { - console.error(err) - }) -} - -export default class CreateNewTeam extends React.Component { - constructor (props) { - super(props) - - this.state = { - create: { - name: '', - alert: null - }, - select: { - team: null, - newMember: null, - alert: null - }, - currentTab: 'create', - currentUser: JSON.parse(localStorage.getItem('currentUser')) - } - } - - handleCloseClick (e) { - this.props.close() - } - - handleContinueClick (e) { - let createState = this.state.create - createState.isSending = true - createState.alert = { - type: 'info', - message: 'sending...' - } - this.setState({create: createState}) - - function onTeamCreate (res) { - let createState = this.state.create - createState.isSending = false - createState.alert = null - - let selectState = this.state.select - selectState.team = res.body - - this.setState({ - currentTab: 'select', - create: createState, - select: { - team: res.body - } - }) - } - - function onError (err) { - let errorMessage = err.response != null ? err.response.body.message : 'Can\'t connect to API server.' - - let createState = this.state.create - createState.isSending = false - createState.alert = { - type: 'error', - message: errorMessage - } - - this.setState({ - create: createState - }) - } - - createTeam({name: this.state.create.name}) - .then(onTeamCreate.bind(this)) - .catch(onError.bind(this)) - } - - renderCreateTab () { - let createState = this.state.create - let alertEl = createState.alert != null ? ( -

{createState.alert.message}

- ) : null - - return ( -
-
Create new team
- - - {alertEl} - -
- ) - } - handleNewMemberChange (value) { - let selectState = this.state.select - selectState.newMember = value - this.setState({select: selectState}) - } - - handleClickAddMemberButton (e) { - let selectState = this.state.select - let input = { - name: selectState.newMember, - role: 'member' - } - - setMember(selectState.team.id, input) - .then(res => { - let selectState = this.state.select - let team = res.body - team.Members = team.Members.sort((a, b) => { - return new Date(a._pivot_createdAt) - new Date(b._pivot_createdAt) - }) - selectState.team = team - selectState.newMember = '' - - this.setState({select: selectState}) - }) - .catch(err => { - if (err.status != null) throw err - else console.error(err) - }) - } - - handleMemberDeleteButtonClick (name) { - let selectState = this.state.select - let input = { - name: name - } - - return e => { - deleteMember(selectState.team.id, input) - .then(res => { - let selectState = this.state.select - let team = res.body - team.Members = team.Members.sort((a, b) => { - return new Date(a._pivot_createdAt) - new Date(b._pivot_createdAt) - }) - selectState.team = team - selectState.newMember = '' - - this.setState({select: selectState}) - }) - .catch(err => { - console.log(err, err.response) - if (err.status != null) throw err - else console.error(err) - }) - } - } - - handleMemberRoleChange (name) { - return function (e) { - let selectState = this.state.select - let input = { - name: name, - role: e.target.value - } - - setMember(selectState.team.id, input) - .then(res => { - console.log(res.body) - }) - .catch(err => { - if (err.status != null) throw err - else console.error(err) - }) - }.bind(this) - } - - renderSelectTab () { - let selectState = this.state.select - - let membersEl = selectState.team.Members.map(member => { - let isCurrentUser = this.state.currentUser.id === member.id - - return ( -
  • - -
    -
    {`${member.profileName} (${member.name})`}
    -
    {member.email}
    -
    - -
    - - -
    -
    • - ) - }) - - return ( -
    -
    Select member
    -
    - this.handleMemberRoleChange(e)} disabled={isDisabled} value={member._pivot_role} className='userRole'> - - - -
    -
    - -
    - - ) - } - } -} - -MemberRow.propTypes = { - member: PropTypes.shape(), - currentUser: PropTypes.shape(), - team: PropTypes.shape({ - id: PropTypes.number - }) -} diff --git a/browser/main/modal/Preference/MemberSettingTab.js b/browser/main/modal/Preference/MemberSettingTab.js deleted file mode 100644 index 42d3fed8..00000000 --- a/browser/main/modal/Preference/MemberSettingTab.js +++ /dev/null @@ -1,149 +0,0 @@ -import React, { PropTypes } from 'react' -import ProfileImage from 'boost/components/ProfileImage' -import Select from 'react-select' -import api from 'boost/api' -import _ from 'lodash' -import MemberRow from './MemberRow' - -function getUsers (input, cb) { - api.searchUser(input) - .then(function (res) { - let users = res.body - - cb(null, { - options: users.map(user => { - return { value: user.name, label: user.name } - }), - complete: false - }) - }) - .catch(function (err) { - console.error(err) - }) -} - -export default class MemberSettingTab extends React.Component { - constructor (props) { - super(props) - - this.state = { - newMember: '' - } - } - - getCurrentTeam (props) { - if (props == null) props = this.props - return _.findWhere(props.teams, {id: props.currentTeamId}) - } - - handleTeamSelectChange (e) { - this.props.switchTeam(e.target.value) - } - - handleNewMemberChange (value) { - this.setState({newMember: value}) - } - - handleClickAddMemberButton (e) { - let team = this.getCurrentTeam() - if (team == null || team.userType !== 'team') return null - - let input = { - name: this.state.newMember, - role: 'member' - } - api.setMember(team.id, input) - .then(res => { - console.log(res.body) - }) - .catch(err => { - if (err.status != null) throw err - else console.error(err) - }) - } - - renderTeamOptions () { - return this.props.teams.map(team => { - return ( - ) - }) - } - - render () { - console.log(this.props.teams) - - let team = this.getCurrentTeam() - - if (team == null || team.userType === 'person') { - return this.renderNoTeam() - } - - let membersEl = team.Members.map(member => ( - - )) - - return ( -
    -
    - Setting of - -
    - -
    -
    Members
    -
    -
    Add member
    -
    - this.handleTeamSelectChange(e)} - className='teamSelect'> - {this.renderTeamOptions()} - -
    -
    Please select a team
    -
    - ) - } -} - -MemberSettingTab.propTypes = { - currentUser: PropTypes.shape(), - teams: PropTypes.array, - currentTeamId: PropTypes.number, - switchTeam: PropTypes.func -} diff --git a/browser/main/modal/Preference/TeamSettingTab.js b/browser/main/modal/Preference/TeamSettingTab.js deleted file mode 100644 index 80589557..00000000 --- a/browser/main/modal/Preference/TeamSettingTab.js +++ /dev/null @@ -1,171 +0,0 @@ -import React, { PropTypes } from 'react' -import _ from 'lodash' -import linkState from 'boost/linkState' -import api from 'boost/api' - -export default class TeamSettingTab extends React.Component { - constructor (props) { - super(props) - let team = this.getCurrentTeam(props) - this.state = { - teamName: team != null ? team.profileName : '', - deleteConfirm: false, - alert: null - } - } - - componentWillReceiveProps (nextProps) { - let team = this.getCurrentTeam(nextProps) - - this.setState({ - teamName: team != null ? team.profileName : '', - deleteConfirm: false - }) - } - - getCurrentTeam (props) { - if (props == null) props = this.props - return _.findWhere(props.teams, {id: props.currentTeamId}) - } - - handleTeamSelectChange (e) { - this.props.switchTeam(e.target.value) - } - - handleSaveButtonClick (e) { - let input = { - profileName: this.state.teamName - } - let alert = { - type: 'info', - message: 'Sending...' - } - this.setState({alert}, () => { - api.updateTeamInfo(this.props.currentTeamId, input) - .then(res => { - console.log(res.body) - let alert = { - type: 'success', - message: 'Successfully done!' - } - this.setState({alert}) - }) - .catch(err => { - var message - if (err.status != null) { - message = err.response.body.message - } else if (err.code === 'ECONNREFUSED') { - message = 'Can\'t connect to API server.' - } else throw err - - let alert = { - type: 'error', - message: message - } - - this.setState({alert}) - }) - }) - } - - handleDeleteConfirmButtonClick (e) { - api.destroyTeam(this.props.currentTeamId) - .then(res => { - console.log(res.body) - }) - .catch(err => { - let message - if (err.status != null) { - message = err.response.body.message - } else if (err.code === 'ECONNREFUSED') { - message = 'Can\'t connect to API server.' - } else throw err - console.log(message) - }) - } - - renderTeamOptions () { - return this.props.teams.map(team => { - return ( - ) - }) - } - - render () { - let team = this.getCurrentTeam() - - if (team == null || team.userType === 'person') { - return this.renderNoTeam() - } - - return ( -
    -
    - Setting of - -
    -
    -
    Team profile
    -
    - - -
    -
    - - - {this.state.alert != null - ? ( -
    {this.state.alert.message}
    - ) - : null} -
    -
    - - {!this.state.deleteConfirm - ? ( -
    - - -
    - ) - : ( -
    - - - -
    - )} -
    - ) - } - - renderNoTeam () { - return ( -
    -
    - Setting of - -
    -
    Please select a team
    -
    - ) - } -} - -TeamSettingTab.propTypes = { - currentTeamId: PropTypes.number, - teams: PropTypes.array, - switchTeam: PropTypes.func -} - -TeamSettingTab.prototype.linkState = linkState diff --git a/browser/main/modal/Preferences.js b/browser/main/modal/Preferences.js index a1b4f4a2..8bea2f3f 100644 --- a/browser/main/modal/Preferences.js +++ b/browser/main/modal/Preferences.js @@ -1,12 +1,11 @@ import React, { PropTypes } from 'react' import { connect, Provider } from 'react-redux' -import linkState from 'boost/linkState' -import store from 'boost/store' +import linkState from 'browser/lib/linkState' +import store from '../store' import AppSettingTab from './Preference/AppSettingTab' -import HelpTab from './Preference/HelpTab' import FolderSettingTab from './Preference/FolderSettingTab' import ContactTab from './Preference/ContactTab' -import { closeModal } from 'boost/modal' +import { closeModal } from 'browser/lib/modal' const APP = 'APP' const HELP = 'HELP' diff --git a/browser/main/modal/Tutorial.js b/browser/main/modal/Tutorial.js index d076729a..e76c3e10 100644 --- a/browser/main/modal/Tutorial.js +++ b/browser/main/modal/Tutorial.js @@ -1,6 +1,6 @@ import React, { PropTypes } from 'react' -import MarkdownPreview from 'boost/components/MarkdownPreview' -import CodeEditor from 'boost/components/CodeEditor' +import MarkdownPreview from 'browser/components/MarkdownPreview' +import CodeEditor from 'browser/components/CodeEditor' export default class Tutorial extends React.Component { constructor (props) { diff --git a/browser/main/reducer.js b/browser/main/reducer.js index c549a17e..81687ea9 100644 --- a/browser/main/reducer.js +++ b/browser/main/reducer.js @@ -29,11 +29,11 @@ import { // view mode IDLE_MODE } from './actions' -import dataStore from 'boost/dataStore' -import keygen from 'boost/keygen' -import activityRecord from 'boost/activityRecord' -import { openModal } from 'boost/modal' -import EditedAlert from 'boost/components/modal/EditedAlert' +import dataStore from 'browser/lib/dataStore' +import keygen from 'browser/lib/keygen' +import activityRecord from 'browser/lib/activityRecord' +import { openModal } from 'browser/lib/modal' +import EditedAlert from './modal/EditedAlert' const initialStatus = { mode: IDLE_MODE, diff --git a/index.js b/index.js index 4f2ea96e..fe56a62e 100644 --- a/index.js +++ b/index.js @@ -4,7 +4,7 @@ function isFinderCalled () { } if (isFinderCalled()) { - require('./finder.js') + require('./lib/finder-app') } else { - require('./main.js') + require('./lib/main-app') } diff --git a/lib/finder-app.js b/lib/finder-app.js index b2fcc086..4e0f82c1 100755 --- a/lib/finder-app.js +++ b/lib/finder-app.js @@ -9,9 +9,11 @@ app.on('ready', function () { app.dock.hide() } - var template = require('./atom-lib/menu-template') + var template = require('./menu-template') var menu = Menu.buildFromTemplate(template) Menu.setApplicationMenu(menu) - finderWindow = require('./atom-lib/finder-window') + finderWindow = require('./finder-window') }) + +module.exports = app diff --git a/lib/finder-window.js b/lib/finder-window.js index 2090c5d2..2d546049 100644 --- a/lib/finder-window.js +++ b/lib/finder-window.js @@ -83,7 +83,7 @@ if (process.platform === 'darwin') { var finderWindow = new BrowserWindow(config) -var url = path.resolve(__dirname, '../browser/finder/index.html') +var url = path.resolve(__dirname, './finder.html') finderWindow.loadURL('file://' + url) finderWindow.setSkipTaskbar(true) diff --git a/lib/finder.html b/lib/finder.html index 8dec611c..0593c2c8 100644 --- a/lib/finder.html +++ b/lib/finder.html @@ -7,17 +7,17 @@ - - - + + +