Skip to content

Commit 7778835

Browse files
authored
Merge branch 'develop' into 68-design/walk-result-ui
2 parents 8e1037c + 6327126 commit 7778835

Some content is hidden

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

89 files changed

+2345
-391
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"version": "0.0.0",
55
"type": "module",
66
"scripts": {
7-
"dev": "vite",
7+
"dev": "vite --host",
88
"build": "tsc && vite build",
99
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
1010
"preview": "vite preview",

src/App.tsx

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import PWABadge from '~/PWABadge'
2-
import { router } from '~/router'
3-
import GlobalStyle from '~/styles/globalStyle'
4-
import { lightTheme, darkTheme } from '~/styles/theme'
51
import { Suspense, useState } from 'react'
2+
import { Helmet, HelmetProvider } from 'react-helmet-async'
63
import { RouterProvider } from 'react-router-dom'
74
import styled, { ThemeProvider } from 'styled-components'
8-
import { Helmet, HelmetProvider } from 'react-helmet-async'
9-
import ModalContainer from '~modals/ModalContainer'
5+
import PWABadge from '~/PWABadge'
6+
import { router } from '~/router'
7+
import GlobalStyle from '~/styles/globalStyle'
8+
import { darkTheme, lightTheme } from '~/styles/theme'
109
import Loader from '~components/Loader'
1110

1211
function App() {
@@ -28,7 +27,6 @@ function App() {
2827
<MobileContainer>
2928
<Suspense fallback={<Loader />}>
3029
<RouterProvider router={router} />
31-
<ModalContainer />
3230
</Suspense>
3331
</MobileContainer>
3432
<PWABadge />

src/assets/avatars/Avatar1.svg

Lines changed: 45 additions & 0 deletions
Loading

0 commit comments

Comments
 (0)