Compare commits
139 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d63d98f4e0 | |||
| 2daaacde77 | |||
| 2378b54144 | |||
| 37d6fd864d | |||
| 38b95e2472 | |||
| e591f4c946 | |||
| bbfd82d802 | |||
| 5710def735 | |||
| 9a579d3df1 | |||
| dab21802b1 | |||
| ed41cb8bf8 | |||
| 8181fceb6f | |||
| 63dd686a14 | |||
| ac505a3211 | |||
| b96dea34e9 | |||
| 53734807f0 | |||
| 59d733daa8 | |||
| 6f9dfc3956 | |||
| 90277ec045 | |||
| d13ddd5cec | |||
| 4c8ffb42f5 | |||
| 0a094d1826 | |||
| 11f1e97fbe | |||
| af7009955f | |||
| b788dc0623 | |||
| 1d1ebfe236 | |||
| 71e37a21b5 | |||
| 2548eb0ee2 | |||
| aefb9198b7 | |||
| 3cb373593f | |||
| 2dc6a5d9d3 | |||
| 7e7ca34361 | |||
| dd1baed764 | |||
| 694b4267be | |||
| 1722a598ce | |||
| aed4e7feaa | |||
| 02fb7dbae0 | |||
| b8c12cec6b | |||
| f360bb4b8a | |||
| 0b0b258d49 | |||
| 26ccd78be9 | |||
| a26f7c3bae | |||
| b4dba45fae | |||
| 368a8f2b53 | |||
| 099ace7f73 | |||
| 449a7d40ee | |||
| 046e1f5c37 | |||
| cee6a10dce | |||
| 05b2d2e3c9 | |||
| f49f246637 | |||
| b51ee6170e | |||
| 82ebf969d0 | |||
| 9d98e156cb | |||
| a724e35d99 | |||
| 733478170f | |||
| bc74d0a854 | |||
| 4237947003 | |||
| a28b362034 | |||
| 86d379ac38 | |||
| 61d2ddd4a2 | |||
| 35ccdff4a6 | |||
| 272ea60abc | |||
| ac8ecba36d | |||
| ad84db5eb2 | |||
| 19491f6aad | |||
| 2ac5db9e05 | |||
| 8645221684 | |||
| 2540b75837 | |||
| e15fd84676 | |||
| 6f8adf5aeb | |||
| 6f29a1f7e0 | |||
| 9894925377 | |||
| fb1e328bb6 | |||
| d7e1fa7ccb | |||
| 76dbfde6be | |||
| 1092c6d5a3 | |||
| fdd3dbe99a | |||
| f319003e40 | |||
| e6ba42afcd | |||
| 0170f03e10 | |||
| d984773e08 | |||
| ebcfa8da27 | |||
| 0b659816be | |||
| 63ef5d6699 | |||
| 7840e7b13d | |||
| 41c56445fd | |||
| fcd6afbf1b | |||
| 0138119953 | |||
| 39995b637b | |||
| 153499fa31 | |||
| ddf15feb62 | |||
| 3789a8d9cb | |||
| 3476a8e7f0 | |||
| b45be9fafd | |||
| a3af650036 | |||
| 26d2ddf719 | |||
| 60ed2324d4 | |||
| 2afbbe305d | |||
| cf53cf028a | |||
| 33b1571929 | |||
| 590293d561 | |||
| 1f8a6d0d30 | |||
| 730491dba5 | |||
| 4a6c57a777 | |||
| 001540b595 | |||
| 190ec5eff4 | |||
| c11245d157 | |||
| b740b43c37 | |||
| 7740adc7c5 | |||
| 293559c02b | |||
| c336c66674 | |||
| 3776d19f29 | |||
| 86eb6ea6e9 | |||
| df3710ec8d | |||
| 3dfbcdfe48 | |||
| d71a810ed2 | |||
| f2e278a8cf | |||
| 9b2145ff00 | |||
| 7ce87a3ee8 | |||
| 37fa170108 | |||
| 9a269b5732 | |||
| f766c19465 | |||
| 30a344970a | |||
| e4b1ceae30 | |||
| aae99a7b50 | |||
| bbe29b7fa3 | |||
| aa61c8cd26 | |||
| fc2b067f52 | |||
| 623d3be042 | |||
| 7a70dea24f | |||
| d37ca4bf6f | |||
| 72219e7a25 | |||
| 92e8cabaed | |||
| 20ff5e65ce | |||
| 5b201ee333 | |||
| 3b1d312cb3 | |||
| 2d349c6d5d | |||
| 2c4fb4df08 | |||
| 048b89d801 |
@@ -8,4 +8,10 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
|
||||
|
||||
|
||||
REACT_APP_AUX_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfit"
|
||||
REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfitusers"
|
||||
REACT_APP_USERS_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser"
|
||||
# REACT_APP_PASSWORD_ENDPOINT = "https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
|
||||
|
||||
REACT_APP_SESSION_EXPIRE_MINUTES = 5
|
||||
|
||||
REACT_APP_TRACKING="Tracking"
|
||||
REACT_APP_RESOURCES="Resources"
|
||||
@@ -5,6 +5,9 @@
|
||||
/.pnp
|
||||
.pnp.js
|
||||
|
||||
/.idea
|
||||
/.vscode
|
||||
|
||||
# testing
|
||||
/coverage
|
||||
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
@@ -0,0 +1,6 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
|
||||
</profile>
|
||||
</component>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -8,7 +8,7 @@
|
||||
},
|
||||
"[javascriptreact]": {
|
||||
"editor.formatOnSave": true,
|
||||
"editor.defaultFormatter": null
|
||||
"editor.defaultFormatter": "esbenp.prettier-vscode"
|
||||
},
|
||||
"javascript.validate.enable": false, //disable all built-in syntax checking
|
||||
"editor.codeActionsOnSave": {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{
|
||||
"name": "nft-max-react",
|
||||
"name": "myFit-App",
|
||||
"version": "0.1.0",
|
||||
"private": true,
|
||||
"dependencies": {
|
||||
@@ -8,12 +8,16 @@
|
||||
"@testing-library/jest-dom": "^5.11.4",
|
||||
"@testing-library/react": "^11.1.0",
|
||||
"@testing-library/user-event": "^12.1.10",
|
||||
"axios": "^0.24.0",
|
||||
"chart.js": "^3.7.1",
|
||||
"chartjs": "^0.3.24",
|
||||
"cors": "^2.8.5",
|
||||
"faker": "^6.6.6",
|
||||
"react": "^18.0.0",
|
||||
"react-calendar": "^4.0.0",
|
||||
"react-chartjs-2": "^4.1.0",
|
||||
"react-countup": "^6.2.0",
|
||||
"react-date-picker": "^9.2.0",
|
||||
"react-dom": "^18.0.0",
|
||||
"react-lottie": "^1.2.3",
|
||||
"react-redux": "^8.0.2",
|
||||
|
||||
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 3.5 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 3.4 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 2.5 KiB |
@@ -24,9 +24,12 @@ import UserProfilePage from "./views/UserProfilePage";
|
||||
import VerifyYouPages from "./views/VerifyYouPages";
|
||||
|
||||
import RemindersPage from './views/RemindersPage';
|
||||
import RemindersAddPage from './views/RemindersAddPage';
|
||||
import TrackingPage from "./views/TrackingPage";
|
||||
import CalendarPage from "./views/CalendarPage";
|
||||
import ResourcePage from "./views/ResourcePage";
|
||||
import TrackActionPage from "./views/TrackActionPage";
|
||||
import SubscriptionPage from "./views/SubscriptionPage";
|
||||
|
||||
export default function Routers() {
|
||||
return (
|
||||
@@ -57,11 +60,17 @@ export default function Routers() {
|
||||
<Route exact path="/my-wallet" element={<MyWalletPage />} />
|
||||
<Route exact path="/my-collection" element={<MyCollection />} />*/}
|
||||
<Route exact path="/reminders" element={<RemindersPage />} />
|
||||
<Route exact path="/add-reminder" element={<RemindersAddPage />} />
|
||||
<Route exact path="/add-reminder/:reminder_uuid" element={<RemindersAddPage />} />
|
||||
<Route exact path="/tracking" element={<TrackingPage />} />
|
||||
<Route exact path="/calendar" element={<CalendarPage />} />
|
||||
<Route exact path="/resources" element={<ResourcePage />} />
|
||||
<Route exact path="/my-wallet" element={<MyWalletPage />} />
|
||||
<Route exact path="/notification" element={<Notification />} />
|
||||
<Route exact path="/subscription" element={<SubscriptionPage />} />
|
||||
|
||||
<Route exact path="/t-weight" element={<TrackingPage />} />
|
||||
<Route exact path="/track-action/:trackpage" element={<TrackActionPage />} />
|
||||
<Route
|
||||
exact
|
||||
path="/my-collection/collection-item"
|
||||
|
||||
|
After Width: | Height: | Size: 1.3 KiB |
|
After Width: | Height: | Size: 1.8 KiB |
|
After Width: | Height: | Size: 1.2 KiB |
|
After Width: | Height: | Size: 6.3 KiB |
|
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 2.9 KiB |
|
After Width: | Height: | Size: 10 KiB |
|
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
|
Before Width: | Height: | Size: 601 KiB After Width: | Height: | Size: 601 KiB |
|
Before Width: | Height: | Size: 2.1 KiB After Width: | Height: | Size: 2.1 KiB |
|
Before Width: | Height: | Size: 4.2 KiB After Width: | Height: | Size: 4.2 KiB |
|
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 3.9 KiB |
|
Before Width: | Height: | Size: 215 B After Width: | Height: | Size: 215 B |
|
Before Width: | Height: | Size: 214 B After Width: | Height: | Size: 214 B |
|
Before Width: | Height: | Size: 214 B After Width: | Height: | Size: 214 B |
|
Before Width: | Height: | Size: 207 B After Width: | Height: | Size: 207 B |
|
After Width: | Height: | Size: 12 KiB |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 246 B |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 246 B |
|
Before Width: | Height: | Size: 246 B After Width: | Height: | Size: 246 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 1.5 KiB |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 688 B After Width: | Height: | Size: 688 B |
|
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 244 B After Width: | Height: | Size: 244 B |
|
Before Width: | Height: | Size: 274 B After Width: | Height: | Size: 274 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
Before Width: | Height: | Size: 297 B After Width: | Height: | Size: 297 B |
|
After Width: | Height: | Size: 15 KiB |
|
Before Width: | Height: | Size: 6.5 KiB After Width: | Height: | Size: 6.5 KiB |
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
Before Width: | Height: | Size: 257 B After Width: | Height: | Size: 257 B |
|
After Width: | Height: | Size: 21 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 17 KiB |
|
After Width: | Height: | Size: 35 KiB |
|
After Width: | Height: | Size: 24 KiB |
|
After Width: | Height: | Size: 46 KiB |
|
Before Width: | Height: | Size: 198 KiB After Width: | Height: | Size: 198 KiB |
|
Before Width: | Height: | Size: 8.2 KiB After Width: | Height: | Size: 8.2 KiB |