diff --git a/back/main.py b/back/main.py index 9d8072c..1d279f0 100644 --- a/back/main.py +++ b/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)] ): @@ -205,7 +205,7 @@ def poems_to_front(): # db: Annotated[Session, Depends(utils.get_db)] rand_id = random.randint(1, kolvo_stixov) # номер стихотворения poem_json = dict() poem = database.query(models.Poems).filter(models.Poems.id == rand_id).first() - poem_json = {"title": poem.title, "text": poem.text, "author": poem.author} + poem_json = {"id": rand_id, "title": poem.title, "text": poem.text, "author": poem.author} return poem_json else: raise HTTPException(status_code=404, detail="Poems not found") @@ -256,4 +256,4 @@ def dispose(data: schemas.DisposeRequest, current_user_schema: Annotated[schemas database.add(new_trashox) database.commit() database.refresh(new_trashox) # обновляем состояние объекта - \ No newline at end of file + diff --git a/back/schemas.py b/back/schemas.py index cc113ff..768f4e2 100644 --- a/back/schemas.py +++ b/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 \ No newline at end of file + rate: int diff --git a/back/service.py b/back/service.py index dbd0972..9bdd1ed 100644 --- a/back/service.py +++ b/back/service.py @@ -29,8 +29,6 @@ def add_poems_to_db(db: Session): flag = True else: author += str1 - if(str1 != f"стих {a+1}\n"): - stixi+=str1#удаление /n и заключение в список poem = models.Poems(title=name, text=stixi, author=author) # В конце каждой итерации добавляем в базу данных db.add(poem) diff --git a/front/src/api/announcement/types.ts b/front/src/api/announcement/types.ts index 449fc6f..a00697c 100644 --- a/front/src/api/announcement/types.ts +++ b/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, - latitude: number, - description: string, + lng: number, + lat: number, + description: string | null, src: string | null, metro: string, trashId: number | null, - booked_by: number, + bookedBy: number, +} + +type AnnouncementResponse = Omit & { + 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, diff --git a/front/src/api/book/index.ts b/front/src/api/book/index.ts index 22fd424..3720de0 100644 --- a/front/src/api/book/index.ts +++ b/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 } diff --git a/front/src/api/dispose/types.ts b/front/src/api/dispose/types.ts index d16e857..4eedace 100644 --- a/front/src/api/dispose/types.ts +++ b/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 & { Category: string } +type TrashboxDispose = Omit & { Category: string } type DisposeParams = Parameters diff --git a/front/src/api/poetry/index.ts b/front/src/api/poetry/index.ts index 36e60b3..4133171 100644 --- a/front/src/api/poetry/index.ts +++ b/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 => { diff --git a/front/src/api/poetry/types.ts b/front/src/api/poetry/types.ts index d3855dc..8251d1b 100644 --- a/front/src/api/poetry/types.ts +++ b/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', }) ) diff --git a/front/src/api/trashbox/index.ts b/front/src/api/trashbox/index.ts index 311987a..7e45fa5 100644 --- a/front/src/api/trashbox/index.ts +++ b/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() ) diff --git a/front/src/api/user/index.ts b/front/src/api/user/index.ts index 9f489b4..322c690 100644 --- a/front/src/api/user/index.ts +++ b/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 = import.meta.env.DEV ? { // Temporary, until api is realized - id: Math.random() * 100, - 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 initialUser: User = { + id: -1, + nickname: '', + regDate: '', + points: -1, } 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 } diff --git a/front/src/api/user/types.ts b/front/src/api/user/types.ts index ba96548..bbbd4d2 100644 --- a/front/src/api/user/types.ts +++ b/front/src/api/user/types.ts @@ -2,30 +2,22 @@ import { isObject } from '../../utils/types' type User = { id: number, - name: string, - regDate: number, + nickname: string, + regDate: string, points: number, } -const isUser = (obj: unknown): obj is User => ( +type UserResponse = Omit & { reg_date: string } + +const isUserResponse = (obj: unknown): obj is UserResponse => ( isObject(obj, { 'id': 'number', - 'name': 'string', - 'regDate': 'number', + 'nickname': 'string', + '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 } diff --git a/front/src/assets/userCategories.ts b/front/src/assets/userCategories.ts index ae4b485..f98a907 100644 --- a/front/src/assets/userCategories.ts +++ b/front/src/assets/userCategories.ts @@ -16,18 +16,18 @@ const userCategoriesInfos: Record string> = `Годен до ${new Date(ann.bestBy).toLocaleDateString('ru')}` ), needDispose: (ann: Announcement) => ( - `Были заинтересованы: ${ann.bookedBy} чел.` + `Было заинтересно ${ann.bookedBy} чел.` ), } const composeUserCategoriesFilters: Record FiltersType> = { givingOut: () => ({ userId: getId(), - expired: false, + obsolete: false, }), needDispose: () => ({ userId: getId(), - expired: true, + obsolete: true, }), } diff --git a/front/src/components/AnnouncementDetails.tsx b/front/src/components/AnnouncementDetails.tsx index d691cac..dd7b805 100644 --- a/front/src/components/AnnouncementDetails.tsx +++ b/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' - -type AnnouncementDetailsProps = { - close: () => void, - refresh: () => void, - announcement: Announcement, -} +import StarRating from './StarRating' 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) => ( <>

