Skip to content

Commit c2174a8

Browse files
cheryllicherylli
committed
merge main branch into working branch
2 parents 65ad0b9 + 33601da commit c2174a8

19 files changed

+1241
-52
lines changed

‎.github/ISSUE_TEMPLATE/web-dev-path-issue.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: Web Dev Path issue
3+
about: Describe this issue template's purpose here.
4+
title: ''
5+
labels: help wanted
6+
assignees: ''
7+
8+
---
9+
10+
**What do we need to build or fix?**
11+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
12+
13+
**Technical details**
14+
A clear and concise description of what you want to happen.
15+
16+
**Approach suggestions**
17+
A clear and concise description of any alternative solutions or features you've considered.
18+
19+
**Deadline**
20+
Please keep in mind that once you assign this task to yourself, you'll need to complete it in 10 days.
21+
22+
**Acceptance criteria**
23+
- Test the section and components in many screen sizes, you can use the Inspect tool for that.
24+
- Please test if the new changes added to the components do not affect the other instances.
25+
- Test the feature in many browsers, such as Chrome, Firefox, Edge, and Safari (MAC).
26+
- Update the CHANGELOG.md file.

‎.husky/pre-commit

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env sh
2+
. "$(dirname -- "$0")/_/husky.sh"
3+
4+
exec >/dev/tty 2>&1
5+
6+
npx lint-staged
7+

‎.prettierignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.next
2+
public

‎.prettierrc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"singleQuote": true,
33
"jsxSingleQuote": true,
4-
"arrowParens": "avoid"
4+
"arrowParens": "avoid",
5+
"endOfLine": "auto"
56
}

‎.vscode/settings.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"git.ignoreLimitWarning": true
3-
}
3+
}

‎CHANGELOG.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
4949
- Contact us form and decoration components
5050
- About page "Wanna Learn More" and "How to get started?" section
5151
- An optional second column to TwoColumn instead of the image
52-
- Internal API route for contact form submission (send the message to an email using sendgrid API)
53-
- Connect contact form submission button to the API
54-
(and signs the user up to our newsletter when the subscribe button is checked)
52+
- .prettierignore file
53+
- husky, lint-staged to auto format with prettier on git commit
54+
- lint and format script to run prettier check and write on all files respectively
55+
- contact form functionalities (email form using sendgrid, subscription if selected, google recaptcha)
5556

5657

5758
### Fixed
@@ -68,6 +69,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
6869
- updated mobile nav to automatically close when page route change is completed
6970
- adjust flex-basis of a few sections in the about page to better match the design file
7071

72+
7173
### Updated
7274

75+
- prettierrc "end of line" to auto
7376
- .env-template to include SENDGRID_API_KEY
77+
78+

‎components/layout/Nav.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,17 +41,16 @@ export default function Nav() {
4141

4242
useEffect(() => {
4343
const handleRouteChange = () => {
44-
setActive(false)
45-
}
44+
setActive(false);
45+
};
4646

47-
router.events.on('routeChangeComplete', handleRouteChange)
47+
router.events.on('routeChangeComplete', handleRouteChange);
4848

4949
return () => {
50-
router.events.off('routeChangeComplete', handleRouteChange)
51-
}
50+
router.events.off('routeChangeComplete', handleRouteChange);
51+
};
5252
}, []);
5353

54-
5554
return (
5655
<header className={styles.header} ref={headerRef}>
5756
<Container>

‎jsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"@/components/*": ["components/*"],
66
"@/styles/*": ["styles/*"],
77
"@/hooks/*": ["hooks/*"],
8-
"@/utils/*": ["utils/*"],
8+
"@/utils/*": ["utils/*"]
99
}
1010
}
11-
}
11+
}

‎package.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,15 @@
88
"open-browser-win": "start http://localhost:3010",
99
"open-browser-mac": "open http://localhost:3010",
1010
"build": "next build",
11-
"start": "next start"
11+
"start": "next start",
12+
"lint": "prettier --check .",
13+
"format": "prettier --write .",
14+
"prepare": "husky install"
15+
},
16+
"lint-staged": {
17+
"**/*.{js,jsx,ts,tsx,scss}": [
18+
"prettier --write"
19+
]
1220
},
1321
"dependencies": {
1422
"@sendgrid/mail": "^7.7.0",
@@ -22,5 +30,11 @@
2230
"react-mailchimp-subscribe": "^2.1.3",
2331
"sass": "^1.35.1",
2432
"swiper": "^8.2.2"
33+
},
34+
"devDependencies": {
35+
"husky": "^8.0.0",
36+
"lint-staged": "^13.0.3",
37+
"prettier": "^2.7.1",
38+
"prettylint": "^1.0.0"
2539
}
2640
}

‎styles/CardsColumns.module.scss

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,4 @@
1818
:global(.swiper-pagination-bullet-active) {
1919
background-color: $dark-bg-color;
2020
}
21-
2221
}
23-
24-
25-
26-

0 commit comments

Comments
 (0)