Skip to content

Commit

Permalink
package
Browse files Browse the repository at this point in the history
  • Loading branch information
maktak1995 committed Mar 16, 2018
1 parent ed27119 commit 3c8ba3d
Show file tree
Hide file tree
Showing 10 changed files with 49 additions and 41 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
package-lock.json
node_modules/
dist/
scratch/
json/*
Binary file added assets/Tucratch_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/appicon.icns
Binary file not shown.
Binary file added assets/appicon.ico
Binary file not shown.
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,26 @@
"main": "./src/index.js",
"scripts": {
"start": "electron .",
"rebuild": "./node_modules/.bin/electron-rebuild"
"rebuild": "./node_modules/.bin/electron-rebuild",
"build": "npm run clean;npm run build:osx;npm run build:win",
"build:osx": "npm run clean:osx;electron-packager . tucratch --out=dist/osx --platform=darwin --arch=x64 --electron-version=1.7.9 --icon=assets/appicon.icns",
"build:win": "npm run clean:win;electron-packager . tucratch --out=dist/win --platform=win32 --arch=ia32 --electron-version=1.7.9 --icon=assets/appicon.ico",
"clean": "rm -rf ./dist",
"clean:osx": "rm -rf ./dist/osx",
"clean:win": "rm -rf ./dist/win"
},
"author": "MakTak",
"license": "MIT",
"dependencies": {
"co": "^4.6.0",
"electron": "^1.7.9",
"extract-text-webpack-plugin": "^3.0.2",
"finalhandler": "^1.1.0",
"electron-json-storage-sync": "^1.1.0",
"electron-packager": "^11.1.0",
"fs": "0.0.1-security",
"fs-extra": "^5.0.0",
"http": "0.0.0",
"jquery": "^3.3.1",
"node-fetch": "^1.7.3",
"node-localstorage": "^1.3.0",
"npm": "^5.7.1",
"rmdir": "^1.2.0",
"router": "^1.3.2",
"serialport": "^6.0.4",
"siimple": "^3.0.0",
"vue": "^2.5.13",
Expand Down
4 changes: 0 additions & 4 deletions src/domain/factory/JsonFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
const path = require('path');
const fs = require('fs');
const PodRepository = require('../repository/PodRepository');
const LocalStorage = require('node-localstorage').LocalStorage;
let localStorage = new LocalStorage('./scratch');



module.exports = class JsonFactory {
static makeJson(JSONPATH) {
Expand Down
33 changes: 18 additions & 15 deletions src/domain/repository/PodRepository.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

const PodFactory = require('../factory/PodFactory');
const fetch = require('node-fetch');
const LocalStorage = require('node-localstorage').LocalStorage;
let localStorage = new LocalStorage('./scratch');
const storage = require('electron-json-storage-sync');

module.exports = class PodRepository {
static async setPod(id){
Expand Down Expand Up @@ -40,45 +39,49 @@ module.exports = class PodRepository {
}

static getPod(name) {
return JSON.parse(localStorage.getItem(name));
return storage.get(name).data;
}

static getPodsList() {
return JSON.parse(localStorage.getItem('podsList'));
return storage.get('podsList').data;
}

static getVarList() {
return JSON.parse(localStorage.getItem('varList'));
return storage.get('varList').data;
}

static setVarList(varList) {
localStorage.setItem('varList', JSON.stringify(varList));
storage.set('varList', varList);
}

static clearStorage() {
storage.clear();
}

static setToStrage(podData) {
const name = podData['name']
localStorage.setItem(name +'_'+ podData['method'], JSON.stringify(PodFactory.addPod(podData)));
storage.set(name +'_'+ podData['method'], PodFactory.addPod(podData));

const getVarList = localStorage.getItem('varList');
const getVarList = storage.get('varList').data;
if(podData['method'] == 'read') {
if(getVarList){
let varList = JSON.parse(getVarList);
let varList = getVarList;
varList[name] = 0;
localStorage.setItem('varList', JSON.stringify(varList));
storage.set('varList', varList);
}else{
const varList = {[name]: 0};
localStorage.setItem('varList', JSON.stringify(varList));
storage.set('varList', varList);
}
}

const getPodsList = localStorage.getItem('podsList');
const getPodsList = storage.get('podsList').data;
if(getPodsList){
let podsList = JSON.parse(getPodsList);
let podsList = getPodsList;
podsList.push(name +'_'+ podData['method']);
localStorage.setItem('podsList', JSON.stringify(podsList));
storage.set('podsList', podsList);
}else{
const podsList = [name +'_'+ podData['method']];
localStorage.setItem('podsList', JSON.stringify(podsList));
storage.set('podsList', podsList);
}
}

Expand Down
5 changes: 3 additions & 2 deletions src/domain/service/SerialResponseParser.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const PodRepository = require('../repository/PodRepository');
const JsonFactory = require('../factory/JsonFactory');
const fsExtra = require('fs-extra');
const path = require('path');
const hasPost = new RegExp(/POST/);
const hasGet = new RegExp(/GET/);

Expand Down Expand Up @@ -42,7 +43,7 @@ module.exports = class SerialResponseParser {
}

static async initPodList(gotMessage) {
fsExtra.emptyDirSync('../../../scratch');
PodRepository.clearStorage();
const reply = JSON.parse(gotMessage);
let pods = reply.bridge;
let errMessage = [];
Expand All @@ -56,7 +57,7 @@ module.exports = class SerialResponseParser {
}

setTimeout(() => {
JsonFactory.makeJson('./json');
JsonFactory.makeJson(path.resolve(appPath, '..', '..', '..', '..'));
}, 1000);

if (errMessage != []) {
Expand Down
8 changes: 4 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
const {app, ipcMain, BrowserWindow} = require('electron');
const path = require('path');
const url = require('url');
const rmdir = require('rmdir');
const ComWithPod = require('./domain/service/ComWithPod');
const ComWithScratch = require('./domain/service/ComWithScratch');
const PodRepository = require('./domain/repository/PodRepository');
Expand All @@ -11,6 +10,8 @@ let parser;
let sended = {'message': ""};
let mainWindow;

global.appPath = app.getPath('exe');

function createWindow () {
mainWindow = new BrowserWindow({width: 450, height: 170, resizable: false});

Expand All @@ -20,10 +21,10 @@ function createWindow () {
slashes: true
}));

ComWithPod.getSerialList().then(function(data){
ComWithPod.getSerialList().then((data) => {
setTimeout(function(){
mainWindow.webContents.send( 'list', data );
}, 500);
}, 1000);
});

mainWindow.on('closed', function () {
Expand All @@ -34,7 +35,6 @@ function createWindow () {
app.on('ready', createWindow);

app.on('window-all-closed', function () {
rmdir('./scratch')
if (process.platform !== 'darwin') {
app.quit();
}
Expand Down
23 changes: 14 additions & 9 deletions src/ui/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,22 @@
</option>
</select>
</div>
<div class="siimple-grid-col siimple-grid-col--5">
<div v-if="selectedChecker == false">
<button v-on:click="select" class="siimple-btn siimple-btn--orange">Select</button>
<button v-on:click="refrash" class="siimple-btn siimple-btn--orange" >Refrash</button>
</div>
<div v-else>
<button class="siimple-btn siimple-btn--disabled">Select</button>
<button v-on:click="refrash" class="siimple-btn siimple-btn--orange" >Refrash</button>
<div v-if="options.length != 0">
<div class="siimple-grid-col siimple-grid-col--5">
<div v-if="selectedChecker == false">
<button v-on:click="select" class="siimple-btn siimple-btn--orange">Select</button>
<button v-on:click="refrash" class="siimple-btn siimple-btn--orange" >Refrash</button>
</div>
<div v-else>
<button class="siimple-btn siimple-btn--disabled">Select</button>
<button v-on:click="refrash" class="siimple-btn siimple-btn--orange" >Refrash</button>
</div>
</div>
</div>
</div>
<div v-else>
<button class="siimple-btn siimple-btn--disabled">Select</button>
<button class="siimple-btn siimple-btn--disabled">Refrash</button>
</div>
</div>
</div>

Expand Down

0 comments on commit 3c8ba3d

Please sign in to comment.