Code

Feature/user profile#61

Code

Open

jerry-dang wants to merge 51 commits intomainCSCC012023/final-project-s23-algo-assassins:mainfrom feature/user-profileCSCC012023/final-project-s23-algo-assassins:feature/user-profileCopy head branch name to clipboard

Commits

Commits on Jun 9, 2023

• Create ProfileScreen.tsx

  Show description for 12b9794
  jerry-dang

  committed
  12b9794

  Copy full SHA for 12b9794

Commits on Jun 15, 2023

• Finished EditProfile, updated UserProfile page

  Show description for 2b3c59b
  jerry-dang

  committed
  2b3c59b

  Copy full SHA for 2b3c59b

• Updated toggle icon

  jerry-dang

  committed
  567c348

  Copy full SHA for 567c348

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  6dc3401

  Copy full SHA for 6dc3401

• Fixed bug in App.tsx

  Show description for 370658a
  jerry-dang

  committed
  370658a

  Copy full SHA for 370658a

Commits on Jun 16, 2023

• Updated user profile

  Show description for 1e46bf1
  jerry-dang

  committed
  1e46bf1

  Copy full SHA for 1e46bf1

Commits on Jun 29, 2023

• Fixed safeArea bug

  jerry-dang

  committed
  fedfd05

  Copy full SHA for fedfd05

Commits on Jul 6, 2023

• Update Podfile.lock

  jerry-dang

  committed
  a9eaecb

  Copy full SHA for a9eaecb

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  a88a2d6

  Copy full SHA for a88a2d6

• Update yarn.lock

  jerry-dang

  committed
  285b075

  Copy full SHA for 285b075

Commits on Jul 18, 2023

• Added user settings page

  jerry-dang

  committed
  dca8585

  Copy full SHA for dca8585

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  7d853f9

  Copy full SHA for 7d853f9

• Fixed bugs

  jerry-dang

  committed
  87f13cb

  Copy full SHA for 87f13cb

Commits on Jul 19, 2023

• Merge branch 'main' into feature/user-profile

  hoomji

  committed
  eb2986b

  Copy full SHA for eb2986b

• delete nodes in /root folder

  hoomji

  committed
  4567f9e

  Copy full SHA for 4567f9e

• Delete package-lock.json

  hoomji

  committed
  1dc37b2

  Copy full SHA for 1dc37b2

Commits on Jul 20, 2023

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  20de945

  Copy full SHA for 20de945

• Merged main

  jerry-dang

  committed
  33f19de

  Copy full SHA for 33f19de

• Update Podfile

  jerry-dang

  committed
  52c49fc

  Copy full SHA for 52c49fc

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  12cae3d

  Copy full SHA for 12cae3d

Commits on Jul 21, 2023

• Front-end updates for user profile (Debug)

  Show description for b438363
  jerry-dang

  committed
  b438363

  Copy full SHA for b438363

• added getUser

  hoomji

  committed
  05b8208

  Copy full SHA for 05b8208

• Debug front-end/back-end

  Show description for 5969616
  jerry-dang

  committed
  5969616

  Copy full SHA for 5969616

Commits on Jul 26, 2023

• Debug bad request and user query

  Show description for 71792f1
  jerry-dang

  committed
  71792f1

  Copy full SHA for 71792f1

Commits on Aug 2, 2023

• Dark theme

  jerry-dang

  committed
  b5c98a3

  Copy full SHA for b5c98a3

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  11ea32b

  Copy full SHA for 11ea32b

• UI Refactoring

  Show description for 5dd1bf5
  jerry-dang

  committed
  5dd1bf5

  Copy full SHA for 5dd1bf5

Commits on Aug 3, 2023

• Finished refactoring UI for workout screens

  jerry-dang

  committed
  75ab617

  Copy full SHA for 75ab617

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  4b9281f

  Copy full SHA for 4b9281f

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  4f8e49f

  Copy full SHA for 4f8e49f

Commits on Aug 4, 2023

• Update user.ts

  hoomji

  committed
  a75de97

  Copy full SHA for a75de97

• Added user profile screen for all users

  jerry-dang

  committed
  7531695

  Copy full SHA for 7531695

• Bug fix?

  jerry-dang

  committed
  d2ec2a0

  Copy full SHA for d2ec2a0

• Merge branch 'feature/user-endpoint' into feature/user-profile

  jerry-dang

  committed
  6d35634

  Copy full SHA for 6d35634

• Bug fix

  jerry-dang

  committed
  8304b37

  Copy full SHA for 8304b37

• Debugging user profile

  jerry-dang

  committed
  feb389b

  Copy full SHA for feb389b

• fix vars

  hoomji

  committed
  45dd0f6

  Copy full SHA for 45dd0f6

• declare vars

  hoomji

  committed
  775bc8c

  Copy full SHA for 775bc8c

• Update UserProfileHeader.tsx

  jerry-dang

  committed
  fe9daa7

  Copy full SHA for fe9daa7

• Merge branch 'feature/user-profile' of https://github.com/CSCC012023/final-project-s23-algo-assassins into feature/user-profile

  jerry-dang

  committed
  bd637db

  Copy full SHA for bd637db

• UI Improvement for Signup/Login

  Show description for 19534b7
  jerry-dang

  committed
  19534b7

  Copy full SHA for 19534b7

• Revoved temp debug button

  jerry-dang

  committed
  0a02595

  Copy full SHA for 0a02595

• Improved friends screen UI

  Show description for 5c291b5
  jerry-dang

  committed
  5c291b5

  Copy full SHA for 5c291b5

• Update WorkoutScreen.tsx

  jerry-dang

  committed
  3e202dc

  Copy full SHA for 3e202dc

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  6c3cfc2

  Copy full SHA for 6c3cfc2

• Fixed UI bug on profile screen

  jerry-dang

  committed
  827057d

  Copy full SHA for 827057d

• UI updates

  Show description for ce3d41c
  jerry-dang

  committed
  ce3d41c

  Copy full SHA for ce3d41c

Commits on Aug 9, 2023

• Update yarn.lock

  jerry-dang

  committed
  d62f36e

  Copy full SHA for d62f36e

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  6fbab9d

  Copy full SHA for 6fbab9d

• Homescreen merge bugfix

  jerry-dang

  committed
  30e4c62

  Copy full SHA for 30e4c62

• Merge branch 'main' into feature/user-profile

  jerry-dang

  committed
  07d2733

  Copy full SHA for 07d2733