Skip to content

Commit

Permalink
Merge branch 'main' into deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
BlackRam-oss committed Oct 25, 2024
2 parents d1b5dfa + 9e53301 commit 203e138
Show file tree
Hide file tree
Showing 10 changed files with 511 additions and 550 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ dist-ssr
*.local

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
Expand Down
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,9 @@ Core libraries:
* [Recoil](https://recoiljs.org/): A state management library for React.
* [React Router](https://reactrouter.com/): A library that provides routing for React applications.
* [Tanstack Query](https://tanstack.com/tanstack-query/): A library that provides a set of tools for getting, caching, and updating game data.
<img width="44" alt="image" src="https://github.com/user-attachments/assets/bf70dddc-68c0-48f4-9c41-74c22f54e3d1">
You can use the following button to show Tanstack Query interactions with the game. (the button will be automatically hidden when released)


UI libraries:

Expand Down
292 changes: 146 additions & 146 deletions package-lock.json

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
"publish": "npm run build && firebase deploy"
},
"dependencies": {
"@drincs/pixi-vn": "^0.8.3",
"@drincs/pixi-vn": "^0.8.4",
"@emotion/react": "^11.13.3",
"@emotion/styled": "^11.13.0",
"@mui/icons-material": "^6.1.3",
"@mui/icons-material": "^6.1.5",
"@mui/joy": "^5.0.0-beta.28",
"@tanstack/react-query": "^5.59.13",
"framer-motion": "^11.11.8",
"i18next": "^23.16.0",
"@tanstack/react-query": "^5.59.16",
"framer-motion": "^11.11.10",
"i18next": "^23.16.4",
"i18next-browser-languagedetector": "^8.0.0",
"notistack": "^3.0.1",
"react": "^18.3.1",
"react-color-palette": "^7.3.0",
"react-dom": "^18.3.1",
"react-error-boundary": "^4.0.13",
"react-i18next": "^15.0.3",
"react-error-boundary": "^4.1.2",
"react-i18next": "^15.1.0",
"react-markdown": "^9.0.1",
"react-router-dom": "^6.27.0",
"recoil": "^0.7.7",
Expand All @@ -36,17 +36,17 @@
"vite-plugin-checker": "^0.8.0"
},
"devDependencies": {
"@tanstack/react-query-devtools": "^5.59.13",
"@types/react": "^18.3.11",
"@tanstack/react-query-devtools": "^5.59.16",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@typescript-eslint/eslint-plugin": "^8.8.1",
"@typescript-eslint/parser": "^8.8.1",
"@vitejs/plugin-react": "^4.3.2",
"eslint": "^9.12.0",
"@typescript-eslint/eslint-plugin": "^8.11.0",
"@typescript-eslint/parser": "^8.11.0",
"@vitejs/plugin-react": "^4.3.3",
"eslint": "^9.13.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.12",
"eslint-plugin-react-refresh": "^0.4.14",
"typescript": "^5.6.3",
"vite": "^5.4.9",
"vite": "^5.4.10",
"vite-plugin-pwa": "^0.20.5"
},
"keywords": [
Expand Down
8 changes: 5 additions & 3 deletions src/AppRoutes.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useQueryClient } from '@tanstack/react-query';
import { Route, Routes } from 'react-router-dom';
import { useSetRecoilState } from 'recoil';
import { nextStepLoadingState } from './atoms/nextStepLoadingState';
import NextButton from './components/NextButton';
import SkipAutoInterceptor from './interceptors/SkipAutoInterceptor';
import HistoryScreen from './screens/HistoryScreen';
import LoadingScreen from './screens/LoadingScreen';
Expand Down Expand Up @@ -49,13 +50,14 @@ export default function AppRoutes() {
element={<>
<HistoryScreen />
<QuickTools />
<NarrationScreen
nextOnClick={nextOnClick}
/>
<NarrationScreen />
<SkipAutoInterceptor
nextOnClick={nextOnClick}
/>
<TextInput />
<NextButton
nextOnClick={nextOnClick}
/>
</>}
/>
<Route path="*" element={<MainMenu />} />
Expand Down
Loading

0 comments on commit 203e138

Please sign in to comment.