fix path of module & contactform

2026-01-01 02:49:37 +00:00 · 2015-12-25 11:06:00 +09:00
parent 325ae00eeb
commit 27a442ed2e
42 changed files with 117 additions and 820 deletions
--- 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
--- 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)
--- a/lib/finder.html
+++ b/lib/finder.html
@@ -7,17 +7,17 @@
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>


-  <link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
-  <link rel="stylesheet" href="../../node_modules/devicon/devicon.min.css">
-  <link rel="stylesheet" href="../../node_modules/highlight.js/styles/xcode.css">
+  <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
+  <link rel="stylesheet" href="../node_modules/devicon/devicon.min.css">
+  <link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css">
  <link rel="shortcut icon" href="favicon.ico">

  <style>
  @font-face {
    font-family: 'Lato';
-    src: url('../../resources/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
-         url('../../resources/Lato-Regular.woff') format('woff'), /* Modern Browsers */
-         url('../../resources/Lato-Regular.ttf') format('truetype');
+    src: url('../resources/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
+         url('../resources/Lato-Regular.woff') format('woff'), /* Modern Browsers */
+         url('../resources/Lato-Regular.ttf') format('truetype');
    font-style: normal;
    font-weight: normal;
    text-rendering: optimizeLegibility;
@@ -26,14 +26,14 @@
 </head>
 <body>
  <div id="content"></div>
-  <script src="../../submodules/ace/src-min/ace.js"></script>
+  <script src="../submodules/ace/src-min/ace.js"></script>
  <script>
    const electron = require('electron')
    electron.webFrame.setZoomLevelLimits(1, 1)
    const _ = require('lodash')
    var scriptUrl = _.find(electron.remote.process.argv, a => a === '--hot')
      ? 'http://localhost:8080/assets/finder.js'
-      : '../../compiled/finder.js'
+      : '../compiled/finder.js'
    var scriptEl=document.createElement('script')
    scriptEl.setAttribute("type","text/javascript")
    scriptEl.setAttribute("src", scriptUrl)
--- a/lib/hotkey.js
+++ b/lib/hotkey.js
@@ -3,7 +3,7 @@ const app = electron.app
 const ipc = electron.ipcMain
 const globalShortcut = electron.globalShortcut
 const jetpack = require('fs-jetpack')
-const mainWindow = require('./atom-lib/main-window')
+const mainWindow = require('./main-window')
 const nodeIpc = require('@rokt33r/node-ipc')

 var userDataPath = app.getPath('userData')
--- a/lib/main-app.js
+++ b/lib/main-app.js
@@ -6,6 +6,8 @@ const autoUpdater = electron.autoUpdater
 const path = require('path')
 const ChildProcess = require('child_process')
 const _ = require('lodash')
+const nodeIpc = require('@rokt33r/node-ipc')
+const GhReleases = require('electron-gh-releases')
 // electron.crashReporter.start()

 var mainWindow = null
@@ -114,7 +116,6 @@ function notify (title, body) {
 }

 var isUpdateReady = false
-var GhReleases = require('electron-gh-releases')

 var ghReleasesOpts = {
  repo: 'BoostIO/boost-releases',
@@ -153,14 +154,13 @@ updater.on('update-downloaded', (info) => {
  }
 })

-const nodeIpc = require('@rokt33r/node-ipc')
 nodeIpc.config.id = 'node'
 nodeIpc.config.retry = 1500
 // nodeIpc.config.silent = true

 function spawnFinder() {
  if (process.platform === 'darwin') {
-    var finderArgv = [path.join(__dirname, 'finder.js'), '--finder']
+    var finderArgv = [path.join(__dirname, 'finder-app.js'), '--finder']
    if (_.find(process.argv, a => a === '--hot')) finderArgv.push('--hot')
    finderProcess = ChildProcess
      .execFile(process.execPath, finderArgv)
@@ -227,7 +227,7 @@ app.on('ready', function () {
    if (finderProcess) finderProcess.kill()
  })

-  var template = require('./atom-lib/menu-template')
+  var template = require('./menu-template')
  if (process.platform === 'win32') {
    template.unshift({
      label: 'Boostnote',
@@ -264,7 +264,7 @@ app.on('ready', function () {

  checkUpdate()

-  mainWindow = require('./atom-lib/main-window')
+  mainWindow = require('./main-window')
  if (process.platform === 'win32') {
    mainWindow.setMenu(menu)
  }
@@ -278,7 +278,7 @@ app.on('ready', function () {
  console.log('fired only once  ')
    spawnFinder()
  } else {
-    finderWindow = require('./atom-lib/finder-window')
+    finderWindow = require('./finder-window')

    finderWindow.on('close', function (e) {
      if (appQuit) return true
@@ -296,3 +296,6 @@ app.on('ready', function () {

  require('./hotkey')
 })
+
+module.exports = app
+
--- a/lib/main-window.js
+++ b/lib/main-window.js
@@ -13,7 +13,7 @@ var mainWindow = new BrowserWindow({
  'standard-window': false
 })

-const url = path.resolve(__dirname, '../browser/main/index.html')
+const url = path.resolve(__dirname, './main.html')

 mainWindow.loadURL('file://' + url)

--- a/lib/main.html
+++ b/lib/main.html
@@ -4,18 +4,18 @@
  <meta charset="utf-8">
  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0"/>

-  <link rel="stylesheet" href="../../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
-  <link rel="stylesheet" href="../../node_modules/devicon/devicon.min.css">
-  <link rel="stylesheet" href="../../node_modules/highlight.js/styles/xcode.css">
-  <link rel="shortcut icon" href="favicon.ico">
+  <link rel="stylesheet" href="../node_modules/font-awesome/css/font-awesome.min.css" media="screen" charset="utf-8">
+  <link rel="stylesheet" href="../node_modules/devicon/devicon.min.css">
+  <link rel="stylesheet" href="../node_modules/highlight.js/styles/xcode.css">
+  <link rel="shortcut icon" href="../resources/favicon.ico">
  <title>Boostnote</title>

  <style>
  @font-face {
    font-family: 'Lato';
-    src: url('../../resources/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
-         url('../../resources/Lato-Regular.woff') format('woff'), /* Modern Browsers */
-         url('../../resources/Lato-Regular.ttf') format('truetype');
+    src: url('../resources/Lato-Regular.woff2') format('woff2'), /* Modern Browsers */
+         url('../resources/Lato-Regular.woff') format('woff'), /* Modern Browsers */
+         url('../resources/Lato-Regular.ttf') format('truetype');
    font-style: normal;
    font-weight: normal;
    text-rendering: optimizeLegibility;
@@ -47,13 +47,13 @@
 </head>
 <body>
  <div id="loadingCover">
-    <img src="../../resources/app.png">
+    <img src="../resources/app.png">
    <div class='message'>Loading...</div>
  </div>

  <div id="content"></div>

-  <script src="../../submodules/ace/src-min/ace.js"></script>
+  <script src="../submodules/ace/src-min/ace.js"></script>
  <script type='text/javascript'>
    const electron = require('electron')
    electron.webFrame.setZoomLevelLimits(1, 1)
@@ -61,7 +61,7 @@
    const _ = require('lodash')
    var scriptUrl = _.find(electron.remote.process.argv, a => a === '--hot')
      ? 'http://localhost:8080/assets/main.js'
-      : '../../compiled/main.js'
+      : '../compiled/main.js'
    var scriptEl = document.createElement('script')
    scriptEl.setAttribute("type","text/javascript")
    scriptEl.setAttribute("src", scriptUrl)