antontranelis/utopia-ui
1
0
Fork 0
mirror of https://github.com/utopia-os/utopia-ui.git synced 2025-12-13 07:46:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from utopia-os/typescript-navbar

Browse Source 
fix(other): make NavBar typesafe
This commit is contained in:
antontranelis 2025-01-07 13:06:18 +00:00 committed by GitHub
commit 46ba73fd1b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,14 +1,3 @@
/* eslint-disable @typescript-eslint/no-empty-function */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/restrict-plus-operands */
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
import QuestionMarkIcon from '@heroicons/react/24/outline/QuestionMarkCircleIcon'
import { useEffect, useRef, useState } from 'react'
import { Link, useLocation } from 'react-router-dom'
@ -31,19 +20,19 @@ export default function NavBar({ appName, userType }: { appName: string; userTyp
items.find((i) => i.user_created?.id === user.id && i.layer?.itemType.name === userType)
profile
? setUserProfile(profile)
: setUserProfile({ id: crypto.randomUUID(), name: user?.first_name, text: '' })
: setUserProfile({ id: crypto.randomUUID(), name: user?.first_name ?? '', text: '' })
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [user, items])
useEffect(() => {}, [userProfile])
// useEffect(() => {}, [userProfile])
const nameRef = useRef<any>(null)
const nameRef = useRef<HTMLHeadingElement>(null)
const [nameWidth, setNameWidth] = useState<number>(0)
const location = useLocation()
const [showNav, setShowNav] = useState<boolean>(false)
useEffect(() => {
showNav && nameRef && setNameWidth(nameRef.current.scrollWidth)
showNav && nameRef.current && setNameWidth(nameRef.current.scrollWidth)
}, [nameRef, appName, showNav])
useEffect(() => {
@ -52,8 +41,8 @@ export default function NavBar({ appName, userType }: { appName: string; userTyp
embedded !== 'true' && setShowNav(true)
}, [location])
const onLogout = () => {
toast.promise(logout(), {
const onLogout = async () => {
await toast.promise(logout(), {
success: {
render() {
return 'Bye bye'
@ -63,7 +52,7 @@ export default function NavBar({ appName, userType }: { appName: string; userTyp
},
error: {
render({ data }) {
return `${data}`
return JSON.stringify(data)
},
},
pending: 'logging out ..',
@ -123,7 +112,7 @@ export default function NavBar({ appName, userType }: { appName: string; userTyp
to={`${userProfile.id && '/item/' + userProfile.id}`}
className='tw-flex tw-items-center'
>
{userProfile?.image && (
{userProfile.image && (
<div className='tw-avatar'>
<div className='tw-w-10 tw-rounded-full'>
<img src={'https://api.utopia-lab.org/assets/' + userProfile.image} />
@ -156,7 +145,7 @@ export default function NavBar({ appName, userType }: { appName: string; userTyp
<li>
<a
onClick={() => {
onLogout()
void onLogout()
}}
>
Logout

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

@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-call */
import { useEffect } from 'react'
export function Modal({

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

@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
import { useEffect, useState } from 'react'
import { useAuth } from '#components/Auth'

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

@ -4,7 +4,6 @@
/* eslint-disable @typescript-eslint/no-unsafe-argument */
/* eslint-disable @typescript-eslint/no-unused-vars */
/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-non-null-assertion */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
import { Children, cloneElement, isValidElement, useEffect, useRef, useState } from 'react'
@ -113,8 +112,8 @@ export function ItemFormPopup(props: ItemFormPopupProps) {
if (!props.layer.onlyOnePerOwner || !item) {
addItem({
...formItem,
name: formItem.name ? formItem.name : user?.first_name,
user_created: user,
name: (formItem.name ? formItem.name : user?.first_name) ?? '',
user_created: user ?? undefined,
type: props.layer.itemType,
id: uuid,
layer: props.layer,

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

@ -79,7 +79,7 @@ export function ProfileForm() {
const layer = layers.find((l) => l.itemType.name === appState.userType)
setItem({
id: crypto.randomUUID(),
name: user ? user.first_name : '',
name: user?.first_name ?? '',
text: '',
layer,
new: true,

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

@ -1,6 +1,5 @@
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-return */
/* eslint-disable @typescript-eslint/restrict-plus-operands */
import { useEffect, useState } from 'react'

3
src/Components/Profile/Templates/OnepagerView.tsx
View File

@ -1,4 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
import { TextView } from '#components/Map'
@ -14,7 +13,7 @@ export const OnepagerView = ({ item }: { item: Item }) => {
item={item}
shareBaseUrl={`https://www.wuerdekompass.org/aktivitaeten/gruppensuche/#/gruppe/${item.slug}`}
/>
{item.user_created.first_name && <ContactInfoView heading='Du hast Fragen?' item={item} />}
{item.user_created?.first_name && <ContactInfoView heading='Du hast Fragen?' item={item} />}
{/* Description Section */}
<div className='tw-my-10 tw-mt-2 tw-px-6 tw-text-sm '>
<TextView rawText={item.text || 'Keine Beschreibung vorhanden'} />

2
src/Components/Profile/Templates/TabsView.tsx
View File

@ -132,7 +132,7 @@ export const TabsView = ({
<table className='sm:tw-table-sm md:tw-table-md'>
<tbody>
{attestations
.filter((a) => a.to.some((t) => t.directus_users_id === item.user_created.id))
.filter((a) => a.to.some((t) => t.directus_users_id === item.user_created?.id))
.sort(
(a, b) =>
new Date(b.date_created).getTime() - new Date(a.date_created).getTime(),

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

@ -2,7 +2,6 @@
/* eslint-disable @typescript-eslint/prefer-optional-chain */
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/require-await */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/restrict-plus-operands */
@ -49,7 +48,7 @@ export const AttestationForm = ({ api }: { api?: ItemsApi<any> }) => {
const sendAttestation = async () => {
const to: any[] = []
users?.map((u) => to.push({ directus_users_id: u.user_created.id }))
users?.map((u) => to.push({ directus_users_id: u.user_created?.id }))
api?.createItem &&
toast
@ -76,7 +75,7 @@ export const AttestationForm = ({ api }: { api?: ItemsApi<any> }) => {
'/item/' +
items.find(
(i) =>
i.user_created.id === to[0].directus_users_id &&
i.user_created?.id === to[0].directus_users_id &&
i.layer?.itemType.name === 'player',
)?.id +
'?tab=2',

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

@ -1,5 +1,3 @@
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
/* eslint-disable @typescript-eslint/no-non-null-assertion */
/* eslint-disable @typescript-eslint/no-unnecessary-condition */
/* eslint-disable @typescript-eslint/prefer-optional-chain */

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

@ -99,7 +99,7 @@ export const OverlayItemsIndexPage = ({
if (success) {
toast.success('New item created')
}
addItem({ ...formItem, user_created: user, id: uuid, layer, public_edit: !user })
addItem({ ...formItem, user_created: user ?? undefined, id: uuid, layer, public_edit: !user })
setLoading(false)
setAddItemPopupType('')
}

5
src/index.tsx
View File

@ -41,7 +41,8 @@ export { TextInput, TextAreaInput, SelectBox } from './Components/Input'
declare global {
interface Window {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
my_modal_3: any
my_modal_3: {
showModal(): void
}
}
}

3
types/Item.d.ts vendored
View File

@ -1,6 +1,7 @@
import type { ItemsApi } from './ItemsApi'
import type { LayerProps } from './LayerProps'
import type { Relation } from './Relation'
import type { UserItem } from './UserItem'
import type { Point } from 'geojson'
export interface Item {
@ -21,6 +22,8 @@ export interface Item {
subname?: string
public_edit?: boolean
slug?: string
user_created?: UserItem
image?: string
// eslint-disable-next-line @typescript-eslint/no-explicit-any
[key: string]: any
/* constructor(

1
types/UserItem.d.ts vendored
View File

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