Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
259 commits
Select commit Hold shift + click to select a range
6d19b44
adds correct categories to videos view
zachegnermh Aug 10, 2022
9989d06
Added preferences table and UI in user profile.
juan-rivera-2020 Aug 11, 2022
3e6ab34
merge with navbarMods_jr
zachegnermh Aug 11, 2022
3208403
adds videos Linked List
zachegnermh Aug 11, 2022
0826ac1
WIP-adds video modal popout feature after notification is clicked wit…
zachegnermh Aug 11, 2022
c0b1edd
Updated app logo and finished preferences matrix.
juan-rivera-2020 Aug 12, 2022
677efd2
adds click outside redirect to videos
zachegnermh Aug 12, 2022
9a6bd95
Merge branch 'preferences_schema' of github.com:MicroHealthLLC/well-b…
zachegnermh Aug 12, 2022
53418cb
WIP-video modal
zachegnermh Aug 12, 2022
cdc72b5
blank commit
microhealthamand Aug 12, 2022
742f3da
updates videos data structure
zachegnermh Aug 12, 2022
8d8ed94
adds video cards
zachegnermh Aug 13, 2022
884b8ca
changes logo on verify screen and tab title
zachegnermh Aug 13, 2022
e9edc94
WIP:preferences.
juan-rivera-2020 Aug 13, 2022
3381812
Changes in amplify related files
microhealthamand Aug 13, 2022
b371568
Adds filtering for videos page
zachegnermh Aug 13, 2022
de2f4e9
Merge branch 'navbarMods_jr' of https://github.com/MicroHealthLLC/wel…
juan-rivera-2020 Aug 14, 2022
ab3d442
updates notification route to go to specified category and level vide…
zachegnermh Aug 14, 2022
af54fe1
Added auto-generated fitness level selection on Activities page.
juan-rivera-2020 Aug 14, 2022
77194ff
updates Videos page, video cards
zachegnermh Aug 14, 2022
ffbec8e
Merge branch 'videos_ze812' of github.com:MicroHealthLLC/well-beeing …
zachegnermh Aug 14, 2022
99ca4f8
Merge branch '14augjr' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Aug 15, 2022
2f00146
WIP:null values bug
juan-rivera-2020 Aug 15, 2022
84ef2e4
updates videocards and video modal
zachegnermh Aug 15, 2022
b2344f2
Fix conflict in schema file.
juan-rivera-2020 Aug 15, 2022
39ba3f4
Fixed preferences bug, updated css for small viewports.
juan-rivera-2020 Aug 15, 2022
0dfc831
edits videos page
zachegnermh Aug 15, 2022
e33d634
fixes video card alignment
zachegnermh Aug 16, 2022
91024fc
Harcoded progress values.
juan-rivera-2020 Aug 16, 2022
e2a9200
Merge branch 'videoUI815' of https://github.com/MicroHealthLLC/well-b…
juan-rivera-2020 Aug 16, 2022
8552101
Modified Videos UI.
juan-rivera-2020 Aug 16, 2022
467a7dc
FIxed video display bug.
juan-rivera-2020 Aug 16, 2022
75858e5
Forgot file.
juan-rivera-2020 Aug 16, 2022
2042ead
FIxing videos bug.
juan-rivera-2020 Aug 16, 2022
9c79084
minor changes, updates videos array in mixins to mcVideos
zachegnermh Aug 16, 2022
0979dcf
WIP-adding YT vids to videos page
zachegnermh Aug 17, 2022
ba2917d
Fixed filtering in Videos page.
juan-rivera-2020 Aug 17, 2022
fdc8f51
WIP-adding YTvideos
zachegnermh Aug 18, 2022
401f56d
WIP:Goals and Activities redesign.
juan-rivera-2020 Aug 18, 2022
903ba45
WIP:Goals and Activities redesign.
juan-rivera-2020 Aug 18, 2022
850dc09
adds Youtube videos to videos page, able to add and delete videos
zachegnermh Aug 18, 2022
d0ff887
Merge branch 'sandbox_jr' of github.com:MicroHealthLLC/well-beeing in…
zachegnermh Aug 18, 2022
1b090f7
adjust font wieght for Video headings
zachegnermh Aug 18, 2022
83a8da6
WIP:Associateing activities with goals.
juan-rivera-2020 Aug 19, 2022
bc7e803
WIP:
juan-rivera-2020 Aug 19, 2022
f72ee04
Merge branch 'sandbox_jr' of https://github.com/MicroHealthLLC/well-b…
juan-rivera-2020 Aug 19, 2022
ce6cd7c
changes birthdate field to phoneNumber with validation
zachegnermh Aug 19, 2022
0c51dd7
WIP: Adding goal to reminders.
juan-rivera-2020 Aug 19, 2022
229f961
WIP: Adding goal to reminders.
juan-rivera-2020 Aug 19, 2022
42e7a7f
Merge branch 'videoUI815' of github.com:MicroHealthLLC/well-beeing in…
zachegnermh Aug 19, 2022
e88e882
removes country code(+1) from phone number UI
zachegnermh Aug 19, 2022
c9e1210
Adding form components
microhealthamand Aug 21, 2022
efa71de
Adding goal and association
microhealthamand Aug 22, 2022
a7da99b
Fix issue with goal api
microhealthamand Aug 22, 2022
70169d6
Merge branch 'sandbox_jr_1_2' of github.com:MicroHealthLLC/well-beein…
zachegnermh Aug 22, 2022
02efe8d
removes strict phone number format from sign up page
zachegnermh Aug 22, 2022
0ac70d7
adds hover event to videoNum buttons to display play icon
zachegnermh Aug 22, 2022
beed624
fixes phone num bug
zachegnermh Aug 22, 2022
4cb7eb0
adds fetchVideos after video is added by user
zachegnermh Aug 22, 2022
2bea755
changes delete video dialog width
zachegnermh Aug 22, 2022
5cb3696
fixes bug in prefs table when sorting columns
zachegnermh Aug 22, 2022
63f86c1
fixes video page bug where videos dont display after reload
zachegnermh Aug 23, 2022
8630068
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Aug 23, 2022
e378f01
WIP:Associating activities with goals.
juan-rivera-2020 Aug 23, 2022
c9c56eb
Resolved conflict
juan-rivera-2020 Aug 23, 2022
d3aacbe
Merge branch 'jr_22aug22' of github.com:MicroHealthLLC/well-beeing in…
zachegnermh Aug 23, 2022
dd4a85f
WIP: Associating goals and activities.
juan-rivera-2020 Aug 23, 2022
8165b04
Merge pull request #82 from MicroHealthLLC/sandbox_phoneNum_signup
juan-rivera-2020 Aug 23, 2022
038c248
Merge pull request #83 from MicroHealthLLC/videosTooltips
juan-rivera-2020 Aug 23, 2022
6f40d98
Merge pull request #84 from MicroHealthLLC/prefs_bug_ze
juan-rivera-2020 Aug 23, 2022
83d2e22
Merge branch 'sandbox' of https://github.com/MicroHealthLLC/well-beei…
juan-rivera-2020 Aug 23, 2022
88a64e2
Fix issue with saving activity
microhealthamand Aug 23, 2022
56963fb
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Aug 23, 2022
f8e0381
Merge branch 'jr_22aug22' of github.com:MicroHealthLLC/well-beeing in…
zachegnermh Aug 23, 2022
2a26e4f
Fix issue with goal creation
microhealthamand Aug 23, 2022
fd27b25
Merge pull request #86 from MicroHealthLLC/jr_22aug22
juan-rivera-2020 Aug 23, 2022
ca781bd
Merge branch 'jr_22aug22' of github.com:MicroHealthLLC/well-beeing in…
zachegnermh Aug 24, 2022
c5657a1
fixes video page, NA videos not displaying
zachegnermh Aug 24, 2022
48e30a3
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Aug 24, 2022
e26e88a
Merge pull request #87 from MicroHealthLLC/videoBackend_ze
zachegnermh Aug 24, 2022
9c6e0cb
WIP:added backend for watched videos
zachegnermh Aug 24, 2022
f269cfb
Added activity names array and goal title free text.
juan-rivera-2020 Aug 25, 2022
57b3565
WIP-improves watchedVideo sequencing
zachegnermh Aug 25, 2022
2490c85
Merge branch 'jr_24aug' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Aug 25, 2022
8fb2963
Merge branch 'videoBackend_ze' of github.com:MicroHealthLLC/well-beei…
zachegnermh Aug 25, 2022
5fef2b3
adds counting capability to videos for Activity progress bars, adds s…
zachegnermh Aug 26, 2022
2a99a1c
Goal card back: Added vertical scroll container to activities list.
juan-rivera-2020 Aug 26, 2022
89e15e8
Blank
juan-rivera-2020 Aug 26, 2022
f5a6672
edits YouTube Card UI
zachegnermh Aug 29, 2022
387da93
Merge branch 'jr_24aug' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Aug 29, 2022
a64a2bb
adds badge for watched video on videos page video card
zachegnermh Aug 29, 2022
f1875ba
adds green check to badge
zachegnermh Aug 29, 2022
7ed977c
removes watchedVideo testing btns from videos page, adds 'removeAll' …
zachegnermh Aug 29, 2022
a1214ae
adds dynamic value to goal progress bar
zachegnermh Aug 29, 2022
84a4802
adds activity counts to goal cards
zachegnermh Aug 29, 2022
df91b71
Reverted Activity dropdown data back to filteredCategories. Modified…
juan-rivera-2020 Aug 29, 2022
2b9285b
Merge branch 'jr_24aug' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Aug 29, 2022
e184a97
rounds progress values to whole numbers
zachegnermh Aug 30, 2022
0070f12
Fixed bug in Goals form and rolled back form to sandbox version.
juan-rivera-2020 Aug 30, 2022
289db33
changes reminder frequency choices
zachegnermh Aug 30, 2022
e75e408
fixes NaN error on progress bar tooltip
zachegnermh Aug 30, 2022
4e0d9fb
Merge branch 'jr_24aug' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Aug 30, 2022
4ad2dcd
fixes bug with progressbar and counts for flexibility category
zachegnermh Aug 30, 2022
8a8aeac
Added default activity to newly created goal.
juan-rivera-2020 Aug 30, 2022
7c4db17
changes freq in currentgoals to reflect other forms
zachegnermh Aug 30, 2022
b5e0b0a
Merge pull request #89 from MicroHealthLLC/videos_ze826
juan-rivera-2020 Aug 31, 2022
782e9ef
Resolving queries update issue.
juan-rivera-2020 Aug 31, 2022
0399827
Resolving queries update issue.
juan-rivera-2020 Aug 31, 2022
57da1d6
removes infinite console log loop
zachegnermh Aug 31, 2022
8d8dc16
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Aug 31, 2022
5fe46f4
Update videos-mixin.js
zachegnermh Aug 31, 2022
fba2e7c
fixes bug with activity category after adding from goal
zachegnermh Aug 31, 2022
fdf28ce
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Aug 31, 2022
198c487
Merge pull request #90 from MicroHealthLLC/videos_ze826
zachegnermh Aug 31, 2022
561f059
fixes bug with progress bar on goal, displaying wrong
zachegnermh Aug 31, 2022
dadbda2
Merge pull request #91 from MicroHealthLLC/videos_ze826
zachegnermh Aug 31, 2022
6484c7a
changes service-worker level naming convention
zachegnermh Sep 6, 2022
e75d232
adds UI to reminder card for completed goal
zachegnermh Sep 7, 2022
eb73cc8
WIP: Goal completion lifecyle..Do not merge.
juan-rivera-2020 Sep 8, 2022
e73194e
refactor code for usability
zachegnermh Sep 8, 2022
88cd588
changes to reminders
zachegnermh Sep 9, 2022
303b9ec
Merge branch 'activity_completion9722' of https://github.com/MicroHea…
juan-rivera-2020 Sep 9, 2022
01cdf58
edits notification to only fire on not completed
zachegnermh Sep 9, 2022
14b59d9
changes completed reminder card to white and unflippable
zachegnermh Sep 9, 2022
ec47ff1
adds isComplete to reminder schema
zachegnermh Sep 9, 2022
6f5cc53
adds View Activity Modal to completed reminder
zachegnermh Sep 9, 2022
632e2ef
WIP: Confetti experience...Do not merge
juan-rivera-2020 Sep 9, 2022
d03086d
adds reset activity
zachegnermh Sep 12, 2022
d2606c6
Goal completion UI done.
juan-rivera-2020 Sep 12, 2022
2a18fed
Merge branch 'activity_completion9722' of https://github.com/MicroHea…
juan-rivera-2020 Sep 12, 2022
33402bb
Merge branch 'confetti_branch' of github.com:MicroHealthLLC/well-beei…
zachegnermh Sep 12, 2022
4f84fdf
Goal completion UI done.
juan-rivera-2020 Sep 12, 2022
9f06fa8
adds watch method for reminder card completion
zachegnermh Sep 12, 2022
939d749
edits goal flag display for completed condition and level to complted…
zachegnermh Sep 12, 2022
6476783
Finished Goals UI and confetti experience.
juan-rivera-2020 Sep 12, 2022
f8ba720
Merge branch 'activity_completion9722' of https://github.com/MicroHea…
juan-rivera-2020 Sep 12, 2022
b842672
Merge branch 'confetti_branch' of github.com:MicroHealthLLC/well-beei…
zachegnermh Sep 12, 2022
dbda7dd
Updated completed Activity card buttons.
juan-rivera-2020 Sep 12, 2022
7db8cfc
.
zachegnermh Sep 12, 2022
4a00847
Merge branch 'confetti_branch' of github.com:MicroHealthLLC/well-beei…
zachegnermh Sep 12, 2022
a7cba42
Added filter in Goal cards to prevent saving duplicate activities.
juan-rivera-2020 Sep 12, 2022
775e60c
removes duplicate activity card update
zachegnermh Sep 12, 2022
f6a43a5
Merge branch 'confetti_branch' of github.com:MicroHealthLLC/well-beei…
zachegnermh Sep 13, 2022
c8af3db
adds tooltips to btns on completed Goal and Activity
zachegnermh Sep 13, 2022
dbbc076
Ready for sanbox merge
juan-rivera-2020 Sep 13, 2022
476d294
Merge pull request #98 from MicroHealthLLC/activity_completion9722
juan-rivera-2020 Sep 13, 2022
ec243f3
Merge pull request #99 from MicroHealthLLC/confetti_branch
juan-rivera-2020 Sep 13, 2022
ef11798
adds method for remove actvity with < 100 progress from completed
zachegnermh Sep 13, 2022
76ff7c1
WIP: Added reuseGoal method. Needs reset video logic within the reu…
juan-rivera-2020 Sep 13, 2022
9e397c7
changes activity frequency UI
zachegnermh Sep 13, 2022
414c953
changes to completed activity card
zachegnermh Sep 13, 2022
b7e1b0b
Merge pull request #100 from MicroHealthLLC/ze_91322
zachegnermh Sep 13, 2022
16b4a5d
fixes deleteWatchedVideo bug
zachegnermh Sep 14, 2022
ab98987
adds frequency to form in currentGoals
zachegnermh Sep 14, 2022
25b152a
Merge pull request #101 from MicroHealthLLC/ze_91322
zachegnermh Sep 14, 2022
e9eaa01
Resolved conflicts.
juan-rivera-2020 Sep 14, 2022
41da5f7
Merge pull request #103 from MicroHealthLLC/reuseCompletedGoal_jr
juan-rivera-2020 Sep 14, 2022
404d4da
WIP: Do not merge
juan-rivera-2020 Sep 14, 2022
c36f46d
WIP: Do not merge
juan-rivera-2020 Sep 14, 2022
6b5c54f
fixes notifcation trigger
zachegnermh Sep 14, 2022
36a147c
edits Reminder card & form for minor UI adjustment
zachegnermh Sep 14, 2022
a3c4a36
Merge pull request #104 from MicroHealthLLC/ze_91322
juan-rivera-2020 Sep 15, 2022
0fb8308
Merge branch 'sandbox' of https://github.com/MicroHealthLLC/well-beei…
juan-rivera-2020 Sep 15, 2022
96f5e1c
fixes Frequency issue from not disiplaying in edit form
zachegnermh Sep 15, 2022
19393c5
Merge pull request #105 from MicroHealthLLC/ze_915
zachegnermh Sep 15, 2022
71e7b23
Finished reuseGoal method; Fixed confetti event listener
juan-rivera-2020 Sep 15, 2022
0a10208
wip
zachegnermh Sep 15, 2022
d696adf
Merge branch 'reuseCompletedGoal_jr' of github.com:MicroHealthLLC/wel…
zachegnermh Sep 15, 2022
a689222
UI edits to forms and watch for activity
zachegnermh Sep 15, 2022
be4bd5c
Fixed error in reuse button in confetti modal.
juan-rivera-2020 Sep 15, 2022
640d448
Merge branch 'ze_915' into reuseCompletedGoal_jr
juan-rivera-2020 Sep 15, 2022
cc13b17
Merge pull request #107 from MicroHealthLLC/reuseCompletedGoal_jr
juan-rivera-2020 Sep 15, 2022
39eec0d
Merge pull request #108 from MicroHealthLLC/ze_915
juan-rivera-2020 Sep 15, 2022
7f0a02d
fix for goal form display
zachegnermh Sep 16, 2022
d8f8b97
WIP - replaces tooltip with popover on activity card
zachegnermh Sep 16, 2022
d01e547
edits popover and frequency label ',' bug
zachegnermh Sep 19, 2022
6662a51
Merge pull request #109 from MicroHealthLLC/popover
zachegnermh Sep 19, 2022
380c31f
restores tooltip, bug found
zachegnermh Sep 19, 2022
31101c3
adds SSO, not working due to AD error
zachegnermh Sep 22, 2022
7e65af8
modifes height of goal card to match activity card
zachegnermh Sep 22, 2022
b14938c
fixes SSO for Beta
zachegnermh Sep 23, 2022
7c3c5a3
Merge branch 'SSO' of github.com:MicroHealthLLC/well-beeing into sandbox
zachegnermh Sep 23, 2022
055bbe5
Merge pull request #117 from MicroHealthLLC/SSO
juan-rivera-2020 Sep 23, 2022
c05bae6
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Sep 26, 2022
5447244
Added default preferences on start up.
juan-rivera-2020 Sep 26, 2022
a533ed3
fixes render issue when no user is logged in
zachegnermh Sep 26, 2022
d8fbb2d
Merge pull request #122 from MicroHealthLLC/SSO_92622
juan-rivera-2020 Sep 26, 2022
d8551d5
Merge pull request #123 from MicroHealthLLC/sso_env_variables
juan-rivera-2020 Sep 26, 2022
fcc2e30
fixes redirect after logout
zachegnermh Sep 26, 2022
385cdc4
Updates.
juan-rivera-2020 Sep 26, 2022
61c7233
Merge branch 'sandbox' of https://github.com/MicroHealthLLC/well-beei…
juan-rivera-2020 Sep 26, 2022
dd52844
Giving default user video settings.
juan-rivera-2020 Sep 26, 2022
0ec6890
Merge pull request #124 from MicroHealthLLC/sso_env_variables
juan-rivera-2020 Sep 26, 2022
a710c17
Saving default Preferences for new user.
juan-rivera-2020 Sep 27, 2022
870d298
Merge pull request #125 from MicroHealthLLC/pref_bug
juan-rivera-2020 Sep 27, 2022
ad97c9d
Removed duplicate goalCompletion confetti modal.
juan-rivera-2020 Sep 28, 2022
2c7eeaa
removes 'Remove All Watched Videos' button for Beta
zachegnermh Sep 28, 2022
aaf05e4
improves UI on Completed Goal Form and frequency label on activity form
zachegnermh Sep 28, 2022
f7fc258
Merge branch '115_ze' of github.com:MicroHealthLLC/well-beeing into z…
zachegnermh Sep 28, 2022
652e8a6
Merge branch 'fixConfettiModal' of github.com:MicroHealthLLC/well-bee…
zachegnermh Sep 28, 2022
9015090
removes progress bar from goal 'trophy' if completed
zachegnermh Sep 28, 2022
9619a02
Merge pull request #130 from MicroHealthLLC/ze_92822
zachegnermh Sep 28, 2022
9878063
Fixed Goal edit form save issue; commented out several console-logs.
juan-rivera-2020 Sep 30, 2022
ba8c871
Merge pull request #132 from MicroHealthLLC/goals_jr_930
juan-rivera-2020 Sep 30, 2022
91e3640
Moved Goal card edit and delete buttons to lower left of back of card.
juan-rivera-2020 Sep 30, 2022
5ebde1d
edits activity card
zachegnermh Sep 30, 2022
c015cfe
Merge branch 'sandbox' of github.com:MicroHealthLLC/well-beeing into …
zachegnermh Sep 30, 2022
452577e
replaces button words with icons/tooltips
zachegnermh Sep 30, 2022
5d5fcba
WIP.
juan-rivera-2020 Sep 30, 2022
ea98952
Added Goal Activities and ability to delete Goal Activities in Goal e…
juan-rivera-2020 Sep 30, 2022
125d8dc
Added Goal Activities and ability to delete Goal Activities in Goal e…
juan-rivera-2020 Sep 30, 2022
43be105
Finished Goal Activities delet functionality.
juan-rivera-2020 Sep 30, 2022
90c40d3
Merge pull request #136 from MicroHealthLLC/goals_jr_930
juan-rivera-2020 Sep 30, 2022
4f61264
Hiding navbar tabs that aren't in use yet.
juan-rivera-2020 Oct 3, 2022
9a1f9fc
fixing Reminder card buttons.
juan-rivera-2020 Oct 3, 2022
f0d37e8
adds condition for goal flag on activity card
zachegnermh Oct 3, 2022
82c4753
fixes
zachegnermh Oct 3, 2022
15f6ca0
Fixes Goal card delete btn funtionality
juan-rivera-2020 Oct 3, 2022
9dbeb7c
fixes 'cancel' functionality for forms
zachegnermh Oct 3, 2022
7044bf5
WIP: Finished new UI for Goal removal button.
juan-rivera-2020 Oct 4, 2022
7998591
fixes issue 140, small UI updates
zachegnermh Oct 4, 2022
0e96bef
Merge pull request #141 from MicroHealthLLC/UX_ze_10322
zachegnermh Oct 4, 2022
1105a18
changes completed card buttons to icons
zachegnermh Oct 4, 2022
bc594a9
Changed Goal activitiy action from delete to remove.
juan-rivera-2020 Oct 4, 2022
1093e45
Merge branch 'sandbox' into fixGoalDeleteBtn
juan-rivera-2020 Oct 4, 2022
dee0614
Merge pull request #142 from MicroHealthLLC/fixGoalDeleteBtn
juan-rivera-2020 Oct 4, 2022
9360fd9
WIP - help icon link
zachegnermh Oct 4, 2022
0dc756a
Merge branch 'UX_ze_10322' of github.com:MicroHealthLLC/well-beeing i…
zachegnermh Oct 4, 2022
46b8a26
adjust activity buttons
zachegnermh Oct 4, 2022
8b126cc
changes toggle notifications label
zachegnermh Oct 4, 2022
26a1864
Updated confetti modal button icons.
juan-rivera-2020 Oct 4, 2022
a0a18a6
Merge branch 'fixGoalDeleteBtn' of https://github.com/MicroHealthLLC/…
juan-rivera-2020 Oct 4, 2022
bc2e1fc
moves Notification toggle switch
zachegnermh Oct 5, 2022
0a247bb
Removed categories dropdown filter from Goal cards.
juan-rivera-2020 Oct 5, 2022
5ad2db5
modifies 'AddVideo' modal
zachegnermh Oct 5, 2022
7c67d79
Merge pull request #143 from MicroHealthLLC/fixGoalDeleteBtn
juan-rivera-2020 Oct 5, 2022
4c12307
Merge pull request #144 from MicroHealthLLC/undo_toggle_jr
juan-rivera-2020 Oct 5, 2022
75b2ca1
changes reminders watch property
zachegnermh Oct 5, 2022
8e8b0ec
Merge branch 'ze_10522' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Oct 5, 2022
9acbd9f
updates Video cards and modal buttons
zachegnermh Oct 5, 2022
74d855c
fixes add video form
zachegnermh Oct 6, 2022
c15125e
adds ability to remove associated goal from Activity card
zachegnermh Oct 6, 2022
d5b5d2a
Merge pull request #147 from MicroHealthLLC/ze_10522
zachegnermh Oct 6, 2022
4b47ab9
fixes youtube validation
zachegnermh Oct 6, 2022
3f1df32
Changed back of goal card height from overflow scroll to minHeightwi…
juan-rivera-2020 Oct 11, 2022
0b3bd1f
Merge pull request #149 from MicroHealthLLC/7oct_fixes_jr
juan-rivera-2020 Oct 11, 2022
30c47ab
changes domain for SSO
zachegnermh Oct 26, 2022
8db2b7f
edits sso config for custom domain
zachegnermh Oct 26, 2022
21cf333
T
katelyn-gomez Feb 9, 2023
ef38da8
Merge pull request #162 from MicroHealthLLC/kgBranch
katelyn-gomez Feb 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module.exports = {
env: {
node: true,
},
extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"],
extends: ["plugin:vue/essential", "eslint:recommended"],
parserOptions: {
parser: "babel-eslint",
},
Expand Down
5 changes: 3 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ pnpm-debug.log*
*.sln
*.sw?

amplify/team-provider-info.json
amplify/backend/api/wellbeeing/resolvers

#amplify-do-not-edit-begin
amplify/\#current-cloud-backend
amplify/.config/local-*
Expand All @@ -43,5 +46,3 @@ amplifytools.xcconfig
.secret-*
**.sample
#amplify-do-not-edit-end
amplify/team-provider-info.json
amplify/backend/api/wellbeeing/resolvers
8 changes: 8 additions & 0 deletions amplify/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# Getting Started with Amplify CLI
This directory was generated by [Amplify CLI](https://docs.amplify.aws/cli).

Helpful resources:
- Amplify documentation: https://docs.amplify.aws
- Amplify CLI documentation: https://docs.amplify.aws/cli
- More details on this folder & generated files: https://docs.amplify.aws/cli/reference/files
- Join Amplify's community: https://amplify.aws/community/
298 changes: 149 additions & 149 deletions amplify/backend/api/wellbeeing/.migration-backup/schema.graphql
Original file line number Diff line number Diff line change
@@ -1,149 +1,149 @@
type Reminder @model @auth(rules: [{ allow: owner }]) {
id: ID!
category: Category!
level: Level!
frequency: String!
contentType: String!
time: String!
}

type Goal @model @auth(rules: [{ allow: owner }]) {
id: ID!
title: String!
category: Category!
progress: Int!
stepCount: Int
dueDate: AWSDate!
isComplete: Boolean
completedCount: Int
checklist: [ChecklistItem]
}

type ChecklistItem {
title: String
isComplete: Boolean
}

type Article
@model
@key(
name: "articlesByCategory"
fields: ["category", "createdAt"]
queryField: "articlesByCategory"
)
@auth(
rules: [
{ allow: groups, groups: ["Editors"] }
{ allow: private, operations: [read] }
]
) {
id: ID!
author: String!
lastEditedBy: String!
title: String!
body: String!
category: Category!
level: Level!
createdAt: AWSDateTime!
image: String
imageCredit: String
}

type Video
@model
@key(
name: "videosByCategory"
fields: ["category", "createdAt"]
queryField: "videosByCategory"
)
@auth(
rules: [
{ allow: groups, groups: ["Editors"] }
{ allow: private, operations: [read] }
]
) {
id: ID!
resourceId: String!
level: Level!
category: Category!
createdAt: AWSDateTime!
}

type FavoriteArticle @model @auth(rules: [{ allow: owner }]) {
id: ID!
articleId: ID!
category: Category!
level: Level!
article: Article @connection(fields: ["articleId"])
}

type FavoriteVideo @model @auth(rules: [{ allow: owner }]) {
id: ID!
videoId: ID!
category: Category!
level: Level!
video: Video @connection(fields: ["videoId"])
}

type Event
@model
@auth(
rules: [
{ allow: groups, groups: ["Editors"] }
{ allow: private, operations: [read, update] }
]
) {
id: ID!
hostName: String!
hostEmail: AWSEmail!
title: String!
description: String!
type: String!
date: AWSDate!
startTime: String!
endTime: String!
timeZone: TimeZone
participants: [Participant]
link: String
image: String
}

type Participant {
id: String
firstName: String
lastName: String
email: AWSEmail
}

enum Category {
# Deprecated
MEDITATION
MUSCLE
POSTURE
STRESS_RELIEF
STRETCHING
YOGA
# New
BALANCE
ENDURANCE
ERGONOMICS
FLEXIBILITY_MOBILITY
MIND
NUTRITION
RECOVERY
STRENGTH
}

enum Level {
BEGINNER
INTERMEDIATE
ADVANCED
NOT_APPLICABLE
}

enum TimeZone {
PST
MST
CST
EST
}
type Reminder @model @auth(rules: [{ allow: owner }]) {
id: ID!
category: Category!
level: Level!
frequency: String!
contentType: String!
time: String!
}
type Goal @model @auth(rules: [{ allow: owner }]) {
id: ID!
title: String!
category: Category!
progress: Int!
stepCount: Int
dueDate: AWSDate!
isComplete: Boolean
completedCount: Int
checklist: [ChecklistItem]
}
type ChecklistItem {
title: String
isComplete: Boolean
}
type Article
@model
@key(
name: "articlesByCategory"
fields: ["category", "createdAt"]
queryField: "articlesByCategory"
)
@auth(
rules: [
{ allow: groups, groups: ["Editors"] }
{ allow: private, operations: [read] }
]
) {
id: ID!
author: String!
lastEditedBy: String!
title: String!
body: String!
category: Category!
level: Level!
createdAt: AWSDateTime!
image: String
imageCredit: String
}
type Video
@model
@key(
name: "videosByCategory"
fields: ["category", "createdAt"]
queryField: "videosByCategory"
)
@auth(
rules: [
{ allow: groups, groups: ["Editors"] }
{ allow: private, operations: [read] }
]
) {
id: ID!
resourceId: String!
level: Level!
category: Category!
createdAt: AWSDateTime!
}
type FavoriteArticle @model @auth(rules: [{ allow: owner }]) {
id: ID!
articleId: ID!
category: Category!
level: Level!
article: Article @connection(fields: ["articleId"])
}
type FavoriteVideo @model @auth(rules: [{ allow: owner }]) {
id: ID!
videoId: ID!
category: Category!
level: Level!
video: Video @connection(fields: ["videoId"])
}
type Event
@model
@auth(
rules: [
{ allow: groups, groups: ["Editors"] }
{ allow: private, operations: [read, update] }
]
) {
id: ID!
hostName: String!
hostEmail: AWSEmail!
title: String!
description: String!
type: String!
date: AWSDate!
startTime: String!
endTime: String!
timeZone: TimeZone
participants: [Participant]
link: String
image: String
}
type Participant {
id: String
firstName: String
lastName: String
email: AWSEmail
}
enum Category {
# Deprecated
MEDITATION
MUSCLE
POSTURE
STRESS_RELIEF
STRETCHING
YOGA
# New
BALANCE
ENDURANCE
ERGONOMICS
FLEXIBILITY_MOBILITY
MIND
NUTRITION
RECOVERY
STRENGTH
}
enum Level {
BEGINNER
INTERMEDIATE
ADVANCED
NOT_APPLICABLE
}
enum TimeZone {
PST
MST
CST
EST
}
Loading