liqd · goapunk · Sep 14, 2023 · Sep 19, 2023 · Sep 19, 2023 · Sep 27, 2023
diff --git a/.eslintrc b/.eslintrc
@@ -39,7 +39,8 @@
   "ignorePatterns": [
     "node_modules/",
     "venv/",
-    "static/"
+    "static/",
+    "meinberlin/assets/berlin_js/"
   ],
   "settings": {
     "import/core-modules": [ django ],

diff --git a/.github/workflows/django.yml b/.github/workflows/django.yml
@@ -2,9 +2,9 @@ name: Django CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [ main, dev ]
   pull_request:
-    branches: [ main ]
+    branches: [ main, dev ]
 
 jobs:
   build:
@@ -84,6 +84,7 @@ jobs:
           PGHOSTADDR: 127.0.0.1
         run: |
           python manage.py collectstatic > /dev/null
+          mkdir -p media
           DJANGO_SETTINGS_MODULE='meinberlin.config.settings.travis' py.test --cov
           isort --diff -c meinberlin tests
           python manage.py makemigrations --dry-run --check --noinput
@@ -97,7 +98,15 @@ jobs:
         run: |
           npm test
           npm run lint
-      - name: Deploy
+      - name: Deploy dev
+        if: github.ref == 'refs/heads/dev'
+        env:
+          TRAVIS_SSH_SECRET: ${{ secrets.DEPLOY }}
+          PROJECT_BUILD: 'meinberlin-restyle'
+          VERSION_BUILD: 'dev'
+        run: |
+          ./scripts/deploy.sh $PROJECT_BUILD ${VERSION_BUILD##*/}
+      - name: Deploy main
         if: github.ref == 'refs/heads/main'
         env:
           TRAVIS_SSH_SECRET: ${{ secrets.DEPLOY }}

diff --git a/.stylelintrc.json b/.stylelintrc.json
@@ -3,7 +3,8 @@
     "stylelint-config-standard-scss"
   ],
   "ignoreFiles": [
-    "**/_variables.scss"
+    "**/_variables.scss",
+    "meinberlin/assets/berlin_css/"
   ],
   "plugins": [
     "stylelint-declaration-strict-value"

diff --git a/Makefile b/Makefile
@@ -1,4 +1,5 @@
 VIRTUAL_ENV ?= venv
+MEDIA_ROOT = media
 NODE_BIN = node_modules/.bin
 SOURCE_DIRS = meinberlin tests
 ARGUMENTS=$(filter-out $(firstword $(MAKECMDGOALS)), $(MAKECMDGOALS))
@@ -81,6 +82,7 @@ install:
 	if [ ! -f $(VIRTUAL_ENV)/bin/python3 ]; then python3 -m venv $(VIRTUAL_ENV); fi
 	$(VIRTUAL_ENV)/bin/python3 -m pip install --upgrade -r requirements/dev.txt
 	$(VIRTUAL_ENV)/bin/python3 manage.py migrate
+	mkdir -p $(MEDIA_ROOT)
 
 .PHONY: clean
 clean:
@@ -198,13 +200,13 @@ lint-js-fix:
 .PHONY: lint-html-fix
 lint-html-fix:
 	EXIT_STATUS=0; \
-	$(VIRTUAL_ENV)/bin/djlint $(ARGUMENTS) --reformat --profile=django || EXIT_STATUS=$$?; \
+	$(VIRTUAL_ENV)/bin/djlint $(ARGUMENTS) --reformat --profile=django --ignore=H030,H031,T002 || EXIT_STATUS=$$?; \
 	exit $${EXIT_STATUS}
 
 .PHONY: lint-html-files
 lint-html-files:
 	EXIT_STATUS=0; \
-	$(VIRTUAL_ENV)/bin/djlint $(ARGUMENTS) --profile=django --ignore=H030,H031 || EXIT_STATUS=$$?; \
+	$(VIRTUAL_ENV)/bin/djlint $(ARGUMENTS) --profile=django --ignore=H030,H031,T002 || EXIT_STATUS=$$?; \
 	exit $${EXIT_STATUS}
 
 .PHONY: lint-python-files

diff --git a/README.md b/README.md
@@ -110,3 +110,9 @@ Stop celery beat with ctr+C
 ### To add scheduled tasks (same for all environments) check the [docs](./docs/celerybeat.md)
 
 In case of settings.TIME_ZONE change, tasks need to be synced with the new time. [See HOWTO](https://django-celery-beat.readthedocs.io/en/latest/#important-warning-about-time-zones)
+
+### Style Library
+
+-   currently all js and css incl fontawesome files are downloaded due to difficulties serving files and slowing development
+    -   img and font resouce paths within the berlin css have been updated to include the local version
+-   Until versioning of libraries implemented prefered solution would be to have js downloaded once per day and cached, css should only be updated before release due to issues of breaking changes not being versioned or announced.
diff --git a/__mocks__/djangoMock.js b/__mocks__/djangoMock.js
@@ -2,5 +2,6 @@ module.exports = {
   gettext: (text) => text,
   pgettext: (text) => text,
   ngettext: (text, count) => text + count,
-  interpolate: (text, count) => text + count
+  interpolate: (text, count) => text + count,
+  npgettext: (context, text, count) => text + count
 }
diff --git a/changelog/0000.md b/changelog/0000.md
@@ -0,0 +1,7 @@
+### Added
+
+- {{ block.super }} to extra_css tags to ensure all templates do not overwrite the base styling added in base.html and base_dashboard.html
+
+### Changed
+
+- move all react components to separate react folder structure and update webpack paths, documented in wiki
diff --git a/changelog/1.md b/changelog/1.md
@@ -0,0 +1,3 @@
+### Added
+
+- github workflows for dev
diff --git a/changelog/1111.md b/changelog/1111.md
@@ -0,0 +1,16 @@
+### Added
+
+- imports for BO style libraries and css, favicon, logo files locally (story !7629)
+- local versions of BO js files and updated linting and imports (story !7629)
+- local version of Fontawesome and update README to explain style library chaoices (story !7629)
+- get_footer managment command and tag to import BO portal footer add to template (story !7626)
+- periodic_footer_update task (story !7626)
+
+### Changed
+
+- favicons for BO one (story !7629)
+
+### Removed
+
+- old header styling (story !7630)
+- old footer styling (story !7627)
diff --git a/changelog/1234.md b/changelog/1234.md
@@ -0,0 +1,3 @@
+### Added
+
+- celerybeat hourly periodic task for footer update
diff --git a/changelog/2627.md b/changelog/2627.md
@@ -0,0 +1,3 @@
+### Added
+
+- new footer snippet to enable headings and BO content footer template, replacing old footer (story !7627)
diff --git a/changelog/7274.md b/changelog/7274.md
@@ -0,0 +1,3 @@
+### Changed
+
+- ckeditor accordion template to Berlin Online markup with small a11y additions ref: https://www.w3.org/WAI/ARIA/apg/patterns/accordion/examples/accordion/ [7274]
diff --git a/changelog/7618.md b/changelog/7618.md
@@ -0,0 +1,7 @@
+### Added
+
+- a4 prefix to follow styling after a4 refactor (story !7618/7701)
+
+
+### Updated
+- a4 tag for follow refactor (story !7618/7701)
diff --git a/changelog/7628.md b/changelog/7628.md
@@ -0,0 +1,3 @@
+### Added
+
+- BO landmark page classes to all user side pages !7628
diff --git a/changelog/7630.md b/changelog/7630.md
@@ -0,0 +1,3 @@
+### Added
+
+- BO header template code and setting to include a11y information in wagtail and logo files (story !7630)
diff --git a/changelog/7681.md b/changelog/7681.md
@@ -0,0 +1,8 @@
+### Added
+
+- an include of BO breadcrumb template code to base.html with wagtail template tag for all cms page breadcrumbs (!7681)
+- BO breadcrumb template code with logical site tree structure to all project/plan/container templates that user interacts with (!7681)
+
+### Removed
+
+- commented out offline event detail template as appears to be unused (!7681)
diff --git a/changelog/7697.md b/changelog/7697.md
@@ -0,0 +1,3 @@
+### Added
+
+- extra context in paragraph detail view
diff --git a/changelog/7701.md b/changelog/7701.md
@@ -0,0 +1,7 @@
+## Added
+
+- different style.scss sheets depending on if BO or a4 (dashboard) pages with if statement in base.html to load depending on url, will need adjusting
+
+## Changed
+
+- project_detail header to BO herounit-image-with-aside !7701
diff --git a/changelog/7702.md b/changelog/7702.md
@@ -0,0 +1,3 @@
+### Added
+
+- converting budegting list item to Berlin Online card and seperating out the list item styles (for the dashboard) and add list_card styling component (for the user side) [7702]
diff --git a/changelog/7760.md b/changelog/7760.md
@@ -0,0 +1,4 @@
+## Added
+
+- viewset for topicprio list and filtering with template tag
+- react list component utilising card component to topicprio list template with webpack entrypoint and template tag
diff --git a/changelog/7761.md b/changelog/7761.md
@@ -0,0 +1,9 @@
+### Added
+
+- added generic form elements (input, select) to react/contrib/forms
+
+
+### Modified
+
+- react/contrib/ControlBar.jsx to include new styling and layout
+- switched webpack devtool to generate sourcemaps for dev mode
diff --git a/changelog/7770.md b/changelog/7770.md
@@ -0,0 +1,9 @@
+## Added
+
+- new file react/contrib/ModeratorStatus.jsx which creates a new component Moderator Status, decoupling status from the badges list
+- new file components/_moderator-status.scss as a separate stylesheet
+- new dev dependency `@testing-library/jest-dom` on package.json
+
+## Changed
+
+- refactored ListItemBadges.jsx to remove the moderator_status from the list
diff --git a/changelog/7828.md b/changelog/7828.md
@@ -0,0 +1,9 @@
+### Added
+
+convert ideas list to react component:
+- added /ideas to /react folder: new files IdeaList.jsx, IdeaList.jest.jsx 
+- initialized in templatetags/react_ideas.py
+
+
+### Modified
+apps/ideas/templates/idea_list.html to render new idea list react component
diff --git a/changelog/7829.md b/changelog/7829.md
@@ -0,0 +1,10 @@
+### Added
+
+convert mapideas list to react component:
+- added /mapideas to /react folder: new files MapIdeaList.jsx, react_mapideas_init.jsx, 
+- initialized in mapideas/templatetags/react_mapideas.py and webpack.common.js
+- testing MapIdeaList.jest.jsx 
+
+
+### Modified
+apps/mapideas/templates/mapidea_list.html to render new idea list react component
diff --git a/changelog/7833.md b/changelog/7833.md
@@ -0,0 +1,8 @@
+### Added
+
+- a new IdeaViewSet, a serializer and filters for ideas to be able to fetch
+ comments via js (#7833)
+
+### Changed
+
+- ProposalViewSet now extends IdeaViewSet to simplify code structure (#7833)
diff --git a/changelog/7840.md b/changelog/7840.md
@@ -0,0 +1,3 @@
+### Added
+
+- new user indicator for user side pages with custom js functionality mimicing the language dropdown functionality from the BO stylguide useing our own vanilla js #7840
diff --git a/changelog/7861.md b/changelog/7861.md
@@ -0,0 +1,9 @@
+### Added
+
+- added ControlBar component to CardList component for react filtering on all the lists [7861]
+
+### Changed
+
+- moved Card components to own folder as seemed more tidy
+- added headline to mapswitch as part of design and used different BO classes for additional styling
+- removed django filters from list view
diff --git a/changelog/7862.md b/changelog/7862.md
@@ -0,0 +1,17 @@
+### Added
+
+- new css component _a4-control-bar-search
+
+### Changed
+
+- added/changed styling for comment filters and form according to styleguide
+- renamed _select.scss to _a4-select.css to reflect the move from mB to a4
+- updated imports for ControlBarDropdown and ControlBarSearch to reflect the
+  move from mB to a4
+
+### Removed
+
+- **Breaking Change** moved the Select component to a4
+- **Breaking Change** moved the ControlBarDropdown component to a4
+- **Breaking Change** moved the ControlBarSearch component to a4
+- removed css for a4-forms__select__wrapper from the user facing css
diff --git a/changelog/_0974.md b/changelog/_0974.md
@@ -0,0 +1,5 @@
+### Changed
+
+- update Berlin Online css file
+- remove local versions of Berlin Online JS files and add new version via a script tag
+- remove un-needed packages from package.json
diff --git a/changelog/_1222.md b/changelog/_1222.md
@@ -0,0 +1,9 @@
+### Added
+
+- some basic tests for bplan image file type probing
+
+### Changed
+
+- replaced imghr with python-magic
+- change all idea/topic list views to TemplateViews as data is fetched via js
+  now
diff --git a/changelog/_1234.md b/changelog/_1234.md
@@ -0,0 +1,3 @@
+### Changed
+
+- renamed component_library to dashboard_component_library and non dashboard components
diff --git a/changelog/_3333.md b/changelog/_3333.md
@@ -0,0 +1,9 @@
+### Added
+
+- API for map list ideas
+- MapPolygonMixin which adds the module polygon to the API
+
+### Changed
+
+- moved LocaleInfoMixin from ideas to contrib
+
diff --git a/changelog/_4444.md b/changelog/_4444.md
@@ -0,0 +1,3 @@
+### Added
+- Add `page_size_query_param` to APIPagination to allow fetching all items (e.g.
+  required for the map)
diff --git a/changelog/_5674.md b/changelog/_5674.md
@@ -0,0 +1,3 @@
+### Added
+
+- function and styling in Card component to mimic Berlin Online lick and title click behaviour with test (#7760)
diff --git a/changelog/_6272.md b/changelog/_6272.md
@@ -0,0 +1,3 @@
+### Changed
+
+- moved Pagination from /budgeting to /contrib
diff --git a/changelog/_6758.md b/changelog/_6758.md
@@ -0,0 +1,5 @@
+### Added
+
+- viewset for kiezkasse list by extending that for idea and filtering with template tag
+- entry point and template tag for kiezkasse
+- add test for kiezkasselist component
diff --git a/changelog/_6789.md b/changelog/_6789.md
@@ -0,0 +1,8 @@
+### Changed
+
+- removed idea-list-item template and exclussive associated styles and deleted from component library
+- move remaining list-item styles to components_dashboard where they are still used in project list and some form lists
+- remove pagination include from list templates
+- add BO classes to Pagination.jsx so it conforms to styleguide
+- move pagination.scss to components_dashboard as not needed usersides anymore
+- update components_dashboard and components_userside lists to better rflect what is used where and what has already been touched
diff --git a/changelog/_7762.md b/changelog/_7762.md
@@ -0,0 +1,8 @@
+### Changed
+
+- Implemented redesign for phase info according to BerlinOnline styleguide
+- Refactor files in templates/a4modules
+- Optimized Swiper integration 
+
+### Added
+- Introduced new CSS file assets/scss/components_user_facing/_phase_info.scss for specific styles
diff --git a/changelog/_7768.md b/changelog/_7768.md
@@ -0,0 +1,7 @@
+### Changed
+
+- updated the design of `templates/account/login.html` and `templates/account/signup.html`
+
+### Added
+
+- added a duplicate of form_checkbox_field (`a4dashboard/includes/form_checkbox_field.html`) to maintain old styles for the dashboard
diff --git a/changelog/_7770.md b/changelog/_7770.md
@@ -0,0 +1,3 @@
+## Changed
+
+- removed warning from ModeratorStatus.jsx
diff --git a/changelog/_7897.md b/changelog/_7897.md
@@ -0,0 +1,11 @@
+### Changed
+
+- CardMeta: removed ref number and updated the date helper to new date format and updated wording
+- CardStats: use bold tag as per the design and update all tests where stats rendered
+- Pill: change text colour inline with design
+- platformemail_form template: change extend from base to dashboard as it is part of the initiator interface and therfore shoudl not be BO styled
+
+
+### Added
+
+- correct structure for skiplink to base.html inline with lighthouse recommendation
diff --git a/changelog/_79453.md b/changelog/_79453.md
@@ -0,0 +1,5 @@
+### Changed
+
+- project_detail changes tabs to new style and used wcag recommended structure https://www.w3.org/WAI/ARIA/apg/patterns/tabs/examples/tabs-automatic/ used BO js for functionality
+- add new tab styling and move old to component_dashboard
+- add edit link styling using same system as BO styleguide
diff --git a/changelog/_8012.md b/changelog/_8012.md
@@ -0,0 +1,8 @@
+## Changed
+
+- Refactored the label class in ModeratorStatus.jsx for improved clarity and modularity.
+- Cleaned up templates/meinberlin_contrib/item_detail.html
+
+## Added
+- Separated the moderator feedback into its own template (templates/meinberlin_contrib/components/moderator_feedback.html) for better organization.
+- Created a new stylesheet (scss/components_user_facing/_moderator_feedback.scss) specifically for the moderator feedback for improved maintainability.
diff --git a/changelog/_8038.md b/changelog/_8038.md
@@ -0,0 +1,7 @@
+## Added
+- Separated the moderator notes into its own template (templates/meinberlin_contrib/components/moderator_notes.html) for better organization.
+- Created a new stylesheet (scss/components_user_facing/_moderator_notes.scss) specifically for the moderator notes snippet for better maintainability.
+- Added extra variables for icon color on (scss/components_user_facing/_variables.scss) with `icon-` prefix
+
+## Changed
+- refactor (scss/components_user_facing/_details.scss) to update global element selector to class `.details`
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- celerybeat hourly periodic task for footer update
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- new footer snippet to enable headings and BO content footer template, replacing old footer (story !7627)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Changed

		- ckeditor accordion template to Berlin Online markup with small a11y additions ref: https://www.w3.org/WAI/ARIA/apg/patterns/accordion/examples/accordion/ [7274]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- BO landmark page classes to all user side pages !7628
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- BO header template code and setting to include a11y information in wagtail and logo files (story !7630)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- extra context in paragraph detail view
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- converting budegting list item to Berlin Online card and seperating out the list item styles (for the dashboard) and add list_card styling component (for the user side) [7702]
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- new user indicator for user side pages with custom js functionality mimicing the language dropdown functionality from the BO stylguide useing our own vanilla js #7840
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Changed

		- renamed component_library to dashboard_component_library and non dashboard components
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		### Added

		- function and styling in Card component to mimic Berlin Online lick and title click behaviour with test (#7760)