Skip to content

Commit

Permalink
Merge email reply fixes into Main (#130)
Browse files Browse the repository at this point in the history
* [HOTFIX] Replaces map tiler on individual club pages (#115)

Problem
Solution
Note

* HOTFIX - Darkmode map tile (#117)

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

* [CAN-143] Implement Drawer
Problem
- Mobile nav switch from overlay to Drawer
Solution
- Created an animated drawer - drawer.jsx
- Include react-transition-group
- Removed overlay *just commented out*
Note
- Need to implment links
- Blurred background
- Mobile Nav Links

* [CAN-143] Bugfix: Scrolling was disabled
Problem
- usePreventScrolling wasn't being returned on unmount due to RTG
Solution
- make the usePreventScrolling hook accept a conditional variable
- This way, you can dynamically prevent scrolling
Note
- RTG ~ React-Transition-Group
- Even when unmounting, be careful of unmount calls, they aren't
handled by Next or React anymore!

* [CAN-143] Add Links To Drawer
Problem
- Links have not been added
Solution
- Added links for mobile nav using previous mobile nav popup
- Changed Color scheme to dark - can be easily changed back
Note

* [CAN-143] Implement Delayed Drawer Animations
Problem
- Background wanted to be coloured / faded
- Weird when component dismounts as background slides with it
Solution
- Add a nested animation to the actual drawer
- Add animation delays for both background and drawer
Note

* [CAN-143] Right slide and Active URL CSS
Problem
- Animation slide in at wrong side
- Active page not highlighted in nav
Solution
- Change react-transition-group from -100% to calc(100vw - 100%)
- Implement isHomepage logic copied from Navbar Links Component and add
to active link
Note

* [CAn-143] Refactor Tests for OverlayNav
Problem
- Failed to push due to failing tests
- This is because Overlaynav has been massively changed.
Solution
- Mock Drawer Component and remove close mock
Note

* Cheekily adding logo and favicon to MR ;)

* CAN-143 - Fix language switcher position

Problem - Position of language switcher felt wrong in drawer

Solution - Suggested a new position for mobile/tablet

Note - Just a suggestion, happy to go for something else as well!

* CAN-143 -  Fix desktop navigation

Problem - Giving width-100 to the outer div of the language switcher

Solution - Take it out, fixes desktop navigation

Note - Really not sure why this broke the navigation, but fixed

* CAN-143 - Fixed double click bug for logo

Problem - Were only calling onClick when pathname was home pathname

Solution - If onClick provided, call it for all paths

Note - I may have misunderstood, but it is supposed to do nav right?

Note2 - Removed outdated test which checked onClick only called as such

* CAN-143 - Added one liner to readme to test CI

Problem - Want to build and test for MRs to check we good

Solution - Added workflow, need to trigger it now

* CAN-143 - Added actual workflow

Problem - Pipeline can't run if it's only on main at the moment

Solution - Add Workflow here already (might have to be on develop)

* CAN-143 - Fixed casing in tests to fix pipeline

Problem - Some outdated casing for test module imports

Solution - Fix them

* HOTFIX - Going back to non-company protection

* CAN-143 - Drawer Test Suite done

* [CAN-143] Add Link to Popup Image
Problem
- Unable to get to club listing from clicking on image
Solution
- Wrap image in a tag with appropriate class names for css grid.
Note

* [CAN-143] Increment Version Number (1.0.0 -> 1.1.0)
New Features:
- Animated Mobile Nav Drawer
- Clickable Popup Image Tag
- Drawer Component Test Suite

Note
- N/A

* HOTFIX-Content on Request

* [CAN-143] Fix Language Switcher Position
Problem
- Language Switcher on drawer nav not positioned properly
Solution
- Adjust height and width of container to be in 100%
- Change position from relative to absolute of parent
- Switch Language Switcher to display none instead of invisible
    - Removes left margin noticed on Language switcher element
Note

* Bump next from 14.2.5 to 14.2.12 (#123)

* Dark mode update (#118)

* [HOTFIX] Replaces map tiler on individual club pages (#115)

Problem
Solution
Note

* HOTFIX - Darkmode map tile (#117)

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

---------

Co-authored-by: joneshector <[email protected]>
Co-authored-by: marcaufderheyde <[email protected]>

* Update ClubOpenStreetMap.tsx default light mode (#119)

* Create develop-ci.yml (#121)

Adding a Github Actions Workflow to build and test the project for merge requests to the develop branch.

* Bump next from 14.2.5 to 14.2.12

Bumps [next](https://github.com/vercel/next.js) from 14.2.5 to 14.2.12.
- [Release notes](https://github.com/vercel/next.js/releases)
- [Changelog](https://github.com/vercel/next.js/blob/canary/release.js)
- [Commits](vercel/next.js@v14.2.5...v14.2.12)

---
updated-dependencies:
- dependency-name: next
  dependency-type: direct:production
...

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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Marc Auf der Heyde <[email protected]>
Co-authored-by: joneshector <[email protected]>
Co-authored-by: marcaufderheyde <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump micromatch from 4.0.5 to 4.0.8 (#122)

* Dark mode update (#118)

* [HOTFIX] Replaces map tiler on individual club pages (#115)

Problem
Solution
Note

* HOTFIX - Darkmode map tile (#117)

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

---------

Co-authored-by: joneshector <[email protected]>
Co-authored-by: marcaufderheyde <[email protected]>

* Update ClubOpenStreetMap.tsx default light mode (#119)

* Create develop-ci.yml (#121)

Adding a Github Actions Workflow to build and test the project for merge requests to the develop branch.

* Bump micromatch from 4.0.5 to 4.0.8

Bumps [micromatch](https://github.com/micromatch/micromatch) from 4.0.5 to 4.0.8.
- [Release notes](https://github.com/micromatch/micromatch/releases)
- [Changelog](https://github.com/micromatch/micromatch/blob/master/CHANGELOG.md)
- [Commits](micromatch/micromatch@4.0.5...4.0.8)

---
updated-dependencies:
- dependency-name: micromatch
  dependency-type: indirect
...

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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Marc Auf der Heyde <[email protected]>
Co-authored-by: joneshector <[email protected]>
Co-authored-by: marcaufderheyde <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Email replies (#129)

* Subject - finally responding to emails

Problem - some people want content removed/added

Solution - take care of requests

Note - no notes

* Removed address

* Forgot a second address

---------

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

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: joneshector <[email protected]>
Co-authored-by: marcaufderheyde <[email protected]>
Co-authored-by: Fabrizio <[email protected]>
Co-authored-by: Fabrizio Catinella <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
  • Loading branch information
6 people authored Feb 4, 2025
1 parent 1f9806d commit 9b787a6
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 24 deletions.

This file was deleted.

4 changes: 2 additions & 2 deletions messages/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@
"headline_description": "CannabisClubsBerlin.com ist deine erste Anlaufstelle für Einblicke in die Cannabis-Clubs in Berlin und bietet umfassende Bewertungen und Informationen, um dich durch die Vielzahl der in der Stadt verfügbaren Cannabis-Optionen zu führen. Unser Ziel ist es, Nutzer über die lebendige Cannabis-Kultur in Berlin aufzuklären und bei der Navigation durch die lokalen Voraussetzungen bezüglich des Cannabis-Konsums und der Clubmitgliedschaften zu unterstützen.",
"operator_title": "Betreiber",
"operator_one": "CannabisClubsBerlin.com",
"operator_two": "Rombsweg 1 C",
"operator_three": "14165, Berlin, Germany",
"operator_two": "Eisenacher Str. 77",
"operator_three": "10823, Berlin, Germany",
"contact_title": "Kontakt",
"contact_one": "Email: [email protected]",
"contact_two": "Phone: +4917681414156",
Expand Down
4 changes: 2 additions & 2 deletions messages/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,8 @@
"headline_description": "CannabisClubsBerlin.com is your premier source for insights into cannabis clubs in Berlin, offering comprehensive reviews and information to guide the Berlin population through the myriad of cannabis options available in the city. Our mission is to educate and inform users about the vibrant cannabis culture in Berlin and to navigate the local regulations regarding cannabis use and club memberships.",
"operator_title": "Operator",
"operator_one": "CannabisClubsBerlin.com",
"operator_two": "Rombsweg 1 C",
"operator_three": "14165, Berlin, Germany",
"operator_two": "Eisenacher Str. 77",
"operator_three": "10823, Berlin, Germany",
"contact_title": "Contact",
"contact_one": "Email: [email protected]",
"contact_two": "Phone: +4917681414156",
Expand Down

0 comments on commit 9b787a6

Please sign in to comment.