Johannes Zellner 9 жил өмнө
parent
commit
2376eb70ab

+ 10 - 17
backend/routes.js

@@ -2,8 +2,9 @@
 
 module.exports = {
     init: init,
-    getConfig: getConfig,
-    getLights: getLights,
+    getConfig: getGeneric('getConfig'),
+    getFullState: getGeneric('getFullState'),
+    getLights: getGeneric('lights'),
     setLight: setLight
 };
 
@@ -20,22 +21,14 @@ function init(hueConfig, callback) {
     callback();
 }
 
-function getConfig(req, res) {
-    api.config(function (error, result) {
-        if (error) return res.send(500, 'Unable to connect to bridge');
+function getGeneric(name) {
+    return function (req, res) {
+        api[name](function (error, result) {
+            if (error) return res.send(500, 'Unable to get t' + name);
 
-        res.send(200, result);
-    });
-}
-
-function getLights(req, res) {
-    api.lights(function (error, result) {
-        if (error) return res.send(500, error);
-
-        console.log('lights:', result);
-
-        res.send(200, result);
-    });
+            res.send(200, result);
+        });
+    };
 }
 
 function setLight(req, res) {

+ 3 - 0
backend/server.js

@@ -6,6 +6,7 @@ module.exports = {
 
 var express = require('express'),
     bodyParser = require('body-parser'),
+    cors = require('cors'),
     routes = require('./routes.js');
 
 function init(hueConfig) {
@@ -13,8 +14,10 @@ function init(hueConfig) {
 
     app.use(express.static('frontend'));
     app.use(bodyParser.json());
+    app.use(cors());
 
     app.get ('/api/config', routes.getConfig);
+    app.get ('/api/fullState', routes.getFullState);
     app.get ('/api/lights', routes.getLights);
     app.post('/api/lights/:id', routes.setLight);
 

+ 2 - 4
frontend/index.html

@@ -11,7 +11,7 @@
 <body>
 
 <div id="app">
-    <md-sidenav class="md-left" ref="leftSidenav" @open="open('Left')" @close="close('Left')">
+    <md-sidenav class="md-left" ref="leftSidenav" @open="sidenavOpen()">
         <md-toolbar class="md-large">
             <div class="md-toolbar-container">
                 <h3 class="md-title">Sidenav content</h3>
@@ -26,8 +26,6 @@
                 <md-list-expand>
                     <md-list>
                         <md-list-item class="md-inset">World</md-list-item>
-                        <md-list-item class="md-inset">Americas</md-list-item>
-                        <md-list-item class="md-inset">Europe</md-list-item>
                     </md-list>
                 </md-list-expand>
             </md-list-item>
@@ -38,7 +36,7 @@
     </md-sidenav>
 
     <md-toolbar>
-        <md-button class="md-icon-button" @click.native="toggleLeftSidenav">
+        <md-button class="md-icon-button" @click.native="toggleSidenav">
             <md-icon>menu</md-icon>
         </md-button>
         <h2 class="md-title">Cloudron HUE</h2>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 25 - 20
frontend/js/bundle.js


+ 18 - 15
frontend/js/main.js

@@ -1,29 +1,32 @@
 var util = require('util');
 
-console.log(util.format('Hello %s', 'world'));
-
 var Vue = require('vue'),
-    VueMaterial = require('vue-material');
+    VueMaterial = require('vue-material'),
+    VueResource = require('vue-resource');
 
 Vue.use(VueMaterial);
+Vue.use(VueResource);
 
 var App = new Vue({
     el: '#app',
+    http: {
+        root: 'https://test.nebulon.info/api',
+    },
     methods: {
-        toggleLeftSidenav() {
+        toggleSidenav() {
             this.$refs.leftSidenav.toggle();
         },
-        toggleRightSidenav() {
-            this.$refs.rightSidenav.toggle();
-        },
-        closeRightSidenav() {
-            this.$refs.rightSidenav.close();
-        },
-        open(ref) {
-            console.log('Opened: ' + ref);
-        },
-        close(ref) {
-            console.log('Closed: ' + ref);
+        sidenavOpen() {
+            console.log('sidenav open');
         }
+    },
+    mounted: function () {
+        console.log('mounted');
+
+        this.$http.get('lights', { responseType: 'text' }).then(function (result) {
+            console.log('result', result);
+        }, function (error) {
+            console.log('error', error);
+        });
     }
 });

+ 3 - 1
package.json

@@ -11,11 +11,13 @@
   "dependencies": {
     "body-parser": "^1.17.2",
     "color": "^1.0.3",
+    "cors": "^2.8.3",
     "express": "^4.15.3",
     "node-hue-api": "^2.4.2"
   },
   "devDependencies": {
-    "vue-material": "^0.7.1"
+    "vue-material": "^0.7.1",
+    "vue-resource": "^1.3.4"
   },
   "browser": {
     "vue": "vue/dist/vue.common.js"

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно