zoeissleeping/filething
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better types

Browse Source
This commit is contained in:
Zoe
2024-09-30 01:06:57 -05:00
parent c208e35e4c
commit d7ff2d77ae
9 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
ui/composables/useUser.ts
View File

@@ -1,9 +1,22 @@
import type { User } from '~/types/user'
import type { Plan, User } from '~/types/user'
import { useFetch } from '#app'
const uninitializedUser = {
id: "",
username: "",
email: "",
plan: <Plan>{
id: 0,
max_storage: 0
},
usage: 0,
created_at: "",
is_admin: false
}
export const useUser = () => {
// Global state for storing the user
const user = useState('user', () => { return { fetched: false, user: <User>{} } })
const user = useState('user', () => { return { fetched: false, user: uninitializedUser } })
// Fetch the user only if it's uninitialized (i.e., null)
const getUser = async () => {
@@ -24,9 +37,9 @@ export const useUser = () => {
}
user.value.user = data.value
} catch (e) {
} catch (e: any) {
console.error(e.message)
user.value.user = {}
user.value.user = uninitializedUser
}
}
@@ -37,7 +50,7 @@ export const useUser = () => {
// Clear the user data (e.g., on logout)
const resetUser = () => {
user.value.user = {}
user.value.user = uninitializedUser
}
return {

4
ui/layouts/admin.vue
View File

@@ -9,7 +9,7 @@ definePageMeta({
const user = await getUser();
const route = useRoute();
const accordionMapping = {
const accordionMapping: Record<string, string> = {
'/admin/users': '',
'/admin/config/settings': 'item-2',
'/admin': 'item-1',
@@ -30,7 +30,7 @@ const isActiveLink = (path: string) => route.path === path;
<div class="w-auto md:w-60 flex-shrink-0">
<aside class="rounded-md border overflow-hidden w-full h-fit">
<div class="px-4 py-3.5 bg-surface border-b">Admin Settings</div>
<VlAccordion type="single" :defaultValue="getActiveAccordion()">
<VlAccordion type="single" :defaultValue="getActiveAccordion() || undefined">
<VlAccordionItem value="item-1" class="text-sm">
<VlAccordionTrigger class="transition-bg hover:bg-muted/10 px-4 py-3.5">
Maintenance

2
ui/middleware/admin.ts
View File

@@ -5,7 +5,7 @@ export default defineNuxtRouteMiddleware(async (to, from) => {
const { getUser } = useUser()
const user = await getUser()
if (!user.is_admin) {
if (!user || !user.is_admin) {
return navigateTo('/home')
}
})

30
ui/pages/admin/index.vue
View File

@@ -1,14 +1,26 @@
<script setup lang="ts">
import type { NuxtError } from '#app';
definePageMeta({
middleware: ["auth", "admin"],
layout: "admin"
});
let {data: systemStatusData, refresh} = await useFetch("/api/admin/status")
let {data: systemStatusData, refresh} = await useFetch<
{ uptime: string, num_goroutine: number, cur_mem_usage: string, total_mem_usage: string,
mem_obtained: string, ptr_lookup_times: number, mem_allocations: number, mem_frees: number, cur_heap_usage: string, heap_mem_obtained: string,
heap_mem_idle: string, heap_mem_inuse: string, heap_mem_release: string, heap_objects: number, bootstrap_stack_usage: string, stack_mem_obtained: string,
mspan_structures_usage: string, mspan_structures_obtained: string, mcache_structures_usage: string, mcache_structures_obtained: string,
buck_hash_sys: string, gc_sys: string, other_sys: string, next_gc: string, last_gc_time: string, pause_total_ns: string, pause_ns: string, num_gc: number
}, NuxtError<{ message: string }>>("/api/admin/status")
const calculateTimeSince = (time) => {
const now = new Date();
const date = new Date(time);
if (systemStatusData.value === null) {
throw new Error("Failed to fetch system status")
}
const calculateTimeSince = (time: string) => {
const now: number = new Date().getTime();
const date: number = new Date(time).getTime();
const diffInSeconds = Math.floor((now - date) / 1000);
const days = Math.floor(diffInSeconds / (3600 * 24));
@@ -29,10 +41,14 @@ const calculateTimeSince = (time) => {
let uptime = ref(calculateTimeSince(systemStatusData.value.uptime));
let lastGcTime = ref(calculateTimeSince(systemStatusData.value.last_gc_time));
let systemStatusInterval;
let timeInterval;
let systemStatusInterval: NodeJS.Timeout;
let timeInterval: NodeJS.Timeout;
const updateTime = () => {
if (systemStatusData.value === null) {
throw new Error("Failed to fetch system status")
}
uptime.value = calculateTimeSince(systemStatusData.value.uptime);
lastGcTime.value = calculateTimeSince(systemStatusData.value.last_gc_time)
};
@@ -57,7 +73,7 @@ onUnmounted(() => {
<div class="w-full overflow-hidden rounded-md border h-fit text-[15px]">
<h4 class="bg-surface px-3.5 py-3 border-b">System Status</h4>
<div class="p-3.5 text-sm">
<dl class="flex-wrap">
<dl class="flex-wrap" v-if="systemStatusData !== null">
<dt>Server Uptime</dt>
<dd>{{ uptime }}</dd>
<dt>Current Goroutine</dt>

2
ui/pages/admin/users/[id]/edit.vue
View File

@@ -20,7 +20,7 @@ const updateUser = async () => {
let body = {
username: username.value,
email: email.value,
password: password.value,
password: password.value as string || undefined,
plan_id: plan_id.value,
is_admin: is_admin.value === 'checked' ? true : false,
}

3
ui/pages/admin/users/index.vue
View File

@@ -33,8 +33,7 @@ const fetchNextPage = async () => {
</h4>
<NuxtLink to="/admin/users/new">
<button
class="transition-bg bg-pine/10 text-pine px-2 py-1.5 rounded-md hover:bg-pine/15 active:bg-pine/25 h-fit text-xs"
v-on:click="updateUser">
class="transition-bg bg-pine/10 text-pine px-2 py-1.5 rounded-md hover:bg-pine/15 active:bg-pine/25 h-fit text-xs">
Create User Account
</button>
</NuxtLink>

9
ui/pages/admin/users/new.vue
View File

@@ -1,4 +1,5 @@
<script setup lang="ts">
import type { NuxtError } from '#app';
import type { User } from '~/types/user';
definePageMeta({
@@ -12,7 +13,7 @@ let password = ref('')
let error = ref('')
let timeout;
let timeout: NodeJS.Timeout;
const submitForm = async () => {
let { data, error: fetchError } = await useAsyncData<User, NuxtError<{ message: string }>>(
() => $fetch('/api/admin/users/new', {
@@ -45,11 +46,11 @@ onUnmounted(() => {
</h4>
<div class="p-4">
<label for="username" class="block max-w-64 text-sm">Username</label>
<Input v-model="username" :value="username" id="username" placeholder="Username" class="w-full mb-2" />
<Input v-model="username" :value="username" id="username" placeholder="Username" autocomplete="off" class="w-full mb-2" />
<label for="email" class="block max-w-64 text-sm">Email</label>
<Input v-model="email" :value="email" id="email" placeholder="Email" class="w-full mb-2" />
<Input v-model="email" :value="email" id="email" placeholder="Email" autocomplete="off" class="w-full mb-2" />
<label for="password" class="block max-w-64 text-sm">Password</label>
<Input v-model="password" id="password" type="password" placeholder="Password" class="w-full mb-2" />
<Input v-model="password" :value="password" id="password" type="password" placeholder="Password" autocomplete="off" class="w-full mb-2" />
<p class="text-love mb-2">{{ error }}</p>
<div>
<button

2
ui/pages/login.vue
View File

@@ -12,7 +12,7 @@ let password = ref('')
let error = ref('')
let timeout;
let timeout: NodeJS.Timeout;
const submitForm = async () => {
let { data, error: fetchError } = await useAsyncData<User, NuxtError<{ message: string }>>(
() => $fetch('/api/login', {

2
ui/pages/signup.vue
View File

@@ -13,7 +13,7 @@ let password = ref('')
let error = ref('')
let timeout;
let timeout: NodeJS.Timeout;
const submitForm = async () => {
let { data, error: fetchError } = await useAsyncData<User, NuxtError<{ message: string }>>(
() => $fetch('/api/signup', {