♻️ Regenerate frontend client (#1156)
This commit is contained in:
@@ -22,7 +22,7 @@ export type ItemCreate = {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
export type ItemOut = {
|
export type ItemPublic = {
|
||||||
title: string;
|
title: string;
|
||||||
description?: string | null;
|
description?: string | null;
|
||||||
id: number;
|
id: number;
|
||||||
@@ -38,8 +38,8 @@ export type ItemUpdate = {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
export type ItemsOut = {
|
export type ItemsPublic = {
|
||||||
data: Array<ItemOut>;
|
data: Array<ItemPublic>;
|
||||||
count: number;
|
count: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -82,7 +82,7 @@ export type UserCreate = {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
export type UserOut = {
|
export type UserPublic = {
|
||||||
email: string;
|
email: string;
|
||||||
is_active?: boolean;
|
is_active?: boolean;
|
||||||
is_superuser?: boolean;
|
is_superuser?: boolean;
|
||||||
@@ -117,8 +117,8 @@ export type UserUpdateMe = {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
export type UsersOut = {
|
export type UsersPublic = {
|
||||||
data: Array<UserOut>;
|
data: Array<UserPublic>;
|
||||||
count: number;
|
count: number;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -68,7 +68,7 @@ export const $ItemCreate = {
|
|||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const $ItemOut = {
|
export const $ItemPublic = {
|
||||||
properties: {
|
properties: {
|
||||||
title: {
|
title: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
@@ -114,12 +114,12 @@ export const $ItemUpdate = {
|
|||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const $ItemsOut = {
|
export const $ItemsPublic = {
|
||||||
properties: {
|
properties: {
|
||||||
data: {
|
data: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
contains: {
|
contains: {
|
||||||
type: 'ItemOut',
|
type: 'ItemPublic',
|
||||||
},
|
},
|
||||||
isRequired: true,
|
isRequired: true,
|
||||||
},
|
},
|
||||||
@@ -207,7 +207,7 @@ export const $UserCreate = {
|
|||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const $UserOut = {
|
export const $UserPublic = {
|
||||||
properties: {
|
properties: {
|
||||||
email: {
|
email: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
@@ -315,12 +315,12 @@ export const $UserUpdateMe = {
|
|||||||
},
|
},
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
export const $UsersOut = {
|
export const $UsersPublic = {
|
||||||
properties: {
|
properties: {
|
||||||
data: {
|
data: {
|
||||||
type: 'array',
|
type: 'array',
|
||||||
contains: {
|
contains: {
|
||||||
type: 'UserOut',
|
type: 'UserPublic',
|
||||||
},
|
},
|
||||||
isRequired: true,
|
isRequired: true,
|
||||||
},
|
},
|
||||||
|
@@ -2,7 +2,7 @@ import type { CancelablePromise } from './core/CancelablePromise';
|
|||||||
import { OpenAPI } from './core/OpenAPI';
|
import { OpenAPI } from './core/OpenAPI';
|
||||||
import { request as __request } from './core/request';
|
import { request as __request } from './core/request';
|
||||||
|
|
||||||
import type { Body_login_login_access_token,Message,NewPassword,Token,UserOut,UpdatePassword,UserCreate,UserRegister,UsersOut,UserUpdate,UserUpdateMe,ItemCreate,ItemOut,ItemsOut,ItemUpdate } from './models';
|
import type { Body_login_login_access_token,Message,NewPassword,Token,UserPublic,UpdatePassword,UserCreate,UserRegister,UsersPublic,UserUpdate,UserUpdateMe,ItemCreate,ItemPublic,ItemsPublic,ItemUpdate } from './models';
|
||||||
|
|
||||||
export type TDataLoginAccessToken = {
|
export type TDataLoginAccessToken = {
|
||||||
formData: Body_login_login_access_token
|
formData: Body_login_login_access_token
|
||||||
@@ -47,10 +47,10 @@ formData,
|
|||||||
/**
|
/**
|
||||||
* Test Token
|
* Test Token
|
||||||
* Test access token
|
* Test access token
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static testToken(): CancelablePromise<UserOut> {
|
public static testToken(): CancelablePromise<UserPublic> {
|
||||||
return __request(OpenAPI, {
|
return __request(OpenAPI, {
|
||||||
method: 'POST',
|
method: 'POST',
|
||||||
url: '/api/v1/login/test-token',
|
url: '/api/v1/login/test-token',
|
||||||
@@ -164,10 +164,10 @@ export class UsersService {
|
|||||||
/**
|
/**
|
||||||
* Read Users
|
* Read Users
|
||||||
* Retrieve users.
|
* Retrieve users.
|
||||||
* @returns UsersOut Successful Response
|
* @returns UsersPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static readUsers(data: TDataReadUsers = {}): CancelablePromise<UsersOut> {
|
public static readUsers(data: TDataReadUsers = {}): CancelablePromise<UsersPublic> {
|
||||||
const {
|
const {
|
||||||
limit = 100,
|
limit = 100,
|
||||||
skip = 0,
|
skip = 0,
|
||||||
@@ -187,10 +187,10 @@ skip = 0,
|
|||||||
/**
|
/**
|
||||||
* Create User
|
* Create User
|
||||||
* Create new user.
|
* Create new user.
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static createUser(data: TDataCreateUser): CancelablePromise<UserOut> {
|
public static createUser(data: TDataCreateUser): CancelablePromise<UserPublic> {
|
||||||
const {
|
const {
|
||||||
requestBody,
|
requestBody,
|
||||||
} = data;
|
} = data;
|
||||||
@@ -208,10 +208,10 @@ requestBody,
|
|||||||
/**
|
/**
|
||||||
* Read User Me
|
* Read User Me
|
||||||
* Get current user.
|
* Get current user.
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static readUserMe(): CancelablePromise<UserOut> {
|
public static readUserMe(): CancelablePromise<UserPublic> {
|
||||||
return __request(OpenAPI, {
|
return __request(OpenAPI, {
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
url: '/api/v1/users/me',
|
url: '/api/v1/users/me',
|
||||||
@@ -221,10 +221,10 @@ requestBody,
|
|||||||
/**
|
/**
|
||||||
* Update User Me
|
* Update User Me
|
||||||
* Update own user.
|
* Update own user.
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static updateUserMe(data: TDataUpdateUserMe): CancelablePromise<UserOut> {
|
public static updateUserMe(data: TDataUpdateUserMe): CancelablePromise<UserPublic> {
|
||||||
const {
|
const {
|
||||||
requestBody,
|
requestBody,
|
||||||
} = data;
|
} = data;
|
||||||
@@ -263,10 +263,10 @@ requestBody,
|
|||||||
/**
|
/**
|
||||||
* Register User
|
* Register User
|
||||||
* Create new user without the need to be logged in.
|
* Create new user without the need to be logged in.
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static registerUser(data: TDataRegisterUser): CancelablePromise<UserOut> {
|
public static registerUser(data: TDataRegisterUser): CancelablePromise<UserPublic> {
|
||||||
const {
|
const {
|
||||||
requestBody,
|
requestBody,
|
||||||
} = data;
|
} = data;
|
||||||
@@ -284,10 +284,10 @@ requestBody,
|
|||||||
/**
|
/**
|
||||||
* Read User By Id
|
* Read User By Id
|
||||||
* Get a specific user by id.
|
* Get a specific user by id.
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static readUserById(data: TDataReadUserById): CancelablePromise<UserOut> {
|
public static readUserById(data: TDataReadUserById): CancelablePromise<UserPublic> {
|
||||||
const {
|
const {
|
||||||
userId,
|
userId,
|
||||||
} = data;
|
} = data;
|
||||||
@@ -306,10 +306,10 @@ userId,
|
|||||||
/**
|
/**
|
||||||
* Update User
|
* Update User
|
||||||
* Update a user.
|
* Update a user.
|
||||||
* @returns UserOut Successful Response
|
* @returns UserPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static updateUser(data: TDataUpdateUser): CancelablePromise<UserOut> {
|
public static updateUser(data: TDataUpdateUser): CancelablePromise<UserPublic> {
|
||||||
const {
|
const {
|
||||||
requestBody,
|
requestBody,
|
||||||
userId,
|
userId,
|
||||||
@@ -411,10 +411,10 @@ export class ItemsService {
|
|||||||
/**
|
/**
|
||||||
* Read Items
|
* Read Items
|
||||||
* Retrieve items.
|
* Retrieve items.
|
||||||
* @returns ItemsOut Successful Response
|
* @returns ItemsPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static readItems(data: TDataReadItems = {}): CancelablePromise<ItemsOut> {
|
public static readItems(data: TDataReadItems = {}): CancelablePromise<ItemsPublic> {
|
||||||
const {
|
const {
|
||||||
limit = 100,
|
limit = 100,
|
||||||
skip = 0,
|
skip = 0,
|
||||||
@@ -434,10 +434,10 @@ skip = 0,
|
|||||||
/**
|
/**
|
||||||
* Create Item
|
* Create Item
|
||||||
* Create new item.
|
* Create new item.
|
||||||
* @returns ItemOut Successful Response
|
* @returns ItemPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static createItem(data: TDataCreateItem): CancelablePromise<ItemOut> {
|
public static createItem(data: TDataCreateItem): CancelablePromise<ItemPublic> {
|
||||||
const {
|
const {
|
||||||
requestBody,
|
requestBody,
|
||||||
} = data;
|
} = data;
|
||||||
@@ -455,10 +455,10 @@ requestBody,
|
|||||||
/**
|
/**
|
||||||
* Read Item
|
* Read Item
|
||||||
* Get item by ID.
|
* Get item by ID.
|
||||||
* @returns ItemOut Successful Response
|
* @returns ItemPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static readItem(data: TDataReadItem): CancelablePromise<ItemOut> {
|
public static readItem(data: TDataReadItem): CancelablePromise<ItemPublic> {
|
||||||
const {
|
const {
|
||||||
id,
|
id,
|
||||||
} = data;
|
} = data;
|
||||||
@@ -477,10 +477,10 @@ id,
|
|||||||
/**
|
/**
|
||||||
* Update Item
|
* Update Item
|
||||||
* Update an item.
|
* Update an item.
|
||||||
* @returns ItemOut Successful Response
|
* @returns ItemPublic Successful Response
|
||||||
* @throws ApiError
|
* @throws ApiError
|
||||||
*/
|
*/
|
||||||
public static updateItem(data: TDataUpdateItem): CancelablePromise<ItemOut> {
|
public static updateItem(data: TDataUpdateItem): CancelablePromise<ItemPublic> {
|
||||||
const {
|
const {
|
||||||
id,
|
id,
|
||||||
requestBody,
|
requestBody,
|
||||||
|
@@ -19,7 +19,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
type ApiError,
|
type ApiError,
|
||||||
type UserOut,
|
type UserPublic,
|
||||||
type UserUpdate,
|
type UserUpdate,
|
||||||
UsersService,
|
UsersService,
|
||||||
} from "../../client"
|
} from "../../client"
|
||||||
@@ -27,7 +27,7 @@ import useCustomToast from "../../hooks/useCustomToast"
|
|||||||
import { emailPattern } from "../../utils"
|
import { emailPattern } from "../../utils"
|
||||||
|
|
||||||
interface EditUserProps {
|
interface EditUserProps {
|
||||||
user: UserOut
|
user: UserPublic
|
||||||
isOpen: boolean
|
isOpen: boolean
|
||||||
onClose: () => void
|
onClose: () => void
|
||||||
}
|
}
|
||||||
|
@@ -9,14 +9,14 @@ import {
|
|||||||
import { BsThreeDotsVertical } from "react-icons/bs"
|
import { BsThreeDotsVertical } from "react-icons/bs"
|
||||||
import { FiEdit, FiTrash } from "react-icons/fi"
|
import { FiEdit, FiTrash } from "react-icons/fi"
|
||||||
|
|
||||||
import type { ItemOut, UserOut } from "../../client"
|
import type { ItemPublic, UserPublic } from "../../client"
|
||||||
import EditUser from "../Admin/EditUser"
|
import EditUser from "../Admin/EditUser"
|
||||||
import EditItem from "../Items/EditItem"
|
import EditItem from "../Items/EditItem"
|
||||||
import Delete from "./DeleteAlert"
|
import Delete from "./DeleteAlert"
|
||||||
|
|
||||||
interface ActionsMenuProps {
|
interface ActionsMenuProps {
|
||||||
type: string
|
type: string
|
||||||
value: ItemOut | UserOut
|
value: ItemPublic | UserPublic
|
||||||
disabled?: boolean
|
disabled?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -50,13 +50,13 @@ const ActionsMenu = ({ type, value, disabled }: ActionsMenuProps) => {
|
|||||||
</MenuList>
|
</MenuList>
|
||||||
{type === "User" ? (
|
{type === "User" ? (
|
||||||
<EditUser
|
<EditUser
|
||||||
user={value as UserOut}
|
user={value as UserPublic}
|
||||||
isOpen={editUserModal.isOpen}
|
isOpen={editUserModal.isOpen}
|
||||||
onClose={editUserModal.onClose}
|
onClose={editUserModal.onClose}
|
||||||
/>
|
/>
|
||||||
) : (
|
) : (
|
||||||
<EditItem
|
<EditItem
|
||||||
item={value as ItemOut}
|
item={value as ItemPublic}
|
||||||
isOpen={editUserModal.isOpen}
|
isOpen={editUserModal.isOpen}
|
||||||
onClose={editUserModal.onClose}
|
onClose={editUserModal.onClose}
|
||||||
/>
|
/>
|
||||||
|
@@ -16,7 +16,7 @@ import { FiLogOut, FiMenu } from "react-icons/fi"
|
|||||||
import { useQueryClient } from "@tanstack/react-query"
|
import { useQueryClient } from "@tanstack/react-query"
|
||||||
|
|
||||||
import Logo from "../../assets/images/fastapi-logo.svg"
|
import Logo from "../../assets/images/fastapi-logo.svg"
|
||||||
import type { UserOut } from "../../client"
|
import type { UserPublic } from "../../client"
|
||||||
import useAuth from "../../hooks/useAuth"
|
import useAuth from "../../hooks/useAuth"
|
||||||
import SidebarItems from "./SidebarItems"
|
import SidebarItems from "./SidebarItems"
|
||||||
|
|
||||||
@@ -25,7 +25,7 @@ const Sidebar = () => {
|
|||||||
const bgColor = useColorModeValue("ui.light", "ui.dark")
|
const bgColor = useColorModeValue("ui.light", "ui.dark")
|
||||||
const textColor = useColorModeValue("ui.dark", "ui.light")
|
const textColor = useColorModeValue("ui.dark", "ui.light")
|
||||||
const secBgColor = useColorModeValue("ui.secondary", "ui.darkSlate")
|
const secBgColor = useColorModeValue("ui.secondary", "ui.darkSlate")
|
||||||
const currentUser = queryClient.getQueryData<UserOut>(["currentUser"])
|
const currentUser = queryClient.getQueryData<UserPublic>(["currentUser"])
|
||||||
const { isOpen, onOpen, onClose } = useDisclosure()
|
const { isOpen, onOpen, onClose } = useDisclosure()
|
||||||
const { logout } = useAuth()
|
const { logout } = useAuth()
|
||||||
|
|
||||||
|
@@ -3,7 +3,7 @@ import { Link } from "@tanstack/react-router"
|
|||||||
import { FiBriefcase, FiHome, FiSettings, FiUsers } from "react-icons/fi"
|
import { FiBriefcase, FiHome, FiSettings, FiUsers } from "react-icons/fi"
|
||||||
import { useQueryClient } from "@tanstack/react-query"
|
import { useQueryClient } from "@tanstack/react-query"
|
||||||
|
|
||||||
import type { UserOut } from "../../client"
|
import type { UserPublic } from "../../client"
|
||||||
|
|
||||||
const items = [
|
const items = [
|
||||||
{ icon: FiHome, title: "Dashboard", path: "/" },
|
{ icon: FiHome, title: "Dashboard", path: "/" },
|
||||||
@@ -19,7 +19,7 @@ const SidebarItems = ({ onClose }: SidebarItemsProps) => {
|
|||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
const textColor = useColorModeValue("ui.main", "ui.light")
|
const textColor = useColorModeValue("ui.main", "ui.light")
|
||||||
const bgActive = useColorModeValue("#E2E8F0", "#4A5568")
|
const bgActive = useColorModeValue("#E2E8F0", "#4A5568")
|
||||||
const currentUser = queryClient.getQueryData<UserOut>(["currentUser"])
|
const currentUser = queryClient.getQueryData<UserPublic>(["currentUser"])
|
||||||
|
|
||||||
const finalItems = currentUser?.is_superuser
|
const finalItems = currentUser?.is_superuser
|
||||||
? [...items, { icon: FiUsers, title: "Admin", path: "/admin" }]
|
? [...items, { icon: FiUsers, title: "Admin", path: "/admin" }]
|
||||||
|
@@ -17,14 +17,14 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
type ApiError,
|
type ApiError,
|
||||||
type ItemOut,
|
type ItemPublic,
|
||||||
type ItemUpdate,
|
type ItemUpdate,
|
||||||
ItemsService,
|
ItemsService,
|
||||||
} from "../../client"
|
} from "../../client"
|
||||||
import useCustomToast from "../../hooks/useCustomToast"
|
import useCustomToast from "../../hooks/useCustomToast"
|
||||||
|
|
||||||
interface EditItemProps {
|
interface EditItemProps {
|
||||||
item: ItemOut
|
item: ItemPublic
|
||||||
isOpen: boolean
|
isOpen: boolean
|
||||||
onClose: () => void
|
onClose: () => void
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,7 @@ import React from "react"
|
|||||||
import { useForm } from "react-hook-form"
|
import { useForm } from "react-hook-form"
|
||||||
import { useMutation, useQueryClient } from "@tanstack/react-query"
|
import { useMutation, useQueryClient } from "@tanstack/react-query"
|
||||||
|
|
||||||
import { type ApiError, type UserOut, UsersService } from "../../client"
|
import { type ApiError, type UserPublic, UsersService } from "../../client"
|
||||||
import useAuth from "../../hooks/useAuth"
|
import useAuth from "../../hooks/useAuth"
|
||||||
import useCustomToast from "../../hooks/useCustomToast"
|
import useCustomToast from "../../hooks/useCustomToast"
|
||||||
|
|
||||||
@@ -28,7 +28,7 @@ const DeleteConfirmation = ({ isOpen, onClose }: DeleteProps) => {
|
|||||||
handleSubmit,
|
handleSubmit,
|
||||||
formState: { isSubmitting },
|
formState: { isSubmitting },
|
||||||
} = useForm()
|
} = useForm()
|
||||||
const currentUser = queryClient.getQueryData<UserOut>(["currentUser"])
|
const currentUser = queryClient.getQueryData<UserPublic>(["currentUser"])
|
||||||
const { logout } = useAuth()
|
const { logout } = useAuth()
|
||||||
|
|
||||||
const mutation = useMutation({
|
const mutation = useMutation({
|
||||||
|
@@ -17,7 +17,7 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"
|
|||||||
|
|
||||||
import {
|
import {
|
||||||
type ApiError,
|
type ApiError,
|
||||||
type UserOut,
|
type UserPublic,
|
||||||
type UserUpdateMe,
|
type UserUpdateMe,
|
||||||
UsersService,
|
UsersService,
|
||||||
} from "../../client"
|
} from "../../client"
|
||||||
@@ -37,7 +37,7 @@ const UserInformation = () => {
|
|||||||
reset,
|
reset,
|
||||||
getValues,
|
getValues,
|
||||||
formState: { isSubmitting, errors, isDirty },
|
formState: { isSubmitting, errors, isDirty },
|
||||||
} = useForm<UserOut>({
|
} = useForm<UserPublic>({
|
||||||
mode: "onBlur",
|
mode: "onBlur",
|
||||||
criteriaMode: "all",
|
criteriaMode: "all",
|
||||||
defaultValues: {
|
defaultValues: {
|
||||||
|
@@ -6,7 +6,7 @@ import {
|
|||||||
type Body_login_login_access_token as AccessToken,
|
type Body_login_login_access_token as AccessToken,
|
||||||
type ApiError,
|
type ApiError,
|
||||||
LoginService,
|
LoginService,
|
||||||
type UserOut,
|
type UserPublic,
|
||||||
UsersService,
|
UsersService,
|
||||||
} from "../client"
|
} from "../client"
|
||||||
|
|
||||||
@@ -17,7 +17,7 @@ const isLoggedIn = () => {
|
|||||||
const useAuth = () => {
|
const useAuth = () => {
|
||||||
const [error, setError] = useState<string | null>(null)
|
const [error, setError] = useState<string | null>(null)
|
||||||
const navigate = useNavigate()
|
const navigate = useNavigate()
|
||||||
const { data: user, isLoading } = useQuery<UserOut | null, Error>({
|
const { data: user, isLoading } = useQuery<UserPublic | null, Error>({
|
||||||
queryKey: ["currentUser"],
|
queryKey: ["currentUser"],
|
||||||
queryFn: UsersService.readUserMe,
|
queryFn: UsersService.readUserMe,
|
||||||
enabled: isLoggedIn(),
|
enabled: isLoggedIn(),
|
||||||
|
@@ -16,7 +16,7 @@ import {
|
|||||||
import { createFileRoute } from "@tanstack/react-router"
|
import { createFileRoute } from "@tanstack/react-router"
|
||||||
import { useQuery, useQueryClient } from "@tanstack/react-query"
|
import { useQuery, useQueryClient } from "@tanstack/react-query"
|
||||||
|
|
||||||
import { type UserOut, UsersService } from "../../client"
|
import { type UserPublic, UsersService } from "../../client"
|
||||||
import ActionsMenu from "../../components/Common/ActionsMenu"
|
import ActionsMenu from "../../components/Common/ActionsMenu"
|
||||||
import Navbar from "../../components/Common/Navbar"
|
import Navbar from "../../components/Common/Navbar"
|
||||||
import useCustomToast from "../../hooks/useCustomToast"
|
import useCustomToast from "../../hooks/useCustomToast"
|
||||||
@@ -28,7 +28,7 @@ export const Route = createFileRoute("/_layout/admin")({
|
|||||||
function Admin() {
|
function Admin() {
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
const showToast = useCustomToast()
|
const showToast = useCustomToast()
|
||||||
const currentUser = queryClient.getQueryData<UserOut>(["currentUser"])
|
const currentUser = queryClient.getQueryData<UserPublic>(["currentUser"])
|
||||||
const {
|
const {
|
||||||
data: users,
|
data: users,
|
||||||
isLoading,
|
isLoading,
|
||||||
|
@@ -2,7 +2,7 @@ import { Box, Container, Text } from "@chakra-ui/react"
|
|||||||
import { createFileRoute } from "@tanstack/react-router"
|
import { createFileRoute } from "@tanstack/react-router"
|
||||||
import { useQueryClient } from "@tanstack/react-query"
|
import { useQueryClient } from "@tanstack/react-query"
|
||||||
|
|
||||||
import type { UserOut } from "../../client"
|
import type { UserPublic } from "../../client"
|
||||||
|
|
||||||
export const Route = createFileRoute("/_layout/")({
|
export const Route = createFileRoute("/_layout/")({
|
||||||
component: Dashboard,
|
component: Dashboard,
|
||||||
@@ -11,7 +11,7 @@ export const Route = createFileRoute("/_layout/")({
|
|||||||
function Dashboard() {
|
function Dashboard() {
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
|
|
||||||
const currentUser = queryClient.getQueryData<UserOut>(["currentUser"])
|
const currentUser = queryClient.getQueryData<UserPublic>(["currentUser"])
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
@@ -10,7 +10,7 @@ import {
|
|||||||
import { createFileRoute } from "@tanstack/react-router"
|
import { createFileRoute } from "@tanstack/react-router"
|
||||||
import { useQueryClient } from "@tanstack/react-query"
|
import { useQueryClient } from "@tanstack/react-query"
|
||||||
|
|
||||||
import type { UserOut } from "../../client"
|
import type { UserPublic } from "../../client"
|
||||||
import Appearance from "../../components/UserSettings/Appearance"
|
import Appearance from "../../components/UserSettings/Appearance"
|
||||||
import ChangePassword from "../../components/UserSettings/ChangePassword"
|
import ChangePassword from "../../components/UserSettings/ChangePassword"
|
||||||
import DeleteAccount from "../../components/UserSettings/DeleteAccount"
|
import DeleteAccount from "../../components/UserSettings/DeleteAccount"
|
||||||
@@ -29,7 +29,7 @@ export const Route = createFileRoute("/_layout/settings")({
|
|||||||
|
|
||||||
function UserSettings() {
|
function UserSettings() {
|
||||||
const queryClient = useQueryClient()
|
const queryClient = useQueryClient()
|
||||||
const currentUser = queryClient.getQueryData<UserOut>(["currentUser"])
|
const currentUser = queryClient.getQueryData<UserPublic>(["currentUser"])
|
||||||
const finalTabs = currentUser?.is_superuser
|
const finalTabs = currentUser?.is_superuser
|
||||||
? tabsConfig.slice(0, 3)
|
? tabsConfig.slice(0, 3)
|
||||||
: tabsConfig
|
: tabsConfig
|
||||||
|
Reference in New Issue
Block a user