Level 1
-
+
-
diff --git a/src/Components/Gaming/hooks/useQuests.tsx b/src/Components/Gaming/hooks/useQuests.tsx
index 336d7a8f..1b3cc1d4 100644
--- a/src/Components/Gaming/hooks/useQuests.tsx
+++ b/src/Components/Gaming/hooks/useQuests.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/prop-types */
/* eslint-disable @typescript-eslint/no-empty-function */
import { useCallback, useState, createContext, useContext } from 'react'
@@ -22,10 +21,15 @@ function useQuestsManager(initialOpen: boolean): {
return { open, setQuestsOpen }
}
-export const QuestsProvider: React.FunctionComponent<{
+interface QuestProviderProps {
initialOpen: boolean
children?: React.ReactNode
-}> = ({ initialOpen, children }) => (
+}
+
+export const QuestsProvider: React.FunctionComponent = ({
+ initialOpen,
+ children,
+}: QuestProviderProps) => (
{children}
)
diff --git a/src/Components/Input/SelectBox.tsx b/src/Components/Input/SelectBox.tsx
index c4d4282e..f91ed194 100644
--- a/src/Components/Input/SelectBox.tsx
+++ b/src/Components/Input/SelectBox.tsx
@@ -1,9 +1,7 @@
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
import InformationCircleIcon from '@heroicons/react/24/outline/InformationCircleIcon'
import { useState } from 'react'
-type SelectBoxProps = {
+interface SelectBoxProps {
labelTitle?: string
labelStyle?: string
type?: string
@@ -40,9 +38,9 @@ export function SelectBox(props: SelectBoxProps) {
}
return (
-
+
{labelTitle ? (
-
diff --git a/src/Components/Map/Subcomponents/Controls/LocateControl.tsx b/src/Components/Map/Subcomponents/Controls/LocateControl.tsx
index 6bd649ec..3380f6bc 100644
--- a/src/Components/Map/Subcomponents/Controls/LocateControl.tsx
+++ b/src/Components/Map/Subcomponents/Controls/LocateControl.tsx
@@ -7,6 +7,9 @@
import { control } from 'leaflet'
import { useEffect, useRef, useState } from 'react'
import { useMap, useMapEvents } from 'react-leaflet'
+
+import TargetSVG from '#assets/target.svg'
+
// eslint-disable-next-line import/no-unassigned-import
import 'leaflet.locatecontrol'
import 'leaflet.locatecontrol/dist/L.Control.Locate.css'
@@ -56,15 +59,12 @@ export const LocateControl = () => {
{loading ? (
) : (
-
+ style={{ fill: `${active ? '#fc8702' : 'currentColor'}` }}
+ />
)}
diff --git a/src/Components/Map/Subcomponents/Controls/QuestControl.tsx b/src/Components/Map/Subcomponents/Controls/QuestControl.tsx
index 1ebd60c2..cbc2e859 100644
--- a/src/Components/Map/Subcomponents/Controls/QuestControl.tsx
+++ b/src/Components/Map/Subcomponents/Controls/QuestControl.tsx
@@ -1,3 +1,4 @@
+import FistSVG from '#assets/fist.svg'
import { useQuestsOpen, useSetQuestOpen } from '#components/Gaming/hooks/useQuests'
export function QuestControl() {
@@ -17,14 +18,7 @@ export function QuestControl() {
className='tw-card-body hover:tw-bg-slate-300 tw-rounded-2xl tw-p-2 tw-h-10 tw-w-10 tw-transition-all tw-duration-300 hover:tw-cursor-pointer'
onClick={() => setQuestsOpen(true)}
>
-
+ 
)}
diff --git a/src/Components/Map/Subcomponents/Controls/SearchControl.tsx b/src/Components/Map/Subcomponents/Controls/SearchControl.tsx
index e197ea03..a267019e 100644
--- a/src/Components/Map/Subcomponents/Controls/SearchControl.tsx
+++ b/src/Components/Map/Subcomponents/Controls/SearchControl.tsx
@@ -10,6 +10,8 @@
/* eslint-disable @typescript-eslint/restrict-plus-operands */
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
/* eslint-disable @typescript-eslint/no-unsafe-call */
+import FlagIcon from '@heroicons/react/24/outline/FlagIcon'
+import MagnifyingGlassIcon from '@heroicons/react/24/outline/MagnifyingGlassIcon'
import axios from 'axios'
import { LatLng, LatLngBounds, marker } from 'leaflet'
import { useEffect, useRef, useState } from 'react'
@@ -234,21 +236,7 @@ export const SearchControl = () => {
hide()
}}
>
-
-
+
{geo?.properties.name ? geo?.properties.name : value}
@@ -295,21 +283,7 @@ export const SearchControl = () => {
)
}}
>
-
-
+
{value}
diff --git a/src/Components/Map/Subcomponents/Controls/SidebarControl.tsx b/src/Components/Map/Subcomponents/Controls/SidebarControl.tsx
index 76f27776..6172a78c 100644
--- a/src/Components/Map/Subcomponents/Controls/SidebarControl.tsx
+++ b/src/Components/Map/Subcomponents/Controls/SidebarControl.tsx
@@ -1,3 +1,5 @@
+import Bars3Icon from '@heroicons/react/16/solid/Bars3Icon'
+
// Converts leaflet.locatecontrol to a React Component
export const SidebarControl = () => {
return (
@@ -11,19 +13,7 @@ export const SidebarControl = () => {
aria-controls='#sidenav'
aria-haspopup='true'
>
-
+
diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
index 96fec05f..835da429 100644
--- a/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
+++ b/src/Components/Map/Subcomponents/ItemPopupComponents/HeaderView.tsx
@@ -9,9 +9,13 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/no-non-null-assertion */
/* eslint-disable @typescript-eslint/no-unsafe-assignment */
+import EllipsisVerticalIcon from '@heroicons/react/16/solid/EllipsisVerticalIcon'
+import PencilIcon from '@heroicons/react/24/solid/PencilIcon'
+import TrashIcon from '@heroicons/react/24/solid/TrashIcon'
import { useState, useEffect } from 'react'
import { useNavigate } from 'react-router-dom'
+import TargetDotSVG from '#assets/targetDot.svg'
import { useAppState } from '#components/AppShell/hooks/useAppState'
import { useHasUserPermission } from '#components/Map/hooks/usePermissions'
import DialogModal from '#components/Templates/DialogModal'
@@ -127,14 +131,7 @@ export function HeaderView({
tabIndex={0}
className='tw-bg-base-100 tw-btn tw-m-1 tw-leading-3 tw-border-none tw-min-h-0 tw-h-6'
>
-
+
-
+
)}
@@ -173,16 +163,7 @@ export function HeaderView({
className='!tw-text-base-content tw-cursor-pointer'
onClick={setPositionCallback}
>
-
+ 
)}
@@ -194,18 +175,7 @@ export function HeaderView({
{loading ? (
) : (
-
+
)}
diff --git a/src/Components/Map/Subcomponents/ItemPopupComponents/StartEndView.tsx b/src/Components/Map/Subcomponents/ItemPopupComponents/StartEndView.tsx
index eaf2c56c..23c3c385 100644
--- a/src/Components/Map/Subcomponents/ItemPopupComponents/StartEndView.tsx
+++ b/src/Components/Map/Subcomponents/ItemPopupComponents/StartEndView.tsx
@@ -1,4 +1,6 @@
/* eslint-disable @typescript-eslint/prefer-optional-chain */
+import CalendarIcon from '@heroicons/react/24/solid/CalendarDaysIcon'
+
import type { Item } from '#types/Item'
/**
@@ -8,20 +10,7 @@ export const StartEndView = ({ item }: { item?: Item }) => {
return (
-
+
diff --git a/src/Components/Profile/Subcomponents/AvatarWidget.tsx b/src/Components/Profile/Subcomponents/AvatarWidget.tsx
index b67c2c52..94d1e1f4 100644
--- a/src/Components/Profile/Subcomponents/AvatarWidget.tsx
+++ b/src/Components/Profile/Subcomponents/AvatarWidget.tsx
@@ -2,9 +2,11 @@
/* eslint-disable @typescript-eslint/no-floating-promises */
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable @typescript-eslint/prefer-optional-chain */
+import ArrowUpTrayIcon from '@heroicons/react/24/outline/ArrowUpTrayIcon'
import { useState, useCallback, useRef } from 'react'
import { ReactCrop, centerCrop, makeAspectCrop } from 'react-image-crop'
+import UserSVG from '#assets/user.svg'
import { useAppState } from '#components/AppShell/hooks/useAppState'
import 'react-image-crop/dist/ReactCrop.css'
import DialogModal from '#components/Templates/DialogModal'
@@ -169,20 +171,7 @@ export const AvatarWidget: React.FC
= ({ avatar, setAvatar })
onChange={onImageChange}
/>
{avatar ? (
@@ -193,22 +182,7 @@ export const AvatarWidget: React.FC
= ({ avatar, setAvatar })
-
+
) : (
-
+
)}
diff --git a/src/Components/Profile/Subcomponents/MarkdownHint.tsx b/src/Components/Profile/Subcomponents/MarkdownHint.tsx
index 1b79bbc3..bf8c8b37 100644
--- a/src/Components/Profile/Subcomponents/MarkdownHint.tsx
+++ b/src/Components/Profile/Subcomponents/MarkdownHint.tsx
@@ -1,5 +1,7 @@
import { useState } from 'react'
+import MarkdownSVG from '#assets/markdown.svg'
+
export const MarkdownHint = () => {
const [expended, setExpended] = useState(false)
return (
@@ -8,18 +10,7 @@ export const MarkdownHint = () => {
title='Markdown is supported'
className='flex tw-flex-row tw-text-gray-400 tw-cursor-pointer tw-items-center'
>
-
+ 
{expended && (
-
+
)}
diff --git a/src/Components/Profile/Subcomponents/ProfileTextView.tsx b/src/Components/Profile/Subcomponents/ProfileTextView.tsx
index 9fc35bbb..f2f1d283 100644
--- a/src/Components/Profile/Subcomponents/ProfileTextView.tsx
+++ b/src/Components/Profile/Subcomponents/ProfileTextView.tsx
@@ -17,9 +17,7 @@ export const ProfileTextView = ({
}) => {
const text = get(item, dataField)
- if (typeof text !== 'string') {
- throw new Error('ProfileTextView: text is not a string')
- }
+ const parsedText = typeof text !== 'string' ? '' : text
return (
@@ -27,7 +25,7 @@ export const ProfileTextView = ({
{heading}
)}
-
+
)}
{platforms.includes('clipboard') && (
@@ -62,17 +58,7 @@ const SocialShareBar = ({
onClick={() => copyLink()}
title='copy Link'
>
-
+ 
)}
diff --git a/src/Components/Profile/Subcomponents/SocialShareButton.tsx b/src/Components/Profile/Subcomponents/SocialShareButton.tsx
index 64f0858a..93f5dbde 100644
--- a/src/Components/Profile/Subcomponents/SocialShareButton.tsx
+++ b/src/Components/Profile/Subcomponents/SocialShareButton.tsx
@@ -5,72 +5,42 @@
import { cloneElement } from 'react'
+import FacebookSVG from '#assets/share/facebook.svg'
+import LinkedinSVG from '#assets/share/linkedin.svg'
+import TelegramSVG from '#assets/share/telegram.svg'
+import TwitterSVG from '#assets/share/twitter.svg'
+import WhatsappSVG from '#assets/share/whatsapp.svg'
+import XingSVG from '#assets/share/xing.svg'
+
const platformConfigs = {
facebook: {
shareUrl: 'https://www.facebook.com/sharer/sharer.php?u={url}',
- icon: (
-
- ),
+ icon:
,
bgColor: '#3b5998',
},
twitter: {
shareUrl: 'https://twitter.com/intent/tweet?text={title}:%20{url}',
- icon: (
-
- ),
+ icon:
,
bgColor: '#55acee',
},
linkedin: {
shareUrl: 'http://www.linkedin.com/shareArticle?mini=true&url={url}&title={title}',
- icon: (
-
- ),
+ icon:
,
bgColor: '#4875b4',
},
xing: {
shareUrl: 'https://www.xing-share.com/app/user?op=share;sc_p=xing-share;url={url}',
- icon: (
-
- ),
+ icon:
,
bgColor: '#026466',
},
whatsapp: {
shareUrl: 'https://api.whatsapp.com/send?text={title}%20{url}',
- icon: (
-
- ),
+ icon:
,
bgColor: '#25D366',
},
telegram: {
shareUrl: 'https://t.me/share/url?url={url}&text={title}',
- icon: (
-
- ),
+ icon:
,
bgColor: '#0088cc',
},
}
diff --git a/src/assets/chevron.svg b/src/assets/chevron.svg
new file mode 100644
index 00000000..fb6f4454
--- /dev/null
+++ b/src/assets/chevron.svg
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/src/assets/fist.svg b/src/assets/fist.svg
new file mode 100644
index 00000000..f079abbe
--- /dev/null
+++ b/src/assets/fist.svg
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/src/assets/layer.svg b/src/assets/layer.svg
new file mode 100644
index 00000000..a8f5494c
--- /dev/null
+++ b/src/assets/layer.svg
@@ -0,0 +1,13 @@
+
\ No newline at end of file
diff --git a/src/assets/markdown.svg b/src/assets/markdown.svg
new file mode 100644
index 00000000..cd6c28cc
--- /dev/null
+++ b/src/assets/markdown.svg
@@ -0,0 +1,12 @@
+
\ No newline at end of file
diff --git a/src/assets/plus.svg b/src/assets/plus.svg
new file mode 100644
index 00000000..ae77e510
--- /dev/null
+++ b/src/assets/plus.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/share/clipboard.svg b/src/assets/share/clipboard.svg
new file mode 100644
index 00000000..75551887
--- /dev/null
+++ b/src/assets/share/clipboard.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/assets/share/facebook.svg b/src/assets/share/facebook.svg
new file mode 100644
index 00000000..f0e46bb1
--- /dev/null
+++ b/src/assets/share/facebook.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/src/assets/share/linkedin.svg b/src/assets/share/linkedin.svg
new file mode 100644
index 00000000..35382bde
--- /dev/null
+++ b/src/assets/share/linkedin.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/src/assets/share/telegram.svg b/src/assets/share/telegram.svg
new file mode 100644
index 00000000..5926a3fd
--- /dev/null
+++ b/src/assets/share/telegram.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/src/assets/share/twitter.svg b/src/assets/share/twitter.svg
new file mode 100644
index 00000000..16c2fe70
--- /dev/null
+++ b/src/assets/share/twitter.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/src/assets/share/whatsapp.svg b/src/assets/share/whatsapp.svg
new file mode 100644
index 00000000..0579784e
--- /dev/null
+++ b/src/assets/share/whatsapp.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/src/assets/share/xing.svg b/src/assets/share/xing.svg
new file mode 100644
index 00000000..2fcc6565
--- /dev/null
+++ b/src/assets/share/xing.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/src/assets/target.svg b/src/assets/target.svg
new file mode 100644
index 00000000..711e071b
--- /dev/null
+++ b/src/assets/target.svg
@@ -0,0 +1,8 @@
+
\ No newline at end of file
diff --git a/src/assets/targetDot.svg b/src/assets/targetDot.svg
new file mode 100644
index 00000000..9ded1a69
--- /dev/null
+++ b/src/assets/targetDot.svg
@@ -0,0 +1,10 @@
+
\ No newline at end of file
diff --git a/src/assets/user.svg b/src/assets/user.svg
new file mode 100644
index 00000000..4a0573ec
--- /dev/null
+++ b/src/assets/user.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/types/SVG.d.ts b/src/types/SVG.d.ts
new file mode 100644
index 00000000..13d53bd9
--- /dev/null
+++ b/src/types/SVG.d.ts
@@ -0,0 +1,7 @@
+declare module '*.svg' {
+ import type { FunctionComponent, SVGProps } from 'react'
+
+ export const ReactComponent: FunctionComponent
>
+ const src: string
+ export default src
+}
diff --git a/tsconfig.json b/tsconfig.json
index 2a66fedf..ff453fb4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -20,6 +20,7 @@
"allowSyntheticDefaultImports": true,
"skipLibCheck": true,
"paths": {
+ "#assets/*": ["./src/assets/*"],
"#components/*": ["./src/Components/*"],
"#utils/*": ["./src/Utils/*"],
"#types/*": ["./src/types/*"],
diff --git a/vite.config.ts b/vite.config.ts
index 415f25db..fd583db2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,9 +1,10 @@
import react from '@vitejs/plugin-react'
import { defineConfig } from 'vite'
+import svgr from 'vite-plugin-svgr'
import { configDefaults } from 'vitest/config'
export default defineConfig({
- plugins: [react()],
+ plugins: [react(), svgr()],
test: {
globals: true,
environment: 'happy-dom',
@@ -14,8 +15,8 @@ export default defineConfig({
exclude: [...configDefaults.exclude],
thresholds: {
lines: 0,
- functions: 65,
- branches: 66,
+ functions: 61,
+ branches: 62,
statements: 0,
},
},