Skip to content

Commit 48b2f8c

Browse files
mariana-caldasmariana-caldas
authored
Merge pull request #69 from Web-Dev-Path/chore/add-prettier-config
Adding prettier config file
2 parents eb78efd + 91707c1 commit 48b2f8c

23 files changed

+320
-305
lines changed

‎.prettierrc‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"singleQuote": true,
3+
"arrowParens": "avoid"
4+
}

‎components/Footer.js‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
import Link from "next/link";
2-
import footerStyles from "../styles/Footer.module.scss";
3-
import { linksNav, linksSocial } from "../utils/links";
4-
import NewsletterSubscribe from "./mailchimp/NewsletterSubscribe";
5-
import Image from "next/image";
1+
import Link from 'next/link';
2+
import footerStyles from '../styles/Footer.module.scss';
3+
import { linksNav, linksSocial } from '../utils/links';
4+
import NewsletterSubscribe from './mailchimp/NewsletterSubscribe';
5+
import Image from 'next/image';
66

77
export default function Footer() {
88
return (
99
<footer className={footerStyles.footer}>
1010
<div className={footerStyles.container}>
1111
<div className={footerStyles.columnLeft}>
1212
<ul className={footerStyles.footerList}>
13-
{linksNav.map((link) => (
13+
{linksNav.map(link => (
1414
<li className={footerStyles.footerItem} key={link.href}>
1515
<Link href={link.href}>
1616
<a title={link.text}>{link.text}</a>
@@ -36,10 +36,15 @@ export default function Footer() {
3636
<p>*Unsubscribe anytime</p>
3737
</div>
3838
<div className={footerStyles.socialMedia}>
39-
{linksSocial.map((link) => (
39+
{linksSocial.map(link => (
4040
<Link href={link.href} key={link.text} passHref>
4141
<a>
42-
<Image width={32} height={32} src={link.src} alt={link.text} />
42+
<Image
43+
width={32}
44+
height={32}
45+
src={link.src}
46+
alt={link.text}
47+
/>
4348
</a>
4449
</Link>
4550
))}

‎components/Layout.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Nav from "./Nav";
2-
import Meta from "./Meta";
3-
import styles from "../styles/Layout.module.scss";
4-
import Footer from "./Footer";
1+
import Nav from './Nav';
2+
import Meta from './Meta';
3+
import styles from '../styles/Layout.module.scss';
4+
import Footer from './Footer';
55

66
export default function Layout({ children }) {
77
return (

‎components/Meta.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Head from "next/head";
2-
import { meta } from "../utils/meta";
1+
import Head from 'next/head';
2+
import { meta } from '../utils/meta';
33

44
export default function Meta() {
55
return (

‎components/Nav.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import Link from "next/link";
2-
import { useEffect, useState } from "react";
3-
import styles from "../styles/Nav.module.scss";
4-
import { linksNav } from "../utils/links";
5-
import Image from "next/image";
1+
import Link from 'next/link';
2+
import { useEffect, useState } from 'react';
3+
import styles from '../styles/Nav.module.scss';
4+
import { linksNav } from '../utils/links';
5+
import Image from 'next/image';
66

77
export default function Nav() {
88
const [active, setActive] = useState(false);
@@ -12,13 +12,13 @@ export default function Nav() {
1212
function setTrueSize() {
1313
if (window.innerWidth >= 768) setActive(false);
1414
}
15-
window.addEventListener("resize", setTrueSize);
15+
window.addEventListener('resize', setTrueSize);
1616

17-
return () => window.removeEventListener("resize", setTrueSize);
17+
return () => window.removeEventListener('resize', setTrueSize);
1818
});
1919

2020
const toggleActive = () => {
21-
setActive((active) => !active);
21+
setActive(active => !active);
2222
};
2323

2424
return (
@@ -46,7 +46,7 @@ export default function Nav() {
4646
</div>
4747
<nav className={`${active ? styles.navVisible : styles.nav}`}>
4848
<ul className={styles.navList}>
49-
{linksNav.map((link) => (
49+
{linksNav.map(link => (
5050
<li className={styles.navItem} key={link.href}>
5151
<Link href={link.href}>
5252
<a className={styles.navLink} title={link.text}>

‎components/mailchimp/NewsletterForm.js‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
11
import { useState } from 'react';
22
import { decode } from 'html-entities';
3-
import newsletterStyles from "../../styles/Newsletter.module.scss";
3+
import newsletterStyles from '../../styles/Newsletter.module.scss';
44

5-
const NewsletterForm = ( { status, message, onValidated }) => {
6-
7-
const [ error, setError ] = useState(null);
8-
const [ email, setEmail ] = useState(null);
5+
const NewsletterForm = ({ status, message, onValidated }) => {
6+
const [error, setError] = useState(null);
7+
const [email, setEmail] = useState(null);
98

109
/**
1110
* Handle form submit.
1211
*
1312
* @return {{value}|*|boolean|null}
1413
*/
1514
const handleFormSubmit = () => {
16-
1715
setError(null);
1816

19-
if ( ! email ) {
20-
setError( 'Please enter a valid email address' );
17+
if (!email) {
18+
setError('Please enter a valid email address');
2119
return null;
2220
}
2321

2422
const isFormValidated = onValidated({ EMAIL: email });
2523

2624
// On success return true
27-
return email && email.indexOf("@") > -1 && isFormValidated;
28-
}
25+
return email && email.indexOf('@') > -1 && isFormValidated;
26+
};
2927

3028
/**
3129
* Handle Input Key Event.
3230
*
3331
* @param event
3432
*/
35-
const handleInputKeyEvent = ( event ) => {
33+
const handleInputKeyEvent = event => {
3634
setError(null);
3735
// Number 13 is the "Enter" key on the keyboard
3836
if (event.keyCode === 13) {
@@ -41,53 +39,58 @@ const NewsletterForm = ( { status, message, onValidated }) => {
4139
// Trigger the button element with a click
4240
handleFormSubmit();
4341
}
44-
}
42+
};
4543

4644
/**
4745
* Extract message from string.
4846
*
4947
* @param {String} message
5048
* @return {null|*}
5149
*/
52-
const getMessage = (message) => {
53-
if ( !message ) {
50+
const getMessage = message => {
51+
if (!message) {
5452
return null;
5553
}
5654
const result = message?.split('-') ?? null;
57-
if ( "0" !== result?.[0]?.trim() ) {
55+
if ('0' !== result?.[0]?.trim()) {
5856
return decode(message);
5957
}
6058
const formattedMessage = result?.[1]?.trim() ?? null;
61-
return formattedMessage ? decode( formattedMessage ) : null;
62-
}
59+
return formattedMessage ? decode(formattedMessage) : null;
60+
};
6361

6462
return (
6563
<>
6664
<div>
6765
<input
68-
onChange={(event) => setEmail(event?.target?.value ?? '')}
66+
onChange={event => setEmail(event?.target?.value ?? '')}
6967
type="email"
7068
placeholder="Your email"
71-
onKeyUp={(event) => handleInputKeyEvent(event)}
69+
onKeyUp={event => handleInputKeyEvent(event)}
7270
/>
73-
<button onClick={handleFormSubmit}>
74-
Submit
75-
</button>
71+
<button onClick={handleFormSubmit}>Submit</button>
7672
</div>
77-
<div className={ newsletterStyles.newsletterFormInfo }>
78-
{status === "sending" && <div className={ newsletterStyles.newsletterFormSending }>Sending...</div>}
79-
{status === "error" || error ? (
73+
<div className={newsletterStyles.newsletterFormInfo}>
74+
{status === 'sending' && (
75+
<div className={newsletterStyles.newsletterFormSending}>
76+
Sending...
77+
</div>
78+
)}
79+
{status === 'error' || error ? (
80+
<div
81+
className={newsletterStyles.newsletterFormError}
82+
dangerouslySetInnerHTML={{ __html: error || getMessage(message) }}
83+
/>
84+
) : null}
85+
{status === 'success' && status !== 'error' && !error && (
8086
<div
81-
className={ newsletterStyles.newsletterFormError }
82-
dangerouslySetInnerHTML={{ __html: error || getMessage( message ) }}
87+
className={newsletterStyles.newsletterFormSuccess}
88+
dangerouslySetInnerHTML={{ __html: decode(message) }}
8389
/>
84-
) : null }
85-
{status === "success" && status !== "error" && !error && (
86-
<div className={ newsletterStyles.newsletterFormSuccess } dangerouslySetInnerHTML={{ __html: decode(message) }} />
8790
)}
8891
</div>
8992
</>
9093
);
91-
}
94+
};
9295

9396
export default NewsletterForm;

‎components/mailchimp/NewsletterSubscribe.js‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,21 @@ import MailchimpSubscribe from 'react-mailchimp-subscribe';
22
import NewsletterForm from './NewsletterForm';
33

44
const NewsletterSubscribe = () => {
5-
65
const MAILCHIMP_URL = process.env.NEXT_PUBLIC_MAILCHIMP_URL;
76

87
return (
98
<MailchimpSubscribe
10-
url={ MAILCHIMP_URL }
11-
render={(props) => {
9+
url={MAILCHIMP_URL}
10+
render={props => {
1211
const { subscribe, status, message } = props || {};
1312
return (
1413
<NewsletterForm
15-
status={ status }
16-
message={ message }
17-
onValidated={ formData => subscribe( formData ) }
14+
status={status}
15+
message={message}
16+
onValidated={formData => subscribe(formData)}
1817
/>
1918
);
20-
} }
19+
}}
2120
/>
2221
);
2322
};

‎pages/404.js‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
1-
import Link from 'next/link'
1+
import Link from 'next/link';
22
const NotFound = () => {
33
return (
44
<div className="not-found">
55
<h1>Ooops...</h1>
66
<h2>That page cannot be found :(</h2>
7-
<p>Go back to the <Link href="/"><a>Homepage</a></Link></p>
7+
<p>
8+
Go back to the{' '}
9+
<Link href="/">
10+
<a>Homepage</a>
11+
</Link>
12+
</p>
813
</div>
914
);
10-
}
11-
export default NotFound;
15+
};
16+
export default NotFound;

‎pages/_app.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
import Layout from "../components/Layout";
2-
import "../styles/globals.scss";
1+
import Layout from '../components/Layout';
2+
import '../styles/globals.scss';
33

44
function MyApp({ Component, pageProps }) {
5-
return (
6-
<Layout>
7-
<Component {...pageProps} />
8-
</Layout>
9-
);
5+
return (
6+
<Layout>
7+
<Component {...pageProps} />
8+
</Layout>
9+
);
1010
}
1111

1212
// Only uncomment this method if you have blocking data requirements for

‎pages/about-us.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
export default function AboutUs() {
2-
return <h1>Hello from About Us</h1>;
2+
return <h1>Hello from About Us</h1>;
33
}

0 commit comments

Comments
 (0)