Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development to main, week 40 #102

Merged
merged 11 commits into from
Oct 10, 2023
Merged

Development to main, week 40 #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
580a021
Added text changes and bugfix
remko48 Oct 3, 2023
3b56592
Merge pull request #97 from ConductionNL/feature/Git-87/text-changes
remko48 Oct 3, 2023
08234c6
added part of requested changes
remko48 Oct 6, 2023
ead6920
added part of WCAG requirements and added translations
remko48 Oct 6, 2023
37fc1d7
updated conduction-themes package
remko48 Oct 6, 2023
0002be1
build fix
remko48 Oct 6, 2023
341f65e
Merge pull request #98 from ConductionNL/feature/XW-83/Github-issues
remko48 Oct 6, 2023
b5a5601
updated conduction-themes package
remko48 Oct 6, 2023
371055d
Merge pull request #99 from ConductionNL/feature/XW-83/Github-issues
remko48 Oct 6, 2023
2cf434d
added language options
remko48 Oct 6, 2023
b6d9222
Merge pull request #101 from ConductionNL/feature/XW-83/Github-issues
remko48 Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pwa/gatsby-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@ module.exports = {
separator: ".",
},
autoGenHomeLabel: "Home",
crumbLabelUpdates: [
{
pathname: "/[id]",
crumbLabel: "Details page",
},
],
},
},
],
Expand Down
35 changes: 13 additions & 22 deletions pwa/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions pwa/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
"private": true,
"description": "Product Website Template",
"author": "Conduction",
"keywords": ["gatsby"],
"keywords": [
"gatsby"
],
"scripts": {
"develop": "gatsby develop",
"start": "gatsby develop",
Expand All @@ -23,7 +25,7 @@
},
"dependencies": {
"@conduction/components": "2.2.8",
"@conduction/theme": "1.0.36",
"@conduction/theme": "1.0.45",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/react-fontawesome": "^0.1.18",
Expand Down
7 changes: 0 additions & 7 deletions pwa/src/components/ParsedHTML/ParsedHTML.module.css
View file
Open in desktop

This file was deleted.

42 changes: 0 additions & 42 deletions pwa/src/components/ParsedHTML/ParsedHTML.tsx
View file
Open in desktop

This file was deleted.

8 changes: 6 additions & 2 deletions pwa/src/components/resultsDisplaySwitch/ResultsDisplaySwitch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faGripVertical, faTable } from "@fortawesome/free-solid-svg-icons";
import { useDisplayContext } from "../../context/displays";
import { Button, ButtonGroup } from "@utrecht/component-library-react/dist/css-module";
import { useTranslation } from "react-i18next";

interface ResultsDisplaySwitchProps {
displayKey: string; // should implement with an unique key
Expand All @@ -13,23 +14,26 @@ interface ResultsDisplaySwitchProps {

const ResultsDisplaySwitch: React.FC<ResultsDisplaySwitchProps> = ({ layoutClassName, displayKey }) => {
const { setDisplay, isActive } = useDisplayContext();
const { t } = useTranslation();

return (
<ButtonGroup className={clsx(styles.container, layoutClassName && layoutClassName)}>
<Button
appearance={isActive(displayKey, "cards") ? "primary-action-button" : "secondary-action-button"}
className={styles.button}
onClick={() => setDisplay({ [displayKey]: "cards" })}
discription={t("Show cards")}
>
<FontAwesomeIcon icon={faGripVertical} /> Tegels
<FontAwesomeIcon icon={faGripVertical} /> {t("Cards")}
</Button>

<Button
appearance={isActive(displayKey, "table") ? "primary-action-button" : "secondary-action-button"}
className={styles.button}
onClick={() => setDisplay({ [displayKey]: "table" })}
discription={t("Show table")}
>
<FontAwesomeIcon icon={faTable} /> Tabel
<FontAwesomeIcon icon={faTable} /> {t("Table")}
</Button>
</ButtonGroup>
);
Expand Down
Loading
Loading