Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
c4ccf04
Created tables in database
elilaird Mar 29, 2019
01ebcee
added private key for ubuntu server
elilaird Mar 31, 2019
e197545
Update init_tables.sql
StealthySnakes Mar 31, 2019
c6a8ddd
testing a js file
StealthySnakes Mar 31, 2019
6975d2b
updated init_sql file to reflect the database
StealthySnakes Apr 2, 2019
992bc5e
merging backend to resolve issues
StealthySnakes Apr 3, 2019
71c599e
merging backend to resolve issues
StealthySnakes Apr 3, 2019
e2f1b27
fixing branches
StealthySnakes Apr 3, 2019
2dd28ab
fixed init_file
StealthySnakes Apr 3, 2019
8402753
I hate git sometimes
StealthySnakes Apr 3, 2019
46ff05d
Merge branch 'backend' into master
StealthySnakes Apr 3, 2019
c3ab05e
Added documentation
elilaird Apr 4, 2019
385bc33
Add .gitignore to master to hide modules
avirajs Apr 8, 2019
35bb24d
stopwatch, cards in progress
ckholzer27 Apr 15, 2019
fb0f3dc
exercise cards done
ckholzer27 Apr 15, 2019
75c0bbb
Comments system working
ckholzer27 Apr 15, 2019
d38ee5e
rating btn added
ckholzer27 Apr 15, 2019
4bc8bca
added signup
ckholzer27 Apr 17, 2019
5eb8efe
Delete AccountHome.jsx
ckholzer27 Apr 17, 2019
efe8dc9
Delete AccountHome.css
ckholzer27 Apr 17, 2019
ee95746
Rename ExerciseList.jsx to ExerciseCard.jsx
ckholzer27 Apr 17, 2019
2f379f8
Update WorkoutPage.jsx
ckholzer27 Apr 17, 2019
c4cbe3d
Delete App.js
ckholzer27 Apr 17, 2019
d0a125e
remove export default for merging (?)
ckholzer27 Apr 17, 2019
f3c818a
Delete .DS_Store
ckholzer27 Apr 17, 2019
7423764
Add files via upload
ckholzer27 Apr 17, 2019
9a35464
Delete DS_Store
ckholzer27 Apr 17, 2019
6b191f4
uploaded api repository that should work
ckholzer27 Apr 25, 2019
885aa84
Update Addimg.js
ckholzer27 Apr 28, 2019
48faffd
Merge branch 'Chase-signup-workoutpg' of https://github.com/StealthyS…
ckholzer27 Apr 28, 2019
f42fd8d
changed stopwatch, should work now
ckholzer27 Apr 28, 2019
0ebf26c
fixed/final wrokout, editor, signup
ckholzer27 Apr 29, 2019
f2e8a8e
last night work
ckholzer27 May 1, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file modified .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Frontend/node_modules
Binary file renamed ...node_modules/fsevents/build/Release/.node → Backend/.DS_Store
100755 → 100644
Binary file not shown.
23 changes: 23 additions & 0 deletions Backend/anyfit_key.pem
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEogIBAAKCAQEAlwRZgTVGIjtuUcIoG7xu7DEDfMzj2l8j9ld6QLHfEnu0us41CW+xKdIqghs/
x085K3RO7FFMi5kZQT7mLd07uyBOWprZV1B74L/tAGojBVH/iIRxHzojldPIZKekxv+MtXUo1QAB
FPiUruy6vKK/Vtydd9vWG7bx08Br/tG3iGxb82jOAznZ/BYFGTZZQjVyDOqJe40YMeGq5WBukmA0
+A4Fvw77/uQ9SW97JPcEn2Iy1XTHt0u5QPy4/4/OQ3/OHzBiQ0+UERi+ZDaQvE8F2XiPng8+zTpA
7ksq5JYnxOXQEaPUW/S1ZL9tWSP9D8N4pHAQAzX/sth8jSATMywHmQIDAQABAoIBABXSXRScnBvK
NrC9u4n2epjKpFReTvZ5FPs9vL6odTF4iq8LqQJKD3GZmubeBSNJwVsUHWtsfAEYCFwzOJOcCkuJ
6YiSI6HIUX4yfY63x4O3S5Nwf+AhSI8X4TcaOmc++hgma9YLgByFpwZ30qv7YGauzlpJe/DZSKxu
e6yApWKi/OZ73d3goVW1L/7vfen3HQhbsfulswYM0gATA7A+GuF9vA/QWHi91TbnojiiiOrSMKVD
JT2o1jaGACgbtMF9dKbUB47tqf8NFfFH25M2RMda9g7hCjTssxqef2FZG0enGMQNQ28M0W0rNI+K
7TodjTgwyXSW+nMm14mqCeylyJkCgYEAz3osdHy4HX1Vy4iShesABux13CDwjZ6oNZrXH0FX4O+o
QrT34LV+WXTv8E4u89hvjtHEaA/hmVua2odXeX4ehoFutAHqQguqF6vQlehS6b1aSNMmmhIceuhi
KEA6p4923d8vuynxOB2OtHcS1okYIbWEqGhjyUOSGKQaHdirxo8CgYEAulXbL0DNjrFJuKtqjBjX
6YvPY8njBkieSfXlf3RzdKUrtSgjwAyDFiUkFlIVm4bL1goutgdg79lfvfkrfogCjZ+TjWls3VQf
T3LgJQY3QfdArZNMvk4KsAlvasa62vbQvTxmmJCs6uxX33cxg9CcHHEAOr9NuWCySUvdzIP6I1cC
gYAt64N1ULlLRZc8kgCkBSwfXCyFyQCUx53BJ4EfWM4DaeeaxATsxh6t2/TTAerga3HdcU4AHiu3
TpAKd9QDfsdwy6rdymK3tW8zCAMFesMHGrKl1Z4AkaueBFrdP8H7ngQX/TLKQPEzk08nYAdaVkNy
CoPO5jPXss3eCEwDeRYjvwKBgAP7AYuo3rtFnkWLo+MKRNKAYhXHoknoEzmRPy3R1wWO4bgk+16G
5eX7NSIk7sE7x+7ymLzau39kLV9pizxQu307A3Pp5KF1wpV35sHjuBp4pbEPjHwkPqY0DWVCiYtT
6nGgcLChpo/+LIJhkXU3Z55T66VVoNts7WITdNGBoD5RAoGAU+/VEqs3ergv6FUCMtMie/mGmBLH
5rhbEPZswT6a/GFCPVVoQPpJvrFZndVZLnLQextsARfsQHd7oJ/tCOutkDrIgO3aQpJavC08Okdp
st4EjmoOv1vQpBUnHacZuBfsR2ltRDEc+QVnc3CfGbmPlnRwUdJmgk4clx+qB0biMpQ=
-----END RSA PRIVATE KEY-----
16 changes: 0 additions & 16 deletions Backend/index.html

