Compare commits

..

198 Commits

Author SHA1 Message Date
victorAnumudu c130c056f8 signup verify code bug fix 2023-03-02 09:37:35 +01:00
tokslaw be32be1ecd Merge branch 'signup_OTP_verification' of MyFit/users-myfit into master 2023-02-27 17:41:48 +00:00
victorAnumudu 62fe0dabec verified otp and made curry underline to straight line 2023-02-27 14:44:52 +01:00
tokslaw 77be53424a Merge branch 'reset-password' of MyFit/users-myfit into master 2023-02-27 12:51:05 +00:00
tokslaw da29fd3307 Merge branch 'signup_validation' of MyFit/users-myfit into master 2023-02-27 12:50:52 +00:00
victorAnumudu 1a599cd582 implemented signup validation 2023-02-27 13:18:53 +01:00
Chukwumdiebube 7d612ef03a Reset Password activated 2023-02-27 11:44:01 +01:00
jenkins 6254df4f2a sign up 2023-02-25 18:35:05 -05:00
tokslaw caf3eff237 Merge branch 'Tracking-image' of MyFit/users-myfit into master 2023-02-21 14:07:17 +00:00
Chukwumdiebube 0672cc88c3 Tracking Images 2023-02-20 22:33:05 +01:00
tokslaw 174be171c8 Merge branch 'Login-history' of MyFit/users-myfit into master 2023-02-20 17:02:06 +00:00
Chukwumdiebube 8b84647e22 login history and reminder date format 2023-02-20 17:22:30 +01:00
jenkins df2f6dc3e3 sign up compled 2023-02-20 00:14:19 -05:00
jenkins bd854714d0 pricing page 2023-02-19 17:54:44 -05:00
jenkins 174d903d6e Just teting 2023-02-18 21:01:30 -05:00
jenkins 2aa7ed5636 Entry widget 2023-02-18 20:44:51 -05:00
tolik 5b7dcc645d Service name fix 2023-02-19 01:05:57 +00:00
tolik 23a9d474ff Image name fix 2023-02-19 01:02:54 +00:00
tolik 446b3a2ed6 Docker fixes - build & registry 2023-02-18 22:46:13 +00:00
jenkins e3680cb77d generic tracking oage 2023-02-18 16:58:50 -05:00
jenkins 30e960a3d8 tracjk hx 2023-02-18 12:05:33 -05:00
tokslaw 43cf688068 Merge branch 'edit_reminder_bug_fixed' of MyFit/users-myfit into master 2023-02-17 15:06:49 +00:00
tokslaw 5d75faf2df Merge branch 'calendar_theming' of MyFit/users-myfit into master 2023-02-17 15:05:33 +00:00
tokslaw 29287c746f Merge branch 'task-47-center-cat-images' of MyFit/users-myfit into master 2023-02-17 15:02:30 +00:00
ChineseChikki c623e2f0c8 images centered 2023-02-17 13:47:07 +01:00
victorAnumudu 3fe29accbf Added styling to calendar page 2023-02-16 16:45:48 +01:00
victorAnumudu 0a1c4a7d2f changed edit btn name to update. category, mode now prefilled from edit reminder link 2023-02-16 15:28:25 +01:00
tokslaw 65a531922f Merge branch 'edit-reminder--1' of MyFit/users-myfit into master 2023-02-16 13:46:50 +00:00
Chukwumdiebube ae01f21c61 Styled text input 2023-02-16 14:23:08 +01:00
tokslaw 39dfa6b1dc Merge branch 'task-44-center-cat-text' of MyFit/users-myfit into master 2023-02-16 12:51:55 +00:00
jenkins d52f7ced65 subcriptiton top 2023-02-15 21:11:59 -05:00
ChineseChikki 5624666213 category text center aligned 2023-02-15 19:37:20 +01:00
tokslaw 40e5615cce Merge branch 'extend_session_expiry_time' of MyFit/users-myfit into master 2023-02-15 17:46:32 +00:00
victorAnumudu f36d80ac9a Clears localStorage when session expire or user logs out 2023-02-15 16:30:25 +01:00
victorAnumudu 886f58f5ea Extended session expiry time 2023-02-15 16:22:22 +01:00
jenkins 2daaacde77 subscription starter 2023-02-14 12:08:23 -05:00
jenkins 2378b54144 subscription link 2023-02-14 11:11:06 -05:00
jenkins 37d6fd864d Spelling fix 2023-02-14 10:51:03 -05:00
tokslaw 38b95e2472 Merge branch 'calendar-selection-01' of MyFit/users-myfit into master 2023-02-14 12:23:06 +00:00
jenkins e591f4c946 Home layout 2023-02-13 20:15:56 -05:00
jenkins bbfd82d802 Subscription config started 2023-02-13 16:58:47 -05:00
jenkins 5710def735 Updated local stog 2023-02-12 23:45:29 -05:00
jenkins 9a579d3df1 Home layout 2023-02-12 22:46:59 -05:00
jenkins dab21802b1 Entry layout 2023-02-11 21:25:54 -05:00
jenkins ed41cb8bf8 Youtube video 2023-02-11 19:59:29 -05:00
Chukwumdiebube 8181fceb6f final touches 2023-02-11 22:27:56 +01:00
jenkins 63dd686a14 tabs categories 2023-02-11 14:05:10 -05:00
Chukwumdiebube ac505a3211 added datepicker 2023-02-11 17:46:48 +01:00
jenkins b96dea34e9 Blog data 2023-02-11 10:40:35 -05:00
jenkins 53734807f0 Add weigh start 2023-02-10 23:46:23 -05:00
tokslaw 59d733daa8 Merge branch 'tracking_component_navigation_fixed' of MyFit/users-myfit into master 2023-02-11 00:27:53 +00:00
victorAnumudu 6f9dfc3956 made tracking component body navigate on click 2023-02-11 00:23:01 +01:00
tokslaw 90277ec045 Revert "react date-picker import"
This reverts commit d13ddd5cec.
2023-02-10 12:14:19 -05:00
tokslaw d13ddd5cec react date-picker import 2023-02-10 10:08:04 -05:00
jenkins 4c8ffb42f5 React date picker 2023-02-10 09:29:30 -05:00
jenkins 0a094d1826 Track page tracking 2023-02-09 21:58:53 -05:00
jenkins 11f1e97fbe Home edit 2023-02-09 21:52:50 -05:00
jenkins af7009955f Track Actio Pages 2023-02-09 21:16:39 -05:00
jenkins b788dc0623 Fixed notes var 2023-02-09 19:18:13 -05:00
tokslaw 1d1ebfe236 Merge branch 'edit_reminder_button_style_fixed' of MyFit/users-myfit into master 2023-02-09 23:05:03 +00:00
victorAnumudu 71e37a21b5 fixed edit reminder style issue 2023-02-09 17:11:49 +01:00
tokslaw 2548eb0ee2 Merge branch 'reminder-select-btns-value' of MyFit/users-myfit into master 2023-02-09 01:50:46 +00:00
tokslaw aefb9198b7 Merge branch 'select-boxes-with-round-edges' of MyFit/users-myfit into master 2023-02-09 01:50:36 +00:00
tokslaw 3cb373593f Merge branch 'Reminder_update_button' of MyFit/users-myfit into master 2023-02-09 01:50:30 +00:00
tokslaw 2dc6a5d9d3 Merge branch 'task-icons-change' of MyFit/users-myfit into master 2023-02-09 01:46:36 +00:00
jenkins 7e7ca34361 Img edit 2023-02-08 20:37:45 -05:00
jenkins dd1baed764 Reminder test icons 2023-02-08 20:10:31 -05:00
jenkins 694b4267be tack Images 2023-02-08 19:44:38 -05:00
jenkins 1722a598ce weight img 2023-02-08 18:59:05 -05:00
jenkins aed4e7feaa Tracking page 2023-02-08 18:22:22 -05:00
Chukwumdiebube 02fb7dbae0 updated reminder state 2023-02-08 20:51:00 +01:00
Chukwumdiebube b8c12cec6b changed messages 2023-02-08 19:42:40 +01:00
Chukwumdiebube f360bb4b8a Values modified 2023-02-08 19:41:03 +01:00
Chukwumdiebube 0b0b258d49 Added rounded edges on select boxes 2023-02-08 18:51:12 +01:00
ChineseChikki 26ccd78be9 icons changed 2023-02-08 17:41:59 +01:00
Chukwumdiebube a26f7c3bae Add reminder button modified 2023-02-08 14:59:43 +01:00
tokslaw b4dba45fae Merge branch 'activate_edit_reminder_conflict_fixed' of MyFit/users-myfit into master 2023-02-08 13:18:02 +00:00
victorAnumudu 368a8f2b53 Fixed activate edit reminder conflict 2023-02-08 13:21:41 +01:00
jenkins 099ace7f73 Track item table 2023-02-07 21:09:20 -05:00
jenkins 449a7d40ee Track Category 2023-02-07 21:06:23 -05:00
jenkins 046e1f5c37 Styling reminders 2023-02-07 20:32:04 -05:00
jenkins cee6a10dce Notes spelling error 2023-02-07 19:55:26 -05:00
tokslaw 05b2d2e3c9 Merge branch 'expired_session_redirect' of MyFit/users-myfit into master 2023-02-06 23:48:42 +00:00
tokslaw f49f246637 Merge branch 'theme-color-login' of MyFit/users-myfit into master 2023-02-06 23:27:46 +00:00
tokslaw b51ee6170e Merge branch 'change_icons_dashboard' of MyFit/users-myfit into master 2023-02-06 23:27:22 +00:00
Chukwumdiebube 82ebf969d0 theme color changed 2023-02-07 00:15:08 +01:00
Chukwumdiebube 9d98e156cb merged the two actions in bubble 2023-02-07 00:03:15 +01:00
Chukwumdiebube a724e35d99 reminder bubble 2023-02-06 23:43:45 +01:00
Chukwumdiebube 733478170f added style for reminder bubble 2023-02-06 23:32:36 +01:00
Chukwumdiebube bc74d0a854 arranged styles 2023-02-06 22:42:29 +01:00
Chukwumdiebube 4237947003 Images added 2023-02-06 21:58:45 +01:00
victorAnumudu a28b362034 notifies that session is abou to expire and routes to login when session expires 2023-02-06 21:51:10 +01:00
tokslaw 86d379ac38 Merge branch 'format_date_safari_bug' of MyFit/users-myfit into master 2023-02-06 19:04:42 +00:00
victorAnumudu 61d2ddd4a2 changed date method 2023-02-06 17:41:08 +01:00
tokslaw 35ccdff4a6 Merge branch 'add_reminder_conflict_fixed_victor' of MyFit/users-myfit into master 2023-02-06 13:15:56 +00:00
victorAnumudu 272ea60abc add reminder conflict fixed 2023-02-06 14:11:26 +01:00
Olu Amey ac8ecba36d Updated gitignore 2023-02-06 08:06:24 -05:00
victorAnumudu ad84db5eb2 add reminder conflict fixed 2023-02-06 14:04:47 +01:00
tokslaw 19491f6aad Merge branch 'Reminder_Link' of MyFit/users-myfit into master 2023-02-06 12:44:09 +00:00
tokslaw 2ac5db9e05 Merge branch 'reminder_category_dropdown_victor' of MyFit/users-myfit into master 2023-02-06 12:25:21 +00:00
jenkins 8645221684 Blog card 2023-02-05 18:58:40 -05:00
jenkins 2540b75837 Blog data resources 2023-02-05 18:30:36 -05:00
jenkins e15fd84676 Resoues point started 2023-02-05 17:18:40 -05:00
victorAnumudu 6f8adf5aeb implemented category drop down list and filtering 2023-02-05 15:08:55 +01:00
tokslaw 6f29a1f7e0 Merge branch 'no_reminder_item_victor' of MyFit/users-myfit into master 2023-02-05 03:41:12 +00:00
tokslaw 9894925377 Merge branch 'user_login_history' of MyFit/users-myfit into master 2023-02-05 03:40:41 +00:00
victorAnumudu fb1e328bb6 implemented the display for no user reminder item 2023-02-05 01:16:32 +01:00
victorAnumudu d7e1fa7ccb implemented user login history 2023-02-05 00:15:40 +01:00
jenkins 76dbfde6be send member_id 2023-02-04 09:36:29 -05:00
tokslaw 1092c6d5a3 Merge branch 'env4Tracking&Resources' of MyFit/users-myfit into master 2023-02-04 13:27:23 +00:00
tokslaw fdd3dbe99a Merge branch 'format-calender' of MyFit/users-myfit into master 2023-02-04 13:23:51 +00:00
tokslaw f319003e40 Merge branch 'task13-reminder-name' of MyFit/users-myfit into master 2023-02-04 13:23:42 +00:00
Chukwumdiebube e6ba42afcd env variables created 2023-02-04 06:28:15 +01:00
Chukwumdiebube 0170f03e10 calender size formatted 2023-02-04 06:14:07 +01:00
Chukwumdiebube d984773e08 reminder link activated 2023-02-04 00:28:57 +01:00
DESKTOP-QHP1O2H\MIKE ebcfa8da27 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit into task13-reminder-name 2023-02-03 18:16:52 -05:00
DESKTOP-QHP1O2H\MIKE 0b659816be fixed name length and no reminder scenario 2023-02-03 18:16:15 -05: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
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
Olu Amey 73af103173 Mobile menu items 2023-01-26 06:42:40 -05:00
Olu Amey 4ee02e506a favicon 2023-01-25 20:16:53 -05:00
Olu Amey 9efc71fda4 logo try 2023-01-25 20:00:35 -05:00
Olu Amey 8c201feec6 notification parts 2023-01-25 19:54:23 -05:00
Olu Amey 1618d70419 Profile page 2023-01-25 17:14:31 -05:00
Olu Amey 0250d37679 Page Lyout 2023-01-25 17:05:49 -05:00
Olu Amey 0e91d44bc3 Side image 2023-01-25 15:53:36 -05:00
Olu Amey bae7addbf0 Side image 2023-01-25 15:50:17 -05:00
Olu Amey 154819aa19 logo 2023-01-25 15:05:18 -05:00
Olu Amey b0e72c62d3 Try logo 2023-01-25 15:00:12 -05:00
Olu Amey 9fad884632 Calendar Page 2023-01-25 14:53:17 -05:00
jenkins fee958f0b0 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit 2023-01-25 13:24:02 -05:00
jenkins 493d28c7d8 placeholder text update 2023-01-25 13:22:54 -05:00
Olu Amey 9907480ff8 Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit 2023-01-25 13:21:42 -05:00
Olu Amey 33caedd8aa Pages added 2023-01-25 13:20:56 -05:00
jenkins bf2dbb7176 placeholder text 2023-01-25 13:18:39 -05:00
tokslaw 4de7f3a012 Merge branch 'login_michael' of MyFit/users-myfit into master 2023-01-25 18:10:15 +00:00
tokslaw 764c949499 Merge branch 'task-4-reset-password-page-chinenye' of MyFit/users-myfit into master 2023-01-25 18:08:57 +00:00
jenkins 6e906bcb0d Merge branch 'master' of https://gitlab.chiefsoft.net/MyFit/users-myfit 2023-01-25 12:46:19 -05:00
jenkins fbe9615b03 Logout msg 2023-01-25 12:45:52 -05:00
jenkins 72e898cd58 logout text 2023-01-25 12:43:22 -05:00
tokslaw 2ec1d1b535 Merge branch 'straight_underline_login_page_victor' of MyFit/users-myfit into master 2023-01-25 17:36:49 +00:00
ChineseChikki e3ae854781 updated reset password 2023-01-25 10:56:11 +01:00
victorAnumudu 4457276f08 made the curve underline straight 2023-01-25 09:40:12 +01:00
ChineseChikki 475949b8b8 forgot password page is working now 2023-01-24 17:24:06 +01:00
366 changed files with 34806 additions and 1269 deletions
Regular → Executable
+8 -2
View File
@@ -7,5 +7,11 @@ REACT_APP_APPSITE=" https://myfitapp.mermsemr.com"
#REACT_APP_APPSITE="http://localhost:7012"
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_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_PASSWORD_ENDPOINT="https://devapi.mermsemr.com/en/desktop/api/v2/myfituser/resetpass"
REACT_APP_SESSION_EXPIRE_MINUTES=15
REACT_APP_TRACKING="Tracking"
REACT_APP_RESOURCES="Resources"
Regular → Executable
View File
Regular → Executable
+3
View File
@@ -5,6 +5,9 @@
/.pnp
.pnp.js
/.idea
/.vscode
# testing
/coverage
+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
+2 -1
View File
@@ -1,6 +1,7 @@
version: '3'
services:
user-myfit:
users-myfit:
image: registry.myfit.ai/users-myfit:latest
build:
context: .
dockerfile: docker/Dockerfile
Regular → Executable
View File
+13742
View File
File diff suppressed because it is too large Load Diff
+13839
View File
File diff suppressed because it is too large Load Diff
Regular → Executable
+5 -1
View File
@@ -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",
Regular → Executable
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

