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

Merge dev to main #37

Merged
merged 175 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
c351e05
feat: add "my team" table
JaneMoroz Aug 29, 2023
2776ae0
style: remove unnecessary style file
JaneMoroz Sep 1, 2023
dbb67ef
feat: move data to 'fixture' folder
JaneMoroz Sep 1, 2023
9bbc2a6
style: fix colors
JaneMoroz Sep 1, 2023
bf92d96
feat: folder structure
timothyrusso Sep 5, 2023
c9e648a
feat: add basic sidebar
timothyrusso Sep 6, 2023
c1f7573
Merge remote-tracking branch 'origin' into feature/CGD-32
timothyrusso Sep 6, 2023
005d147
feat: update file structure
timothyrusso Sep 6, 2023
022bebf
fix: rename folder 'myteam' to 'my-team'
JaneMoroz Sep 6, 2023
00d0e2a
Merge branch 'dev' into feature/CGD-34
JaneMoroz Sep 6, 2023
8004848
fix: fix eslint error
JaneMoroz Sep 6, 2023
9adc333
style: use colors from tailwind config
JaneMoroz Sep 6, 2023
18a8562
Merge remote-tracking branch 'origin/feature/cgd-37' into feature/CGD-34
JaneMoroz Sep 6, 2023
390b668
feat: add "Edit" button
JaneMoroz Sep 6, 2023
f60d41b
Merge branch 'dev' into feature/CGD-34
JaneMoroz Sep 7, 2023
6ec6fae
fix: move temp variable to TeamTable
JaneMoroz Sep 7, 2023
62d7c77
fix: fix typo
JaneMoroz Sep 7, 2023
82a576a
Merge remote-tracking branch 'origin' into feature/CGD-32
timothyrusso Sep 8, 2023
644e88f
feat: main structure of the sidebar
timothyrusso Sep 8, 2023
d0f5718
fix: change folder's name, rename page
JaneMoroz Sep 8, 2023
6f74d39
create img folder
Dan-Y-Ko Sep 8, 2023
e7a1a1b
add banner image
Dan-Y-Ko Sep 8, 2023
d4236b7
finish reusable banner
Dan-Y-Ko Sep 9, 2023
bc768b4
remove fixture because it won't be needed as banner content is static
Dan-Y-Ko Sep 9, 2023
3a2c858
fix index file and remove export
Dan-Y-Ko Sep 9, 2023
3f3e7b4
remove docker and backend related things
Dan-Y-Ko Sep 9, 2023
bd83336
remove prisma folder
Dan-Y-Ko Sep 9, 2023
3478e43
Update README.md
Dan-Y-Ko Sep 9, 2023
99cda9f
resolve eslint error
Dan-Y-Ko Sep 9, 2023
4987284
fix: change averageHour column
JaneMoroz Sep 9, 2023
3c6ab07
remove object curly newline eslint rule to resolve issue with prettie…
Dan-Y-Ko Sep 9, 2023
8a26d1e
trial workflow
marktlinn Sep 9, 2023
dd62b15
style: change row gap
JaneMoroz Sep 9, 2023
254f3a9
add: run workflow on pr
marktlinn Sep 9, 2023
4ba6c6e
chore: remove vercel preview workflow
marktlinn Sep 9, 2023
3651cc3
Merge pull request #16 from chingu-x/trial-workflow2
marktlinn Sep 9, 2023
e4467ff
chore: updating workflow to run cypress only on PRs to Main
marktlinn Sep 9, 2023
11f3906
add cypress script to pre-push hook
Dan-Y-Ko Sep 9, 2023
ca87611
Merge pull request #18 from chingu-x/GH-actions-tests
marktlinn Sep 9, 2023
7df5ba4
feat: add basic structure for the sidebar
timothyrusso Sep 10, 2023
7f7adb7
Merge remote-tracking branch 'origin' into feature/CGD-32
timothyrusso Sep 10, 2023
9c2540d
feat: buttons layout
timothyrusso Sep 10, 2023
bbdf952
feat: semantic tag for the sidebar
timothyrusso Sep 11, 2023
8d31db9
style: remove hover effects from the edit btn
JaneMoroz Sep 11, 2023
d804f16
feat: test
JaneMoroz Sep 11, 2023
4ca8226
Create LICENSE
Dan-Y-Ko Sep 12, 2023
8e68f0f
feat: refactor the sidebar code
timothyrusso Sep 12, 2023
b47440f
style: prettier format
timothyrusso Sep 12, 2023
71ae837
style: add light/dark theme colors
JaneMoroz Sep 12, 2023
7010c92
feat: add ThemeProvider from "next-themes"
JaneMoroz Sep 12, 2023
a55c957
feat: add ModeToggle
JaneMoroz Sep 12, 2023
3724cb1
feat: add Mode Toggle to Navbar
JaneMoroz Sep 12, 2023
0da6ed5
Merge pull request #20 from chingu-x/add-license
marktlinn Sep 12, 2023
2a4774a
Merge branch 'dev' into feature/CGD-34
Dan-Y-Ko Sep 12, 2023
e4ae6d8
Merge pull request #12 from chingu-x/feature/CGD-34
Dan-Y-Ko Sep 12, 2023
c08dea5
Merge branch 'feature/CGD-47' of github.com:chingu-x/chingu-dashboard…
Dan-Y-Ko Sep 12, 2023
a8eb5d7
add eslint rule to disable relative import outside of same folder
Dan-Y-Ko Sep 12, 2023
0cc6c58
add eslint rule to disable relative import outside of same folder
Dan-Y-Ko Sep 12, 2023
e82f428
fix eslint error
Dan-Y-Ko Sep 12, 2023
178d5dc
Merge branch 'dev' into feature/cgd-35
Dan-Y-Ko Sep 12, 2023
734912a
feat: add voyage pages and refactor the code
timothyrusso Sep 13, 2023
c965be3
Merge branch 'dev' into feature/CGD-47
JaneMoroz Sep 13, 2023
666bbfa
Update issue templates
Dan-Y-Ko Sep 13, 2023
e1860b7
add pull request template
Dan-Y-Ko Sep 13, 2023
f93a4be
Merge branch 'feature/cgd-35' of github.com:chingu-x/chingu-dashboard…
Dan-Y-Ko Sep 13, 2023
11d9046
clean up barrel exports
Dan-Y-Ko Sep 14, 2023
96718f5
feat: add voyage text box
timothyrusso Sep 14, 2023
11ed605
Merge pull request #22 from chingu-x/issue-template
marktlinn Sep 14, 2023
1074c93
feat: update px with rem values
timothyrusso Sep 14, 2023
520d6b1
feat: type constants
timothyrusso Sep 14, 2023
ad22ad7
Merge branch 'dev' into feature/cgd-35
Dan-Y-Ko Sep 14, 2023
a286a98
Merge pull request #14 from chingu-x/feature/cgd-35
Dan-Y-Ko Sep 14, 2023
4bdb615
feat: add links to the buttons and start the voyage in layout
timothyrusso Sep 15, 2023
b49533a
feat: add green arrows for the voyage pages
timothyrusso Sep 16, 2023
7268468
feat: update behaviour of the sidebar
timothyrusso Sep 16, 2023
a754ec7
Merge branch 'dev' into feature/CGD-47
JaneMoroz Sep 17, 2023
c129cd2
fix: merge fix
JaneMoroz Sep 17, 2023
0a45295
feat: remove transition effects
timothyrusso Sep 17, 2023
cff30f3
feat: refactor the code in reusable components
timothyrusso Sep 17, 2023
5e33c02
feat: move to the correct folder
timothyrusso Sep 17, 2023
c2b5f07
style: add comment for mocked data
timothyrusso Sep 17, 2023
7396c12
fix: fix eslint error
JaneMoroz Sep 18, 2023
3e409f5
test: add 'mode toggle' tests
JaneMoroz Sep 18, 2023
664c42e
Merge branch 'feature/CGD-47' of github.com:chingu-x/chingu-dashboard…
Dan-Y-Ko Sep 18, 2023
5b03bb3
fix conflicting types with cypress and jest
Dan-Y-Ko Sep 18, 2023
1a1ca86
remove extra cypress boilerplate files, add cypress screenshot folder…
Dan-Y-Ko Sep 18, 2023
156b6af
adjust styles to make main page content adjust with sidebar
Dan-Y-Ko Sep 18, 2023
de0d40b
fix height issue but still some issues with responsiveness
Dan-Y-Ko Sep 19, 2023
b8ab98d
fix height issue but still some issues with responsiveness
Dan-Y-Ko Sep 19, 2023
8b731bd
remove background color on main page
Dan-Y-Ko Sep 19, 2023
b668bbe
remove uncessary style
Dan-Y-Ko Sep 19, 2023
75ad6c7
fix height of side bar in other pages
Dan-Y-Ko Sep 19, 2023
bac80e7
Merge remote-tracking branch 'origin' into feature/CGD-32
timothyrusso Sep 19, 2023
2ca1c60
feat: add links for my voyage pages
timothyrusso Sep 19, 2023
79977c0
feat: update position of the sidebar
timothyrusso Sep 19, 2023
690eeb7
fix: fix profile img path
JaneMoroz Sep 19, 2023
155e97a
feat: update sidebar height
timothyrusso Sep 19, 2023
d80d3a5
feat: fix sidebar height
timothyrusso Sep 19, 2023
18480e4
feat: remove padding top of the sidebar
timothyrusso Sep 19, 2023
e05615b
Merge pull request #21 from chingu-x/feature/CGD-47
marktlinn Sep 19, 2023
257657f
chore: add cypress config to .eslintignore
marktlinn Sep 19, 2023
7c90f81
Merge pull request #24 from chingu-x/hot-fix-eslintignore
Dan-Y-Ko Sep 19, 2023
48a0dfb
fix issues with type mismatch and edge case with link that has - in it
Dan-Y-Ko Sep 19, 2023
f896f90
remove counter page
Dan-Y-Ko Sep 19, 2023
50623e0
Merge remote-tracking branch 'origin' into feature/CGD-32
timothyrusso Sep 20, 2023
9e30eae
Merge branch 'feature/cgd-32-fix' into feature/CGD-32
timothyrusso Sep 20, 2023
ffdbe7c
feat: fix some bugs about the buttons hover behaviour
timothyrusso Sep 20, 2023
952bbc6
style: fix some prettier errors
timothyrusso Sep 20, 2023
2a77296
fix: remove export error
timothyrusso Sep 20, 2023
3969132
feat: background of the buttons based on the url path
timothyrusso Sep 21, 2023
c69c98a
feat: dashboard selected button when the page is loaded
timothyrusso Sep 21, 2023
7a6c5d7
feat: update colors
timothyrusso Sep 21, 2023
9c002c3
update styles
Dan-Y-Ko Sep 21, 2023
20245a8
disable link if user is not part of a voyage
Dan-Y-Ko Sep 21, 2023
26c4e11
change voyage status flag back to true
Dan-Y-Ko Sep 21, 2023
b225241
Merge pull request #23 from chingu-x/feature/CGD-32
Dan-Y-Ko Sep 21, 2023
9569c6c
replace with better solution to handle sidebar
Dan-Y-Ko Sep 21, 2023
e5de02d
feat: update layour for all pages
timothyrusso Sep 22, 2023
61def38
feat: update layout
timothyrusso Sep 22, 2023
ea16058
add border to sidebar
Dan-Y-Ko Sep 22, 2023
a7476bc
remove voyage status container from sidebar
Dan-Y-Ko Sep 22, 2023
c3bb4d1
fix linter errors
Dan-Y-Ko Sep 22, 2023
c9d1787
feat: add banners to all the pages
timothyrusso Sep 22, 2023
6eb30eb
feat: update banner dimensions
timothyrusso Sep 22, 2023
0c2f9b3
fix: prettier style
timothyrusso Sep 22, 2023
ec0ee1c
feat: add sidebar shadow
timothyrusso Sep 23, 2023
e43a778
feat: fix prettier errors
timothyrusso Sep 23, 2023
45c701d
feat: use constants to define the colors
timothyrusso Sep 23, 2023
d3aa69e
suggestions: JSX typescript deprecation error + MainPages as name type?
marktlinn Sep 23, 2023
ddc6943
Merge pull request #30 from chingu-x/suggestions-sidebar
Dan-Y-Ko Sep 23, 2023
fe03103
Merge pull request #26 from chingu-x/fix-sidebar
marktlinn Sep 23, 2023
b69cfcd
Merge branch 'dev' into fix/alignment-of-page-content
Dan-Y-Ko Sep 24, 2023
1a38d56
Merge pull request #27 from chingu-x/fix/alignment-of-page-content
Dan-Y-Ko Sep 24, 2023
59be2db
Merge remote-tracking branch 'origin' into feature/sidebar-shadow
timothyrusso Sep 24, 2023
3a9136c
feat: responsive layout for the tech stack container
timothyrusso Sep 25, 2023
6dbbcdb
feat: correct prettier errors
timothyrusso Sep 25, 2023
d53d2bb
style: change 'add hours' cell according to the updated design
JaneMoroz Sep 25, 2023
82ffd5d
style: change some colors according to the updated design
JaneMoroz Sep 25, 2023
49f0bae
feat: make directory responsive
JaneMoroz Sep 26, 2023
4cead3d
feat: create TeamDirectoryComponent
JaneMoroz Sep 26, 2023
ddf21b2
fix: banner image fix
JaneMoroz Sep 26, 2023
8a41b29
feat: fix shadow
timothyrusso Sep 26, 2023
d37e88a
feat: prettier fix
timothyrusso Sep 26, 2023
f334d5e
updated colors in theme config
rjyeeun Sep 26, 2023
f6895f1
update theme config
rjyeeun Sep 26, 2023
16f1d06
update nav bar
rjyeeun Sep 26, 2023
4ca53a2
update directory
rjyeeun Sep 26, 2023
14c116d
updated ideation
rjyeeun Sep 26, 2023
3d23e3e
fixed error
rjyeeun Sep 26, 2023
31345ac
update colors in nav dropdown
Dan-Y-Ko Sep 26, 2023
26a41e8
update ideation page styles
Dan-Y-Ko Sep 26, 2023
78bb84b
Merge pull request #34 from chingu-x/updateStyles
Dan-Y-Ko Sep 26, 2023
b5491a5
Merge branch 'dev' into feature/sidebar-shadow
timothyrusso Sep 27, 2023
8f77259
Merge remote-tracking branch 'origin' into feature/responsive-tech-stack
timothyrusso Sep 27, 2023
93e97a5
Merge branch 'dev' into fix/banner-image-fix
JaneMoroz Sep 27, 2023
ffd21e2
Merge branch 'dev' into feature/team-directory-responsive
JaneMoroz Sep 27, 2023
267af95
feat: fix opacity of the shadows color
timothyrusso Sep 27, 2023
7d0f4bd
Merge branch 'feature/sidebar-shadow' of https://github.com/chingu-x/…
timothyrusso Sep 27, 2023
e834a3f
feat: fix layout
timothyrusso Sep 27, 2023
23d3eb1
Merge pull request #29 from chingu-x/feature/sidebar-shadow
Dan-Y-Ko Sep 27, 2023
e8bf485
Merge branch 'dev' into fix/banner-image-fix
Dan-Y-Ko Sep 27, 2023
a25d341
Merge pull request #33 from chingu-x/fix/banner-image-fix
Dan-Y-Ko Sep 27, 2023
167eec3
Merge branch 'dev' into feature/responsive-tech-stack
Dan-Y-Ko Sep 27, 2023
24fc4fa
Merge pull request #31 from chingu-x/feature/responsive-tech-stack
Dan-Y-Ko Sep 27, 2023
14e96a9
Merge branch 'dev' into feature/team-directory-responsive
Dan-Y-Ko Sep 27, 2023
81be087
Merge pull request #32 from chingu-x/feature/team-directory-responsive
Dan-Y-Ko Sep 27, 2023
23cf237
Merge branch 'dev' into feature/responsive-design-ideation-page
timothyrusso Sep 28, 2023
f781a59
feat: responsive layout for the create ideation container
timothyrusso Oct 1, 2023
b5a4a50
feat: fix layout for the ideation container and vote description card
timothyrusso Oct 2, 2023
7bca62b
feat: responsive heigth for vote description card
timothyrusso Oct 3, 2023
ca208b2
feat: responsive contribution card
timothyrusso Oct 3, 2023
a4acefd
Merge branch 'feature/responsive-design-ideation-page' of https://git…
timothyrusso Oct 3, 2023
fcc2202
feat: fix min width for contribution container
timothyrusso Oct 3, 2023
b825d8a
feat: fix text capitalize
timothyrusso Oct 5, 2023
4cfa4df
Merge pull request #36 from chingu-x/feature/responsive-design-ideati…
Dan-Y-Ko Oct 6, 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
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
**/node_modules/*
dist
cypress.config.ts
coverage
**/.next/*
*.json
Expand Down
29 changes: 24 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint", "import"],
"plugins": ["@typescript-eslint", "import", "no-relative-import-paths"],
"extends": [
"plugin:import/recommended",
"plugin:import/typescript",
Expand All @@ -33,12 +33,20 @@
],
"react/function-component-definition": [
2,
{ "namedComponents": "function-declaration" }
{
"namedComponents": "function-declaration"
}
],
"react/destructuring-assignment": [2, "always"],
"react/button-has-type": 2,
"react/no-array-index-key": 2,
"import/order": 2,
"no-relative-import-paths/no-relative-import-paths": [
"error",
{
"allowSameFolder": true
}
],
"semi": [2, "always"],
"quotes": [2, "double"],
"prefer-destructuring": [
Expand All @@ -61,12 +69,23 @@
"arrow-body-style": [2, "as-needed"],
"arrow-parens": [2, "always"],
"space-infix-ops": 2,
"arrow-spacing": [2, { "before": true, "after": true }],
"no-unused-vars": [2, { "args": "all", "argsIgnorePattern": "_" }],
"arrow-spacing": [
2,
{
"before": true,
"after": true
}
],
"no-unused-vars": [
2,
{
"args": "all",
"argsIgnorePattern": "_"
}
],
"guard-for-in": 2,
"no-await-in-loop": 2,
"indent": [2, 2],
"object-curly-newline": [2, { "minProperties": 4, "consistent": true }],
"brace-style": 2,
"no-multiple-empty-lines": 2,
"eol-last": [2, "always"],
Expand Down
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
32 changes: 0 additions & 32 deletions .github/workflows/preview.yml

This file was deleted.

9 changes: 7 additions & 2 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v2
with:
node-version: "18" # current LTS (we have 16 in Docker)
node-version: "18"

- name: Install dependencies
run: yarn install
Expand All @@ -27,4 +27,9 @@ jobs:
run: yarn test

- name: Run Cypress tests
run: yarn cypress
run: |
if [[ ${{ github.event.pull_request.base.ref }} == 'main' ]]; then
yarn cypress
else
echo "Skipping Cypress tests for non-main branch."
fi
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

# testing
/coverage
/cypress/screenshots

# next.js
/.next/
Expand Down
1 change: 1 addition & 0 deletions .husky/pre-push
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@

yarn prettier
yarn lint
yarn cypress
15 changes: 0 additions & 15 deletions Dockerfile.dev

This file was deleted.

Loading
Loading