add logout
Signed-off-by: garionion <github@entr0py.de>
This commit is contained in:
parent
89510a0a67
commit
09369d83c1
4 changed files with 49 additions and 15 deletions
|
@ -1,8 +1,11 @@
|
||||||
<template>
|
<template>
|
||||||
<div class="dark:bg-blue-900 min-h-screen">
|
<div class="dark:bg-blue-900 min-h-screen">
|
||||||
<v-nav />
|
<v-nav />
|
||||||
<main class="container mx-auto px-2 max-w-7xl sm:px-6">
|
<main class="container mx-auto px-2 sm:px-6 pt-8">
|
||||||
<router-view></router-view>
|
<suspense>
|
||||||
|
<template #default><router-view></router-view> </template>
|
||||||
|
<template #fallback>Loading</template>
|
||||||
|
</suspense>
|
||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -88,9 +88,9 @@
|
||||||
class="absolute inset-y-0 right-0 flex items-center pr-2 sm:static sm:inset-auto sm:ml-6 sm:pr-0"
|
class="absolute inset-y-0 right-0 flex items-center pr-2 sm:static sm:inset-auto sm:ml-6 sm:pr-0"
|
||||||
>
|
>
|
||||||
<router-link
|
<router-link
|
||||||
:to="{ name: 'Login' }"
|
:to="{ name: 'Login', query: { logout: true } }"
|
||||||
class="text-white bg-blue-600 hover:bg-blue-800 px-3 py-2 rounded-md text-sm font-medium"
|
class="text-white bg-blue-600 hover:bg-blue-800 px-3 py-2 rounded-md text-sm font-medium"
|
||||||
>Logout</router-link
|
>{{ isLoggedIn ? "Logout" : "Login" }}</router-link
|
||||||
>
|
>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -124,8 +124,9 @@
|
||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
//stolen from https://git.max-site.de/Eulinchen/eulinchen-frontend/src/branch/master/src/components/VNav.vue
|
//stolen from https://git.max-site.de/Eulinchen/eulinchen-frontend/src/branch/master/src/components/VNav.vue
|
||||||
|
|
||||||
import { ref, reactive, computed } from "vue";
|
import { ref, reactive, computed, watch } from "vue";
|
||||||
import { useRoute } from "vue-router";
|
import { useRoute } from "vue-router";
|
||||||
|
import { isLoggedIn as isLoggedinFromAPI } from "../api";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "VNav",
|
name: "VNav",
|
||||||
|
@ -137,16 +138,25 @@ export default {
|
||||||
name: "Dashboard",
|
name: "Dashboard",
|
||||||
to: "Home",
|
to: "Home",
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
name: "Sites",
|
||||||
|
to: "Sites",
|
||||||
|
},
|
||||||
{
|
{
|
||||||
name: "Settings",
|
name: "Settings",
|
||||||
to: "Settings",
|
to: "Settings",
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
const route = useRoute();
|
const route = useRoute();
|
||||||
console.log(route);
|
|
||||||
const activeRoute = computed(() => route.name);
|
const activeRoute = computed(() => route.name);
|
||||||
|
|
||||||
return { title, open, items, activeRoute };
|
const isLoggedIn = ref(false);
|
||||||
|
const getLoginStatus = async () => {
|
||||||
|
isLoggedIn.value = await isLoggedinFromAPI();
|
||||||
|
};
|
||||||
|
watch(activeRoute, getLoginStatus);
|
||||||
|
|
||||||
|
return { title, open, items, activeRoute, isLoggedIn };
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
@ -2,6 +2,7 @@ import { createWebHistory, createRouter } from "vue-router";
|
||||||
import Home from "../views/Home.vue";
|
import Home from "../views/Home.vue";
|
||||||
const Settings = () => import("../views/Settings.vue");
|
const Settings = () => import("../views/Settings.vue");
|
||||||
const Login = () => import("../views/Login.vue");
|
const Login = () => import("../views/Login.vue");
|
||||||
|
const Sites = () => import("../views/Sites.vue");
|
||||||
import { isLoggedIn } from "../api";
|
import { isLoggedIn } from "../api";
|
||||||
|
|
||||||
const routes = [
|
const routes = [
|
||||||
|
@ -15,10 +16,16 @@ const routes = [
|
||||||
name: "Settings",
|
name: "Settings",
|
||||||
component: Settings,
|
component: Settings,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
path: "/sites",
|
||||||
|
name: "Sites",
|
||||||
|
component: Sites,
|
||||||
|
},
|
||||||
{
|
{
|
||||||
path: "/login",
|
path: "/login",
|
||||||
name: "Login",
|
name: "Login",
|
||||||
component: Login,
|
component: Login,
|
||||||
|
props: (route) => ({ logout: route.query.logout }),
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -1,11 +1,12 @@
|
||||||
<template xmlns="http://www.w3.org/1999/html">
|
<template>
|
||||||
<div
|
<div
|
||||||
class="container mx-auto h-full flex justify-center items-center dark:text-white"
|
class="container mx-auto h-full flex justify-center items-center dark:text-white"
|
||||||
>
|
>
|
||||||
<div class="sm:w-3/4 md:w-1/3 w-full">
|
<div class="sm:w-3/4 md:w-1/3 w-full">
|
||||||
<h1 class="font-hairline mb-6 text-center">Login</h1>
|
<h1 class="font-hairline mb-6 text-center">Login</h1>
|
||||||
<div
|
<form
|
||||||
class="border-yellow-300 p-8 border-t-8 bg-white mb-6 rounded-lg shadow-lg"
|
class="border-yellow-300 p-8 border-t-8 bg-white mb-6 rounded-lg shadow-lg"
|
||||||
|
@submit.prevent="login"
|
||||||
>
|
>
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<label class="font-bold text-gray-800 block mb-2"
|
<label class="font-bold text-gray-800 block mb-2"
|
||||||
|
@ -33,29 +34,37 @@
|
||||||
<div class="flex items-center justify-between">
|
<div class="flex items-center justify-between">
|
||||||
<button
|
<button
|
||||||
class="bg-green-600 hover:bg-green-400 text-white font-bold py-2 px-4 rounded"
|
class="bg-green-600 hover:bg-green-400 text-white font-bold py-2 px-4 rounded"
|
||||||
@click="login"
|
type="submit"
|
||||||
>
|
>
|
||||||
Login
|
Login
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script lang="ts">
|
||||||
import { ref } from "vue";
|
import { ref, toRefs } from "vue";
|
||||||
import { login as apiLogin } from "../api";
|
import { login as apiLogin, logout as apiLogout } from "../api";
|
||||||
import router from "../router";
|
import router from "../router";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "Login",
|
name: "Login",
|
||||||
setup() {
|
props: {
|
||||||
|
logout: {
|
||||||
|
type: String,
|
||||||
|
required: false,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
async setup(props) {
|
||||||
|
const { logout } = toRefs(props);
|
||||||
const user = ref("");
|
const user = ref("");
|
||||||
const password = ref("");
|
const password = ref("");
|
||||||
async function login() {
|
async function login() {
|
||||||
try {
|
try {
|
||||||
let loginResp = await apiLogin(user.value, password.value);
|
let loginResp = await apiLogin(user.value, password.value);
|
||||||
|
|
||||||
if (loginResp) {
|
if (loginResp) {
|
||||||
router.push({ name: "Home" });
|
router.push({ name: "Home" });
|
||||||
}
|
}
|
||||||
|
@ -64,6 +73,11 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (logout.value !== undefined) {
|
||||||
|
console.log("LOGOUT");
|
||||||
|
await apiLogout();
|
||||||
|
}
|
||||||
|
|
||||||
return {
|
return {
|
||||||
user,
|
user,
|
||||||
password,
|
password,
|
||||||
|
|
Loading…
Reference in a new issue