Code

Merge dev to main#37

Code

Merged

Dan-Y-Ko merged 175 commits intomainchingu-x/chingu-dashboard:mainfrom devchingu-x/chingu-dashboard:devCopy head branch name to clipboardOct 6, 2023

+2,101-2,424

Commits

Commits on Aug 29, 2023

• feat: add "my team" table

  JaneMoroz

  committed
  c351e05

Commits on Sep 1, 2023

• style: remove unnecessary style file

  JaneMoroz

  committed
  2776ae0

• feat: move data to 'fixture' folder

  JaneMoroz

  committed
  dbb67ef

• style: fix colors

  JaneMoroz

  committed
  9bbc2a6

Commits on Sep 5, 2023

• feat: folder structure

  timothyrusso

  committed
  bf92d96

Commits on Sep 6, 2023

• feat: add basic sidebar

  timothyrusso

  committed
  c9e648a

• Merge remote-tracking branch 'origin' into feature/CGD-32

  timothyrusso

  committed
  c1f7573

• feat: update file structure

  timothyrusso

  committed
  005d147

• fix: rename folder 'myteam' to 'my-team'

  JaneMoroz

  committed
  022bebf

• Merge branch 'dev' into feature/CGD-34

  JaneMoroz

  committed
  00d0e2a

• fix: fix eslint error

  JaneMoroz

  committed
  8004848

• style: use colors from tailwind config

  JaneMoroz

  committed
  9adc333

• Merge remote-tracking branch 'origin/feature/cgd-37' into feature/CGD-34

  JaneMoroz

  committed
  18a8562

• feat: add "Edit" button

  JaneMoroz

  committed
  390b668

Commits on Sep 7, 2023

• Merge branch 'dev' into feature/CGD-34

  JaneMoroz

  committed
  f60d41b

• fix: move temp variable to TeamTable

  JaneMoroz

  committed
  6ec6fae

• fix: fix typo

  JaneMoroz

  committed
  62d7c77

Commits on Sep 8, 2023

• Merge remote-tracking branch 'origin' into feature/CGD-32

  timothyrusso

  committed
  82a576a

• feat: main structure of the sidebar

  timothyrusso

  committed
  644e88f

• fix: change folder's name, rename page

  JaneMoroz

  committed
  d0f5718

• create img folder

  Dan-Y-Ko

  committed
  6f74d39

• add banner image

  Dan-Y-Ko

  committed
  e7a1a1b

Commits on Sep 9, 2023

• finish reusable banner

  Dan-Y-Ko

  committed
  d4236b7

• remove fixture because it won't be needed as banner content is static

  Dan-Y-Ko

  committed
  bc768b4

• fix index file and remove export

  Dan-Y-Ko

  committed
  3a2c858

• remove docker and backend related things

  Dan-Y-Ko

  committed
  3f3e7b4

• remove prisma folder

  Dan-Y-Ko

  committed
  bd83336

• Update README.md

  Dan-Y-Ko

  authored
  3478e43

• resolve eslint error

  Dan-Y-Ko

  committed
  99cda9f

• fix: change averageHour column

  JaneMoroz

  committed
  4987284

• remove object curly newline eslint rule to resolve issue with prettier formatting

  Dan-Y-Ko

  committed
  3c6ab07

• trial workflow

  marktlinn

  committed
  8a26d1e

• style: change row gap

  JaneMoroz

  committed
  dd62b15

• add: run workflow on pr

  marktlinn

  committed
  254f3a9

• chore: remove vercel preview workflow

  marktlinn

  committed
  4ba6c6e

• Merge pull request #16 from chingu-x/trial-workflow2

  Show description for 3651cc3
  marktlinn

  authored
  3651cc3

• chore: updating workflow to run cypress only on PRs to Main

  marktlinn

  committed
  e4467ff

• add cypress script to pre-push hook

  Dan-Y-Ko

  committed
  11f3906

• Merge pull request #18 from chingu-x/GH-actions-tests

  Show description for ca87611
  marktlinn

  authored
  ca87611

Commits on Sep 10, 2023

• feat: add basic structure for the sidebar

  timothyrusso

  committed
  7df5ba4

• Merge remote-tracking branch 'origin' into feature/CGD-32

  timothyrusso

  committed
  7f7adb7

• feat: buttons layout

  timothyrusso

  committed
  9c2540d

Commits on Sep 11, 2023

• feat: semantic tag for the sidebar

  timothyrusso

  committed
  bbdf952

• style: remove hover effects from the edit btn

  JaneMoroz

  committed
  8d31db9

• feat: test

  JaneMoroz

  committed
  d804f16

