Updated user to use latest api

front/src/api/user/index.ts

@@ -1,19 +1,11 @@
 import { API_URL } from '../../config'
 import { UserResponse, User } from './types'
 
-import { faker } from '@faker-js/faker/locale/ru'
+const initialUser: User = {
-
+    id: -1,
-
+    nickname: '',
-const initialUser: User = import.meta.env.DEV ? { // Temporary, until api is realized
+    regDate: '',
-    id: Math.random() * 100,
+    points: -1,
-    name: faker.person.firstName() + ' ' + faker.person.lastName(),
-    regDate: faker.date.anytime().getTime(),
-    points: Math.round(Math.random() * 1000),
-} : {
-    id: 1,
-    name: 'Вася пупкин',
-    regDate: 0,
-    points: 100,
 }
 
 const composeUserURL = () => (
@@ -21,7 +13,10 @@ const composeUserURL = () => (
 )
 
 const processUser = (data: UserResponse): User => {
-    return data
+    return {
+        ...data,
+        regDate: data.reg_date,
+    }
 }
 
 export { initialUser, composeUserURL, processUser }

front/src/api/user/types.ts

@@ -2,30 +2,22 @@ import { isObject } from '../../utils/types'
 
 type User = {
     id: number,
-    name: string,
+    nickname: string,
-    regDate: number,
+    regDate: string,
     points: number,
 }
 
-const isUser = (obj: unknown): obj is User => (
+type UserResponse = Omit<User, 'regDate'> & { reg_date: string }
+
+const isUserResponse = (obj: unknown): obj is UserResponse => (
     isObject(obj, {
         'id': 'number',
-        'name': 'string',
+        'nickname': 'string',
-        'regDate': 'number',
+        'reg_date': 'string',
         'points': 'number',
     })
 )
 
-type UserResponse = User
-
-// const isUserResponse = (obj: unknown): obj is UserResponse => (
-//     isObject(obj, {
-
-//     })
-// )
-
-const isUserResponse = isUser
-
 export type { UserResponse, User }
 
-export { isUserResponse, isUser }
+export { isUserResponse }

front/src/hooks/api/useUser.ts

@@ -1,23 +1,16 @@
-import { initialUser } from '../../api/user'
+import { composeUserURL, initialUser, processUser } from '../../api/user'
-import { User } from '../../api/user/types'
+import { User, isUserResponse } from '../../api/user/types'
-import { UseFetchReturn } from '../useFetch'
+import useFetch, { UseFetchReturn } from '../useFetch'
 
 const useUser = (): UseFetchReturn<User> => (
-    // useFetch(
+    useFetch(
-    //     composeUserURL(),
+        composeUserURL(),
-    //     'GET',
+        'GET',
-    //     true,
+        true,
-    //     isUserResponse,
+        isUserResponse,
-    //     processUser,
+        processUser,
-    //     initialUser
+        initialUser
-    // )
+    )
-
-    {
-        data: initialUser,
-        loading: false,
-        error: null,
-        refetch: () => { return },
-    }
 )
 
 export default useUser

front/src/pages/UserPage.tsx

@@ -5,17 +5,19 @@ import { userCategories } from '../assets/userCategories'
 import { BackHeader, CategoryPreview, Poetry, Points, SignOut } from '../components'
 import { gotError, gotResponse } from '../hooks/useFetch'
 
+import styles from '../styles/UserPage.module.css'
+
 function UserPage() {
     const user = useUser()
 
     return (
-        <Container style={{ maxWidth: 'calc(100vh*9/16)' }}>
+        <Container className={styles.sixteenXnine}>
             <BackHeader text={
                 gotResponse(user) ? (
                     gotError(user) ? (
                         user.error
                     ) : (
-                        `${user.data.name}, с нами с ${new Date(user.data.regDate).toLocaleDateString('ru')}`
+                        `${user.data.nickname}, с нами с ${user.data.regDate}`
                     )
                 ) : (
                     'Загрузка...'

front/src/styles/UserPage.module.css

@@ -0,0 +1,3 @@
+.sixteenXnine {
+    max-width: calc(100vh * 9/16) !important;
+}