studio-variable/designtopack
4
0
Fork 0
Code Issues 7 Pull requests Projects Releases Packages Wiki Activity Actions

route /login managed through vue router

Browse source
This commit is contained in:
isUnknown 2025-04-30 16:09:24 +02:00
parent 5b3549068b
commit de52c5e6be
4 changed files with 41 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

44
public/site/controllers/site.php
View file

@ -1,31 +1,27 @@
<?php <?php
return function ($page, $kirby, $site) { return function ($page, $kirby, $site) {
if (!$kirby->user() && $page->uri() != 'login') { $data = $page->toArray();
go('/login'); $data['template'] = (string) $page->template();
} else { $data['newInspirations'] = (bool) page('inspirations')->children()->findBy('new', 'true');
$data = $page->toArray();
$data['template'] = (string) $page->template();
$data['newInspirations'] = (bool) page('inspirations')->children()->findBy('new', 'true');
if ($kirby->user()) { if ($kirby->user()) {
$userData = [ $userData = [
"role" => (string) $kirby->user()->role(), "role" => (string) $kirby->user()->role(),
"uuid" => (string) $kirby->user()->uuid() "uuid" => (string) $kirby->user()->uuid()
];
if ($kirby->user()->client()->exists() && $kirby->user()->client()->isNotEmpty()) {
$userData['client'] = [
"name" => (string) $kirby->user()->client()->toPage()->title(),
"uuid" => (string) $kirby->user()->client()->toPage()->uuid()
];
}
}
return [
'genericData' => $data,
'userData' => $userData ?? null
]; ];
if ($kirby->user()->client()->exists() && $kirby->user()->client()->isNotEmpty()) {
$userData['client'] = [
"name" => (string) $kirby->user()->client()->toPage()->title(),
"uuid" => (string) $kirby->user()->client()->toPage()->uuid()
];
}
} }
return [
'genericData' => $data,
'userData' => $userData ?? null
];
}; };

10
public/site/templates/projects.json.php
View file

@ -1,7 +1,15 @@
<?php <?php
if (!$kirby->user()) {
return json_encode([
'page' => $genericData,
'user' => []
]);
}
function getProjectData($project) function getProjectData($project)
{ {
$data = [ $data = [
'title' => $project->title()->value(), 'title' => $project->title()->value(),
'url' => $project->url(), 'url' => $project->url(),

18
src/router/router.js
View file

@ -1,9 +1,9 @@
import { createWebHistory, createRouter } from "vue-router"; import { createWebHistory, createRouter } from 'vue-router';
import routes from "./routes"; import routes from './routes';
import { useApiStore } from "../stores/api"; import { useApiStore } from '../stores/api';
import { usePageStore } from "../stores/page"; import { usePageStore } from '../stores/page';
import { useUserStore } from "../stores/user"; import { useUserStore } from '../stores/user';
import { getActivePinia } from "pinia"; import { getActivePinia } from 'pinia';
const router = createRouter({ const router = createRouter({
history: createWebHistory(), history: createWebHistory(),
@ -12,10 +12,14 @@ const router = createRouter({
router.beforeEach(async (to, from, next) => { router.beforeEach(async (to, from, next) => {
const pinia = getActivePinia(); const pinia = getActivePinia();
const api = useApiStore(pinia);
const pageStore = usePageStore(pinia); const pageStore = usePageStore(pinia);
const userStore = useUserStore(pinia); const userStore = useUserStore(pinia);
if (to.path === '/login') next();
if (!userStore.user) next('/login');
const api = useApiStore(pinia);
try { try {
const res = await api.fetchData(to.path); const res = await api.fetchData(to.path);

1
src/router/routes.js
View file

@ -13,6 +13,7 @@ const routes = [
component: Home, component: Home,
}, },
{ {
name: 'Login',
path: '/login', path: '/login',
component: Login, component: Login,
}, },