Merge branch 'main' of https://github.com/dm1sh/porridger_tmp

back/main.py

@@ -162,12 +162,12 @@ async def login_for_access_token(
     return {"access_token":access_token}
 
 
-@app.get("/api/users/me/", response_model=schemas.User) #
+@app.get("/api/users/me", response_model=schemas.User) #
 async def read_users_me(current_user: Annotated[schemas.User, Depends(utils.get_current_active_user)]):
     return current_user
 
 
-@app.get("/api/users/me/items/")
+@app.get("/api/users/me/items")
 async def read_own_items(
     current_user: Annotated[schemas.User, Depends(utils.get_current_active_user)]
 ):
@@ -253,4 +253,4 @@ def dispose(data: schemas.TrashboxResponse, current_user: Annotated[schemas.User
     database.add(new_trashox)
     database.commit()
     database.refresh(new_trashox)  # обновляем состояние объекта
-    
+    

back/schemas.py

@@ -58,8 +58,6 @@ class TokenData(BaseModel):
 class User(BaseModel):
     id: int
     nickname: str
-    name: Union[str, None] = None
-    surname: Union[str, None] = None
     reg_date: date
     disabled: Union[bool, None] = False
     items: list[Announcement] = []
@@ -102,4 +100,4 @@ class SortAnnouncements(BaseModel):
 # схема для начисления баллов
 class AddRating(BaseModel):
     user_id: int
-    rate: int
+    rate: int

front/src/api/announcement/types.ts

@@ -1,20 +1,28 @@
 import { isObject } from '../../utils/types'
 import { Category, isCategory } from '../../assets/category'
 
-type AnnouncementResponse = {
+type Announcement = {
     id: number,
-    user_id: number,
+    userId: number,
     name: string,
     category: Category,
-    best_by: string,
+    bestBy: string,
     address: string,
-    longtitude: number,
+    lng: number,
-    latitude: number,
+    lat: number,
-    description: string,
+    description: string | null,
     src: string | null,
     metro: string,
     trashId: number | null,
-    booked_by: number,
+    bookedBy: number,
+}
+
+type AnnouncementResponse = Omit<Announcement, 'userId' | 'bestBy' | 'bookedBy' | 'lat' | 'lng'> & {
+    user_id: Announcement['userId'],
+    best_by: Announcement['bestBy'],
+    longtitude: Announcement['lng'],
+    latitude: Announcement['lat'],
+    booked_by: Announcement['bookedBy'],
 }
 
 const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => (
@@ -35,22 +43,6 @@ const isAnnouncementResponse = (obj: unknown): obj is AnnouncementResponse => (
     })
 )
 
-type Announcement = {
-    id: number,
-    userId: number,
-    name: string,
-    category: Category,
-    bestBy: number,
-    address: string,
-    lng: number,
-    lat: number,
-    description: string | null,
-    src: string | null,
-    metro: string,
-    trashId: number | null,
-    bookedBy: number,
-}
-
 export type {
     Announcement,
     AnnouncementResponse,

front/src/api/book/index.ts

@@ -6,6 +6,10 @@ const composeBookURL = () => (
 )
 
 const processBook = (data: BookResponse): Book => {
+    if (!data.Success) {
+        throw new Error('Не удалось забронировать объявление')
+    }
+
     return data.Success
 }
 

front/src/api/dispose/types.ts

@@ -2,7 +2,7 @@ import { composeDisposeBody } from '.'
 import { isObject } from '../../utils/types'
 import { Trashbox } from '../trashbox/types'
 
-type TrashboxDispose = Omit<Trashbox, 'Categories' | 'Address'> & { Category: string }
+type TrashboxDispose = Omit<Trashbox, 'Categories'> & { Category: string }
 
 type DisposeParams = Parameters<typeof composeDisposeBody>
 

front/src/api/poetry/index.ts

@@ -5,10 +5,11 @@ const initialPoetry: Poetry = {
     title: '',
     text: '',
     author: '',
+    id: 0,
 }
 
 const composePoetryURL = () => (
-    API_URL + '/poetry?'
+    API_URL + '/user/poem?'
 )
 
 const processPoetry = (data: PoetryResponse): Poetry => {

front/src/api/poetry/types.ts

@@ -4,6 +4,7 @@ type PoetryResponse = {
     title: string,
     text: string,
     author: string,
+    id: number,
 }
 
 const isPoetryResponse = (obj: unknown): obj is PoetryResponse => (
@@ -11,6 +12,7 @@ const isPoetryResponse = (obj: unknown): obj is PoetryResponse => (
         'title': 'string',
         'text': 'string',
         'author': 'string',
+        'id': 'number',
     })
 )
 

front/src/api/trashbox/index.ts

@@ -2,11 +2,13 @@ import { LatLng } from 'leaflet'
 
 import { API_URL } from '../../config'
 import { Trashbox, TrashboxResponse } from './types'
+import { Category } from '../../assets/category'
 
-const composeTrashboxURL = (position: LatLng) => (
+const composeTrashboxURL = (position: LatLng, category: Category) => (
     API_URL + '/trashbox?' + new URLSearchParams({
         lat: position.lat.toString(),
         lng: position.lng.toString(),
+        category: category,
     }).toString()
 )
 

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/assets/userCategories.ts

@@ -16,18 +16,18 @@ const userCategoriesInfos: Record<UserCategory, (ann: Announcement) => string> =
         `Годен до ${new Date(ann.bestBy).toLocaleDateString('ru')}`
     ),
     needDispose: (ann: Announcement) => (
-        `Были заинтересованы: ${ann.bookedBy} чел.`
+        `Было заинтересно ${ann.bookedBy} чел.`
     ),
 }
 
 const composeUserCategoriesFilters: Record<UserCategory, () => FiltersType> = {
     givingOut: () => ({
         userId: getId(),
-        expired: false,
+        obsolete: false,
     }),
     needDispose: () => ({
         userId: getId(),
-        expired: true,
+        obsolete: true,
     }),
 }
 

front/src/components/AnnouncementDetails.tsx

@@ -4,19 +4,13 @@ import { CSSProperties, useState } from 'react'
 import { LatLng } from 'leaflet'
 
 import LineDot from './LineDot'
-import Rating from './Rating'
 import { categoryNames } from '../assets/category'
 import { useBook, useRemoveAnnouncement } from '../hooks/api'
 import { Announcement } from '../api/announcement/types'
 import { iconItem } from '../utils/markerIcons'
 import { useId } from '../hooks'
 import SelectDisposalTrashbox from './SelectDisposalTrashbox'
-
+import StarRating from './StarRating'
-type AnnouncementDetailsProps = {
-    close: () => void,
-    refresh: () => void,
-    announcement: Announcement,
-}
 
 const styles = {
     container: {
@@ -30,9 +24,13 @@ const styles = {
     } as CSSProperties,
 }
 
+type ViewProps = {
+    announcement: Announcement,
+}
+
 const View = ({
     announcement: { name, category, bestBy, description, lat, lng, address, metro, userId },
-}: { announcement: Announcement }) => (
+}: ViewProps) => (
     <>
         <h1>{name}</h1>
 
@@ -42,7 +40,9 @@ const View = ({
 
         <p className='mb-0'>{description}</p>
 
-        <Rating userId={userId} className='mb-3' />
+        <p className='mb-3'>
+            Рейтинг пользователя: <StarRating dynamic userId={userId} />
+        </p>
 
         <MapContainer style={styles.map} center={[lat, lng]} zoom={16} >
             <TileLayer
@@ -80,7 +80,7 @@ function Control({
 
     return (
         <>
-            <p>Забронировали {bookedBy} чел.</p>
+            <p>Забронировали {bookedBy + (bookButton.disabled ? 1 : 0)} чел.</p>
             {(myId === userId) ? (
                 <>
                     <Button variant='success' onClick={showDispose}>Утилизировать</Button>
@@ -93,6 +93,12 @@ function Control({
     )
 }
 
+type AnnouncementDetailsProps = {
+    close: () => void,
+    refresh: () => void,
+    announcement: Announcement,
+}
+
 function AnnouncementDetails({
     close,
     refresh,

front/src/components/Poetry.tsx

@@ -1,18 +1,13 @@
-import { CSSProperties } from 'react'
 import { usePoetry } from '../hooks/api'
 import { gotError, gotResponse } from '../hooks/useFetch'
 
-const styles = {
+import styles from '../styles/Poetry.module.css'
-    container: {
-        paddingBottom: 8,
-    } as CSSProperties,
-}
 
 function Poetry() {
     const poetry = usePoetry()
 
     return (
-        <div style={styles.container}>
+        <div className={styles.container}>
             <h4 className='fw-bold'>Поэзия</h4> {
                 gotResponse(poetry) ? (
                     gotError(poetry) ? (
@@ -23,7 +18,13 @@ function Poetry() {
                     ) : (
                         <>
                             <h5>{poetry.data.title}</h5>
-                            <p dangerouslySetInnerHTML={{ __html: poetry.data.text }} />
+                            <p
+                                className={styles.text}
+                                dangerouslySetInnerHTML={{
+                                    __html:
+                                        poetry.data.text.trim().replace(/(\n){3,}/g, '\n\n'),
+                                }}
+                            />
                             <p><em>{poetry.data.author}</em></p>
                         </>
                     )

front/src/components/Rating.tsx

@@ -1,78 +0,0 @@
-import { useState } from 'react'
-
-import { gotError, gotResponse } from '../hooks/useFetch'
-import { useUserRating, useSendRate } from '../hooks/api'
-
-import styles from '../styles/Rating.module.css'
-
-type StarProps = {
-    filled: boolean,
-    selected: boolean,
-    setMyRate: () => void,
-    sendMyRate: () => void,
-}
-
-function Star({ filled, selected, setMyRate, sendMyRate }: StarProps) {
-    return (
-        <button
-            className={`${styles.star} ${filled ? styles.starFilled : ''} ${selected ? styles.starSelected : ''}`}
-            onMouseEnter={setMyRate}
-            onFocus={setMyRate}
-            onClick={sendMyRate}
-        >&#9733;</button>
-    )
-}
-
-type RatingProps = {
-    userId: number,
-    className: string | undefined,
-}
-
-function Rating({ userId, className }: RatingProps) {
-    const rating = useUserRating(userId)
-
-    const [myRate, setMyRate] = useState(0)
-
-    const { doSendRate } = useSendRate()
-
-    async function sendMyRate() {
-        const res = await doSendRate(myRate)
-
-        if (res) {
-            rating.refetch()
-        }
-    }
-
-    return (
-        <p className={className}>
-            Рейтинг пользователя:{' '}
-            {gotResponse(rating) ? (
-                gotError(rating) ? (
-                    <span className='text-danger'>{rating.error}</span>
-                ) : (
-                    <span
-                        className={styles.starContainer}
-                        onMouseLeave={() => setMyRate(0)}
-                    >
-                        {...Array(5).fill(5).map(
-                            (_, i) =>
-                                <Star
-                                    key={i}
-                                    filled={i < rating.data}
-                                    selected={i < myRate}
-                                    setMyRate={() => setMyRate(i + 1)}
-                                    sendMyRate={() => void sendMyRate()}
-                                />
-                        )}
-                    </span>
-                )
-            ) : (
-                <span>Загрузка...</span>
-            )
-            }
-        </p>
-
-    )
-}
-
-export default Rating

front/src/components/SelectDisposalTrashbox.tsx

@@ -81,12 +81,13 @@ function SelectDisposalTrashbox({ annId, category, address, closeRefresh }: Sele
                     variant='success'
                     onClick={() => {
                         if (gotResponse(trashboxes) && !gotError(trashboxes)) {
-                            const { Lat, Lng, Name } = trashboxes.data[selectedTrashbox.index]
+                            const { Lat, Lng, Name, Address } = trashboxes.data[selectedTrashbox.index]
                             void handleDispose(annId, {
                                 Category: selectedTrashbox.category,
                                 Lat,
                                 Lng,
                                 Name,
+                                Address,
                             })
                         }
                     }}

front/src/components/StarRating.tsx

@@ -0,0 +1,77 @@
+import { useState } from 'react'
+
+import { useSendRate, useUserRating } from '../hooks/api'
+import { gotError, gotResponse } from '../hooks/useFetch'
+
+import styles from '../styles/StarRating.module.css'
+
+type StarProps = {
+    filled: boolean,
+    selected: boolean,
+    setMyRate?: () => void,
+    sendMyRate?: () => void,
+    disabled: boolean
+}
+
+function Star({ filled, selected, setMyRate, sendMyRate, disabled }: StarProps) {
+    return (
+        <button
+            className={`${styles.star} ${filled ? styles.starFilled : ''} ${selected ? styles.starSelected : ''}`}
+            onMouseEnter={setMyRate}
+            onFocus={setMyRate}
+            onClick={sendMyRate}
+            disabled={disabled}
+        >&#9733;</button> // star
+    )
+}
+
+type StarRatingProps = {
+    userId: number,
+    dynamic?: boolean,
+    style?: React.CSSProperties,
+}
+
+function StarRating({ userId, dynamic = false }: StarRatingProps) {
+    const rating = useUserRating(userId)
+
+    const [myRate, setMyRate] = useState(0)
+
+    const { doSendRate } = useSendRate()
+
+    async function sendMyRate() {
+        const res = await doSendRate(myRate, userId)
+
+        if (res) {
+            rating.refetch()
+        }
+    }
+
+    if (!gotResponse(rating)) {
+        return (
+            <span>Загрузка...</span>
+        )
+    }
+
+    if (gotError(rating)) {
+        return (
+            <span className='text-danger'>{rating.error}</span>
+        )
+    }
+
+    return (
+        <span className={styles.starContainer} onMouseLeave={() => setMyRate(0)}>
+            {...Array(5).fill(5).map((_, i) => (
+                <Star
+                    key={i}
+                    filled={i < Math.round(rating.data)}
+                    selected={i < myRate}
+                    setMyRate={() => dynamic && setMyRate(i + 1)}
+                    sendMyRate={() => dynamic && void sendMyRate()}
+                    disabled={!dynamic}
+                />
+            ))}
+        </span >
+    )
+}
+
+export default StarRating

front/src/components/index.ts

@@ -14,4 +14,4 @@ export { default as Points } from './Points'
 export { default as SignOut } from './SignOut'
 export { default as Poetry } from './Poetry'
 export { default as SelectDisposalTrashbox } from './SelectDisposalTrashbox'
-export { default as Rating } from './Rating'
+export { default as StarRating } from './StarRating'

front/src/hooks/api/useDispose.ts

@@ -4,7 +4,7 @@ import { useSendWithButton } from '..'
 import { composeDisposeBody, composeDisposeURL, processDispose } from '../../api/dispose'
 import { DisposeParams, isDisposeResponse } from '../../api/dispose/types'
 
-const useDispose = (resolve: () => void) => {
+function useDispose(resolve: () => void) {
     const { doSend, button } = useSendWithButton(
         'Выбор сделан',
         'Зачтено',

front/src/hooks/api/usePoetry.ts

@@ -1,122 +1,17 @@
-import { Poetry } from '../../api/poetry/types'
+import { composePoetryURL, initialPoetry, processPoetry } from '../../api/poetry'
-import { UseFetchReturn } from '../useFetch'
+import { Poetry, isPoetryResponse } from '../../api/poetry/types'
+import useFetch, { UseFetchReturn } from '../useFetch'
 
-const testPoetry: Poetry = {
+const usePoetry = (): UseFetchReturn<Poetry> => (
-    title: 'The Mouse\'s Tale',
+    useFetch(
-    text: `<div style="padding:0 60px"><div class="eleven" style="position:relative;left:-60px">"Fury said to</div>
+        composePoetryURL(),
-    <div class="ten" style="position:relative;left:-40px">a mouse, That</div>
+        'GET',
-    <div class="ten" style="position:relative;left:0px">he met</div>
+        false,
-    <div class="ten" style="position:relative;left:10px">in the</div>
+        isPoetryResponse,
-    <div class="ten" style="position:relative;left:20px">house,</div>
+        processPoetry,
-    <div class="ten" style="position:relative;left:17px">'Let us</div>
+        initialPoetry,
-    <div class="ten" style="position:relative;left:5px">both go</div>
-    <div class="ten" style="position:relative;left:-7px">to law:</div>
-    <div class="ten" style="position:relative;left:-23px"><i>I</i> will</div>
-    <div class="ten" style="position:relative;left:-26px">prosecute</div>
-    <div class="nine" style="position:relative;left:-40px"><i>you.</i>—</div>
-    <div class="nine" style="position:relative;left:-30px">Come, I'll</div>
-    <div class="nine" style="position:relative;left:-20px">take no</div>
-    <div class="nine" style="position:relative;left:-7px">denial;</div>
-    <div class="nine" style="position:relative;left:19px">We must</div>
-    <div class="nine" style="position:relative;left:45px">have a</div>
-    <div class="nine" style="position:relative;left:67px">trial:</div>
-    <div class="nine" style="position:relative;left:80px">For</div>
-    <div class="eight" style="position:relative;left:70px">really</div>
-    <div class="eight" style="position:relative;left:57px">this</div>
-    <div class="eight" style="position:relative;left:75px">morning</div>
-    <div class="eight" style="position:relative;left:95px">I've</div>
-    <div class="eight" style="position:relative;left:77px">nothing</div>
-    <div class="eight" style="position:relative;left:57px">to do.'</div>
-    <div class="seven" style="position:relative;left:38px">Said the</div>
-    <div class="seven" style="position:relative;left:30px">mouse to</div>
-    <div class="seven" style="position:relative;left:18px">the cur,</div>
-    <div class="seven" style="position:relative;left:22px">'Such a</div>
-    <div class="seven" style="position:relative;left:37px">trial,</div>
-    <div class="seven" style="position:relative;left:27px">dear sir,</div>
-    <div class="seven" style="position:relative;left:9px">With no</div>
-    <div class="seven" style="position:relative;left:-8px">jury or</div>
-    <div class="seven" style="position:relative;left:-18px">judge,</div>
-    <div class="seven" style="position:relative;left:-6px">would be</div>
-    <div class="seven" style="position:relative;left:7px">wasting</div>
-    <div class="seven" style="position:relative;left:25px">our breath.'</div>
-    <div class="six" style="position:relative;left:30px">'I'll be</div>
-    <div class="six" style="position:relative;left:24px">judge,</div>
-    <div class="six" style="position:relative;left:15px">I'll be</div>
-    <div class="six" style="position:relative;left:2px">jury,'</div>
-    <div class="six" style="position:relative;left:-4px">Said</div>
-    <div class="six" style="position:relative;left:17px">cunning</div>
-    <div class="six" style="position:relative;left:29px">old Fury;</div>
-    <div class="six" style="position:relative;left:37px">'I'll try</div>
-    <div class="six" style="position:relative;left:51px">the whole</div>
-    <div class="six" style="position:relative;left:70px">cause,</div>
-    <div class="six" style="position:relative;left:65px">and</div>
-    <div class="six" style="position:relative;left:60px">condemn</div>
-    <div class="six" style="position:relative;left:60px">you</div>
-    <div class="six" style="position:relative;left:68px">to</div>
-    <div class="six" style="position:relative;left:82px">death.' "</div><style>.eleven {
-        font-size: 105%;
-        margin: 0px;
-    }
-
-    .ten {
-        font-size: 100%;
-        margin: 0px;
-    }
-
-    .nine {
-        font-size: 90%;
-        margin: 0px;
-    }
-
-    .eight {
-        font-size: 80%;
-        margin: 0px;
-    }
-
-    .seven {
-        font-size: 70%;
-        margin: 0px;
-    }
-
-    .six {
-        font-size: 60%;
-        margin: 0px;
-    }</style></div>`,
-    author: 'Lewis Carroll',
-}
-
-function usePoetry(): UseFetchReturn<Poetry> {
-    return (
-        // useFetch(
-        //     composePoetryURL(),
-        //     'GET',
-        //     false,
-        //     isPoetryResponse,
-        //     processPoetry,
-        //     initialPoetry,
-        // )
-
-        {
-            data: testPoetry,
-            loading: false,
-            error: null,
-            refetch: () => { return },
-        }
-
-        // {
-        //     data: undefined,
-        //     loading: false,
-        //     error: 'хе-хе',
-        //     refetch: () => { return },
-        // }
-
-        // {
-        //     data: undefined,
-        //     loading: true,
-        //     error: null,
-        //     refetch: () => { return },
-        // }
     )
-}
+)
+
 
 export default usePoetry

front/src/hooks/api/useRemoveAnnouncement.ts

@@ -4,7 +4,7 @@ import { useSendWithButton } from '..'
 import { composeRemoveAnnouncementURL, processRemoveAnnouncement } from '../../api/removeAnnouncement'
 import { isRemoveAnnouncementResponse } from '../../api/removeAnnouncement/types'
 
-const useRemoveAnnouncement = (resolve: () => void) => {
+function useRemoveAnnouncement(resolve: () => void) {
     const { doSend, button } = useSendWithButton(
         'Закрыть объявление',
         'Закрыто',

front/src/hooks/api/useSendRate.ts

@@ -11,10 +11,11 @@ function useSendRate() {
         processSendRate,
     )
 
-    const doSendRate = (rate: number) => (
+    const doSendRate = (rate: number, user_id: number) => (
         doSend({}, {
             body: JSON.stringify({
                 rate,
+                user_id,
             }),
             headers: {
                 'Content-Type': 'application/json',

front/src/hooks/api/useTrashboxes.ts

@@ -1,12 +1,12 @@
 import { LatLng } from 'leaflet'
-import { sampleSize, random } from 'lodash'
 
-import { Trashbox } from '../../api/trashbox/types'
+import { Trashbox, isTrashboxResponse } from '../../api/trashbox/types'
-import { UseFetchReturn } from '../useFetch'
+import useFetch, { UseFetchReturn } from '../useFetch'
 
 import { faker } from '@faker-js/faker/locale/ru'
-import { Category, categories } from '../../assets/category'
+import { Category } from '../../assets/category'
-import { useCallback, useMemo } from 'react'
+import { useMemo } from 'react'
+import { composeTrashboxURL, processTrashbox } from '../../api/trashbox'
 
 function genMockTrashbox(pos: LatLng): Trashbox {
     const loc = faker.location.nearbyGPSCoordinate({ origin: [pos.lat, pos.lng], radius: 1 })
@@ -21,16 +21,17 @@ function genMockTrashbox(pos: LatLng): Trashbox {
 }
 
 const useTrashboxes = (position: LatLng, category: Category): UseFetchReturn<Trashbox[]> => (
-    // useFetch(
+    // TODO: Remove once available
-    //     composeTrashboxURL(position, category),
+    // eslint-disable-next-line react-hooks/rules-of-hooks
-    //     'GET',
+    import.meta.env.PROD ? useFetch(
-    //     true,
+        composeTrashboxURL(position, category),
-    //     isTrashboxResponse,
+        'GET',
-    //     processTrashbox,
+        true,
-    //     [],
+        isTrashboxResponse,
-    // )
+        processTrashbox,
-
+        [],
-    {
+    ) : {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
         data: useMemo(() => new Array(3).fill(3).map(() => genMockTrashbox(position)), [position]),
         loading: false,
         error: null,

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/hooks/api/useUserRating.ts

@@ -3,28 +3,14 @@ import { UserRating, isUserRatingResponse } from '../../api/userRating/types'
 import useFetch, { UseFetchReturn } from '../useFetch'
 
 const useUserRating = (userId: number): UseFetchReturn<UserRating> => (
-    // useFetch(
+    useFetch(
-    //     composeUserRatingURL(userId),
+        composeUserRatingURL(userId),
-    //     'GET',
+        'GET',
-    //     false,
+        false,
-    //     isUserRatingResponse,
+        isUserRatingResponse,
-    //     processUserRating,
+        processUserRating,
-    //     initialUserRating
+        initialUserRating
-    // )
+    )
-
-    {
-        data: 3,
-        loading: false,
-        error: null,
-        refetch: () => { return },
-    }
-
-    // {
-    //     data: undefined,
-    //     loading: true,
-    //     error: null,
-    //     refetch: () => { return },
-    // }
 )
 
 export default useUserRating

front/src/pages/UserPage.tsx

@@ -2,20 +2,22 @@ import { Container } from 'react-bootstrap'
 
 import { useUser } from '../hooks/api'
 import { userCategories } from '../assets/userCategories'
-import { BackHeader, CategoryPreview, Poetry, Points, SignOut } from '../components'
+import { BackHeader, CategoryPreview, Poetry, Points, SignOut, StarRating } 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}`
                     )
                 ) : (
                     'Загрузка...'
@@ -32,6 +34,13 @@ function UserPage() {
                 )
             } />
 
+            <div>
+                <h5 className={styles.userRating}>
+                    Ваша оценка:
+                    <StarRating userId={user.data?.id || 1} />
+                </h5>
+            </div>
+
             {userCategories.map(cat => (
                 <CategoryPreview key={cat} category={cat} />
             ))}

front/src/styles/Poetry.module.css

@@ -0,0 +1,7 @@
+.container {
+    padding-bottom: 8;
+}
+
+.text {
+    white-space: 'pre-wrap';
+}

front/src/styles/StarRating.module.css

@@ -1,7 +1,11 @@
+.starContainer {
+    white-space: nowrap;
+}
+
 .star {
     -webkit-text-stroke: 2px var(--bs-body-color);
     font-size: 1.5rem;
-    color: var(--bs-modal-bg);
+    color: var(--bs-body-bg);
     background: none;
     border: none;
     padding: 0 3px;

front/src/styles/UserPage.module.css

@@ -0,0 +1,10 @@
+.userRating {
+    display: flex;
+    align-items: flex-end;
+    justify-content: space-between;
+    flex-wrap: wrap;
+}
+
+.sixteenXnine {
+    max-width: calc(100vh * 9/16) !important;
+}

front/src/utils/dispose.ts

@@ -1,9 +0,0 @@
-import { Announcement } from '../api/announcement/types'
-
-const DAY_MS = 24 * 60 * 60 * 1000
-
-const isAnnExpired = (ann: Announcement) => (
-    (ann.bestBy - Date.now()) < DAY_MS
-)
-
-export { isAnnExpired }

front/src/utils/filters.ts

@@ -2,17 +2,17 @@ import { Announcement } from '../api/announcement/types'
 import { isCategory } from '../assets/category'
 import { fallbackToUndefined, isBoolean, isInt } from './types'
 
-const filterNames = ['userId', 'category', 'metro', 'expired'] as const
+const filterNames = ['userId', 'category', 'metro', 'obsolete'] as const
 type FilterNames = typeof filterNames[number]
 
 type FiltersType = Partial<
     Pick<Announcement, FilterNames & keyof Announcement> &
     {
-        expired: boolean,
+        obsolete: boolean,
     }
 >
 
-const defaultFilters: FiltersType = { userId: undefined, category: undefined, metro: undefined, expired: false }
+const defaultFilters: FiltersType = { userId: undefined, category: undefined, metro: undefined, obsolete: false }
 
 const URLEncodeFilters = (filters: FiltersType) => (
     Object.fromEntries(
@@ -39,7 +39,7 @@ const URLDecoreFilters = (params: URLSearchParams): FiltersType => {
         userId: fallbackToUndefined(Number.parseInt(strFilters['userId']), isInt),
         category: fallbackToUndefined(strFilters['category'], isCategory),
         metro: strFilters['metro'],
-        expired: fallbackToUndefined(strFilters['expired'] === 'true', isBoolean),
+        obsolete: fallbackToUndefined(strFilters['obsolete'] === 'true', isBoolean),
     }
 }