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

Feature/oc 807/table wrapper #325

Merged
merged 5 commits into from
Sep 20, 2023
Merged

Feature/oc 807/table wrapper #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8e84596
INIT new TableWrapper component
lencodes Sep 12, 2023
2bb1c6f
INIT buttons scroll
lencodes Sep 12, 2023
e065b4d
Merge remote-tracking branch 'origin/development' into feature/OC-807…
remko48 Sep 15, 2023
cea8898
added tableWrapper from component package
remko48 Sep 19, 2023
83faf38
build fix
remko48 Sep 20, 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
23 changes: 11 additions & 12 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": "skeleton-pip",
"author": "Conduction",
"keywords": ["gatsby"],
"keywords": [
"gatsby"
],
"scripts": {
"develop": "gatsby develop",
"start": "gatsby develop",
Expand All @@ -21,7 +23,7 @@
"prepare": "cd .. && husky install"
},
"dependencies": {
"@conduction/components": "2.2.5",
"@conduction/components": "2.2.7",
"@fortawesome/fontawesome-svg-core": "^6.1.1",
"@fortawesome/free-solid-svg-icons": "^6.1.1",
"@fortawesome/react-fontawesome": "^0.1.18",
Expand Down
1 change: 0 additions & 1 deletion pwa/src/components/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,3 @@ export * from "./link/Link";
export * from "./organizationCard/OrganizationCard";
export * from "./pagination/pagination";
export * from "./resultsDisplaySwitch/ResultsDisplaySwitch";
export * from "./tableWrapper/TableWrapper";
33 changes: 0 additions & 33 deletions pwa/src/components/tableWrapper/TableWrapper.module.css
View file
Open in desktop

This file was deleted.

62 changes: 0 additions & 62 deletions pwa/src/components/tableWrapper/TableWrapper.tsx
View file
Open in desktop

This file was deleted.

6 changes: 4 additions & 2 deletions ...tes/templateParts/OrganizationDisplayTemplates/table/TableOrganizationDisplayTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,14 @@ import {
} from "@utrecht/component-library-react/dist/css-module";
import { IconArrowRight } from "@tabler/icons-react";
import { getResultsUrl } from "../../../../services/getResultsUrl";
import TableWrapper from "../../../../components/tableWrapper/TableWrapper";
import { TableWrapper } from "@conduction/components";
import { Link } from "../../../../components";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faGlobe, faHouseLaptop, faInfoCircle, faRepeat, faUserCog } from "@fortawesome/free-solid-svg-icons";
import { GitHubLogo } from "../../../../assets/svgs/GitHub";
import { GitLabLogo } from "../../../../assets/svgs/GitLab";
import { TOOLTIP_ID } from "../../../../layout/Layout";
import { GatsbyContext } from "../../../../context/gatsby";

