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

Merge develop -> main #49

Merged
merged 40 commits into from
Jul 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
30475e4
Feature/scts 2 pointer marker (#11)
thomasm0 May 23, 2024
89fa847
Polyline layer example with docs and test (#22)
thomasm0 May 29, 2024
077a86c
WMSLayer example, test and docs (#23)
thomasm0 May 29, 2024
974953e
PolygonLayer in React
SireeKoolenWijkstra May 22, 2024
0a32724
Resolve random storybook Failed to fetch dynamically imported module …
thomasm0 Jun 4, 2024
19236e7
pass data directly to Polygon component since it already has the righ…
SireeKoolenWijkstra Jun 4, 2024
056bd68
[3] Polygon marker (#21)
thomasm0 Jun 5, 2024
6bada74
Merge pull request #24 from Amsterdam/feat/SCTS-30_polygon_marker_rea…
SireeKoolenWijkstra Jun 5, 2024
a730760
Further favicon cleanup
thomasm0 May 14, 2024
424d023
storybook logo changed to gemeente
thomasm0 May 14, 2024
cb60a82
Make storybook primary script, remove vite build and non-map components
thomasm0 May 15, 2024
07e9f4c
Marker for react leaflet
SireeKoolenWijkstra May 21, 2024
075ff6d
removed duplicated test, removed var that was used only once
SireeKoolenWijkstra Jun 5, 2024
e534373
Merge pull request #12 from Amsterdam/feat/SCTS29_create_pointer_mark…
SireeKoolenWijkstra Jun 11, 2024
34d89ed
Polyline Layer component is added
SireeKoolenWijkstra Jun 4, 2024
eaae6bb
Merge pull request #25 from Amsterdam/feat/SCTS-31_polyline_marker_re…
SireeKoolenWijkstra Jun 11, 2024
1be08bd
[chore] layer descriptions (#29)
reno1979 Jun 18, 2024
5418bc7
Bump ws from 8.17.0 to 8.17.1 (#31)
dependabot[bot] Jun 20, 2024
06c3941
WMSLayer added
SireeKoolenWijkstra Jun 5, 2024
d9b91ea
Add test to see if icons are shown
SireeKoolenWijkstra Jun 25, 2024
2d4af57
Merge pull request #28 from Amsterdam/feature/scts-33-create-WMS-laye…
SireeKoolenWijkstra Jul 3, 2024
8896b3e
Use utility class to visually hide elements (#36)
VincentSmedinga Jul 3, 2024
79721dc
style ReactLeaflet GeoJSON like Leaflet GeoJSON
SireeKoolenWijkstra Jun 24, 2024
3f2ccac
improve readability by removing and inserting new lines
SireeKoolenWijkstra Jul 8, 2024
f6e08ec
Merge pull request #34 from Amsterdam/feature/SCT-39_create_GEOJSONLa…
SireeKoolenWijkstra Jul 8, 2024
c62c741
[39] GeoJSON docs (#37)
thomasm0 Jul 8, 2024
fdb63d2
[5] Marker clustering (#27)
thomasm0 Jul 9, 2024
546ac8b
Docs cleanup (#30)
thomasm0 Jul 9, 2024
58fcdf2
[26] Context examples (#32)
thomasm0 Jul 9, 2024
b5ecadc
Table of contents added to markdown docs (#38)
thomasm0 Jul 9, 2024
499fec9
Intro + test docs pages (#39)
thomasm0 Jul 11, 2024
f34421b
Move MarkerCluster storybook dirs into correct React directory to fix…
thomasm0 Jul 11, 2024
e6ff6ec
Storybook updated to v8.2.1 (#42)
thomasm0 Jul 11, 2024
58b08ff
Fixed fullscreen map (#40)
dlnr Jul 15, 2024
7214dd6
fullscreen zoomcontrols thumbnail updated and images optimized (#43)
thomasm0 Jul 15, 2024
c5f794b
Merge latest main -> develop (#44)
thomasm0 Jul 17, 2024
2760132
Merge main (#46)
thomasm0 Jul 17, 2024
da5088e
Merge (#47)
thomasm0 Jul 17, 2024
52ff7fc
merge what?
thomasm0 Jul 17, 2024
783b471
remove old files (#48)
thomasm0 Jul 17, 2024
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
14 changes: 10 additions & 4 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@ import type { StorybookConfig } from '@storybook/react-vite';
const config: StorybookConfig = {
stories: [
'../src/stories/Intro.mdx',
'../src/stories/Requirements.mdx',
'../src/stories/CoordinateReferenceSystems.mdx',
'../src/stories/Icons.mdx',
'../src/stories/Layers.mdx',
'../src/stories/MarkerClustering.mdx',
'../src/stories/Alternatives.mdx',
'../src/**/*.mdx',
'../src/**/*.stories.@(js|jsx|mjs|ts|tsx)',
],
Expand All @@ -15,11 +21,11 @@ const config: StorybookConfig = {
],
framework: {
name: '@storybook/react-vite',
options: {},
},
docs: {
autodocs: true,
options: {
strictMode: true,
},
},
docs: {},
staticDirs: ['./static'],
};

Expand Down
4 changes: 2 additions & 2 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ export const parameters = {
'Coordinate*',
'Global',
'React',
'React-Context-Examples',
'React-Leaflet',
'Components',
'Patterns',
],
},
},
viewport: {
viewports,
},
};
export const tags = ['autodocs'];
8 changes: 8 additions & 0 deletions .storybook/static/amsterdam.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"no-descending-specificity": null,
"max-nesting-depth": 2,
"selector-max-id": 1,
"order/properties-alphabetical-order": true
"order/properties-alphabetical-order": true,
"selector-class-pattern": null
}
}
Loading