-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '170-refactor-switch-contacts-to-use-a-slug' into 167-re…
…gression-add-created-date-field-to-projects-netlify-and-check-that-it-works-with-sorting
- Loading branch information
Showing
7 changed files
with
188 additions
and
20 deletions.
There are no files selected for viewing
26 changes: 26 additions & 0 deletions
26
packages/example-site/content/project/ongoing-project2.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"slug": "ongoing-project-2", | ||
"question": "Hello world (from json)?", | ||
"mainContact": "first-contact", | ||
"projectTeam": [ | ||
"first-contact", | ||
"second-contact" | ||
], | ||
"agency": "example agency", | ||
"deliverable": "example deliverable", | ||
"description": "example description", | ||
"emailContent": "example emailContent", | ||
"endDate": "2016-12-15", | ||
"expertise": "example expertise", | ||
"fundingInfo": "example fundingInfo", | ||
"keyDates": "example keyDates", | ||
"lastModified": "example lastModified", | ||
"opportunityCloses": "2022-10-28", | ||
"purpose": "example purpose", | ||
"requirement": "example requirement", | ||
"startDate": "2022-06-17", | ||
"status": "ongoing", | ||
"statusOfData": "example statusOfData", | ||
"summary": "example summary", | ||
"topics": ["example topics"] | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"slug": "open-project-2", | ||
"question": "Hello world (from json)?", | ||
"mainContact": "the-boss", | ||
"projectTeam": [ | ||
"first-contact", | ||
"second-contact" | ||
], | ||
"agency": "example agency", | ||
"deliverable": "example deliverable", | ||
"description": "example description", | ||
"emailContent": "example emailContent", | ||
"endDate": "2016-12-15", | ||
"expertise": "example expertise", | ||
"fundingInfo": "example fundingInfo", | ||
"keyDates": "example keyDates", | ||
"lastModified": "example lastModified", | ||
"opportunityCloses": "2022-10-28", | ||
"purpose": "example purpose", | ||
"requirement": "example requirement", | ||
"startDate": "2022-06-17", | ||
"status": "open", | ||
"statusOfData": "example statusOfData", | ||
"summary": "example summary", | ||
"topics": ["example topics"] | ||
} |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import React from "react" | ||
import { graphql } from "gatsby" | ||
import { CardProps } from "../components" | ||
import { useStaticText } from "../hooks" | ||
import { ProjectPageLayout } from "../layouts/ProjectPageLayout" | ||
|
||
export interface OpenProjectProps { | ||
data: { | ||
allProject: { | ||
nodes: CardProps[] | ||
} | ||
bgImage: { | ||
childImageSharp: { | ||
resize: { | ||
src: string | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
export default ({ data: { allProject, bgImage } }: OpenProjectProps) => { | ||
const { open } = useStaticText() | ||
|
||
return ( | ||
<ProjectPageLayout | ||
allProject={allProject} | ||
bgImage={bgImage} | ||
title={open.title} | ||
lede={open.lede} | ||
pageName={open.pageName} | ||
sortOptions={["created", "opportunityCloses"]} | ||
/> | ||
) | ||
} | ||
export const query = graphql` | ||
query ProjectPageQuery { | ||
allProject(filter: { status: { eq: "open" } }) { | ||
nodes { | ||
question | ||
slug | ||
status | ||
summary | ||
deliverable | ||
expertise | ||
keyDates | ||
endDate | ||
agency | ||
topics | ||
statusOfData | ||
priorResearch | ||
fundingInfo | ||
lastModified | ||
} | ||
} | ||
bgImage: file( | ||
name: { eq: "open" } | ||
extension: { in: ["png", "jpg", "jpeg"] } | ||
sourceInstanceName: { eq: "themeImages" } | ||
) { | ||
childImageSharp { | ||
resize(width: 1536) { | ||
src | ||
} | ||
} | ||
} | ||
} | ||
` |
68 changes: 68 additions & 0 deletions
68
packages/gatsby-theme-project-portal/src/pages/ongoing.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
import React from "react" | ||
import { graphql } from "gatsby" | ||
import { CardProps } from "../components" | ||
import { useStaticText } from "../hooks" | ||
import { ProjectPageLayout } from "../layouts/ProjectPageLayout" | ||
|
||
export interface OngoingProjectProps { | ||
data: { | ||
allProject: { | ||
nodes: CardProps[] | ||
} | ||
bgImage: { | ||
childImageSharp: { | ||
resize: { | ||
src: string | ||
} | ||
} | ||
} | ||
} | ||
} | ||
|
||
export default ({ data: { allProject, bgImage } }: OngoingProjectProps) => { | ||
const { ongoing } = useStaticText() | ||
|
||
return ( | ||
<ProjectPageLayout | ||
allProject={allProject} | ||
bgImage={bgImage} | ||
title={ongoing.title} | ||
lede={ongoing.lede} | ||
pageName={ongoing.pageName} | ||
sortOptions={["startDate", "created"]} | ||
/> | ||
) | ||
} | ||
export const query = graphql` | ||
query ProjectPageQuery { | ||
allProject(filter: { status: { eq: "ongoing" } }) { | ||
nodes { | ||
question | ||
slug | ||
status | ||
summary | ||
deliverable | ||
expertise | ||
keyDates | ||
endDate | ||
agency | ||
topics | ||
statusOfData | ||
priorResearch | ||
fundingInfo | ||
lastModified | ||
} | ||
} | ||
bgImage: file( | ||
name: { eq: "ongoing" } | ||
extension: { in: ["png", "jpg", "jpeg"] } | ||
sourceInstanceName: { eq: "themeImages" } | ||
) { | ||
childImageSharp { | ||
resize(width: 1536) { | ||
src | ||
} | ||
} | ||
} | ||
} | ||
` |