antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2026-03-01 12:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into antontranelis-patch-1

Browse Source
This commit is contained in:
Anton Tranelis 2025-02-20 11:04:45 +00:00 committed by GitHub
commit 3d8890db37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
24 changed files with 103 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

145
package-lock.json generated
View File

@ -1,22 +1,20 @@
{
"name": "utopia-ui",
"version": "3.0.59",
"version": "3.0.60",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "utopia-ui",
"version": "3.0.59",
"version": "3.0.60",
"license": "GPL-3.0-only",
"dependencies": {
"@heroicons/react": "^2.0.17",
"@tanstack/react-query": "^5.17.8",
"@types/offscreencanvas": "^2019.7.1",
"axios": "^1.6.5",
"date-fns": "^3.3.1",
"leaflet": "^1.9.4",
"leaflet.locatecontrol": "^0.79.0",
"prop-types": "^15.8.1",
"radash": "^12.1.0",
"react-colorful": "^5.6.1",
"react-image-crop": "^10.1.8",
@ -25,7 +23,6 @@
"react-markdown": "^9.0.1",
"react-photo-album": "^3.0.2",
"react-router-dom": "^6.16.0",
"react-string-replace": "^1.1.1",
"react-toastify": "^9.1.3",
"remark-breaks": "^4.0.0",
"tw-elements": "^1.0.0",
@ -56,6 +53,7 @@
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-no-catch-all": "^1.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^6.1.1",
@ -64,7 +62,6 @@
"eslint-plugin-react-refresh": "^0.4.18",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-yml": "^1.14.0",
"globals": "^15.14.0",
"happy-dom": "^16.8.1",
"postcss": "^8.4.21",
"prettier": "^3.3.3",
@ -1005,35 +1002,6 @@
"url": "https://opencollective.com/eslint"
}
},
"node_modules/@eslint/eslintrc/node_modules/globals": {
"version": "13.24.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"type-fest": "^0.20.2"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/@eslint/eslintrc/node_modules/type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/@eslint/js": {
"version": "8.57.1",
"resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
@ -2030,12 +1998,6 @@
"undici-types": "~6.20.0"
}
},
"node_modules/@types/offscreencanvas": {
"version": "2019.7.3",
"resolved": "https://registry.npmjs.org/@types/offscreencanvas/-/offscreencanvas-2019.7.3.tgz",
"integrity": "sha512-ieXiYmgSRXUDeOntE1InxjWyvEelZGP63M+cGuquuRLuIKKT1osnkXjxev9B7d1nXSug5vpunx+gNlbVxMlC9A==",
"license": "MIT"
},
"node_modules/@types/prop-types": {
"version": "15.7.14",
"resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.14.tgz",
@ -3163,7 +3125,6 @@
"integrity": "sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==",
"dev": true,
"license": "MIT",
"peer": true,
"engines": {
"node": ">=6"
},
@ -3177,7 +3138,6 @@
"integrity": "sha512-SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"semver": "^7.0.0"
}
@ -4696,7 +4656,6 @@
"integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"semver": "^7.5.4"
},
@ -4845,7 +4804,6 @@
"https://opencollective.com/eslint"
],
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.1.2",
"@eslint-community/regexpp": "^4.11.0",
@ -4945,7 +4903,6 @@
"integrity": "sha512-6TyDmZ1HXoFQXnhCTUjVFULReoBPOAjpuiKELMkeP40yffI/1ZRO+d9ug/VC6fqISo2WkuIBk3cvuRPALaWlOQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"@eslint-community/eslint-utils": "^4.4.0",
"builtins": "^5.0.1",
@ -4969,37 +4926,6 @@
"eslint": ">=7.0.0"
}
},
"node_modules/eslint-plugin-n/node_modules/globals": {
"version": "13.24.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"type-fest": "^0.20.2"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/eslint-plugin-n/node_modules/type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"peer": true,
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/eslint-plugin-no-catch-all": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/eslint-plugin-no-catch-all/-/eslint-plugin-no-catch-all-1.1.0.tgz",
@ -5263,35 +5189,6 @@
"url": "https://opencollective.com/eslint"
}
},
"node_modules/eslint/node_modules/globals": {
"version": "13.24.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"type-fest": "^0.20.2"
},
"engines": {
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/eslint/node_modules/type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/espree": {
"version": "9.6.1",
"resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
@ -6013,13 +5910,29 @@
}
},
"node_modules/globals": {
"version": "15.15.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
"integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
"version": "13.24.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
"integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
"dev": true,
"license": "MIT",
"dependencies": {
"type-fest": "^0.20.2"
},
"engines": {
"node": ">=18"
"node": ">=8"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/globals/node_modules/type-fest": {
"version": "0.20.2",
"resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
"integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
"dev": true,
"license": "(MIT OR CC0-1.0)",
"engines": {
"node": ">=10"
},
"funding": {
"url": "https://github.com/sponsors/sindresorhus"
@ -6563,7 +6476,6 @@
"integrity": "sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==",
"dev": true,
"license": "MIT",
"peer": true,
"dependencies": {
"builtin-modules": "^3.3.0"
},
@ -9788,6 +9700,7 @@
"version": "15.8.1",
"resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
"integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
"dev": true,
"license": "MIT",
"dependencies": {
"loose-envify": "^1.4.0",
@ -9799,6 +9712,7 @@
"version": "16.13.1",
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
"dev": true,
"license": "MIT"
},
"node_modules/property-information": {
@ -10072,15 +9986,6 @@
"react-dom": ">=16.8"
}
},
"node_modules/react-string-replace": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/react-string-replace/-/react-string-replace-1.1.1.tgz",
"integrity": "sha512-26TUbLzLfHQ5jO5N7y3Mx88eeKo0Ml0UjCQuX4BMfOd/JX+enQqlKpL1CZnmjeBRvQE8TR+ds9j1rqx9CxhKHQ==",
"license": "MIT",
"engines": {
"node": ">=0.12.0"
}
},
"node_modules/react-toastify": {
"version": "9.1.3",
"resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-9.1.3.tgz",

7
package.json
View File

@ -1,6 +1,6 @@
{
"name": "utopia-ui",
"version": "3.0.59",
"version": "3.0.64",
"description": "Reuseable React Components to build mapping apps for real life communities and networks",
"repository": "https://github.com/utopia-os/utopia-ui",
"homepage": "https://utopia-os.org/",
@ -58,6 +58,7 @@
"eslint-import-resolver-typescript": "^3.6.3",
"eslint-plugin-import": "^2.31.0",
"eslint-plugin-json": "^3.1.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-no-catch-all": "^1.1.0",
"eslint-plugin-prettier": "^5.2.1",
"eslint-plugin-promise": "^6.1.1",
@ -66,7 +67,6 @@
"eslint-plugin-react-refresh": "^0.4.18",
"eslint-plugin-security": "^3.0.1",
"eslint-plugin-yml": "^1.14.0",
"globals": "^15.14.0",
"happy-dom": "^16.8.1",
"postcss": "^8.4.21",
"prettier": "^3.3.3",
@ -90,12 +90,10 @@
"dependencies": {
"@heroicons/react": "^2.0.17",
"@tanstack/react-query": "^5.17.8",
"@types/offscreencanvas": "^2019.7.1",
"axios": "^1.6.5",
"date-fns": "^3.3.1",
"leaflet": "^1.9.4",
"leaflet.locatecontrol": "^0.79.0",
"prop-types": "^15.8.1",
"radash": "^12.1.0",
"react-colorful": "^5.6.1",
"react-image-crop": "^10.1.8",
@ -104,7 +102,6 @@
"react-markdown": "^9.0.1",
"react-photo-album": "^3.0.2",
"react-router-dom": "^6.16.0",
"react-string-replace": "^1.1.1",
"react-toastify": "^9.1.3",
"remark-breaks": "^4.0.0",
"tw-elements": "^1.0.0",

5
src/Components/AppShell/AppShell.tsx
View File

@ -13,7 +13,6 @@ export function AppShell({
appName,
children,
assetsApi,
userType,
}: {
appName: string
children: React.ReactNode
@ -23,8 +22,8 @@ export function AppShell({
return (
<ContextWrapper>
<div className='tw-flex tw-flex-col tw-h-full'>
<SetAppState assetsApi={assetsApi} userType={userType} />
<NavBar userType={userType} appName={appName}></NavBar>
<SetAppState assetsApi={assetsApi} />
<NavBar appName={appName}></NavBar>
<div id='app-content' className='tw-flex-grow'>
{children}
</div>

6
src/Components/AppShell/NavBar.tsx
View File

@ -8,7 +8,7 @@ import { useItems } from '#components/Map/hooks/useItems'
import type { Item } from '#types/Item'
export default function NavBar({ appName, userType }: { appName: string; userType: string }) {
export default function NavBar({ appName }: { appName: string }) {
const { isAuthenticated, user, logout } = useAuth()
const [userProfile, setUserProfile] = useState<Item>({} as Item)
@ -16,12 +16,10 @@ export default function NavBar({ appName, userType }: { appName: string; userTyp
useEffect(() => {
const profile =
user &&
items.find((i) => i.user_created?.id === user.id && i.layer?.itemType.name === userType)
user && items.find((i) => i.user_created?.id === user.id && i.layer?.userProfileLayer)
profile
? setUserProfile(profile)
: setUserProfile({ id: crypto.randomUUID(), name: user?.first_name ?? '', text: '' })
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [user, items])
// useEffect(() => {}, [userProfile])

12
src/Components/AppShell/SetAppState.tsx
View File

@ -4,13 +4,7 @@ import { useSetAppState } from './hooks/useAppState'
import type { AssetsApi } from '#types/AssetsApi'
export const SetAppState = ({
assetsApi,
userType,
}: {
assetsApi: AssetsApi
userType: string
}) => {
export const SetAppState = ({ assetsApi }: { assetsApi: AssetsApi }) => {
const setAppState = useSetAppState()
useEffect(() => {
@ -18,9 +12,5 @@ export const SetAppState = ({
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [assetsApi])
useEffect(() => {
setAppState({ userType })
}, [setAppState, userType])
return <></>
}

13
src/Components/Auth/LoginPage.tsx
View File

@ -1,8 +1,3 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-floating-promises */
import { useEffect, useState } from 'react'
import { Link, useNavigate } from 'react-router-dom'
import { toast } from 'react-toastify'
@ -28,14 +23,14 @@ export function LoginPage() {
success: {
render({ data }) {
navigate('/')
return `Hi ${data?.first_name}`
return `Hi ${data?.first_name ? data.first_name : 'Traveler'}`
},
// other options
icon: '✌️',
},
error: {
render({ data }) {
return `${data}`
return `${data as string}`
},
autoClose: 10000,
},
@ -44,9 +39,10 @@ export function LoginPage() {
}
useEffect(() => {
const keyDownHandler = (event) => {
const keyDownHandler = (event: KeyboardEvent) => {
if (event.key === 'Enter') {
event.preventDefault()
// eslint-disable-next-line @typescript-eslint/no-floating-promises
onLogin()
}
}
@ -86,6 +82,7 @@ export function LoginPage() {
? 'tw-btn tw-btn-disabled tw-btn-block tw-btn-primary'
: 'tw-btn tw-btn-primary tw-btn-block'
}
// eslint-disable-next-line @typescript-eslint/no-misused-promises
onClick={() => onLogin()}
>
{loading ? <span className='tw-loading tw-loading-spinner'></span> : 'Login'}

9
src/Components/Auth/RequestPasswordPage.tsx
View File

@ -1,6 +1,3 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-misused-promises */
/* eslint-disable @typescript-eslint/no-unsafe-argument */
import { useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { toast } from 'react-toastify'
@ -12,8 +9,7 @@ import { useAuth } from './useAuth'
/**
* @category Auth
*/
// eslint-disable-next-line react/prop-types
export function RequestPasswordPage({ resetUrl }) {
export function RequestPasswordPage({ resetUrl }: { resetUrl: string }) {
const [email, setEmail] = useState<string>('')
const { requestPasswordReset, loading } = useAuth()
@ -32,7 +28,7 @@ export function RequestPasswordPage({ resetUrl }) {
},
error: {
render({ data }) {
return `${data}`
return `${data as string}`
},
},
pending: 'sending email ...',
@ -56,6 +52,7 @@ export function RequestPasswordPage({ resetUrl }) {
? 'tw-btn tw-btn-disabled tw-btn-block tw-btn-primary'
: 'tw-btn tw-btn-primary tw-btn-block'
}
// eslint-disable-next-line @typescript-eslint/no-misused-promises
onClick={() => onReset()}
>
{loading ? <span className='tw-loading tw-loading-spinner'></span> : 'Send'}

7
src/Components/Auth/SetNewPasswordPage.tsx
View File

@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-misused-promises */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
import { useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { toast } from 'react-toastify'
@ -20,8 +18,6 @@ export function SetNewPasswordPage() {
const onReset = async () => {
const token = window.location.search.split('token=')[1]
// eslint-disable-next-line no-console
console.log(token)
await toast.promise(passwordReset(token, password), {
success: {
@ -32,7 +28,7 @@ export function SetNewPasswordPage() {
},
error: {
render({ data }) {
return `${data}`
return `${data as string}`
},
},
pending: 'setting password ...',
@ -55,6 +51,7 @@ export function SetNewPasswordPage() {
? 'tw-btn tw-btn-disabled tw-btn-block tw-btn-primary'
: 'tw-btn tw-btn-primary tw-btn-block'
}
// eslint-disable-next-line @typescript-eslint/no-misused-promises
onClick={() => onReset()}
>
{loading ? <span className='tw-loading tw-loading-spinner'></span> : 'Set'}

13
src/Components/Auth/SignupPage.tsx
View File

@ -1,8 +1,3 @@
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-misused-promises */
import { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'
import { toast } from 'react-toastify'
@ -30,14 +25,14 @@ export function SignupPage() {
success: {
render({ data }) {
navigate('/')
return `Hi ${data?.first_name}`
return `Hi ${data?.first_name ? data.first_name : 'Traveler'}`
},
// other options
icon: '✌️',
},
error: {
render({ data }) {
return `${data}`
return `${data as string}`
},
autoClose: 10000,
},
@ -46,9 +41,10 @@ export function SignupPage() {
}
useEffect(() => {
const keyDownHandler = (event) => {
const keyDownHandler = (event: KeyboardEvent) => {
if (event.key === 'Enter') {
event.preventDefault()
// eslint-disable-next-line @typescript-eslint/no-floating-promises
onRegister()
}
}
@ -88,6 +84,7 @@ export function SignupPage() {
? 'tw-btn tw-btn-disabled tw-btn-block tw-btn-primary'
: 'tw-btn tw-btn-primary tw-btn-block'
}
// eslint-disable-next-line @typescript-eslint/no-misused-promises
onClick={() => onRegister()}
>
{loading ? <span className='tw-loading tw-loading-spinner'></span> : 'Sign Up'}

50
src/Components/Auth/useAuth.tsx
View File

@ -1,8 +1,3 @@
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/no-explicit-any */
import { createContext, useState, useContext, useEffect } from 'react'
import type { UserApi } from '#types/UserApi'
@ -28,11 +23,11 @@ interface AuthContextProps {
login: (credentials: AuthCredentials) => Promise<UserItem | undefined>
register: (credentials: AuthCredentials, userName: string) => Promise<UserItem | undefined>
loading: boolean
logout: () => Promise<any>
updateUser: (user: UserItem) => any
token: string | null
requestPasswordReset: (email: string, reset_url: string) => Promise<any>
passwordReset: (token: string, new_password: string) => Promise<any>
logout: () => Promise<void>
updateUser: (user: UserItem) => Promise<UserItem>
token: string | undefined
requestPasswordReset: (email: string, reset_url: string) => Promise<void>
passwordReset: (token: string, new_password: string) => Promise<void>
}
const AuthContext = createContext<AuthContextProps>({
@ -53,12 +48,13 @@ const AuthContext = createContext<AuthContextProps>({
*/
export const AuthProvider = ({ userApi, children }: AuthProviderProps) => {
const [user, setUser] = useState<UserItem | null>(null)
const [token, setToken] = useState<string | null>(null)
const [token, setToken] = useState<string>()
const [loading, setLoading] = useState<boolean>(false)
const isAuthenticated = !!user
useEffect(() => {
setLoading(true)
// eslint-disable-next-line @typescript-eslint/no-floating-promises
loadUser()
setLoading(false)
// eslint-disable-next-line react-hooks/exhaustive-deps
@ -84,10 +80,10 @@ export const AuthProvider = ({ userApi, children }: AuthProviderProps) => {
const login = async (credentials: AuthCredentials): Promise<UserItem | undefined> => {
setLoading(true)
try {
const res = await userApi.login(credentials.email, credentials.password)
setToken(res?.access_token)
const user = await userApi.login(credentials.email, credentials.password)
setToken(user?.access_token)
return await loadUser()
} catch (error: any) {
} catch (error) {
setLoading(false)
throw error
}
@ -95,13 +91,13 @@ export const AuthProvider = ({ userApi, children }: AuthProviderProps) => {
const register = async (
credentials: AuthCredentials,
userName,
userName: string,
): Promise<UserItem | undefined> => {
setLoading(true)
try {
/* const res = */ await userApi.register(credentials.email, credentials.password, userName)
return await login(credentials)
} catch (error: any) {
} catch (error) {
setLoading(false)
throw error
}
@ -111,7 +107,7 @@ export const AuthProvider = ({ userApi, children }: AuthProviderProps) => {
try {
await userApi.logout()
setUser(null)
} catch (error: any) {
} catch (error) {
setLoading(false)
throw error
}
@ -119,37 +115,35 @@ export const AuthProvider = ({ userApi, children }: AuthProviderProps) => {
const updateUser = async (user: UserItem) => {
setLoading(true)
const { id, ...userRest } = user
try {
const res = await userApi.updateUser(userRest)
setUser(res as any)
loadUser()
const updatedUser = await userApi.updateUser(user)
setUser(updatedUser)
await loadUser()
setLoading(false)
return res as any
} catch (error: any) {
return updatedUser
} catch (error) {
setLoading(false)
throw error
}
}
const requestPasswordReset = async (email: string, resetUrl?: string): Promise<any> => {
const requestPasswordReset = async (email: string, resetUrl?: string): Promise<void> => {
setLoading(true)
try {
await userApi.requestPasswordReset(email, resetUrl)
return setLoading(false)
} catch (error: any) {
} catch (error) {
setLoading(false)
throw error
}
}
const passwordReset = async (token: string, newPassword: string): Promise<any> => {
const passwordReset = async (token: string, newPassword: string): Promise<void> => {
setLoading(true)
try {
await userApi.passwordReset(token, newPassword)
return setLoading(false)
} catch (error: any) {
} catch (error) {
setLoading(false)
throw error
}

2
src/Components/Gaming/Quests.tsx
View File

@ -29,7 +29,7 @@ export function Quests() {
items.find(
(i) =>
i.user_created?.id === user?.id &&
i.layer?.itemType.name === 'user' &&
i.layer?.userProfileLayer &&
i.user_created?.id != null,
),
)

6
src/Components/Map/Layer.tsx
View File

@ -49,7 +49,7 @@ export const Layer = ({
markerDefaultColor2 = 'RGBA(35, 31, 32, 0.2)',
api,
itemType,
onlyOnePerOwner = false,
userProfileLayer = false,
customEditLink,
customEditParameter,
// eslint-disable-next-line camelcase
@ -101,7 +101,7 @@ export const Layer = ({
markerDefaultColor2,
api,
itemType,
onlyOnePerOwner,
userProfileLayer,
// Can we just use editCallback for all cases?
customEditLink,
customEditParameter,
@ -127,7 +127,7 @@ export const Layer = ({
markerDefaultColor2,
api,
itemType,
onlyOnePerOwner,
userProfileLayer,
customEditLink,
customEditParameter,
// eslint-disable-next-line camelcase

12
src/Components/Map/Subcomponents/ItemFormPopup.tsx
View File

@ -86,17 +86,16 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
map.closePopup()
} else {
const item = items.find(
(i) =>
i.user_created?.id === user?.id && i.layer?.itemType.name === props.layer.itemType.name,
(i) => i.user_created?.id === user?.id && i.layer?.id === props.layer.id,
)
const uuid = crypto.randomUUID()
let success = false
try {
props.layer.onlyOnePerOwner &&
props.layer.userProfileLayer &&
item &&
(await props.layer.api?.updateItem!({ ...formItem, id: item.id }))
;(!props.layer.onlyOnePerOwner || !item) &&
;(!props.layer.userProfileLayer || !item) &&
(await props.layer.api?.createItem!({
...formItem,
id: uuid,
@ -108,13 +107,12 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
toast.error(error.toString())
}
if (success) {
if (props.layer.onlyOnePerOwner && item) updateItem({ ...item, ...formItem })
if (!props.layer.onlyOnePerOwner || !item) {
if (props.layer.userProfileLayer && item) updateItem({ ...item, ...formItem })
if (!props.layer.userProfileLayer || !item) {
addItem({
...formItem,
name: (formItem.name ? formItem.name : user?.first_name) ?? '',
user_created: user ?? undefined,
type: props.layer.itemType,
id: uuid,
layer: props.layer,
public_edit: !user,

8
src/Components/Map/Subcomponents/ItemViewPopup.tsx
View File

@ -60,9 +60,9 @@ export const ItemViewPopup = forwardRef((props: ItemViewPopupProps, ref: any) =>
setLoading(true)
let success = false
try {
!props.item.layer?.onlyOnePerOwner &&
!props.item.layer?.userProfileLayer &&
(await props.item.layer?.api?.deleteItem!(props.item.id))
props.item.layer?.onlyOnePerOwner &&
props.item.layer?.userProfileLayer &&
(await props.item.layer.api?.updateItem!({ id: props.item.id, position: null }))
success = true
// eslint-disable-next-line no-catch-all/no-catch-all
@ -71,8 +71,8 @@ export const ItemViewPopup = forwardRef((props: ItemViewPopupProps, ref: any) =>
toast.error(error.toString())
}
if (success) {
!props.item.layer?.onlyOnePerOwner && removeItem(props.item)
props.item.layer?.onlyOnePerOwner && updadateItem({ ...props.item, position: undefined })
!props.item.layer?.userProfileLayer && removeItem(props.item)
props.item.layer?.userProfileLayer && updadateItem({ ...props.item, position: undefined })
toast.success('Item deleted')
}
setLoading(false)

22
src/Components/Profile/ProfileForm.tsx
View File

@ -3,6 +3,7 @@
/* eslint-disable @typescript-eslint/no-unsafe-argument */
import { useEffect, useState } from 'react'
import { useLocation, useNavigate } from 'react-router-dom'
import { toast } from 'react-toastify'
import { useAppState } from '#components/AppShell/hooks/useAppState'
import { useAuth } from '#components/Auth/useAuth'
@ -76,14 +77,19 @@ export function ProfileForm() {
item && setItem(item)
if (!item) {
const layer = layers.find((l) => l.itemType.name === appState.userType)
setItem({
id: crypto.randomUUID(),
name: user?.first_name ?? '',
text: '',
layer,
new: true,
})
if (items.some((i) => i.user_created?.id === user?.id && i.layer?.userProfileLayer)) {
navigate('/')
toast.error('Item does not exist')
} else {
const layer = layers.find((l) => l.userProfileLayer)
setItem({
id: crypto.randomUUID(),
name: user?.first_name ?? '',
text: '',
layer,
new: true,
})
}
}
// eslint-disable-next-line react-hooks/exhaustive-deps

17
src/Components/Profile/Subcomponents/ContactInfoView.tsx
View File

@ -16,24 +16,9 @@ export const ContactInfoView = ({ item, heading }: { item: Item; heading: string
const items = useItems()
useEffect(() => {
// eslint-disable-next-line no-console
console.log(
'user:',
items.find(
(i) =>
i.user_created?.id === item.user_created?.id &&
i.layer?.itemType.name === appState.userType,
),
)
setProfileOwner(
items.find(
(i) =>
i.user_created?.id === item.user_created?.id &&
i.layer?.itemType.name === appState.userType,
),
items.find((i) => i.user_created?.id === item.user_created?.id && i.layer?.userProfileLayer),
)
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [item, items])
return (

1
src/Components/Profile/UserSettings.tsx
View File

@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
import { useEffect, useState } from 'react'
import { useNavigate } from 'react-router-dom'

1
src/Components/Profile/itemFunctions.ts
View File

@ -273,7 +273,6 @@ export const onUpdateItem = async (
...changedItem,
layer: item.layer,
user_created: user,
type: item.layer?.itemType,
}),
)
.then(() => {

2
src/Components/Templates/AttestationForm.tsx
View File

@ -76,7 +76,7 @@ export const AttestationForm = ({ api }: { api?: ItemsApi<unknown> }) => {
(i) =>
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
i.user_created?.id === to[0].directus_users_id &&
i.layer?.itemType.name === 'player',
i.layer?.userProfileLayer === true,
)?.id +
'?tab=2',
),

2
src/Components/Templates/SelectUser.tsx
View File

@ -13,7 +13,7 @@ import { MapOverlayPage } from './MapOverlayPage'
export const SelectUser = () => {
const appState = useAppState()
const items = useItems()
const users = items.filter((i) => i.layer?.itemType.name === appState.userType)
const users = items.filter((i) => i.layer?.userProfileLayer)
const [selectedUsers, setSelectedUsers] = useState<string[]>([])

2
src/types/Item.d.ts vendored
View File

@ -1,5 +1,4 @@
import type { ItemsApi } from './ItemsApi'
import type { ItemType } from './ItemType'
import type { LayerProps } from './LayerProps'
import type { Relation } from './Relation'
import type { UserItem } from './UserItem'
@ -50,7 +49,6 @@ export interface Item {
contact?: string
telephone?: string
next_appointment?: string
type?: ItemType
gallery?: GalleryItem[]
// {

2
src/types/LayerProps.d.ts vendored
View File

@ -21,7 +21,7 @@ export interface LayerProps {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
api?: ItemsApi<any>
itemType: ItemType
onlyOnePerOwner?: boolean
userProfileLayer?: boolean
customEditLink?: string
customEditParameter?: string
public_edit_items?: boolean

4
src/types/UserApi.d.ts vendored
View File

@ -8,8 +8,8 @@ export interface UserApi {
login(email: string, password: string): Promise<UserItem | undefined>
logout(): Promise<void>
getUser(): Promise<UserItem>
getToken(): Promise<string | null>
updateUser(user: UserItem): Promise<void>
getToken(): Promise<string | undefined>
updateUser(user: UserItem): Promise<UserItem>
requestPasswordReset(email: string, reset_url?: string)
passwordReset(token: string, new_password: string)
}

1
src/types/UserItem.d.ts vendored
View File

@ -11,6 +11,7 @@ export interface UserItem {
password?: string
profile?: Profile
first_name?: string
access_token?: string
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any
}