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

Staging 2 Main (Sprint August 2023) #179

Merged
merged 97 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
caf5283
chore(deps): update devdependencies-non-major
renovate[bot] May 21, 2023
8389abb
chore(deps): update devdependencies-non-major
renovate[bot] Jun 4, 2023
45b9541
chore(deps): update devdependencies-non-major
renovate[bot] Jun 19, 2023
6123ad7
fix(history): Fall back to home in bo back button when no history
vogelino Aug 3, 2023
8e0e0cd
Merge branch 'main' into staging
vogelino Aug 3, 2023
5159f4f
Merge branch 'staging' into refactor/better-back-button
vogelino Aug 3, 2023
2fa5d0d
Minimal effort collapsable faq
Jaszkowic Aug 3, 2023
8b13ffc
Merge branch 'main' into staging
vogelino Aug 3, 2023
b5b78dd
Merge branch 'staging' into refactor/better-back-button
vogelino Aug 3, 2023
bcb114c
chore(senatskanzlei_logo): Update the mayor logo to match its gender
vogelino Aug 3, 2023
102562c
cursor pointer on collapsable question
Jaszkowic Aug 3, 2023
da18ede
bg color on hover
Jaszkowic Aug 3, 2023
28667ff
use button for accessibility
Jaszkowic Aug 3, 2023
5bfaebf
fix(Links): Encode the back url into the query params to avoid loss o…
vogelino Aug 3, 2023
170eaca
chore(Button): Fix types of query in Button
vogelino Aug 3, 2023
e9585d4
chore(deps): update devdependencies-non-major
renovate[bot] Aug 3, 2023
ad7a4e1
Merge branch 'staging' into feat/collapsable-faq
vogelino Aug 3, 2023
f8f2faf
refactor(FaqList): Add headlessui a11y elements and styles
vogelino Aug 3, 2023
65dc17c
Merge pull request #181 from technologiestiftung/feat/collapsable-faq
vogelino Aug 3, 2023
264e5ce
Merge pull request #180 from technologiestiftung/chore/logo-mayor-update
vogelino Aug 3, 2023
d666aa4
refactor(Map): Scroll to previously clicked facility on back button c…
vogelino Aug 3, 2023
621b267
refactor(map): Cast ScrollBehavior type because typesrcipt does under…
vogelino Aug 3, 2023
cafc041
fix(useMaplibreMap): Make sure only one map instance is created
vogelino Aug 7, 2023
de6c8a6
Merge branch 'staging' into fix/avoid-filters-reset
vogelino Aug 7, 2023
b7391cc
fix(UrlStateContext): Use router push with shallow statt window replace
vogelino Aug 7, 2023
e3b3c46
Merge branch 'fix/local-missing-map-markers' into fix/avoid-filters-r…
vogelino Aug 7, 2023
49b9447
feat: Show link to website if no phone present (#184)
Jaszkowic Aug 7, 2023
fcbe346
refactor(Search): Remove address search component and logic
vogelino Aug 7, 2023
b186093
chore(MapLayout): Remove unused type
vogelino Aug 7, 2023
3e7ce23
feat(TextSearch): Add Text Search UI
vogelino Aug 8, 2023
423bc8a
docs: Revamp README
ff6347 Aug 8, 2023
20e4ed0
feat(useActiveIdsBySearchTerm): Filter data by text or category
vogelino Aug 8, 2023
f291cb6
feat(ActiveFiltersList): Show the text search and categories in the l…
vogelino Aug 8, 2023
c17aa3b
refactor(useActiveIdsBySearchTerm): Show all items for first two cate…
vogelino Aug 9, 2023
b12cdc7
refactor(FiltersList): Add loading indication when loading search res…
vogelino Aug 9, 2023
ac96662
feat(TextSearch): Add clear and submit buttons on text search
vogelino Aug 9, 2023
29052af
refactor(UrlStateContext): Limit text search length
vogelino Aug 9, 2023
9fb14c7
Merge pull request #188 from technologiestiftung/refactor/remove-loca…
vogelino Aug 9, 2023
6e9b1cb
refactor(MapHeader): Change active class and text of sidebar button
vogelino Aug 9, 2023
5f89dbf
Merge branch 'staging' into feat/full-text-search-frontend
vogelino Aug 9, 2023
e6f8764
refactor(MapHeader): Fix styles related to merging the address search…
vogelino Aug 9, 2023
703694c
fix(TextSearch): Remove class that misaligns buttons on text field
vogelino Aug 9, 2023
9cb3cca
fix(UrlStateContext): Make sure that the query string isn't lost when…
vogelino Aug 9, 2023
36962f7
fix(UrlStateContext): use ?? instead of pipe to avoid falsy values to…
vogelino Aug 9, 2023
a118c11
fix(UrlStateContext): Use window pushState instead of router push to …
vogelino Aug 10, 2023
3fc919f
refactor(UrlStateContext): Simplify initial default function
vogelino Aug 10, 2023
58d8920
Merge branch 'refactor/remember-scroll-position' into feat/full-text-…
vogelino Aug 10, 2023
186c89e
Merge branch 'fix/avoid-filters-reset' into feat/full-text-search-fro…
vogelino Aug 10, 2023
75e9cae
fix(UrlStateContext): Ensure the query is sent with every link
vogelino Aug 10, 2023
e247d8b
Merge pull request #189 from technologiestiftung/docs/readme
ff6347 Aug 10, 2023
e3bb85e
fix(UrlStateContext): The text search is now clearable
vogelino Aug 10, 2023
7ad2dbc
fix(UrlStateContext): always update state to avoid old values
vogelino Aug 10, 2023
c2392fa
refactor(sofortige-hilfe): Remove log statement
vogelino Aug 10, 2023
254dbaf
refactor(UrlStateContext): Cleanup the url when empty values
vogelino Aug 10, 2023
4a9f6a6
refactor(UrlStateContext): Enforce cleaning of falsy values from url
vogelino Aug 10, 2023
f1d0309
refactor(github-actions): Add warnForPRIntoMain action to prevent mer…
vogelino Aug 10, 2023
e461666
fix(UrlStateContext): Avoid resetting everything when no categories s…
vogelino Aug 10, 2023
7d1008c
fix(UrlStateContext): Fix missing filters on page change when no cate…
vogelino Aug 10, 2023
e14a4fd
fix(facilityFilterUtil): Remove encodeURIComponent
vogelino Aug 10, 2023
a018607
Merge pull request #191 from technologiestiftung/ci/add-merge-action
vogelino Aug 10, 2023
60f9c09
refactor(revalidation): Remove nextjs revalidation
vogelino Aug 14, 2023
999e4b0
feat(MapLayout): Toggle display of filter sidebar on large/small disp…
vogelino Aug 14, 2023
348b24e
Merge pull request #194 from technologiestiftung/feat/show-sidebar-on…
vogelino Aug 14, 2023
a071c3d
feat(typos): Fix typos in function names
vogelino Aug 14, 2023
162d555
refactor(UrlStateContext): Attempt to simplify the UrlStateContext
vogelino Aug 14, 2023
115fbd7
fix(TextsContext): Fix text key name case change
vogelino Aug 14, 2023
9710845
fix(TextSearch): Use changed key Text in TextSearch
vogelino Aug 14, 2023
92ecbdb
fix(UrlStateContext): Fix typo in comment
vogelino Aug 15, 2023
2a169bf
Merge pull request #190 from technologiestiftung/feat/full-text-searc…
vogelino Aug 15, 2023
44f7af2
Merge pull request #193 from technologiestiftung/refactor/remove-reva…
vogelino Aug 15, 2023
8075b3a
feat(FacilitiesMap): Color geopins based on type
vogelino Aug 15, 2023
93b1fb9
feat(FacilityType): Show facility type pill in filters and FacilityLi…
vogelino Aug 15, 2023
6234065
feat(FacilitySecondaryInfos): Add secondaty infos incl color pill eve…
vogelino Aug 16, 2023
4440ca3
feat(mapUtil): Also colorize the markers in spiderified state
vogelino Aug 16, 2023
2e09263
feat(FacilitySecondaryInfos): Don't show distance and opened status i…
vogelino Aug 16, 2023
4878c86
refactor(FacilitiesMap): Remove unnecessary color prop on markers
vogelino Aug 16, 2023
c273a33
feat(useClusterMarkers): Add cluster markers to the map
vogelino Aug 16, 2023
0871d78
fix(mapUtil): Fix cluster detection range (too large)
vogelino Aug 16, 2023
a8aaff9
refactor(FiltersList): Make button to Link
vogelino Aug 17, 2023
3a3a1a7
refactor(FacilityListItem): Show website based on type not presence i…
vogelino Aug 17, 2023
1c112bd
refactor(loadData): Always load data from cache now
vogelino Aug 17, 2023
6361236
feat(useClusterMarkers): Rerender cluster markers on filter change
vogelino Aug 17, 2023
f9627a2
refactor(useMapHighlightMarker): Update missing useEffect dependendy
vogelino Aug 17, 2023
3532dc8
refactor(isFallback): Remove use of isFallback (no more revalidation)
vogelino Aug 17, 2023
8f26ba0
feat(MapLayout): Colorize individual selected facilities on mobile
vogelino Aug 17, 2023
36a84fa
feat(UseClusterMarkers): Hide/Show when cluster is spiderfied
vogelino Aug 17, 2023
9a797e8
Revert "refactor(isFallback): Remove use of isFallback (no more reval…
vogelino Aug 17, 2023
a850023
refactor(FacilityInfo): Hide address when not in DB
vogelino Aug 17, 2023
1e4b8c2
fix(Card): Remove header in header
vogelino Aug 17, 2023
58cfcee
feat(sitemap): Add automatic sitemap generation
vogelino Aug 17, 2023
b877d33
Merge branch 'feat/coloured-geopins' into feat/generate-sitemap
vogelino Aug 17, 2023
d5c03c1
feat(_app): Add favicons and webmanifest
vogelino Aug 17, 2023
1ecb3f6
feat(LegalFooter): Add Link to Map
vogelino Aug 17, 2023
dd73045
fix(sitemap): Avoid crash in GH build
vogelino Aug 17, 2023
5c5290d
fix(FacilityListItem): Avoid x-overflow in items
vogelino Aug 17, 2023
4d9fb4c
Merge pull request #196 from technologiestiftung/feat/coloured-geopins
vogelino Aug 18, 2023
1c6ab64
Merge pull request #197 from technologiestiftung/feat/generate-sitemap
vogelino Aug 18, 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
15 changes: 15 additions & 0 deletions .github/workflows/warnForPRIntoMain.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
name: 'Prevent merge from non-staging to master'
on:
pull_request:
types: [opened, synchronize, reopened]

jobs:
warn_main_merge:
runs-on: 'ubuntu-latest'
name: 'Validate PR Source and Target Branches'
steps:
- name: 'Checking source and target branch in PR'
uses: 'technologiestiftung/[email protected]'
with:
stagingName: 'staging'
mainName: 'master'
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,4 @@ yarn-error.log*

# cache data
data
.vscode/settings.json
Loading
Loading