polka_billy/porridger
1
0
Fork 1
Code Issues 20 Pull Requests Packages Releases Activity

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

Browse Source
This commit is contained in:
MatManSky 2023-08-12 12:42:52 +03:00
commit 480644c1e9
16 changed files with 177 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
back/api.py
View File

@ -191,17 +191,14 @@ def add_points(user_id: int, db: Annotated[Session, Depends(utils.get_db)]):
# Отправляем стихи
@app.get("/api/user/poem") # пока не работает
@app.get("/api/user/poem", response_model=schemas.Poem) # пока не работает
def poems_to_front(db: Annotated[Session, Depends(utils.get_db)]): # db: Annotated[Session, Depends(utils.get_db)]
kolvo_stixov = db.query(models.Poems).count() # пока количество стихотворений = 101
if kolvo_stixov > 1:
rand_id = random.randint(1, kolvo_stixov) # номер стихотворения
poem_json = dict()
poem = db.query(models.Poems).filter(models.Poems.id == rand_id).first()
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")
num_of_poems = db.query(models.Poems).count() # определяем кол-во стихов в бд
rand_id = random.randint(1, num_of_poems) # генерируем номер стихотворения
poem = db.query(models.Poems).filter(models.Poems.id == rand_id).first() # находим стих в бд
if not poem:
raise HTTPException(status_code=404, detail="Poem not found")
return poem
@app.get("/api/trashbox", response_model=List[schemas.TrashboxResponse])

5
back/schemas.py
View File

@ -48,6 +48,7 @@ class User(BaseModel):
reg_date: date
disabled: Union[bool, None] = False
items: list[Announcement] = []
points: int
class Config:
orm_mode = True
@ -57,10 +58,14 @@ class UserInDB(User):
hashed_password: str
class Poem(BaseModel):
id: int
title: str
text: str
author: str
class Config:
orm_mode = True
# Для "/api/trashbox"
class TrashboxBase(BaseModel):
Lat: float

19
back/service.py
View File

@ -42,26 +42,9 @@ def add_poems_to_db(db: Session):
db.refresh(poem)
# close the file
f1.close()
def generate_poem(db: Session):
# генерируем 1 случайное id и выбираем объект бд с этим id
rand_id = random.randint(1, 102)
poem = db.query(models.Poems).filter(models.Poems.id == rand_id).first()
# возвращаем название и текст стихотворения
return {"name": poem.title, "text": poem.poem_text, "author":""} # добавить поле author в Poems
#Вова тестирует получение поэм, Димоны, помогите пж
# def poems_to_front(db: Annotated[Session, Depends(utils.get_db)]):
# kolvo_stixov = 109 # пока количество стихотворений = 101
# 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}
# return poem_json
def get_query_results(schema: schemas.SortAnnouncements, db: Annotated[Session, Depends(utils.get_db)]):
def filter_ann(schema: schemas.SortAnnouncements, db: Annotated[Session, Depends(utils.get_db)]):
"""Функция для последовательного применения различных фильтров (через схему SortAnnouncements)"""
res = db.query(models.Announcement)
fields = schema.__dict__ # параметры передоваемой схемы SortAnnouncements (ключи и значения)

2
back/utils.py
View File