BIN
View File
Binary file not shown.

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
+2 -5
View File
@@ -2,13 +2,10 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.svg" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<meta name="description" content="Cloud-based electronic health record platform for all users. patient health record, family health record">
<meta name="developed" content="MERMS-myFit" />
<meta name="published" content="MERMS-myFit" />
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
View File
Regular → Executable
+26 -2
View File
@@ -22,6 +22,16 @@ import UpdatePasswordPages from "./views/UpdatePasswordPages";
import UploadProductPage from "./views/UploadProductPage";
import UserProfilePage from "./views/UserProfilePage";
import VerifyYouPages from "./views/VerifyYouPages";
import VerifySignupPage from "./views/VerifySignupPage";
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";
import VerifySignupCompletePage from "./views/VerifySignupCompletePage";
export default function Routers() {
return (
@@ -41,16 +51,30 @@ export default function Routers() {
element={<UpdatePasswordPages />}
/>
<Route exact path="/verify-you" element={<VerifyYouPages />} />
<Route exact path="/verify-signup" element={<VerifySignupPage />} />
<Route exact path="/complete-signup" element={<VerifySignupCompletePage />} />
{/* private route */}
<Route element={<AuthRoute />}>
<Route exact path="/" element={<HomePages />} />
<Route exact path="/active-bids" element={<AcitveBidsPage />} />
{/* <Route exact path="/active-bids" element={<AcitveBidsPage />} />
<Route exact path="/notification" element={<Notification />} />
<Route exact path="/market-place" element={<MarketPlacePage />} />
<Route exact path="/shop-details" element={<ShopDetailsPage />} />
<Route exact path="/my-wallet" element={<MyWalletPage />} />
<Route exact path="/my-collection" element={<MyCollection />} />
<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"
View File
View File
View File
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 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

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 198 KiB

View File

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

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