Skip to content

Commit

Permalink
new welcome screen
Browse files Browse the repository at this point in the history
  • Loading branch information
johannesbrandenburger committed Jan 20, 2024
1 parent 1fc7549 commit 0e9d73e
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 29 deletions.
Binary file added frontend/public/demo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 9 additions & 8 deletions frontend/src/App.vue
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
<template>
<v-layout>
<v-app-bar :elevation="16" :color="tenantBackgroundColor">
<img
alt="logo-black"
:src="TENANT_LOGO"
width="200"
class="d-inline-block align-top ml-2"
style="cursor: pointer"
/>
<a :href="`${PATH}/`" class="d-inline-block ml-2 align-middle">
<img
alt="logo-white"
:src="TENANT_LOGO"
width="200"
style="cursor: pointer"
/>
</a>
<a :href="`${PATH}/`" style="text-decoration: none; color: inherit">
<div class="mr-15 ml-4 app-bar-title" style="cursor: pointer">
{{ TENANT === 'default' ? '' : TENANT }}
</div>
</a>
<v-spacer></v-spacer>
<a :href="`${PATH}/pin`">
<a :href="`${PATH}/pin`" v-if="isLoggedIn">
<v-btn class="mr-2"> My Pins </v-btn>
</a>
<a :href="`${PATH}/heatmap`">
Expand Down
39 changes: 19 additions & 20 deletions frontend/src/views/HomeView.vue
Original file line number Diff line number Diff line change
@@ -1,28 +1,27 @@
<template>
<h1>Home</h1>
<div v-if="isLoggedIn">
<p>Logged in as {{ username }}</p>
<button @click="logout">Logout</button>
</div>
<div v-else>
<button @click="login">Login</button>
</div>
</template>
<div class="mt-4 ml-4 mr-4">

<script setup>
import { computed } from 'vue';
import { getUser, login, logout } from '../js/user';
<h1>Welcome to Reveal the World!</h1>

// get userDetails from cookie with regex match
<p>Reveal the World is a platform to visualize your travels. You can mark the places you have already visited on a world map and color in regions. Like with an analog scratch map -- just cooler!</p>
<br>
<p>You can also check the heatmap to see which regions of the world are particularly frequently visited.</p>
<br>
<br>
<strong>Color your world!</strong>

let isLoggedIn = computed(() => {
return getUser() !== null;
});
<div class="mt-4">
<v-img
alt="demo"
:src="`/demo.png`"
width="100%"
/>

let username = computed(() => {
return getUser().username;
});
</div>

console.log(getUser());
</div>
</template>

<script setup>
</script>
2 changes: 1 addition & 1 deletion frontend/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.0.3
v2.0.3

0 comments on commit 0e9d73e

Please sign in to comment.