From 6863af482c583d5dd719cd1b84080ff36327d93a Mon Sep 17 00:00:00 2001
From: Sagi Frimer <sagifrimer@gmail.com>
Date: Thu, 14 Mar 2019 22:48:25 +0200
Subject: [PATCH] Added basic routing

---
 chameleon-client/src/App.vue                 | 24 ++++++++++++++++----
 chameleon-client/src/components/3DTab.vue    | 22 ++++++++++++++++++
 chameleon-client/src/components/Settings.vue |  8 -------
 chameleon-client/src/components/Vision.vue   | 14 ------------
 chameleon-client/src/main.js                 |  3 ++-
 chameleon-client/src/routes.js               | 15 ++++++++++++
 chameleon-client/theme/index.less            |  1 +
 7 files changed, 60 insertions(+), 27 deletions(-)
 create mode 100644 chameleon-client/src/components/3DTab.vue
 delete mode 100644 chameleon-client/src/components/Settings.vue
 delete mode 100644 chameleon-client/src/components/Vision.vue
 create mode 100644 chameleon-client/src/routes.js

diff --git a/chameleon-client/src/App.vue b/chameleon-client/src/App.vue
index 507480493..d61b25885 100644
--- a/chameleon-client/src/App.vue
+++ b/chameleon-client/src/App.vue
@@ -3,14 +3,14 @@
       <div class="layout">
         <Layout :style="{minHeight: '100vh'}">
             <Sider collapsible :collapsed-width="78" v-model="isCollapsed">
-                <Menu @on-open-change="onOpenChange" active-name="vision-input" :open-names="['vision']"  width="auto" :class="menuitemClasses">
+                <Menu @on-open-change="onOpenChange" active-name="vision-input" :open-names="['vision']" theme="dark"  width="auto" :class="menuitemClasses">
                     <Submenu name="vision">
                       <template slot="title">
                         <Icon type="ios-videocam"/>
                         <span v-if="!isCollapsed">Vision</span>
                       </template>
-                      <MenuItem name="vision-input">Input</MenuItem>
-                      <MenuItem name="vision-3D">3D</MenuItem>
+                      <MenuItem name="vision-input" to="/input">Input</MenuItem>
+                      <MenuItem name="vision-3D" to="3d">3D</MenuItem>
                     </Submenu>
                     <Submenu name="settings">
                       <template slot="title">
@@ -22,6 +22,17 @@
                     </Submenu>
                 </Menu>
             </Sider>
+            <Layout id="main-layout">
+                <Content id="main-content">
+                  <router-view></router-view>
+                </Content>
+            </Layout>
+            <Layout id="camera">
+                <Content>
+                  Camera 1
+                  <img src="./assets/logo.png">
+                </Content>
+            </Layout>
         </Layout>
     </div>
   </div>
@@ -61,7 +72,12 @@ export default {
   color: #2c3e50;
 }
 
-.layout-con{
+#camera, #main-layout {
+  background-color: #272e35;
+  padding: 100px 30px 30px 30px;
+}
+
+.layout{
     height: 100%;
     width: 100%;
 }
diff --git a/chameleon-client/src/components/3DTab.vue b/chameleon-client/src/components/3DTab.vue
new file mode 100644
index 000000000..238efd43c
--- /dev/null
+++ b/chameleon-client/src/components/3DTab.vue
@@ -0,0 +1,22 @@
+<template>
+    <div id="3D">
+        <Slider v-for="slider in sliders" v-bind:key="slider.id" v-model="slider.value"></Slider>
+    </div>
+</template>
+    
+<script> 
+    export default {
+        name: '3D',
+        data () {
+            return {
+                 sliders: [
+                    { id: 'lightning', value: 25 }
+                ]
+            }
+        }
+    }
+</script>
+
+<style scoped>
+ 
+</style>
\ No newline at end of file
diff --git a/chameleon-client/src/components/Settings.vue b/chameleon-client/src/components/Settings.vue
deleted file mode 100644
index d0906a5ed..000000000
--- a/chameleon-client/src/components/Settings.vue
+++ /dev/null
@@ -1,8 +0,0 @@
-<template>
-</template>
-
-<script>
-    export default {
-
-    }
-</script>
\ No newline at end of file
diff --git a/chameleon-client/src/components/Vision.vue b/chameleon-client/src/components/Vision.vue
deleted file mode 100644
index f7bf2f52d..000000000
--- a/chameleon-client/src/components/Vision.vue
+++ /dev/null
@@ -1,14 +0,0 @@
-<template>
-    <div id="vision">
-        <nav class="nav">
-            <router-link to="/input"><a>Input</a></router-link>
-        </nav>
-        <router-view></router-view>
-    </div>
-</template>
-
-<script>
-    export default {
-        name: 'Vision'
-    }
-</script>
\ No newline at end of file
diff --git a/chameleon-client/src/main.js b/chameleon-client/src/main.js
index f1f63ccfa..264243897 100644
--- a/chameleon-client/src/main.js
+++ b/chameleon-client/src/main.js
@@ -2,7 +2,7 @@ import Vue from 'vue'
 import App from './App.vue'
 import VueRouter from 'vue-router'
 import iView from 'iview';
-//import 'iview/dist/styles/iview.css'
+import router from "./routes";
 import '../theme/index.less';
 
 Vue.use(VueRouter);
@@ -11,5 +11,6 @@ Vue.use(iView);
 Vue.config.productionTip = false
 
 new Vue({
+  router,
   render: h => h(App)
 }).$mount('#app')
diff --git a/chameleon-client/src/routes.js b/chameleon-client/src/routes.js
new file mode 100644
index 000000000..1333ed4fc
--- /dev/null
+++ b/chameleon-client/src/routes.js
@@ -0,0 +1,15 @@
+import VueRouter from "vue-router";
+import Input from "./components/InputTab.vue";
+import ThreeD from "./components/3DTab.vue";
+
+const routes = [
+  { path: '/', redirect: '/input' },
+  { path: '/input', component: Input },
+  { path: '/3d', component: ThreeD }
+]
+
+const router = new VueRouter({
+  routes // short for `routes: routes`
+})
+
+export default router;
\ No newline at end of file
diff --git a/chameleon-client/theme/index.less b/chameleon-client/theme/index.less
index 16b61c71e..6f6f81770 100644
--- a/chameleon-client/theme/index.less
+++ b/chameleon-client/theme/index.less
@@ -1,4 +1,5 @@
 @import '../node_modules/iview/src/styles/index.less';
 
+
 @primary-color: #ff0000;
 @link-color : #ff0000;
\ No newline at end of file