Commits on Sep 12, 2023

• Create LICENSE

  Dan-Y-Ko

  authored
  4ca8226

• feat: refactor the sidebar code

  timothyrusso

  committed
  8e68f0f

• style: prettier format

  timothyrusso

  committed
  b47440f

• style: add light/dark theme colors

  JaneMoroz

  committed
  71ae837

• feat: add ThemeProvider from "next-themes"

  JaneMoroz

  committed
  7010c92

• feat: add ModeToggle

  JaneMoroz

  committed
  a55c957

• feat: add Mode Toggle to Navbar

  JaneMoroz

  committed
  3724cb1

• Merge pull request #20 from chingu-x/add-license

  Show description for 0da6ed5
  marktlinn

  authored
  0da6ed5

• Merge branch 'dev' into feature/CGD-34

  Dan-Y-Ko

  authored
  2a4774a

• Merge pull request #12 from chingu-x/feature/CGD-34

  Show description for e4ae6d8
  Dan-Y-Ko

  authored
  e4ae6d8

• Merge branch 'feature/CGD-47' of github.com:chingu-x/chingu-dashboard into feature/CGD-47

  Dan-Y-Ko

  committed
  c08dea5

• add eslint rule to disable relative import outside of same folder

  Dan-Y-Ko

  committed
  a8eb5d7

• add eslint rule to disable relative import outside of same folder

  Dan-Y-Ko

  committed
  0cc6c58

• fix eslint error

  Dan-Y-Ko

  committed
  e82f428

• Merge branch 'dev' into feature/cgd-35

  Dan-Y-Ko

  authored
  178d5dc

Commits on Sep 13, 2023

• feat: add voyage pages and refactor the code

  timothyrusso

  committed
  734912a

• Merge branch 'dev' into feature/CGD-47

  JaneMoroz

  committed
  c965be3

• Update issue templates

  Dan-Y-Ko

  authored
  666bbfa

• add pull request template

  Dan-Y-Ko

  committed
  e1860b7

• Merge branch 'feature/cgd-35' of github.com:chingu-x/chingu-dashboard into feature/cgd-35

  Dan-Y-Ko

  committed
  f93a4be

Commits on Sep 14, 2023

• clean up barrel exports

  Dan-Y-Ko

  committed
  11d9046

• feat: add voyage text box

  timothyrusso

  committed
  96718f5

• Merge pull request #22 from chingu-x/issue-template

  Show description for 11ed605
  marktlinn

  authored
  11ed605

• feat: update px with rem values

  timothyrusso

  committed
  1074c93

• feat: type constants

  timothyrusso

  committed
  520d6b1

• Merge branch 'dev' into feature/cgd-35

  Dan-Y-Ko

  authored
  ad22ad7

• Merge pull request #14 from chingu-x/feature/cgd-35

  Show description for a286a98
  Dan-Y-Ko

  authored
  a286a98

Commits on Sep 15, 2023

• feat: add links to the buttons and start the voyage in layout

  timothyrusso

  committed
  4bdb615

Commits on Sep 16, 2023

• feat: add green arrows for the voyage pages

  timothyrusso

  committed
  b49533a

• feat: update behaviour of the sidebar

  timothyrusso

  committed
  7268468

Commits on Sep 17, 2023

• Merge branch 'dev' into feature/CGD-47

  JaneMoroz

  committed
  a754ec7

• fix: merge fix

  JaneMoroz

  committed
  c129cd2

• feat: remove transition effects

  timothyrusso

  committed
  0a45295

• feat: refactor the code in reusable components

  timothyrusso

  committed
  cff30f3

• feat: move to the correct folder

  timothyrusso

  committed
  5e33c02

• style: add comment for mocked data

  timothyrusso

  committed
  c2b5f07

Commits on Sep 18, 2023

• fix: fix eslint error

  JaneMoroz

  committed
  7396c12

• test: add 'mode toggle' tests

  JaneMoroz

  committed
  3e409f5

• Merge branch 'feature/CGD-47' of github.com:chingu-x/chingu-dashboard into feature/CGD-47

  Dan-Y-Ko

  committed
  664c42e

• fix conflicting types with cypress and jest

  Dan-Y-Ko

  committed
  5b03bb3

• remove extra cypress boilerplate files, add cypress screenshot folder to git ignore

  Dan-Y-Ko

  committed
  1a1ca86

• adjust styles to make main page content adjust with sidebar

  Dan-Y-Ko

  committed
  156b6af

Commits on Sep 19, 2023

• fix height issue but still some issues with responsiveness

  Dan-Y-Ko

  committed
  de0d40b

