Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge verein-website into website #209

Merged
merged 13 commits into from
Dec 10, 2019
Merged

Merge verein-website into website #209

merged 13 commits into from
Dec 10, 2019

Conversation

baltpeter
Copy link
Member

No description provided.

The main change here is a new Markdown parser. We need to explicitly
allow inline HTML.

Also, the new parser apparently handles some cases differently,
which is fun.
@cypress
Copy link

cypress bot commented Dec 6, 2019



Test summary

19 0 0 0


Run details

Project website
Status Passed
Commit 155d14a
Started Dec 10, 2019 1:31 PM
Ended Dec 10, 2019 1:32 PM
Duration 00:58 💡
OS Linux Debian - 9.6
Browser Electron 73

View run in Cypress Dashboard ➡️


This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

The menu is now deliberately hardcoded instead of using the Hugo
menu feature. I genuinely can't see any advantage to that feature
and without it, i18n is trivial here.
* The 'verein.datenanfragen.de' website is no longer active, it
  has been merged into the main website.

* We have started a new language version at demandetesdonnees.fr.
For now, this only includes the NPM dependencies but this is
much better than previously.
For now, this only includes the NPM dependencies but this is
much better than previously.
@baltpeter baltpeter changed the title WIP: Merge verein-website into website Merge verein-website into website Dec 7, 2019
@baltpeter
Copy link
Member Author

@zner0L This is ready for review now.

This needs to be merged first, followed by datenanfragen/verein-website#10.

Copy link
Member

@zner0L zner0L left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I like all that very much! Thanks for taking on the challenge. I highlighted the things that I might want changed.

content/open-source.de.md Show resolved Hide resolved
content/verein/constitution.de.md Show resolved Hide resolved
src/i18n/de.json Show resolved Hide resolved
src/Utility/common.js Outdated Show resolved Hide resolved
The problem was that we were copying the transfer details using
`innerHTML` which obviously doesn't preserve the canvas data.
Now, we are also repainting the QR codes in the print window.

The print function was already specific to this use-case but it is
now even more, so it doesn't make sense to keep it in `browser.js`,
this commit moves it into the `DonationWidget.js`.

Finally, keep the QR code background pure white in the print window
as opposed to the slight off-white on the main site.
@baltpeter
Copy link
Member Author

Note: Once this is merged, we should inform the ITZ of the new URL for the transparency page.

@zner0L zner0L merged commit 5d94ed2 into master Dec 10, 2019
@zner0L zner0L deleted the b_verein branch December 10, 2019 13:48
@NathanBnm NathanBnm mentioned this pull request Feb 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet

2 participants