diff --git a/src/prog/dashboard2/.gitignore b/src/prog/dashboard2/.gitignore
index 09552ad9..e96212c1 100644
--- a/src/prog/dashboard2/.gitignore
+++ b/src/prog/dashboard2/.gitignore
@@ -1,6 +1,8 @@
.DS_Store
node_modules/
dist/
+npm-debug.log
+yarn-error.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
diff --git a/src/prog/dashboard2/README.md b/src/prog/dashboard2/README.md
index 93bf864e..a31e9e14 100644
--- a/src/prog/dashboard2/README.md
+++ b/src/prog/dashboard2/README.md
@@ -1,6 +1,6 @@
-# dashboard2
+# domo
-> AwoX dashboard App
+> Home Automation Tool
## Build Setup
diff --git a/src/prog/dashboard2/build/check-versions.js b/src/prog/dashboard2/build/check-versions.js
index 100f3a0f..6548ba18 100644
--- a/src/prog/dashboard2/build/check-versions.js
+++ b/src/prog/dashboard2/build/check-versions.js
@@ -1,7 +1,7 @@
var chalk = require('chalk')
var semver = require('semver')
var packageConfig = require('../package.json')
-var shell = require('shelljs')
+
function exec (cmd) {
return require('child_process').execSync(cmd).toString().trim()
}
@@ -12,15 +12,12 @@ var versionRequirements = [
currentVersion: semver.clean(process.version),
versionRequirement: packageConfig.engines.node
},
-]
-
-if (shell.which('npm')) {
- versionRequirements.push({
+ {
name: 'npm',
currentVersion: exec('npm --version'),
versionRequirement: packageConfig.engines.npm
- })
-}
+ }
+]
module.exports = function () {
var warnings = []
diff --git a/src/prog/dashboard2/build/dev-server.js b/src/prog/dashboard2/build/dev-server.js
index 782dc6fc..96c36522 100644
--- a/src/prog/dashboard2/build/dev-server.js
+++ b/src/prog/dashboard2/build/dev-server.js
@@ -73,6 +73,7 @@ console.log('> Starting dev server...')
devMiddleware.waitUntilValid(() => {
console.log('> Listening at ' + uri + '\n')
// when env is testing, don't need open it
+
if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') {
opn(uri)
}
diff --git a/src/prog/dashboard2/build/vue-loader.conf.js b/src/prog/dashboard2/build/vue-loader.conf.js
index 7aee79ba..57f6886c 100644
--- a/src/prog/dashboard2/build/vue-loader.conf.js
+++ b/src/prog/dashboard2/build/vue-loader.conf.js
@@ -8,5 +8,10 @@ module.exports = {
? config.build.productionSourceMap
: config.dev.cssSourceMap,
extract: isProduction
- })
+ }),
+ postcss: [
+ require('autoprefixer')({
+ browsers: ['iOS >= 7', 'Android >= 4.1']
+ })
+ ]
}
diff --git a/src/prog/dashboard2/build/webpack.base.conf.js b/src/prog/dashboard2/build/webpack.base.conf.js
index f47b326b..1d4a4979 100644
--- a/src/prog/dashboard2/build/webpack.base.conf.js
+++ b/src/prog/dashboard2/build/webpack.base.conf.js
@@ -1,5 +1,9 @@
var path = require('path')
var utils = require('./utils')
+
+var projectRoot = path.resolve(__dirname, '../')
+const vuxLoader = require('vux-loader')
+
var config = require('../config')
var vueLoaderConfig = require('./vue-loader.conf')
@@ -7,7 +11,7 @@ function resolve (dir) {
return path.join(__dirname, '..', dir)
}
-module.exports = {
+let webpackConfig = {
entry: {
app: './src/main.js'
},
@@ -65,3 +69,8 @@ module.exports = {
]
}
}
+
+
+module.exports = vuxLoader.merge(webpackConfig, {
+ plugins: ['vux-ui', 'progress-bar', 'duplicate-style']
+})
diff --git a/src/prog/dashboard2/build/webpack.prod.conf.js b/src/prog/dashboard2/build/webpack.prod.conf.js
index c57e78a9..da44b656 100644
--- a/src/prog/dashboard2/build/webpack.prod.conf.js
+++ b/src/prog/dashboard2/build/webpack.prod.conf.js
@@ -8,12 +8,10 @@ var CopyWebpackPlugin = require('copy-webpack-plugin')
var HtmlWebpackPlugin = require('html-webpack-plugin')
var ExtractTextPlugin = require('extract-text-webpack-plugin')
var OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin')
-var SWPrecacheWebpackPlugin = require('sw-precache-webpack-plugin')
var env = config.build.env
var webpackConfig = merge(baseWebpackConfig, {
- watch: process.env.WEBPACK_WATCH === 'true',
module: {
rules: utils.styleLoaders({
sourceMap: config.build.productionSourceMap,
@@ -92,15 +90,7 @@ var webpackConfig = merge(baseWebpackConfig, {
to: config.build.assetsSubDirectory,
ignore: ['.*']
}
- ]),
- // service worker caching
- new SWPrecacheWebpackPlugin({
- cacheId: 'my-vue-app',
- filename: 'service-worker.js',
- staticFileGlobs: ['dist/**/*.{js,html,css}'],
- minify: true,
- stripPrefix: 'dist/'
- })
+ ])
]
})
diff --git a/src/prog/dashboard2/config/index.js b/src/prog/dashboard2/config/index.js
index 196da1fa..ff544c42 100644
--- a/src/prog/dashboard2/config/index.js
+++ b/src/prog/dashboard2/config/index.js
@@ -24,7 +24,7 @@ module.exports = {
dev: {
env: require('./dev.env'),
port: 8080,
- autoOpenBrowser: true,
+ autoOpenBrowser: false,
assetsSubDirectory: 'static',
assetsPublicPath: '/',
proxyTable: {},
diff --git a/src/prog/dashboard2/index.html b/src/prog/dashboard2/index.html
index 871da8be..7ffc4037 100644
--- a/src/prog/dashboard2/index.html
+++ b/src/prog/dashboard2/index.html
@@ -2,31 +2,11 @@
-
-
- dashboard2
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- <% for (var chunk of webpack.chunks) {
- for (var file of chunk.files) {
- if (file.match(/\.(js|css)$/)) { %>
- <% }}} %>
+
+ domo
-
+
diff --git a/src/prog/dashboard2/package.json b/src/prog/dashboard2/package.json
index 87796797..40de8423 100644
--- a/src/prog/dashboard2/package.json
+++ b/src/prog/dashboard2/package.json
@@ -1,25 +1,23 @@
{
"name": "dashboard2",
"version": "1.0.0",
- "description": "Domo dashboard App",
- "author": "AwoX",
+ "description": "Stream Device Dashboard",
+ "author": "jbnadal ",
"private": true,
"scripts": {
"dev": "node build/dev-server.js",
- "start": "node build/dev-server.js",
"build": "node build/build.js",
- "build:watch": "cross-env WEBPACK_WATCH=true node build/build.js",
"lint": "eslint --ext .js,.vue src"
},
"dependencies": {
"axios": "^0.16.2",
- "components": "^0.1.0",
- "ionicons": "^3.0.0",
- "node-sass": "^4.5.3",
- "onsenui": "~2.4.0",
- "vue": "^2.3.3",
- "vue-onsenui": "~2.0.0",
- "vuex": "^2.3.1"
+ "fastclick": "^1.0.6",
+ "vue": "^2.2.2",
+ "vue-router": "^2.2.0",
+ "vuex": "^2.1.1",
+ "vuex-i18n": "^1.3.1",
+ "vuex-router-sync": "^4.2.0",
+ "vux": "^2.2.1"
},
"devDependencies": {
"autoprefixer": "^6.7.2",
@@ -27,53 +25,54 @@
"babel-eslint": "^7.1.1",
"babel-loader": "^6.2.10",
"babel-plugin-transform-runtime": "^6.22.0",
- "babel-preset-env": "^1.3.2",
+ "babel-preset-env": "^1.2.1",
"babel-preset-stage-2": "^6.22.0",
"babel-register": "^6.22.0",
"chalk": "^1.1.3",
+ "compression-webpack-plugin": "^0.3.2",
"connect-history-api-fallback": "^1.3.0",
"copy-webpack-plugin": "^4.0.1",
- "cross-env": "^4.0.0",
- "css-loader": "^0.28.0",
- "eslint": "^3.19.0",
- "eslint-config-standard": "^6.2.1",
+ "css-loader": "^0.26.1",
+ "eslint": "^3.14.1",
"eslint-friendly-formatter": "^2.0.7",
- "eslint-loader": "^1.7.1",
+ "eslint-loader": "^1.6.1",
"eslint-plugin-html": "^2.0.0",
+ "eslint-config-standard": "^6.2.1",
"eslint-plugin-promise": "^3.4.0",
"eslint-plugin-standard": "^2.0.1",
"eventsource-polyfill": "^0.9.6",
"express": "^4.14.1",
"extract-text-webpack-plugin": "^2.0.0",
- "file-loader": "^0.11.1",
+ "file-loader": "^0.10.0",
"friendly-errors-webpack-plugin": "^1.1.3",
+ "function-bind": "^1.1.0",
"html-webpack-plugin": "^2.28.0",
"http-proxy-middleware": "^0.17.3",
+ "webpack-bundle-analyzer": "^2.2.1",
+ "semver": "^5.3.0",
"opn": "^4.0.2",
"optimize-css-assets-webpack-plugin": "^1.3.0",
- "ora": "^1.2.0",
+ "ora": "^1.1.0",
"rimraf": "^2.6.0",
- "sass-loader": "^6.0.6",
- "semver": "^5.3.0",
- "shelljs": "^0.7.6",
- "sw-precache-webpack-plugin": "^0.9.1",
- "url-loader": "^0.5.8",
- "vue-loader": "^12.1.0",
- "vue-style-loader": "^3.0.1",
- "vue-template-compiler": "^2.3.3",
- "webpack": "^2.6.1",
- "webpack-bundle-analyzer": "^2.2.1",
+ "url-loader": "^0.5.7",
+ "yaml-loader": "^0.4.0",
+ "less": "^2.7.1",
+ "less-loader": "^2.2.3",
+ "vux-loader": "^1.0.70",
+ "vue-loader": "^11.1.4",
+ "vue-style-loader": "^2.0.0",
+ "vue-template-compiler": "^2.2.4",
+ "webpack": "^2.2.1",
"webpack-dev-middleware": "^1.10.0",
- "webpack-hot-middleware": "^2.18.0",
- "webpack-merge": "^4.1.0"
+ "webpack-hot-middleware": "^2.16.1",
+ "webpack-merge": "^2.6.1"
},
"engines": {
"node": ">= 4.0.0",
"npm": ">= 3.0.0"
},
"browserslist": [
- "> 1%",
- "last 2 versions",
- "not ie <= 8"
+ "iOS >= 7",
+ "Android >= 4.1"
]
}
diff --git a/src/prog/dashboard2/src/App.vue b/src/prog/dashboard2/src/App.vue
new file mode 100644
index 00000000..623622e8
--- /dev/null
+++ b/src/prog/dashboard2/src/App.vue
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/prog/dashboard2/src/AppNavigator.vue b/src/prog/dashboard2/src/AppNavigator.vue
deleted file mode 100644
index 6215b64b..00000000
--- a/src/prog/dashboard2/src/AppNavigator.vue
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/AppSplitter.vue b/src/prog/dashboard2/src/AppSplitter.vue
deleted file mode 100644
index c0b22422..00000000
--- a/src/prog/dashboard2/src/AppSplitter.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/AppTabbar.vue b/src/prog/dashboard2/src/AppTabbar.vue
deleted file mode 100644
index 1fc6d6d7..00000000
--- a/src/prog/dashboard2/src/AppTabbar.vue
+++ /dev/null
@@ -1,102 +0,0 @@
-
-
-
- {{ title }}
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/assets/onsenui-logo.png b/src/prog/dashboard2/src/assets/onsenui-logo.png
deleted file mode 100644
index 656ed8f7..00000000
Binary files a/src/prog/dashboard2/src/assets/onsenui-logo.png and /dev/null differ
diff --git a/src/prog/dashboard2/src/assets/shutters.svg b/src/prog/dashboard2/src/assets/shutters.svg
deleted file mode 100644
index 15a6cfa6..00000000
--- a/src/prog/dashboard2/src/assets/shutters.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
diff --git a/src/prog/dashboard2/src/assets/sprinklers.svg b/src/prog/dashboard2/src/assets/sprinklers.svg
deleted file mode 100644
index d152a485..00000000
--- a/src/prog/dashboard2/src/assets/sprinklers.svg
+++ /dev/null
@@ -1,73 +0,0 @@
-
-
-
diff --git a/src/prog/dashboard2/src/assets/vue-onsenui.png b/src/prog/dashboard2/src/assets/vue-onsenui.png
deleted file mode 100644
index d5ca596b..00000000
Binary files a/src/prog/dashboard2/src/assets/vue-onsenui.png and /dev/null differ
diff --git a/src/prog/dashboard2/src/assets/vux_logo.png b/src/prog/dashboard2/src/assets/vux_logo.png
new file mode 100644
index 00000000..fab54655
Binary files /dev/null and b/src/prog/dashboard2/src/assets/vux_logo.png differ
diff --git a/src/prog/dashboard2/src/components/Hello.vue b/src/prog/dashboard2/src/components/Hello.vue
new file mode 100644
index 00000000..2d805395
--- /dev/null
+++ b/src/prog/dashboard2/src/components/Hello.vue
@@ -0,0 +1,53 @@
+
+
+
{{ msg }}
+
Essential Links
+
+
Ecosystem
+
+
+
+
+
+
+
+
diff --git a/src/prog/dashboard2/src/components/HelloFromVux.vue b/src/prog/dashboard2/src/components/HelloFromVux.vue
new file mode 100644
index 00000000..96f58ca6
--- /dev/null
+++ b/src/prog/dashboard2/src/components/HelloFromVux.vue
@@ -0,0 +1,41 @@
+
+
+
+

+
+
+
+ |
+
+
+
+
+
+
+
diff --git a/src/prog/dashboard2/src/main.js b/src/prog/dashboard2/src/main.js
index 93c35a7c..f5fc96de 100644
--- a/src/prog/dashboard2/src/main.js
+++ b/src/prog/dashboard2/src/main.js
@@ -1,21 +1,28 @@
+// The Vue build version to load with the `import` command
+// (runtime-only or standalone) has been set in webpack.base.conf with an alias.
import Vue from 'vue'
-import Vuex from 'vuex'
-import VueOnsen from 'vue-onsenui'
-import CustomToolbar from './partials/CustomToolbar.vue'
-import storeLike from './store.js'
-import AppNavigator from './AppNavigator.vue'
-// Onsen UI basic CSS
-import 'onsenui/css/onsenui.css'
-// Onsen UI CSS components source (requires cssnext)
-import 'onsenui/css/onsen-css-components.css'
+import FastClick from 'fastclick'
+import VueRouter from 'vue-router'
+import App from './App'
+import Home from './components/HelloFromVux'
-Vue.use(Vuex)
-Vue.use(VueOnsen)
-Vue.component('custom-toolbar', CustomToolbar) // Common toolbar
+Vue.use(VueRouter)
+
+const routes = [{
+ path: '/',
+ component: Home
+}]
+
+const router = new VueRouter({
+ routes
+})
+
+FastClick.attach(document.body)
+
+Vue.config.productionTip = false
/* eslint-disable no-new */
new Vue({
- el: '#app',
- render: h => h(AppNavigator),
- store: new Vuex.Store(storeLike)
-})
+ router,
+ render: h => h(App)
+}).$mount('#app-box')
diff --git a/src/prog/dashboard2/src/pages.example/Animations.vue b/src/prog/dashboard2/src/pages.example/Animations.vue
deleted file mode 100644
index 5344545f..00000000
--- a/src/prog/dashboard2/src/pages.example/Animations.vue
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
- Transitions
-
- {{ animation }}
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Buttons.vue b/src/prog/dashboard2/src/pages.example/Buttons.vue
deleted file mode 100644
index 9721a410..00000000
--- a/src/prog/dashboard2/src/pages.example/Buttons.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-
-
-
-
-
- Normal
- Quiet
- Outline
- Call to action
- Light
- Large
-
-
-
- Normal
- Quiet
- Outline
- Call to action
- Light
- Large
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Carousel.vue b/src/prog/dashboard2/src/pages.example/Carousel.vue
deleted file mode 100644
index ec5123dc..00000000
--- a/src/prog/dashboard2/src/pages.example/Carousel.vue
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
-
-
-
-
- {{key}}
-
-
-
-
-
- {{ carouselIndex === dotIndex - 1 ? '\u25CF' : '\u25CB' }}
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Dialogs.vue b/src/prog/dashboard2/src/pages.example/Dialogs.vue
deleted file mode 100644
index f99c9dda..00000000
--- a/src/prog/dashboard2/src/pages.example/Dialogs.vue
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
-
-
- More
-
-
-
-
-
-
-
- Notifications
-
-
-
- Alert
-
-
-
-
- Simple Confirmation
-
-
-
-
- Prompt
-
-
-
-
- Toast
-
-
-
-
- Action/Bottom Sheet
-
-
-
-
- Components
-
-
-
- Simple Dialog
-
-
-
-
-
- Alert Dialog
-
-
-
-
-
- Toast (top)
-
-
-
-
-
- Modal
-
-
-
-
-
- Popover - MD Menu
-
-
-
-
-
- Action/Bottom Sheet
-
-
-
-
-
-
-
-
-
-
- Simple Dialog
-
- Lorem ipsum dolor
-
- Close
-
-
-
-
-
- Lorem ipsum
-
-
- Supercalifragilisticexpialidocious
-
-
-
- Loading
-
- Click or wait
-
-
-
-
-
-
- {{ label }}
-
-
-
-
-
- Action 1
- Action 2
- Action 3
- Cancel
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Forms.vue b/src/prog/dashboard2/src/pages.example/Forms.vue
deleted file mode 100644
index 49c79f64..00000000
--- a/src/prog/dashboard2/src/pages.example/Forms.vue
+++ /dev/null
@@ -1,160 +0,0 @@
-
-
-
-
- Text input
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Hello {{ name || 'anonymous' }}!
-
-
-
- Switches
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Select
-
-
-
-
-
-
-
-
- {{ selectedItem }} Vue is awesome!
-
-
-
- Radio buttons
-
-
-
-
-
-
- I love {{ selectedVegetable }}!
-
-
-
- Checkboxes - {{checkedColors}}
-
-
-
-
-
- Range slider
-
- Adjust the volume:
-
-
-
-
-
-
-
-
-
-
-
-
-
- Volume: {{ volume }} (careful, that's loud)
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Home.vue b/src/prog/dashboard2/src/pages.example/Home.vue
deleted file mode 100644
index 7ca52458..00000000
--- a/src/prog/dashboard2/src/pages.example/Home.vue
+++ /dev/null
@@ -1,95 +0,0 @@
-
-
-
- This is a kitchen sink example that shows off the Vue bindings for Onsen UI.
-
-
-
- {{ page.label }}
- {{ page.desc }}
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/InfiniteScroll.vue b/src/prog/dashboard2/src/pages.example/InfiniteScroll.vue
deleted file mode 100644
index f0a6db40..00000000
--- a/src/prog/dashboard2/src/pages.example/InfiniteScroll.vue
+++ /dev/null
@@ -1,97 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Useful for loading more items when the scroll reaches the bottom of the page, typically after an asynchronous API call.
-
-
-
-
- Item #{{ item }}
-
-
-
-
-
-
-
-
-
-
-
- Automatically unloads items that are not visible and loads new ones. Useful when the list contains thousands of items.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Menu.vue b/src/prog/dashboard2/src/pages.example/Menu.vue
deleted file mode 100644
index ebe069ec..00000000
--- a/src/prog/dashboard2/src/pages.example/Menu.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-

-
-
- Access
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
- Links
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/Progress.vue b/src/prog/dashboard2/src/pages.example/Progress.vue
deleted file mode 100644
index ed38a577..00000000
--- a/src/prog/dashboard2/src/pages.example/Progress.vue
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
-
-
-
-
-
- Progress: {{ progress }}%
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages.example/PullHook.vue b/src/prog/dashboard2/src/pages.example/PullHook.vue
deleted file mode 100644
index a8a6ba5f..00000000
--- a/src/prog/dashboard2/src/pages.example/PullHook.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
- Pull to refresh
-
-
-
![]()
-
- {{ kitten.name }}
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Home.vue b/src/prog/dashboard2/src/pages/Home.vue
deleted file mode 100644
index afa76771..00000000
--- a/src/prog/dashboard2/src/pages/Home.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Home
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Lights.vue b/src/prog/dashboard2/src/pages/Lights.vue
deleted file mode 100644
index 071164c3..00000000
--- a/src/prog/dashboard2/src/pages/Lights.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Light
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Menu.vue b/src/prog/dashboard2/src/pages/Menu.vue
deleted file mode 100644
index ebe069ec..00000000
--- a/src/prog/dashboard2/src/pages/Menu.vue
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-

-
-
- Access
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
- Links
-
-
-
-
-
-
- {{ item.title }}
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Settings.vue b/src/prog/dashboard2/src/pages/Settings.vue
deleted file mode 100644
index 9defe53e..00000000
--- a/src/prog/dashboard2/src/pages/Settings.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Settings
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Shutters.vue b/src/prog/dashboard2/src/pages/Shutters.vue
deleted file mode 100644
index 2cb0c45b..00000000
--- a/src/prog/dashboard2/src/pages/Shutters.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Shutters
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Sprinklers.vue b/src/prog/dashboard2/src/pages/Sprinklers.vue
deleted file mode 100644
index 318f0963..00000000
--- a/src/prog/dashboard2/src/pages/Sprinklers.vue
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
- Sprintklers
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/pages/Timers.vue b/src/prog/dashboard2/src/pages/Timers.vue
deleted file mode 100644
index 1d95dc5b..00000000
--- a/src/prog/dashboard2/src/pages/Timers.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- Timer
-
-
-
-
diff --git a/src/prog/dashboard2/src/partials/CustomToolbar.vue b/src/prog/dashboard2/src/partials/CustomToolbar.vue
deleted file mode 100644
index 9155356b..00000000
--- a/src/prog/dashboard2/src/partials/CustomToolbar.vue
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
- {{ backLabel }}
-
-
-
- {{ title }}
-
-
-
-
-
diff --git a/src/prog/dashboard2/src/router/index.js b/src/prog/dashboard2/src/router/index.js
new file mode 100644
index 00000000..5bf9ea6d
--- /dev/null
+++ b/src/prog/dashboard2/src/router/index.js
@@ -0,0 +1,15 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+import Hello from '@/components/Hello'
+
+Vue.use(Router)
+
+export default new Router({
+ routes: [
+ {
+ path: '/',
+ name: 'Hello',
+ component: Hello
+ }
+ ]
+})
diff --git a/src/prog/dashboard2/src/store.js b/src/prog/dashboard2/src/store.js
deleted file mode 100644
index 8b3cede0..00000000
--- a/src/prog/dashboard2/src/store.js
+++ /dev/null
@@ -1,62 +0,0 @@
-export default {
- modules: {
- navigator: {
- strict: true,
- namespaced: true,
- state: {
- stack: [],
- options: {}
- },
- mutations: {
- push (state, page) {
- state.stack.push(page)
- },
- pop (state) {
- if (state.stack.length > 1) {
- state.stack.pop()
- }
- },
- replace (state, page) {
- state.stack.pop()
- state.stack.push(page)
- },
- reset (state, page) {
- state.stack = [page || state.stack[0]]
- },
- options (state, newOptions = {}) {
- state.options = newOptions
- }
- }
- },
-
- splitter: {
- strict: true,
- namespaced: true,
- state: {
- open: false
- },
- mutations: {
- toggle (state, shouldOpen) {
- if (shouldOpen instanceof Boolean) {
- state.open = shouldOpen
- } else {
- state.open = !state.open
- }
- }
- }
- },
-
- tabbar: {
- strict: true,
- namespaced: true,
- state: {
- index: 0
- },
- mutations: {
- set (state, index) {
- state.index = index
- }
- }
- }
- }
-}
diff --git a/src/prog/dashboard2/static/.gitkeep b/src/prog/dashboard2/static/.gitkeep
new file mode 100644
index 00000000..e69de29b
diff --git a/src/prog/dashboard2/static/img/icons/android-chrome-192x192.png b/src/prog/dashboard2/static/img/icons/android-chrome-192x192.png
deleted file mode 100644
index 53c42cd7..00000000
Binary files a/src/prog/dashboard2/static/img/icons/android-chrome-192x192.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/android-chrome-512x512.png b/src/prog/dashboard2/static/img/icons/android-chrome-512x512.png
deleted file mode 100644
index 9d3c3407..00000000
Binary files a/src/prog/dashboard2/static/img/icons/android-chrome-512x512.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/apple-touch-icon-120x120.png b/src/prog/dashboard2/static/img/icons/apple-touch-icon-120x120.png
deleted file mode 100644
index 5236b3f6..00000000
Binary files a/src/prog/dashboard2/static/img/icons/apple-touch-icon-120x120.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/apple-touch-icon-152x152.png b/src/prog/dashboard2/static/img/icons/apple-touch-icon-152x152.png
deleted file mode 100644
index f4fadbb1..00000000
Binary files a/src/prog/dashboard2/static/img/icons/apple-touch-icon-152x152.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/apple-touch-icon-180x180.png b/src/prog/dashboard2/static/img/icons/apple-touch-icon-180x180.png
deleted file mode 100644
index f04ad6dd..00000000
Binary files a/src/prog/dashboard2/static/img/icons/apple-touch-icon-180x180.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/apple-touch-icon-60x60.png b/src/prog/dashboard2/static/img/icons/apple-touch-icon-60x60.png
deleted file mode 100644
index 2868f890..00000000
Binary files a/src/prog/dashboard2/static/img/icons/apple-touch-icon-60x60.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/apple-touch-icon-76x76.png b/src/prog/dashboard2/static/img/icons/apple-touch-icon-76x76.png
deleted file mode 100644
index 1f8e9f18..00000000
Binary files a/src/prog/dashboard2/static/img/icons/apple-touch-icon-76x76.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/apple-touch-icon.png b/src/prog/dashboard2/static/img/icons/apple-touch-icon.png
deleted file mode 100644
index 1392e43e..00000000
Binary files a/src/prog/dashboard2/static/img/icons/apple-touch-icon.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/favicon-16x16.png b/src/prog/dashboard2/static/img/icons/favicon-16x16.png
deleted file mode 100644
index 71e7c49f..00000000
Binary files a/src/prog/dashboard2/static/img/icons/favicon-16x16.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/favicon-32x32.png b/src/prog/dashboard2/static/img/icons/favicon-32x32.png
deleted file mode 100644
index f5c7283e..00000000
Binary files a/src/prog/dashboard2/static/img/icons/favicon-32x32.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/favicon.ico b/src/prog/dashboard2/static/img/icons/favicon.ico
deleted file mode 100644
index cac0e7db..00000000
Binary files a/src/prog/dashboard2/static/img/icons/favicon.ico and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/msapplication-icon-144x144.png b/src/prog/dashboard2/static/img/icons/msapplication-icon-144x144.png
deleted file mode 100644
index fcce1f8a..00000000
Binary files a/src/prog/dashboard2/static/img/icons/msapplication-icon-144x144.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/mstile-150x150.png b/src/prog/dashboard2/static/img/icons/mstile-150x150.png
deleted file mode 100644
index 81c38bb9..00000000
Binary files a/src/prog/dashboard2/static/img/icons/mstile-150x150.png and /dev/null differ
diff --git a/src/prog/dashboard2/static/img/icons/safari-pinned-tab.svg b/src/prog/dashboard2/static/img/icons/safari-pinned-tab.svg
deleted file mode 100644
index 732afd8e..00000000
--- a/src/prog/dashboard2/static/img/icons/safari-pinned-tab.svg
+++ /dev/null
@@ -1,149 +0,0 @@
-
-
-
diff --git a/src/prog/dashboard2/static/manifest.json b/src/prog/dashboard2/static/manifest.json
deleted file mode 100644
index ba210e20..00000000
--- a/src/prog/dashboard2/static/manifest.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
- "name": "dashboard2",
- "short_name": "dashboard2",
- "icons": [
- {
- "src": "/static/img/icons/android-chrome-192x192.png",
- "sizes": "192x192",
- "type": "image/png"
- },
- {
- "src": "/static/img/icons/android-chrome-512x512.png",
- "sizes": "512x512",
- "type": "image/png"
- }
- ],
- "start_url": "/index.html",
- "display": "standalone",
- "background_color": "#000000",
- "theme_color": "#4DBA87"
-}