• fix height issue but still some issues with responsiveness

  Dan-Y-Ko

  committed
  b8ab98d

• remove background color on main page

  Dan-Y-Ko

  committed
  8b731bd

• remove uncessary style

  Dan-Y-Ko

  committed
  b668bbe

• fix height of side bar in other pages

  Dan-Y-Ko

  committed
  75ad6c7

• Merge remote-tracking branch 'origin' into feature/CGD-32

  timothyrusso

  committed
  bac80e7

• feat: add links for my voyage pages

  timothyrusso

  committed
  2ca1c60

• feat: update position of the sidebar

  timothyrusso

  committed
  79977c0

• fix: fix profile img path

  JaneMoroz

  committed
  690eeb7

• feat: update sidebar height

  timothyrusso

  committed
  155e97a

• feat: fix sidebar height

  timothyrusso

  committed
  d80d3a5

• feat: remove padding top of the sidebar

  timothyrusso

  committed
  18480e4

• Merge pull request #21 from chingu-x/feature/CGD-47

  Show description for e05615b
  marktlinn

  authored
  e05615b

• chore: add cypress config to .eslintignore

  marktlinn

  committed
  257657f

• Merge pull request #24 from chingu-x/hot-fix-eslintignore

  Show description for 7c90f81
  Dan-Y-Ko

  authored
  7c90f81

• fix issues with type mismatch and edge case with link that has - in it

  Dan-Y-Ko

  committed
  48a0dfb

• remove counter page

  Dan-Y-Ko

  committed
  f896f90

Commits on Sep 20, 2023

• Merge remote-tracking branch 'origin' into feature/CGD-32

  timothyrusso

  committed
  50623e0

• Merge branch 'feature/cgd-32-fix' into feature/CGD-32

  timothyrusso

  committed
  9e30eae

• feat: fix some bugs about the buttons hover behaviour

  timothyrusso

  committed
  ffdbe7c

• style: fix some prettier errors

  timothyrusso

  committed
  952bbc6

• fix: remove export error

  timothyrusso

  committed
  2a77296

Commits on Sep 21, 2023

• feat: background of the buttons based on the url path

  timothyrusso

  committed
  3969132

• feat: dashboard selected button when the page is loaded

  timothyrusso

  committed
  c69c98a

• feat: update colors

  timothyrusso

  committed
  7a6c5d7

• update styles

  Dan-Y-Ko

  committed
  9c002c3

• disable link if user is not part of a voyage

  Dan-Y-Ko

  committed
  20245a8

• change voyage status flag back to true

  Dan-Y-Ko

  committed
  26c4e11

• Merge pull request #23 from chingu-x/feature/CGD-32

  Show description for b225241
  Dan-Y-Ko

  authored
  b225241

• replace with better solution to handle sidebar

  Dan-Y-Ko

  committed
  9569c6c

Commits on Sep 22, 2023

• feat: update layour for all pages

  timothyrusso

  committed
  e5de02d

• feat: update layout

  timothyrusso

  committed
  61def38

• add border to sidebar

  Dan-Y-Ko

  committed
  ea16058

• remove voyage status container from sidebar

  Dan-Y-Ko

  committed
  a7476bc

• fix linter errors

  Dan-Y-Ko

  committed
  c3bb4d1

• feat: add banners to all the pages

  timothyrusso

  committed
  c9d1787

• feat: update banner dimensions

  timothyrusso

  committed
  6eb30eb

• fix: prettier style

  timothyrusso

  committed
  0c2f9b3

Commits on Sep 23, 2023

• feat: add sidebar shadow

  timothyrusso

  committed
  ec0ee1c

• feat: fix prettier errors

  timothyrusso

  committed
  e43a778

• feat: use constants to define the colors

  timothyrusso

  committed
  45c701d

• suggestions: JSX typescript deprecation error + MainPages as name type?

  marktlinn

  committed
  d3aa69e

• Merge pull request #30 from chingu-x/suggestions-sidebar

  Show description for ddc6943
  Dan-Y-Ko

  authored
  ddc6943

• Merge pull request #26 from chingu-x/fix-sidebar

  Show description for fe03103
  marktlinn

  authored
  fe03103

Commits on Sep 24, 2023

• Merge branch 'dev' into fix/alignment-of-page-content

  Dan-Y-Ko

  authored
  b69cfcd

• Merge pull request #27 from chingu-x/fix/alignment-of-page-content

  Show description for 1a38d56
  Dan-Y-Ko

  authored
  1a38d56

• Merge remote-tracking branch 'origin' into feature/sidebar-shadow

  timothyrusso

  committed
  59be2db

