Code

User dashboard dev merge #2#10

Code

Merged

tzhao-ooc merged 12 commits intomainAndyZzzZzzZzz/SquadMatch:mainfrom user_dashboard_devAndyZzzZzzZzz/SquadMatch:user_dashboard_devCopy head branch name to clipboardOct 6, 2024

+166-219

Commits

Commits on Sep 28, 2024

• Saving my progress

  teddapoet

  committed
  2a0724a

  Copy full SHA for 2a0724a

• Merge remote-tracking branch 'originn/main' into user_dashboard_dev

  teddapoet

  committed
  25f234e

  Copy full SHA for 25f234e

Commits on Sep 29, 2024

• New changes from main

  teddapoet

  committed
  68c3acc

  Copy full SHA for 68c3acc

• Added Modal partial and modified stylesheet

  teddapoet

  committed
  d5ac9d9

  Copy full SHA for d5ac9d9

• Changed back rubyversion in the gemfile to create pull request without affecting the main branch

  teddapoet

  committed
  5a749f0

  Copy full SHA for 5a749f0

• add .ruby-version

  teddapoet

  committed
  2d92436

  Copy full SHA for 2d92436

Commits on Oct 2, 2024

• fixed css

  teddapoet

  committed
  c38693f

  Copy full SHA for c38693f

Commits on Oct 4, 2024

• Bug fixes for location button, loaded data to modals

  teddapoet

  committed
  320dc71

  Copy full SHA for 320dc71

Commits on Oct 5, 2024

• fixed location button stretched link issue

  teddapoet

  committed
  c16992e

  Copy full SHA for c16992e

• update front-end works on both home and user_dasboard, integrate the modal partial to home page, created a sports_icon partial to dynamically load sport icons

  teddapoet

  committed
  dcf819c

  Copy full SHA for dcf819c

Commits on Oct 6, 2024

• Update Gemfile

  teddapoet

  authored
  4f4e350

  Copy full SHA for 4f4e350

• Update .ruby-version

  teddapoet

  authored
  c2f001a

  Copy full SHA for c2f001a