Skip to content

Commit 4d9e6db

Browse files
committed
Frontend update and improvements
1 parent f3451d1 commit 4d9e6db

File tree

71 files changed

+425
-423
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+425
-423
lines changed

frontend/.env.example

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ VITE_PASS_TEMPLATE=generic
1010
VITE_THEME_COLOR="#ffffff"
1111
VITE_OFFICIAL_LANGUAGE=false
1212
VITE_NEW_RIDDLE_ENDPOINTS=true
13-
VITE_INITIAL_BG_IMAGE=https://example.com
1413
VITE_FIREBASE_PROJECT_ID="Set if you need push notifications"
1514
VITE_FIREBASE_API_KEY="Set if you need push notifications"
1615
VITE_FIREBASE_SENDER_ID="Set if you need push notifications"

frontend/package.json

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,36 @@
66
"type": "module",
77
"dependencies": {
88
"@chakra-ui/icons": "2.2.4",
9-
"@chakra-ui/react": "^2.10.5",
9+
"@chakra-ui/react": "^2.10.9",
1010
"@chakra-ui/styled-system": "2.12.0",
1111
"@chakra-ui/theme-tools": "2.2.6",
1212
"@emotion/react": "11.14.0",
13-
"@emotion/styled": "11.14.0",
14-
"@firebase/app": "0.10.18",
15-
"@firebase/messaging": "0.12.16",
16-
"@nivo/bar": "^0.88.0",
17-
"@tanstack/react-query": "5.66.0",
18-
"@tanstack/react-query-devtools": "^5.64.2",
13+
"@emotion/styled": "11.14.1",
14+
"@firebase/app": "0.13.2",
15+
"@firebase/messaging": "0.12.22",
16+
"@nivo/bar": "^0.99.0",
17+
"@tanstack/react-query": "5.81.5",
18+
"@tanstack/react-query-devtools": "^5.81.5",
1919
"@zxing/browser": "^0.1.5",
2020
"@zxing/library": "^0.21.3",
21-
"axios": "1.7.9",
21+
"axios": "1.10.0",
2222
"date-fns": "4.1.0",
2323
"deepmerge": "^4.3.1",
24-
"framer-motion": "12.0.6",
24+
"framer-motion": "12.20.2",
2525
"js-cookie": "3.0.5",
26-
"lodash": "4.17.21",
2726
"pigeon-maps": "^0.22.1",
28-
"prismjs": "1.29.0",
27+
"prismjs": "1.30.0",
2928
"react": "18.3.1",
3029
"react-dom": "18.3.1",
3130
"react-geolocated": "^4.3.0",
3231
"react-helmet-async": "2.0.5",
33-
"react-hook-form": "7.54.2",
34-
"react-icons": "5.4.0",
35-
"react-markdown": "9.0.3",
36-
"react-qr-code": "^2.0.15",
37-
"react-router-dom": "7.1.5",
32+
"react-hook-form": "7.59.0",
33+
"react-icons": "5.5.0",
34+
"react-markdown": "10.1.0",
35+
"react-qr-code": "^2.0.16",
36+
"react-router": "7.6.3",
3837
"react-simple-code-editor": "0.14.1",
39-
"remark-gfm": "4.0.0",
38+
"remark-gfm": "4.0.1",
4039
"values.js": "2.1.1"
4140
},
4241
"resolutions": {

frontend/src/App.tsx

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
import { Suspense } from 'react'
2-
import { Route, Routes } from 'react-router-dom'
2+
import { Route, Routes } from 'react-router'
33
import { CmschLayout } from './common-components/layout/CmschLayout'
44
import { ErrorPage } from './pages/error/error.page'
55
import HomePage from './pages/home/home.page'
66
import LoginPage from './pages/login/login.page'
77
import CountdownPage from './pages/countdown/countdown.page'
88
import IndexPage from './pages/index/index.page'
99
import { l } from './util/language'
10-
import { AppBackground } from './common-components/layout/AppBackground'
1110
import { Paths } from './util/paths.ts'
1211
import AccessKeyPage from './pages/access-key/accessKey.page.tsx'
1312
import CommunityPage from './pages/communities/community.page.tsx'
@@ -49,7 +48,6 @@ import DebtPage from './pages/debt/debt.page.tsx'
4948

5049
export function App() {
5150
return (
52-
<AppBackground>
5351
<CountdownPage>
5452
<CmschLayout>
5553
<Suspense>
@@ -142,6 +140,5 @@ export function App() {
142140
</Suspense>
143141
</CmschLayout>
144142
</CountdownPage>
145-
</AppBackground>
146143
)
147144
}

frontend/src/api/contexts/config/ConfigContext.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,4 +45,4 @@ export const useConfigContext = () => {
4545
return ctx
4646
}
4747

48-
export const useStyleFromContext = () => useContext(ConfigContext)?.components?.style
48+
export const useStyle = () => useContext(ConfigContext)?.components?.style || usePersistentStyleSetting().persistentStyle

frontend/src/api/contexts/service/ServiceContext.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { useToast } from '@chakra-ui/react'
22
import { createContext, PropsWithChildren, useContext, useEffect, useState } from 'react'
3-
import { useNavigate } from 'react-router-dom'
3+
import { useNavigate } from 'react-router'
44
import { AbsolutePaths } from '../../../util/paths'
55
import { l } from '../../../util/language'
66

frontend/src/common-components/BoardStat.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Stat, StatHelpText, StatLabel, StatNumber, StatProps } from '@chakra-ui/react'
2-
import { useNavigate } from 'react-router-dom'
2+
import { useNavigate } from 'react-router'
33
import { useOpaqueBackground } from '../util/core-functions.util'
44

55
interface BoardStatProps extends StatProps {

frontend/src/common-components/CmschLink.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Link as ChakraLink, LinkProps, useColorModeValue } from '@chakra-ui/react'
2-
import { Link as RouterLink } from 'react-router-dom'
2+
import { Link as RouterLink } from 'react-router'
33

44
type Props = {
55
isExternal?: boolean

frontend/src/common-components/CollapsableTableRow.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { ChevronDownIcon, ChevronUpIcon } from '@chakra-ui/icons'
22
import { useDisclosure, Link as ChakraLink, Grid, GridItem, Box } from '@chakra-ui/react'
3-
import { Link } from 'react-router-dom'
3+
import { Link } from 'react-router'
44
import { joinPath, useOpaqueBackground } from '../util/core-functions.util'
55
import { AbsolutePaths } from '../util/paths'
66
import { LeaderBoardItemView } from '../util/views/leaderBoardView'

frontend/src/common-components/ComponentUnavailable.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { l } from '../util/language'
2-
import { Navigate } from 'react-router-dom'
2+
import { Navigate } from 'react-router'
33
import { AbsolutePaths } from '../util/paths'
44
import { useServiceContext } from '../api/contexts/service/ServiceContext'
55
import { useEffect } from 'react'

frontend/src/common-components/CurrentEventCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Box, Flex, useColorModeValue } from '@chakra-ui/react'
22
import { useEventListQuery } from '../api/hooks/event/useEventListQuery'
33
import { isCurrentEvent, useOpaqueBackground } from '../util/core-functions.util'
44
import { AbsolutePaths } from '../util/paths'
5-
import { Link } from 'react-router-dom'
5+
import { Link } from 'react-router'
66
import { PulsingDot } from './PulsingDot'
77

88
export default function CurrentEventCard() {

0 commit comments

Comments
 (0)