-
+
+
+ {showFilterControl &&
+ setClusterRef(r)}
+ showCoverageOnHover
+ chunkedLoading
+ maxClusterRadius={50}
+ removeOutsideVisibleBounds={false}
>
-
-
-
- {showFilterControl &&
- setClusterRef(r)}
- showCoverageOnHover
- chunkedLoading
- maxClusterRadius={50}
- removeOutsideVisibleBounds={false}
- >
- {Children.toArray(children).map((child) =>
- isValidElement<{
- setItemFormPopup: React.Dispatch>
- itemFormPopup: ItemFormPopupProps | null
- clusterRef: React.MutableRefObject
- }>(child)
- ? cloneElement(child, { setItemFormPopup, itemFormPopup, clusterRef })
- : child,
- )}
-
- {geo && (
- {
- if (selectNewItemPosition) {
- e.layer.closePopup()
- setMapClicked({ position: e.latlng, setItemFormPopup })
- }
- },
- }}
- />
+ {Children.toArray(children).map((child) =>
+ isValidElement<{
+ setItemFormPopup: React.Dispatch>
+ itemFormPopup: ItemFormPopupProps | null
+ clusterRef: React.MutableRefObject
+ }>(child)
+ ? cloneElement(child, { setItemFormPopup, itemFormPopup, clusterRef })
+ : child,
)}
-
+ {geo && (
+ {
+ if (selectNewItemPosition) {
+ e.layer.closePopup()
+ setMapClicked({ position: e.latlng, setItemFormPopup })
+ }
+ },
+ }}
+ />
+ )}
+ }) => {
+export const AttestationForm = ({ api }: { api?: ItemsApi }) => {
const items = useItems()
const appState = useAppState()
const [users, setUsers] = useState()
@@ -46,10 +38,12 @@ export const AttestationForm = ({ api }: { api?: ItemsApi }) => {
setInputValue(event.target.value)
}
- const sendAttestation = async () => {
+ const sendAttestation = () => {
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
const to: any[] = []
users?.map((u) => to.push({ directus_users_id: u.user_created?.id }))
+ // eslint-disable-next-line @typescript-eslint/no-floating-promises
api?.createItem &&
toast
.promise(
@@ -65,6 +59,7 @@ export const AttestationForm = ({ api }: { api?: ItemsApi }) => {
success: 'Attestation created',
error: {
render({ data }) {
+ // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
return `${data}`
},
},
@@ -73,8 +68,10 @@ export const AttestationForm = ({ api }: { api?: ItemsApi }) => {
.then(() =>
navigate(
'/item/' +
+ // eslint-disable-next-line @typescript-eslint/restrict-plus-operands
items.find(
(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',
)?.id +
@@ -92,29 +89,28 @@ export const AttestationForm = ({ api }: { api?: ItemsApi }) => {
Gratitude
to
- {users &&
- users.map(
- (u, k) => (
-
- {u.image ? (
-
-
- 
-
+ {users?.map(
+ (u, k) => (
+
+ {u.image ? (
+
+
+ ),
+ ', ',
+ )}
+
- ) : (
-
- )}
-
-
+ ) : (
+
+ )}
+ {u.name}
+
- ),
- ', ',
- )}
+ {u.name}
diff --git a/src/Components/Templates/EmojiPicker.tsx b/src/Components/Templates/EmojiPicker.tsx
index 5f302b87..e52b09ea 100644
--- a/src/Components/Templates/EmojiPicker.tsx
+++ b/src/Components/Templates/EmojiPicker.tsx
@@ -1,21 +1,23 @@
-/* eslint-disable @typescript-eslint/no-unsafe-call */
/* eslint-disable @typescript-eslint/restrict-template-expressions */
import { useState } from 'react'
+interface Props {
+ selectedEmoji: string
+ selectedColor: string
+ selectedShape: string
+ setSelectedEmoji: (emoji: string) => void
+ setSelectedColor: (color: string) => void
+ setSelectedShape: (shape: string) => void
+}
+
export const EmojiPicker = ({
- // eslint-disable-next-line react/prop-types
selectedEmoji,
- // eslint-disable-next-line react/prop-types
selectedColor,
- // eslint-disable-next-line react/prop-types
selectedShape,
- // eslint-disable-next-line react/prop-types
setSelectedEmoji,
- // eslint-disable-next-line react/prop-types
setSelectedColor,
- // eslint-disable-next-line react/prop-types
setSelectedShape,
-}) => {
+}: Props) => {
const [isOpen, setIsOpen] = useState(false)
const emojis = [
@@ -77,17 +79,17 @@ export const EmojiPicker = ({
setIsOpen(!isOpen)
}
- const selectEmoji = (emoji) => {
+ const selectEmoji = (emoji: string) => {
setSelectedEmoji(emoji)
setIsOpen(false)
}
- const selectShape = (shape) => {
+ const selectShape = (shape: string) => {
setSelectedShape(shape)
setIsOpen(false)
}
- const selectColor = (color) => {
+ const selectColor = (color: string) => {
setSelectedColor(color)
setIsOpen(false)
}
diff --git a/src/Utils/ContainsUUID.ts b/src/Utils/ContainsUUID.ts
new file mode 100644
index 00000000..19193174
--- /dev/null
+++ b/src/Utils/ContainsUUID.ts
@@ -0,0 +1,4 @@
+export function containsUUID(str: string): boolean {
+ const uuidRegex = /[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/i
+ return uuidRegex.test(str)
+}
diff --git a/src/Utils/MarkerIconFactory.ts b/src/Utils/MarkerIconFactory.ts
index 6de46870..9769dd5f 100644
--- a/src/Utils/MarkerIconFactory.ts
+++ b/src/Utils/MarkerIconFactory.ts
@@ -61,6 +61,14 @@ const addIcon = (icon: string) => {
return ''
case 'network':
return ''
+ case 'crosshair':
+ return ''
+ case 'shop':
+ return ''
+ case 'plant':
+ return ''
+ case 'circle-dot':
+ return ''
default:
return ''
}
diff --git a/src/index.tsx b/src/index.tsx
index 8592a9ee..5cacee86 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -19,7 +19,6 @@ export {
export { AppShell, Content, SideBar, Sitemap } from './Components/AppShell'
export {
AuthProvider,
- useAuth,
LoginPage,
SignupPage,
RequestPasswordPage,