Skip to content

Commit

Permalink
Merge branch 'main' into MIJN-7117-rvv-sloterweg-statustrein
Browse files Browse the repository at this point in the history
  • Loading branch information
janthijs authored Nov 7, 2023
2 parents 2f64789 + cd3aa3e commit 161c782
Show file tree
Hide file tree
Showing 22 changed files with 4,205 additions and 2,893 deletions.
6,519 changes: 3,932 additions & 2,587 deletions package-lock.json

Large diffs are not rendered by default.

49 changes: 24 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,81 +51,80 @@
"@types/leaflet": "^1.7.6",
"@types/lodash.escaperegexp": "^4.1.6",
"@types/lodash.isequal": "^4.5.5",
"@types/marked": "^4.0.1",
"@types/memoizee": "^0.4.6",
"@types/memory-cache": "^0.2.4",
"@types/morgan": "^1.9.3",
"@types/node": "^16.11.19",
"@types/node": "^20.8.10",
"@types/node-jose": "^1.1.10",
"@types/pg": "^8.6.5",
"@types/proj4": "^2.5.2",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@types/react-router-dom": "^5.3.2",
"@types/sanitize-html": "^2.5.0",
"@types/supercluster": "^5.0.3",
"@types/throttle-debounce": "^2.1.0",
"@types/supercluster": "^7.1.2",
"@types/throttle-debounce": "^5.0.1",
"@types/uid-safe": "^2.1.2",
"axios": "^0.24.0",
"axios": "^1.6.0",
"axios-mock-adapter": "^1.21.4",
"better-sqlite3": "^8.6.0",
"better-sqlite3": "^9.0.0",
"classnames": "^2.3.1",
"compression": "^1.7.4",
"concurrently": "^6.4.0",
"concurrently": "^8.2.2",
"cookie-parser": "^1.4.6",
"cookie-session": "^1.4.0",
"cookie-session": "^2.0.0",
"cors": "^2.8.5",
"cross-env": "^7.0.3",
"date-fns": "^2.27.0",
"dotenv": "^10.0.0",
"dotenv-expand": "^8.0.3",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
"express": "^4.17.3",
"express-basic-auth": "^1.2.1",
"express-http-proxy": "^1.6.3",
"express-openid-connect": "^2.17.1",
"express-rate-limit": "^6.4.0",
"express-http-proxy": "^2.0.0",
"express-openid-connect": "^2.5.2",
"express-rate-limit": "^7.1.3",
"flat-cache": "^3.0.4",
"focus-trap-react": "^8.8.2",
"focus-trap-react": "^10.2.3",
"form-data": "^4.0.0",
"fuse.js": "^6.4.6",
"fuse.js": "^7.0.0",
"http-proxy-middleware": "^2.0.1",
"include-media": "^1.4.10",
"jose": "^2.0.6",
"include-media": "^2.0.0",
"jose": "^5.0.1",
"js-cookie": "^3.0.1",
"jsonpath": "^1.1.1",
"jw-paginate": "^1.0.4",
"leaflet": "^1.7.1",
"lodash.escaperegexp": "^4.1.2",
"lodash.isequal": "^4.5.0",
"marked": "^4.0.10",
"marked": "^9.1.5",
"memoizee": "^0.4.15",
"memory-cache": "^0.2.0",
"morgan": "^1.10.0",
"node-jose": "^2.1.1",
"node-sass": "^9.0.0",
"pg": "^8.8.0",
"prettier": "^2.5.1",
"prettier": "^3.0.3",
"proj4": "^2.7.5",
"pug": "^3.0.2",
"qs": "^6.11.1",
"react": "^18.2.0",
"react-circular-progressbar": "^2.0.4",
"react-dom": "^18.2.0",
"react-error-boundary": "^3.1.4",
"react-error-boundary": "^4.0.11",
"react-router-dom": "^5.3.0",
"react-spring": "^9.7.2",
"react-swipeable": "^6.2.0",
"react-swipeable": "^7.0.1",
"react-test-renderer": "^18.2.0",
"recoil": "^0.7.4",
"sanitize-html": "^2.6.0",
"slugme": "^1.1.1",
"supercluster": "^7.1.4",
"throttle-debounce": "^3.0.1",
"supercluster": "^8.0.1",
"throttle-debounce": "^5.0.0",
"ts-node": "^10.9.1",
"typescript": "^4.7.3",
"typescript": "^5.2.2",
"uid-safe": "^2.1.5",
"use-debounce": "^10.0.0",
"vite-plugin-svgr": "^3.2.0",
"vite-plugin-svgr": "^4.1.0",
"xlsx": "file:vendor/xlsx-0.20.0.tgz"
},
"devDependencies": {
Expand Down
104 changes: 50 additions & 54 deletions src/client/assets/icons/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,59 +3,55 @@ export {
Minimise as IconMinimise,
Spinner as IconSpinner,
} from '@amsterdam/design-system-react-icons';
export { ReactComponent as IconAlert } from './Alert.svg';
export { ReactComponent as IconArrowRrimaryWhite } from './Arrow__primary-white.svg';
export { ReactComponent as IconAVG } from './AVG-verzoeken.svg';
export { ReactComponent as IconBelastingen } from './belastingen.svg';
export { ReactComponent as IconMyNotifications } from './Bell.svg';
export { ReactComponent as IconBurgerZaken } from './burgerzaken.svg';
export { ReactComponent as IconBezwaren } from './icon-bezwaren.svg';
export { ReactComponent as IconParkeren } from './Car.svg';
export { ReactComponent as IconCheckmark } from './Checkmark.svg';
export { ReactComponent as IconChevronLeft } from './Chevron-Left.svg';
export { ReactComponent as IconChevronRight } from './Chevron-Right.svg';
// export { ReactComponent as IconChevronRight__primaryRed } from './Chevron-Right__primary-red.svg';
// export { ReactComponent as IconChevronRight__primaryWhite } from './Chevron-Right__primary-white.svg';
export { ReactComponent as IconClose } from './Close.svg';
// export { ReactComponent as IconClose__primaryWhite } from './Close__primary-white.svg';
export { ReactComponent as IconDocument } from './Document.svg';
export { ReactComponent as IconDownload } from './Download.svg';
export { ReactComponent as IconErfpacht } from './erfpacht.svg';
export { ReactComponent as IconExternalLink } from './External-Link.svg';
export { ReactComponent as IconFilter } from './Filter.svg';
export { ReactComponent as IconHomeCommercial } from './home-commercial.svg';
export { ReactComponent as IconHomeSimple } from './home-simple.svg';
export { ReactComponent as IconHome } from './home.svg';
export { ReactComponent as IconGarbage } from './Huisvuilkalender.svg';
export { ReactComponent as IconInfo } from './Info.svg';
export { ReactComponent as IconInkomen } from './inkomen.svg';
export { ReactComponent as IconInkomenSVWI } from './inkomen-svwi.svg';
export { ReactComponent as IconKlachten } from './IconKlachten.svg';
export { ReactComponent as IconKrefia } from './krefia.svg';
export { ReactComponent as IconLogout } from './Logout.svg';
export { default as IconAlert } from './Alert.svg?react';
export { default as IconArrowRrimaryWhite } from './Arrow__primary-white.svg?react';
export { default as IconAVG } from './AVG-verzoeken.svg?react';
export { default as IconBelastingen } from './belastingen.svg?react';
export { default as IconMyNotifications } from './Bell.svg?react';
export { default as IconBurgerZaken } from './burgerzaken.svg?react';
export { default as IconBezwaren } from './icon-bezwaren.svg?react';
export { default as IconParkeren } from './Car.svg?react';
export { default as IconCheckmark } from './Checkmark.svg?react';
export { default as IconChevronLeft } from './Chevron-Left.svg?react';
export { default as IconChevronRight } from './Chevron-Right.svg?react';
export { default as IconClose } from './Close.svg?react';
export { default as IconDocument } from './Document.svg?react';
export { default as IconDownload } from './Download.svg?react';
export { default as IconErfpacht } from './erfpacht.svg?react';
export { default as IconExternalLink } from './External-Link.svg?react';
export { default as IconFilter } from './Filter.svg?react';
export { default as IconHomeCommercial } from './home-commercial.svg?react';
export { default as IconHomeSimple } from './home-simple.svg?react';
export { default as IconHome } from './home.svg?react';
export { default as IconGarbage } from './Huisvuilkalender.svg?react';
export { default as IconInfo } from './Info.svg?react';
export { default as IconInkomen } from './inkomen.svg?react';
export { default as IconInkomenSVWI } from './inkomen-svwi.svg?react';
export { default as IconKlachten } from './IconKlachten.svg?react';
export { default as IconKrefia } from './krefia.svg?react';
export { default as IconLogout } from './Logout.svg?react';
// Map icons
export { ReactComponent as MapIconHomeCommercial } from './map/homeCommercial__primary-red.svg';
export { ReactComponent as IconMarker } from './Marker.svg';
// export { ReactComponent as IconMenu } from './Menu.svg';
export { ReactComponent as IconMijnGegevens } from './MijnGegevens.svg';
export { ReactComponent as IconMilieuzone } from './milieuzone.svg';
export { default as MapIconHomeCommercial } from './map/homeCommercial__primary-red.svg?react';
export { default as IconMarker } from './Marker.svg?react';
export { default as IconMijnGegevens } from './MijnGegevens.svg?react';
export { default as IconMilieuzone } from './milieuzone.svg?react';
export {
ReactComponent as IconIndeterminate,
ReactComponent as IconMin,
} from './min.svg';
export { ReactComponent as IconPassport } from './Passport.svg';
export { ReactComponent as IconPlus } from './plus.svg';
export { ReactComponent as IconProfile } from './Profile.svg';
export { ReactComponent as IconSearch } from './Search.svg';
export { ReactComponent as IconStadspas } from './stadspas.svg';
export { ReactComponent as IconSubsidie } from './subsidie.svg';
export { ReactComponent as IconTips } from './Tip.svg';
export { ReactComponent as IconToeristischeVerhuur } from './toeristische-verhuur.svg';
export { ReactComponent as IconVergunningen } from './vergunningen.svg';
export { ReactComponent as IconWior } from './wior.svg';
export { ReactComponent as IconZorg } from './zorg.svg';
export { ReactComponent as IconHoreca } from './iconHoreca.svg';
export { ReactComponent as IconSiaMeldingen } from './siameldingen.svg';
export { ReactComponent as ThumbsUp } from './thumbs_up.svg';
export { ReactComponent as ThumbsDown } from './thumbs_down.svg';
export { ReactComponent as IconBodem } from './icon_bodem.svg';
default as IconIndeterminate,
default as IconMin,
} from './min.svg?react';
export { default as IconPassport } from './Passport.svg?react';
export { default as IconPlus } from './plus.svg?react';
export { default as IconProfile } from './Profile.svg?react';
export { default as IconSearch } from './Search.svg?react';
export { default as IconStadspas } from './stadspas.svg?react';
export { default as IconSubsidie } from './subsidie.svg?react';
export { default as IconTips } from './Tip.svg?react';
export { default as IconToeristischeVerhuur } from './toeristische-verhuur.svg?react';
export { default as IconVergunningen } from './vergunningen.svg?react';
export { default as IconWior } from './wior.svg?react';
export { default as IconZorg } from './zorg.svg?react';
export { default as IconHoreca } from './iconHoreca.svg?react';
export { default as IconSiaMeldingen } from './siameldingen.svg?react';
export { default as ThumbsUp } from './thumbs_up.svg?react';
export { default as ThumbsDown } from './thumbs_down.svg?react';
export { default as IconBodem } from './icon_bodem.svg?react';
82 changes: 41 additions & 41 deletions src/client/assets/icons/map/index.tsx
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
// Map icons
export { ReactComponent as IconAfvalGlas } from './glas.svg';
export { ReactComponent as IconAfvalGft } from './gft.svg';
export { ReactComponent as IconAfvalTextiel } from './textile.svg';
export { ReactComponent as IconAfvalPapier } from './paper.svg';
export { ReactComponent as IconAfvalRest } from './rest-afval.svg';
export { ReactComponent as IconAfvalGrofAfval } from './grof-afval.svg';
export { default as IconAfvalGlas } from './glas.svg?react';
export { default as IconAfvalGft } from './gft.svg?react';
export { default as IconAfvalTextiel } from './textile.svg?react';
export { default as IconAfvalPapier } from './paper.svg?react';
export { default as IconAfvalRest } from './rest-afval.svg?react';
export { default as IconAfvalGrofAfval } from './grof-afval.svg?react';

export { ReactComponent as IconAuto } from './car.svg';
export { ReactComponent as IconBekendmaking } from './bekendmaking.svg';
export { ReactComponent as IconEvenement } from './evenement.svg';
export { ReactComponent as IconSport } from './sport.svg';
export { ReactComponent as IconHomeCommercial } from './homeCommercial__primary-red.svg';
export { ReactComponent as IconTennis } from './tennis.svg';
export { ReactComponent as IconVoetbal } from './voetbal.svg';
export { ReactComponent as IconFitness } from './fitness.svg';
export { ReactComponent as IconVolleybal } from './volleybal.svg';
export { ReactComponent as IconBasketbal } from './basketbal.svg';
export { default as IconAuto } from './car.svg?react';
export { default as IconBekendmaking } from './bekendmaking.svg?react';
export { default as IconEvenement } from './evenement.svg?react';
export { default as IconSport } from './sport.svg?react';
export { default as IconHomeCommercial } from './homeCommercial__primary-red.svg?react';
export { default as IconTennis } from './tennis.svg?react';
export { default as IconVoetbal } from './voetbal.svg?react';
export { default as IconFitness } from './fitness.svg?react';
export { default as IconVolleybal } from './volleybal.svg?react';
export { default as IconBasketbal } from './basketbal.svg?react';

