Skip to content

Commit

Permalink
Merge pull request #147 from Web-Dev-Path/chore/release-1.2.0
Browse files Browse the repository at this point in the history
Release 1.2.0
  • Loading branch information
mariana-caldas committed Dec 2, 2022
2 parents 403039b + 7a6c07e commit 3e45225
Show file tree
Hide file tree
Showing 15 changed files with 192 additions and 191 deletions.
Binary file removed .DS_Store
Binary file not shown.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- updated `package.json` commands for macOs
- swipeable CardsColumns.js on mobile

## Unreleased
## 1.2.0

### Added

Expand All @@ -57,6 +57,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- still got questions section to about page
- Contact us cards section to contact page
- Linkedin link to footer
- Next.js 13

### Fixed

Expand All @@ -77,3 +78,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- next.js warning - no stylesheets in head component
- CardColumns refactoring to accept an array of card objects as props
- styles on newsletter button and contact page

## Unreleased

### Added

### Fixed
2 changes: 1 addition & 1 deletion components/containers/Card.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import Link from 'next/link';
import styles from '@/styles/Card.module.scss';

Expand Down
2 changes: 1 addition & 1 deletion components/containers/Member.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import styles from '@/styles/Member.module.scss';

export default function Member({
Expand Down
2 changes: 1 addition & 1 deletion components/containers/TwoColumn.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Image from 'next/image';
import Image from 'next/legacy/image';
import ButtonLink from '@/components/buttons/ButtonLink';
import Container from '@/components/containers/Container';
import styles from '@/styles/TwoColumn.module.scss';
Expand Down
51 changes: 25 additions & 26 deletions components/layout/Footer.js
Original file line number Diff line number Diff line change
@@ -1,33 +1,34 @@
import Link from 'next/link';
import footerStyles from '@/styles/Footer.module.scss';
import { linksNav, linksSocial } from '@/utils/links';
import NewsletterSubscribe from '@/components/mailchimp/NewsletterSubscribe';
import Image from 'next/image';
import Image from 'next/legacy/image';
import Container from '@/components/containers/Container';

export default function Footer() {
return (
<footer className={footerStyles.footer}>
<NewsletterSubscribe />
<Container customClass={footerStyles.footer__inner}>
<Link href='/'>
<a className={footerStyles.footer__logo} title='Go to the Homepage'>
<Image
src='/images/svg/logo.svg'
height={250}
width={250}
alt='Our footer logo'
/>
</a>
</Link>
<a
href='/'
className={footerStyles.footer__logo}
title='Go to the Homepage'
>
<Image
src='/images/svg/logo.svg'
height={250}
width={250}
alt='Our footer logo'
/>
</a>
<div className={footerStyles.footer__navSocialsDiv}>
<nav className={footerStyles.footer__nav} aria-label='Main'>
<ul className={footerStyles.footer__navList}>
{linksNav.map(link => (
<li className={footerStyles.footer__navItem} key={link.text}>
<Link href={link.href}>
<a title={link.text}>{link.text}</a>
</Link>
<a href={link.href} title={link.text}>
{link.text}
</a>
</li>
))}
</ul>
Expand All @@ -41,17 +42,15 @@ export default function Footer() {
className={footerStyles.footer__socialItem}
key={link.text}
>
<Link href={link.href}>
<a title={link.text} target='_blank'>
<Image
href={link.href}
src={link.src}
height={65}
width={47}
alt={link.alt}
/>
</a>
</Link>
<a href={link.href} title={link.text} target='_blank'>
<Image
href={link.href}
src={link.src}
height={65}
width={47}
alt={link.alt}
/>
</a>
</li>
))}
</ul>
Expand Down
2 changes: 1 addition & 1 deletion components/layout/Hero.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from 'react';
import Image from 'next/image';
import Image from 'next/legacy/image';
import Nav from '@/components/layout/Nav';
import Container from '@/components/containers/Container';
import styles from '@/styles/Hero.module.scss';
Expand Down
61 changes: 28 additions & 33 deletions components/layout/Nav.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useState, useEffect, useRef } from 'react';
import Link from 'next/link';
import Image from 'next/image';
import Image from 'next/legacy/image';
import { useRouter } from 'next/router';
import Container from '@/components/containers/Container';
import styles from '@/styles/Nav.module.scss';
Expand Down Expand Up @@ -57,48 +56,44 @@ export default function Nav() {
<div ref={containerRef}>
<nav className={styles.nav}>
<div className={styles.nav__logo}>
<Link href='/' passHref>
<a>
<Image
src='/images/svg/logo.svg'
height={115}
width={180}
alt='Logo'
title='Go to the Homepage'
/>
</a>
</Link>
<a href='/' passhref='true'>
<Image
src='/images/svg/logo.svg'
height={115}
width={180}
alt='Logo'
title='Go to the Homepage'
/>
</a>
</div>
<ul
className={`${styles.nav__links} ${active ? styles.active : ''}`}
>
{linksNav.map(({ text, href, id }) => {
return (
<li className={styles.nav__item} key={id}>
<Link href={href}>
<a
className={`${styles.nav__link} ${
router.pathname == href ? `${styles.current}` : ''
}`}
title={text}
>
{text}
</a>
</Link>
<a
href={href}
className={`${styles.nav__link} ${
router.pathname == href ? `${styles.current}` : ''
}`}
title={text}
>
{text}
</a>
</li>
);
})}
<li className={styles.nav__item}>
<Link href='mailto:[email protected]?subject=Project collaborator application'>
<a
className={`${styles.nav__button} ${
active ? styles.active : ''
}`}
title='Join us'
>
Join us
</a>
</Link>
<a
href='mailto:[email protected]?subject=Project collaborator application'
className={`${styles.nav__button} ${
active ? styles.active : ''
}`}
title='Join us'
>
Join us
</a>
</li>
</ul>
<button
Expand Down
2 changes: 1 addition & 1 deletion components/mailchimp/NewsletterForm.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { createRef, useState } from 'react';
import Image from 'next/image';
import Image from 'next/legacy/image';
import { decode } from 'html-entities';
import ReCAPTCHA from 'react-google-recaptcha';
import Container from '@/components/containers/Container';
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "web-dev-path",
"version": "1.1.0",
"version": "1.2.0",
"private": true,
"scripts": {
"dev": "yarn run open-browser-win && next dev -p 3010",
Expand All @@ -21,7 +21,7 @@
"dependencies": {
"@sendgrid/mail": "^7.7.0",
"html-entities": "^2.3.2",
"next": "^12.2.2",
"next": "^13.0.5",
"next-pwa": "^5.5.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
Expand Down
5 changes: 1 addition & 4 deletions pages/404.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ export default function NotFound() {
<h1>Ooops...</h1>
<h2>That page cannot be found :(</h2>
<p>
Go back to the{' '}
<Link href='/'>
<a>Homepage</a>
</Link>
Go back to the <Link href='/'>Homepage</Link>
</p>
</div>
);
Expand Down
4 changes: 1 addition & 3 deletions pages/blog/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,7 @@ export default function Blog() {
<p>We're building this page. Stay tuned!</p>
<ul>
<li>
<Link href='/blog/first-post'>
<a>First Post</a>
</Link>
<Link href='/blog/first-post'>First Post</Link>
</li>
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion pages/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default function Home() {
altTag: 'Join the project',
content:
'Are you learning web development and need mentorship? Are you a web dev looking for help or a code buddy for a project?',
link: "/about'",
link: '/about',
linkText: 'Learn more',
},
{
Expand Down
1 change: 0 additions & 1 deletion styles/SubmitButton.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
cursor: pointer;
font-weight: bold;
text-align: center;
min-width: 12rem;
display: block;
border: 1px solid $primary-content-color;
@include transition(all 0.3s ease);
Expand Down
Loading

0 comments on commit 3e45225

Please sign in to comment.