diff --git a/src/components/Sidebar.svelte b/src/components/Sidebar.svelte
index fd3303a..1b1907d 100644
--- a/src/components/Sidebar.svelte
+++ b/src/components/Sidebar.svelte
@@ -258,6 +258,7 @@
console.error("Logout failed:", error.message);
} else {
localStorage.removeItem("user");
+
goto("/login");
}
}
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index be26899..f639963 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,12 +1,12 @@
-import { redirect } from '@sveltejs/kit';
-import type { LayoutServerLoad } from './$types';
+// import { redirect } from '@sveltejs/kit';
+// import type { LayoutServerLoad } from './$types';
-export const load: LayoutServerLoad = async ({ locals }) => {
- if (!locals.user) {
- throw redirect(303, '/login');
- }
+// export const load: LayoutServerLoad = async ({ locals }) => {
+// if (!locals.user) {
+// throw redirect(303, '/login');
+// }
- return {
- user: locals.user
- };
-};
\ No newline at end of file
+// return {
+// user: locals.user
+// };
+// };
\ No newline at end of file
diff --git a/src/routes/backoffice/+layout.svelte b/src/routes/backoffice/+layout.svelte
index b3c42e7..00635eb 100644
--- a/src/routes/backoffice/+layout.svelte
+++ b/src/routes/backoffice/+layout.svelte
@@ -1,13 +1,44 @@
-
diff --git a/src/routes/backoffice/+page.server.ts b/src/routes/backoffice/+page.server.ts
index 197924e..f5a41ea 100644
--- a/src/routes/backoffice/+page.server.ts
+++ b/src/routes/backoffice/+page.server.ts
@@ -1,8 +1,11 @@
+import { supabase } from "$lib/supabaseClient";
import { redirect } from "@sveltejs/kit";
-export const load = async (event) => {
- if (!event.locals.user){
+import type { RequestEvent } from "@sveltejs/kit";
+
+export const load = async (event: RequestEvent & { locals: { user?: any } }) => {
+
+ if (!event.locals.user) {
console.log(event.url)
}
-
}
\ No newline at end of file
diff --git a/src/routes/backoffice/timesheets/+page.svelte b/src/routes/backoffice/timesheets/+page.svelte
index 0a5a9a8..f2dbf1d 100644
--- a/src/routes/backoffice/timesheets/+page.svelte
+++ b/src/routes/backoffice/timesheets/+page.svelte
@@ -90,7 +90,6 @@
{ label: "Guest", value: "Guest" },
];
-
let currentUserId: string | null = null;
onMount(async () => {
@@ -226,8 +225,6 @@
: issue.approval
? "APPROVED"
: "REJECTED", // or map as needed
- approved_by: issue.approved_by ?? null,
- approved_date: issue.approved_date ? new Date(issue.approved_date) : null,
total_hours_work:
Math.abs(
new Date(issue.datetime_out).getTime() -
@@ -395,8 +392,8 @@
const approved_date = new Date().toISOString();
const { error } = await supabase
.from("vb_timesheet")
- .update({
- approval: status ,
+ .update({
+ approval: status,
approved_by,
approved_date,
})
@@ -721,7 +718,9 @@
>Select Villa
{#each dataVilla as villa}
-
+
{/each}
{#if $formErrors[col.key]}
diff --git a/src/routes/feedback/+page.svelte b/src/routes/feedback/+page.svelte
index bdf1a30..0b7b2eb 100644
--- a/src/routes/feedback/+page.svelte
+++ b/src/routes/feedback/+page.svelte
@@ -1,49 +1,73 @@
-
-
-
-
-

-
-
-
- Guest
Feedback
Form
-
-
-
-

-
+ }
+
+
+
+
+
+

+
+
+
+ Guest
Feedback
Form
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
diff --git a/src/routes/login/+page.svelte b/src/routes/login/+page.svelte
index 408aebf..fa683c4 100644
--- a/src/routes/login/+page.svelte
+++ b/src/routes/login/+page.svelte
@@ -1,6 +1,7 @@
+
+
+
+
🚫
+
Akses Ditolak
+
+ Anda tidak memiliki izin untuk mengakses halaman ini.
+
+
+ Kembali ke Login
+
+
+