{name}

@@ -42,7 +40,9 @@ const View = ({

{description}

- +

+ Рейтинг пользователя: +

-

Забронировали {bookedBy} чел.

+

Забронировали {bookedBy + (bookButton.disabled ? 1 : 0)} чел.

{(myId === userId) ? ( <> @@ -93,6 +93,12 @@ function Control({ ) } +type AnnouncementDetailsProps = { + close: () => void, + refresh: () => void, + announcement: Announcement, +} + function AnnouncementDetails({ close, refresh, diff --git a/front/src/components/Poetry.tsx b/front/src/components/Poetry.tsx index c8473cd..2bd23aa 100644 --- a/front/src/components/Poetry.tsx +++ b/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 = { - container: { - paddingBottom: 8, - } as CSSProperties, -} +import styles from '../styles/Poetry.module.css' function Poetry() { const poetry = usePoetry() return ( -
+

Поэзия

{ gotResponse(poetry) ? ( gotError(poetry) ? ( @@ -23,7 +18,13 @@ function Poetry() { ) : ( <>
{poetry.data.title}
-

+

{poetry.data.author}

) diff --git a/front/src/components/Rating.tsx b/front/src/components/Rating.tsx deleted file mode 100644 index 355f33f..0000000 --- a/front/src/components/Rating.tsx +++ /dev/null @@ -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 ( - - ) -} - -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 ( -

- Рейтинг пользователя:{' '} - {gotResponse(rating) ? ( - gotError(rating) ? ( - {rating.error} - ) : ( - setMyRate(0)} - > - {...Array(5).fill(5).map( - (_, i) => - setMyRate(i + 1)} - sendMyRate={() => void sendMyRate()} - /> - )} - - ) - ) : ( - Загрузка... - ) - } -

- - ) -} - -export default Rating diff --git a/front/src/components/SelectDisposalTrashbox.tsx b/front/src/components/SelectDisposalTrashbox.tsx index 1bf4405..dfa05f6 100644 --- a/front/src/components/SelectDisposalTrashbox.tsx +++ b/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, }) } }} diff --git a/front/src/components/StarRating.tsx b/front/src/components/StarRating.tsx new file mode 100644 index 0000000..3154f6f --- /dev/null +++ b/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 ( + // 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 ( + Загрузка... + ) + } + + if (gotError(rating)) { + return ( + {rating.error} + ) + } + + return ( + setMyRate(0)}> + {...Array(5).fill(5).map((_, i) => ( + dynamic && setMyRate(i + 1)} + sendMyRate={() => dynamic && void sendMyRate()} + disabled={!dynamic} + /> + ))} + + ) +} + +export default StarRating diff --git a/front/src/components/index.ts b/front/src/components/index.ts index b124f0c..312f3db 100644 --- a/front/src/components/index.ts +++ b/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' diff --git a/front/src/hooks/api/useDispose.ts b/front/src/hooks/api/useDispose.ts index 957e20b..cc20841 100644 --- a/front/src/hooks/api/useDispose.ts +++ b/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( 'Выбор сделан', 'Зачтено', diff --git a/front/src/hooks/api/usePoetry.ts b/front/src/hooks/api/usePoetry.ts index 6547f63..86aac07 100644 --- a/front/src/hooks/api/usePoetry.ts +++ b/front/src/hooks/api/usePoetry.ts @@ -1,122 +1,17 @@ -import { Poetry } from '../../api/poetry/types' -import { UseFetchReturn } from '../useFetch' +import { composePoetryURL, initialPoetry, processPoetry } from '../../api/poetry' +import { Poetry, isPoetryResponse } from '../../api/poetry/types' +import useFetch, { UseFetchReturn } from '../useFetch' -const testPoetry: Poetry = { - title: 'The Mouse\'s Tale', - text: `
"Fury said to
-
a mouse, That
-
he met
-
in the
-
house,
-
'Let us
-
both go
-
to law:
-
I will
-
prosecute
-
you.—
-
Come, I'll
-
take no
-
denial;
-
We must
-
have a
-
trial:
-
For
-
really
-
this
-
morning
-
I've
-
nothing
-
to do.'
-
Said the
-
mouse to
-
the cur,
-
'Such a
-
trial,
-
dear sir,
-
With no
-
jury or
-
judge,
-
would be
-
wasting
-
our breath.'
-
'I'll be
-
judge,
-
I'll be
-
jury,'
-
Said
-
cunning
-
old Fury;
-
'I'll try
-
the whole
-
cause,
-
and
-
condemn
-
you
-
to
-
death.' "
`, - author: 'Lewis Carroll', -} - -function usePoetry(): UseFetchReturn { - 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 }, - // } +const usePoetry = (): UseFetchReturn => ( + useFetch( + composePoetryURL(), + 'GET', + false, + isPoetryResponse, + processPoetry, + initialPoetry, ) -} +) + export default usePoetry diff --git a/front/src/hooks/api/useRemoveAnnouncement.ts b/front/src/hooks/api/useRemoveAnnouncement.ts index ed9a92a..b139d03 100644 --- a/front/src/hooks/api/useRemoveAnnouncement.ts +++ b/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( 'Закрыть объявление', 'Закрыто', diff --git a/front/src/hooks/api/useSendRate.ts b/front/src/hooks/api/useSendRate.ts index d3cfc03..f85dbe2 100644 --- a/front/src/hooks/api/useSendRate.ts +++ b/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', diff --git a/front/src/hooks/api/useTrashboxes.ts b/front/src/hooks/api/useTrashboxes.ts index 7e28027..bd2929a 100644 --- a/front/src/hooks/api/useTrashboxes.ts +++ b/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 { UseFetchReturn } from '../useFetch' +import { Trashbox, isTrashboxResponse } from '../../api/trashbox/types' +import useFetch, { UseFetchReturn } from '../useFetch' import { faker } from '@faker-js/faker/locale/ru' -import { Category, categories } from '../../assets/category' -import { useCallback, useMemo } from 'react' +import { Category } from '../../assets/category' +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 => ( - // useFetch( - // composeTrashboxURL(position, category), - // 'GET', - // true, - // isTrashboxResponse, - // processTrashbox, - // [], - // ) - - { + // TODO: Remove once available + // eslint-disable-next-line react-hooks/rules-of-hooks + import.meta.env.PROD ? useFetch( + composeTrashboxURL(position, category), + 'GET', + 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, diff --git a/front/src/hooks/api/useUser.ts b/front/src/hooks/api/useUser.ts index 758ba8f..ce55ab0 100644 --- a/front/src/hooks/api/useUser.ts +++ b/front/src/hooks/api/useUser.ts @@ -1,23 +1,16 @@ -import { initialUser } from '../../api/user' -import { User } from '../../api/user/types' -import { UseFetchReturn } from '../useFetch' +import { composeUserURL, initialUser, processUser } from '../../api/user' +import { User, isUserResponse } from '../../api/user/types' +import useFetch, { UseFetchReturn } from '../useFetch' const useUser = (): UseFetchReturn => ( - // useFetch( - // composeUserURL(), - // 'GET', - // true, - // isUserResponse, - // processUser, - // initialUser - // ) - - { - data: initialUser, - loading: false, - error: null, - refetch: () => { return }, - } + useFetch( + composeUserURL(), + 'GET', + true, + isUserResponse, + processUser, + initialUser + ) ) export default useUser diff --git a/front/src/hooks/api/useUserRating.ts b/front/src/hooks/api/useUserRating.ts index b14a5bf..4328675 100644 --- a/front/src/hooks/api/useUserRating.ts +++ b/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 => ( - // useFetch( - // composeUserRatingURL(userId), - // 'GET', - // false, - // isUserRatingResponse, - // processUserRating, - // initialUserRating - // ) - - { - data: 3, - loading: false, - error: null, - refetch: () => { return }, - } - - // { - // data: undefined, - // loading: true, - // error: null, - // refetch: () => { return }, - // } + useFetch( + composeUserRatingURL(userId), + 'GET', + false, + isUserRatingResponse, + processUserRating, + initialUserRating + ) ) export default useUserRating diff --git a/front/src/pages/UserPage.tsx b/front/src/pages/UserPage.tsx index f02bcc1..2ed6dba 100644 --- a/front/src/pages/UserPage.tsx +++ b/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 ( - + +
+
+ Ваша оценка: + +
+
+ {userCategories.map(cat => ( ))} diff --git a/front/src/styles/Poetry.module.css b/front/src/styles/Poetry.module.css new file mode 100644 index 0000000..a452425 --- /dev/null +++ b/front/src/styles/Poetry.module.css @@ -0,0 +1,7 @@ +.container { + padding-bottom: 8; +} + +.text { + white-space: 'pre-wrap'; +} \ No newline at end of file diff --git a/front/src/styles/Rating.module.css b/front/src/styles/StarRating.module.css similarity index 82% rename from front/src/styles/Rating.module.css rename to front/src/styles/StarRating.module.css index 48a57c7..a929f10 100644 --- a/front/src/styles/Rating.module.css +++ b/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; diff --git a/front/src/styles/UserPage.module.css b/front/src/styles/UserPage.module.css new file mode 100644 index 0000000..97dea46 --- /dev/null +++ b/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; +} \ No newline at end of file diff --git a/front/src/utils/dispose.ts b/front/src/utils/dispose.ts deleted file mode 100644 index 65a87ff..0000000 --- a/front/src/utils/dispose.ts +++ /dev/null @@ -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 } diff --git a/front/src/utils/filters.ts b/front/src/utils/filters.ts index bbad2e7..131f5de 100644 --- a/front/src/utils/filters.ts +++ b/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 & { - 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), } }