Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch For Debugging #285

Open
wants to merge 91 commits into
base: develop
Choose a base branch
from
Open

Branch For Debugging #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
3a1313a
AI training and classification models
Thivesshj Sep 3, 2022
9b09d05
added trained model
Thivesshj Sep 3, 2022
25c954a
Merge branch 'develop' into Feature-AI
Thivesshj Sep 3, 2022
173973d
Merge branch 'develop' into Feature-AI
Thivesshj Sep 5, 2022
46688e8
Merge branch 'develop' into Feature-AI
Thivesshj Sep 9, 2022
daab07a
Merge branch 'develop' into Feature-AI
Thivesshj Sep 11, 2022
1e37bc3
Merge branch 'develop' into Feature-AI
Thivesshj Sep 16, 2022
9cf1c00
ai
Thivesshj Sep 16, 2022
bedb073
added alert
Thivesshj Sep 16, 2022
daefe8d
🙈
Dylan-Whiteford Sep 16, 2022
9eb4842
Merge branch 'develop' of https://github.com/COS301-SE-2022/Gym-King …
Dylan-Whiteford Sep 16, 2022
6128d31
Merge branch 'Feature-AI' of https://github.com/COS301-SE-2022/Gym-Ki…
Dylan-Whiteford Sep 17, 2022
e81b092
🙈
Dylan-Whiteford Sep 17, 2022
71d5796
👷 downgrade nx workspace
Dylan-Whiteford Sep 17, 2022
fe96a54
fixed asynchronous code
Thivesshj Sep 20, 2022
198e8d2
Merge branch 'develop' into Feature-AI
Thivesshj Sep 21, 2022
ba9d65c
Merge branch 'develop' into Feature-AI
Thivesshj Sep 23, 2022
0d4a368
Merge branch 'develop' into Feature-AI
Thivesshj Sep 26, 2022
8d6534c
syncing branch
Thivesshj Sep 26, 2022
199cb4b
Update UploadActivityPage.tsx
Thivesshj Sep 26, 2022
57a9a56
Merge branch 'Feature-Friends' of https://github.com/COS301-SE-2022/G…
Dylan-Whiteford Sep 26, 2022
fb502e0
🐛
Dylan-Whiteford Sep 27, 2022
6f203cc
add print stack trace
Dylan-Whiteford Sep 27, 2022
c055b5d
Merge branch 'develop' of https://github.com/COS301-SE-2022/Gym-King …
Dylan-Whiteford Sep 27, 2022
19fa72c
Merge branch 'develop' into Feature-AI
Thivesshj Sep 27, 2022
58e13f7
removed unneccesary imports
Thivesshj Sep 28, 2022
377ce0c
add AI setting toggle
Thivesshj Sep 28, 2022
56b4eb9
🚀 finish take video functionality
Dylan-Whiteford Sep 28, 2022
d27abfc
Merge branch 'Feature-AI' of https://github.com/COS301-SE-2022/Gym-Ki…
Dylan-Whiteford Sep 28, 2022
4949daf
implemented AI-toggle on upload activity page
Thivesshj Sep 28, 2022
5750166
Update UploadActivityPage.tsx
Thivesshj Sep 28, 2022
6095637
Merge branch 'develop' into Feature-AI
Thivesshj Sep 28, 2022
8627528
Merge branch 'develop' into Feature-AI
Thivesshj Sep 28, 2022
8c91c79
implemented tflite-functionality
Thivesshj Sep 29, 2022
a4ab4ca
Update UploadActivityPage.tsx
Thivesshj Sep 29, 2022
5966d39
Merge branch 'develop' into Feature-AI
Thivesshj Sep 29, 2022
58d4d8a
update NNoutcome card and output messages
Thivesshj Sep 29, 2022
15ab3a0
💄
Dylan-Whiteford Sep 29, 2022
e54cd9b
UI fixes
jademichellepeche Oct 15, 2022
e8576b9
Removed warnings
jademichellepeche Oct 15, 2022
8d81352
Fixing build error
jademichellepeche Oct 15, 2022
54a61eb
Updated map view modal
jademichellepeche Oct 18, 2022
83a47a1
Added toggle for modal
jademichellepeche Oct 18, 2022
caf6827
Updated user profile
jademichellepeche Oct 18, 2022
285f46e
Updated Friend Profile
jademichellepeche Oct 18, 2022
1959761
Updated NotFriendProfile
jademichellepeche Oct 18, 2022
46680c0
Fixed GymList
jademichellepeche Oct 18, 2022
c003c11
Updated GymPage
jademichellepeche Oct 18, 2022
7c342ea
Merge branch 'develop' into Feature-AI
Thivesshj Oct 23, 2022
58af380
update code in UploadActivity and NNOutcome
Thivesshj Oct 23, 2022
983684a
add bench press model
Thivesshj Oct 23, 2022
cb2a953
add pull up model
Thivesshj Oct 23, 2022
c48abaa
ass pushup model
Thivesshj Oct 23, 2022
97e5e64
add situp model
Thivesshj Oct 23, 2022
0550b58
remove unwanted model
Thivesshj Oct 23, 2022
da1f1bc
Fixed unit tests
jademichellepeche Oct 23, 2022
2f5500c
Fix bugs
jademichellepeche Oct 23, 2022
ad15e6c
Merge remote-tracking branch 'origin/Feature-Beautify' into Feature-AI
Thivesshj Oct 23, 2022
7f4da01
Merge remote-tracking branch 'origin/Debugging' into Feature-AI
Thivesshj Oct 23, 2022
52155db
🚀 add auto login attempt for users who have details stored on device
Dylan-Whiteford Oct 23, 2022
66ccf29
hotfixes
Thivesshj Oct 23, 2022
6330dcc
Merge branch 'Feature-AI' of https://github.com/COS301-SE-2022/Gym-Ki…
Dylan-Whiteford Oct 24, 2022
f8f7958
🐛 finish auto login on splash page
Dylan-Whiteford Oct 26, 2022
0be0a6b
💄 add new logo
Dylan-Whiteford Oct 26, 2022
ce84874
Update AppSettingsPage.tsx
Thivesshj Oct 26, 2022
4c0ed24
🏗️ add push notification registration event when user logs in
Dylan-Whiteford Oct 26, 2022
e860537
Merge branch 'Feature-AI' of https://github.com/COS301-SE-2022/Gym-Ki…
Dylan-Whiteford Oct 26, 2022
e0828d2
Merge branch 'develop' into Feature-Beautify
jademichellepeche Oct 26, 2022
54ad33f
Merge remote-tracking branch 'origin/Debugging' into Feature-Beautify
jademichellepeche Oct 26, 2022
b67df28
🩹 add push notification for when a user earns a badge
Dylan-Whiteford Oct 26, 2022
44a5692
Updated UserProfile
jademichellepeche Oct 26, 2022
7fb6b3e
Updated profiles styling
jademichellepeche Oct 26, 2022
abbc874
Updated App Settings
jademichellepeche Oct 26, 2022
4ae546e
Updated EmployeeHome
jademichellepeche Oct 26, 2022
3a8969e
Updated PendingApprovals
jademichellepeche Oct 26, 2022
fb7f62b
Updated ActivityList
jademichellepeche Oct 26, 2022
1df3093
Updated Radio Group
jademichellepeche Oct 26, 2022
541c356
Removed random page breaks
jademichellepeche Oct 26, 2022
e9d2f3f
Removed random page breaks
jademichellepeche Oct 26, 2022
41bdc19
💄 add push notification toggle to settings page
Dylan-Whiteford Oct 26, 2022
dc78669
Merge branch 'Feature-Beautify' of https://github.com/COS301-SE-2022/…
Dylan-Whiteford Oct 26, 2022
f130fd5
🔨 lock app in potrait mode
Dylan-Whiteford Oct 27, 2022
eae3bc7
🩹 🐛
Dylan-Whiteford Oct 27, 2022
0892d68
Fixex Badge Sizing
jademichellepeche Oct 27, 2022
a4f9ca9
Updated UploadActivity
jademichellepeche Oct 27, 2022
8bd7184
Updated AppSettings for owners and employees
jademichellepeche Oct 27, 2022
c3565a9
Updated popovers
jademichellepeche Oct 27, 2022
dbfd6ba
Merge branch 'develop' into Feature-Beautify
jademichellepeche Oct 27, 2022
c229bbf
Removed warnings
jademichellepeche Oct 27, 2022
3819b47
Merge branch 'Feature-Beautify' of https://github.com/COS301-SE-2022/…
Dylan-Whiteford Oct 27, 2022
ff8fb89
🔧 remove signings config from trapeeze
Dylan-Whiteford Oct 27, 2022
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,497 changes: 1,497 additions & 0 deletions back-end/AI/Model.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