export { ReactComponent as IconGeneral } from './general.svg';
export { ReactComponent as IconGymzaal } from './gymzaal.svg';
export { ReactComponent as IconSportzaal } from './sportzaal.svg';
export { ReactComponent as IconSportpark } from './sportpark.svg';
export { ReactComponent as IconOverig } from './overig.svg';
export { ReactComponent as IconSkate } from './skate.svg';
export { ReactComponent as IconSportveld } from './sportveld.svg';
export { ReactComponent as IconSporthal } from './sporthal.svg';
export { ReactComponent as IconZwembad } from './zwemmen.svg';
export { ReactComponent as IconTafeltennis } from './tafeltennis.svg';
export { ReactComponent as IconJeuDeBoules } from './jeuDeBoules.svg';
export { ReactComponent as IconHardlopen } from './hardlopen.svg';
export { ReactComponent as IconPin } from './pin.svg';
export { ReactComponent as IconWior } from './wior2.svg';
export { ReactComponent as IconAfvalMelding } from './afval.svg';
export { ReactComponent as IconGroenWater } from './openbaar-groen-en-water.svg';
export { ReactComponent as IconOverlastBedrijven } from './overlast-bedrijven-en-horeca.svg';
export { ReactComponent as IconOverlastWater } from './overlast-op-water.svg';
export { ReactComponent as IconOverlastDieren } from './overlast-van-dieren.svg';
export { ReactComponent as IconCivieleConstructies } from './civiele-constructies.svg';
export { ReactComponent as IconMeldingen } from './meldingen.svg';
export { ReactComponent as IconSchoon } from './schoon.svg';
export { ReactComponent as IconOverlastOpenbareRuimte } from './overlast-in-de-openbare-ruimte.svg';
export { ReactComponent as IconWegenVerkeerStraatmeubilair } from './wegen-verkeer-straatmeubilair.svg';
export { ReactComponent as IconBread } from './bread.svg';
export { default as IconGeneral } from './general.svg?react';
export { default as IconGymzaal } from './gymzaal.svg?react';
export { default as IconSportzaal } from './sportzaal.svg?react';
export { default as IconSportpark } from './sportpark.svg?react';
export { default as IconOverig } from './overig.svg?react';
export { default as IconSkate } from './skate.svg?react';
export { default as IconSportveld } from './sportveld.svg?react';
export { default as IconSporthal } from './sporthal.svg?react';
export { default as IconZwembad } from './zwemmen.svg?react';
export { default as IconTafeltennis } from './tafeltennis.svg?react';
export { default as IconJeuDeBoules } from './jeuDeBoules.svg?react';
export { default as IconHardlopen } from './hardlopen.svg?react';
export { default as IconPin } from './pin.svg?react';
export { default as IconWior } from './wior2.svg?react';
export { default as IconAfvalMelding } from './afval.svg?react';
export { default as IconGroenWater } from './openbaar-groen-en-water.svg?react';
export { default as IconOverlastBedrijven } from './overlast-bedrijven-en-horeca.svg?react';
export { default as IconOverlastWater } from './overlast-op-water.svg?react';
export { default as IconOverlastDieren } from './overlast-van-dieren.svg?react';
export { default as IconCivieleConstructies } from './civiele-constructies.svg?react';
export { default as IconMeldingen } from './meldingen.svg?react';
export { default as IconSchoon } from './schoon.svg?react';
export { default as IconOverlastOpenbareRuimte } from './overlast-in-de-openbare-ruimte.svg?react';
export { default as IconWegenVerkeerStraatmeubilair } from './wegen-verkeer-straatmeubilair.svg?react';
export { default as IconBread } from './bread.svg?react';
2 changes: 1 addition & 1 deletion src/client/components/Button/Button.test.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { render, screen } from '@testing-library/react';
import { BrowserRouter } from 'react-router-dom';
import { ReactComponent as IconComponent } from '../../assets/icons/Alert.svg';
import { default as IconComponent } from '../../assets/icons/Alert.svg?react';
import Linkd from './Button';

