diff --git a/chameleon-client/src/App.vue b/chameleon-client/src/App.vue
index 3604a5e64..535c7abab 100644
--- a/chameleon-client/src/App.vue
+++ b/chameleon-client/src/App.vue
@@ -19,32 +19,12 @@
Settings
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -114,7 +94,6 @@
#camera, #main-layout {
background-color: #272e35;
- /* padding: 100px 30px 30px 30px; */
}
#main-nav {
diff --git a/chameleon-client/src/components/CameraTab.vue b/chameleon-client/src/components/CameraTab.vue
index 30dc3f82c..c265dacb9 100644
--- a/chameleon-client/src/components/CameraTab.vue
+++ b/chameleon-client/src/components/CameraTab.vue
@@ -1,5 +1,5 @@
- camera
+ Camera
+
+
\ No newline at end of file
diff --git a/chameleon-client/src/components/Vision.vue b/chameleon-client/src/components/Vision.vue
new file mode 100644
index 000000000..6c2d25216
--- /dev/null
+++ b/chameleon-client/src/components/Vision.vue
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/chameleon-client/src/routes.js b/chameleon-client/src/routes.js
index 6ec209569..3682015fc 100644
--- a/chameleon-client/src/routes.js
+++ b/chameleon-client/src/routes.js
@@ -1,4 +1,6 @@
import VueRouter from "vue-router";
+import Vision from "./components/Vision.vue"
+import Setting from "./components/Settings.vue"
import Input from "./components/InputTab.vue";
import Threshold from "./components/ThresholdTab.vue";
import System from "./components/SystemTab.vue";
@@ -7,15 +9,19 @@ import Contours from "./components/contourTab.vue";
const routes = [
{ path: '/', redirect: '/vision/input'},
- { path: '/vision/input', component: Input, name:'input' },
- { path: '/vision/threshold', component: Threshold ,name:'threshold'},
- {path:'/settings/system', component: System },
- {path:'/settings/camera', component: Camera},
- {path:'/settings/contours', component: Contours}
+ { path: '/vision', component: Vision, children: [
+ { path: 'input', component: Input },
+ { path: 'threshold', component: Threshold },
+ { path: 'contours', component: Contours }
+ ]},
+ { path: '/settings', component: Setting, children: [
+ { path: 'system', component: System },
+ { path: 'camera', component: Camera }
+ ]}
]
const router = new VueRouter({
- routes // short for `routes: routes`
+ routes
})
export default router;
\ No newline at end of file