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.

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

Dependency cleanup and updates #912

Merged
merged 44 commits into from
Jan 17, 2022
Merged

Dependency cleanup and updates #912

merged 44 commits into from
Jan 17, 2022

Conversation

cafca
Copy link
Collaborator

@cafca cafca commented Dec 2, 2021

Remove unused dependencies, upgrade to Webpack 5 and solve numerous problems
surfacing because of that.

Todo

  • Webpack Dev Server works
  • Build works
  • Fix unit tests
  • Fix Cypress tests

Checklist:

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works

@codecov
Copy link

codecov bot commented Dec 15, 2021

Codecov Report

Merging #912 (676f73b) into develop (767cca4) will decrease coverage by 1.10%.
The diff coverage is 41.02%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop     #912      +/-   ##
===========================================
- Coverage    37.16%   36.06%   -1.11%     
===========================================
  Files          458      458              
  Lines         9321     9112     -209     
  Branches      2501     2017     -484     
===========================================
- Hits          3464     3286     -178     
+ Misses        5551     5376     -175     
- Partials       306      450     +144     
Flag Coverage Δ
unittests 36.06% <41.02%> (-1.11%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
src/App.tsx 0.00% <0.00%> (ø)
src/apps/Gastro/components/FileUpload.tsx 75.00% <ø> (-3.58%) ⬇️
...apps/Gastro/components/RegistrationForm/Direct.tsx 0.00% <ø> (ø)
...components/RegistrationForm/SectionCertificate.tsx 0.00% <0.00%> (ø)
...stro/components/RegistrationForm/SectionNotice.tsx 0.00% <0.00%> (ø)
.../apps/Gastro/components/RegistrationForm/index.tsx 0.00% <ø> (ø)
src/apps/Gastro/components/SignupForm/index.tsx 0.00% <ø> (ø)
src/apps/Gastro/components/ThanksRegistration.tsx 0.00% <0.00%> (ø)
src/apps/Gastro/pages/EventApplication.tsx 0.00% <0.00%> (ø)
src/apps/Gastro/pages/Events/Application.tsx 0.00% <0.00%> (ø)
... and 260 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 767cca4...676f73b. Read the comment docs.

@ohrie ohrie added the dependencies Topics regarding dependency files / updates label Jan 13, 2022
.browserslistrc Show resolved Hide resolved
.eslintrc Outdated
@@ -86,6 +94,13 @@
"react/destructuring-assignment": 0,
"react/jsx-props-no-spreading": 0,

// TODO: Turn this on and decide on a rule
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is something that @ohrie and @tordans could make a decision on

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am for this option.
Specifically I would prefer this scheme for default exports:

const ComponentA = (props) => {
  return <div>{props.header}</div>;
};

export default ComponentA;

How about you, @tordans ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ohrie in https://github.com/FixMyBerlin/fixmy.rsv/blob/develop/.eslintrc#L105-L110 I set it up to use arrow-function. The only place I found where the other function style is convenient was with export default function Name() {} where the default export does not require an extra line (at the end of the file). But for typescript the arrows are a lot easier (or the only way?), so I move everything to arrows in fixmy.rsv.


PS: I would also prefer the string-style reporting levels over the numbers, which IMO are very abstract, see https://github.com/FixMyBerlin/fixmy.rsv/blob/develop/.eslintrc#L27.

@cafca cafca marked this pull request as ready for review January 13, 2022 14:47
@ohrie
Copy link
Contributor

ohrie commented Jan 17, 2022

Thank you again for this huge update @cafca !
I've tested it on my machine, and it's running also flawlessly.
After we've decided on https://github.com/FixMyBerlin/fixmy.frontend/pull/912/files/143fe21a799af88cf8f5f0c9bf52829ed61fd460#r784009315 I'm looking forward to merge this.

@ohrie ohrie merged commit 3f19aed into develop Jan 17, 2022
@ohrie ohrie deleted the dep-cleanup branch January 17, 2022 09:07
@ohrie
Copy link
Contributor

ohrie commented Jan 17, 2022

@cafca Did the cypress tests work on your machine?
On CI and my machine they fail. I get this error:
cypress-io/cypress#18435

I did try the suggested solutions, but neither worked for me.

I've tried to dig deep into it with DEBUG=cypress:webpack npx cypress open but didn't found anything problematic.

@ohrie ohrie mentioned this pull request Jan 18, 2022
@ohrie ohrie mentioned this pull request Jan 26, 2022
5 tasks
ohrie added a commit that referenced this pull request Feb 10, 2022
* Remove querystring dependencies (#925)

* Remove query-string dependecy

* Remove qs dependency and replace with URLSearchParams

* Remove obsolet implicit boolean conversion

* Add hover support for clickable features for 'plaungen'& 'zustand' | Ref #929

* Rename BMVI to BMDV (#935)

* Rename BMVI to BMDV

Add SVG editions of new Logo

* Replace SVG Logo through PNG BMDV

* Dependency cleanup and updates (#912)

* Remove unused babel plugins

* Remove unused packages

* Update NodeJS types

* Update package-lock

* Update and fix storybook

Dependency @material-ui/styles was missing

* Add ts-expect-error

* Update dev tools

* Migrate webpack config

* Migrate eslint config

* Linter error fixes

* Linter warning fixes

* Remove common-tags

* Fix browserslist

* Remove ads during npm install

* Update manifest background color

* Update webpack and other devtools + config

* Disable ts error

* Update eslint

* Don't require babel config file

* Comment oiut empty transform ignore patterns

* Fix unit tests

* Update linter

* Update core-js version for babel/preset-env

* Try running linter directly

* Remove unused dep

* Remove unused function

* Apply linter fixes

* Dep updates

* Fix incompatible dependencies

* Remove custom Jest tsconfig

(which caused errors during test runs)

* Re-enable Eslint cache

* Update react-markdown syntax

* Fix reselect type

* Fix getCenterFromGeom for point geometries

* Remove buggy report edit button

* Transpile Typescript only in dev server

* Apply linter fixes

* Remove dead code

* Apply linter fixes

* Update jest.config.js

Extend the help comment based on https://github.com/FixMyBerlin/fixmy.frontend/pull/912/files/143fe21a799af88cf8f5f0c9bf52829ed61fd460#r784012274

* Turn on function component eslint rule with arrow functions

Co-authored-by: Tobias <[email protected]>
Co-authored-by: Henri <[email protected]>

* Disable Cypress integration tests for now

Cypress tests are not working after upgrading to webpack 5

Reenable after bug is fixed by Cypress.

See cypress-io/cypress#18435

* Docs comments lint small fixes (#951)

* Readme: Add link to todenv

* Gastro: Re-activate the gastro app on staging for testing

* Map: Add comment about release-system

* Remove false empty space in URL

* CSS: Fix Links styles

- white space none was overwritten to pre-wrap below.
- padding none is invalid, should be 0.

* Comment breakpoints

* Document Dotenv

* Update mui-utils.ts

```
createTheme.js?2bfd:94 Material-UI: the createMuiTheme function was renamed to createTheme.

You should use `import { createTheme } from '@material-ui/core/styles'
`
``

* Remove popupbikelanes map and route (#952)

* Remove and redirect /popupbikelanes Map

Those are part of the regular planning view, now.

* Remove /popupbikelanes Routes

* Add `.editorconfig` and `.vscode` files (#947)

* Add `.editorconfig` and `.vscode` files

Start streamlining editor settings.

* Add styled component recommended extension

* .vscode/settings: Remove organizeImports

This does not work great. It deletes imports too early, eg when there is an error in your code formatting or a snipped is commented out for testing. We have to do this manually per file, for now.

Co-authored-by: Henri <[email protected]>

* eslint config: Remove import order rules (#950)

I suggest we remove this rule and instead rely on VS Codes "Organize Imports" which can be done on save https://eshlox.net/2019/12/02/vscode-automatically-organize-typescript-imports/

* Xhain: Fix last name & update official status (#949)

"HerRmann"

She is no longer the mayor of Friedrichshain-Kreuzberg and uses "Ex-" in front of her former job title for herself now (Eg. Twitter).

* Improve mouse hover map (#936)

* Integrate improvements for map events for hovering by @tordans

* Add pointer cursor for marker images

* Refactor registerMouseHoverHandler

Co-authored-by: Tobias <[email protected]>

* HBI: Add WelcomeModal, update HBI-FAQ (#946)

* Use Link component for FAQ

Which styles them is the right way.

* Update FAQ with content about current HBI

* WebglMap: Extract map/indexView into Component state

* Introduce WelcomModal on WebglMap

Use URL schema `/zustand?lat=50.1&lng=10&zoom=10` to set the map, which is a hidden feature.

* Extract ModalCloseIcon into Component

* WelcomeModal: Fix `aria-*` attributes

- Document aria-controls
- Fix cut off border in SVG with overflow styles; also css width is better than attribute width
- Add Modal-aria-attributes

* Remove 'beta' from Logo

* HBI: Refactor WelcomeModal, Fix Links in Modal, Fix Overlay-Layer visibility (#954)

* WelcomeModal: Extract styles in separate file

* WelcomeModal: Split Components, Fix Column2 Center/Zoom

- Center/Zoom for Column2 does not reload the page anymore, so the closed-State of the modal is preserved.
- Column1 still has a reload, though. But this is less annoying.
- Columns are split into Components to keep the Modal Component small.

* Map: Bugfix: Overlay layers where not filtered properly

Fixes #934

* Upgrade to styled-components v5 (#961)

* Fix loading images from Markdown pages (#964)

* Fix loading images from Markdown pages

* Upgrade react-markdown to 8.0.0

* Readd require.context for images, so image is available in build

* Bump node-fetch from 2.6.6 to 2.6.7 (#962)

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add search icon to search bar (#955)

* Add search icon to search bar

* Reverse if logic

* Resolve PR threads -> SearchIcon

* Use SVG as inline component and not background-image

* Upgrade msw to 0.36.7 (#965)

* Update version to 1.1.0

* Add map legend hbi (#960)

* Add first static MapLegend for accidents & cadastre

* Add individual legend components

* Map Legend toggle working with button

* Add Link & Hint to Legend

* Add correct Incidient legend items with POints

* Fix styling for bottom link/text in MapLegend

* Fixed different Header style in Flexbox

* Fix linter issues

* Use React hooks as imported functions

The pattern I suggest is, to import React hook `React.use*` directly. But use `React.FC` and such when using React-Types.

* Create Component ModalCloseIcon

Move the local component to be a full component in our components2 folder.
Use it for the Kataster legend.

This fixes an issue, that the border lines of the close-icon are cut off.

* Fix fill color for Kataster legend

The gray of the outline was lighter than the gray of the location icon below due to this svg filter stuff.

* Horizontal navigation bar (#953)

* Rename MapLegend to MapSelectorBar & rudimentary Selector Bar functionality

Reduce misunderstandings

* Fix margin in MapSelectorBar in default mode

* Docs comments lint small fixes (#951)

* Readme: Add link to todenv

* Gastro: Re-activate the gastro app on staging for testing

* Map: Add comment about release-system

* Remove false empty space in URL

* CSS: Fix Links styles

- white space none was overwritten to pre-wrap below.
- padding none is invalid, should be 0.

* Comment breakpoints

* Document Dotenv

* Update mui-utils.ts

```
createTheme.js?2bfd:94 Material-UI: the createMuiTheme function was renamed to createTheme.

You should use `import { createTheme } from '@material-ui/core/styles'
`
``

* Remove popupbikelanes map and route (#952)

* Remove and redirect /popupbikelanes Map

Those are part of the regular planning view, now.

* Remove /popupbikelanes Routes

* Add `.editorconfig` and `.vscode` files (#947)

* Add `.editorconfig` and `.vscode` files

Start streamlining editor settings.

* Add styled component recommended extension

* .vscode/settings: Remove organizeImports

This does not work great. It deletes imports too early, eg when there is an error in your code formatting or a snipped is commented out for testing. We have to do this manually per file, for now.

Co-authored-by: Henri <[email protected]>

* eslint config: Remove import order rules (#950)

I suggest we remove this rule and instead rely on VS Codes "Organize Imports" which can be done on save https://eshlox.net/2019/12/02/vscode-automatically-organize-typescript-imports/

* Xhain: Fix last name & update official status (#949)

"HerRmann"

She is no longer the mayor of Friedrichshain-Kreuzberg and uses "Ex-" in front of her former job title for herself now (Eg. Twitter).

* Improve mouse hover map (#936)

* Integrate improvements for map events for hovering by @tordans

* Add pointer cursor for marker images

* Refactor registerMouseHoverHandler

Co-authored-by: Tobias <[email protected]>

* HBI: Add WelcomeModal, update HBI-FAQ (#946)

* Use Link component for FAQ

Which styles them is the right way.

* Update FAQ with content about current HBI

* WebglMap: Extract map/indexView into Component state

* Introduce WelcomModal on WebglMap

Use URL schema `/zustand?lat=50.1&lng=10&zoom=10` to set the map, which is a hidden feature.

* Extract ModalCloseIcon into Component

* WelcomeModal: Fix `aria-*` attributes

- Document aria-controls
- Fix cut off border in SVG with overflow styles; also css width is better than attribute width
- Add Modal-aria-attributes

* Remove 'beta' from Logo

* Improve MapSelectorBar & SVG file using new alignment system

Now the MapSelectorBar is perfectly horizontal on Desktop and vertical on mobile

* Fix MapSelectorBar for embed mode

* Fix prettier warnings.

* Disable MapLegend for now

* Improve SVG sizes for braces

* Resolve obsolete display: block

* Remove test for MapLegend

* Fix problems mentioned in PR

* HBI: Refactor WelcomeModal, Fix Links in Modal, Fix Overlay-Layer visibility (#954)

* WelcomeModal: Extract styles in separate file

* WelcomeModal: Split Components, Fix Column2 Center/Zoom

- Center/Zoom for Column2 does not reload the page anymore, so the closed-State of the modal is preserved.
- Column1 still has a reload, though. But this is less annoying.
- Columns are split into Components to keep the Modal Component small.

* Map: Bugfix: Overlay layers where not filtered properly

Fixes #934

* Add individual legend components

* Map Legend toggle working with button

* Add Link & Hint to Legend

* Add correct Incidient legend items with POints

* Fix styling for bottom link/text in MapLegend

* Fixed different Header style in Flexbox

* Fix linter issues

* Upgrade to styled-components v5 (#961)

* Use React hooks as imported functions

The pattern I suggest is, to import React hook `React.use*` directly. But use `React.FC` and such when using React-Types.

* Create Component ModalCloseIcon

Move the local component to be a full component in our components2 folder.
Use it for the Kataster legend.

This fixes an issue, that the border lines of the close-icon are cut off.

* Fix fill color for Kataster legend

The gray of the outline was lighter than the gray of the location icon below due to this svg filter stuff.

* Set fixed width for MapSwitchWrapper

* Readd MapLegend to correspond to target branch

* Rename MapLegend to MapSelectorBar & rudimentary Selector Bar functionality

Reduce misunderstandings

* Fix margin in MapSelectorBar in default mode

* Improve MapSelectorBar & SVG file using new alignment system

Now the MapSelectorBar is perfectly horizontal on Desktop and vertical on mobile

* Fix MapSelectorBar for embed mode

* Fix prettier warnings.

* Improve SVG sizes for braces

* Resolve obsolete display: block

* Fix problems mentioned in PR

* Set fixed width for MapSwitchWrapper

Co-authored-by: Tobias <[email protected]>
Co-authored-by: Niklas S <[email protected]>

* Improve imports & exports through barrel file

* Improve handling of props and their types

* Map Legend button toggles Legend now

* Moved MapLegend component to legacy components/ folder

Moved images & icons into assets folder

* Fix maplegend color

* Improved spacings of headlines

* Remove StyledCloseIcon & fix z-index failure for WelcomeModal

* Fix more z-index issues & fix mobile view width

Close Icon was not visible on small device

* Fix position of points in legend

* Improve lengths for Legend

Co-authored-by: Tobias <[email protected]>
Co-authored-by: Niklas S <[email protected]>

* Fix Legend height on mobile

* Remove storybook dependencies

* Disable storybook -> temporarily disable Lint issues

* Implement fixes and improvements for HBI 2.0

Squashed commit of the following:

commit acad9b845194a9c66967138b2e0624dc45d2948e
Merge: beaa887c f7d9577
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:49:12 2022 +0100

    Merge branch 'develop' into improve-hbi-refresh

commit beaa887c1ad4dd1a505e1d874e5e19f8efb53478
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:48:34 2022 +0100

    Update npm packages (lock file)

commit f739cfb
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:43:09 2022 +0100

    Fix test config in package.json again

commit 58b3dcb
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:38:17 2022 +0100

    Fix tests for HBI interpolation zoom

commit f66b6dc
Author: Henri <[email protected]>
Date:   Wed Feb 9 11:19:14 2022 +0100

    Improve Mail in WelcomeModal using AnchorLink component

commit f1c8603
Author: Henri <[email protected]>
Date:   Wed Feb 9 11:18:50 2022 +0100

    Fix Close Icon & on focus

    xlink:href is deprecated: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href

commit 533e613
Author: Henri <[email protected]>
Date:   Wed Feb 9 10:53:37 2022 +0100

    Optimize maplegend icon activated in size

commit 578a4e0
Author: Henri <[email protected]>
Date:   Wed Feb 9 10:40:13 2022 +0100

    Fix planning filters for changing visibility of tracks

commit dba8bb7
Author: Henri <[email protected]>
Date:   Tue Feb 8 11:49:04 2022 +0100

    Fix visibility of layers on high zoom / adapt to Mapbox Studio style

commit f352018
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:51:47 2022 +0100

    Add active state of map legend icon

commit 15671c7
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:44:43 2022 +0100

    Hide Legend Close Icon on Desktop

commit a5b03f0
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:33:22 2022 +0100

    Bump up required npm version because of changed lock file version in npm@8

commit e77533b
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:31:41 2022 +0100

    Fix text in WelcomModale

* Fix mapbox style url property key issue

The mapbox style urls have been passed through property called "style", which is defined by react for CSS styling. Therefore the string was incorrectly transformed into an object

Changing this to a more specific property key, this resolves the issue.

Co-authored-by: Vincent Ahrend <[email protected]>
Co-authored-by: Tobias <[email protected]>
Co-authored-by: Niklas S <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
ohrie added a commit that referenced this pull request Feb 16, 2022
* Remove querystring dependencies (#925)

* Remove query-string dependecy

* Remove qs dependency and replace with URLSearchParams

* Remove obsolet implicit boolean conversion

* Add hover support for clickable features for 'plaungen'& 'zustand' | Ref #929

* Rename BMVI to BMDV (#935)

* Rename BMVI to BMDV

Add SVG editions of new Logo

* Replace SVG Logo through PNG BMDV

* Dependency cleanup and updates (#912)

* Remove unused babel plugins

* Remove unused packages

* Update NodeJS types

* Update package-lock

* Update and fix storybook

Dependency @material-ui/styles was missing

* Add ts-expect-error

* Update dev tools

* Migrate webpack config

* Migrate eslint config

* Linter error fixes

* Linter warning fixes

* Remove common-tags

* Fix browserslist

* Remove ads during npm install

* Update manifest background color

* Update webpack and other devtools + config

* Disable ts error

* Update eslint

* Don't require babel config file

* Comment oiut empty transform ignore patterns

* Fix unit tests

* Update linter

* Update core-js version for babel/preset-env

* Try running linter directly

* Remove unused dep

* Remove unused function

* Apply linter fixes

* Dep updates

* Fix incompatible dependencies

* Remove custom Jest tsconfig

(which caused errors during test runs)

* Re-enable Eslint cache

* Update react-markdown syntax

* Fix reselect type

* Fix getCenterFromGeom for point geometries

* Remove buggy report edit button

* Transpile Typescript only in dev server

* Apply linter fixes

* Remove dead code

* Apply linter fixes

* Update jest.config.js

Extend the help comment based on https://github.com/FixMyBerlin/fixmy.frontend/pull/912/files/143fe21a799af88cf8f5f0c9bf52829ed61fd460#r784012274

* Turn on function component eslint rule with arrow functions

Co-authored-by: Tobias <[email protected]>
Co-authored-by: Henri <[email protected]>

* Disable Cypress integration tests for now

Cypress tests are not working after upgrading to webpack 5

Reenable after bug is fixed by Cypress.

See cypress-io/cypress#18435

* Docs comments lint small fixes (#951)

* Readme: Add link to todenv

* Gastro: Re-activate the gastro app on staging for testing

* Map: Add comment about release-system

* Remove false empty space in URL

* CSS: Fix Links styles

- white space none was overwritten to pre-wrap below.
- padding none is invalid, should be 0.

* Comment breakpoints

* Document Dotenv

* Update mui-utils.ts

```
createTheme.js?2bfd:94 Material-UI: the createMuiTheme function was renamed to createTheme.

You should use `import { createTheme } from '@material-ui/core/styles'
`
``

* Remove popupbikelanes map and route (#952)

* Remove and redirect /popupbikelanes Map

Those are part of the regular planning view, now.

* Remove /popupbikelanes Routes

* Add `.editorconfig` and `.vscode` files (#947)

* Add `.editorconfig` and `.vscode` files

Start streamlining editor settings.

* Add styled component recommended extension

* .vscode/settings: Remove organizeImports

This does not work great. It deletes imports too early, eg when there is an error in your code formatting or a snipped is commented out for testing. We have to do this manually per file, for now.

Co-authored-by: Henri <[email protected]>

* eslint config: Remove import order rules (#950)

I suggest we remove this rule and instead rely on VS Codes "Organize Imports" which can be done on save https://eshlox.net/2019/12/02/vscode-automatically-organize-typescript-imports/

* Xhain: Fix last name & update official status (#949)

"HerRmann"

She is no longer the mayor of Friedrichshain-Kreuzberg and uses "Ex-" in front of her former job title for herself now (Eg. Twitter).

* Improve mouse hover map (#936)

* Integrate improvements for map events for hovering by @tordans

* Add pointer cursor for marker images

* Refactor registerMouseHoverHandler

Co-authored-by: Tobias <[email protected]>

* HBI: Add WelcomeModal, update HBI-FAQ (#946)

* Use Link component for FAQ

Which styles them is the right way.

* Update FAQ with content about current HBI

* WebglMap: Extract map/indexView into Component state

* Introduce WelcomModal on WebglMap

Use URL schema `/zustand?lat=50.1&lng=10&zoom=10` to set the map, which is a hidden feature.

* Extract ModalCloseIcon into Component

* WelcomeModal: Fix `aria-*` attributes

- Document aria-controls
- Fix cut off border in SVG with overflow styles; also css width is better than attribute width
- Add Modal-aria-attributes

* Remove 'beta' from Logo

* HBI: Refactor WelcomeModal, Fix Links in Modal, Fix Overlay-Layer visibility (#954)

* WelcomeModal: Extract styles in separate file

* WelcomeModal: Split Components, Fix Column2 Center/Zoom

- Center/Zoom for Column2 does not reload the page anymore, so the closed-State of the modal is preserved.
- Column1 still has a reload, though. But this is less annoying.
- Columns are split into Components to keep the Modal Component small.

* Map: Bugfix: Overlay layers where not filtered properly

Fixes #934

* Upgrade to styled-components v5 (#961)

* Fix loading images from Markdown pages (#964)

* Fix loading images from Markdown pages

* Upgrade react-markdown to 8.0.0

* Readd require.context for images, so image is available in build

* Bump node-fetch from 2.6.6 to 2.6.7 (#962)

Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.6 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](node-fetch/node-fetch@v2.6.6...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Add search icon to search bar (#955)

* Add search icon to search bar

* Reverse if logic

* Resolve PR threads -> SearchIcon

* Use SVG as inline component and not background-image

* Upgrade msw to 0.36.7 (#965)

* Update version to 1.1.0

* Add map legend hbi (#960)

* Add first static MapLegend for accidents & cadastre

* Add individual legend components

* Map Legend toggle working with button

* Add Link & Hint to Legend

* Add correct Incidient legend items with POints

* Fix styling for bottom link/text in MapLegend

* Fixed different Header style in Flexbox

* Fix linter issues

* Use React hooks as imported functions

The pattern I suggest is, to import React hook `React.use*` directly. But use `React.FC` and such when using React-Types.

* Create Component ModalCloseIcon

Move the local component to be a full component in our components2 folder.
Use it for the Kataster legend.

This fixes an issue, that the border lines of the close-icon are cut off.

* Fix fill color for Kataster legend

The gray of the outline was lighter than the gray of the location icon below due to this svg filter stuff.

* Horizontal navigation bar (#953)

* Rename MapLegend to MapSelectorBar & rudimentary Selector Bar functionality

Reduce misunderstandings

* Fix margin in MapSelectorBar in default mode

* Docs comments lint small fixes (#951)

* Readme: Add link to todenv

* Gastro: Re-activate the gastro app on staging for testing

* Map: Add comment about release-system

* Remove false empty space in URL

* CSS: Fix Links styles

- white space none was overwritten to pre-wrap below.
- padding none is invalid, should be 0.

* Comment breakpoints

* Document Dotenv

* Update mui-utils.ts

```
createTheme.js?2bfd:94 Material-UI: the createMuiTheme function was renamed to createTheme.

You should use `import { createTheme } from '@material-ui/core/styles'
`
``

* Remove popupbikelanes map and route (#952)

* Remove and redirect /popupbikelanes Map

Those are part of the regular planning view, now.

* Remove /popupbikelanes Routes

* Add `.editorconfig` and `.vscode` files (#947)

* Add `.editorconfig` and `.vscode` files

Start streamlining editor settings.

* Add styled component recommended extension

* .vscode/settings: Remove organizeImports

This does not work great. It deletes imports too early, eg when there is an error in your code formatting or a snipped is commented out for testing. We have to do this manually per file, for now.

Co-authored-by: Henri <[email protected]>

* eslint config: Remove import order rules (#950)

I suggest we remove this rule and instead rely on VS Codes "Organize Imports" which can be done on save https://eshlox.net/2019/12/02/vscode-automatically-organize-typescript-imports/

* Xhain: Fix last name & update official status (#949)

"HerRmann"

She is no longer the mayor of Friedrichshain-Kreuzberg and uses "Ex-" in front of her former job title for herself now (Eg. Twitter).

* Improve mouse hover map (#936)

* Integrate improvements for map events for hovering by @tordans

* Add pointer cursor for marker images

* Refactor registerMouseHoverHandler

Co-authored-by: Tobias <[email protected]>

* HBI: Add WelcomeModal, update HBI-FAQ (#946)

* Use Link component for FAQ

Which styles them is the right way.

* Update FAQ with content about current HBI

* WebglMap: Extract map/indexView into Component state

* Introduce WelcomModal on WebglMap

Use URL schema `/zustand?lat=50.1&lng=10&zoom=10` to set the map, which is a hidden feature.

* Extract ModalCloseIcon into Component

* WelcomeModal: Fix `aria-*` attributes

- Document aria-controls
- Fix cut off border in SVG with overflow styles; also css width is better than attribute width
- Add Modal-aria-attributes

* Remove 'beta' from Logo

* Improve MapSelectorBar & SVG file using new alignment system

Now the MapSelectorBar is perfectly horizontal on Desktop and vertical on mobile

* Fix MapSelectorBar for embed mode

* Fix prettier warnings.

* Disable MapLegend for now

* Improve SVG sizes for braces

* Resolve obsolete display: block

* Remove test for MapLegend

* Fix problems mentioned in PR

* HBI: Refactor WelcomeModal, Fix Links in Modal, Fix Overlay-Layer visibility (#954)

* WelcomeModal: Extract styles in separate file

* WelcomeModal: Split Components, Fix Column2 Center/Zoom

- Center/Zoom for Column2 does not reload the page anymore, so the closed-State of the modal is preserved.
- Column1 still has a reload, though. But this is less annoying.
- Columns are split into Components to keep the Modal Component small.

* Map: Bugfix: Overlay layers where not filtered properly

Fixes #934

* Add individual legend components

* Map Legend toggle working with button

* Add Link & Hint to Legend

* Add correct Incidient legend items with POints

* Fix styling for bottom link/text in MapLegend

* Fixed different Header style in Flexbox

* Fix linter issues

* Upgrade to styled-components v5 (#961)

* Use React hooks as imported functions

The pattern I suggest is, to import React hook `React.use*` directly. But use `React.FC` and such when using React-Types.

* Create Component ModalCloseIcon

Move the local component to be a full component in our components2 folder.
Use it for the Kataster legend.

This fixes an issue, that the border lines of the close-icon are cut off.

* Fix fill color for Kataster legend

The gray of the outline was lighter than the gray of the location icon below due to this svg filter stuff.

* Set fixed width for MapSwitchWrapper

* Readd MapLegend to correspond to target branch

* Rename MapLegend to MapSelectorBar & rudimentary Selector Bar functionality

Reduce misunderstandings

* Fix margin in MapSelectorBar in default mode

* Improve MapSelectorBar & SVG file using new alignment system

Now the MapSelectorBar is perfectly horizontal on Desktop and vertical on mobile

* Fix MapSelectorBar for embed mode

* Fix prettier warnings.

* Improve SVG sizes for braces

* Resolve obsolete display: block

* Fix problems mentioned in PR

* Set fixed width for MapSwitchWrapper

Co-authored-by: Tobias <[email protected]>
Co-authored-by: Niklas S <[email protected]>

* Improve imports & exports through barrel file

* Improve handling of props and their types

* Map Legend button toggles Legend now

* Moved MapLegend component to legacy components/ folder

Moved images & icons into assets folder

* Fix maplegend color

* Improved spacings of headlines

* Remove StyledCloseIcon & fix z-index failure for WelcomeModal

* Fix more z-index issues & fix mobile view width

Close Icon was not visible on small device

* Fix position of points in legend

* Improve lengths for Legend

Co-authored-by: Tobias <[email protected]>
Co-authored-by: Niklas S <[email protected]>

* Fix Legend height on mobile

* Remove storybook dependencies

* Disable storybook -> temporarily disable Lint issues

* Implement fixes and improvements for HBI 2.0

Squashed commit of the following:

commit acad9b845194a9c66967138b2e0624dc45d2948e
Merge: beaa887c f7d9577
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:49:12 2022 +0100

    Merge branch 'develop' into improve-hbi-refresh

commit beaa887c1ad4dd1a505e1d874e5e19f8efb53478
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:48:34 2022 +0100

    Update npm packages (lock file)

commit f739cfb
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:43:09 2022 +0100

    Fix test config in package.json again

commit 58b3dcb
Author: Henri <[email protected]>
Date:   Thu Feb 10 11:38:17 2022 +0100

    Fix tests for HBI interpolation zoom

commit f66b6dc
Author: Henri <[email protected]>
Date:   Wed Feb 9 11:19:14 2022 +0100

    Improve Mail in WelcomeModal using AnchorLink component

commit f1c8603
Author: Henri <[email protected]>
Date:   Wed Feb 9 11:18:50 2022 +0100

    Fix Close Icon & on focus

    xlink:href is deprecated: https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/xlink:href

commit 533e613
Author: Henri <[email protected]>
Date:   Wed Feb 9 10:53:37 2022 +0100

    Optimize maplegend icon activated in size

commit 578a4e0
Author: Henri <[email protected]>
Date:   Wed Feb 9 10:40:13 2022 +0100

    Fix planning filters for changing visibility of tracks

commit dba8bb7
Author: Henri <[email protected]>
Date:   Tue Feb 8 11:49:04 2022 +0100

    Fix visibility of layers on high zoom / adapt to Mapbox Studio style

commit f352018
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:51:47 2022 +0100

    Add active state of map legend icon

commit 15671c7
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:44:43 2022 +0100

    Hide Legend Close Icon on Desktop

commit a5b03f0
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:33:22 2022 +0100

    Bump up required npm version because of changed lock file version in npm@8

commit e77533b
Author: Henri <[email protected]>
Date:   Mon Feb 7 09:31:41 2022 +0100

    Fix text in WelcomModale

* Fix mapbox style url property key issue

The mapbox style urls have been passed through property called "style", which is defined by react for CSS styling. Therefore the string was incorrectly transformed into an object

Changing this to a more specific property key, this resolves the issue.

* Hotfix search icon map

* Fix padding for Button wrapper in WelcomeModal

* Add HBI intersection data to Press page (#973)

* Fix padding for Button wrapper in WelcomeModal

* Add HBI intersection data to Press page

* Add license & sources for hbi data

Co-authored-by: Vincent Ahrend <[email protected]>
Co-authored-by: Tobias <[email protected]>
Co-authored-by: Niklas S <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
dependencies Topics regarding dependency files / updates
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants