diff --git a/ui/package-lock.json b/ui/package-lock.json index 0ca9d3e..836c3ad 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -5436,11 +5436,6 @@ "is-object": "1.0.1" } }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==" - }, "js-base64": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.3.tgz", @@ -6030,6 +6025,11 @@ "yallist": "2.1.2" } }, + "luxon": { + "version": "0.5.8", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-0.5.8.tgz", + "integrity": "sha512-TQImsQkWWXqiF43cWbcLN6CxaTzsJJD+8lvgrG8bs0Hc5YBLn+2dAmqUt+BKp2n5+mK0ABJ07Ss7V28H2sYF+w==" + }, "macaddress": { "version": "0.2.8", "resolved": "https://registry.npmjs.org/macaddress/-/macaddress-0.2.8.tgz", @@ -10932,6 +10932,11 @@ "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz", "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ==" }, + "vue-datetime": { + "version": "1.0.0-beta.3", + "resolved": "https://registry.npmjs.org/vue-datetime/-/vue-datetime-1.0.0-beta.3.tgz", + "integrity": "sha1-JlIuZYmynFMncmQ1t3DivcH4W4Y=" + }, "vue-hot-reload-api": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz", @@ -11443,6 +11448,11 @@ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", "dev": true }, + "weekstart": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/weekstart/-/weekstart-1.0.0.tgz", + "integrity": "sha1-4K7jWNRa2ZgCJUdp17KjTJOA9Tk=" + }, "whet.extend": { "version": "0.9.9", "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", diff --git a/ui/package.json b/ui/package.json index 2e733a1..1804917 100644 --- a/ui/package.json +++ b/ui/package.json @@ -21,12 +21,14 @@ "bootstrap": "^4.0.0", "chart.js": "^2.7.2", "font-awesome": "^4.7.0", - "jquery": "^3.3.1", + "luxon": "^0.5.8", "moment": "^2.21.0", "vue": "^2.5.16", + "vue-datetime": "^1.0.0-beta.3", "vue-resource": "^1.5.0", "vue-router": "^3.0.1", - "vuex": "^3.0.1" + "vuex": "^3.0.1", + "weekstart": "^1.0.0" }, "devDependencies": { "babel-loader": "^7.1.4", diff --git a/ui/src/App.vue b/ui/src/App.vue index 9d8de09..d7dfc63 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -19,6 +19,12 @@ Dashboard +
  • + + + Science + +
  • diff --git a/ui/src/assets/css/main.css b/ui/src/assets/css/main.css index ae2a9aa..f242969 100644 --- a/ui/src/assets/css/main.css +++ b/ui/src/assets/css/main.css @@ -112,4 +112,11 @@ hr { #sidebar .hideable { display: none; } -} \ No newline at end of file +} + +.box { + border: 1px solid #ddd; + background-color: #f5f5f5; + padding: 20px; + border-radius: 5px; +} diff --git a/ui/src/components/Login.vue b/ui/src/components/Login.vue index fe8ddde..3ab3f14 100644 --- a/ui/src/components/Login.vue +++ b/ui/src/components/Login.vue @@ -62,12 +62,3 @@ export default { }, } - - diff --git a/ui/src/components/Science.vue b/ui/src/components/Science.vue new file mode 100644 index 0000000..64af7c9 --- /dev/null +++ b/ui/src/components/Science.vue @@ -0,0 +1,83 @@ + + + \ No newline at end of file diff --git a/ui/src/main.js b/ui/src/main.js index 7bc6553..a3dee13 100644 --- a/ui/src/main.js +++ b/ui/src/main.js @@ -1,22 +1,19 @@ import Vue from 'vue' import VueResource from 'vue-resource'; +import { Settings } from 'luxon' import router from './router.js' import store from './store.js'; import App from './App.vue' import './assets/css/main.css' -import '../node_modules/bootstrap/dist/css/bootstrap.css' -import '../node_modules/font-awesome/css/font-awesome.css' +import 'bootstrap/dist/css/bootstrap.css' +import 'font-awesome/css/font-awesome.css' +import 'vue-datetime/dist/vue-datetime.css' -/* -import $ from 'jquery'; -window.jQuery = $; -window.$ = $; -*/ Vue.use(VueResource); Vue.http.options.root = 'http://192.168.1.26:5000/api/'; +Settings.defaultLocale = 'en' -Vue.prototype.$bus = new Vue(); new Vue({ el: '#app', diff --git a/ui/src/router.js b/ui/src/router.js index 38b330d..fa3bcb9 100644 --- a/ui/src/router.js +++ b/ui/src/router.js @@ -3,6 +3,7 @@ import Router from 'vue-router' import Dashboard from './components/dashboard/Dashboard.vue' import About from './components/About.vue' import Settings from './components/settings/Settings.vue' +import Science from './components/Science.vue' Vue.use(Router) @@ -27,5 +28,11 @@ export default new Router({ main: Settings } }, + { + path: '/science', + components: { + main: Science + } + }, ] })