Compare commits

...

43 Commits

Author SHA1 Message Date
Chukwumdiebube d984773e08 reminder link activated 2023-02-04 00:28:57 +01:00
tokslaw 63ef5d6699 Merge branch 'theme_color_change' of MyFit/users-myfit into master 2023-02-03 15:00:43 +00:00
victorAnumudu 7840e7b13d theme color changed 2023-02-03 15:22:03 +01:00
jenkins 41c56445fd Calendar page updated 2023-02-02 22:21:42 -05:00
tokslaw fcd6afbf1b Merge branch 'unwanted-popups' of MyFit/users-myfit into master 2023-02-02 23:01:28 +00:00
tokslaw 0138119953 Merge branch 'task-7-implement-reminder-fixed' of MyFit/users-myfit into master 2023-02-02 18:29:14 +00:00
tokslaw 39995b637b Merge branch 'task-3-reset-password' of MyFit/users-myfit into master 2023-02-02 18:07:31 +00:00
DESKTOP-QHP1O2H\MIKE 153499fa31 implemented reminder list counter 2023-02-02 11:51:36 -05:00
jenkins ddf15feb62 Reminder page 2023-02-02 11:00:10 -05:00
jenkins 3789a8d9cb Reminder add routing 2023-02-02 07:21:48 -05:00
jenkins 3476a8e7f0 Menu cleanup 2023-02-02 06:44:33 -05:00
Chukwumdiebube b45be9fafd All unwanted pop-ups removed 2023-02-02 10:42:03 +01:00
tokslaw a3af650036 Merge branch 'task-7-implement-reminders' of MyFit/users-myfit into master 2023-02-01 23:23:18 +00:00
tokslaw 26d2ddf719 Merge branch 'successful_login_definition' of MyFit/users-myfit into master 2023-02-01 23:18:56 +00:00
DESKTOP-QHP1O2H\MIKE 60ed2324d4 implemented reminders list api 2023-02-01 16:30:46 -05:00
victorAnumudu 2afbbe305d sets local storage values on successful login and clears those values when user logs out 2023-02-01 19:41:59 +01:00
tokslaw cf53cf028a Merge branch 'expires_user_login_session' of MyFit/users-myfit into master 2023-02-01 12:10:15 +00:00
victorAnumudu 33b1571929 Expires user login session after 5 minutes 2023-02-01 07:18:03 +01:00
ChineseChikki 590293d561 reset password implemented 2023-01-31 22:59:13 +01:00
tokslaw 1f8a6d0d30 Merge branch 'removing-toasts-ebube' of MyFit/users-myfit into master 2023-01-31 15:48:26 +00:00
Chukwumdiebube 730491dba5 Merge branch 'removing-toasts-ebube' of https://gitlab.chiefsoft.net/MyFit/users-myfit into unwanted-popups-ebube 2023-01-31 16:33:08 +01:00
Chukwumdiebube 4a6c57a777 Toasts removed! 2023-01-31 16:32:41 +01:00
Chukwumdiebube 001540b595 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit into unwanted-popups-ebube 2023-01-31 14:41:04 +01:00
tokslaw 190ec5eff4 Merge branch 'Ts&Cs-ebube' of MyFit/users-myfit into master 2023-01-31 13:27:37 +00:00
tokslaw c11245d157 Merge branch 'faq-implementation-ebube' of MyFit/users-myfit into master 2023-01-31 13:27:19 +00:00
tokslaw b740b43c37 Merge branch 'user_profile_details' of MyFit/users-myfit into master 2023-01-31 12:42:29 +00:00
victorAnumudu 7740adc7c5 Made user first and last name display on profile 2023-01-31 11:02:18 +01:00
Chukwumdiebube 293559c02b Toasts removed! 2023-01-30 23:21:07 +01:00
tokslaw c336c66674 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit 2023-01-30 16:46:39 -05:00
tokslaw 3776d19f29 my area fix 2023-01-30 16:46:25 -05:00
tokslaw 86eb6ea6e9 Merge branch 'expires_login_session' of MyFit/users-myfit into master 2023-01-30 21:38:12 +00:00
Chukwumdiebube df3710ec8d faq content updated 2023-01-30 16:19:48 +01:00
Chukwumdiebube 3dfbcdfe48 Updated Texts 2023-01-30 15:58:46 +01:00
Chukwumdiebube d71a810ed2 grammar fixes 2023-01-30 13:50:17 +01:00
victorAnumudu f2e278a8cf expires login session after 5 mins 2023-01-30 11:41:49 +01:00
jenkins 9b2145ff00 Profile layout 2023-01-28 23:52:14 -05:00
jenkins 7ce87a3ee8 test 2023-01-28 23:13:13 -05:00
jenkins 37fa170108 Headet token 2023-01-28 22:54:47 -05:00
jenkins 9a269b5732 Addreminder 2023-01-28 22:27:03 -05:00
jenkins f766c19465 Login hx 2023-01-28 21:25:55 -05:00
jenkins 30a344970a Reminder table demo 2023-01-28 20:41:21 -05:00
jenkins e4b1ceae30 env update 2023-01-28 19:59:42 -05:00
ameye aae99a7b50 Merge branch 'task-9-login-implementation' of MyFit/users-myfit into master 2023-01-28 11:59:55 +00:00
306 changed files with 1649 additions and 2196 deletions
Regular → Executable
+4 -1
View File
@@ -8,4 +8,7 @@ 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/myfituser"
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
Regular → Executable
View File
Regular → Executable
View File
+8
View File
@@ -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/
+6
View File
@@ -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>
Generated
+6
View File
@@ -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>
Vendored Regular → Executable
+1 -1
View File
@@ -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": {
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
+24
View File
@@ -3348,6 +3348,11 @@
"@xtuc/long": "4.2.2"
}
},
"@wojtekmaj/date-utils": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@wojtekmaj/date-utils/-/date-utils-1.1.2.tgz",
"integrity": "sha512-06PQad/6pyYDjInBW2ih4Oy30EAg0mtXTCz+b/fGwzN2JB2X2Zsa4QtHl4I8M+IaCKN8bwj61OW3XAWxh+D9hA=="
},
"@xtuc/ieee754": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -6490,6 +6495,14 @@
"get-intrinsic": "^1.1.1"
}
},
"get-user-locale": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/get-user-locale/-/get-user-locale-1.5.1.tgz",
"integrity": "sha512-WiNpoFRcHn1qxP9VabQljzGwkAQDrcpqUtaP0rNBEkFxJdh4f3tik6MfZsMYZc+UgQJdGCxWEjL9wnCUlRQXag==",
"requires": {
"lodash.memoize": "^4.1.1"
}
},
"glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
@@ -11049,6 +11062,17 @@
}
}
},
"react-calendar": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-4.0.0.tgz",
"integrity": "sha512-y9Q5Oo3Mq869KExbOCP3aJ3hEnRZKZ0TqUa9QU1wJGgDZFrW1qTaWp5v52oZpmxTTrpAMTUcUGaC0QJcO1f8Nw==",
"requires": {
"@wojtekmaj/date-utils": "^1.0.2",
"clsx": "^1.2.1",
"get-user-locale": "^1.2.0",
"prop-types": "^15.6.0"
}
},
"react-chartjs-2": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/react-chartjs-2/-/react-chartjs-2-4.3.1.tgz",
Regular → Executable
+1
View File
@@ -14,6 +14,7 @@
"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-dom": "^18.0.0",
Regular → Executable
View File
Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
+2 -2
View File
@@ -1,4 +1,4 @@
import Toaster from "./components/Helpers/Toaster";
// import Toaster from "./components/Helpers/Toaster";
import Routers from "./Routers";
import Default from "./components/Partials/Default";
@@ -7,7 +7,7 @@ function App() {
<Default>
<>
<Routers />
<Toaster />
{/* <Toaster /> */}
</>
</Default>
);
Regular → Executable
+2
View File
@@ -24,6 +24,7 @@ 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";
@@ -57,6 +58,7 @@ 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="/tracking" element={<TrackingPage />} />
<Route exact path="/calendar" element={<CalendarPage />} />
<Route exact path="/resources" element={<ResourcePage />} />
View File
View File
View File
View File
View File
View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

