-
{site.name}
- -
-
-
- school
-
-
- {site.type.en}
+
+
+
+ {/* TODO: replace img source when backend offers an image endpoint */}
+ 
- {site.description ?? ''}
-
-
- (undefined)
const [site, setSite] = useState()
+ const fetchSiteData = async (parsedSiteId: number) => {
+ setIsLoadingSite(true)
+ try {
+ const fetchedSite = await api().social.site(parsedSiteId)
+ setSite(fetchedSite)
+ } catch (error_: unknown) {
+ setError(ensureError(error_))
+ } finally {
+ setIsLoadingSite(false)
+ }
+ }
+
useEffect((): void => {
- void fetchSite(Number(siteId) || 1, setSite)
- }, [setSite, siteId])
+ void fetchSiteData(Number(siteId) || 1)
+ }, [siteId])
return (
- personSponsors:
+
diff --git a/canopeum_frontend/src/pages/MapSite.tsx b/canopeum_frontend/src/pages/MapSite.tsx
index 1f6bbdf2c..026cee81e 100644
--- a/canopeum_frontend/src/pages/MapSite.tsx
+++ b/canopeum_frontend/src/pages/MapSite.tsx
@@ -1,29 +1,47 @@
+import SiteSummaryCard from '@components/site/SiteSummaryCard'
+import type { SiteSocial } from '@services/api'
+import api from '@services/apiInterface'
+import { ensureError } from '@services/errors'
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
-import SiteSummaryCard from '../components/site/SiteSummaryCard'
-import type { SiteSocial } from '../services/api'
-import api from '../services/apiInterface'
-
-const fetchSite = async (siteId: number, setSite: (site: SiteSocial) => void) => {
- try {
- const site = await api().social.site(siteId)
- setSite(site)
- } catch (error) {
- console.error(error)
- }
-}
const MapSite = () => {
const { siteId } = useParams()
+ const [isLoadingSite, setIsLoadingSite] = useState(true)
+ const [error, setError] = useState
+
+
{site.name}
+
+
+ {site.type.en}
+{site.description ?? ''}
+
+
- {site.sponsors.map(sponsorName =>
+ person
+ Sponsors:
+
+
+ {site.sponsors.map(sponsorName => (
+
{sponsorName}
+ ))}
+ {sponsorName}
)}
- {site &&
+
+ : error
+ ?
+ Loading...
+
+
+
+ : (site && {error.message}
+
diff --git a/canopeum_frontend/src/pages/Utilities.tsx b/canopeum_frontend/src/pages/Utilities.tsx
index 8a4cd3195..c3ae6b764 100644
--- a/canopeum_frontend/src/pages/Utilities.tsx
+++ b/canopeum_frontend/src/pages/Utilities.tsx
@@ -1,5 +1,6 @@
import facebookLogo from '@assets/icons/facebook-regular.svg'
import canopeumLogo from '@assets/images/Canopeum_Logo.jpg'
+import PrimaryIconBadge from '@components/PrimaryIconBadge'
const Utilities = () => (
@@ -53,6 +54,15 @@ const Utilities = () => (
psychiatry
+
+
Badges
+
+
+ Buttons
diff --git a/canopeum_frontend/tsconfig.json b/canopeum_frontend/tsconfig.json
index 9f4b155e4..5aa94fe5b 100644
--- a/canopeum_frontend/tsconfig.json
+++ b/canopeum_frontend/tsconfig.json
@@ -9,6 +9,12 @@
"paths": {
"@assets/*": [
"./src/assets/*"
+ ],
+ "@components/*": [
+ "./src/components/*"
+ ],
+ "@services/*": [
+ "./src/services/*"
]
},
/* Bundler mode */
diff --git a/canopeum_frontend/vite.config.ts b/canopeum_frontend/vite.config.ts
index 73bcc071f..413acb7f2 100644
--- a/canopeum_frontend/vite.config.ts
+++ b/canopeum_frontend/vite.config.ts
@@ -9,7 +9,14 @@ export default ({ mode }: { mode: string }) => {
resolve: {
alias: {
'@assets': '/src/assets',
+ '@components': '/src/components',
+ '@services': '/src/services',
},
},
+ server: {
+ watch: {
+ usePolling: true
+ }
+ }
})
}