Skip to content

Commit

Permalink
Merge branch 'development' into Feature/XW-127/api-changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@remko48
remko48 committed Nov 28, 2023
2 parents b5a425c + 752e167 commit 1865d14
Show file tree
Hide file tree
Showing 34 changed files with 3,272 additions and 2,750 deletions.
2 changes: 2 additions & 0 deletions pwa/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ COPY package.json package-lock.json ./
# install node modules and build assets
RUN npm install

RUN npm install @parcel/watcher

COPY . .

RUN npm run build
Expand Down
5,567 changes: 2,993 additions & 2,574 deletions pwa/package-lock.json
View file

Large diffs are not rendered by default.

132 changes: 66 additions & 66 deletions pwa/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,88 +22,88 @@
"prepare": "cd .. && husky install"
},
"dependencies": {
"@conduction/components": "2.2.25",
"@conduction/components": "2.2.36",
"@conduction/theme": "1.0.55",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "6.4.2",
"@fortawesome/free-regular-svg-icons": "6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.1.18",
"@nl-design-system-unstable/amsterdam-design-tokens": "^1.0.0-alpha.107",
"@nl-design-system-unstable/bodegraven-reeuwijk-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/borne-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/buren-design-tokens": "^1.0.0-alpha.83",
"@nl-design-system-unstable/demodam-design-tokens": "^1.0.0-alpha.95",
"@nl-design-system-unstable/drechterland-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/duiven-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/duo-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/enkhuizen-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/groningen-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/haarlem-design-tokens": "^1.0.0-alpha.107",
"@nl-design-system-unstable/haarlemmermeer-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/hoorn-design-tokens": "^1.0.0-alpha.96",
"@nl-design-system-unstable/horstaandemaas-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/leidschendam-voorburg-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/nijmegen-design-tokens": "^1.0.0-alpha.95",
"@nl-design-system-unstable/noordoostpolder-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/provincie-zuid-holland-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/stedebroec-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/tilburg-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/venray-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/vught-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/westervoort-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/zevenaar-design-tokens": "^1.0.0-alpha.100",
"@nl-design-system-unstable/zwolle-design-tokens": "^1.0.0-alpha.100",
"@tabler/icons-react": "2.21.0",
"@types/qs": "^6.9.9",
"@types/react": "^18.0.28",
"@types/react-dom": "^18.0.11",
"@utrecht/component-library-react": "^1.0.0-alpha.394",
"@utrecht/design-tokens": "^1.0.0-alpha.524",
"axios": "^0.25.0",
"clsx": "^1.1.1",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@nl-design-system-unstable/amsterdam-design-tokens": "^1.0.0-alpha.128",
"@nl-design-system-unstable/bodegraven-reeuwijk-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/borne-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/buren-design-tokens": "^1.0.0-alpha.104",
"@nl-design-system-unstable/demodam-design-tokens": "^1.0.0-alpha.116",
"@nl-design-system-unstable/drechterland-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/duiven-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/duo-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/enkhuizen-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/groningen-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/haarlem-design-tokens": "^1.0.0-alpha.128",
"@nl-design-system-unstable/haarlemmermeer-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/hoorn-design-tokens": "^1.0.0-alpha.117",
"@nl-design-system-unstable/horstaandemaas-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/leidschendam-voorburg-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/nijmegen-design-tokens": "^1.0.0-alpha.116",
"@nl-design-system-unstable/noordoostpolder-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/provincie-zuid-holland-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/rotterdam-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/stedebroec-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/tilburg-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/venray-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/vught-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/westervoort-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/zevenaar-design-tokens": "^1.0.0-alpha.121",
"@nl-design-system-unstable/zwolle-design-tokens": "^1.0.0-alpha.121",
"@tabler/icons-react": "2.42.0",
"@types/qs": "^6.9.10",
"@types/react": "^18.2.39",
"@types/react-dom": "^18.2.17",
"@utrecht/component-library-react": "^2.0.0",
"@utrecht/design-tokens": "^1.0.0-alpha.607",
"axios": "^1.6.2",
"clsx": "^2.0.0",
"dateformat": "^5.0.3",
"dedent": "^0.7.0",
"gatsby": "^4.11.1",
"gatsby-plugin-breadcrumb": "^12.3.1",
"gatsby-plugin-layout": "^3.11.0",
"html-react-parser": "^4.0.0",
"i18next": "^21.6.16",
"jwt-decode": "^3.1.2",
"dedent": "^1.5.1",
"gatsby": "^5.12.11",
"gatsby-plugin-breadcrumb": "^12.3.2",
"gatsby-plugin-layout": "^4.12.0",
"html-react-parser": "^5.0.6",
"i18next": "^23.7.6",
"jwt-decode": "^4.0.0",
"lodash": "^4.17.21",
"qs": "^6.11.2",
"react": "^18.2.0",
"react-collapsible": "^2.10.0",
"react-dom": "^18.2.0",
"react-favicon": "^1.0.1",
"react-favicon": "^2.0.3",
"react-helmet": "^6.1.0",
"react-hook-form": "7.29.0",
"react-hook-form": "7.48.2",
"react-hot-toast": "^2.4.1",
"react-i18next": "^11.16.6",
"react-loading-skeleton": "^3.1.0",
"react-paginate": "^8.1.4",
"react-query": "^3.34.19",
"react-select": "^5.3.2",
"react-i18next": "^13.5.0",
"react-loading-skeleton": "^3.3.1",
"react-paginate": "^8.2.0",
"react-query": "^3.39.3",
"react-select": "^5.8.0",
"showdown": "^2.1.0"
},
"devDependencies": {
"@parcel/watcher": "^2.3.0",
"@types/dateformat": "^5.0.0",
"@types/dedent": "^0.7.0",
"@types/node": "^17.0.23",
"@types/react-helmet": "^6.1.5",
"@typescript-eslint/eslint-plugin": "^5.55.0",
"@typescript-eslint/parser": "^5.55.0",
"@types/showdown": "2.0.3",
"eslint": "^8.36.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-react": "^7.32.2",
"gh-pages": "^5.0.0",
"@types/dateformat": "^5.0.2",
"@types/dedent": "^0.7.2",
"@types/node": "^20.10.0",
"@types/react-helmet": "^6.1.9",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"@types/showdown": "2.0.6",
"eslint": "^8.54.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-react": "^7.33.2",
"gh-pages": "^6.1.0",
"husky": "^8.0.3",
"lint-staged": "^13.2.0",
"lint-staged": "^15.1.0",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.5",
"typescript": "^4.6.3"
"prettier": "^3.1.0",
"typescript": "^5.3.2"
}
}
4 changes: 4 additions & 0 deletions pwa/src/hooks/useEnvironment.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ export const useEnvironment = () => {
window.sessionStorage.setItem("FOOTER_CONTENT", process.env.GATSBY_FOOTER_CONTENT ?? "");
window.sessionStorage.setItem("FOOTER_CONTENT_HEADER", process.env.GATSBY_FOOTER_CONTENT_HEADER ?? "");
window.sessionStorage.setItem("OIDN_NUMBER", process.env.GATSBY_OIDN_NUMBER ?? "");
window.sessionStorage.setItem("SHOW_CATEGORY", process.env.GATSBY_SHOW_CATEGORY ?? "");
window.sessionStorage.setItem("SHOW_ORGANIZATION", process.env.GATSBY_SHOW_ORGANIZATION ?? "");

updateSessionStorage();
};
Expand All @@ -62,6 +64,8 @@ export const useEnvironment = () => {
window.sessionStorage.setItem("FOOTER_CONTENT", config.GATSBY_FOOTER_CONTENT ?? "");
window.sessionStorage.setItem("FOOTER_CONTENT_HEADER", config.GATSBY_FOOTER_CONTENT_HEADER ?? "");
window.sessionStorage.setItem("OIDN_NUMBER", config.GATSBY_OIDN_NUMBER ?? "");
window.sessionStorage.setItem("SHOW_CATEGORY", config.GATSBY_SHOW_CATEGORY ?? "");
window.sessionStorage.setItem("SHOW_ORGANIZATION", config.GATSBY_SHOW_ORGANIZATION ?? "");

updateSessionStorage();
};
Expand Down
5 changes: 5 additions & 0 deletions pwa/src/layout/Layout.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import { fab } from "@fortawesome/free-brands-svg-icons";
import { far } from "@fortawesome/free-regular-svg-icons";
import { IconPack, library } from "@fortawesome/fontawesome-svg-core";
import { useEnvironment } from "../hooks/useEnvironment";
import { ToolTip } from "@conduction/components";