835 changes: 835 additions & 0 deletions back-end/AI/classifier.ipynb
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added back-end/AI/inception_v3_weights_tf_dim_ordering_tf_kernels_notop.h5
View file
Open in desktop
Binary file not shown.
307 changes: 307 additions & 0 deletions back-end/AI/trained_model3/keras_metadata.pb
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added back-end/AI/trained_model3/saved_model.pb
View file
Open in desktop
Binary file not shown.
Binary file added back-end/AI/trained_model3/variables/variables.index
View file
Open in desktop
Binary file not shown.
Binary file added back-end/AI/weights3/.index
View file
Open in desktop
Binary file not shown.
2 changes: 2 additions & 0 deletions back-end/AI/weights3/checkpoint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
model_checkpoint_path: "."
all_model_checkpoint_paths: "."
7 changes: 6 additions & 1 deletion front-end/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,16 @@
"@capacitor/app-launcher": "^4.0.1",
"@capacitor/core": "4.2.0",
"@capacitor/device": "^4.0.1",
"@capacitor/filesystem": "^4.1.1",
"@capacitor/geolocation": "^4.0.1",
"@capacitor/haptics": "1.1.4",
"@capacitor/ios": "4.2.0",
"@capacitor/keyboard": "1.2.2",
"@capacitor/push-notifications": "^4.1.0",
"@capacitor/status-bar": "1.0.8",
"@teamhive/capacitor-video-recorder": "^5.0.0",
"@tensorflow/tfjs": "^3.20.0",
"@tensorflow/tfjs-tflite": "0.0.1-alpha.8",
"@testing-library/jest-dom": "^5.11.9",
"@testing-library/react": "^11.2.5",
"@testing-library/user-event": "^12.6.3",
Expand All @@ -23,7 +27,8 @@
"env-cmd": "^10.1.0",
"express": "^4.18.1",
"ionicons": "^5.4.0",
"jest": "27.4.2",
"jest": "28.0.0",
"node-fetch": "^3.2.10",
"react-scripts": "^5.0.1",
"swiper": "^8.2.6",
"ts-node": "^10.7.0",
Expand Down
Binary file added front-end/public/assets/model/benchpress/group1-shard10of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard11of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard12of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard13of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard14of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard15of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard16of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard1of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard2of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard3of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard4of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard5of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard6of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard7of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard8of16.bin
View file
Open in desktop
Binary file not shown.
Binary file added front-end/public/assets/model/benchpress/group1-shard9of16.bin
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions front-end/public/assets/model/benchpress/model.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading