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.

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

Feature/user profile #61

Open
wants to merge 51 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
12b9794
Create ProfileScreen.tsx
jerry-dang Jun 9, 2023
2b3c59b
Finished EditProfile, updated UserProfile page
jerry-dang Jun 15, 2023
567c348
Updated toggle icon
jerry-dang Jun 15, 2023
6dc3401
Merge branch 'main' into feature/user-profile
jerry-dang Jun 15, 2023
370658a
Fixed bug in App.tsx
jerry-dang Jun 15, 2023
1e46bf1
Updated user profile
jerry-dang Jun 16, 2023
fedfd05
Fixed safeArea bug
jerry-dang Jun 29, 2023
a9eaecb
Update Podfile.lock
jerry-dang Jul 6, 2023
a88a2d6
Merge branch 'main' into feature/user-profile
jerry-dang Jul 6, 2023
285b075
Update yarn.lock
jerry-dang Jul 6, 2023
dca8585
Added user settings page
jerry-dang Jul 18, 2023
7d853f9
Merge branch 'main' into feature/user-profile
jerry-dang Jul 18, 2023
87f13cb
Fixed bugs
jerry-dang Jul 18, 2023
eb2986b
Merge branch 'main' into feature/user-profile
hoomji Jul 19, 2023
4567f9e
delete nodes in /root folder
hoomji Jul 19, 2023
1dc37b2
Delete package-lock.json
hoomji Jul 19, 2023
20de945
Merge branch 'main' into feature/user-profile
jerry-dang Jul 20, 2023
33f19de
Merged main
jerry-dang Jul 20, 2023
52c49fc
Update Podfile
jerry-dang Jul 20, 2023
12cae3d
Merge branch 'main' into feature/user-profile
jerry-dang Jul 20, 2023
b438363
Front-end updates for user profile (Debug)
jerry-dang Jul 21, 2023
05b8208
added getUser
hoomji Jul 21, 2023
5969616
Debug front-end/back-end
jerry-dang Jul 21, 2023
71792f1
Debug bad request and user query
jerry-dang Jul 26, 2023
b5c98a3
Dark theme
jerry-dang Aug 2, 2023
11ea32b
Merge branch 'main' into feature/user-profile
jerry-dang Aug 2, 2023
5dd1bf5
UI Refactoring
jerry-dang Aug 2, 2023
75ab617
Finished refactoring UI for workout screens
jerry-dang Aug 3, 2023
4b9281f
Merge branch 'main' into feature/user-profile
jerry-dang Aug 3, 2023
4f8e49f
Merge branch 'main' into feature/user-profile
jerry-dang Aug 3, 2023
a75de97
Update user.ts
hoomji Aug 4, 2023
7531695
Added user profile screen for all users
jerry-dang Aug 4, 2023
d2ec2a0
Bug fix?
jerry-dang Aug 4, 2023
6d35634
Merge branch 'feature/user-endpoint' into feature/user-profile
jerry-dang Aug 4, 2023
8304b37
Bug fix
jerry-dang Aug 4, 2023
feb389b
Debugging user profile
jerry-dang Aug 4, 2023
45dd0f6
fix vars
hoomji Aug 4, 2023
775bc8c
declare vars
hoomji Aug 4, 2023
fe9daa7
Update UserProfileHeader.tsx
jerry-dang Aug 4, 2023
bd637db
Merge branch 'feature/user-profile' of https://github.com/CSCC012023/…
jerry-dang Aug 4, 2023
19534b7
UI Improvement for Signup/Login
jerry-dang Aug 4, 2023
0a02595
Revoved temp debug button
jerry-dang Aug 4, 2023
5c291b5
Improved friends screen UI
jerry-dang Aug 4, 2023
3e202dc
Update WorkoutScreen.tsx
jerry-dang Aug 4, 2023
6c3cfc2
Merge branch 'main' into feature/user-profile
jerry-dang Aug 4, 2023
827057d
Fixed UI bug on profile screen
jerry-dang Aug 4, 2023
ce3d41c
UI updates
jerry-dang Aug 4, 2023
d62f36e
Update yarn.lock
jerry-dang Aug 9, 2023
6fbab9d
Merge branch 'main' into feature/user-profile
jerry-dang Aug 9, 2023
30e4c62
Homescreen merge bugfix
jerry-dang Aug 9, 2023
07d2733
Merge branch 'main' into feature/user-profile
jerry-dang Aug 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
Prev Previous commit
Next Next commit
Update yarn.lock
  • Loading branch information
jerry-dang committed Aug 9, 2023
commit d62f36e1755557ec00c1084c138f49878674a6b7
74 changes: 32 additions & 42 deletions back-end/yarn.lock
Original file line number Diff line number Diff line change
@@ -280,10 +280,10 @@ braces@~3.0.2:
dependencies:
fill-range "^7.0.1"

bson@^5.3.0:
version "5.3.0"
resolved "https://registry.npmjs.org/bson/-/bson-5.3.0.tgz"
integrity sha512-ukmCZMneMlaC5ebPHXIkP8YJzNl5DC41N5MAIvKDqLggdao342t4McltoJBQfQya/nHBWAcSsYRqlXPoQkTJag==
bson@^5.4.0:
version "5.4.0"
resolved "https://registry.npmjs.org/bson/-/bson-5.4.0.tgz"
integrity sha512-WRZ5SQI5GfUuKnPTNmAYPiKIof3ORXAF4IRU5UcgmivNIon01rWQlw5RUH954dpu8yGL8T59YShVddIPaU/gFA==

buffer-from@^1.0.0:
version "1.1.2"
@@ -914,25 +914,25 @@ mongodb-connection-string-url@^2.6.0:
"@types/whatwg-url" "^8.2.1"
whatwg-url "^11.0.0"

mongodb@^5.5.0, mongodb@5.6.0:
version "5.6.0"
resolved "https://registry.npmjs.org/mongodb/-/mongodb-5.6.0.tgz"
integrity sha512-z8qVs9NfobHJm6uzK56XBZF8XwM9H294iRnB7wNjF0SnY93si5HPziIJn+qqvUR5QOff/4L0gCD6SShdR/GtVQ==
mongodb@^5.5.0, mongodb@5.7.0:
version "5.7.0"
resolved "https://registry.npmjs.org/mongodb/-/mongodb-5.7.0.tgz"
integrity sha512-zm82Bq33QbqtxDf58fLWBwTjARK3NSvKYjyz997KSy6hpat0prjeX/kxjbPVyZY60XYPDNETaHkHJI2UCzSLuw==
dependencies:
bson "^5.3.0"
bson "^5.4.0"
mongodb-connection-string-url "^2.6.0"
socks "^2.7.1"
optionalDependencies:
saslprep "^1.0.3"

mongoose@^7.2.1:
version "7.3.2"
resolved "https://registry.npmjs.org/mongoose/-/mongoose-7.3.2.tgz"
integrity sha512-Z86m5ASwYYFyT++wPQTtuTl5Jh052w6G1IM8LxPu/6iuqxQo6nUOaEoGZfMy0ovw3Dyw3415Jue3pYXkRqPkfA==
version "7.4.1"
resolved "https://registry.npmjs.org/mongoose/-/mongoose-7.4.1.tgz"
integrity sha512-o3E5KHHiHdaiwCJG3+9r70sncRKki71Ktf/TfXdW6myu+53rtZ56uLl5ylkQiCf60V3COJuOeekcxXVsjQ7cBA==
dependencies:
bson "^5.3.0"
bson "^5.4.0"
kareem "2.5.1"
mongodb "5.6.0"
mongodb "5.7.0"
mpath "0.9.0"
mquery "5.0.0"
ms "2.1.3"
@@ -1005,18 +1005,18 @@ nodemailer@^6.9.3:
resolved "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.3.tgz"
integrity sha512-fy9v3NgTzBngrMFkDsKEj0r02U7jm6XfC3b52eoNV+GCrGj+s8pt5OqhiJdWKuw51zCTdiNR/IUD1z33LIIGpg==

nodemon@^2.0.22:
version "2.0.22"
resolved "https://registry.npmjs.org/nodemon/-/nodemon-2.0.22.tgz"
integrity sha512-B8YqaKMmyuCO7BowF1Z1/mkPqLk6cs/l63Ojtd6otKjMx47Dq1utxfRxcavH1I7VSaL8n5BUaoutadnsX3AAVQ==
nodemon@^3.0.1:
version "3.0.1"
resolved "https://registry.npmjs.org/nodemon/-/nodemon-3.0.1.tgz"
integrity sha512-g9AZ7HmkhQkqXkRc20w+ZfQ73cHLbE8hnPbtaFbFtCumZsjyMhKk9LajQ07U5Ux28lvFjZ5X7HvWR1xzU8jHVw==
dependencies:
chokidar "^3.5.2"
debug "^3.2.7"
ignore-by-default "^1.0.1"
minimatch "^3.1.2"
pstree.remy "^1.1.8"
semver "^5.7.1"
simple-update-notifier "^1.0.7"
semver "^7.5.3"
simple-update-notifier "^2.0.0"
supports-color "^5.5.0"
touch "^3.1.0"
undefsafe "^2.0.5"
@@ -1234,28 +1234,18 @@ saslprep@^1.0.3:
dependencies:
sparse-bitfield "^3.0.3"

semver@^5.7.1:
version "5.7.1"
resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"
integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==

semver@^6.0.0:
version "6.3.0"
resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
version "6.3.1"
resolved "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz"
integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==

semver@^7.3.5:
version "7.5.3"
resolved "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz"
integrity sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==
semver@^7.3.5, semver@^7.5.3:
version "7.5.4"
resolved "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz"
integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
dependencies:
lru-cache "^6.0.0"

semver@~7.0.0:
version "7.0.0"
resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz"
integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==

send@0.18.0:
version "0.18.0"
resolved "https://registry.npmjs.org/send/-/send-0.18.0.tgz"
@@ -1319,12 +1309,12 @@ signal-exit@^3.0.0:
resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz"
integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==

simple-update-notifier@^1.0.7:
version "1.1.0"
resolved "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-1.1.0.tgz"
integrity sha512-VpsrsJSUcJEseSbMHkrsrAVSdvVS5I96Qo1QAQ4FxQ9wXFcB+pjj7FB7/us9+GcgfW4ziHtYMc1J0PLczb55mg==
simple-update-notifier@^2.0.0:
version "2.0.0"
resolved "https://registry.npmjs.org/simple-update-notifier/-/simple-update-notifier-2.0.0.tgz"
integrity sha512-a2B9Y0KlNXl9u/vsW6sTIu9vGEpfKu2wRV6l1H3XEas/0gUIzGzBoP/IouTcUQbm9JWZLH3COxyn03TYlFax6w==
dependencies:
semver "~7.0.0"
semver "^7.5.3"

smart-buffer@^4.2.0:
version "4.2.0"