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.

Sign up for GitHub

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

MNTOR-3556: Front end integration #4995

Merged
merged 22 commits into from
Sep 13, 2024
Merged

MNTOR-3556: Front end integration #4995

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
f9e6186
feat: some example code for FE
mansaj Aug 29, 2024
e2d14bd
extract data from the right table
codemist Aug 30, 2024
c6576e5
Unsubscription from monthly report confirmation page (#4998)
codemist Sep 5, 2024
bbccb59
pass subscriber data
codemist Sep 5, 2024
f826724
return void
codemist Sep 10, 2024
fbd3776
add toast
codemist Sep 10, 2024
7f0b7ba
correct api endpoint
codemist Sep 10, 2024
d0c43de
remove debugging comments
codemist Sep 10, 2024
232f39e
add try again link
codemist Sep 11, 2024
9529d0f
add feature flag
codemist Sep 12, 2024
b73466a
rename file
codemist Sep 12, 2024
5b5ead7
override css variables
codemist Sep 12, 2024
0a0912e
wrap in try catch
codemist Sep 12, 2024
2a3e019
add loader
codemist Sep 12, 2024
7a9f920
fixup
codemist Sep 12, 2024
86f5cb4
add toat if catch error
codemist Sep 12, 2024
60674fe
remove original css override styles
codemist Sep 12, 2024
84c36c4
move to /unsubscribe-email folder
codemist Sep 12, 2024
d501a06
lint
codemist Sep 12, 2024
3e7886f
add try again styling
codemist Sep 12, 2024
d5c4a42
use plus language for header
codemist Sep 12, 2024
dbd5653
unit test
codemist Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions ...sign)/(public)/unsubscribe-email/monthly-report-free/UnsubscribeMonthlyReport.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,14 @@
max-width: $content-xs;
}
}

.tryAgain {
color: $color-white;
font-weight: 600;
text-decoration: underline;
background: none;
border: none;
padding: 0;
margin: 0;
cursor: pointer;
}
16 changes: 8 additions & 8 deletions ...redesign)/(public)/unsubscribe-email/monthly-report-free/UnsubscribeMonthlyReportView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ export const UnsubscribeMonthlyReportView = ({ token }: { token: string }) => {
});

if (!response.ok) {
toast(
toast.error(
l10n.getFragment("unsubscription-failed", {
elems: {
try_again_link: (
<Button
variant="link"
onPress={() => void handleUnsubscription()}
<button
className={styles.tryAgain}
onClick={() => void handleUnsubscription()}
/>
),
},
Expand All @@ -54,13 +54,13 @@ export const UnsubscribeMonthlyReportView = ({ token }: { token: string }) => {
setUnsubscribeSuccess(true);
}
} catch (error) {
toast(
toast.error(
l10n.getFragment("unsubscription-failed", {
elems: {
try_again_link: (
<Button
variant="link"
onPress={() => void handleUnsubscription()}
<button
Copy link
Collaborator

@codemist codemist Sep 12, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

I decided to resort to a default <button> element here as opposed to using the pre-made Button component + link variant because this is a unique button that's in white, which would require overriding the blue-set colour to the link <Button> variant.

className={styles.tryAgain}
onClick={() => void handleUnsubscription()}
/>
),
},
Expand Down
Loading