Skip to content

Commit 2b5bfa9

Browse files
committed
#266 Allow users to view their past records
1 parent fe963c4 commit 2b5bfa9

File tree

114 files changed

+1419
-1187
lines changed

Some content is hidden

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

114 files changed

+1419
-1187
lines changed

package-lock.json

+137-23
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@
3737
"@capacitor/splash-screen": "7.0.0",
3838
"@capacitor/status-bar": "7.0.0",
3939
"@flumens/bigu": "0.4.0",
40-
"@flumens/ionic": "2.0.0-alpha.74",
41-
"@flumens/models": "0.6.0",
42-
"@flumens/tailwind": "0.27.0",
43-
"@flumens/utils": "^0.1.0",
40+
"@flumens/ionic": "2.0.0-alpha.75",
41+
"@flumens/models": "0.7.0",
42+
"@flumens/tailwind": "0.28.0",
43+
"@flumens/utils": "^0.2.0",
4444
"@hookform/resolvers": "^4.0.0",
4545
"@ionic-native/core": "5.36.0",
4646
"@ionic/core": "^8.4.3",
@@ -79,8 +79,10 @@
7979
"react-router": "5.3.4",
8080
"react-router-dom": "5.3.4",
8181
"react-window": "^1.8.11",
82+
"react-window-infinite-loader": "^1.0.10",
8283
"sql.js": "^1.12.0",
8384
"swiper": "^11.2.3",
85+
"tailwind-merge": "^3.0.2",
8486
"tailwind-variants": "^0.3.1",
8587
"zod": "^3.24.2"
8688
},
@@ -109,6 +111,7 @@
109111
"@types/react-router": "^5.1.20",
110112
"@types/react-router-dom": "5.3.3",
111113
"@types/react-window": "^1.8.8",
114+
"@types/react-window-infinite-loader": "^1.0.9",
112115
"babel-eslint": "10.1.0",
113116
"babel-jest": "^29.7.0",
114117
"babel-plugin-module-resolver": "^5.0.2",

src/App.tsx

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { observer } from 'mobx-react';
22
import { Route, Redirect } from 'react-router-dom';
33
import {
4+
SamplesContext,
45
TailwindBlockContext,
56
TailwindContext,
67
TailwindContextValue,
@@ -9,6 +10,7 @@ import {
910
import { IonApp, IonRouterOutlet, isPlatform } from '@ionic/react';
1011
import { IonReactRouter } from '@ionic/react-router';
1112
import UpdatedRecordsAlert from 'common/Components/UpdatedRecordsAlert';
13+
import samples from 'common/models/collections/samples';
1214
import 'common/theme.scss';
1315
import 'common/translations/translator';
1416
import Home from './Home';
@@ -26,6 +28,8 @@ const tailwindBlockContext = {
2628
basePath: '',
2729
};
2830

31+
const samplesContext = { samples };
32+
2933
const HomeRedirect = () => <Redirect to="home" />;
3034

3135
const App = () => (
@@ -34,17 +38,19 @@ const App = () => (
3438
<OnboardingScreens>
3539
<TailwindContext.Provider value={tailwindContext}>
3640
<TailwindBlockContext.Provider value={tailwindBlockContext}>
37-
<IonReactRouter>
38-
<UpdatedRecordsAlert />
39-
<IonRouterOutlet id="main">
40-
<Route exact path="/" component={HomeRedirect} />
41-
<Route path="/home" component={Home} />
42-
{User}
43-
{Info}
44-
{Survey}
45-
{Settings}
46-
</IonRouterOutlet>
47-
</IonReactRouter>
41+
<SamplesContext.Provider value={samplesContext}>
42+
<IonReactRouter>
43+
<UpdatedRecordsAlert />
44+
<IonRouterOutlet id="main">
45+
<Route exact path="/" component={HomeRedirect} />
46+
<Route path="/home" component={Home} />
47+
{User}
48+
{Info}
49+
{Survey}
50+
{Settings}
51+
</IonRouterOutlet>
52+
</IonReactRouter>
53+
</SamplesContext.Provider>
4854
</TailwindBlockContext.Provider>
4955
</TailwindContext.Provider>
5056
</OnboardingScreens>

0 commit comments

Comments
 (0)