This file was deleted.

19 changes: 12 additions & 7 deletions Backend/init_tables.sql
Original file line number Diff line number Diff line change
@@ -1,26 +1,29 @@
--use ______; -- insert database name
use anyfit;

CREATE TABLE user_info (
user_id INT PRIMARY KEY,
username VARCHAR(40),
_name VARCHAR(14),
_password VARCHAR(40),
avatar VARBINARY
avatar VARCHAR(250)
);

CREATE TABLE friends (
user_id INT PRIMARY KEY,
username VARCHAR(40),
friend_id INT,
f_username VARCHAR(40),
FOREIGN KEY(user_id) REFERENCES user_info(user_id),
FOREIGN KEY(username) REFERENCES user_info(username)
f_username VARCHAR(40)
-- FOREIGN KEY(user_id) REFERENCES user_info(user_id),
-- FOREIGN KEY(username) REFERENCES user_info(username)
);

CREATE TABLE user_workout (
user_id INT PRIMARY KEY,
username VARCHAR(40),
workout_id INT,
past_workout BOOLEAN,
custom_workout BOOLEAN,
favorite_workout BOOLEAN,
FOREIGN KEY(user_id) REFERENCES user_info(user_id),
FOREIGN KEY(workout_id) REFERENCES workout_info(workout_id)
);
Expand All @@ -38,8 +41,8 @@ CREATE TABLE workout_info (
intensity INT,
ExpLevel VARCHAR(40),
comments VARCHAR(250),
Pub/Pri BOOLEAN,
FOREIGN KEY(exercise) REFERENCES exercise(exercise_id)
visibility BOOLEAN,
FOREIGN KEY(exercise_id) REFERENCES exercise(exercise_id)
);

CREATE TABLE exercise (
Expand All @@ -50,3 +53,5 @@ CREATE TABLE exercise (
);




Binary file added Documentation/UML.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Frontend/.DS_Store
Binary file not shown.
16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/acorn

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/ansi-html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/atob

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/autoprefixer

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/babylon

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/browserslist

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/css-blank-pseudo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/css-has-pseudo

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/css-prefers-color-scheme

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/cssesc

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/detect

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/detect-port

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/errno

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/escodegen

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/esgenerate

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion Frontend/node_modules/.bin/eslint

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading