diff --git a/package.json b/package.json index c8db13a..39e24ea 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "google-maps": "^3.2.1", "less": "^2.7.2", "less-loader": "^3.0.0", + "mapbox-gl": "^0.37.0", "material-design-icons-iconfont": "^3.0.3", "mini-toastr": "^0.6.3", "quasar-framework": "^0.13.6", @@ -51,7 +52,7 @@ "style-loader": "^0.13.2", "superagent": "^3.5.0", "vue": "^2.1.0", - "vue-che": "^0.2.10", + "vue-che": "^0.3.0", "vue-loader": "^10.0.0", "vue-router": "^2.3.0", "vue-template-compiler": "^2.1.0", diff --git a/src/vue-components/App.vue b/src/vue-components/App.vue index 2239c24..397cebb 100644 --- a/src/vue-components/App.vue +++ b/src/vue-components/App.vue @@ -21,7 +21,7 @@
-
+
@@ -36,8 +36,8 @@
- -
+ +
{{$route.meta.title}} @@ -241,7 +241,7 @@ } .__fullscreen { - position: absolute; + position: absolute !important; // override .mapboxgl-map width: 100%; height: 100%; top: 0; diff --git a/src/vue-components/mainpage2.vue b/src/vue-components/mainpage2.vue new file mode 100644 index 0000000..bcfb67c --- /dev/null +++ b/src/vue-components/mainpage2.vue @@ -0,0 +1,405 @@ + + + + + \ No newline at end of file diff --git a/src/vue-components/user-login.vue b/src/vue-components/user-login.vue index afd918e..66689bf 100644 --- a/src/vue-components/user-login.vue +++ b/src/vue-components/user-login.vue @@ -64,33 +64,28 @@
- -
- + +
+ - + +