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

New campaign statuses #1956

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

New campaign statuses #1956

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4a73626
feat: Add new campaign statuses
sashko9807 Sep 3, 2024
6fd57db
chore: Add translation to paused state
sashko9807 Oct 9, 2024
b5dafcc
chore: Add donation button for complete and partially_finances if che…
sashko9807 Oct 9, 2024
ed14071
Merge branch 'master' of github.com:sashko9807/podkrepibg-frontend in…
sashko9807 Oct 29, 2024
8913d3e
fix: Build
sashko9807 Oct 29, 2024
aab5886
fix: Donation button not showing for correct campaign
sashko9807 Oct 29, 2024
3c418af
Merge branch 'master' of github.com:sashko9807/podkrepibg-frontend in…
sashko9807 Dec 7, 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
14 changes: 5 additions & 9 deletions public/locales/bg/campaigns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,13 @@
"corporate-donor": "Корпоративен дарител"
},
"campaign-status": {
"initial": "В начален етап",
"draft": "Чернова",
"pending-validation": "Чакаща валидация",
"approved": "Одобрена",
"rejected": "Отхвърлена",
"active": "Активна",
"active-pending-validation": "Активна чака валидиране",
"suspended": "Спряна",
"complete": "Завършена",
"disabled": "Деактивирана",
"error": "Грешна",
"paused": "На пауза",
"suspended": "Спряна от организатор",
"partially_financed": "Частично финансирана",
"blocked": "Спряна",
"complete": "Успешнa",
"deleted": "Изтрита"
},
"campaignTypesFields": {
Expand Down
14 changes: 5 additions & 9 deletions public/locales/en/campaigns.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,13 @@
"corporate-donor": "Corporate Donor"
},
"campaign-status": {
"initial": "Initial",
"draft": "Draft",
"pending-validation": "Pending validation",
"approved": "Approved",
"rejected": "Rejected",
"active": "Active",
"active-pending-validation": "Active pending validation",
"suspended": "Suspended",
"complete": "Complete",
"disabled": "Disabled",
"error": "Error",
"suspended": "Suspended by organizer",
"complete": "Succeeded",
"paused": "Paused",
"partially_financed": "Partially financed",
"blocked": "Suspended",
"deleted": "Deleted"
},
"campaignTypesFields": {
Expand Down
19 changes: 10 additions & 9 deletions src/components/client/campaigns/CampaignCard/CampaignCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import theme from 'common/theme'
import Link from 'components/common/Link'
import CampaignProgress from 'components/client/campaigns/CampaignProgress'
import SuccessfullCampaignTag from '../SuccessfullCampaignTag'
import { CampaignState } from '../helpers/campaign.enums'
import { CampaignState, canAcceptDonationState } from '../helpers/campaign.enums'

import { Root } from './CampaignCard.styled'
import {
Expand Down Expand Up @@ -92,14 +92,15 @@ export default function ActiveCampaignCard({ campaign, index }: Props) {
</StyledContent>
</Link>
<StyledCardActions disableSpacing>
{(campaignState === CampaignState.complete && !allowDonationOnComplete) || (
<DonateButton
href={routes.campaigns.oneTimeDonation(slug)}
variant="contained"
color="secondary">
{t('cta.support')}
</DonateButton>
)}
{campaignState === CampaignState.active ||
Copy link
Contributor

Choose a reason for hiding this comment

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

May be I don't understand...
Isn't this going to hide the donation button for ACTIVE campaigns?

campaignState === CampaignState.active - this will be TRUE so the rest won't be evaluated?

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree

(canAcceptDonationState.has(campaignState) && !allowDonationOnComplete) || (
<DonateButton
href={routes.campaigns.oneTimeDonation(slug)}
variant="contained"
color="secondary">
{t('cta.support')}
</DonateButton>
)}
</StyledCardActions>
</Root>
)
Expand Down
15 changes: 8 additions & 7 deletions src/components/client/campaigns/helpers/campaign.enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
export enum CampaignState {
initial = 'initial',
draft = 'draft',
pendingvalidation = 'pending_validation',
approved = 'approved',
rejected = 'rejected',
active = 'active',
activependingvalidation = 'active_pending_validation',
partially_financed = 'partially_financed',
suspended = 'suspended',
complete = 'complete',
disabled = 'disabled',
error = 'error',
blocked = 'blocked',
paused = 'paused',
deleted = 'deleted',
}

export const canAcceptDonationState = new Set([
CampaignState.partially_financed,
CampaignState.complete,
])

export enum StatisticsGroupBy {
DAY = 'day',
WEEK = 'week',
Expand Down
Loading