diff --git a/__tests__/__snapshots__/snapshot.js.snap b/__tests__/__snapshots__/snapshot.js.snap index c69eb25..e8d6dfb 100644 --- a/__tests__/__snapshots__/snapshot.js.snap +++ b/__tests__/__snapshots__/snapshot.js.snap @@ -258,232 +258,6 @@ exports[`renders homepage unchanged 1`] = ` -
-
-
-

- Current Apprentices - - - v - 0.0 - -

-
-
-
-
-

- First Last1 -

- a portrait of First Last1 -
-
- - Personal - - - - -
-
- - Linkedin - - - - -
-
- - Github - - - - -
-
-
-
-
-
-

- First Last2 -

- a portrait of First Last2 -
-
- - Personal - - - - -
-
- - Linkedin - - - - -
-
- - Github - - - - -
-
-
-
-
-
-
diff --git a/components/previous-apprentices-group/previous-apprentices-group.module.scss b/components/previous-apprentices-group/previous-apprentices-group.module.scss index 819a74e..23501f3 100644 --- a/components/previous-apprentices-group/previous-apprentices-group.module.scss +++ b/components/previous-apprentices-group/previous-apprentices-group.module.scss @@ -16,7 +16,7 @@ } &__apprentice { - width: 10rem; + width: 10.25rem; &:not(&:last-child) { padding-bottom: 0.5rem; diff --git a/components/previous-apprentices/previous-apprentices.module.scss b/components/previous-apprentices/previous-apprentices.module.scss index 3057a9d..1f9d618 100644 --- a/components/previous-apprentices/previous-apprentices.module.scss +++ b/components/previous-apprentices/previous-apprentices.module.scss @@ -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; diff --git a/data/apprentices.json b/data/apprentices.json index 86f3ce6..b5dee54 100644 --- a/data/apprentices.json +++ b/data/apprentices.json @@ -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": [ @@ -21,7 +41,7 @@ "apprentices": [ { "name": "Angus Chang", - "status": "current" + "status": "previous" }, { "name": "Alice Russell" @@ -50,11 +70,11 @@ "apprentices": [ { "name": "Hunter Keca", - "status": "current" + "status": "previous" }, { "name": "Luis Hernandez", - "status": "current" + "status": "previous" }, { "name": "Susmita Bhowmik" @@ -99,7 +119,7 @@ "apprentices": [ { "name": "Yosevu Kilonzo", - "status": "current" + "status": "previous" }, { "name": "Corinne Ling", @@ -107,7 +127,7 @@ }, { "name": "Travis Sanon", - "status": "current" + "status": "previous" } ] }, diff --git a/pages/index.js b/pages/index.js index 0478cc4..9ca6ff0 100644 --- a/pages/index.js +++ b/pages/index.js @@ -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'; @@ -19,7 +21,8 @@ export const getStaticProps = async () => ({ }, }); -const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGroups } }) => ( +// const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGroups } }) => ( +const Home = ({ apprenticeData: { previousApprenticeGroups } }) => (
Sparkbox Apprentices @@ -45,7 +48,8 @@ const Home = ({ apprenticeData: { currentApprenticeGroup, previousApprenticeGrou
- + {/* Turn this back on when we restart the apprenticeship */} + {/* */}
@@ -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, }), };