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.

Sign up for GitHub

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

Jump to bottom

Merge dev to main #37

Merged
merged 175 commits into from
Oct 6, 2023
Merged

Merge dev to main #37

merged 175 commits into from
Oct 6, 2023

Conversation

Dan-Y-Ko
Copy link
Contributor

@Dan-Y-Ko Dan-Y-Ko commented Sep 27, 2023 •
edited
Loading

Description

End of sprint merge to production

Issue link

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • This change requires a documentation update

How Has This Been Tested?

Checklist:

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • New and existing unit tests pass locally with my changes
  • Any dependent changes have been merged and published in downstream modules

JaneMoroz and others added 30 commits August 29, 2023 14:03
@JaneMoroz
feat: add "my team" table
c351e05
@JaneMoroz
style: remove unnecessary style file
2776ae0
@JaneMoroz
feat: move data to 'fixture' folder
dbb67ef
@JaneMoroz
style: fix colors
9bbc2a6
@timothyrusso
feat: folder structure
bf92d96
@timothyrusso
feat: add basic sidebar
c9e648a
@timothyrusso
Merge remote-tracking branch 'origin' into feature/CGD-32
c1f7573
@timothyrusso
feat: update file structure
005d147
@JaneMoroz
fix: rename folder 'myteam' to 'my-team'
022bebf
@JaneMoroz
Merge branch 'dev' into feature/CGD-34
00d0e2a
@JaneMoroz
fix: fix eslint error
8004848
@JaneMoroz
style: use colors from tailwind config
9adc333
@JaneMoroz
Merge remote-tracking branch 'origin/feature/cgd-37' into feature/CGD-34
18a8562
@JaneMoroz
feat: add "Edit" button
390b668
@JaneMoroz
Merge branch 'dev' into feature/CGD-34
f60d41b
@JaneMoroz
fix: move temp variable to TeamTable
6ec6fae
@JaneMoroz
fix: fix typo
62d7c77
@timothyrusso
Merge remote-tracking branch 'origin' into feature/CGD-32
82a576a
@timothyrusso
feat: main structure of the sidebar
644e88f
@JaneMoroz
fix: change folder's name, rename page
d0f5718
@Dan-Y-Ko
create img folder
6f74d39
@Dan-Y-Ko
add banner image
e7a1a1b
@Dan-Y-Ko
finish reusable banner
d4236b7
@Dan-Y-Ko
remove fixture because it won't be needed as banner content is static
bc768b4
@Dan-Y-Ko
fix index file and remove export
3a2c858
@Dan-Y-Ko
remove docker and backend related things
3f3e7b4
@Dan-Y-Ko
remove prisma folder
bd83336
@Dan-Y-Ko
Update README.md
3478e43
@Dan-Y-Ko
resolve eslint error
99cda9f
@JaneMoroz
fix: change averageHour column
4987284
@Dan-Y-Ko Dan-Y-Ko requested a review from marktlinn September 27, 2023 19:12
@vercel
Copy link

vercel bot commented Sep 27, 2023 •
edited
Loading

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
chingu-dashboard ✅ Ready (Inspect) Visit Preview 💬 Add feedback Oct 6, 2023 4:06pm

jenny-alexander
jenny-alexander approved these changes Oct 6, 2023
View reviewed changes
Copy link

@jenny-alexander jenny-alexander left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@Dan-Y-Ko Dan-Y-Ko merged commit 48cb02a into main Oct 6, 2023
1 check passed
Dan-Y-Ko added a commit that referenced this pull request Jul 9, 2024
@Dan-Y-Ko
Merge pull request #37 from chingu-x/dev
600a05f 
Merge dev to main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jenny-alexander jenny-alexander jenny-alexander approved these changes

@marktlinn marktlinn Awaiting requested review from marktlinn

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Dan-Y-Ko @jenny-alexander @JaneMoroz @timothyrusso @marktlinn @rjyeeun