- mdi-checkbox-marked-circle-outline mdi-flag-checkered
@@ -58,9 +58,9 @@
Repeat Goal
@@ -114,14 +114,19 @@ export default {
diff --git a/src/components/ReminderCard.vue b/src/components/ReminderCard.vue
new file mode 100644
index 0000000..6b58941
--- /dev/null
+++ b/src/components/ReminderCard.vue
@@ -0,0 +1,718 @@
+
+
+
+
+ mdi-yoga Edit Activity
+
+ Add Goal to Activity
+
+ mdi-yoga Add Activity
+
+
+ mdi-yoga View Activity
+
+
+
+
+
+
+
+
+
+ {{categoryIcon(reminder.category)}} Focus Area
+
+ {{reminder.category}}
+
+
+
+
+
+ mdi-stairs Level
+
+ {{this.levelToString(reminder.level)}}
+
+
+
+
+
+ mdi-calendar-clock-outline Frequency
+
+ {{removeComma(reminder.frequency)}}
+
+
+
+
+
+ mdi-clock Time
+
+ {{reminder.time}}
+
+
+
+
+
+ mdi-flag-checkered Associated Goal
+
+ {{reminder.goal.title}}
+ No Goal Set
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ See attached goal to reuse this activity
+
+
+
+
+ mdi-content-save
+
+
+
+
+
+ mdi-cancel
+
+
+ mdi-close
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/VideoCard.vue b/src/components/VideoCard.vue
index 63032c5..c5ab7d7 100644
--- a/src/components/VideoCard.vue
+++ b/src/components/VideoCard.vue
@@ -1,48 +1,88 @@
-
-
-
{{ goal.title }}
+ {{ goal.title }}
- Category: Focus Area:
- Last Completed: {{ new Date(goal.updatedAt).toDateString() }} + Last Completed: {{ new Date(goal.updatedAt).toDateString() }}
- Completed Count: {{ goal.completedCount }} + Completed Activities: {{ goal.completedCount }}
+
+
+
+
+
+
+
+
diff --git a/src/components/ReminderForm.vue b/src/components/ReminderForm.vue
new file mode 100644
index 0000000..184d539
--- /dev/null
+++ b/src/components/ReminderForm.vue
@@ -0,0 +1,339 @@
+
+
+
+
+
+
+
+
+ {{ reminder.goal.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ mdi-flag-checkered
+
+
+ mdi-flag-checkered
+
+
+
+ Add Activity to Goal
+
+
+
+ mdi-flag-checkered
+ mdi-plus
+
+
+
+ Activity Completed
+
+
+
+ mdi-trophy
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ categoryIcon(reminder.activity) || categoryIcon(reminder.category)
+ }}
+
+
+
+ {{ categoryString(reminder.category) }}
+
+
+ {{
+ categoryIcon(reminder.activity) || categoryIcon(reminder.category)
+ }}
+
+
+
+ {{ categoryString(reminder.category) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Frequency
+ {{ displayFreq(reminder.frequency) }}
+
+
+ Time
+ {{ reminder.time }}
+
+
+
+
+
+
+
+
+
+ mdi-eye-outline
+
+ View
+
+
+
+ mdi-recycle-variant
+
+ Do it again!
+
+
+
+ mdi-trash-can-outline
+
+ Delete
+
+
+
+
+
+
+
+ mdi-square-edit-outline
+
+ Edit
+
+
+
+
+ mdi-timer-play-outline
+
+ Start Activity
+
+
+
+
+ mdi-trash-can-outline
+
+ Delete
+
+
+
+
+
+ {{
+ levelTitle(reminder.level)
+ }}
+
+
+
+
+
+
+
+
+
+
+ ACTIVITY PROGRESS
+ + {{ getCompletedActivities(capitalizeFirstLet((checkForFlex(reminder.category)).toLowerCase()), + checkForNA(reminder.level)).length + }} of {{ + getActivities(capitalizeFirstLet((checkForFlex(reminder.category)).toLowerCase()), + checkForNA(reminder.level)).length + }} + +Save
+
+ Cancel
+ Close
+
+
- ![]()
-
+
+ {{
- video.snippet.title
- }}
- {{ video.snippet.channelTitle }}
-
- {{ video.snippet.description }}
-
-
- View Video
- -->
+
+
+
+
-
+
Focus Area: {{ currentCat }}
+
+
+ {{
+ levelToString(currentLev)
+ }}
+
+
+ mdi-arrow-left Back
+
Delete Video?
- Are you sure you want to delete
- {{ video.snippet.title }}?
+ Are you sure you want to delete
+ Video Title?
+
- Cancel
- Delete
+ Cancel
+ Delete
@@ -89,18 +124,27 @@
diff --git a/src/components/VideoModal.vue b/src/components/VideoModal.vue
new file mode 100644
index 0000000..56bd7b7
--- /dev/null
+++ b/src/components/VideoModal.vue
@@ -0,0 +1,95 @@
+
+
+
+
+ {{ levelToString(currentVideo.level) + " " + currentVideo.category }}
+
+
+
+
+
+
+
+
diff --git a/src/components/WelcomeBanner.vue b/src/components/WelcomeBanner.vue
index baf80ed..91b4406 100644
--- a/src/components/WelcomeBanner.vue
+++ b/src/components/WelcomeBanner.vue
@@ -2,29 +2,34 @@
+
-
+ ![]()
+
+
+
+
+
+
+ {{ levelToString(getFirstNonNullVal(_videos).level) }}
+
+
+
+
+
+
+
+
+
+
+ Flexibility
+{{ _videos[0].category }}
+ + +
+
+
+
+
+
+
+
+
+ mdi-youtube
+
+ {{ index + 1 }}
+
+
+
+
+
+
+
+ mdi-youtube
+
+ {{ index + 1 }}
+
+
+
+
+
+
-
-
+
-
- {{ video.snippet.title }}
-
+
+ Activity:
+ {{ activityNum }}
+
+
+
+
+
+
+
+ mdi-arrow-left Back
+
+
+ Next
+ mdi-arrow-right
+
+
+
-
- Well-Beeing is here to help change your life for the better! -
-- Whether reminding you to get moving, check your health, or take a - mindful moment, Well-Beeing promotes a healthy lifestyle. -
-
-
- Remember, a better YOU means a better MicroHealth!
+
+
-
+ >
@@ -33,23 +38,73 @@
diff --git a/src/components/YoutubeVideoCard.vue b/src/components/YoutubeVideoCard.vue
new file mode 100644
index 0000000..c6660e4
--- /dev/null
+++ b/src/components/YoutubeVideoCard.vue
@@ -0,0 +1,231 @@
+
+
+ {{
+ video.snippet.title
+ }}
+
+
+ {{ video.snippet.description }}
+
+
+ Play
+ mdi-youtube
+
+
+ mdi-trash-can-outline
+
+
+
+
+
+
+
+ {{ video.snippet.channelTitle }}
+ {{ video.snippet.description }}
+
+
+
+
+
+ Delete Video?
+ Are you sure you want to delete
+ {{ video.snippet.title }}?
+
+
+
+
+
+ mdi-trash-can-outline
+
+
+ Delete
+
+
+
+
+ mdi-cancel
+
+
+ Cancel
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/graphql/extended_queries.js b/src/graphql/extended_queries.js
new file mode 100644
index 0000000..d2d180b
--- /dev/null
+++ b/src/graphql/extended_queries.js
@@ -0,0 +1,44 @@
+export const extendedListGoals = /* GraphQL */ `
+ query ListGoals(
+ $filter: ModelGoalFilterInput
+ $limit: Int
+ $nextToken: String
+ ) {
+ listGoals(filter: $filter, limit: $limit, nextToken: $nextToken) {
+ items {
+ id
+ title
+ category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ activity
+ frequency
+ contentType
+ time
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
+ }
+`;
\ No newline at end of file
diff --git a/src/graphql/mutations.js b/src/graphql/mutations.js
index 3954d64..c66b4aa 100644
--- a/src/graphql/mutations.js
+++ b/src/graphql/mutations.js
@@ -9,10 +9,34 @@ export const createReminder = /* GraphQL */ `
createReminder(input: $input, condition: $condition) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -27,10 +51,34 @@ export const updateReminder = /* GraphQL */ `
updateReminder(input: $input, condition: $condition) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -45,10 +93,34 @@ export const deleteReminder = /* GraphQL */ `
deleteReminder(input: $input, condition: $condition) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -64,10 +136,28 @@ export const createGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -88,10 +178,28 @@ export const updateGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -112,10 +220,28 @@ export const deleteGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -232,6 +358,60 @@ export const deleteVideo = /* GraphQL */ `
}
}
`;
+export const createWatchedVideo = /* GraphQL */ `
+ mutation CreateWatchedVideo(
+ $input: CreateWatchedVideoInput!
+ $condition: ModelWatchedVideoConditionInput
+ ) {
+ createWatchedVideo(input: $input, condition: $condition) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const updateWatchedVideo = /* GraphQL */ `
+ mutation UpdateWatchedVideo(
+ $input: UpdateWatchedVideoInput!
+ $condition: ModelWatchedVideoConditionInput
+ ) {
+ updateWatchedVideo(input: $input, condition: $condition) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const deleteWatchedVideo = /* GraphQL */ `
+ mutation DeleteWatchedVideo(
+ $input: DeleteWatchedVideoInput!
+ $condition: ModelWatchedVideoConditionInput
+ ) {
+ deleteWatchedVideo(input: $input, condition: $condition) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
export const createFavoriteArticle = /* GraphQL */ `
mutation CreateFavoriteArticle(
$input: CreateFavoriteArticleInput!
@@ -391,6 +571,72 @@ export const deleteFavoriteVideo = /* GraphQL */ `
}
}
`;
+export const createPreferences = /* GraphQL */ `
+ mutation CreatePreferences(
+ $input: CreatePreferencesInput!
+ $condition: ModelPreferencesConditionInput
+ ) {
+ createPreferences(input: $input, condition: $condition) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const updatePreferences = /* GraphQL */ `
+ mutation UpdatePreferences(
+ $input: UpdatePreferencesInput!
+ $condition: ModelPreferencesConditionInput
+ ) {
+ updatePreferences(input: $input, condition: $condition) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const deletePreferences = /* GraphQL */ `
+ mutation DeletePreferences(
+ $input: DeletePreferencesInput!
+ $condition: ModelPreferencesConditionInput
+ ) {
+ deletePreferences(input: $input, condition: $condition) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
export const createEvent = /* GraphQL */ `
mutation CreateEvent(
$input: CreateEventInput!
diff --git a/src/graphql/queries.js b/src/graphql/queries.js
index 86cf455..418472a 100644
--- a/src/graphql/queries.js
+++ b/src/graphql/queries.js
@@ -6,10 +6,34 @@ export const getReminder = /* GraphQL */ `
getReminder(id: $id) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -26,10 +50,27 @@ export const listReminders = /* GraphQL */ `
items {
id
category
+ goal {
+ id
+ title
+ category
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -44,10 +85,28 @@ export const getGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -70,10 +129,14 @@ export const listGoals = /* GraphQL */ `
id
title
category
+ reminders {
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -159,6 +222,43 @@ export const listVideos = /* GraphQL */ `
}
}
`;
+export const getWatchedVideo = /* GraphQL */ `
+ query GetWatchedVideo($id: ID!) {
+ getWatchedVideo(id: $id) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const listWatchedVideos = /* GraphQL */ `
+ query ListWatchedVideos(
+ $filter: ModelWatchedVideoFilterInput
+ $limit: Int
+ $nextToken: String
+ ) {
+ listWatchedVideos(filter: $filter, limit: $limit, nextToken: $nextToken) {
+ items {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
+ }
+`;
export const getFavoriteArticle = /* GraphQL */ `
query GetFavoriteArticle($id: ID!) {
getFavoriteArticle(id: $id) {
@@ -271,6 +371,51 @@ export const listFavoriteVideos = /* GraphQL */ `
}
}
`;
+export const getPreferences = /* GraphQL */ `
+ query GetPreferences($id: ID!) {
+ getPreferences(id: $id) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const listPreferences = /* GraphQL */ `
+ query ListPreferences(
+ $filter: ModelPreferencesFilterInput
+ $limit: Int
+ $nextToken: String
+ ) {
+ listPreferences(filter: $filter, limit: $limit, nextToken: $nextToken) {
+ items {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
+ }
+`;
export const getEvent = /* GraphQL */ `
query GetEvent($id: ID!) {
getEvent(id: $id) {
@@ -518,10 +663,27 @@ export const remindersByLevel = /* GraphQL */ `
items {
id
category
+ goal {
+ id
+ title
+ category
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
diff --git a/src/graphql/subscriptions.js b/src/graphql/subscriptions.js
index fbccb7b..3e6cb5c 100644
--- a/src/graphql/subscriptions.js
+++ b/src/graphql/subscriptions.js
@@ -6,10 +6,34 @@ export const onCreateReminder = /* GraphQL */ `
onCreateReminder(owner: $owner) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -21,10 +45,34 @@ export const onUpdateReminder = /* GraphQL */ `
onUpdateReminder(owner: $owner) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -36,10 +84,34 @@ export const onDeleteReminder = /* GraphQL */ `
onDeleteReminder(owner: $owner) {
id
category
+ goal {
+ id
+ title
+ category
+ reminders {
+ nextToken
+ }
+ progress
+ stepCount
+ dueDate
+ isComplete
+ goalEnd
+ completedCount
+ checklist {
+ title
+ isComplete
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ goalId
level
frequency
contentType
time
+ activity
+ isComplete
createdAt
updatedAt
owner
@@ -52,10 +124,28 @@ export const onCreateGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -73,10 +163,28 @@ export const onUpdateGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -94,10 +202,28 @@ export const onDeleteGoal = /* GraphQL */ `
id
title
category
+ reminders {
+ items {
+ id
+ category
+ goalId
+ level
+ frequency
+ contentType
+ time
+ activity
+ isComplete
+ createdAt
+ updatedAt
+ owner
+ }
+ nextToken
+ }
progress
stepCount
dueDate
isComplete
+ goalEnd
completedCount
checklist {
title
@@ -196,6 +322,51 @@ export const onDeleteVideo = /* GraphQL */ `
}
}
`;
+export const onCreateWatchedVideo = /* GraphQL */ `
+ subscription OnCreateWatchedVideo($owner: String) {
+ onCreateWatchedVideo(owner: $owner) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const onUpdateWatchedVideo = /* GraphQL */ `
+ subscription OnUpdateWatchedVideo($owner: String) {
+ onUpdateWatchedVideo(owner: $owner) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const onDeleteWatchedVideo = /* GraphQL */ `
+ subscription OnDeleteWatchedVideo($owner: String) {
+ onDeleteWatchedVideo(owner: $owner) {
+ id
+ title
+ videoId
+ category
+ level
+ nextVideo
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
export const onCreateFavoriteArticle = /* GraphQL */ `
subscription OnCreateFavoriteArticle($owner: String) {
onCreateFavoriteArticle(owner: $owner) {
@@ -337,6 +508,63 @@ export const onDeleteFavoriteVideo = /* GraphQL */ `
}
}
`;
+export const onCreatePreferences = /* GraphQL */ `
+ subscription OnCreatePreferences($owner: String) {
+ onCreatePreferences(owner: $owner) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const onUpdatePreferences = /* GraphQL */ `
+ subscription OnUpdatePreferences($owner: String) {
+ onUpdatePreferences(owner: $owner) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
+export const onDeletePreferences = /* GraphQL */ `
+ subscription OnDeletePreferences($owner: String) {
+ onDeletePreferences(owner: $owner) {
+ id
+ preference_items {
+ category
+ l1
+ l2
+ l3
+ l4
+ l5
+ not_interested
+ }
+ createdAt
+ updatedAt
+ owner
+ }
+ }
+`;
export const onCreateEvent = /* GraphQL */ `
subscription OnCreateEvent {
onCreateEvent {
diff --git a/src/main.js b/src/main.js
index e55d1b8..8b2a1ff 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,11 +6,10 @@ import store from "./store";
import vuetify from "./plugins/vuetify";
import { TiptapVuetifyPlugin } from "tiptap-vuetify";
import "tiptap-vuetify/dist/main.css";
-import Amplify from "aws-amplify";
-import aws_exports from "./aws-exports";
-
-Amplify.configure(aws_exports);
-
+import { Amplify } from "aws-amplify";
+import sso_config from "./sso-exports"
+//import aws_exports from "./aws-exports";
+import VueConfetti from 'vue-confetti'
import {
applyPolyfills,
defineCustomElements,
@@ -20,7 +19,10 @@ applyPolyfills().then(() => {
defineCustomElements(window);
});
+Amplify.configure(sso_config);
+
Vue.config.productionTip = false;
+Vue.use(VueConfetti)
Vue.use(TiptapVuetifyPlugin, {
vuetify,
iconsGroup: "mdi",
diff --git a/src/mixins/notification.js b/src/mixins/notification.js
index 14dc7df..10d41e9 100644
--- a/src/mixins/notification.js
+++ b/src/mixins/notification.js
@@ -1,4 +1,4 @@
-export const notification = {
+/* export const notification = {
data() {
return {
imageURLs: {
@@ -55,7 +55,7 @@ export const notification = {
notification(activity) {
return {
icon: "/img/icons/android-chrome-192x192.png",
- body: "This is your daily Well Beeing reminder!",
+ body: "This is your daily be well reminder!",
image: this.imageURL(activity.category),
actions: [
{
@@ -78,3 +78,4 @@ export const notification = {
},
},
};
+ */
\ No newline at end of file
diff --git a/src/mixins/utilities-mixin.js b/src/mixins/utilities-mixin.js
index 6689fb1..0574942 100644
--- a/src/mixins/utilities-mixin.js
+++ b/src/mixins/utilities-mixin.js
@@ -1,6 +1,7 @@
+import { mapGetters, mapActions } from "vuex";
export default {
data() {
- return {
+ return {
categories: [
{
title: "",
@@ -20,6 +21,7 @@ export default {
title: "Endurance",
icon: "mdi-run",
query: "endurance",
+ // activities: ["walking", "yard word", "dancing", "swimming", "biking", "hiking", "climbing stairs"],
value: "ENDURANCE",
image: "/img/endurance.jpg",
},
@@ -66,6 +68,106 @@ export default {
image: "/img/strength.jpg",
},
],
+ activities: [
+ //Endurance
+ {
+ title: "Walking",
+ icon: "mdi-human",
+ query: "walking",
+ category: "ENDURANCE",
+ value: "WALKING",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Jogging",
+ icon: "mdi-human",
+ query: "jogging",
+ category: "ENDURANCE",
+ value: "JOGGING",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Yard Work",
+ icon: "mdi-human",
+ query: "yard_work",
+ category: "ENDURANCE",
+ value: "YARD_WORK",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Dancing",
+ icon: "mdi-human",
+ query: "dancing",
+ category: "ENDURANCE",
+ value: "DANCING",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Swimming",
+ icon: "mdi-human",
+ query: "swimming",
+ category: "ENDURANCE",
+ value: "SWIMMING",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Biking",
+ icon: "mdi-human",
+ query: "biking",
+ category: "ENDURANCE",
+ value: "BIKING",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Climbing stairs",
+ icon: "mdi-heart-plus",
+ category: "ENDURANCE",
+ query: "climbing_stairs",
+ value: "CLIMBING_STAIRS",
+ image: "/img/endurance.jpg",
+ },
+ {
+ title: "Other, sport",
+ icon: "mdi-weight-lifter",
+ query: "other",
+ category: "ENDURANCE",
+ value: "OTHER",
+ image: "/img/endurance.jpg",
+ },
+ //Strength
+ {
+ title: "Lifting weights",
+ icon: "mdi-human",
+ query: "lifting_weights",
+ category: "STRENGTH",
+ value: "LIFTING_WEIGHTS",
+ image: "/img/strength.jpg",
+ },
+ {
+ title: "Resistance bands",
+ icon: "mdi-human",
+ query: "resistance_bands",
+ category: "STRENGTH",
+ value: "RESISTANCE_BANDS",
+ image: "/img/strength.jpg",
+ },
+ {
+ title: "Bodyweight exercises",
+ icon: "mdi-human",
+ query: "body_weight_exercises",
+ category: "STRENGTH",
+ value: "body_weight_exercises",
+ image: "/img/strength.jpg",
+ },
+ {
+ title: "Other, strength",
+ icon: "mdi-weight-lifter",
+ query: "other_s",
+ category: "STRENGTH",
+ value: "OTHER_S",
+ image: "/img/strength.jpg",
+ },
+ ],
levels: [
{
title: "All",
@@ -73,27 +175,27 @@ export default {
query: "all",
},
{
- title: "Beginner-1",
+ title: "Novice",
value: "L1",
query: "beginner-1",
},
{
- title: "Beginner-2",
+ title: "Beginner",
value: "L2",
query: "beginner-2",
},
{
- title: "Intermediate-1",
+ title: "Competent",
value: "L3",
query: "intermediate-1",
},
{
- title: "Intermediate-2",
+ title: "Proficient",
value: "L4",
query: "intermediate-2",
},
{
- title: "Advanced",
+ title: "Expert",
value: "L5",
query: "advanced",
},
@@ -111,47 +213,67 @@ export default {
query: "all",
},
{
- title: "Beginner-1",
- label: "Beginner-1",
+ title: "Novice",
+ label: "Novice",
value: "L1",
query: "beginner-1",
},
{
- title: "Beginner-2",
- label: "Beginner-2",
+ title: "Beginner",
+ label: "Beginner",
value: "L2",
query: "beginner-2",
},
{
- title: "Intermediate-1",
- label: "Intermediate-1",
+ title: "Competent",
+ label: "Competent",
value: "L3",
query: "intermediate-1",
},
{
- title: "Intermediate-2",
- label: "Intermediate-2",
+ title: "Proficient",
+ label: "Proficient",
value: "L4",
query: "intermediate-2",
},
{
- title: "Advanced",
- label: "Advanced",
+ title: "Expert",
+ label: "Expert",
value: "L5",
query: "advanced",
},
- {
+ // {
+ // title: "Favorite",
+ // label: "My Favorites",
+ // value: "FAVORITE",
+ // query: "favorites",
+ // },
+ ],
+ favFilters: [
+ {
title: "Favorite",
label: "My Favorites",
value: "FAVORITE",
query: "favorites",
},
],
+ weekdays: {
+ 'Sunday': 1,
+ 'Monday': 2,
+ 'Tuesday': 3,
+ 'Wednesday': 4,
+ 'Thursday': 5,
+ 'Friday': 6,
+ 'Saturday': 7,
+ }
};
},
methods: {
+ ...mapActions(["fetchPreferences", "fetchWatchedVideos", "removeWatchedVideo" , "addPreferences"]),
async notify(activity) {
+ console.log(activity)
const reg = await navigator.serviceWorker.getRegistration();
+ console.log(reg)
// Let's check if the browser supports notifications
if (!("Notification" in window)) {
alert("This browser does not support desktop notification");
@@ -181,11 +303,11 @@ export default {
notification(activity) {
return {
icon: "/img/icons/android-chrome-192x192.png",
- body: "This is your daily Well Beeing reminder!",
+ body: "This is your daily be well reminder!",
image: this.imageURL(activity.category),
actions: [
{
- title: "View Content",
+ title: "Start Activity",
action: "view-content",
},
{
@@ -197,7 +319,8 @@ export default {
};
},
categoryIcon(value) {
- if (value) {
+ let valid = this.categories.map(t => t.value)
+ if (valid.includes(value)) {
return (
this.categories.find((category) => category.value == value).icon || ""
);
@@ -223,13 +346,185 @@ export default {
this.categories.find((category) => category.value == value).image || ""
);
},
+ resetActivity(reminder) {
+ let filtered = this.watchedVideos.filter(v => v.category == this.capitalizeFirstLet((this.checkForFlex(reminder.category)).toLowerCase()) && v.level == this.checkForNA(reminder.level))
+ console.log(filtered)
+ filtered.forEach(v => console.log(v))
+ },
+ deleteWatchedVideos() {
+ if (this.watchedVideos) {
+ this.watchedVideos.forEach(v => {
+ this.removeWatchedVideo({ id: v.id })
+ });
+ }
+ console.log(this.watchedVideos)
+ },
+ getActivityProgressValue(cat, lev) {
+ if (cat && lev) {
+ return this.getProgressValue(this.capitalizeFirstLet((this.checkForFlex(cat)).toLowerCase()),
+ this.checkForNA(lev))
+ }
+ },
+ },
+ mounted() {
+ this.fetchPreferences()
+ this.fetchWatchedVideos()
},
computed: {
+ ...mapGetters(["preferences", "watchedVideos"]),
+ strengthLevel(){
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Strength')
+ if(prefs[0].l1){
+ //console.log("Strength: L1")
+ return 'L1'
+ }
+ if(prefs[0].l2){
+ return 'L2'
+ }
+ if(prefs[0].l3){
+ return 'L3'
+ }
+ if(prefs[0].l4){
+ return 'L4'
+ }
+ if(prefs[0].l5){
+ return 'L5'
+ }
+ }
+ if (!this.preferences[0]){
+ return 'L1'
+ }
+ },
+ balanceLevel(){
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Balance')
+ if(prefs[0].l1){
+ return 'L1'
+ }
+ if(prefs[0].l2){
+ return 'L2'
+ }
+ if(prefs[0].l3){
+ return 'L3'
+ }
+ if(prefs[0].l4){
+ //console.log("Balance: L4")
+ return 'L4'
+ }
+ if(prefs[0].l4){
+ return 'L5'
+ }
+ }
+ if (!this.preferences[0]){
+ return 'L1'
+ }
+ },
+ enduranceLevel(){
+ if (this.preferences && this.preferences[0]){
+ //console.log("endurance")
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Endurance')
+ //console.log(prefs)
+ if(prefs[0].l1){
+ return 'L1'
+ }
+ if(prefs[0].l2){
+ return 'L2'
+ }
+ if(prefs[0].l3){
+ return 'L3'
+ }
+ if(prefs[0].l4){
+ //console.log("Endurance: L4")
+ return 'L4'
+ }
+ if(prefs[0].l5){
+ return 'L5'
+ }
+ }
+ if (!this.preferences[0]){
+ return 'L1'
+ }
+ },
+ nutritionLevel(){
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Nutrition')
+ if(!prefs[0].not_interested){
+ return 'NOT_APPLICABLE'
+ }
+ if(prefs[0].not_interested){
+ //console.log("Nutrition: I AM NOT INTERESTED")
+ return false
+ }
+ }
+ if (!this.preferences[0]){
+ return 'NOT_APPLICABLE'
+ }
+ },
+ recLevel(){
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Recovery')
+ if(!prefs[0].not_interested){
+ //console.log("Recovery: I AM INTERESTED")
+ return 'NOT_APPLICABLE'
+ }
+ if(prefs[0].not_interested){
+ return false
+ }
+ }
+ if (!this.preferences[0]){
+ return 'NOT_APPLICABLE'
+ }
+ },
+ ergLevel(){
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Ergonomics')
+ if(!prefs[0].not_interested){
+ //console.log("ERGONOMICS: I AM INTERESTED")
+ return 'NOT_APPLICABLE'
+ }
+ if(prefs[0].not_interested){
+ return false
+ }
+ }
+ if (!this.preferences[0]){
+ return 'NOT_APPLICABLE'
+ }
+ },
+ flexLevel(){
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items.filter(t => t && t.category == 'Flexibility & Mobility')
+ if(prefs[0].l1){
+ return 'L1'
+ }
+ if(prefs[0].l2){
+ return 'L2'
+ }
+ if(prefs[0].l3){
+ return 'L3'
+ }
+ if(prefs[0].l4){
+ return 'L4'
+ }
+ if(prefs[0].l5){
+ return 'L5'
+ }
+ }
+ if (!this.preferences[0]){
+ return 'L1'
+ }
+ },
filteredCategories() {
- return this.categories.filter((category) => category.value != "ALL");
+ if (this.preferences && this.preferences[0]){
+ let prefs = this.preferences[0].preference_items
+ let filtered = prefs.filter(c => c.category && c.not_interested == false).map(c => c.category)
+ return this.categories.filter((category) => category.value != "ALL" && filtered.includes(category.title));
+ } else return this.categories.filter((category) => category.value != "ALL" );
},
filteredLevels() {
+ //console.log("filteredLevels");
return this.levels.filter((level) => level.value != "ALL");
},
+
},
};
diff --git a/src/mixins/videos-mixin.js b/src/mixins/videos-mixin.js
new file mode 100644
index 0000000..60f59c8
--- /dev/null
+++ b/src/mixins/videos-mixin.js
@@ -0,0 +1,586 @@
+import { mapGetters, mapActions } from 'vuex'
+
+export default {
+ data() {
+ return {
+ currentVideo: {},
+ mhVideos: [
+ // Balance Videos
+ {
+ title: "Balance Beginner 1 1",
+ videoId: "isIVduIDdi4",
+ category: "Balance",
+ level: "L1",
+ nextVideo: "7kXNrWp7bHQ",
+ },
+ {
+ title: "Balance Beginner 1 2",
+ videoId: "7kXNrWp7bHQ",
+ category: "Balance",
+ level: "L1",
+ nextVideo: "",
+ },
+ {
+ title: "Balance Beginner 2 1",
+ videoId: "-Q1Pv65SM6U",
+ category: "Balance",
+ level: "L2",
+ nextVideo: "P12NmR9PGRI",
+ },
+ {
+ title: "Balance Beginner 2 2",
+ videoId: "P12NmR9PGRI",
+ category: "Balance",
+ level: "L2",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Balance 1 1",
+ videoId: "5xT9k13v6Ls",
+ category: "Balance",
+ level: "L3",
+ nextVideo: "rytZxljdyFE",
+ },
+ {
+ title: "Intermediate Balance 1 2",
+ videoId: "rytZxljdyFE",
+ category: "Balance",
+ level: "L3",
+ nextVideo: "",
+ },
+ {
+ title: "IntermediateBalance 2 1",
+ videoId: "EYfkYOg1ra4",
+ category: "Balance",
+ level: "L4",
+ nextVideo: "",
+ },
+ {
+ title: "Balance Advanced 1 1",
+ videoId: "FnQqMfNsmTI",
+ category: "Balance",
+ level: "L5",
+ nextVideo: "",
+ },
+ // Endurance Videos
+ {
+ title: "Endurance Beginner 1 1",
+ videoId: "o6IUlO2hBkk",
+ category: "Endurance",
+ level: "L1",
+ nextVideo: "7RMsG2NNjLU",
+ },
+ {
+ title: "Endurance Beginner 1 2",
+ videoId: "7RMsG2NNjLU",
+ category: "Endurance",
+ level: "L1",
+ nextVideo: "",
+ },
+ {
+ title: "Endurance Beginner 2 1",
+ videoId: "ax6fPkFbaI4",
+ category: "Endurance",
+ level: "L2",
+ nextVideo: "voja3Ul-iRo",
+ },
+ {
+ title: "Endurance Beginner 2 2",
+ videoId: "voja3Ul-iRo",
+ category: "Endurance",
+ level: "L2",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Endurance 1 1",
+ videoId: "NGH8B_4_OkU",
+ category: "Endurance",
+ level: "L3",
+ nextVideo: "eMBb7c9fIJ0",
+ },
+ {
+ title: "Intermediate Endurance 1 2",
+ videoId: "eMBb7c9fIJ0",
+ category: "Endurance",
+ level: "L3",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Endurance 2 1",
+ videoId: "F75LpW186tU",
+ category: "Endurance",
+ level: "L4",
+ nextVideo: "01Mn0r3l2dI",
+ },
+ {
+ title: "Intermediate Endurance 2 2",
+ videoId: "01Mn0r3l2dI",
+ category: "Endurance",
+ level: "L4",
+ nextVideo: "",
+ },
+ {
+ title: "Endurance Advanced 1 1",
+ videoId: "r3FgBgrWUhA",
+ category: "Endurance",
+ level: "L5",
+ nextVideo: "0Hak187Nu_M",
+ },
+ {
+ title: "Endurance Advanced 1 2",
+ videoId: "0Hak187Nu_M",
+ category: "Endurance",
+ level: "L5",
+ nextVideo: "",
+ },
+ // Strength Videos
+ {
+ title: "Beginner Strength 1 2",
+ videoId: "yZsaRWXMAkc",
+ category: "Strength",
+ level: "L1",
+ nextVideo: "",
+ },
+ {
+ title: "Beginner Strength 2 1",
+ videoId: "MwZ-DsBXT4k",
+ category: "Strength",
+ level: "L2",
+ nextVideo: "HQiK7aN44Xg",
+ },
+ {
+ title: "Beginner Strength 2 2",
+ videoId: "HQiK7aN44Xg",
+ category: "Strength",
+ level: "L2",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Strength 1 1",
+ videoId: "zLfAWL1gCgU",
+ category: "Strength",
+ level: "L3",
+ nextVideo: "W88-aOIZCVg",
+ },
+ {
+ title: "Intermediate Strength 1 2",
+ videoId: "W88-aOIZCVg",
+ category: "Strength",
+ level: "L3",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Strength 2 1",
+ videoId: "uxXpHZFM-no",
+ category: "Strength",
+ level: "L4",
+ nextVideo: "23nvqIuCGnw",
+ },
+ {
+ title: "Intermediate Strength 2 2",
+ videoId: "23nvqIuCGnw",
+ category: "Strength",
+ level: "L4",
+ nextVideo: "",
+ },
+ {
+ title: "Advanced Strength 1 1",
+ videoId: "oz1unfEYJ_o",
+ category: "Strength",
+ level: "L5",
+ nextVideo: "xkgc4Pa71PQ",
+ },
+ {
+ title: "Advanced Strength 1 2",
+ videoId: "xkgc4Pa71PQ",
+ category: "Strength",
+ level: "L5",
+ nextVideo: "",
+ },
+ // Flexibility & Mobility
+ {
+ title: "Beginner Stretching 1 1",
+ videoId: "0U7gPbTn60s",
+ category: "Flexibility-mobility",
+ level: "L1",
+ nextVideo: "OgRmcO4CmPU",
+ },
+ {
+ title: "Beginner Stretching 1 2",
+ videoId: "OgRmcO4CmPU",
+ category: "Flexibility-mobility",
+ level: "L1",
+ nextVideo: "",
+ },
+ {
+ title: "Beginner Stretching 2 1",
+ videoId: "1_ligz-w4uM",
+ category: "Flexibility-mobility",
+ level: "L2",
+ nextVideo: "RAEoE3nUC2Y",
+ },
+ {
+ title: "Beginner Stretching 2 2",
+ videoId: "RAEoE3nUC2Y",
+ category: "Flexibility-mobility",
+ level: "L2",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Stretching 1 1",
+ videoId: "5dWN4zaBym8",
+ category: "Flexibility-mobility",
+ level: "L3",
+ nextVideo: "samWrACQ-hQ",
+ },
+ {
+ title: "Intermediate Stretching 1 2",
+ videoId: "samWrACQ-hQ",
+ category: "Flexibility-mobility",
+ level: "L3",
+ nextVideo: "",
+ },
+ {
+ title: "Intermediate Stretching 2 1",
+ videoId: "kwPyjoi7Ux8",
+ category: "Flexibility-mobility",
+ level: "L4",
+ nextVideo: "2eQTsfZYe3w",
+ },
+ {
+ title: "Intermediate Stretching 2 2",
+ videoId: "2eQTsfZYe3w",
+ category: "Flexibility-mobility",
+ level: "L4",
+ nextVideo: "",
+ },
+ {
+ title: "Advanced stretching 1",
+ videoId: "n9L83mn06Tk",
+ category: "Flexibility-mobility",
+ level: "L5",
+ nextVideo: "",
+ },
+ // Recovery Videos
+ {
+ title: "Active Recovery 1 1",
+ videoId: "Geg0s4YYEe0",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "gwbXuEnMZ1A",
+ },
+ {
+ title: "Active Recovery 1 2",
+ videoId: "gwbXuEnMZ1A",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "NbLQK4afius",
+ },
+ {
+ title: "Breathing Recovery 1 1",
+ videoId: "NbLQK4afius",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "SMZgV7XE2LE",
+ },
+ {
+ title: "Breathing Recovery 1 2",
+ videoId: "SMZgV7XE2LE",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "WvRaMAsxsIw",
+ },
+ {
+ title: "Cool Down Recovery 1 1",
+ videoId: "WvRaMAsxsIw",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "0UEbqjiNR9c",
+ },
+ {
+ title: "Cool Down Recovery 1 2",
+ videoId: "0UEbqjiNR9c",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "wkvan1b3P_E",
+ },
+ {
+ title: "Myofascial Release Recovery 1 1",
+ videoId: "wkvan1b3P_E",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "m78TSrhyr0Q",
+ },
+ {
+ title: "Myofascial Release Recovery 1 2",
+ videoId: "m78TSrhyr0Q",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "H3a43Zr-kEg",
+ },
+ {
+ title: "Sleeping Recovery 1 1",
+ videoId: "H3a43Zr-kEg",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "gy5JycEQCDY",
+ },
+ {
+ title: "Sleeping Recovery 1 2",
+ videoId: "gy5JycEQCDY",
+ category: "Recovery",
+ level: "na",
+ nextVideo: "",
+ },
+ // Ergonomics
+ {
+ title: "Sitting Ergonomics 1 1",
+ videoId: "GwyuVcCBx0Q",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "ft2kze0WYJY",
+ },
+ {
+ title: "Sitting Ergonomics 1 2",
+ videoId: "ft2kze0WYJY",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "7ZT9Gr2_YZU",
+ },
+ {
+ title: "Standing Ergonomics 1 1",
+ videoId: "7ZT9Gr2_YZU",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "Y8KcLwk-Z-k",
+ },
+ {
+ title: "Standing Ergonomics 1 2",
+ videoId: "Y8KcLwk-Z-k",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "Ji7YRJHGWFo",
+ },
+ {
+ title: "Walking Ergonomics 1 1",
+ videoId: "Ji7YRJHGWFo",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "SIlSLgcSqAk",
+ },
+ {
+ title: "Walking Ergonomics 1 2",
+ videoId: "SIlSLgcSqAk",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "Dl5eHpq7tMk",
+ },
+ {
+ title: "Running Ergonomics 1 1",
+ videoId: "Dl5eHpq7tMk",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "1SXcKlcQ5os",
+ },
+ {
+ title: "Running Ergonomics 1 2",
+ videoId: "1SXcKlcQ5os",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "mvFFdRXKYpk",
+ },
+ {
+ title: "Sleeping Ergonomics 1 1",
+ videoId: "mvFFdRXKYpk",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "dMfDnqT-oZo",
+ },
+ {
+ title: "Sleeping Ergonomics 1 2",
+ videoId: "dMfDnqT-oZo",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "TXzP2C4rt8U",
+ },
+ {
+ title: "Typing Ergonomics 1 1",
+ videoId: "TXzP2C4rt8U",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "vYQQ95YhIKI",
+ },
+ {
+ title: "Typing Ergonomics 1 2",
+ videoId: "vYQQ95YhIKI",
+ category: "Ergonomics",
+ level: "na",
+ nextVideo: "",
+ },
+ {
+ title: "Food & Hydration 1 1",
+ videoId: "r-CtynFrVhw",
+ category: "Nutrition",
+ level: "na",
+ nextVideo: "cN-jF7VplJc",
+ },
+ {
+ title: "Food & Hydration 1 2",
+ videoId: "cN-jF7VplJc",
+ category: "Nutrition",
+ level: "na",
+ nextVideo: "",
+ },
+ ],
+ };
+ },
+ /* mounted() {
+ this.fetchWatchedVideos()
+ }, */
+ methods: {
+ ...mapActions([
+ "fetchWatchedVideos",
+ ]),
+ nextVideo(category, level) {
+ if (this.isEmpty(this.currentVideo)) {
+ let selected = this.mhVideos.filter(
+ (v) => v.category == category && v.level == level && !this.getIdsArray(this.watchedVideos).includes(v.videoId)
+ );
+ if (selected[0]) {
+ this.currentVideo = selected[0];
+ } else this.closeModal();
+
+ console.log(level
+ + " "
+ + category
+ + " "
+ + "Progress: "
+ + this.getCompletedActivities(category, level).length
+ + " / "
+ + this.getActivities(category, level).length)
+ } /* else {
+ let current = this.mhVideos.filter(
+ (v) => v.videoId == this.currentVideo.videoId
+ );
+ if (current[0].nextVideo) {
+ let next = this.mhVideos.filter(
+ (v) => v.videoId == current[0].nextVideo
+ );
+ this.currentVideo = next[0];
+ } else {
+ this.currentVideo = false;
+ }
+ } */
+ },
+ capitalizeFirstLet(string) {
+ return string.charAt(0).toUpperCase() + string.slice(1);
+ },
+ isEmpty(obj) {
+ return Object.keys(obj).length === 0;
+ },
+ getIdsArray(array) {
+ return array.map((v) => v.videoId)
+ },
+ getActivities(cat, lev) {
+ return this.mhVideos.filter((v) => v.category == cat && v.level == lev)
+ },
+ getCompletedActivities(cat, lev) {
+ let catVids = this.getActivities(cat, lev)
+ return catVids.filter((v) => this.getIdsArray(this.watchedVideos).includes(v.videoId))
+ },
+ getProgressValue(cat, lev) {
+ //console.log(cat, lev)
+ return this.getCompletedActivities(cat, lev).length / this.getActivities(cat, lev).length * 100
+ },
+ getGoalProgressValue(reminders) {
+ let total = 0
+ if (reminders) {
+ reminders.forEach((r) => {
+ //console.log(r)
+ let val = this.getCompletedActivities(this.capitalizeFirstLet((this.checkForFlex(r.category)).toLowerCase()),
+ this.checkForNA(r.level)).length / this.getActivities(this.capitalizeFirstLet((this.checkForFlex(r.category)).toLowerCase()),
+ this.checkForNA(r.level)).length
+ total += val
+ })
+ return total / reminders.length * 100
+ }
+ },
+ closeModal() {
+ console.log("Completed")
+ },
+ levelToString(level) {
+ //console.log(this.videos);
+ switch (level) {
+ case "L1":
+ return "Novice";
+ case "L2":
+ return "Beginner";
+ case "L3":
+ return "Competent";
+ case "L4":
+ return "Proficient";
+ case "L5":
+ return "Expert";
+ case "na":
+ return "";
+ case "NOT_APPLICABLE":
+ return "N/A"
+ }
+ },
+ filterToLevel(filter) {
+ switch (filter) {
+ case "beginner-1":
+ return "L1";
+ case "beginner-2":
+ return "L2";
+ case "intermediate-1":
+ return "L3";
+ case "intermediate-2":
+ return "L4";
+ case "advanced":
+ return "L5";
+ case "na":
+ return "na";
+ }
+ },
+ levelToLowercase(level) {
+ switch (level) {
+ case "L1":
+ return "novice";
+ case "L2":
+ return "beginner";
+ case "L3":
+ return "competent";
+ case "L4":
+ return "proficient";
+ case "L5":
+ return "expert";
+ case "na":
+ return "novice";
+ }
+ },
+ checkForNA(level) {
+ return level == "NOT_APPLICABLE" ? "na" : level
+ },
+ checkForFlex(category) {
+ return category && category == "FLEXIBILITY_MOBILITY" ? "FLEXIBILITY-MOBILITY" : category
+ },
+ levelToColor(level) {
+ switch (level) {
+ case "L1":
+ case "L2":
+ return "var(--mh-green)";
+ case "L3":
+ case "L4":
+ return "var(--mh-orange)";
+ case "L5":
+ return "error";
+ case "NOT_APPLICABLE":
+ return "#1976d2"
+ }
+ },
+ },
+ computed: {
+ ...mapGetters(["watchedVideos",]),
+ },
+};
diff --git a/src/registerServiceWorker.js b/src/registerServiceWorker.js
index 1473a0a..cd554bd 100644
--- a/src/registerServiceWorker.js
+++ b/src/registerServiceWorker.js
@@ -2,7 +2,7 @@
import { register } from "register-service-worker";
-if (process.env.NODE_ENV === "production") {
+if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "production") {
register(`${process.env.BASE_URL}service-worker.js`, {
ready() {
console.log(
diff --git a/src/router/index.js b/src/router/index.js
index b96c74c..a59b1bb 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -1,4 +1,4 @@
-import Auth from "@aws-amplify/auth";
+import { Auth } from "@aws-amplify/auth";
import Vue from "vue";
import VueRouter from "vue-router";
import Home from "../views/Home.vue";
@@ -44,7 +44,6 @@ const routes = [
},
{
path: "/activities",
- redirect: "/activities/goals",
name: "Activities",
component: () =>
import(/* webpackChunkName: "activities" */ "../views/Activities.vue"),
@@ -287,6 +286,8 @@ router.beforeEach(async (to, from, next) => {
next("/not-authorized");
} else if (requiresAuth && !currentUserInfo) {
next("/login");
+ } else if (requiresAuth && Object.keys(currentUserInfo).length == 0) {
+ next("/login");
} else {
next();
}
diff --git a/src/service-worker.js b/src/service-worker.js
index 6e9e65d..cf51e38 100644
--- a/src/service-worker.js
+++ b/src/service-worker.js
@@ -2,12 +2,16 @@ self.__precacheManifest = [].concat(self.__precacheManifest || []);
workbox.precaching.precacheAndRoute(self.__precacheManifest, {});
self.addEventListener("notificationclick", (event) => {
+ console.log(event)
event.notification.close();
if (event.action === "view-content") {
+
let content = contentType(event.notification.data.contentType);
let category = categoryQuery(event.notification.data.category);
let level = levelQuery(event.notification.data.level);
+ console.log(content, category, level)
+
clients.openWindow(
`/activities/${content}?category=${category}&filter=${level}`
);
@@ -25,23 +29,25 @@ function categoryQuery(key) {
ENDURANCE: "endurance",
ERGONOMICS: "ergonomics",
FLEXIBILITY_MOBILITY: "flexibility-mobility",
- MIND: "mind",
NUTRITION: "nutrition",
RECOVERY: "recovery",
STRENGTH: "strength",
};
- return categories[key] || "endurance";
+ return categories[key] || "balance";
}
function levelQuery(key) {
const levels = {
- BEGINNER: "beginner",
- INTERMEDIATE: "intermediate",
- ADVANCED: "advanced",
+ L1: "beginner-1",
+ L2: "beginner-2",
+ L3: "intermediate-1",
+ L4: "intermediate-2",
+ L5: "advanced",
+ NOT_APPLICABLE: "na",
};
- return levels[key] || "beginner";
+ return levels[key] || "beginner-1";
}
function contentType(key) {
diff --git a/src/sso-exports.js b/src/sso-exports.js
new file mode 100644
index 0000000..79a9624
--- /dev/null
+++ b/src/sso-exports.js
@@ -0,0 +1,52 @@
+let baseURL = "https://beta-bewell.microhealthllc.com/"
+let graphQLEndpoint = "https://ljertf3kdrghnnu37weavbpf5u.appsync-api.us-east-1.amazonaws.com/graphql"
+
+if (process.env.NODE_ENV == "development") {
+ console.log(process.env)
+ baseURL = "http://localhost:8080/"
+ graphQLEndpoint = process.env.VUE_APP_GRAPHQL_ENDPOINT
+}
+
+const awsmobile = {
+ "aws_project_region": "us-east-1",
+ "aws_cognito_identity_pool_id": "us-east-1:954b13cc-6ce6-4a13-9b78-924e31738325",
+ "aws_cognito_region": "us-east-1",
+ "aws_user_pools_id": "us-east-1_LFKE2NdwM",
+ "aws_user_pools_web_client_id": "2ldpgbq78qlq1cpphht9d8k57q",
+ "oauth": {
+ domain: "beta-be-well.microhealthllc.com",
+ scope: ["email", "openid", "phone", "aws.cognito.signin.user.admin"],
+ redirectSignIn: `${baseURL}`,
+ redirectSignOut: `${baseURL}`,
+ responseType: "code"
+ },
+ "aws_cognito_username_attributes": [
+ "EMAIL"
+ ],
+ "aws_cognito_social_providers": [],
+ "aws_cognito_signup_attributes": [
+ "EMAIL"
+ ],
+ "aws_cognito_mfa_configuration": "OPTIONAL",
+ "aws_cognito_mfa_types": [
+ "SMS",
+ "TOTP"
+ ],
+ "aws_cognito_password_protection_settings": {
+ "passwordPolicyMinLength": 8,
+ "passwordPolicyCharacters": []
+ },
+ "aws_cognito_verification_mechanisms": [
+ "PHONE_NUMBER"
+ ],
+ "aws_appsync_graphqlEndpoint": `${graphQLEndpoint}`,
+ "aws_appsync_region": "us-east-1",
+ "aws_appsync_authenticationType": "AMAZON_COGNITO_USER_POOLS",
+ "aws_appsync_dangerously_connect_to_http_endpoint_for_testing": true,
+ "aws_user_files_s3_bucket": "wellbeeing3f58a2ecb03248c2988066b315cb3ceb124038-sandbox",
+ "aws_user_files_s3_bucket_region": "us-east-1",
+ "aws_user_files_s3_dangerously_connect_to_http_endpoint_for_testing": true
+};
+
+
+export default awsmobile;
diff --git a/src/store/index.js b/src/store/index.js
index 2955dee..3338963 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -7,6 +7,8 @@ import eventStore from "./modules/event-store";
import goalStore from "./modules/goal-store";
import reminderStore from "./modules/reminder-store";
import videoStore from "./modules/video-store";
+import preferencesStore from "./modules/preferences-store";
+import watchedVideoStore from "./modules/watched-video-store";
Vue.use(Vuex);
@@ -40,5 +42,7 @@ export default new Vuex.Store({
goalStore,
reminderStore,
videoStore,
+ preferencesStore,
+ watchedVideoStore,
},
});
diff --git a/src/store/modules/auth.js b/src/store/modules/auth.js
index 6f291a9..f5d937e 100644
--- a/src/store/modules/auth.js
+++ b/src/store/modules/auth.js
@@ -115,6 +115,13 @@ export default {
});
} catch (error) {
console.log(error);
+ if (error.toString().includes("Invalid phone number format")) {
+ commit("SET_SNACKBAR", {
+ show: true,
+ message: "Invalid Phone Number Provided!",
+ color: "red",
+ });
+ }
}
commit("TOGGLE_SAVING", false);
},
diff --git a/src/store/modules/event-store.js b/src/store/modules/event-store.js
index 4f0d091..46fe25b 100644
--- a/src/store/modules/event-store.js
+++ b/src/store/modules/event-store.js
@@ -18,6 +18,7 @@ export default {
link: "",
},
events: [],
+ associate_goal: false,
},
actions: {
async addEvent({ commit }, event) {
@@ -179,6 +180,7 @@ export default {
(event1, event2) => new Date(event1.date) - new Date(event2.date)
);
},
+ SET_ASSOCIATED_GOAL: (state, goal) => (state.associate_goal = goal),
SET_PARTICIPANTS: (state, updatedEvent) => {
// Update event for Event Details page
state.event.participants = updatedEvent.participants;
@@ -194,5 +196,6 @@ export default {
getters: {
event: (state) => state.event,
events: (state) => state.events,
+ associatedGoal: (state) => state.associate_goal,
},
};
diff --git a/src/store/modules/goal-store.js b/src/store/modules/goal-store.js
index 80c5496..d2bcf22 100644
--- a/src/store/modules/goal-store.js
+++ b/src/store/modules/goal-store.js
@@ -2,8 +2,9 @@ import { API, graphqlOperation } from "aws-amplify";
import { createGoal } from "@/graphql/mutations";
import { updateGoal } from "@/graphql/mutations";
import { deleteGoal } from "@/graphql/mutations";
+import { extendedListGoals } from "@/graphql/extended_queries";
// import { getGoal } from "@/graphql/queries";
-import { listGoals } from "@/graphql/queries";
+// import { listGoals } from "@/graphql/queries";
// import awsconfig from "@/aws-exports";
export default {
@@ -56,7 +57,8 @@ export default {
},
async fetchGoals({ commit }) {
try {
- const res = await API.graphql(graphqlOperation(listGoals));
+ const res = await API.graphql(graphqlOperation(extendedListGoals));
+ // const res = await API.graphql(graphqlOperation(listGoals));
commit("SET_GOALS", res.data.listGoals.items);
} catch (error) {
console.log(error);
diff --git a/src/store/modules/preferences-store.js b/src/store/modules/preferences-store.js
new file mode 100644
index 0000000..cd8f34b
--- /dev/null
+++ b/src/store/modules/preferences-store.js
@@ -0,0 +1,115 @@
+import { API, graphqlOperation } from "aws-amplify";
+import { createPreferences } from "@/graphql/mutations";
+// import { createPreferenceItems } from "@/graphql/mutations";
+import { updatePreferences } from "@/graphql/mutations";
+import { updatePreferenceItems } from "@/graphql/mutations";
+import { listPreferences } from "@/graphql/queries";
+import { listPreferenceItems } from "@/graphql/queries";
+// import { deletePreferences } from "@/graphql/mutations";
+// import { deletePreferenceItems } from "@/graphql/mutations";
+
+export default {
+ state: {
+ preferences: [],
+ preferenceItems: [],
+ },
+ actions: {
+ async addPreferences({ commit, dispatch }, preference) {
+ // console.log(preference)
+ commit("TOGGLE_SAVING", true);
+ try {
+ await API.graphql(
+ graphqlOperation(createPreferences, { input:preference })
+ );
+ dispatch("fetchPreferences");
+ commit("SET_SNACKBAR", {
+ show: true,
+ message: "Preferences successfully added!",
+ color: "var(--mh-green)",
+ });
+ } catch (error) {
+ console.log(error);
+ }
+ commit("TOGGLE_SAVING", false);
+ },
+ // async addPreferenceItems({ commit, dispatch }, preferenceItem) {
+ // console.log(preferenceItem)
+ // commit("TOGGLE_SAVING", true);
+ // try {
+ // await API.graphql(
+ // graphqlOperation(createPreferences, { input:preferenceItem })
+ // );
+ // dispatch("fetchPreferenceItems");
+ // commit("SET_SNACKBAR", {
+ // show: true,
+ // message: "Preferences successfully added!",
+ // color: "var(--mh-green)",
+ // });
+ // } catch (error) {
+ // console.log(error);
+ // }
+ // commit("TOGGLE_SAVING", false);
+ // },
+ async updatePreferencesById({ commit, dispatch }, preference) {
+ commit("TOGGLE_SAVING", true);
+ try {
+ await API.graphql(
+ graphqlOperation(updatePreferences, { input: preference })
+ );
+ dispatch("fetchPreferences");
+ commit("SET_SNACKBAR", {
+ show: true,
+ message: "Preferences successfully updated!",
+ color: "var(--mh-green)",
+ });
+ } catch (error) {
+ console.log(error);
+ }
+ commit("TOGGLE_SAVING", false);
+ },
+ async updatePreferenceItemsById({ commit, dispatch }, preferenceItem) {
+ commit("TOGGLE_SAVING", true);
+ try {
+ await API.graphql(
+ graphqlOperation(updatePreferenceItems, { input: preferenceItem })
+ );
+ dispatch("fetchPreferenceItems");
+ commit("SET_SNACKBAR", {
+ show: true,
+ message: "Preferences successfully updated!",
+ color: "var(--mh-green)",
+ });
+ } catch (error) {
+ console.log(error);
+ }
+ commit("TOGGLE_SAVING", false);
+ },
+
+ async fetchPreferences({ commit }) {
+ try {
+ const res = await API.graphql(graphqlOperation(listPreferences));
+ commit("SET_PREFERENCES", res.data.listPreferences.items);
+ // console.log(res.data.listPreferences.items);
+ } catch (error) {
+ console.log(error);
+ }
+ },
+ async fetchPreferenceItems({ commit }) {
+ try {
+ const res = await API.graphql(graphqlOperation(listPreferenceItems));
+ commit("SET_PREFERENCE_ITEMS", res.data);
+ console.log(res.data);
+ } catch (error) {
+ console.log(error);
+ }
+ },
+ },
+ mutations: {
+ SET_PREFERENCES: (state, preferences) => (state.preferences = preferences),
+ // SET_PREFERENCE_ITEMS: (state, preferenceItems) => (state.preferenceItems = preferenceItems),
+ },
+ getters: {
+ preferences: (state) => state.preferences,
+ // preferenceItems: (state) => state.preferenceItems
+ },
+};
diff --git a/src/store/modules/reminder-store.js b/src/store/modules/reminder-store.js
index 5c31dc0..f9e5d0d 100644
--- a/src/store/modules/reminder-store.js
+++ b/src/store/modules/reminder-store.js
@@ -1,7 +1,7 @@
import { API, graphqlOperation } from "aws-amplify";
import { createReminder } from "@/graphql/mutations";
import { updateReminder } from "@/graphql/mutations";
-import { listReminders } from "@/graphql/queries";
+import { listReminders, getReminder } from "@/graphql/queries";
import { deleteReminder } from "@/graphql/mutations";
export default {
@@ -30,15 +30,16 @@ export default {
async updateReminderById({ commit, dispatch }, reminder) {
commit("TOGGLE_SAVING", true);
try {
+ //console.log("updateReminderById", reminder);
await API.graphql(
graphqlOperation(updateReminder, { input: reminder })
);
dispatch("fetchReminders");
- commit("SET_SNACKBAR", {
+ /* commit("SET_SNACKBAR", {
show: true,
message: "Activity Reminder Successfully Updated!",
color: "var(--mh-green)",
- });
+ }); */
} catch (error) {
console.log(error);
}
@@ -65,6 +66,14 @@ export default {
console.log(error);
}
},
+ async fetchReminder(id) {
+ try {
+ const res = await API.graphql(graphqlOperation(getReminder, { input: id }));
+ console.log(res.data)
+ } catch (error) {
+ console.log(error)
+ }
+ }
},
mutations: {
SET_REMINDERS: (state, reminders) => (state.reminders = reminders),
diff --git a/src/store/modules/watched-video-store.js b/src/store/modules/watched-video-store.js
new file mode 100644
index 0000000..11612c6
--- /dev/null
+++ b/src/store/modules/watched-video-store.js
@@ -0,0 +1,55 @@
+import { API, graphqlOperation } from "aws-amplify";
+import { createWatchedVideo } from "@/graphql/mutations";
+import { deleteWatchedVideo } from "@/graphql/mutations";
+import { listWatchedVideos } from "@/graphql/queries";
+
+export default {
+ state: {
+ watched_videos: [],
+ },
+ actions: {
+ async addWatchedVideo({ commit, dispatch }, video) {
+ commit("TOGGLE_SAVING", true);
+ try {
+ await API.graphql(graphqlOperation(createWatchedVideo, { input: video }));
+ dispatch("fetchWatchedVideos");
+ commit("SET_SNACKBAR", {
+ show: true,
+ message: "Video Added to Watched List!",
+ color: "var(--mh-green)",
+ });
+ } catch (error) {
+ console.log(error);
+ }
+ commit("TOGGLE_SAVING", false);
+ },
+ async removeWatchedVideo({ commit, dispatch }, id) {
+ try {
+ await API.graphql(graphqlOperation(deleteWatchedVideo, { input: id }));
+ dispatch("fetchWatchedVideos");
+ commit("SET_SNACKBAR", {
+ show: true,
+ message: "Watched Videos Reset",
+ color: "var(--mh-orange)",
+ });
+ } catch (error) {
+ console.log(error);
+ }
+ },
+ async fetchWatchedVideos({ commit }) {
+ try {
+ const res = await API.graphql(graphqlOperation(listWatchedVideos));
+ commit("SET_WATCHED_VIDEOS", res.data.listWatchedVideos.items);
+ } catch (error) {
+ console.log(error);
+ }
+ },
+ },
+ mutations: {
+ ADD_WATCHED_VIDEO: (state, video) => state.watched_videos.push(video),
+ SET_WATCHED_VIDEOS: (state, videos) => (state.watched_videos = videos),
+ },
+ getters: {
+ watchedVideos: (state) => state.watched_videos,
+ },
+};
diff --git a/src/views/Activities.vue b/src/views/Activities.vue
index fcc178b..6f6d910 100644
--- a/src/views/Activities.vue
+++ b/src/views/Activities.vue
@@ -1,52 +1,67 @@
-
+
-
-
+
+
+
+
+
-
+
+
+ +
- All
+ >
{{ category.title
}}{{ category.icon }}
-
-
+ Fitness Level
+
+
{{ filter.label }}
-
+ -->
+
+
+
+
this.$route.query.category == category.query
@@ -112,12 +153,31 @@ export default {
(filter) => this.$route.query.filter == filter.query
);
}
- this.mounted = true;
+ /* if (this.$route.query.favFilters) {
+ this.selectedFavFilter = this.favFilters.findIndex(
+ (favFilters) => this.$route.query.favFilters == favFilters.query
+ );
+ } */
+
},
};
diff --git a/src/views/Activities/Goals.vue b/src/views/Activities/Goals.vue
index 98c5c31..709a6ad 100644
--- a/src/views/Activities/Goals.vue
+++ b/src/views/Activities/Goals.vue
@@ -1,248 +1,168 @@
-
+
+
+ Be a better version of You.
+
+ We've got your back!
+ + + +
+
+
-
-
+ ![]()
+
+
+
+
+ {{ video.snippet.channelTitle }}
+
+
+
+
+
+
+ {{ video.snippet.title }}
+
+
+
+ mdi-star
+
+
+ mdi-star-outline
+
+
+ + +
-
+