@ -88,7 +88,7 @@ async def get_current_user(db: Annotated[Session, Depends(get_db)], token: Annot
if user is None:
raise credentials_exception
return schemas.User(id=user.id, nickname=user.nickname, name=user.name, surname=user.surname,
disabled=user.disabled, items=user.announcements, reg_date=user.reg_date)
disabled=user.disabled, items=user.announcements, reg_date=user.reg_date, points=user.points)
async def get_current_active_user(

6
front/src/api/trashbox/index.ts
View File

@ -6,9 +6,9 @@ import { Category } from '../../assets/category'
const composeTrashboxURL = (position: LatLng, category: Category) => (
API_URL + '/trashbox?' + new URLSearchParams({
lat: position.lat.toString(),
lng: position.lng.toString(),
category: category,
Lat: position.lat.toString(),
Lng: position.lng.toString(),
Category: category,
}).toString()
)

2
front/src/components/LineDot.tsx
View File

@ -3,7 +3,7 @@ import { colors, lineNames, lineByName } from '../assets/metro'
function LineDot({ station }: { station: string }) {
const line = lineByName(station)
if (line == undefined) {
if (line === undefined) {
return <></>
}

2
front/src/components/Poetry.tsx
View File

@ -26,7 +26,7 @@ function Poetry() {
}}
/>
<p><em>{poetry.data.author}</em></p>
<img src={`/poem_pic/${poetry.data.id}`} alt='Иллюстрация' />
<img src={`/poem_pic/${poetry.data.id}.jpg`} alt='Иллюстрация' />
</>
)
) : (

119
front/src/components/StoriesPreview.tsx
View File

@ -1,5 +1,5 @@
import { Link } from 'react-router-dom'
import { CSSProperties, useEffect, useMemo, useRef, useState } from 'react'
import { useEffect, useLayoutEffect, useRef, useState } from 'react'
import { Button } from 'react-bootstrap'
import { UserCategory, composeUserCategoriesFilters, userCategoriesInfos } from '../assets/userCategories'
@ -9,64 +9,37 @@ import { URLEncodeFilters } from '../utils/filters'
import rightAngleIcon from '../assets/rightAngle.svg'
import styles from '../styles/StoriesPreview.module.css'
type StoriesPreviewProps = {
announcements: Announcement[],
category: UserCategory,
}
const styles = {
container: {
transform: 'translateX(0)',
} as CSSProperties,
ul: {
display: 'flex',
gap: 10,
listStyleType: 'none',
overflow: 'scroll',
paddingLeft: 0,
scrollBehavior: 'smooth',
} as CSSProperties,
link: {
textDecoration: 'none',
color: 'var(--bs-body-color)',
maxWidth: 'calc(25vh * 9 / 16)',
display: 'inline-block',
} as CSSProperties,
image: {
height: '25vh',
objectFit: 'contain',
borderRadius: 12,
marginBottom: 5,
maxWidth: 'inherit',
} as CSSProperties,
title: {
overflow: 'hidden',
textOverflow: 'ellipsis',
marginBottom: 5,
} as CSSProperties,
scrollButton: {
position: 'fixed',
right: 0,
top: 0,
zIndex: 100,
background: 'linear-gradient(to right, rgba(17, 17, 17, 0) 0%, rgba(17, 17, 17, 255) 100%)',
display: 'block',
height: '100%',
width: '10%',
border: 'none',
cursor: 'default',
borderRadius: 0,
} as CSSProperties,
leftScrollButton: {
left: 0,
transform: 'scaleX(-1)',
} as CSSProperties,
rightScrollButton: {
right: 0,
} as CSSProperties,
}
const StoriesPreview = ({ announcements, category }: StoriesPreviewProps) => (
announcements.map((ann, i) => (
<li key={`${category}${i}`}>
<Link to={'/?' + new URLSearchParams({
...URLEncodeFilters(composeUserCategoriesFilters[category]()),
storyIndex: i.toString(),
}).toString()} className={styles.link}>
{ann.src?.endsWith('mp4') ? (
<video src={ann.src} className={styles.image} />
) : (
<img
src={ann.src || categoryGraphics[ann.category]}
alt={'Изображение' + (ann.src ? 'предмета' : categoryNames[ann.category])}
className={styles.image}
/>
)}
<p className={styles.title}>{ann.name}</p>
<p className={styles.title}>{userCategoriesInfos[category](ann)}</p>
</Link>
</li>
))
)
function StoriesPreview({ announcements, category }: StoriesPreviewProps) {
function StoriesPreviewCarousel({ announcements, category }: StoriesPreviewProps) {
const ulElement = useRef<HTMLUListElement | null>(null)
const [showScrollButtons, setShowScrollButtons] = useState({ left: false, right: false })
@ -90,7 +63,7 @@ function StoriesPreview({ announcements, category }: StoriesPreviewProps) {
}
}, [])
useEffect(() => {
useLayoutEffect(() => {
const ul = ulElement.current
if (ul) {
@ -106,40 +79,26 @@ function StoriesPreview({ announcements, category }: StoriesPreviewProps) {
}
}
return <div style={styles.container}>
return <div className={styles.container}>
{showScrollButtons.left &&
<Button onClick={doScroll(false)} style={{ ...styles.scrollButton, ...styles.leftScrollButton }}>
<Button onClick={doScroll(false)} className={`${styles.scrollButton} ${styles.leftScrollButton}`}>
<img src={rightAngleIcon} alt='Показать ещё' />
</Button>
}
<ul style={styles.ul} className='StoriesPreview_ul' ref={ulElement}>
{useMemo(() => announcements.map((ann, i) => (
<li key={`${category}${i}`}>
<Link to={'/?' + new URLSearchParams({
...URLEncodeFilters(composeUserCategoriesFilters[category]()),
storyIndex: i.toString(),
}).toString()} style={styles.link}>
{ann.src?.endsWith('mp4') ? (
<video src={ann.src} style={styles.image} />
) : (
<img
src={ann.src || categoryGraphics[ann.category]}
alt={'Изображение' + (ann.src ? 'предмета' : categoryNames[ann.category])}
style={styles.image}
/>
)}
<p style={styles.title}>{ann.name}</p>
<p style={styles.title}>{userCategoriesInfos[category](ann)}</p>
</Link>
</li>
)), [announcements, category])}
</ul>
{announcements.length > 0 ? (
<ul className={styles.list} ref={ulElement}>
<StoriesPreview announcements={announcements} category={category} />
</ul>
) : (
<p>Здесь пока пусто</p>
)}
{showScrollButtons.right &&
<Button onClick={doScroll(true)} style={{ ...styles.scrollButton, ...styles.rightScrollButton }}>
<Button onClick={doScroll(true)} className={`${styles.scrollButton} ${styles.rightScrollButton}`}>
<img src={rightAngleIcon} alt='Показать ещё' />
</Button>
}
</div>
}
export default StoriesPreview
export default StoriesPreviewCarousel

2
front/src/hooks/api/useSignIn.ts
View File

@ -20,7 +20,7 @@ function useSignIn() {
body: formData,
})
if (token !== undefined) {
if (token !== null && token !== undefined) {
setToken(token)
return true

24
front/src/hooks/api/useTrashboxes.ts
View File

@ -3,40 +3,20 @@ import { LatLng } from 'leaflet'
import { Trashbox, isTrashboxResponse } from '../../api/trashbox/types'
import useFetch, { UseFetchReturn } from '../useFetch'
import { faker } from '@faker-js/faker/locale/ru'
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 })
return {
Name: faker.company.name(),
Address: faker.location.streetAddress(),
Categories: faker.lorem.words({ max: 3, min: 1 }).split(' '),
Lat: loc[0],
Lng: loc[1],
}
}
const useTrashboxes = (position: LatLng, category: Category): UseFetchReturn<Trashbox[]> => (
// TODO: Remove once available
// eslint-disable-next-line react-hooks/rules-of-hooks
import.meta.env.PROD ? useFetch(
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,
refetch: () => { return },
}
)
)
export default useTrashboxes

16
front/src/hooks/useFetch.ts
View File

@ -20,7 +20,7 @@ type UseFetchLoading = {
} & UseFetchShared
type UseFetchErrored = {
data: undefined,
data: null,
loading: false,
error: string,
} & UseFetchShared
@ -32,8 +32,7 @@ const gotError = <T>(res: UseFetchReturn<T>): res is UseFetchErrored => (
)
function fallbackError<T>(res: UseFetchSucced<T> | UseFetchErrored): T | string
function fallbackError<T>(res: UseFetchReturn<T>): T | string | undefined
function fallbackError<T>(res: UseFetchReturn<T>): T | string | undefined {
function fallbackError<T>(res: UseFetchReturn<T>): T | string | null | undefined {
return (
gotError(res) ? res.error : res.data
)
@ -62,7 +61,6 @@ function useFetch<R, T extends NonNullable<unknown>>(
needAuth,
guardResponse,
processResponse,
true,
params,
)
@ -70,10 +68,14 @@ function useFetch<R, T extends NonNullable<unknown>>(
setFetchLoading(true)
doSend().then(
data => {
if (data !== undefined) {
if (data !== undefined && data !== null) {
setData(data)
console.log('Got data', data)
}
if (data !== undefined) {
setFetchLoading(false)
}
setFetchLoading(false)
}
).catch( // must never occur
err => import.meta.env.DEV && console.error('Failed to do fetch request', err)
@ -93,7 +95,7 @@ function useFetch<R, T extends NonNullable<unknown>>(
if (error !== null) {
return {
data: undefined,
data: null,
loading: fetchLoading,
error,
refetch,

49
front/src/hooks/useSend.ts
View File

@ -2,7 +2,7 @@ import { useCallback, useEffect, useRef, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { getToken } from '../utils/auth'
import { handleHTTPErrors, isAborted } from '../utils'
import { AbortError, handleHTTPErrors, isAborted } from '../utils'
function useSend<R, T extends NonNullable<unknown>>(
url: string,
@ -10,17 +10,19 @@ function useSend<R, T extends NonNullable<unknown>>(
needAuth: boolean,
guardResponse: (data: unknown) => data is R,
processResponse: (data: R) => T,
startWithLoading = false,
defaultParams?: Omit<RequestInit, 'method'>,
) {
const [loading, setLoading] = useState(startWithLoading)
const [loading, setLoading] = useState(false)
const [error, setError] = useState<string | null>(null)
const navigate = useNavigate()
const abortControllerRef = useRef<AbortController>()
useEffect(() => () => abortControllerRef.current?.abort(), [])
useEffect(() => () => {
const reason = new AbortError('unmount')
abortControllerRef.current?.abort(reason)
}, [])
/** Don't use in useEffect. If you need request result, go with useFetch instead */
const doSend = useCallback(async (urlProps?: Record<string, string>, params?: Omit<RequestInit, 'method'>) => {
@ -28,7 +30,8 @@ function useSend<R, T extends NonNullable<unknown>>(
setError(null)
if (abortControllerRef.current) {
abortControllerRef.current.abort()
const reason = new AbortError('resent')
abortControllerRef.current.abort(reason)
}
const abortController = new AbortController()
@ -45,7 +48,7 @@ function useSend<R, T extends NonNullable<unknown>>(
if (token === null) {
navigate('/login')
return undefined
return null
}
headers.append('Authorization', `Bearer ${token}`)
@ -73,21 +76,33 @@ function useSend<R, T extends NonNullable<unknown>>(
return processResponse(data)
} catch (err) {
if (err instanceof Error && !isAborted(err)) {
if (err instanceof TypeError) {
setError('Ошибка сети')
} else {
setError(err.message)
}
if (err instanceof Error) {
if (isAborted<T>(err)) {
if (err.message !== 'resent') {
setLoading(false)
}
if (import.meta.env.DEV) {
console.error(url, params, err)
if (err.fallback !== undefined) {
return err.fallback
}
return undefined
} else {
if (err instanceof TypeError) {
setError('Ошибка сети')
} else {
setError(err.message)
}
if (import.meta.env.DEV) {
console.error(url, params, err)
}
setLoading(false)
}
}
setLoading(false)
return undefined
return null
}
}, [defaultParams, needAuth, navigate, url, method, guardResponse, processResponse])

4
front/src/hooks/useSendButtonCaption.ts
View File

@ -11,8 +11,8 @@ function useSendButtonCaption(
const [disabled, setDisabled] = useState(false)
const [title, setTitle] = useState(initial)
const update = useCallback(<T extends NonNullable<unknown>>(data: T | undefined) => {
if (data !== undefined) {
const update = useCallback(<T extends NonNullable<unknown>>(data: T | null | undefined) => {
if (data !== undefined) { // not loading
setCaption(result)
setTitle('Отправить ещё раз')

56
front/src/styles/StoriesPreview.module.css Normal file
View File

@ -0,0 +1,56 @@
.container {
transform: translateX(0);
}
.list {
display: flex;
gap: 10px;
list-style-type: none;
overflow: scroll;
padding-left: 0;
scroll-behavior: smooth;
}
.link {
text-decoration: none;
color: var(--bs-body-color);
max-width: calc(25vh * 9 / 16);
display: inline-block;
}
.image {
height: 25vh;
object-fit: contain;
border-radius: 12px;
margin-bottom: 5px;
max-width: inherit;
}
.title {
overflow: hidden;
text-overflow: ellipsis;
margin-bottom: 5px;
}
.scrollButton {
position: fixed;
right: 0;
top: 0;
z-index: 100;
background: linear-gradient(to right, rgba(17, 17, 17, 0) 0%, rgba(17, 17, 17, 255) 100%);
display: block;
height: 100%;
width: 10%;
border: none;
cursor: default;
border-radius: 0;
}
.leftScrollButton {
left: 0;
transform: scaleX(-1);
}
.rightScrollButton {
right: 0;
}

18
front/src/utils/index.ts
View File

@ -1,7 +1,21 @@
const isAborted = (err: Error) => (
const isAborted = <T>(err: Error): err is AbortError<T> => (
err.name === 'AbortError'
)
type AbortErrorMessage = 'resent' | 'unmount' | 'cancel'
class AbortError<T> extends DOMException {
readonly fallback: T | undefined
message: AbortErrorMessage
constructor(message: AbortErrorMessage, fallback?: T) {
super(message, 'AbortError')
this.message = message
this.fallback = fallback
}
}
function handleHTTPErrors(res: Response) {
if (!res.ok) {
switch (res.status) {
@ -16,4 +30,4 @@ function handleHTTPErrors(res: Response) {
}
}
export { isAborted, handleHTTPErrors }
export { isAborted, AbortError, handleHTTPErrors }

2
package-lock.json generated
View File

@ -1,5 +1,5 @@
{
"name": "porridger",
"name": "porridger_tmp",
"lockfileVersion": 3,
"requires": true,
"packages": {}