version 0.2.10

- Hotkeyの設定機能 - Stylus refactor
2025-12-13 01:36:22 +00:00 · 2015-09-02 01:02:04 +09:00
parent e317075815
commit c6307e4ad3
12 changed files with 219 additions and 65 deletions
--- a/browser/main/Components/AboutModal.jsx
+++ b/browser/main/Components/AboutModal.jsx
@@ -1,6 +1,3 @@
-var remote = require('remote')
-var version = remote.getGlobal('version')
-
 var React = require('react/addons')

 var ExternalLink = require('../Mixins/ExternalLink')
@@ -19,8 +16,9 @@ module.exports = React.createClass({
    }
  },
  render: function () {
+    var version = global.version
    return (
-      <div className='AboutModal modal'>
+      <div className='PreferencesModal sideNavModal modal'>
        <div className='about1'>
          <img className='logo' src='resources/favicon-230x230.png'/>
          <div className='appInfo'>Boost {version == null || version.length === 0 ? 'DEV version' : 'v' + version}</div>
--- a/browser/main/Components/EditProfileModal.jsx
+++ b/browser/main/Components/EditProfileModal.jsx
@@ -69,7 +69,6 @@ module.exports = React.createClass({
    this.setState({
      passwordSubmitStatus: 'sending'
    }, function () {
-      console.log(this.state.password)
      Hq.changePassword(this.state.password)
        .then(function (res) {
          this.setState({
@@ -103,9 +102,9 @@ module.exports = React.createClass({
    }

    return (
-      <div className='EditProfileModal modal tabModal'>
+      <div className='EditProfileModal sideNavModal modal'>
        <div className='leftPane'>
-          <div className='tabLabel'>Edit profile</div>
+          <div className='modalLabel'>Edit profile</div>
          <div className='tabList'>
            <button className={this.state.currentTab === 'userInfo' ? 'active' : ''} onClick={this.selectTab('userInfo')}><i className='fa fa-user fa-fw'/> User Info</button>
            <button className={this.state.currentTab === 'password' ? 'active' : ''} onClick={this.selectTab('password')}><i className='fa fa-lock fa-fw'/> Password</button>
@@ -119,7 +118,7 @@ module.exports = React.createClass({
  },
  renderUserInfoTab: function () {
    return (
-      <div className='userInfoTab'>
+      <div className='userInfoTab tab'>
        <div className='formField'>
          <label>Profile Name</label>
          <input valueLink={this.linkState('user.profileName')}/>
@@ -142,18 +141,18 @@ module.exports = React.createClass({
  },
  renderPasswordTab: function () {
    return (
-      <div className='passwordTab'>
+      <div className='passwordTab tab'>
        <div className='formField'>
          <label>Current password</label>
-          <input valueLink={this.linkState('password.currentPassword')}/>
+          <input type='password' valueLink={this.linkState('password.currentPassword')}/>
        </div>
        <div className='formField'>
          <label>New password</label>
-          <input valueLink={this.linkState('password.newPassword')}/>
+          <input type='password' valueLink={this.linkState('password.newPassword')}/>
        </div>
        <div className='formField'>
          <label>Confirmation</label>
-          <input valueLink={this.linkState('password.passwordConfirmation')}/>
+          <input type='password' valueLink={this.linkState('password.passwordConfirmation')}/>
        </div>

        <div className='formConfirm'>
--- a/browser/main/Components/HomeNavigator.jsx
+++ b/browser/main/Components/HomeNavigator.jsx
@@ -11,7 +11,7 @@ var Modal = require('../Mixins/Modal')

 var UserStore = require('../Stores/UserStore')

-var AboutModal = require('./AboutModal')
+var PreferencesModal = require('./PreferencesModal')
 var PlanetCreateModal = require('./PlanetCreateModal')
 var TeamCreateModal = require('./TeamCreateModal')
 var LogoutModal = require('./LogoutModal')
@@ -65,8 +65,8 @@ module.exports = React.createClass({
  openTeamCreateModal: function () {
    this.openModal(TeamCreateModal, {user: this.state.currentUser, transitionTo: this.transitionTo})
  },
-  openAboutModal: function () {
-    this.openModal(AboutModal)
+  openPreferencesModal: function () {
+    this.openModal(PreferencesModal)
  },
  openPlanetCreateModal: function () {
    this.openModal(PlanetCreateModal, {transitionTo: this.transitionTo})
@@ -168,7 +168,7 @@ module.exports = React.createClass({

        <ul className='controlGroup'>
          <li>
-            <button onClick={this.openAboutModal}><i className='fa fa-info-circle fa-fw'/> About this app</button>
+            <button onClick={this.openPreferencesModal}><i className='fa fa-gears fa-fw'/> Preferences</button>
          </li>
          <li>
            <button onClick={this.handleLogoutClick}><i className='fa fa-sign-out fa-fw'/> Log out</button>
--- a/browser/main/Components/PlanetSettingModal.jsx
+++ b/browser/main/Components/PlanetSettingModal.jsx
@@ -125,9 +125,9 @@ module.exports = React.createClass({
    content = this.state.currentTab === 'profile' ? this.renderPlanetProfileTab() : this.renderPlanetDeleteTab()

    return (
-      <div className='PlanetSettingModal modal tabModal'>
+      <div className='PlanetSettingModal sideNavModal modal'>
        <div className='leftPane'>
-          <h1 className='tabLabel'>Planet setting</h1>
+          <h1 className='modalLabel'>Planet setting</h1>
          <nav className='tabList'>
            <button onClick={this.activePlanetProfile} className={this.state.currentTab === 'profile' ? 'active' : ''}><i className='fa fa-globe fa-fw'/> Planet profile</button>
            <button onClick={this.activePlanetDelete} className={this.state.currentTab === 'delete' ? 'active' : ''}><i className='fa fa-trash fa-fw'/> Delete Planet</button>
@@ -142,7 +142,7 @@ module.exports = React.createClass({
  },
  renderPlanetProfileTab: function () {
    return (
-      <div className='planetProfileTab'>
+      <div className='planetProfileTab tab'>
        <div className='formField'>
          <label>Planet name </label>
          <input valueLink={this.linkState('planet.name')}/>
@@ -169,7 +169,7 @@ module.exports = React.createClass({
    var disabled = !this.state.deleteConfirmation.match(new RegExp('^' + this.props.planet.userName + '/' + this.props.planet.name + '$'))

    return (
-      <div className='planetDeleteTab'>
+      <div className='planetDeleteTab tab'>
        <p>Are you sure to destroy <strong>'{this.props.planet.userName + '/' + this.props.planet.name}'</strong>?</p>
        <p>If you are sure, write <strong>'{this.props.planet.userName + '/' + this.props.planet.name}'</strong> to input below and click <strong>'{this.state.randomDeleteText}'</strong> button.</p>
        <input valueLink={this.linkState('deleteConfirmation')} placeholder='userName/planetName'/>
--- a/browser/main/Components/PreferencesModal.jsx
+++ b/browser/main/Components/PreferencesModal.jsx
@@ -0,0 +1,112 @@
+var ipc = require('ipc')
+var remote = require('remote')
+
+var React = require('react/addons')
+
+var LinkedState = require('../Mixins/LinkedState')
+var ExternalLink = require('../Mixins/ExternalLink')
+var KeyCaster = require('../Mixins/KeyCaster')
+
+module.exports = React.createClass({
+  mixins: [LinkedState, ExternalLink, KeyCaster('aboutModal')],
+  propTypes: {
+    close: React.PropTypes.func
+  },
+  getInitialState: function () {
+    var keymap = remote.getGlobal('keymap')
+    console.log(keymap)
+    return {
+      currentTab: 'settings',
+      keymap: keymap
+    }
+  },
+  onKeyCast: function (e) {
+    switch (e.status) {
+      case 'closeModal':
+        this.props.close()
+        break
+    }
+  },
+  activeSettings: function () {
+    this.setState({currentTab: 'settings'})
+  },
+  activeAbout: function () {
+    this.setState({currentTab: 'about'})
+  },
+  saveKeymap: function () {
+    ipc.send('hotkeyUpdated', JSON.stringify(this.state.keymap))
+  },
+  render: function () {
+    var content = this.state.currentTab === 'settings' ? this.renderSettingsTab() : this.renderAboutTab()
+
+    return (
+      <div className='PreferencesModal sideNavModal modal'>
+        <div className='leftPane'>
+          <h1 className='modalLabel'>Preferences</h1>
+          <nav className='tabList'>
+            <button onClick={this.activeSettings} className={this.state.currentTab === 'settings' ? 'active' : ''}><i className='fa fa-gear fa-fw'/> Settings</button>
+            <button onClick={this.activeAbout} className={this.state.currentTab === 'about' ? 'active' : ''}><i className='fa fa-info-circle fa-fw'/> About this app</button>
+          </nav>
+        </div>
+        <div className='rightPane'>
+          {content}
+        </div>
+      </div>
+    )
+  },
+  renderSettingsTab: function () {
+    return (
+      <div className='settingsTab tab'>
+        <div className='categoryLabel'>Hotkey</div>
+        <div className='formField'>
+          <label>Toggle finder</label>
+          <input valueLink={this.linkState('keymap.toggleFinder')}/>
+        </div>
+        <div className='formConfirm'>
+          <button onClick={this.saveKeymap}>Save</button>
+        </div>
+        <div className='example'>
+          <h3>Example</h3>
+          <ul>
+            <li><code>0</code> to <code>9</code></li>
+            <li><code>A</code> to <code>Z</code></li>
+            <li><code>F1</code> to <code>F24</code></li>
+            <li>Punctuations like <code>~</code>, <code>!</code>, <code>@</code>, <code>#</code>, <code>$</code>, etc.</li>
+            <li><code>Plus</code></li>
+            <li><code>Space</code></li>
+            <li><code>Backspace</code></li>
+            <li><code>Delete</code></li>
+            <li><code>Insert</code></li>
+            <li><code>Return</code> (or <code>Enter</code> as alias)</li>
+            <li><code>Up</code>, <code>Down</code>, <code>Left</code> and <code>Right</code></li>
+            <li><code>Home</code> and <code>End</code></li>
+            <li><code>PageUp</code> and <code>PageDown</code></li>
+            <li><code>Escape</code> (or <code>Esc</code> for short)</li>
+            <li><code>VolumeUp</code>, <code>VolumeDown</code> and <code>VolumeMute</code></li>
+            <li><code>MediaNextTrack</code>, <code>MediaPreviousTrack</code>, <code>MediaStop</code> and <code>MediaPlayPause</code></li>
+          </ul>
+        </div>
+      </div>
+    )
+  },
+  renderAboutTab: function () {
+    var version = global.version
+    return (
+      <div className='aboutTab tab'>
+        <div className='about1'>
+          <img className='logo' src='resources/favicon-230x230.png'/>
+          <div className='appInfo'>Boost {version == null || version.length === 0 ? 'DEV version' : 'v' + version}</div>
+        </div>
+
+        <div className='about2'>
+          <div className='externalLabel'>External links</div>
+          <ul className='externalList'>
+            <li><a onClick={this.openExternal} href='http://b00st.io'>Boost Homepage <i className='fa fa-external-link'/></a></li>
+            <li><a onClick={this.openExternal} href='http://boostio.github.io/regulations.html'>Regulation <i className='fa fa-external-link'/></a></li>
+            <li><a onClick={this.openExternal} href='http://boostio.github.io/privacypolicies.html'>Private policy <i className='fa fa-external-link'/></a></li>
+          </ul>
+        </div>
+      </div>
+    )
+  }
+})
--- a/browser/main/Components/TeamSettingsModal.jsx
+++ b/browser/main/Components/TeamSettingsModal.jsx
@@ -176,9 +176,9 @@ module.exports = React.createClass({
    }

    return (
-      <div className='TeamSettingsModal modal tabModal'>
+      <div className='TeamSettingsModal sideNavModal modal'>
        <div className='leftPane'>
-          <div className='tabLabel'>Team settings</div>
+          <div className='modalLabel'>Team settings</div>
          <div className='tabList'>
            <button className={this.state.currentTab === 'teamInfo' ? 'active' : ''} onClick={this.selectTab('teamInfo')}><i className='fa fa-info-circle fa-fw'/> Team Info</button>
            <button className={this.state.currentTab === 'members' ? 'active' : ''} onClick={this.selectTab('members')}><i className='fa fa-users fa-fw'/> Members</button>
@@ -192,7 +192,7 @@ module.exports = React.createClass({
  },
  renderTeamInfoTab: function () {
    return (
-      <div className='userInfoTab'>
+      <div className='userInfoTab tab'>
        <div className='formField'>
          <label>Profile Name</label>
          <input valueLink={this.linkState('team.profileName')}/>
@@ -239,7 +239,7 @@ module.exports = React.createClass({
    var belowLimit = members.length < 5

    return (
-      <div className='membersTab'>
+      <div className='membersTab tab'>
        <table className='memberTable'>
          <thead>
            <tr>
--- a/browser/main/Containers/MainContainer.jsx
+++ b/browser/main/Containers/MainContainer.jsx
@@ -55,7 +55,6 @@ module.exports = React.createClass({
        return
      } else {
        this.transitionTo('home')
-        return
      }
    }

--- a/browser/main/index.electron.html
+++ b/browser/main/index.electron.html
@@ -87,10 +87,11 @@
  </script>
  <script src="../ace/src-min/ace.js"></script>
  <script>
-
-    var version = require('remote').getGlobal('version')
+    var version = require('remote').require('app').getVersion()
+    global.version = version
    document.title = 'Boost ' + ((version == null || version.length === 0) ? 'DEV version' : 'v' + version)
    require('../electron-stylus')(__dirname + '/../styles/main/index.styl', 'mainCss')
+    // require('../electron-stylus')(__dirname + '/../styles/main/index.styl')
    require('node-jsx').install({ harmony: true, extension: '.jsx' })
    require('./index.jsx')
  </script>
--- a/browser/styles/shared/modal.styl
+++ b/browser/styles/shared/modal.styl
@@ -32,14 +32,14 @@
      .modal-control
        float right

-  .tabModal
+  .sideNavModal
    height 500px
    .leftPane
      absolute top bottom left
      width 175px
      padding 20px
      border-right solid 1px borderColor
-      .tabLabel
+      .modalLabel
        font-size 1.5em
        margin-top 25px
        margin-bottom 35px
@@ -57,9 +57,7 @@
      left 175px
      padding 15px
      overflow-y auto
-
-  .EditProfileModal, .PlanetSettingModal, .TeamSettingsModal
-    .userInfoTab, .passwordTab, .planetProfileTab, .userInfoTab, .membersTab
+    .tab
      padding-top 45px
      .formField
        position relative
@@ -111,6 +109,33 @@
          alertSuccess()
        .alertError
          alertError()
+  .PreferencesModal
+    .settingsTab
+      .categoryLabel
+        font-size 1.5em
+        margin-bottom 25px
+      .example
+        marked()
+    .aboutTab
+      padding-top 30px
+      .about1
+        margin-bottom 25px
+        .logo
+          display block
+          margin 0 auto
+        .appInfo
+          font-size 1.5em
+          text-align center
+      .about2
+        width 200px
+        margin 0 auto
+        .externalLabel
+          font-size 1.2em
+          margin-bottom 15px
+        .externalList
+          li
+            margin-bottom 15px
+  .PlanetSettingModal
    .planetDeleteTab
      padding-top 65px
      p
@@ -153,6 +178,7 @@
          alertSuccess()
        .alertError
          alertError()
+  .TeamSettingsModal
    .membersTab
      .memberTable
        width 100%
@@ -262,25 +288,6 @@
    border-radius 5px
    marked()

-  .AboutModal
-    width 320px
-    .about1
-      margin-bottom 25px
-      .logo
-        display block
-        margin 0 auto
-      .appInfo
-        font-size 1.5em
-        text-align center
-    .about2
-      width 200px
-      margin 0 auto
-      .externalLabel
-        font-size 1.2em
-        margin-bottom 15px
-      .externalList
-        li
-          margin-bottom 15px

  .PlanetCreateModal.modal, .TeamCreateModal.modal, .AddMemberModal.modal
    padding 60px 0
--- a/main.js
+++ b/main.js
@@ -4,6 +4,7 @@ var Menu = require('menu')
 var MenuItem = require('menu-item')
 var Tray = require('tray')
 var ipc = require('ipc')
+var jetpack = require('fs-jetpack')

 require('crash-reporter').start()

@@ -19,7 +20,6 @@ var update = null
 // })

 var version = app.getVersion()
-global.version = version
 var versionText = (version == null || version.length === 0) ? 'DEV version' : 'v' + version
 var nn = require('node-notifier')
 var autoUpdater = require('auto-updater')
@@ -143,12 +143,49 @@ app.on('ready', function () {
  popUpWindow.setVisibleOnAllWorkspaces(true)

  var globalShortcut = require('global-shortcut')
+  console.log('jetpack launch')
+  var userDataPath = app.getPath('userData')
+  if (!jetpack.cwd(userDataPath).exists('keymap.json')) {
+    jetpack.cwd(userDataPath).file('keymap.json', {content: '{}'})
+  }
+  try {
+    global.keymap = JSON.parse(jetpack.cwd(userDataPath).read('keymap.json', 'utf-8'))
+  } catch (err) {
+    jetpack.cwd(userDataPath).file('keymap.json', {content: '{}'})
+    global.keymap = {}
+  }
+  if (global.keymap.toggleFinder == null) global.keymap.toggleFinder = 'ctrl+tab+shift'
+  var toggleFinderKey = global.keymap.toggleFinder

-  globalShortcut.register('ctrl+tab+shift', function () {
-    if (mainWindow != null && !mainWindow.isFocused()) {
-      mainWindow.hide()
+  try {
+    globalShortcut.register(toggleFinderKey, function () {
+      if (mainWindow != null && !mainWindow.isFocused()) {
+        mainWindow.hide()
+      }
+      popUpWindow.show()
+    })
+  } catch (err) {
+    console.log(err.name)
+  }
+
+  ipc.on('hotkeyUpdated', function (event, newKeymap) {
+    console.log('got new keymap')
+    console.log(newKeymap)
+    globalShortcut.unregisterAll()
+    global.keymap = JSON.parse(newKeymap)
+    jetpack.cwd(userDataPath).file('keymap.json', {content: JSON.stringify(global.keymap)})
+
+    var toggleFinderKey = global.keymap.toggleFinder != null ? global.keymap.toggleFinder : 'ctrl+tab+shift'
+    try {
+      globalShortcut.register(toggleFinderKey, function () {
+        if (mainWindow != null && !mainWindow.isFocused()) {
+          mainWindow.hide()
+        }
+        popUpWindow.show()
+      })
+    } catch (err) {
+      console.log(err.name)
    }
-    popUpWindow.show()
  })

  global.hideFinder = function () {
--- a/modules/menu-template.js
+++ b/modules/menu-template.js
@@ -19,7 +19,7 @@ module.exports = [
        type: 'separator'
      },
      {
-        label: 'Hide Electron',
+        label: 'Hide Boost',
        accelerator: 'Command+H',
        selector: 'hide:'
      },
@@ -89,13 +89,13 @@ module.exports = [
        click: function () {
          BrowserWindow.getFocusedWindow().reload()
        }
-      // },
-      // {
-      //   label: 'Toggle DevTools',
-      //   accelerator: 'Alt+Command+I',
-      //   click: function () {
-      //     BrowserWindow.getFocusedWindow().toggleDevTools()
-      //   }
+      },
+      {
+        label: 'Toggle DevTools',
+        accelerator: 'Alt+Command+I',
+        click: function () {
+          BrowserWindow.getFocusedWindow().toggleDevTools()
+        }
      }
    ]
  },
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "boost",
-  "version": "0.2.9",
+  "version": "0.2.10",
  "description": "Boost App",
  "main": "main.js",
  "scripts": {
@@ -32,6 +32,7 @@
  "homepage": "https://github.com/Rokt33r/codexen-app#readme",
  "dependencies": {
    "font-awesome": "^4.3.0",
+    "fs-jetpack": "^0.7.0",
    "markdown-it": "^4.3.1",
    "md5": "^2.0.0",
    "moment": "^2.10.3",