From 9a31c2d1007a57dd12c57f273180c4078f2e7918 Mon Sep 17 00:00:00 2001 From: MerlinScheurer Date: Thu, 13 Feb 2025 20:51:14 +0100 Subject: [PATCH] Refac move UserAccountType into loadUserAccount.ts --- frontend/src/api/loader/loadUserAccount.ts | 11 ++++++++++- frontend/src/pages/Base.tsx | 13 ++----------- frontend/src/stores/UserAccountStore.ts | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frontend/src/api/loader/loadUserAccount.ts b/frontend/src/api/loader/loadUserAccount.ts index e04fb330..bc452cc2 100644 --- a/frontend/src/api/loader/loadUserAccount.ts +++ b/frontend/src/api/loader/loadUserAccount.ts @@ -1,5 +1,14 @@ import APIClient from '../../functions/APIClient'; -import { UserAccountType } from '../../pages/Base'; + +export type UserAccountType = { + id: number; + name: string; + is_superuser: boolean; + is_staff: boolean; + groups: []; + user_permissions: []; + last_login: string; +}; const loadUserAccount = async (): Promise => { return APIClient('/api/user/account/'); diff --git a/frontend/src/pages/Base.tsx b/frontend/src/pages/Base.tsx index aab8204c..cb304805 100644 --- a/frontend/src/pages/Base.tsx +++ b/frontend/src/pages/Base.tsx @@ -7,8 +7,9 @@ import Navigation from '../components/Navigation'; import { useAuthStore } from '../stores/AuthDataStore'; import { useUserConfigStore } from '../stores/UserConfigStore'; import { useUserAccountStore } from '../stores/UserAccountStore'; +import { UserAccountType } from '../api/loader/loadUserAccount'; -export type TaUpdateType = { +type TaUpdateType = { version?: string; is_breaking?: boolean; }; @@ -20,16 +21,6 @@ export type AuthenticationType = { ta_update: TaUpdateType; }; -export type UserAccountType = { - id: number; - name: string; - is_superuser: boolean; - is_staff: boolean; - groups: []; - user_permissions: []; - last_login: string; -}; - type BaseLoaderData = { userConfig: UserConfigType; userAccount: UserAccountType; diff --git a/frontend/src/stores/UserAccountStore.ts b/frontend/src/stores/UserAccountStore.ts index 4ed312ee..8f014fce 100644 --- a/frontend/src/stores/UserAccountStore.ts +++ b/frontend/src/stores/UserAccountStore.ts @@ -1,5 +1,5 @@ import { create } from 'zustand'; -import { UserAccountType } from '../pages/Base'; +import { UserAccountType } from '../api/loader/loadUserAccount'; interface AccountState { userAccount: UserAccountType | null;