Updating basecode to be on same level as develop #3
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…contain deleted, canceled or past subevents
Merging City-of-Helsinki master changes to City-of-Turku develop
Ducky07
added a commit
that referenced
this pull request
May 4, 2020
* MUI to Bootstrap Header-component * MUI to boostrap fix * Added Glyphicons to language & login * Added + Glyphicon to add new event * Updating basecode to be on same level as develop (#3) * Fix double encoding City-of-Helsinki#524; with caveat axios/axios#2563 * Display all api results in react select components * Fix event publisher field name for user rights check * Fix City-of-Helsinki#530 * Do not try to update deleted subevents * Do not try to edit past subevents * Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents * Remove unnecessary inlined sub_events at cancel to prevent API errors * Add instructions for internet events * Update snapshots * Add remote participation keyword to all internet events * Add notification about online events to cancel confirmation dialog * Add postpone button and badge * Mention postponing in cancel extra text * Add postpone button to editor too * Show postponed events in search instead of crashing * Update user rights managers * Add missing </p> * Do not remove subevents at cancel after all; deleted items removed by API PR City-of-Helsinki/linkedevents#407 * Fix removed future time validation; fixes City-of-Helsinki#536, City-of-Helsinki#528 * Update snapshots Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> * Updated header-component Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP Added Reactstrap stylesheet. Added Reactstrap & Bootstrap packets * Removed React-select language changer, replaced with component Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component * Fixed padding on language-select Fixed padding to be inline with login Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com> Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
Ducky07
added a commit
that referenced
this pull request
May 5, 2020
* MUI to Bootstrap Header-component * MUI to boostrap fix * Added Glyphicons to language & login * Added + Glyphicon to add new event * Updating basecode to be on same level as develop (#3) * Fix double encoding City-of-Helsinki#524; with caveat axios/axios#2563 * Display all api results in react select components * Fix event publisher field name for user rights check * Fix City-of-Helsinki#530 * Do not try to update deleted subevents * Do not try to edit past subevents * Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents * Remove unnecessary inlined sub_events at cancel to prevent API errors * Add instructions for internet events * Update snapshots * Add remote participation keyword to all internet events * Add notification about online events to cancel confirmation dialog * Add postpone button and badge * Mention postponing in cancel extra text * Add postpone button to editor too * Show postponed events in search instead of crashing * Update user rights managers * Add missing </p> * Do not remove subevents at cancel after all; deleted items removed by API PR City-of-Helsinki/linkedevents#407 * Fix removed future time validation; fixes City-of-Helsinki#536, City-of-Helsinki#528 * Update snapshots Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> * Updated header-component Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP Added Reactstrap stylesheet. Added Reactstrap & Bootstrap packets * Removed React-select language changer, replaced with component Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component * Fixed padding on language-select Fixed padding to be inline with login * Updated Caret for language selector Added caret and styling * Header updates for changing locale, mobile, styling & components Replaced React-select with custom languageselector for changing locale, changed styling, updated header components (nav logo to brand) & added mobile styling * Updated scss formating Made header scss prettier Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com> Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
aceViilee
added a commit
that referenced
this pull request
May 13, 2020
* city_theme is the same as the theme folder name in node_modules, ie node_modules/linked-theme would be city_theme: linked-theme * language json fields can now be imported from the theme package, images can also be directly import ie. import SomePicture from '@city-images/somepic.png' * MUI to Bootstrap Header-component * MUI to boostrap fix * Added Glyphicons to language & login * Added + Glyphicon to add new event * Updating basecode to be on same level as develop (#3) * Fix double encoding City-of-Helsinki#524; with caveat axios/axios#2563 * Display all api results in react select components * Fix event publisher field name for user rights check * Fix City-of-Helsinki#530 * Do not try to update deleted subevents * Do not try to edit past subevents * Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents * Remove unnecessary inlined sub_events at cancel to prevent API errors * Add instructions for internet events * Update snapshots * Add remote participation keyword to all internet events * Add notification about online events to cancel confirmation dialog * Add postpone button and badge * Mention postponing in cancel extra text * Add postpone button to editor too * Show postponed events in search instead of crashing * Update user rights managers * Add missing </p> * Do not remove subevents at cancel after all; deleted items removed by API PR City-of-Helsinki/linkedevents#407 * Fix removed future time validation; fixes City-of-Helsinki#536, City-of-Helsinki#528 * Update snapshots Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> * Updated header-component Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP Added Reactstrap stylesheet. Added Reactstrap & Bootstrap packets * Bringing develop changes to city-theme branch (#4) * Fix double encoding City-of-Helsinki#524; with caveat axios/axios#2563 * Display all api results in react select components * Fix event publisher field name for user rights check * Fix City-of-Helsinki#530 * Do not try to update deleted subevents * Do not try to edit past subevents * Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents * Remove unnecessary inlined sub_events at cancel to prevent API errors * Add instructions for internet events * Update snapshots * Add remote participation keyword to all internet events * Add notification about online events to cancel confirmation dialog * Add postpone button and badge * Mention postponing in cancel extra text * Add postpone button to editor too * Show postponed events in search instead of crashing * Update user rights managers * Add missing </p> * Do not remove subevents at cancel after all; deleted items removed by API PR City-of-Helsinki/linkedevents#407 * Fix removed future time validation; fixes City-of-Helsinki#536, City-of-Helsinki#528 * Update snapshots Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> * Removed React-select language changer, replaced with component Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component * Fixed padding on language-select Fixed padding to be inline with login * Bringing Bootstrap header. (#5) * MUI to Bootstrap Header-component * MUI to boostrap fix * Added Glyphicons to language & login * Added + Glyphicon to add new event * Updating basecode to be on same level as develop (#3) * Fix double encoding City-of-Helsinki#524; with caveat axios/axios#2563 * Display all api results in react select components * Fix event publisher field name for user rights check * Fix City-of-Helsinki#530 * Do not try to update deleted subevents * Do not try to edit past subevents * Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents * Remove unnecessary inlined sub_events at cancel to prevent API errors * Add instructions for internet events * Update snapshots * Add remote participation keyword to all internet events * Add notification about online events to cancel confirmation dialog * Add postpone button and badge * Mention postponing in cancel extra text * Add postpone button to editor too * Show postponed events in search instead of crashing * Update user rights managers * Add missing </p> * Do not remove subevents at cancel after all; deleted items removed by API PR City-of-Helsinki/linkedevents#407 * Fix removed future time validation; fixes City-of-Helsinki#536, City-of-Helsinki#528 * Update snapshots Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> * Updated header-component Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP Added Reactstrap stylesheet. Added Reactstrap & Bootstrap packets * Removed React-select language changer, replaced with component Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component * Fixed padding on language-select Fixed padding to be inline with login Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com> Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> * Updated Caret for language selector Added caret and styling * Header updates for changing locale, mobile, styling & components Replaced React-select with custom languageselector for changing locale, changed styling, updated header components (nav logo to brand) & added mobile styling * Updated scss formating Made header scss prettier * Reverted unintended changes Reverted changes that came with an accidental merge from experimental/city-theme branch. * Update to component Removed moderationstyles and added classnames + scss rule when moderationlink is displayed. Added temp alt to citylogo Updated Language dropdowns styling and structure Co-Authored-By: Hannes <hienous@users.noreply.github.com> * Update to header + test Cleaned NavbarBrand, export for NavLinks and HeaderBar for testing purpose, updated SCSS for NavbarBrand and added rules to JEST Co-Authored-By: Hannes <hienous@users.noreply.github.com> * Added comment on citylogo Citylogo can now be used from scss * Removed not needed stylesheet and added comment * Comments for code Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com> Co-authored-by: Riku Oja <riku.oja@kapsi.fi> Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi> Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com> Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com> Co-authored-by: Jack Valley <Juuso.laakso@turku.fi> Co-authored-by: Hannes <hienous@users.noreply.github.com>
DelusionCB
added a commit
that referenced
this pull request
May 27, 2021
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* language json fields can now be imported from the theme package, images can also be directly import ie. import SomePicture from '@city-images/somepic.png'
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
* Bringing develop changes to city-theme branch (#4)
* Fix double encoding #524; with caveat https://github.com/axios/axios/pull/2563
* Display all api results in react select components
* Fix event publisher field name for user rights check
* Fix #530
* Do not try to update deleted subevents
* Do not try to edit past subevents
* Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents
* Remove unnecessary inlined sub_events at cancel to prevent API errors
* Add instructions for internet events
* Update snapshots
* Add remote participation keyword to all internet events
* Add notification about online events to cancel confirmation dialog
* Add postpone button and badge
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Bringing Bootstrap header. (#5)
* MUI to Bootstrap
Header-component
* MUI to boostrap fix
* Added Glyphicons to language & login
* Added + Glyphicon to add new event
* Updating basecode to be on same level as develop (#3)
* Fix double encoding #524; with caveat https://github.com/axios/axios/pull/2563
* Display all api results in react select components
* Fix event publisher field name for user rights check
* Fix #530
* Do not try to update deleted subevents
* Do not try to edit past subevents
* Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents
* Remove unnecessary inlined sub_events at cancel to prevent API errors
* Add instructions for internet events
* Update snapshots
* Add remote participation keyword to all internet events
* Add notification about online events to cancel confirmation dialog
* Add postpone button and badge
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Updated header-component
Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP
Added Reactstrap stylesheet.
Added Reactstrap & Bootstrap packets
* Removed React-select language changer, replaced with component
Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component
* Fixed padding on language-select
Fixed padding to be inline with login
Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com>
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Bringing Header changes to our Theme branch (#6)
* MUI to Bootstrap
Header-component
* MUI to boostrap fix
* Added Glyphicons to language & login
* Added + Glyphicon to add new event
* Updating basecode to be on same level as develop (#3)
* Fix double encoding #524; with caveat https://github.com/axios/axios/pull/2563
* Display all api results in react select components
* Fix event publisher field name for user rights check
* Fix #530
* Do not try to update deleted subevents
* Do not try to edit past subevents
* Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents
* Remove unnecessary inlined sub_events at cancel to prevent API errors
* Add instructions for internet events
* Update snapshots
* Add remote participation keyword to all internet events
* Add notification about online events to cancel confirmation dialog
* Add postpone button and badge
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Updated header-component
Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP
Added Reactstrap stylesheet.
Added Reactstrap & Bootstrap packets
* Removed React-select language changer, replaced with component
Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component
* Fixed padding on language-select
Fixed padding to be inline with login
* Updated Caret for language selector
Added caret and styling
* Header updates for changing locale, mobile, styling & components
Replaced React-select with custom languageselector for changing locale, changed styling, updated header components (nav logo to brand) & added mobile styling
* Updated scss formating
Made header scss prettier
Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com>
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* chaganges to buttons
Material ui to reactstrap
* more buttons to bootstrap
* Update HelLabeledCheckboxGroup.js
Reverted accidental changes
* Removed unnecessary files
Old and deprecated
* Updated Buttons for Image Picker
More the same with Helsinki's theme
* Update to Header Logo
Logo moved to scss.
* searchbar button
* Changed material ui to reacstrap
Removed material ui from search page
* Feature/oidc auth (#8)
* initial oidc integration commit
* Removed Passport from user authentication
Fixed Warning with History import and removed Passport authentications.
* fetchUser and comments for OIDC
Needs proper lifecycle methods.
* Added some missing oidc features and updated tests
* Added oidc settings to production build.
* Added tests for user actions and reducer.
* Updated readme by removing mentions to builtin auth server.
* Updated node-sass package, added more tests and gitignored coverage folder.
Co-authored-by: Ducky07 <Juuso.laakso@turku.fi>
* Update yarn.lock
* Update config_dev.json.example
* Made changes to make this branch compatible with develop.
appConfig, config_dev.json.example, Header/index.js, yarn.lock
* Update index.js
* Revert "Merge branch 'experimental/city-theme' into develop"
This reverts commit f51da9b1af35b251f72032fd033bf86b74d51782, reversing
changes made to a06088f7a05f65e1e7918d1781f2f8f2f68aa4c2.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch develop
# Your branch is up to date with 'origin/develop'.
#
# You are currently reverting commit a06088f.
#
# Changes to be committed:
# modified: config/appConfig.js
# deleted: config/assetPath.js
# modified: config/webpack/dev.js
# modified: config/webpack/prod.js
# modified: config_dev.json.example
# modified: package.json
# deleted: src/assets/default/assets/main.scss
# deleted: src/assets/default/i18n/index.js
# new file: src/assets/images/turkulogowhite.png
# modified: src/components/FormFields/index.js
# modified: src/components/FormFields/index.scss
# deleted: src/components/Header/LanguageSelector.js
# deleted: src/components/Header/LanguageSelector.test.js
# modified: src/components/Header/index.scss
# modified: src/components/HelFormFields/HelKeywordSelector/HelKeywordSelector.js
# modified: src/components/HelFormFields/HelLabeledCheckboxGroup.scss
# modified: src/components/HelFormFields/HelOffersField.js
# modified: src/components/HelFormFields/HelTextField.js
# modified: src/components/ImageEdit/index.js
# modified: src/components/ImageEdit/index.scss
# modified: src/components/ImagePicker/index.js
# modified: src/components/ImagePicker/index.scss
# modified: src/components/SearchBar/index.js
# modified: src/components/SearchBar/index.scss
# modified: src/i18n/index.js
# modified: src/index.jade
# new file: src/themes/material-ui-tku.js
# new file: src/themes/tku/tku-brand-colors.js
# modified: src/views/App/index.js
# modified: yarn.lock
Manually reverting changes that were accidentally merged into develop.
Weirdly enough Github thought taking commits from develop would be the same as merging the two branches together, while not being able to understand PR reverting (aka only reverting one branch but not the other).
Please don't do that again...
* Feature/header components (#9)
* city_theme is the same as the theme folder name in node_modules, ie node_modules/linked-theme would be city_theme: linked-theme
* language json fields can now be imported from the theme package, images can also be directly import ie. import SomePicture from '@city-images/somepic.png'
* MUI to Bootstrap
Header-component
* MUI to boostrap fix
* Added Glyphicons to language & login
* Added + Glyphicon to add new event
* Updating basecode to be on same level as develop (#3)
* Fix double encoding #524; with caveat https://github.com/axios/axios/pull/2563
* Display all api results in react select components
* Fix event publisher field name for user rights check
* Fix #530
* Do not try to update deleted subevents
* Do not try to edit past subevents
* Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents
* Remove unnecessary inlined sub_events at cancel to prevent API errors
* Add instructions for internet events
* Update snapshots
* Add remote participation keyword to all internet events
* Add notification about online events to cancel confirmation dialog
* Add postpone button and badge
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Updated header-component
Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP
Added Reactstrap stylesheet.
Added Reactstrap & Bootstrap packets
* Bringing develop changes to city-theme branch (#4)
* Fix double encoding #524; with caveat https://github.com/axios/axios/pull/2563
* Display all api results in react select components
* Fix event publisher field name for user rights check
* Fix #530
* Do not try to update deleted subevents
* Do not try to edit past subevents
* Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents
* Remove unnecessary inlined sub_events at cancel to prevent API errors
* Add instructions for internet events
* Update snapshots
* Add remote participation keyword to all internet events
* Add notification about online events to cancel confirmation dialog
* Add postpone button and badge
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Removed React-select language changer, replaced with component
Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component
* Fixed padding on language-select
Fixed padding to be inline with login
* Bringing Bootstrap header. (#5)
* MUI to Bootstrap
Header-component
* MUI to boostrap fix
* Added Glyphicons to language & login
* Added + Glyphicon to add new event
* Updating basecode to be on same level as develop (#3)
* Fix double encoding #524; with caveat https://github.com/axios/axios/pull/2563
* Display all api results in react select components
* Fix event publisher field name for user rights check
* Fix #530
* Do not try to update deleted subevents
* Do not try to edit past subevents
* Refactor editability check; allow deleting and canceling series that contain deleted, canceled or past subevents
* Remove unnecessary inlined sub_events at cancel to prevent API errors
* Add instructions for internet events
* Update snapshots
* Add remote participation keyword to all internet events
* Add notification about online events to cancel confirmation dialog
* Add postpone button and badge
* Mention postponing in cancel extra text
* Add postpone button to editor too
* Show postponed events in search instead of crashing
* Update user rights managers
* Add missing </p>
* Do not remove subevents at cancel after all; deleted items removed by API PR https://github.com/City-of-Helsinki/linkedevents/pull/407
* Fix removed future time validation; fixes #536, #528
* Update snapshots
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Updated header-component
Updated to Reactstrap based on Open design. Updated mobile-functionality. Language dropdown WIP
Added Reactstrap stylesheet.
Added Reactstrap & Bootstrap packets
* Removed React-select language changer, replaced with component
Added comment about Nav-update, removed React-select and updated language dropdown with LanguageSelector-component
* Fixed padding on language-select
Fixed padding to be inline with login
Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com>
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Updated Caret for language selector
Added caret and styling
* Header updates for changing locale, mobile, styling & components
Replaced React-select with custom languageselector for changing locale, changed styling, updated header components (nav logo to brand) & added mobile styling
* Updated scss formating
Made header scss prettier
* Reverted unintended changes
Reverted changes that came with an accidental merge from experimental/city-theme branch.
* Update to component
Removed moderationstyles and added classnames + scss rule when moderationlink is displayed.
Added temp alt to citylogo
Updated Language dropdowns styling and structure
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
* Update to header + test
Cleaned NavbarBrand, export for NavLinks and HeaderBar for testing purpose, updated SCSS for NavbarBrand and added rules to JEST
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
* Added comment on citylogo
Citylogo can now be used from scss
* Removed not needed stylesheet and added comment
* Comments for code
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
Co-authored-by: Riku Oja <riku.oja@kapsi.fi>
Co-authored-by: Aleksi Salonen <aleksi.salonen@hel.fi>
Co-authored-by: Riku Oja <Rikuoja@users.noreply.github.com>
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Added aria to languageselector + translations (#14)
Aria label based on intl, added translations
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Feature/theme-temp to develop, Featuring city_theme ver. 0.0.1. (#15)
* Added all changes from experimental/city-theme branch
Manually merged city-theme and develop branch together.
* Updated some styling and removed a warning from store.js
* Changed Helsinki backend values.
(These changes are temporary and should not be a longterm change / nor should It be moved to Helsinki)
* Changed file structure
So that theme would work properly.
* Update yarn.lock
* removed Circularprogress
* Added a mission Aria-label
Also re-formatted for more compactness
* Added missing html page language tag
(Will be replaced later down the road by a proper dynamically changing one)
* Added missing accessibility changes
Added a z-index to language selector and linked-events-bar so that they won't be hidden under other elements.
* Reformatted Helper.js
For more compact code, Will return to this for more accessibility changes.
* Added a missing aria-label to clear up an error.
aria-label='Feedback'
* Added accessibility to Headers Logo element.
Also changed from href to routing a method.
* Changed material ui buttons to reactstrap buttons
* Temporary comments for upcoming changes
* Styling & Functionality changes towards Reactstrap
Removed hel naming, unnecessary legend margins and SCSS styling, added reactstrap styling & functionality.
Formatted js files.
* Accesibility for tips
* Some comments and optimization for better loadtimes.
Removed Helsinki fonts and Material-ui icons import to reduce loadtimes for a better pagespeed result.
* Removed Temporary comments.
Co-authored-by: tmokko <58773830+tmokko@users.noreply.github.com>
* Missing header-styles (#16)
Re-adding styles that were accidentally removed during a merge.
* Added Navlinks, moderation link and Language selector to test (#17)
* Feature/lin19-validation (#18)
* Heltextfield test
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
* Added errorMessage for clear error-coloring when limit has reached
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
* Added short string (160 letters) for header
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Feature/lin59 skip link (#19)
* Added Skiplink and changed App main content-div
Added Skiplink for jump to #main-content, styling for it and placeholder formattedMessage.
* Added comment for skiplink
* Fixed filestructure
* Changed folder-name
* Feature/lin59 skip link (#20)
* Added Skiplink and changed App main content-div
Added Skiplink for jump to #main-content, styling for it and placeholder formattedMessage.
* Added comment for skiplink
* Fixed filestructure
* Changed folder-name
* Fixed import
* Removed useless Nav, added Aria-labels (#21)
Removed useless Nav, added aria-labels, added event handler for navbar brands
* Testing message background & testing message text change (#23)
* Update index.jade
* Changed red testingmessage color to be more darker for better contrast.
* Fixed languageselector test (#22)
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Security vulnerability and error fixes. (#24)
* Removing security vulnerabilities...
Fixed MOST packages which were causing security vulnerabilities and conflicts.
There is still 2 low level security vulnerabilities left from Babel 6 package family.
Updating the Babel 6 to 7 (or higher) will require code changes, so I left them for now.
( https://babeljs.io/docs/en/v7-migration )
Changed index.jade to .pug since .jade is deprecated and no longer in use (it's been renamed to .pug which is being updated)
( https://pugjs.org/api/getting-started.html )
* Changed jest version to be compatible
* Update yarn.lock
* Going back a version with Jest
Sadly npm jest 's newer versions aren't compatible with out node version.
Made optimization to fonts to increase pagespeed.
* Updated packages to newer versions.
Sadly we're not able to remove jest which causes a lot of warnings.
But at least we have newer versions of webpack, eslint, material-ui and react redux/dom
* index.pug meta/speed optimization (#26)
* Added meta tags for better search optimization
Also removed an unnecessary div from App/index.js
* Brought back div since it seems to be neccessary for some proptype
* Fixed an incompatability error with the react-redux package (#27)
Changed version back to the latest ^4.4 version from ^5..
* Updated search and test + added loca (#25)
* Updated search and test + added loca
Updated search to display found amount of events + easier for screenreader to read out loud. Updated test snapshot and test itself. Added loca
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
* Removed commented part
* Added results for english and swedish
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Changed intl-providers testmessages, updated snapshots and fixed broken test (#28)
Updated snapshots
Changed Intl-providers messages to just testMessages from i18n/fi.json
Fixed Header-tests error with formatMessage
* Added react-helmet component to index.js that changes the html lang attribute according to current locale. Updated test and removed old html lang attribute from the pug file.
* Feature/lin60 semantic headers (#30)
* Changed RecurringEvent components + styles
Changed RecurringEvent components from Material UI to Reactstrap (Few Material components left)
Made headers semantic with proper WCAG-placement
Added styling for Modal
Added isOpen for FormFields RecurringEvent-component
* Test for recurring event
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
* Changed test name
Co-Authored-By: Hannes <hienous@users.noreply.github.com>
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Material-UI Textfields to Form Inputs (#31)
* initial Textfield changes
Changed TextField from Material-Ui to Reactstrap, Increasing Accessibility
* Update HelTextField.js
* Textfield labels and placeholders
* Reverted some changes
* e
* Changed stylings for Editor-page and removed spacings
* Added comments to changes
Added comments to changes that were made as well as updated theme npm package.
Co-authored-by: tmokko <58773830+tmokko@users.noreply.github.com>
* Increasing Event Page Accessibility (#32)
* accessibility improvements
* More accessibility to eventpage
* EventDetails-page accessibility
* Fixed event readability
* Update index.js
* Removed unnecessary spaces
Co-authored-by: tmokko <58773830+tmokko@users.noreply.github.com>
* Accessibility improvements for form inputs (#33)
* Accessibility improvements
Changed form/formgroup to a div to remove "enter key" refreshing the page.
Added fieldID to id={fieldID} to give every input their unique ID, removing an aria error.
* Style changes for inputs
Changed classes to get back the input styles that were lost.
* Accessibility definitions (#34)
* Added accessibility definitions from LNI71 Branch to it's own branch
Seperated Footer / Accessibility definitions branch to their own respective branches.
* Added comment
* fix/LIN74 (#38)
* fix so that event data shows up in the form when editing,
type prop(string) for the input is now passed from FormFields/index -> MultiLanguageField -> HelTextField. ie type='text' / type='textarea'
* Added stylings for textarea
Also changed h2 styling to label since h2 isn't used/correct anymore.
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Updated city_theme version.
* Header link list hotfix on mobile (#39)
Added inline-grid for link list
* Changed turku:internet to virtual:public for our Backend (#40)
* Changed welcome texts to reflect our needs (#41)
Changed our Welcome texts to our own variables.
* Feature/date picker (#42)
* Added custom date picker and date time field
* Added date picker and date time fields to views
* Updated city_theme version (#44)
* Search page style changes. (#46)
* Updated old searchbar styles
Updated Search Bar styles since they were kind of broken.
Should be fixed now.
* Updated city_theme version.
* Changed localization-order (#45)
Changed order to FI, SV & EN
* Feature/imagepicker imageedit components + Cards #28 & #60 (#43)
* Imagepicker + Imageedit component update
Updated Material UI components to Reactstrap
Added new styling for ImagePicker
* ImagePicker & ImageEdit changes
Added mobile styling
Added styling
Changed components from Material UI partially to Reactstrap
Edited FormattedMessage
* added toggle parameters to Modal components and moved ImagePicker closebtn stuff to separate method.
* Updated components + styling
Added getCloseButton, P-tag for file-upload tip, styling for it and added it to i18n
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Updated testing message (#47)
* Updated pug testing message
Updated pug testing message so that it'll fit into mobile.
Also city_theme package update
* Updated city_theme
* Feature/cookie bar (#48)
* Added cookie bar
* Updated styles for CookieConsent
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Added required label asterix + error alert + className (#49)
Asterix for required field labels
Error role + ClassName in state of error for error-text coloring via theme
* Rotated ImagePickers glyphicon (#50)
* Rotated ImagePickers glyphicon
Rotated 180 degrees
* added styling
* Updated text to reflect new keyword change. (#51)
We use different wording in our backend.
* Initial footer commit (#53)
* Initial footer commit
Footer for linkedevents-ui, made by @almahonk @tmokko and @ducky07
Page height adjustments so that the footer will be displayed correctly.
* Updated theme package
Updated theme package version.
* Added maxlenght for provider and photographer fields (#52)
Added maxLenght for photographer and provider-fields
Added text-change to json-files.
* cookieBar link (#54)
* Updated cookie link
* Added cookie link to other languages
* Flipped cookie bar button order and colors (#55)
* Changed date picker to open at min date if end date hasn't been selected yet. (#56)
* Changed 160 remaining characters to 160/160 remaining (#57)
* Feature/lin76 logout button (#58)
* Created custom logout-component for header
Custom logout-component for header
Styling for it
* Added styling and removed useless lines
Co-authored-by: Hannes <hienous@users.noreply.github.com>
* Feature/event table rework (#61)
* initial commit for replacing material-ui table
EventTable.js:
Replaced most material-ui components and refactored the table mapping so its semantically correct.
EventRow.js:
Replaced old material-ui components with new ones.
TableHeaderCell.js:
Replaced old material-ui components with new ones.
Validation/Publisher/Name/DateTime Cell files:
Refactored all Cell components to React classes.
Added new HeaderCell.js and CheckBoxCell.js:
CheckBoxCell is a new component that returns a reactstrap Input checkbox that is used in the table body rows.
HeaderCell is a new component that populates the table header cells, previously this was done by TableHeaderCell.
Added a bunch of scss rules for the new components/table although it is still WIP.
* Changed isActive PropTypes
isActive: PropTypes.bool to .func
* added tests
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* removed material ui Chip (#59)
replaced whit reactstrap badge
* removed Material-Ui Chip (#60)
Replaced Material-Ui with Reactstrap badge
* Validation Popovers (#62)
* Initial popver changes
* Popover styling
Improved Popver stylings and made them more mobile friendly.
* Updated city_theme package
* Popover styling
* Updated city_theme package.
* Updated to EventAction-buttons and modal behind them (#63)
* Updated to EventAction-buttons and modal behind them
Added mobilestyling for EventAction-buttons
Added styling for modal behind EventAction-buttons
Removed footer-landmark from EventActions and changed to div
* minor adjustments/refactoring
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Removed length max from fields (#64)
* Event action buttons (#65)
Changes to event-action-buttons.
Styled more like what it probably should be while maintaining mobile friendliness.
* Feature/lin6 preview event (#66)
* WIP added PreviewModal to Editor
* Added Preview Event Modal
Added ClassNames to EventDetails for preview-classname based on prop
Added disableSuperEventLinks-prop for preview not to display superEvent in preview.
Added PreviewEvent-Modal so event can be observed how it would look like before submitting
Added styling for PreviewEvent-modal
Added 2 intl-messages for Preview
Added PreviewModal into Editor, added function for button and state for display.
* Removed useless parameters
* Removed Material-Ui from Checkboxes (#67)
* Removed Material-Ui from Checkboxes
Made some hotfixes to Id's
* Changed Checkbox Styles
Changed input checkbox styles to fit better for mobile.
Small tweak to validationpopover font style.
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Small style change (#69)
Made it so that language selection texts won't make unnecessary space.
* Removed aria label error (#70)
Removed aria error from checkbox.
* Hotfix - Removed form label errors (#71)
* Removed aria label error
Removed aria error from checkbox.
* Update index.js
* Feature/lin28 picture helptext (#68)
* Changed helptext for uploading image
Added danger-coloring to error-text, added alert-role for screenreaders, changed position of error-text & changed helptext for uploading image
* Added more detailed tips for uploading picture
* Mobile friendly action buttons (#73)
* Button style changes
Increased mobile friendliness.
* Updated city_theme version.
* Updated to mobile buttons (#74)
* Feature/snackbar (#72)
* Remnoved materia-ui from Notifications
* Updated Alert Notification styles
* snackbar
* fixed Notifications flashmessages div
* hotfix for notifications
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Changed buttons way of display (#75)
* Hotfix for umbrella-badge (#76)
* Hotfix for umbrella-badge
* Theme package update.
Updated city_theme to a newer version which brings in mobile fixes.
Co-authored-by: Jack Valley <juuso.laakso@turku.fi>
* Streamlining mobile looks (#78)
* Streamlining mobile looks
Changed paddings for headers in mobile for tighter look.
Changed events selection in which language event would be presented, switched Labels position from above input to under it for better look in mobile & changed aria-checked from mixed to isChecked.
Changed recurringEvents modals layout to more streamline.
in editor changed language checkboxes styling little bit to match changes in HelLanguageSelect
Changed legends margin in mobile for tighter look.
Changed action buttons tyling overall in different views(moderator, regular user etc) to be more streamlined and not leak over the page.
* Theme package update
Updated city_theme package for updated mobile styles.
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Bringing organization ancestor changes from City-of-Helsinki (#79)
Bringing organization ancestor changes from City-of-Helsinki as well as max subevent display count.
* Changed date time fields in events form to take FormattedMessage as label instead of only translation id (#80)
* Changed textfield to input and added styling / removed withStyles (#81)
* Feature/material ui removal (#82)
* removed material-ui
* removed material-ui + 'styling'
* Removed HelDatePicker
no longer in use
* Removed Material-ui DeleteButton
replaced it with glyphicon-trash icon and html button
* removed materia-ui
* removed material-ui
Changed Checkbox to input
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Deleted useless imports (#83)
* removed h6 tag (#84)
changend h6 tag to p tag and improved accessibility
* improved keyword bages (#85)
* Accessibility improvements (#86)
* Added translated texts for en and sv
Translated texts for preview event, footer and event postponing.
* Changes to EventActionButtons and Welcome Message
Changed EventActionButton to be inside a render, so that button texts change with page language.
Changed welcome message to appear again, now also with translations.
* Updated theme package version
Bringing in new translations through city_theme
* Removed EvenActionButton changes
Removed EvenActionButton changes since they're going to be added to another branch, seperate from this one.
* Update index.js
* Changed link color to a darker blue
for better accessibility
* Updated theme package
Updated version of city_theme for better accessibility.
* Fixed a Proptype error (#88)
@tmokko Fixed a Proptype error.
* Feature/accessibility (#89)
* Accessibility changes
* cleaning lines
* Mobile Hotfix (#93)
* Fixed width
* ClassName to audience boxes & stylefix
Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com>
* Changed Material UI icon to bootstrap (#92)
* improved accessibility (#91)
formcontrol to searchbar and label
* Updated DebugHelper component (#90)
* Updated DebugHelper component
Added styling
Changed Material UI components to Reactstrap
Changed hardcoded texts into FormattedMessages.
* Google translated tooltip
* Updated theme package and fixed an className Error
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* EventActionButtons (#94)
* Initial EventActionButton changes
EventActionButton changes by @hienous
Replacing some old Material-UI as well as changing EventActionButton to a class type component in order to enable language text changes for action buttons.
* fixed/refactored EventActionButton so that it actually works, added styling to the elements that EventActionButton renders.
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Feature/custom events table pagination (#95)
* Replaced material ui table pagination with custom one
* Updated test snapshots
* Changed sv pagination shortcut link text
* Feature/22 event location map (#96)
* Added EventMap component that displays the event location on the editor page via the formfields component. The map component visibility is toggled by a button, a tooltip is displayed on the button if a location has not been selected.
Updated FormFields/index with the new EventMap component and a button that toggles its visibility.
Updated HelSelect with a new prop 'optionalWrapperAttributes' that are used to add attributes to the div that wraps the Select, added aria-labelledby to the Select component.
Major rework of HelSelect functions that are used when selecting location, search results are now displayed in the currently selected language, if the selected location is missing ie. a swedish name then the finnish one is used by default.
Added new language specific messages that are used by the EventMap component/toggle button.
Added two json files to src/assets/default, these are used when city_theme is not in use, urls has the url to the helsinki tileset and localization contains the default map center/position for helsinki.
* Added aria-label to toggle button that is used if no event location is selected, added className to toggle button which adds disabled state styling to the button if no event location is selected.
Removed tooltip from the button as it is no longer needed with the new disabled state styling added to the button.
* Added changes to make the editor page display input texts according to the selected language. (#97)
Changes include:
EventDetails/index.js: Changed OptionGroup function to display event checkbox values according to selected language.
FormFields/index.js: Added availableLocales array[string] to component state that contains the locales that can be specified for data retrieval. Added currentLocale variable that is passed to location/keyword select that checks if current intl.locale is included in availableLocales.
HelKeywordSelector.js: Category texts change according to the selected language, currentLocale is passed through to other components.
HelSelect.js: Keyword search results are displayed according to the selected language, reworked the location search so that it is similar to the new keyword search.
ImagePicker/index.js: Changed order of exports, this seems to have fixed the texts that didnt change with language.
SelectedKeywords.js: Text changes according to the selected language.
sv.json: Added a bunch of translations that were previously missing. Some of the translations are quite rough, change them when a better translation is provided.
apiDataMapping.js: Added an additional key to the return object of the mapKeywordSetToForm function.
formDataMapping.js Modified obj.keywords so that if you click 'edit event' on an event page, the following editor page has all of the language specific keywords
* Fixed and added tests for HelTextField (#99)
* replaced material-ui tooltip with reactstrap tooltip (#98)
* Replaced material-ui Tooltip with reactstrap Tooltip, minor refactoring to EventActionButton & UmbrellaCheckbox, added tooltip styling to make the new tooltip look like the old one.
* changed tooltip background color
* changed button behaviour when disabled, button receives aria-disabled/aria-label when disabled, added one sv translation
* modified Button aria-label
* Fixed and updated header and editor tests (#100)
* Removed material ui from app view (#101)
* Changed notifications to update language when user changes language (#102)
* Changed notifications to update language when user changes language
* Added tests for notifications and proptype for locale
* Fix/event action button onclick and aria label (#103)
* Fixed EventActionButton onclick and changed its aria-label
* Added tests to EventActionButton
* Added create draft button for admins in event creation (#104)
* Removed search bar auto focus and duplicate input (#105)
Changes:
Removed search page text input auto focus and hidden duplicate input for the text input.
Added tests for SearchBar.
* Changed customDatePicker to use strict date validation on componentDidUpdate (#106)
* Feature/multilanguage video fields (#107)
* Added MultiLanguage Video fields.
Notable changes:
HelVideoFields.js: reworked to class component, video name and alt_text fields are now MultiLanguageField so that each selected content language gets its own specific input fields, added functionality to add/remove additional videos which can be enabled by uncommenting the Button components. Added a bunch of tests
EventDetails/Index.js: modified so that it displays the name/alt_text values for each language specified in the event video object.
validationRules.js: modified the isEmpty function to check if given value is object -> all of its values are ''
FormFields/Index.js: added new prop that is passed to HelVideoFields
* Fix issue with old event video data showing up in the form. Previously if one was editing an existing event and clicked 'create a new event', then the edited events video data would show up in the new events video inputs.
* switched the order of components so that SideField is rendered first, the direction is then flipped visually with flex-direction: row-reverse so that it looks the same as before. Previously screen readers arrived at the SideField texts after the inputs, now because the SideField content is before the inputs in the DOM they are read first. (#108)
* Fixed accessibility issues in organization selector (#109)
* Fixed accessibility issues in organization selector
-updated some of the input attributes
-updated onChange function to be bound named function
-changed select input from react-select to reactstrap input select
-added tests for organization selector
* Feature/lin63 event table mobile (#110)
* WIP added mobile responsive + styles
* Added some mobile styling
* Fixed buttons in mobileview in moderation
* Fix, the db changes that were made for the HelVideoFields component nullified the name and alt_text fields of preexisting events with videos. Because they were null, the validation caused an error when trying to edit the event. (#111)
* Changed searchpages styling (#114)
Changed datepickers fontsize & optimized search for mobile
* Feature/header rework (#112)
* WIP Buttons to Navlinks + Accessability
WIP
* WIP reworked accessability & NavLinks
* Removed accidental changes on Table
* Fixed navigation and added more styling
* Updated active pathnames and updated test.
* Removed out commented components and added comment about it.
* Removed comments and added fontsize + weight for NavLinks
* Changed margin size for Glyphicon on m
* Minor refactoring for Header/index, removed redundant tabIndex from links etc. Refactored Header.test.js and added a few tests. Updated scss so that the mobile dropdown opens smoothly. Updated test snapshots.
* Updated OnClick paths & border for buttons
Header/index: Removed RouterPush consts from render and created HandleOnClick function to work with mobile collapse & changed border from auto to black to be compabtitle with browsers
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Form id fixes and validation (#113)
* Hotfix for Heltextfield id
* Fixed id
* Fixed an issue with readOnly functionality.
Removed an error to do with readOnly property.
* Updated PropTypes
Updated PropTypes since there are both strings and objects being used.
* Textfield ID fixes
Fixed ID errors for HelTextField.js, MultiLanguageField.js and NewOffer.js.
Added a validation fix for old event editing by @hienous
* Update validationRules.js
* Updated label and location id
location id from input to span
* Removed title in favor of aria-label
* Added formatted message to delete button
* Update NewOffer.js
Fixed formatted message
* Removed aria from glyphicons, because they're not required to be read.
* Added translations to copytoclipboard
Added translations and increased accessibility for copytoclipboard buttons.
* Improved the OrganizationSelector Aria readability
Co-authored-by: Mokko Tarja <tarja.mokko@turku.fi>
* Updating city_theme package version (#115)
* Added accurate translations Recurring events id (#116)
Co-authored-by: Mokko Tarja <tarja.mokko@turku.fi>
* Fixed labels for MultiLanguageField (#117)
Labels should now read correctly when adding event information in multiple languages.
Changed city_theme package version to '0.x.x', it will update to the latest patch and minor versions of city_theme automatically without requiring manual package version change.
* Added better descriptive labels for delete price button. (#118)
Added mobile styles so that it will scale properly.
* Added / changed accessability (#119)
Changed imagediv to button for accessability, removed useless arias and tabIndexs, old comments and moved external input inside label above for accessability.
Updated snapshot
* Fixed test (#120)
* Fixed test (#121)
* Fixes test errors (#122)
Fixed simple test errors.
Passing all test now.
* Updated theme package version. (#125)
* Feature/lin112 mobilestreamlining (#123)
* Added margin to sidefields for better view on mobile
* Added className for Imagepickers sidefield & styling into mobile
* Removed create-event buttons hide-func (#124)
* Added accessability to search (#127)
* Added accessability to search
Added tabindexs to titles
Added new Arias to better inform user
Added all 3 translations
* Removed aria-disabled
* Changed swedish translations
* Revert "Added accessability to search (#127)" (#128)
This reverts commit 29af486f5cb4ec6a64d6fa1f4059b1ecf4811d0b.
Co-authored-by: aceViilee <51813121+aceViilee@users.noreply.github.com>
* Updated Namecell expand (#126)
* Updated Namecell expand
Changed Eventtables span-caret to button
Added styling to it
Added Aria-label for accesssability
Added injectintl for global localeupdate into Eventrow
Added intl-texts for finnish, english and swedish
Updated test
* Removed useless import
* Updated snapshots
* Added translations for /help page (#130)
* Initial .md changes
Made it so that the text on the /help page changes depending on what mode the ui is set to (events or courses)
Still requires functionality to replace old Helsinki texts with .md files from theme package.
* WIP Moved markdown-files to asset folder for city_theme usage
Moved help markdown-files to assets for city_theme usage
Now returns either city_theme markdown-files or defaults depending on city_theme settings
* Restored original Helsinki-text into default MD
Co-authored-by: DelusionCB <threepiiem@gmail.com>
* Changed theme version to 0.6.4 (#131)
Sadly the theme version doesn't update for whatever reason in the production. So we have to still change it manually.
* Feature/image edit rework (#129)
* INIT COMMIT, Refactored ImageEdit so that images can now have language specific names/alt-texts, fixed ImagePicker handleDelete method so that it now displays the images name according to current language, ImageThumbnail displays the name of the image according to current language
* ImageEdit refactoring, added checkbox to indicate that user has permission to upload/use picture, added help texts that explain the different license options, added a few tests, adjusted/added stylings to the license inputs.
ImagePicker.test.js decided that it needs the @city imports(even though it doesnt use them?), added jest.mocks so tests work again. Updated languages jsons, updated snapshots
* minor ImageEdit refactoring, added missing tests, added paths to package.json -> jest -> moduleNameMapper to fix issue that some test files decided that they required the theme-package imports although even if they weren't used.
* photographerName is now a required field, updated getNotReadyToSubmit method to check that photographerName exists and is not too long.
* updated fields that are skipped during validation, previously e.g., if a swedish only event had an image that contained name/alt_text for 3 languages then if you tried to modify the event it enabled all 3 languages for the event.
* updated package.json city_theme dependency version
* updated yarn.lock
* Fixed event start time not being shown as a required field (#134)
* previously the event preview modal only displayed the image if keywords existed. Images are now always displayed in the preview modal. (#133)
* Added aria-label for trashcan/delete glyphicon (#132)
* Added aria-label for trashcan/delete glyphicon
* Changed translation
* Updated snapshots
* Updated Image-components locales (#136)
Passed locale to ImageThumbnail so now displayed Images texts are based on locale. Locale being finnish -> Shows name equal to current locale if given name in different language, otherwise return default (finnish)
Changed thumbnail-div to button for accessability.
* Fixed event location not being shown as a required field (#137)
* Initial /accessibility page changes (#135)
* Initial /accessibility page changes
Added accessibility texts to come from .md files as well as added our translations to theme package.
* Added a return fallback to .fi.md
in case there's no translation file for set language.
* Added a return file for /help page as well
* Fixed test (#138)
* Removed yarn.lock (#139)
Removed yarn.lock so that our production build will always take latest packages and their dependencies.
* Update ImagePicker.test.js.snap (#140)
* Material-UI - Removal (#141)
* Removed material-ui packages since they're no longer being used
* Removed old Helsinki theme
Removed old js style files which aren't in use.
* Changed collapse for header and some sizes (#142)
* Initial heading level fixes (#143)
* category legend to h2
Changed form category headers from legend to h2
* Changed heading level
for HelSelect and HelLabeledCheckboxGroup
* Changed legends to headings (h2 & h3)
* Removed h2-wrap from image and changed max-height
* Updated image-picker heading level
* Wrapped price input to label
* Updated event info heading levels
Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com>
* Increased Firefox accessibility (#144)
* Added aria-label to HelTextField
Added aria-label to HelTextField since htmlfor reference wasn't enough for Firefox. (Earlier implementation worked fine on chromium-based browsers)
* Improved accessibility
* Updated test snapshots
* Added intl to SelectedKeywords, added accessability and added transla… (#145)
* Added intl to SelectedKeywords, added accessability and added translations for english and finnish
* updated snapshots
* Fixed update language in language change (#146)
* Interner Explorer Warning message (#147)
* Initial IE warning commit
* Update BrowserWarning.js
* Update BrowserWarning.js
* Update BrowserWarning.js
* Tested functionality
* Removed old IE check
Removing old checker since it no longer works.
* Updated Swedish translations
* Feature/lin65 pagingnumber (#148)
* Added accessability
* Added page number for screenreader + updated snapshots
* Fixed translation (#149)
* 103 remote participation keyword for virtual events (#150)
* remote participation is now added as a keyword when event location is set to 'Virtual event'.
* remote participation is now added when no keywords exist
* Feature/new offer length (#151)
* Added ruling and limit to maxium amount of offers
Added limit of 20 to offers (can be changed from constants)
Added red-colored alert-message when limit is exceeded
Added placeholders for translations
* Updated snapshots
* Updated
Changed disabled to be cleaner
added count value for limit
* Aaand updated snapshots again
* Changed classname to start with lowercase
* and lowercase scss
* Updated missing form label for tables checkboxes (#162)
* Updated missing form label for tables checkboxes
Updated & fixed tests
Added placeholders for localization
Added labels for screenreader
Added styling
Co-Authored-By: Hannes <50320115+hienous@users.noreply.github.com>
* Updated events in utils and EventTables cells
Changed utils/events.js to get event named based on locale, not first value from multilanguage
Updated CheckboxCell and NameCell to do the same.
Co-Authored-By: Hannes <50320115+hienous@users.noreply.github.com>
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Merging Turku Specific Changes to Develop. (#168)
* Feature/sidefield guidance (#152)
* SideFields/Styles and translations
Added new SideFields to better guide users through the form as well as small style tweaks.
Updated test files.
Waiting for review.
* Removed unused component
* Initial Matomo integration (#153)
Adding Matomo tracking to our .pug Header
* Feature/lin114 reportmodal (#154)
* Moved debughelper to Footer
Moved debugHelper-button to open DebugReportModal into Footer and removed useless pathing from index
* Removed context and changed label to intl props
* Removed useless landmark from Footer
* Revert "Removed useless landmark from Footer"
This reverts commit 1065e18511fde11795466584ce3d8aa9694cf25e.
* Removed useless aria-label from Footer *
* Updated snapshots, fixed jests moduleMapper, added placeholders for reporting button
* Added space to intl prop and changed commented text
* Fixed text
* Feature/#104 umbrella selector (#155)
* initial umbrella selector location change
Moved umbrella selector to be near the event time selection on the form.
* Removed useless rows and added styling
* Removed duplicate umbrella-event
Co-authored-by: Jack Valley <Juuso.laakso@turku.fi>
* Changed add new occasion and recurring event buttons to be disabled when event is umbrella (#156)
* Changed position for button (#157)
* Initial localization language change (#158)
* Added localization functionality
Sets website language from current browser language.
By @hienous
* Save localization to cookies
Saves localization option to storage, which language has been selected.
* Combined same if typeof
Unnecessary to have two of the same type.
* Removed tooltip from button and moved tooltip-text to modal + hide hrs from screenreader (#160)
* Changed component locations on the form page (#161)
Changed some field locations on the form field per Tiia's request.
* Added better meta tags (#159)
* Added more descriptive meta tags
Added better meta tags for search engine optimization.
* Removed meta robots and revisit-after
Removed meta for robots and revisit since robots definition is 'index, follow' by default and revisit-after is being ignored by most bot crawlers.
* Changed en description to fi
* Favicon for linkedevents
Added favicon for linkedevents, changes to helsinki's favicon when no theme package is present.
* Updated test file
Updated jest mock for favicon
* Travis CI update (#163)
* Update .travis.yml
* Update README.md
* Removing authedFetch.js
Helsinki's authentication file. In our authentication system we do not use it
and it is causing issues when running lint tests.
* Updated .travis.yml
Updated travis.yml so that the tests can be run.
* Changed README.md
Updated travis build status address.
* Update .travis.yml
Co-authored-by: pelmat <58703747+pelmat@users.noreply.github.com>
* Accessibility improvements (#165)
Improved accessibility for event tables.
It should now read checkboxes correctly and have higher contrast for badges.
* Implemented codecov (#166)
* Feature branch merge (#164)
* Update .travis.yml
* Update README.md
* Removing authedFetch.js
Helsinki's authentication file. In our authentication system we do not use it
and it is causing issues when running lint tests.
* Updated .travis.yml
Updated travis.yml so that the tests can be run.
* Changed README.md
Updated travis build status address.
* Update .travis.yml
Co-authored-by: pelmat <58703747+pelmat@users.noreply.github.com>
* Update .travis.yml
* Update .travis.yml
* Update package.json
* Update package.json
* Update README.md
* Update README.md
Co-authored-by: pelmat <58703747+pelmat@users.noreply.github.com>
* Feature/lin121 image components (#167)
* Updated missing form label for tables checkboxes (#162)
* Updated missing form label for tables checkboxes
Updated & fixed tests
Added placeholders for localization
Added labels for screenreader
Added styling
Co-Authored-By: Hannes <50320115+hienous@users.noreply.github.com>
* Updated events in utils and EventTables cells
Changed utils/events.js to get event named based on locale, not first value from multilanguage
Updated CheckboxCell and NameCell to do the same.
Co-Authored-By: Hannes <50320115+hienous@users.noreply.github.com>
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* INIT commit, select image from organization, upload new images from local/url and initial version of default images
* Updated to image-components
Changed default picture fetch organization.
Changed formfield-structure for image-components.
Added validation to upload from url.
Added validationText-color.
Added localization and changed previews to divs from Buttons.
Removed buttons from ImagePicker.
Changed Imagepickers styling and added mobile.
Added labels to ImageThumbnails,
Changed styling to ImageThumbnails.
Added finnish and english loca
* Changed imagePreview to be hidden in mobile before picture is selected
* Removed !important
* Changed Image components + added/changed tests + styling
Changed defaultImage request functios name for clearer meaning.
Updated/added new tests for ImageEdit, ImageGallery and ImagePicker. Updated snapshots.
Changed component structure and added styling.
* Added city_theme publisher ID to userImages, removed non-used content
* Removed non-used lines.
* Update ImagePicker.test.js.snap
* Event-row location with tip-text
* Fixed missing closing tag
* Cleaned components
Added locale for ImageGallery
Cleaned ImageEdit = added classNames and styling, removed hardcoded styles
Cleaned ImageGallery = Added classNames and styling, removed hardcoded styles
* Update ImageGallery.js
Changed col sm 6 to 5 for compact look.
* removed tabs from infotexts and added semantic
* Finetuned styling for picture tips.
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Removed extra imports and consts
Removed duplicates
Co-authored-by: DelusionCB <59691622+DelusionCB@users.noreply.github.com>
Co-authored-by: pelmat <58703747+pelmat@users.noreply.github.com>
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Increased search page accessibility (#169)
* Increased search page accessibility
Improved accessibility on the search page.
Updated Travis & codecov links for develop branch.
* Updated tests
Still requires some more fixes.
* Updated formatted message count
* Added better description for modal closing button to reflect what it's closing (#170)
Updated tests
Added better description to all modal closing buttons
Added finnish translations
Swedish and english placeholders
* Accessibility improvements (#171)
* Changes to improve accessibility
Changed colors to be more accessible.removed unnecessary styles which were conflicting with other styles.
* Fixed styles
Fixed which weren't working before and removed unnecessary styles which were not doing anything.
* Fixed button margin
There were no spacing between action buttons.
* Fixed a small mobile style error
Links would break in a very specific width setting.
* Updated tests
* Removed unnecessary 'Button' component
Added arialabel for report modal button.
* Updated tests
and removed unnecessary .legend style
* Update index.js
* Updated test snapshots
* Added more tests
In collaboration with @DelusionCB
* Feature/lin95 eventtable language (#172)
* Alot of changes ->
1. Added language-badges to events
1.1 Added styling for badges
2. Added placeholder loca
3. Added language parameter
4. updated eventlisting test
5. Added radio buttons for language filtering
5.1 Added styling for them (moved eventlisting styles from moderator-sheet and created own sheet for eventlisting)
6. Deleted random dublicate searchpage.scss
* Fixed tests and deleted commented part
* added tests
Co-authored-by: Hannes <50320115+hienous@users.noreply.github.com>
* Fixed events created by user pagination. (#173)
Pagination didn't reset when going to page 2 and selecting "Show only events created by "me"". Fixed that.
* Lint, Link and Test improvements (#174)
Lint commands now actually work.
Footer link now changes from theme package, also made tests for Footer.
Copy to Clipboard is now hidden from aria.
* Removed tabIndexes and general accessibility fixes (#175)
Removed unnecessary tabIndexes, increased 'Check data in the form' text contrast level and changed agree to terms checkbox to be after the informative text.
* Page Title Accessibility (#177)
* Page Title Accessibility
HTML title now changes & translates with page/language change.
Added tests for react-helmet component.
Removed extra empty header from App
Removed unnecessary tabIndex from Event/index
* Removed unnecessary export
* fix: upgrade redux-actions from 0.9.1 to 0.13.0 (#178)
Snyk has created this PR to upgrade redux-actions from 0.9.1 to 0.13.0.
See this package in npm:
https://www.npmjs.com/package/redux-actions
See this project in Snyk:
https://app.snyk.io/org/pelmat/project/294d4340-625d-4d00-ba2f-131bc13b78fd?utm_source=github&utm_medium=upgrade-pr
* fix: upgrade bootstrap from 4.4.1 to 4.5.2 (#179)
Snyk has created this PR to upgrade bootstrap from 4.4.1 to 4.5.2.
See this package in npm:
https://www.npmjs.com/package/bootstrap
See this project in Snyk:
https://app.snyk.io/org/pelmat/project/294d4340-625d-4d00-ba2f-131bc13b78fd?utm_source=github&utm_medium=upgrade-pr
* fix: upgrade axios from 0.19.2 to 0.20.0 (#180)
Snyk has created this PR to upgrade axios from 0.19.2 to 0.20.0.
See this package in npm:
https://www.npmjs.com/package/axios
See this project in Snyk:
https://app.snyk.io/org/pelmat/project/294d4340-625d-4d00-ba2f-131bc13b78fd?utm_source=github&utm_medium=upgrade-pr
* fix: upgrade nconf from 0.9.1 to 0.10.0 (#181)
Snyk has created this PR to upgrade nconf from 0.9.1 to 0.10.0.
See this package in npm:
https://www.npmjs.com/package/nconf
See this project in Snyk:
https://app.snyk.io/org/pelmat/project/294d4340-625d-4d00-ba2f-131bc13b78fd?utm_source=github&utm_medium=upgrade-pr
* Feature/lin137 picture accessability (#182)
* Updated accessability and added few changes
1. Added way to clear the pictures from states
2. Added reset of states to submit
3. Changed thumbnails setstate to reset imagefile
4. Added "SetAltDecoration"-function to automaticly add "This picture is an decoration" to input and hide the input-fields
5. Added new tips & placeholder localization
6. Updated tests
* Update ImageEdit.test.js
* Added & changed text
Moved alert-text under input & added one more tip
Redid scss to be cleaner
updated tests
added placeholders for new loca
* Navigation accessibility (#183)
* Initial nav changes
Updated order, styling and tests.
* Hidden HR
Made HR invisible to screen reader
*…
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.