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

New design notifications news #1673

Merged

Conversation

RalitsaIlieva
Copy link
Contributor

Closes #1550 (news subscription)

Motivation and context

There is new design that should be implemented.

Screenshots:

image
image
image
image
image
image
image

Before After
Paste screenshot Paste screenshot

Testing

Steps to test

Affected urls

Environment

New environment variables:

  • NEW_ENV_VAR: env var details

New or updated dependencies:

Dependency name Previous version Updated version Details
dependency/name v1.0.0 v2.0.0

Copy link

github-actions bot commented Nov 24, 2023

✅ Tests will run for this PR. Once they succeed it can be merged.

RalitsaIlieva and others added 23 commits December 11, 2023 12:01
* headings font size bug fixes

* removed library from package.json
* Terms and GDPR added in the registerForm

* Format check added

* Some error messages added in the RegisterForm
* update README.md [skip ci]

* update .all-contributorsrc [skip ci]

---------

Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
Co-authored-by: igoychev <igoychev@gmail.com>
Co-authored-by: ani-kalpachka <ani.kalpachka888@abv.bg>
Co-authored-by: ani-kalpachka <ani.kalpachka888@abv.bg>
…1624)

Bumps [@babel/traverse](https://github.com/babel/babel/tree/HEAD/packages/babel-traverse) from 7.22.8 to 7.23.2.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.23.2/packages/babel-traverse)

---
updated-dependencies:
- dependency-name: "@babel/traverse"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* upgraded NextJS to fix dependabot vulnerability warnings

* fixed linter and formatting

* reverted next to 13.4.12, updated MUI and translation libraries

* upgraded playwright to latest

* fixed language change and corrected decimal separators

* forced resolution for postcss and zod to fix security recommendations

* added locale for tests to fix decimal separator mixups

* donation amount changed to integer to avoid language specific decimal separators

* upgraded node to v20

* fixing the docker build context to use the already checked out code from github checkout action
* Update Guarantors slider

* Revert unnecessary changes

---------

Co-authored-by: ani-kalpachka <ani.kalpachka888@abv.bg>
* Update bank details on donation

* Update reasoning

---------

Co-authored-by: ani-kalpachka <ani.kalpachka888@abv.bg>
Bumps [crypto-js](https://github.com/brix/crypto-js) from 4.1.1 to 4.2.0.
- [Commits](brix/crypto-js@4.1.1...4.2.0)

---
updated-dependencies:
- dependency-name: crypto-js
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Update next version to 13.5.4

* i18n: Fix translations not working for dynamic paths

* i18next.config: Detect user's locale from NEXT_LOCALE cookie
Co-authored-by: ani-kalpachka <ani.kalpachka888@abv.bg>
* Add refund button

* Add refundStore

* Fix prettier problem

* Remove log

* Fix typos

* refundClickClickHandler -> refundClickHandler

* Show extPaymentId in confirmation box

* Fix button typo
* fix: shows tabs for donors and wishes

* fix: wishes tab shows messages and pagination

* fix: adds btn 'Show all' to wishes tab, align wishes array

* fix: InfoIcon align

* fix: shuffle wishes array

* fix: clear unused classes
dependabot bot and others added 14 commits December 14, 2023 19:55
Bumps [next-auth](https://github.com/nextauthjs/next-auth) from 4.22.1 to 4.24.5.
- [Release notes](https://github.com/nextauthjs/next-auth/releases)
- [Commits](https://github.com/nextauthjs/next-auth/compare/next-auth@4.22.1...next-auth@4.24.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Remove legacy hotjar implementation
Hotjar is now loaded through the GTM

* CampaignsPage.tsx: Remove Hotjar implementation
)

Bumps [@adobe/css-tools](https://github.com/adobe/css-tools) from 4.3.1 to 4.3.2.
- [Changelog](https://github.com/adobe/css-tools/blob/main/History.md)
- [Commits](https://github.com/adobe/css-tools/commits)

---
updated-dependencies:
- dependency-name: "@adobe/css-tools"
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ani Kalpachka <ani.kalpachka@merkle.com>
… in (podkrepi-bg#1677)

When user logs in trough donation step 2, person's data remains undefined due to data not being updated.
Manually refetch the data coming from useCurrentPerson() after login to refresh the user's data
@sashko9807 sashko9807 self-assigned this Dec 15, 2023
@@ -8,13 +8,15 @@ import { TranslatableField, translateError } from 'common/form/validation'

export type CheckboxFieldProps = {
name: string
sx?: object
Copy link
Member

Choose a reason for hiding this comment

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

Type should be SxProps<Theme>

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done

<CampaignFinanceSummary campaign={campaign} expenses={totalExpenses ?? 0} />
</Grid>
{(expensesList?.length || canEditCampaign) && (
{expensesList?.length ||
Copy link
Member

Choose a reason for hiding this comment

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

Please consider merging with the latest master, because this condition as is, will hide the expenses table for normal users.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

fixed

@@ -28,6 +29,7 @@ export default function IndexPage() {
<PartnersSection />
<TeamMembersSection />
<JoinPodkrepiBgSection />
<SubscriptionSection />
Copy link
Member

Choose a reason for hiding this comment

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

Too many sections/buttons have been created to subscribe for the newsletter.
@swolf86 can you please point us to the final design of where the newsletter subscription's position should be on the main page.

Copy link

Choose a reason for hiding this comment

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

https://www.figma.com/file/MmvFKzUv6yE5U2wrOpWtwS/Podkrepi.bg?type=design&node-id=3904%3A13406&mode=design&t=i8Eql4jYENDpTGgA-1

  1. under what have we achieved?
    Съществуващата секция “Какво постигнахме досега” да се допълни с функционалност за абониране
  2. under Who is behind Podkrepi.bg?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

image

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are 4 positions of the Subscribe for news according to the design in Figma. If something changed, please, update it on time

@@ -73,7 +73,14 @@
"save": "Запази",
"submit": "Изпрати",
"apply": "Кандидатствайте",
"subscribe": "Абониране за известия",
"subscribe": "Абонирай се за email известия за кампанията",
Copy link
Member

Choose a reason for hiding this comment

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

In my opinion translations for subscriptions, belong more to the notifications.json, but this is more of a personal opinion, rather than change request, thus feel free to leave it as is.

@sashko9807 sashko9807 removed their assignment Dec 21, 2023
@ani-kalpachka
Copy link
Member

@sashko9807 The comments seem to be fixed. Could you please check and confirm?

Copy link
Member

@sashko9807 sashko9807 left a comment

Choose a reason for hiding this comment

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

Approving this in order to not block functionality tests in staging environment . Though the commit still needs some polishing before deploying to production.

@sashko9807 sashko9807 added the run tests Allows running the tests workflows for forked repos label Jan 3, 2024
@github-actions github-actions bot removed the run tests Allows running the tests workflows for forked repos label Jan 3, 2024
@ani-kalpachka ani-kalpachka merged commit f37755e into podkrepi-bg:master Jan 3, 2024
10 of 11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Notification Subscription] Update UI For The Notifications Functionality
10 participants