Commits on Sep 25, 2023

• feat: responsive layout for the tech stack container

  timothyrusso

  committed
  3a9136c

• feat: correct prettier errors

  timothyrusso

  committed
  6dbbcdb

• style: change 'add hours' cell according to the updated design

  JaneMoroz

  committed
  d53d2bb

• style: change some colors according to the updated design

  JaneMoroz

  committed
  82ffd5d

Commits on Sep 26, 2023

• feat: make directory responsive

  JaneMoroz

  committed
  49f0bae

• feat: create TeamDirectoryComponent

  JaneMoroz

  committed
  4cead3d

• fix: banner image fix

  JaneMoroz

  committed
  ddf21b2

• feat: fix shadow

  timothyrusso

  committed
  8a41b29

• feat: prettier fix

  timothyrusso

  committed
  d37e88a

• updated colors in theme config

  rjyeeun

  committed
  f334d5e

• update theme config

  rjyeeun

  committed
  f6895f1

• update nav bar

  rjyeeun

  committed
  16f1d06

• update directory

  rjyeeun

  committed
  4ca53a2

• updated ideation

  rjyeeun

  committed
  14c116d

• fixed error

  rjyeeun

  committed
  3d23e3e

• update colors in nav dropdown

  Dan-Y-Ko

  committed
  31345ac

• update ideation page styles

  Dan-Y-Ko

  committed
  26a41e8

• Merge pull request #34 from chingu-x/updateStyles

  Show description for 78bb84b
  Dan-Y-Ko

  authored
  78bb84b

Commits on Sep 27, 2023

• Merge branch 'dev' into feature/sidebar-shadow

  timothyrusso

  authored
  b5491a5

• Merge remote-tracking branch 'origin' into feature/responsive-tech-stack

  timothyrusso

  committed
  8f77259

• Merge branch 'dev' into fix/banner-image-fix

  JaneMoroz

  committed
  93e97a5

• Merge branch 'dev' into feature/team-directory-responsive

  JaneMoroz

  committed
  ffd21e2

• feat: fix opacity of the shadows color

  timothyrusso

  committed
  267af95

• Merge branch 'feature/sidebar-shadow' of https://github.com/chingu-x/chingu-dashboard into feature/sidebar-shadow

  timothyrusso

  committed
  7d0f4bd

• feat: fix layout

  timothyrusso

  committed
  e834a3f

• Merge pull request #29 from chingu-x/feature/sidebar-shadow

  Show description for 23d3eb1
  Dan-Y-Ko

  authored
  23d3eb1

• Merge branch 'dev' into fix/banner-image-fix

  Dan-Y-Ko

  authored
  e8bf485

• Merge pull request #33 from chingu-x/fix/banner-image-fix

  Show description for a25d341
  Dan-Y-Ko

  authored
  a25d341

• Merge branch 'dev' into feature/responsive-tech-stack

  Dan-Y-Ko

  authored
  167eec3

• Merge pull request #31 from chingu-x/feature/responsive-tech-stack

  Show description for 24fc4fa
  Dan-Y-Ko

  authored
  24fc4fa

• Merge branch 'dev' into feature/team-directory-responsive

  Dan-Y-Ko

  authored
  14e96a9

• Merge pull request #32 from chingu-x/feature/team-directory-responsive

  Show description for 81be087
  Dan-Y-Ko

  authored
  81be087

Commits on Sep 28, 2023

• Merge branch 'dev' into feature/responsive-design-ideation-page

  timothyrusso

  authored
  23cf237

Commits on Oct 1, 2023

• feat: responsive layout for the create ideation container

  timothyrusso

  committed
  f781a59

Commits on Oct 2, 2023

• feat: fix layout for the ideation container and vote description card

  timothyrusso

  committed
  b5a4a50

Commits on Oct 3, 2023

• feat: responsive heigth for vote description card

  timothyrusso

  committed
  7bca62b

• feat: responsive contribution card

  timothyrusso

  committed
  ca208b2

• Merge branch 'feature/responsive-design-ideation-page' of https://github.com/chingu-x/chingu-dashboard into feature/responsive-design-ideation-page

  timothyrusso

  committed
  a4acefd

• feat: fix min width for contribution container

  timothyrusso

  committed
  fcc2202

Commits on Oct 5, 2023

• feat: fix text capitalize

  timothyrusso

  committed
  b825d8a

Commits on Oct 6, 2023

• Merge pull request #36 from chingu-x/feature/responsive-design-ideation-page

  Show description for 4cfa4df
  Dan-Y-Ko

  authored
  4cfa4df