diff options
Diffstat (limited to 'master/src/views')
| -rw-r--r-- | master/src/views/Home.vue | 14 | 
1 files changed, 13 insertions, 1 deletions
diff --git a/master/src/views/Home.vue b/master/src/views/Home.vue index 180383f..88f65e8 100644 --- a/master/src/views/Home.vue +++ b/master/src/views/Home.vue @@ -3,22 +3,29 @@  		<div id="title-container">  			<span>Gymnasiearbete</span>  		</div> +		<!--  		<div id="minion-list">  			<Minion  				name="Skyddsling 1"  				ip="10.0.1.179"  			/>  		</div> +        --> +		<div id="map-container"> +			<G7Map /> +		</div>  	</div>  </template>  <script lang="ts">  import { Options, Vue } from "vue-class-component";  import Minion from "@/components/MinionStatus.vue"; +import G7Map from "@/components/G7Map.vue";  @Options({  	components: { -		Minion +		Minion, +		G7Map  	}  })  export default class HomeView extends Vue {} @@ -29,6 +36,7 @@ export default class HomeView extends Vue {}      display: flex;      justify-content: center;      margin-top: 2em; +    margin-bottom: 7em;      span {          font-size: 2.5rem; @@ -38,4 +46,8 @@ export default class HomeView extends Vue {}  #minion-list {      margin: 3em;  } + +#map-container { +    margin-left: 3em; +}  </style>  | 
