Jared Norris 8 anos atrás
pai
commit
c732542a1a

+ 10
- 5
VueApp/src/App.vue Ver arquivo

@@ -2,11 +2,11 @@
2 2
   <div>
3 3
     <nav class="navbar navbar-default">
4 4
       <div class="container-fluid">
5
+        <img class="navbar-left logo" src="./assets/PotentialEnergy.png">
5 6
         <div class="navbar-header">
6
-          <a class="navbar-brand" href="#">Potential Energy</a>
7 7
           <button
8 8
             id="qsLoginBtn"
9
-            class="btn btn-primary btn-margin"
9
+            class="btn btn-primary navbar-fixed-bottom"
10 10
             v-if="!authenticated"
11 11
             @click="login()">
12 12
               Log In
@@ -14,7 +14,7 @@
14 14
 
15 15
           <button
16 16
             id="qsLogoutBtn"
17
-            class="btn btn-primary btn-margin"
17
+            class="btn btn-primary btn-success btn-margin"
18 18
             v-if="authenticated"
19 19
             @click="logout()">
20 20
               Log Out
@@ -59,8 +59,13 @@ export default {
59 59
 
60 60
 <style>
61 61
 @import '../node_modules/bootstrap/dist/css/bootstrap.css';
62
-
62
+.logo {
63
+  height: 100px;
64
+  width: 100px;
65
+}
63 66
 .btn-margin {
64
-  margin-top: 7px
67
+  margin-top: 30px;
68
+  margin-left: 10px;
65 69
 }
70
+
66 71
 </style>

BIN
VueApp/src/assets/PotentialEnergy.png Ver arquivo


+ 0
- 5
VueApp/src/components/GoogleMap.vue Ver arquivo

@@ -1,10 +1,5 @@
1 1
 <template>
2 2
   <div>
3
-    <h1>Temporary Instructions:</h1>
4
-    <h4>
5
-      Click the map in two places to begin.
6
-      You may drag either the markers or the route itself to adjust the path.
7
-    </h4>
8 3
     <div>
9 4
       <label>
10 5
         <gmap-autocomplete @place_changed="setPlace"></gmap-autocomplete>

+ 4
- 1
VueApp/src/components/Main.vue Ver arquivo

@@ -1,7 +1,10 @@
1 1
 <template>
2 2
   <div v-if="authenticated" class="main-container">
3 3
     <div class="appHeader">
4
-      <img src="http://via.placeholder.com/1000x100"/>
4
+      <h4>
5
+        Click the map in two places to begin.
6
+        You may drag either the markers or the route itself to adjust the path.
7
+      </h4>
5 8
     </div>
6 9
     <div class="mainMap">
7 10
       <GoogleMap v-on:updateRoute="updateElevation"/>