Compare commits

...

41 Commits

Author SHA1 Message Date
DESKTOP-QHP1O2H\MIKE 60ed2324d4 implemented reminders list api 2023-02-01 16:30:46 -05: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
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
ChineseChikki bbe29b7fa3 login implemented 2023-01-27 18:34:55 +01:00
jenkins aa61c8cd26 update call 2023-01-26 22:32:45 -05:00
Olu Amey fc2b067f52 Api call 2023-01-26 20:54:23 -05:00
Olu Amey 623d3be042 Sample API call 2023-01-26 17:32:12 -05:00
Olu Amey 7a70dea24f Lock needed for updates 2023-01-26 16:49:51 -05:00
Olu Amey d37ca4bf6f SVS added test 2023-01-26 16:31:51 -05:00
Olu Amey 72219e7a25 Env fix 2023-01-26 16:21:41 -05:00
Olu Amey 92e8cabaed axios added 2023-01-26 16:21:11 -05:00
tokslaw 20ff5e65ce Merge branch 'task-8-invalid-credential-details' of MyFit/users-myfit into master 2023-01-26 17:40:52 +00:00
ChineseChikki 5b201ee333 invalid credential change 2023-01-26 17:45:15 +01:00
tokslaw 3b1d312cb3 Merge branch 'task-8-line-below-text-create-account' of MyFit/users-myfit into master 2023-01-26 16:14:54 +00:00
tokslaw 2d349c6d5d Merge branch 'task-8-line-below-text-login' of MyFit/users-myfit into master 2023-01-26 16:11:09 +00:00
ChineseChikki 2c4fb4df08 create-account-line updated 2023-01-26 14:47:19 +01:00
ChineseChikki 048b89d801 Line-Adjustment 2023-01-26 14:20:24 +01:00
305 changed files with 15431 additions and 1013 deletions
Regular → Executable
+3 -1
View File
@@ -8,4 +8,6 @@ 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_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
+13751
View File
File diff suppressed because it is too large Load Diff
Regular → Executable
+3 -1
View File
@@ -1,5 +1,5 @@
{
"name": "nft-max-react",
"name": "myFit-App",
"version": "0.1.0",
"private": true,
"dependencies": {
@@ -8,8 +8,10 @@
"@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-chartjs-2": "^4.1.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
View File
Regular → Executable
View File
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