redesign user data api
This commit is contained in:
parent
f132049948
commit
44361e614d
17 changed files with 80 additions and 52 deletions
|
|
@ -1,9 +1,24 @@
|
|||
<?php
|
||||
|
||||
return function ($page) {
|
||||
return function ($page, $kirby) {
|
||||
$data = $page->toArray();
|
||||
$data['template'] = (string) $page->template();
|
||||
|
||||
$userData = [
|
||||
"role" => $kirby->user()->role(),
|
||||
"uuid" => $kirby->user()->uuid(),
|
||||
"notifications" => Yaml::decode($kirby->user()->notifications()->value()),
|
||||
];
|
||||
|
||||
if ($kirby->user()->role() == 'client') {
|
||||
$userData['client'] = [
|
||||
"name" => $kirby->user()->client()->toPage()->title(),
|
||||
"uuid" => $kirby->user()->client()->toPage()->uuid()
|
||||
];
|
||||
}
|
||||
|
||||
return [
|
||||
'genericData' => $data,
|
||||
'userData' => $userData
|
||||
];
|
||||
};
|
||||
|
|
@ -1,19 +1,2 @@
|
|||
<script>
|
||||
<?php if ($kirby->user()): ?>
|
||||
const kirbyData = {
|
||||
user: {
|
||||
role: '<?= $kirby->user()->role() ?>',
|
||||
uuid: '<?= $kirby->user()->uuid() ?>',
|
||||
notifications: <?= json_encode(Yaml::decode($kirby->user()->notifications()->value())) ?>
|
||||
<?php if ($kirby->user()->role() == 'client'): ?>
|
||||
client: {
|
||||
name: '<?= $kirby->user()->client()->toPage()->title() ?>',
|
||||
uuid: '<?= $kirby->user()->client()->toPage()->uuid() ?>',
|
||||
}
|
||||
<?php endif ?>
|
||||
}
|
||||
}
|
||||
<?php endif ?>
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -11,6 +11,9 @@ $specificData = [
|
|||
"moodboard" => $moodboard
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -5,6 +5,9 @@ $specificData = [
|
|||
"exampleHardData" => 'Example hard value'
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -5,6 +5,9 @@ $specificData = [
|
|||
'blocks' => $blocks
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -16,6 +16,9 @@ $specificData = [
|
|||
"images" => $images
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -26,6 +26,9 @@ $specificData = [
|
|||
"inspirations" => $inspirations
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -4,6 +4,9 @@ $specificData = [
|
|||
'title' => $page->title()->value(),
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -8,6 +8,9 @@ $project = [
|
|||
'steps' => $page->getSteps(),
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $project);
|
||||
$pageData = array_merge($genericData, $project);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
@ -15,6 +15,9 @@ $specificData = [
|
|||
"children" => $children,
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -4,6 +4,9 @@ $specificData = [
|
|||
'title' => $page->title()->value(),
|
||||
];
|
||||
|
||||
$data = array_merge($genericData, $specificData);
|
||||
$pageData = array_merge($genericData, $specificData);
|
||||
|
||||
echo json_encode($data);
|
||||
echo json_encode([
|
||||
"page" => $pageData,
|
||||
"user" => $userData
|
||||
]);
|
||||
Loading…
Add table
Add a link
Reference in a new issue