From 23d3249ee943a17d89f5d29555cd0c92664f93e6 Mon Sep 17 00:00:00 2001
From: Jelte-Akker <31856403+Jelte-Akker@users.noreply.github.com>
Date: Fri, 12 May 2023 14:32:41 +0200
Subject: [PATCH 1/5] fixed postal address to new standard (#367)
* fixed postal address to new standard
* quick fix
* fixed oopsie
---
src/data/en-us.json | 6 ++++--
src/data/nl.json | 4 +++-
src/static-pages/vereniging/contact.jsx | 8 +++++---
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/data/en-us.json b/src/data/en-us.json
index 4733052..7074218 100644
--- a/src/data/en-us.json
+++ b/src/data/en-us.json
@@ -52,8 +52,10 @@
"name": "Studievereniging Sticky",
"room": "Room 2.81",
"building": "Buys Ballot Building",
- "address_1": "Princetonplein 5",
- "address_2": "3584 CC UTRECHT",
+ "address_1": "Winthontlaan 30C",
+ "address_2": "3526KV Utrecht",
+ "address_1_postal": "Winthontlaan 30C",
+ "address_2_postal": "3526KV Utrecht",
"iban": "IBAN",
"iban_no": "NL61INGB0002877106",
"mail": "MAIL",
diff --git a/src/data/nl.json b/src/data/nl.json
index 3c71940..556a4d3 100644
--- a/src/data/nl.json
+++ b/src/data/nl.json
@@ -53,7 +53,9 @@
"room": "Kamer 2.81",
"building": "Buys Ballot Gebouw",
"address_1": "Princetonplein 5",
- "address_2": "3584 CC UTRECHT",
+ "address_2": "3584CC Utrecht",
+ "address_1_postal": "Winthontlaan 30C",
+ "address_2_postal": "3526KV Utrecht",
"iban": "IBAN",
"iban_no": "NL61INGB0002877106",
"mail": "MAIL",
diff --git a/src/static-pages/vereniging/contact.jsx b/src/static-pages/vereniging/contact.jsx
index d2fe24c..360f7f8 100644
--- a/src/static-pages/vereniging/contact.jsx
+++ b/src/static-pages/vereniging/contact.jsx
@@ -36,9 +36,11 @@ const ContactPage = props => {
{getTranslation(language, 'contact.postal_address')}
- {getTranslation(language, 'contact.name')}
- {getTranslation(language, 'contact.address_1')}
- {getTranslation(language, 'contact.address_2')}
+ {getTranslation(language, 'contact.name')},{' '}
+ {getTranslation(language, 'contact.building')}
+
+ {getTranslation(language, 'contact.address_1_postal')}
+ {getTranslation(language, 'contact.address_2_postal')}
From 06dd69684c5cb8c0d6259b878f5aefd9c360d460 Mon Sep 17 00:00:00 2001
From: Jelte-Akker <31856403+Jelte-Akker@users.noreply.github.com>
Date: Fri, 12 May 2023 15:23:03 +0200
Subject: [PATCH 2/5] Fix/fix postal address (#368)
* fixed postal address to new standard
* quick fix
* fixed oopsie
* en version fixed
---
src/data/en-us.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/data/en-us.json b/src/data/en-us.json
index 7074218..e2ee359 100644
--- a/src/data/en-us.json
+++ b/src/data/en-us.json
@@ -52,8 +52,8 @@
"name": "Studievereniging Sticky",
"room": "Room 2.81",
"building": "Buys Ballot Building",
- "address_1": "Winthontlaan 30C",
- "address_2": "3526KV Utrecht",
+ "address_1": "Princetonplein 5",
+ "address_2": "3584CC Utrecht",
"address_1_postal": "Winthontlaan 30C",
"address_2_postal": "3526KV Utrecht",
"iban": "IBAN",
From cb0a257ff4d7f517f6d1e9c6a242d7135f745a06 Mon Sep 17 00:00:00 2001
From: Sander
Date: Wed, 27 Sep 2023 13:36:03 +0200
Subject: [PATCH 3/5] update site colour (#370)
---
src/semantic/src/site/globals/site.variables | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/semantic/src/site/globals/site.variables b/src/semantic/src/site/globals/site.variables
index abcde0b..b29f6ad 100644
--- a/src/semantic/src/site/globals/site.variables
+++ b/src/semantic/src/site/globals/site.variables
@@ -2,4 +2,4 @@
User Global Variables
*******************************/
-@primaryColor: #29738f;
+@primaryColor: #61518f;
From 2b74a0b1c028dceadc0981807312b0e87672fbf4 Mon Sep 17 00:00:00 2001
From: Sander
Date: Tue, 3 Oct 2023 17:31:55 +0200
Subject: [PATCH 4/5] More Borrel Freedom (#372)
* update drinks to richer content
* remove redundant loc strings
* format drinks
---
src/components/Drinks.jsx | 23 ++++++-----------------
src/data/en-us.json | 3 ---
src/data/nl.json | 3 ---
3 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/src/components/Drinks.jsx b/src/components/Drinks.jsx
index 2093de1..2321c89 100644
--- a/src/components/Drinks.jsx
+++ b/src/components/Drinks.jsx
@@ -1,22 +1,12 @@
import React from 'react';
import { Card } from 'semantic-ui-react';
import { graphql, StaticQuery } from 'gatsby';
-import { getTranslation, getLanguage, metadata } from '../data/i18n';
+import { getLanguage, metadata } from '../data/i18n';
+import Markdown from 'markdown-to-jsx';
class Drinks extends React.Component {
renderDescription = (drinks, lg) => {
- return (
- <>
- {drinks.description}
-
- {getTranslation(lg, 'drinks.when', [
- drinks.day,
- drinks.time,
- drinks.location,
- ])}
-
-
- );
+ return {drinks.descriptionlong.descriptionlong};
};
render() {
@@ -42,12 +32,11 @@ const drinksQuery = graphql`
query drinksQuery {
allContentfulDrinks {
nodes {
- day
node_locale
- time
- location
title
- description
+ descriptionlong {
+ descriptionlong
+ }
}
}
}
diff --git a/src/data/en-us.json b/src/data/en-us.json
index e2ee359..e8e4990 100644
--- a/src/data/en-us.json
+++ b/src/data/en-us.json
@@ -1,7 +1,4 @@
{
- "drinks": {
- "when": "Every {0} starting at {1} in the {2}!"
- },
"board": {
"number": "Board {0}",
"current": "The current board",
diff --git a/src/data/nl.json b/src/data/nl.json
index 556a4d3..f4a6670 100644
--- a/src/data/nl.json
+++ b/src/data/nl.json
@@ -1,7 +1,4 @@
{
- "drinks": {
- "when": "Elke {0} vanaf {1} in de {2}!"
- },
"board": {
"number": "Bestuur {0}",
"current": "Het huidige bestuur",
From 59c11ed9900ae414f31446bd2a6a96ec97ed296e Mon Sep 17 00:00:00 2001
From: Silas Peters <69711739+SilasPeters@users.noreply.github.com>
Date: Sat, 28 Oct 2023 20:18:04 +0200
Subject: [PATCH 5/5] Create projects.yml
This new workflow will automatically add all new issues to the CommITCrowd project
---
.github/workflows/projects.yml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
create mode 100644 .github/workflows/projects.yml
diff --git a/.github/workflows/projects.yml b/.github/workflows/projects.yml
new file mode 100644
index 0000000..446daab
--- /dev/null
+++ b/.github/workflows/projects.yml
@@ -0,0 +1,22 @@
+name: projects
+
+on:
+ issues:
+ types:
+ - opened
+
+jobs:
+ add-to-project:
+ name: Add opened issue to CommITCrowd project
+ runs-on: ubuntu-latest
+ steps:
+ - uses: actions/add-to-project@v0.5.0
+ 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