fixed: register form, trackpreview styles

enviroCar · Sep 11, 2017 · be5113b · be5113b
1 parent cfed054
commit be5113b
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # envirocar-www-ng
 This is the Angular Webapp for enviroCar platform. (www.envirocar.org). 
-The Webapp is built with [AngularJS 1.58](https://angularjs.org/). 
+The Webapp is built with [AngularJS 1.6.6](https://angularjs.org/). 
 The UI components are built with [Angular Material](https://material.angularjs.org/).
 
 ## Installation

diff --git a/app/components/apiservices/api.services.users.js b/app/components/apiservices/api.services.users.js
@@ -241,11 +241,9 @@
                     'Content-Type': 'application/JSON'
                 },
                 data: userdata
-            }).success(function (res) {
+            }).then(function (res) {
+                console.log(res);
                 return res;
-            }).error(function (error) {
-                console.log("ResponseError @POST: " + ecBaseUrl + "/users/" + username);
-                return error;
             });
         };
 

diff --git a/app/components/dashboard/dashboard.charts/latest_tracks/latest_tracks.directive.html b/app/components/dashboard/dashboard.charts/latest_tracks/latest_tracks.directive.html
@@ -56,7 +56,7 @@
                                     <md-content >
                                         <p class="placeholder-p">.</p>
 
-                                        <img src="{{event.url}}" style="width:290px;height:184px;"></img>
+                                        <img src="{{event.url}}" style="width:290px;height:184px;"/>
 
                                     </md-content>
                                 </md-tooltip>

diff --git a/app/components/login/login.controller.js b/app/components/login/login.controller.js
@@ -164,7 +164,7 @@
                         },
                         function (error) {
                             console.log(error);
-                            if (error.status === 409) {
+                            if (error.status === 409) { // name or email alrdy in use
                                 $scope.error_name_in_use = true;
                                 $scope.name_in_use_alrdy = $scope.username_register;
                             }

diff --git a/app/styles/styles.css b/app/styles/styles.css
@@ -255,9 +255,12 @@ md-toolbar {
     display: block !important;
     height: auto; }
 
-md-tooltip {
-  font-size: 26px;
-  z-index: 3600; }
+.leaflet-right {
+  z-index: 15 !important; }
+
+.md-tooltip {
+  font-size: 16px;
+  z-index: 10000 !important; }
 
 .white-bg {
   text-align: center;
@@ -498,20 +501,22 @@ md-content {
   align: center; }
 
 .trackpreview {
-  width: 300px;
-  height: 190px; }
+  z-index: 5000 !important;
+  width: 290px;
+  height: 180px; }
   .trackpreview .md-content {
     width: 290px;
     height: 180px;
-    padding: 4px;
     background-color: grey;
-    border-bottom: 4px solid grey; }
+    border-bottom: 4px solid grey;
+    border-top: 4px solid grey; }
   .trackpreview .img {
     vertical-align: central;
     position: absolute;
     top: 2em;
-    left: 0em;
+    left: 2em;
     background-color: grey;
+    border-top: 4px solid grey;
     border-bottom: 4px solid grey; }
   .trackpreview .placeholder-p {
     color: transparent;

diff --git a/app/styles/styles.scss b/app/styles/styles.scss
@@ -298,9 +298,13 @@ md-toolbar {
     }
 }
 
-md-tooltip {
-    font-size: 26px;
-    z-index: 3600;
+.leaflet-right {
+    z-index: 15 !important;
+}
+
+.md-tooltip {
+    font-size: 16px;
+    z-index: 10000 !important;
 }
 
 .white-bg {
@@ -604,24 +608,26 @@ md-content {
 }
 
 .trackpreview {
-
-    width:300px;
-    height:190px;
+
+    z-index: 5000 !important;
+    width:290px;
+    height:180px;
 
     .md-content {
         width:290px;
         height:180px;
-        padding: 4px;
         background-color: grey;
-        border-bottom: 4px solid grey
+        border-bottom: 4px solid grey;
+        border-top: 4px solid grey;
     }
     .img{
         vertical-align: central;
         position: absolute;
         top:2em;
-        left:0em;
+        left:2em;
         background-color: grey;
-        border-bottom: 4px solid grey
+        border-top: 4px solid grey;
+        border-bottom: 4px solid grey;
     }
 
     .placeholder-p {

diff --git a/bower.json b/bower.json
@@ -20,7 +20,7 @@
     "ui-leaflet": "1.0.3",
     "leaflet.heat": "Leaflet.heat#*",
     "angular-material": "^1.1.1",
-    "angular-ui-router": "^0.2.18",
+    "angular-ui-router": "0.4.2",
     "angular-translate": "^2.11.0",
     "angular-cookies": "1.6.6",
     "d3": "^3.5.3",
@@ -35,7 +35,7 @@
   "resolutions": {
     "angular-material": "^1.1.1",
     "leaflet": "1.0.3",
-    "ui-leaflet": "^2.0.0",
+    "ui-leaflet": "1.0.3",
     "angular": "1.6.6",
     "angular-cookies": "1.6.6"
   }

diff --git a/index.html b/index.html
@@ -147,10 +147,10 @@
     <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/distance/filter_distance_card.directive.js"></script>
     <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/duration/filter_duration_card.controller.js"></script>
     <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/duration/filter_duration_card.directive.js"></script>
-    <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/vehicle/filter_vehicle_card.controller.js"></script>
-    <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/vehicle/filter_vehicle_card.directive.js"></script>
     <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/spatial/filter_spatial_card.controller.js"></script>
     <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/spatial/filter_spatial_card.directive.js"></script>
+    <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/vehicle/filter_vehicle_card.controller.js"></script>
+    <script src="app/components/tracks/all_tracks_pagination_tab/filter_cards/vehicle/filter_vehicle_card.directive.js"></script>
     <script src="app/components/tracks/all_tracks_pagination_tab/filter_dialogs/spatial/spatial_filter_dialog.controller.js"></script>
     <!-- endinject -->