View File

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 601 KiB

After

Width:  |  Height:  |  Size: 601 KiB

View File

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 3.9 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 215 B

After

Width:  |  Height:  |  Size: 215 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 214 B

After

Width:  |  Height:  |  Size: 214 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 207 B

View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

View File

Before

Width:  |  Height:  |  Size: 688 B

After

Width:  |  Height:  |  Size: 688 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 244 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 244 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 244 B

After

Width:  |  Height:  |  Size: 244 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 274 B

After

Width:  |  Height:  |  Size: 274 B

View File

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

View File

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

View File

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

View File

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 297 B

View File

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 6.5 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 257 B

After

Width:  |  Height:  |  Size: 257 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 198 KiB

After

Width:  |  Height:  |  Size: 198 KiB

View File

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 138 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

View File

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 138 KiB

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 250 B

After

Width:  |  Height:  |  Size: 250 B

View File

Before

Width:  |  Height:  |  Size: 332 B

After

Width:  |  Height:  |  Size: 332 B

View File

Before

Width:  |  Height:  |  Size: 362 B

After

Width:  |  Height:  |  Size: 362 B

View File

Before

Width:  |  Height:  |  Size: 246 B

After

Width:  |  Height:  |  Size: 246 B

View File

Before

Width:  |  Height:  |  Size: 367 B

After

Width:  |  Height:  |  Size: 367 B

Regular → Executable
View File

Before

Width:  |  Height:  |  Size: 300 B

After

Width:  |  Height:  |  Size: 300 B

View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

View File

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

Some files were not shown because too many files have changed in this diff Show More