describe('Linkd', () => {
Expand Down
4 changes: 2 additions & 2 deletions src/client/components/MainHeader/MainHeader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import classnames from 'classnames';
import { useMemo } from 'react';
import { Link, useLocation } from 'react-router-dom';
import { AppRoutes, OTAP_ENV } from '../../../universal/config';
import { ReactComponent as AmsterdamLogoLarge } from '../../assets/images/logo-amsterdam-large.svg';
import { ReactComponent as AmsterdamLogo } from '../../assets/images/logo-amsterdam.svg';
import AmsterdamLogoLarge from '../../assets/images/logo-amsterdam-large.svg?react';
import AmsterdamLogo from '../../assets/images/logo-amsterdam.svg?react';
import { getApiErrors } from '../../config/api';
import { useDesktopScreen, usePhoneScreen } from '../../hooks/media.hook';
import { useAppStateGetter } from '../../hooks/useAppState';
Expand Down
9 changes: 4 additions & 5 deletions src/client/components/MainNavBar/MainNavBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import { ChapterTitles } from '../../../universal/config/chapter';
import { isError } from '../../../universal/helpers/api';
import { ComponentChildren } from '../../../universal/types';
import { IconClose, IconSearch } from '../../assets/icons';
// @ts-expect-error
import { ReactComponent as AmsterdamLogo } from '../../assets/images/logo-amsterdam.svg';
import AmsterdamLogo from '../../assets/images/logo-amsterdam.svg?react';
import { isUiElementVisible } from '../../config/app';
import { ChapterIcons } from '../../config/chapterIcons';
import { useDesktopScreen, useTabletScreen } from '../../hooks/media.hook';
import { useAppStateGetter } from '../../hooks/useAppState';
Expand All @@ -18,23 +18,22 @@ import { useProfileTypeValue } from '../../hooks/useProfileType';
import { useTermReplacement } from '../../hooks/useTermReplacement';
import { IconButton } from '../Button/Button';
import FontEnlarger from '../FontEnlarger/FontEnlarger';
import LogoutLink from './LogoutLink';
import MainNavSubmenu, {
MainNavSubmenuLink,
} from '../MainNavSubmenu/MainNavSubmenu';
import { Search } from '../Search/Search';
import { SearchEntry } from '../Search/searchConfig';
import { useSearchOnPage } from '../Search/useSearch';
import LogoutLink from './LogoutLink';
import {
MenuItem,
isMenuItemVisible,
mainMenuItemId,
mainMenuItems,
MenuItem,
} from './MainNavBar.constants';
import styles from './MainNavBar.module.scss';
import { ProfileName } from './ProfileName';
import { useBurgerMenuAnimation } from './useBurgerMenuAnimation';
import { isUiElementVisible } from '../../config/app';

const BurgerMenuToggleBtnId = 'BurgerMenuToggleBtn';
const LinkContainerId = 'MainMenu';
Expand Down
2 changes: 1 addition & 1 deletion src/client/components/MainNavBar/MainNavBarSimple.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ReactComponent as AmsterdamLogo } from '../../assets/images/logo-amsterdam.svg';
import { default as AmsterdamLogo } from '../../assets/images/logo-amsterdam.svg?react';
import { SecondaryLinks } from './MainNavBar';
import styles from './MainNavBar.module.scss';

Expand Down
4 changes: 2 additions & 2 deletions src/client/pages/ApplicationError/ApplicationError.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ import classNames from 'classnames';
import { useState } from 'react';
import type { FallbackProps } from 'react-error-boundary';
import { AppRoutes, ExternalUrls } from '../../../universal/config';
import { ReactComponent as AmsterdamLogoLarge } from '../../assets/images/logo-amsterdam-large.svg';
import { ReactComponent as AmsterdamLogo } from '../../assets/images/logo-amsterdam.svg';
import AmsterdamLogoLarge from '../../assets/images/logo-amsterdam-large.svg?react';
import AmsterdamLogo from '../../assets/images/logo-amsterdam.svg?react';
import { LinkdInline } from '../../components';
import footerStyles from '../../components/MainFooter/MainFooter.module.scss';
import { PageContent, TextPage } from '../../components/Page/Page';
Expand Down
2 changes: 1 addition & 1 deletion src/client/pages/Landing/LandingYivi.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
import { LOGIN_URL_YIVI } from '../../config/api';
import { FeatureToggle } from '../../../universal/config';
import styles from './Landing.module.scss';
import { ReactComponent as YiviLogo } from './yivi-logo.svg';
import { default as YiviLogo } from './yivi-logo.svg?react';

export default function Landing() {
const loginButton = useRef(null);
Expand Down
Loading

0 comments on commit 161c782

Please sign in to comment.