Skip to content

Commit

Permalink
Dev to master (#379)
Browse files Browse the repository at this point in the history
* New workflow for adding newly opened issues to the CommITCrowd project

    Perhaps the title says it all. This is a really simple workflow, and it's open for any changes or adjustments

* feat: Hide phone number if not filled in in Contentful

* Add introduction information to the website (#376)

---------

Co-authored-by: Silas Peters <[email protected]>
Co-authored-by: Sem van Nieuwenhuizen <[email protected]>
  • Loading branch information
3 people authored Apr 8, 2024
1 parent e100ed1 commit a8c6765
Show file tree
Hide file tree
Showing 6 changed files with 113 additions and 8 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/projects.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
name: projects

on:
issues:
types:
- opened
pull_requests:
types:
- opened

jobs:
add-to-project:
name: Add opened issue or PR to CommITCrowd project
runs-on: ubuntu-latest
steps:
- uses: actions/[email protected]
with:
# URL of the project to add issues to
project-url: https://github.com/orgs/svsticky/projects/7
# A GitHub personal access token with write access to the project
github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
# A comma-separated list of labels to use as a filter for issue to be added
# labeled: # optional
# The behavior of the labels filter, AND to match all labels, OR to match any label, NOT to exclude any listed label (default is OR)
# label-operator: # optional
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ pnpm-lock.yaml
.yarn-integrity
# semantic dist
src/semantic/dist

# IDEA
.idea/
65 changes: 65 additions & 0 deletions src/components/IntroInformation.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import React from 'react';
import { Button, Card } from 'semantic-ui-react';
import { graphql, StaticQuery } from 'gatsby';
import { getLanguage, getTranslation, metadata } from '../data/i18n';

class IntroInformation extends React.Component {
render() {
const language =
typeof window !== 'undefined'
? getLanguage(window)
: metadata.defaultLocale;
let intro_information = this.props.data.allContentfulIntroInformation.nodes.filter(
d => d.node_locale === language
)[0]; //get only the first element

let color = this.props.data.contentfulBoard.color;
console.log(color);

return (
<>
<div>
<h2>{intro_information.title}</h2>
<Card fluid>
<div>{intro_information.description.description}</div>
<Button
href={intro_information.introWebsiteUrl}
target="_blank"
rel="noopener noreferrer"
className="button"
style={{ backgroundColor: color, color: 'white' }}
>
{intro_information.linkToWebsiteButtonText}
</Button>
</Card>
</div>
</>
);
}
}

const introInformationQuery = graphql`
query introInformationQuery {
allContentfulIntroInformation {
nodes {
node_locale
title
linkToWebsiteButtonText
description {
description
}
introWebsiteUrl
}
}
contentfulBoard(current: { eq: true }) {
color
}
}
`;

export default props => (
<StaticQuery
query={introInformationQuery}
render={data => <IntroInformation data={data} {...props} />}
/>
);
6 changes: 6 additions & 0 deletions src/components/layout/GridDryQueries.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ const IndexWrapper = styled.div`
.mainPartner {
grid-area: mainPartner;
}
.introInformation {
grid-area: introInformation;
}
.banner {
display: grid;
Expand All @@ -38,6 +41,7 @@ const IndexWrapper = styled.div`
grid-template-areas:
'logo'
'banner'
'introInformation'
'news'
'news'
'drinks'
Expand All @@ -64,6 +68,7 @@ const IndexWrapper = styled.div`
grid-template-columns: 1fr 1fr;
grid-template-areas:
'banner banner'
'introInformation introInformation'
'news news'
'drinks mainPartner'
'jobs activity';
Expand All @@ -80,6 +85,7 @@ const IndexWrapper = styled.div`
grid-template-columns: 3fr 1fr;
grid-template-areas:
'banner banner'
'news introInformation'
'news drinks'
'news mainPartner'
'news jobs'
Expand Down
4 changes: 4 additions & 0 deletions src/static-pages/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import MainPartnerBanner from '$/components/mainpartner/Banner';
import IndexWrapper from '$/components/layout/GridDryQueries';
import FeaturedJobWidget from '$/components/jobs/FeaturedJobWidget';
import ActivityWidget from '$/components/activities/ActivityWidget';
import IntroInformation from '$/components/IntroInformation';

import logo from '$/images/sticky-logo-text.svg';

Expand All @@ -34,6 +35,9 @@ const Index = ({ data }) => {
<div className="news">
<News itemsPerPage="5" />
</div>
<div className="introInformation">
<IntroInformation />
</div>
<div className="drinks">
<Drinks />
</div>
Expand Down
18 changes: 10 additions & 8 deletions src/templates/JobTemplate.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,16 @@ const JobView = ({ data }) => {
<Button primary href={'mailto:' + job.contactPerson.email} fluid>
{getTranslation(job.node_locale, 'vacancy.mail')}
</Button>
<Button
primary
href={'tel:' + job.contactPerson.phone}
fluid
className="call-button"
>
{getTranslation(job.node_locale, 'vacancy.call')}
</Button>
{job.contactPerson.phone && (
<Button
primary
href={'tel:' + job.contactPerson.phone}
fluid
className="call-button"
>
{getTranslation(job.node_locale, 'vacancy.call')}
</Button>
)}
</Card>
)}
</div>
Expand Down

0 comments on commit a8c6765

Please sign in to comment.