interface TableOrganizationDisplayTemplateProps {
organizations: any[];
Expand All @@ -32,9 +33,10 @@ export const TableOrganizationDisplayTemplate: React.FC<TableOrganizationDisplay
hideTableHead,
}) => {
const { t } = useTranslation();
const { screenSize } = React.useContext(GatsbyContext);

return (
<TableWrapper>
<TableWrapper touchScreen={screenSize === "tablet" || screenSize === "mobile"}>
<Table>
{!hideTableHead && (
<TableHeader>
Expand Down
6 changes: 4 additions & 2 deletions pwa/src/templates/templateParts/resultsTemplates/table/TableResultTemplate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ import {
import { IconArrowRight } from "@tabler/icons-react";
import clsx from "clsx";
import { getResultsUrl } from "../../../../services/getResultsUrl";
import TableWrapper from "../../../../components/tableWrapper/TableWrapper";
import { getTypeFromSchemaRef } from "../../../../services/getTypeFromSchemaRef";
import { Link } from "../../../../components";
import { TableWrapper } from "@conduction/components";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
import { faInfoCircle, faLayerGroup } from "@fortawesome/free-solid-svg-icons";
import { TOOLTIP_ID } from "../../../../layout/Layout";
import { GatsbyContext } from "../../../../context/gatsby";

interface TableResultTemplateProps {
components: any[];
Expand All @@ -29,6 +30,7 @@ interface TableResultTemplateProps {

export const TableResultTemplate: React.FC<TableResultTemplateProps> = ({ components, hideTableHead }) => {
const { t } = useTranslation();
const { screenSize } = React.useContext(GatsbyContext);

/**
* Map component status to `StatusBadge` status
Expand Down Expand Up @@ -69,7 +71,7 @@ export const TableResultTemplate: React.FC<TableResultTemplateProps> = ({ compon
};

return (
<TableWrapper>
<TableWrapper touchScreen={screenSize === "tablet" || screenSize === "mobile"}>
<Table>
{!hideTableHead && (
<TableHeader>
Expand Down
14 changes: 14 additions & 0 deletions pwa/static/themes/rotterdam.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,20 @@
--conduction-tabs-tab-panel-padding-inline-start: var(--web-app-size-lg);
--conduction-tabs-tab-panel-padding-inline-end: var(--web-app-size-lg);

--conduction-tabs-scroll-button-hover-color: var(--rotterdam-color-green);
--conduction-tabs-scroll-button-hover-background-color: var(--web-app-color-white);
--conduction-tabs-scroll-button-color: #404b4f;
--conduction-tabs-scroll-button-background-color: var(--web-app-color-white);

/* @conduction: TableWrapper */
--conduction-table-wrapper-scroll-button-hover-color: var(--rotterdam-color-green);
--conduction-table-wrapper-scroll-button-hover-background-color: var(--web-app-color-white);
--conduction-table-wrapper-scroll-button-padding-inline-end: 14px;
--conduction-table-wrapper-scroll-button-padding-inline-start: 14px;
--conduction-table-wrapper-scroll-button-color: #404b4f;
--conduction-table-wrapper-scroll-button-background-color: var(--web-app-color-white);


/* @gemeent-denhaag: SideNav */
--web-app-sidenav-link-active-color: var(--rotterdam-color-green);
--web-app-sidenav-link-hover-color: var(--rotterdam-color-green);
Expand Down
14 changes: 14 additions & 0 deletions pwa/static/themes/theme.css.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,6 +237,20 @@
--conduction-tabs-tab-panel-padding-inline-start: var(--web-app-size-lg);
--conduction-tabs-tab-panel-padding-inline-end: var(--web-app-size-lg);

--conduction-tabs-scroll-button-hover-color: var(--rotterdam-color-green);
--conduction-tabs-scroll-button-hover-background-color: var(--web-app-color-white);
--conduction-tabs-scroll-button-color: #404b4f;
--conduction-tabs-scroll-button-background-color: var(--web-app-color-white);

/* @conduction: TableWrapper */
--conduction-table-wrapper-scroll-button-hover-color: var(--rotterdam-color-green);
--conduction-table-wrapper-scroll-button-hover-background-color: var(--web-app-color-white);
--conduction-table-wrapper-scroll-button-padding-inline-end: 14px;
--conduction-table-wrapper-scroll-button-padding-inline-start: 14px;
--conduction-table-wrapper-scroll-button-color: #404b4f;
--conduction-table-wrapper-scroll-button-background-color: var(--web-app-color-white);


/* @gemeent-denhaag: SideNav */
--web-app-sidenav-link-active-color: var(--rotterdam-color-green);
--web-app-sidenav-link-hover-color: var(--rotterdam-color-green);
Expand Down
16 changes: 16 additions & 0 deletions pwa/static/themes/utrecht.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,22 @@
--conduction-tabs-tab-panel-padding-inline-start: var(--web-app-size-lg);
--conduction-tabs-tab-panel-padding-inline-end: var(--web-app-size-lg);

--conduction-tabs-scroll-button-hover-color: #000000;
--conduction-tabs-scroll-button-hover-background-color: var(--web-app-color-white);
--conduction-tabs-scroll-button-color: #000000b3;
--conduction-tabs-scroll-button-background-color: var(--web-app-color-white);

/* @conduction: TableWrapper */
--conduction-table-wrapper-scroll-button-hover-color: var(--web-app-color-link-active);
--conduction-table-wrapper-scroll-button-hover-background-color: var(--web-app-color-white);
--conduction-table-wrapper-scroll-button-padding-inline-end: 14px;
--conduction-table-wrapper-scroll-button-padding-inline-start: 14px;
--conduction-table-wrapper-scroll-button-color: #000000;
--conduction-table-wrapper-scroll-button-background-color: var(--web-app-color-white);
--conduction-table-wrapper-scroll-button-border-width: var(--web-app-size-4xs);
--conduction-table-wrapper-scroll-button-border-style: solid;
--conduction-table-wrapper-scroll-button-border-color: var(--web-app-color-disabled);

/* @gemeent-denhaag: SideNav */
--web-app-sidenav-link-active-color: var(--web-app-color-link-active);
--web-app-sidenav-link-hover-color: var(--web-app-color-link-active);
Expand Down
Loading