Skip to content

Commit

Permalink
SC-1732: Move v16 to past, update employment, remove current apprenti…
Browse files Browse the repository at this point in the history 
…ceship (#48)

* feat: remove current apprentices section for now
    * We'll add this section back in once we start the apprenticeship back up.
* feat: update v16 apprentices to past, update current employment statuses
* fix: triangle wrapping to next line
* fix: turn off logo background in previous apprentices section
  • Loading branch information
@mdt2
mdt2 authored Jul 18, 2023
1 parent 1fc3c42 commit 712ba82
Show file tree
Hide file tree
Showing 5 changed files with 39 additions and 241 deletions.
226 changes: 0 additions & 226 deletions __tests__/__snapshots__/snapshot.js.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,232 +258,6 @@ exports[`renders homepage unchanged 1`] = `
</div>
</div>
</section>
<section
className="current-apprentices"
>
<div
className="current-apprentices__content"
>
<div
className="current-apprentices__header"
>
<h2>
Current Apprentices
<span
className="current-apprentices__version"
>
v
0.0
</span>
</h2>
</div>
<div
className="card-container"
>
<div
className="card-container__card"
>
<div
className="container"
>
<h3
className="container__heading"
>
First Last1
</h3>
<img
alt="a portrait of First Last1"
className="container__image"
src="/apprentices/First.png"
/>
<div
className="container__links"
>
<div
className="container"
>
<a
aria-label="First Last1's Personal"
className="link"
href="personal"
>
Personal
</a>
<svg
aria-hidden={true}
fill="none"
height="9"
viewBox="0 0 11 9"
width="11"
xmlns="http://www.w3.org/2000/svg"
>
<path
clipRule="evenodd"
d="M0.5 3.07343L0.5 8.5L1.26923 8.5L1.26923 3.07343L8.31903 3.07343C7.95887 3.47125 7.57203 4.06799 7.15851 4.86364L7.85883 4.86364C8.6992 3.94367 9.57959 3.27234 10.5 2.84965L10.5 2.51399C9.57959 2.07887 8.6992 1.40754 7.85883 0.500001L7.15852 0.500001C7.57203 1.29565 7.95887 1.89239 8.31903 2.29021L0.5 2.29021L0.5 2.68182L0.5 3.07343Z"
fill="white"
fillRule="evenodd"
/>
</svg>
</div>
<div
className="container"
>
<a
aria-label="First Last1's Linkedin"
className="link"
href="https://www.linkedin.com/"
>
Linkedin
</a>
<svg
aria-hidden={true}
fill="none"
height="9"
viewBox="0 0 11 9"
width="11"
xmlns="http://www.w3.org/2000/svg"
>
<path
clipRule="evenodd"
d="M0.5 3.07343L0.5 8.5L1.26923 8.5L1.26923 3.07343L8.31903 3.07343C7.95887 3.47125 7.57203 4.06799 7.15851 4.86364L7.85883 4.86364C8.6992 3.94367 9.57959 3.27234 10.5 2.84965L10.5 2.51399C9.57959 2.07887 8.6992 1.40754 7.85883 0.500001L7.15852 0.500001C7.57203 1.29565 7.95887 1.89239 8.31903 2.29021L0.5 2.29021L0.5 2.68182L0.5 3.07343Z"
fill="white"
fillRule="evenodd"
/>
</svg>
</div>
<div
className="container"
>
<a
aria-label="First Last1's Github"
className="link"
href="https://www.github.com/"
>
Github
</a>
<svg
aria-hidden={true}
fill="none"
height="9"
viewBox="0 0 11 9"
width="11"
xmlns="http://www.w3.org/2000/svg"
>
<path
clipRule="evenodd"
d="M0.5 3.07343L0.5 8.5L1.26923 8.5L1.26923 3.07343L8.31903 3.07343C7.95887 3.47125 7.57203 4.06799 7.15851 4.86364L7.85883 4.86364C8.6992 3.94367 9.57959 3.27234 10.5 2.84965L10.5 2.51399C9.57959 2.07887 8.6992 1.40754 7.85883 0.500001L7.15852 0.500001C7.57203 1.29565 7.95887 1.89239 8.31903 2.29021L0.5 2.29021L0.5 2.68182L0.5 3.07343Z"
fill="white"
fillRule="evenodd"
/>
</svg>
</div>
</div>
</div>
</div>
<div
className="card-container__card"
>
<div
className="container"
>
<h3
className="container__heading"
>
First Last2
</h3>
<img
alt="a portrait of First Last2"
className="container__image"
src="/apprentices/First.png"
/>
<div
className="container__links"
>
<div
className="container"
>
<a
aria-label="First Last2's Personal"
className="link"
href="personal"
>
Personal
</a>
<svg
aria-hidden={true}
fill="none"
height="9"
viewBox="0 0 11 9"
width="11"
xmlns="http://www.w3.org/2000/svg"
>
<path
clipRule="evenodd"
d="M0.5 3.07343L0.5 8.5L1.26923 8.5L1.26923 3.07343L8.31903 3.07343C7.95887 3.47125 7.57203 4.06799 7.15851 4.86364L7.85883 4.86364C8.6992 3.94367 9.57959 3.27234 10.5 2.84965L10.5 2.51399C9.57959 2.07887 8.6992 1.40754 7.85883 0.500001L7.15852 0.500001C7.57203 1.29565 7.95887 1.89239 8.31903 2.29021L0.5 2.29021L0.5 2.68182L0.5 3.07343Z"
fill="white"
fillRule="evenodd"
/>
</svg>
</div>
<div
className="container"
>
<a
aria-label="First Last2's Linkedin"
className="link"
href="https://www.linkedin.com/"
>
Linkedin
</a>
<svg
aria-hidden={true}
fill="none"
height="9"
viewBox="0 0 11 9"
width="11"
xmlns="http://www.w3.org/2000/svg"
>
<path
clipRule="evenodd"
d="M0.5 3.07343L0.5 8.5L1.26923 8.5L1.26923 3.07343L8.31903 3.07343C7.95887 3.47125 7.57203 4.06799 7.15851 4.86364L7.85883 4.86364C8.6992 3.94367 9.57959 3.27234 10.5 2.84965L10.5 2.51399C9.57959 2.07887 8.6992 1.40754 7.85883 0.500001L7.15852 0.500001C7.57203 1.29565 7.95887 1.89239 8.31903 2.29021L0.5 2.29021L0.5 2.68182L0.5 3.07343Z"
fill="white"
fillRule="evenodd"
/>
</svg>
</div>
<div
className="container"
>
<a
aria-label="First Last2's Github"
className="link"
href="https://www.github.com/"
>
Github
</a>
<svg
aria-hidden={true}
fill="none"
height="9"
viewBox="0 0 11 9"
width="11"
xmlns="http://www.w3.org/2000/svg"
>
<path
clipRule="evenodd"
d="M0.5 3.07343L0.5 8.5L1.26923 8.5L1.26923 3.07343L8.31903 3.07343C7.95887 3.47125 7.57203 4.06799 7.15851 4.86364L7.85883 4.86364C8.6992 3.94367 9.57959 3.27234 10.5 2.84965L10.5 2.51399C9.57959 2.07887 8.6992 1.40754 7.85883 0.500001L7.15852 0.500001C7.57203 1.29565 7.95887 1.89239 8.31903 2.29021L0.5 2.29021L0.5 2.68182L0.5 3.07343Z"
fill="white"
fillRule="evenodd"
/>
</svg>
</div>
</div>
</div>
</div>
</div>
</div>
</section>
<section
className="previous-apprentices"
>
Expand Down
2 changes: 1 addition & 1 deletion components/previous-apprentices-group/previous-apprentices-group.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
}

&__apprentice {
width: 10rem;
width: 10.25rem;

&:not(&:last-child) {
padding-bottom: 0.5rem;
Expand Down
10 changes: 5 additions & 5 deletions components/previous-apprentices/previous-apprentices.module.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@

@media (min-width: 50rem) {
.previous-apprentices {

background: url('../../public/sparkbox-logo.svg') no-repeat;
background-size: 40rem;
background-position-x: calc(50% + 38rem);
background-position-y: 16rem;
// Turn this back on when we restart the apprenticeship and "current apprentices" is active
// background: url('../../public/sparkbox-logo.svg') no-repeat;
// background-size: 40rem;
// background-position-x: calc(50% + 38rem);
// background-position-y: 16rem;

&__groups {
margin: auto;
Expand Down
30 changes: 25 additions & 5 deletions data/apprentices.json
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,25 @@
{
"previousApprenticeGroups": [
{
"version": "16.0",
"apprentices": [
{
"name": "Marissa Huysentruyt",
"status": "current"
},
{
"name": "Teresita Isidro"
},
{
"name": "Jared Kohrt",
"status": "previous"
},
{
"name": "Bennett Smrdel",
"status": "previous"
}
]
},
{
"version": "15.0",
"apprentices": [
Expand All @@ -21,7 +41,7 @@
"apprentices": [
{
"name": "Angus Chang",
"status": "current"
"status": "previous"
},
{
"name": "Alice Russell"
Expand Down Expand Up @@ -50,11 +70,11 @@
"apprentices": [
{
"name": "Hunter Keca",
"status": "current"
"status": "previous"
},
{
"name": "Luis Hernandez",
"status": "current"
"status": "previous"
},
{
"name": "Susmita Bhowmik"
Expand Down Expand Up @@ -99,15 +119,15 @@
"apprentices": [
{
"name": "Yosevu Kilonzo",
"status": "current"
"status": "previous"
},
{
"name": "Corinne Ling",
"status": "previous"
},
{
"name": "Travis Sanon",
"status": "current"
"status": "previous"
}
]
},
Expand Down
12 changes: 8 additions & 4 deletions pages/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ import styles from './index.module.scss';
import apprenticeData from '../data/apprentices';
import Hero from '../components/hero/hero';
import ApprenticeQualities from '../components/apprentice-qualities/apprentice-qualities';
import CurrentApprentices, { currentApprenticeClassPropTypes } from '../components/current-apprentices/current-apprentices';
// Turn this back on when we restart the apprenticeship
// import CurrentApprentices, { currentApprenticeClassPropTypes }
// from '../components/current-apprentices/current-apprentices';
import PreviousApprentices, { previousApprenticeGroupsPropTypes } from '../components/previous-apprentices/previous-apprentices';
import CallToAction from '../components/call-to-action/call-to-action';
import Footer from '../components/footer/footer';
Expand All @@ -19,7 +21,8 @@ export const getStaticProps = async () => ({
},
});

const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGroups } }) => (
// const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGroups } }) => (
const Home = ({ apprenticeData: { previousApprenticeGroups } }) => (
<div className={styles.container}>
<Head>
<title>Sparkbox Apprentices</title>
Expand All @@ -45,7 +48,8 @@ const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGrou
<Hero />
<main>
<ApprenticeQualities />
<CurrentApprentices currentApprenticeClass={currentApprenticeGroup} />
{/* Turn this back on when we restart the apprenticeship */}
{/* <CurrentApprentices currentApprenticeClass={currentApprenticeGroup} /> */}
<PreviousApprentices previousApprenticeGroups={previousApprenticeGroups} />
<CallToAction />
</main>
Expand All @@ -56,7 +60,7 @@ const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGrou

Home.propTypes = {
apprenticeData: PropTypes.shape({
currentApprenticeGroup: PropTypes.shape({ currentApprenticeClassPropTypes }).isRequired,
// currentApprenticeGroup: PropTypes.shape({ currentApprenticeClassPropTypes }).isRequired,
previousApprenticeGroups: PropTypes.arrayOf(previousApprenticeGroupsPropTypes).isRequired,
}),
};
Expand Down

0 comments on commit 712ba82

Please sign in to comment.