export const TOOLTIP_ID = "cb8f47c3-7151-4a46-954d-784a531b01e6";

interface LayoutProps {
children: React.ReactNode;
Expand Down Expand Up @@ -58,6 +61,8 @@ const Layout: React.FC<LayoutProps> = ({ children, pageContext, location }) => {
<APIProvider value={API}>
<Surface>
<Document>
<ToolTip id={TOOLTIP_ID} />

<Toaster position="bottom-right" />

<div className={styles.container}>
Expand Down
113 changes: 34 additions & 79 deletions pwa/src/services/getConfig.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ import Buren from "./../../static/configFiles/buren.json";
import Albrandswaard from "./../../static/configFiles/albrandswaard.json";
import StedeBroec from "./../../static/configFiles/stede-broec.json";
import Lansingerland from "./../../static/configFiles/lansingerland.json";
import Waddinxveen from "./../../static/configFiles/waddinxveen..json";
import Waddinxveen from "./../../static/configFiles/waddinxveen.json";
import RijssenHolten from "./../../static/configFiles/rijssen-holten.json";
import HoekscheWaard from "./../../static/configFiles/hoeksche-waard.json";
import Texel from "./../../static/configFiles/texel.json";
import { TGroupedSelectOption } from "@conduction/components/lib/components/formFields/select/select";

export const getConfig = (themeOrDomainName: string): Record<string, any> | undefined => {
switch (themeOrDomainName) {
Expand Down Expand Up @@ -72,83 +73,37 @@ export const getConfig = (themeOrDomainName: string): Record<string, any> | unde
}
};

export const availableThemes: { label: string; value: string }[] = [
{
label: "Alle organisaties",
value: "open-webconcept-theme",
},
{
label: "Albrandswaard",
value: "albrandswaard",
},
{
label: "Barendrecht",
value: "barendrecht",
},
{
label: "Buren",
value: "buren",
},
// {
// label: "Conduction",
// value: "conduction-theme",
// },
// development purposes
{
label: "Dinkelland",
value: "dinkelland-theme",
},
{
label: "Epe",
value: "epe-theme",
},
{
label: "Hoeksche Waard",
value: "hoeksche-waard",
},
{
label: "Lansingerland",
value: "lansingerland",
},
{
label: "Noaberkracht",
value: "noaberkracht-theme",
},
{
label: "Noordwijk",
value: "noordwijk-theme",
},
{
label: "Ridderkerk",
value: "ridderkerk",
},
{
label: "Rijssen-Holten",
value: "rijssen-holten",
},
{
label: "Rotterdam",
value: "rotterdam-theme",
},
{
label: "Stede Broec",
value: "stedebroec",
},
{
label: "Texel",
value: "texel",
},
{
label: "Tubbergen",
value: "tubbergen-theme",
},
{
label: "Waddinxveen",
value: "waddinxveen",
export const availableThemes: TGroupedSelectOption[] = [
{
label: "Alle overheidsorganisaties",
options: [
{ label: "Alle overheidsorganisaties", value: "open-webconcept-theme" },
// { label: "Conduction", value: "conduction-theme" },
// { label: "XXLLNC", value: "xxllnc-theme" },
],
},
{
label: "Gemeenten",
options: [
{ label: "Albrandswaard", value: "albrandswaard" },
{ label: "Barendrecht", value: "barendrecht" },
{ label: "Buren", value: "buren" },
{ label: "Dinkelland", value: "dinkelland-theme" },
{ label: "Epe", value: "epe-theme" },
{ label: "Hoeksche Waard", value: "hoeksche-waard" },
{ label: "Lansingerland", value: "lansingerland" },
{ label: "Noordwijk", value: "noordwijk-theme" },
{ label: "Ridderkerk", value: "ridderkerk" },
{ label: "Rijssen-Holten", value: "rijssen-holten" },
{ label: "Rotterdam", value: "rotterdam-theme" },
{ label: "Stede Broec", value: "stedebroec" },
{ label: "Texel", value: "texel" },
{ label: "Tubbergen", value: "tubbergen-theme" },
{ label: "Waddinxveen", value: "waddinxveen" },
],
},
{
label: "Regionale samenwerkingsorganen",
options: [{ label: "Noaberkracht", value: "noaberkracht-theme" }],
},
// {
// label: "XXLLNC",
// value: "xxllnc-theme",
// },
// development purposes
];
19 changes: 11 additions & 8 deletions pwa/src/templates/templateParts/cardsResultsTemplate/CardsResultsTemplate.module.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,8 @@
flex-direction: column;
}

.cardHeader:before {
z-index: 1;
content: "";
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
.cardContainer:hover .cardHeader {
border-bottom-color: var(--conduction-card-header-hover-border-bottom-color);
}

.title {
Expand All @@ -26,6 +20,15 @@

.description {
color: var(--conduction-card-wrapper-color) !important;
display: -webkit-box;
-webkit-line-clamp: 5;
-webkit-box-orient: vertical;
overflow: hidden;
text-overflow: ellipsis;
}

.cardFooter {
margin-top: auto;
}

@media only screen and (max-width: 992px) {
Expand Down
Loading

0 comments on commit 1865d14

Please sign in to comment.