Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
992305b
Added Photo in schema and photo-store
katelyn-gomez Feb 23, 2023
ed04c43
Added photo to Nav bar and feature to upload Title and File-- functio…
katelyn-gomez Feb 23, 2023
ae087a3
Merge branch 'kgBranch' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Feb 24, 2023
e75a25d
Updates to Photos
katelyn-gomez Mar 20, 2023
a917aa8
WIP Competitions tab
katelyn-gomez Mar 24, 2023
fc347cd
Competition changed to Campaign, as well as changes to its Form and C…
katelyn-gomez Apr 15, 2023
8c2c843
Fixed null exception in Competition Form
katelyn-gomez Apr 17, 2023
620b174
Removed clear function on timepicker
katelyn-gomez Apr 18, 2023
7c1f7ae
changed ::v-deep to :deep
katelyn-gomez Apr 18, 2023
3981982
added API key for auth
katelyn-gomez Apr 18, 2023
4cadce1
Merge branch 'kgBranch' of github.com:MicroHealthLLC/well-beeing into…
zachegnermh Apr 18, 2023
fbc1c64
fixing sandbox env
zachegnermh Apr 18, 2023
aa20ac8
Downgraded node version to revert this file
katelyn-gomez Apr 19, 2023
eb2e5c0
turned off sso to fix file upload error
katelyn-gomez Apr 19, 2023
c32d21e
Fixed timepicker
katelyn-gomez Apr 19, 2023
2c9f168
Fixed some validation
katelyn-gomez Apr 19, 2023
210c768
Default val for comp submission changed to true
katelyn-gomez Apr 19, 2023
bc3a410
Fixed OpenPhoto() in Campaigns
katelyn-gomez Apr 23, 2023
cd08553
schema changes
katelyn-gomez Apr 24, 2023
ce50829
Changed isApproved value and deleteCompetitor()
katelyn-gomez Apr 26, 2023
58528fb
Added manual scoring and delete submission dialog
katelyn-gomez May 3, 2023
0a75bc4
manual scoring fix
katelyn-gomez May 3, 2023
3bddc9f
added sign-up deadline and group part. snackbar
katelyn-gomez May 8, 2023
1dbf2bb
Schema update
katelyn-gomez May 18, 2023
c7153db
Found and fixed error of sizing of text and cards
katelyn-gomez May 18, 2023
c8b529d
Put Groups display into v-cards
katelyn-gomez May 23, 2023
f6a1b2a
Add points to GroupCard participants
katelyn-gomez May 23, 2023
a366804
Redesigned Leaderboard and fixed sorting on it
katelyn-gomez May 31, 2023
e4d9426
Changes to Submissions tab
katelyn-gomez Jun 1, 2023
e8699ad
Changes to submissions tab
katelyn-gomez Jun 1, 2023
209e1a4
Changed submission layout to carousel
katelyn-gomez Jun 6, 2023
a72f07c
Fix for issue 164
isabellemeeksmh Jun 15, 2023
14b66a5
Fixed TimePicker issue
katelyn-gomez Jun 15, 2023
492be9c
Starting implementation of "Like Submission"
katelyn-gomez Jun 21, 2023
6639040
Dependabot #49 and #50 resolution
katelyn-gomez Jun 23, 2023
e4cae74
Merge pull request #165 from MicroHealthLLC/responsiveNavBar_im_20230615
katelyn-gomez Jun 23, 2023
659d246
Added LikeSubmission feature
katelyn-gomez Jun 26, 2023
85e6d10
Merge branch 'kgBranch4' of https://github.com/MicroHealthLLC/be-well…
katelyn-gomez Jun 26, 2023
df76612
Add likeButton to schema
katelyn-gomez Jun 27, 2023
963e86e
enable sso
katelyn-gomez Jun 27, 2023
bab10c4
schema containing Likes and modified login page
katelyn-gomez Jul 20, 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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ amplify/\#current-cloud-backend
amplify/.config/local-*
amplify/logs
amplify/mock-data
amplify/mock-api-resources
amplify/backend/amplify-meta.json
amplify/backend/.temp
build/
Expand Down
11 changes: 11 additions & 0 deletions .graphqlconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,17 @@ projects:
region: us-east-1
apiId: null
maxDepth: 3
beta:
schemaPath: src/graphql/schema.json
includes:
- src/graphql/**/*.js
excludes:
- ./amplify/**
extensions:
amplify:
codeGenTarget: javascript
generatedFileName: ''
docsFilePath: src/graphql
extensions:
amplify:
version: 3
6 changes: 3 additions & 3 deletions amplify/.config/project-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"providers": [
"awscloudformation"
],
"projectName": "WellBeeing",
"projectName": "beWell",
"version": "3.1",
"frontend": "javascript",
"javascript": {
"framework": "vue",
"config": {
"SourceDir": "src",
"DistributionDir": "dist",
"BuildCommand": "npm run-script build",
"StartCommand": "npm run-script serve"
"BuildCommand": "npm.cmd run-script build",
"StartCommand": "npm.cmd run-script serve"
}
}
}
8 changes: 0 additions & 8 deletions amplify/README.md

This file was deleted.

326 changes: 326 additions & 0 deletions amplify/backend/api/bewellapi/schema.graphql
Original file line number Diff line number Diff line change
@@ -0,0 +1,326 @@
type Reminder @model @auth(rules: [{ allow: owner }]) {
id: ID!
category: Category!
goal: Goal @belongsTo(fields: ["goalId"])
goalId: ID @index(name: "byGoal")
level: Level!
@index(
name: "remindersByLevel"
queryField: "remindersByLevel"
sortKeyFields: ["createdAt"]
)
frequency: String!
contentType: String!
time: String!
activity: String
isComplete: Boolean
createdAt: AWSDateTime!
}

type Photo @model @auth (rules: [{ allow: owner }]) {
id: ID!
title: String!
}

type Goal @model @auth(rules: [{ allow: owner }]) {
id: ID!
title: String!
category: Category!
reminders: [Reminder] @hasMany(indexName: "byGoal",fields: ["id"])
progress: Int!
stepCount: Int
dueDate: AWSDate!
isComplete: Boolean
goalEnd: Boolean
completedCount: Int
checklist: [ChecklistItem]
}

type ChecklistItem {
title: String
isComplete: Boolean
}

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

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

type WatchedVideo @model @auth(rules: [{ allow: owner identityClaim: "sub::username" }]) {
id: ID!
title: String!
videoId: String!
category: String!
level: String!
nextVideo: String!
}

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

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

type Preferences @model @auth(
rules: [
{ allow: owner }
]
) {
id: ID!
preference_items: [PreferenceItems]
}

type PreferenceItems {
category: String
l1: Boolean
l2: Boolean
l3: Boolean
l4: Boolean
l5: Boolean
not_interested: Boolean
}

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: String!
participants: [Participant]
link: String
image: String
}

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

type Competition
@model
@auth(
rules: [
{ allow: groups, groups: ["Editors"] },
{ allow: private, operations: [read] },
{ allow: public, operations: [read] }
]
) {
id: ID!
hostName: String!
hostEmail: AWSEmail!
title: String!
campaignType: String!
isPrivate: Boolean!
# isAnonymous: Boolean!
groupParticipation: Boolean!
manualScoring: Boolean
unit: String
scoringVal: Float
category: String!
description: String!
rules: String!
startDate: AWSDate!
endDate: AWSDate!
startTime: String!
endTime: String!
timeZone: TimeZone!
deadline: AWSDate!
groups: [Group] @hasMany(indexName: "byCompetition", fields: ["id"])
competitors: [Competitor] @hasMany(indexName: "byCompetition", fields: ["id"])
submissions: [CompetitionSubmission]
@hasMany(indexName: "bySubmission", fields: ["id"])
image: String
}

type Group
@model
@auth(
rules: [
{
allow: groups
groups: ["Editors"]
operations: [create, read, update, delete]
},
{ allow: owner, operations: [create, delete] },
{ allow: private, operations: [read] }
]
) {
id: ID!
competitionId: ID! @index(name: "byCompetition", sortKeyFields: ["groupName"])
groupName: String!
score:Float @default(value: "0")
}

type Competitor
@model
@auth(
rules: [
{ allow: groups, groups: ["Editors"] },
{ allow: owner, operations: [create, delete] },
{ allow: private, operations: [read] }
]
) {
id: ID!
competitionId: ID! @index(name: "byCompetition", sortKeyFields: ["lastName"])
userId: ID!
firstName: String!
lastName: String!
groupParticipation: Boolean
groupName: String
groupId: String
score: Float @default(value: "0")
}

type CompetitionSubmission
@model
@auth(
rules: [
{
allow: groups
groups: ["Editors"]
operations: [create, read, update, delete]
},
{ allow: owner, operations: [create, delete] },
{ allow: private, operations: [read] }
]
) {
id: ID!
competitionId: ID! @index(name: "bySubmission", sortKeyFields: ["createdAt"])
competitorId: ID!
userId: ID!
s3Key: String
description: String
submittedBy: String
createdAt: AWSDateTime!
likes: Int
isApproved: Boolean @default(value: "true")
type: SubmissionType
url: String
manualScoring: Boolean
scoringVal: Float
mAmount: Float
}

type likeButton @model @auth (rules: [{ allow: owner }]) {
id: ID!
subId: String!
liked: Boolean! @default(value: "false")
icon: String!
}

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

enum Level {
L1
L2
L3
L4
L5
NOT_APPLICABLE
}

enum TimeZone {
PST
MST
CST
EST
EDT
}

enum SubmissionType {
PHOTO
VIDEO
TEXT
}



Loading