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

Update 'Report an irregularity' button on Campaign page #1898

Merged
merged 2 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion public/locales/bg/campaigns.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"gallery": "Галерия",
"financial-report": "Финансови отчети",
"report-campaign": "Докладвайте кампанията",
"report-campaign": "Подайте сигнал за нередност",
"feedback": "Обратна връзка",
"beneficiary": {
"name": "Бенефициент",
Expand Down
2 changes: 1 addition & 1 deletion public/locales/en/campaigns.json
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
},
"gallery": "Gallery",
"financial-report": "Financial report",
"report-campaign": "Report the campaign",
"report-campaign": "Report an irregularity",
"feedback": "Feedback",
"beneficiary": {
"name": "Beneficiary",
Expand Down
53 changes: 21 additions & 32 deletions src/components/client/campaigns/CampaignDetails.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,31 +2,30 @@ import React, { useState } from 'react'

import { useTranslation } from 'next-i18next'
import dynamic from 'next/dynamic'

import { CampaignResponse } from 'gql/campaigns'

import 'react-quill/dist/quill.bubble.css'

import { Divider, Grid, IconButton, Tooltip, Typography } from '@mui/material'
import SecurityIcon from '@mui/icons-material/Security'
import NotificationsActiveOutlinedIcon from '@mui/icons-material/NotificationsActiveOutlined'
import EditIcon from '@mui/icons-material/Edit'
import { Assessment, InfoOutlined } from '@mui/icons-material'
import EmailIcon from '@mui/icons-material/Email'
import { styled } from '@mui/material/styles'

import DonationWishes from './DonationWishes'
import { ImageSlider } from 'components/common/ImageSlider'
import CampaignInfo from './CampaignInfo/CampaignInfo'
import CampaignInfoGraphics from './CampaignInfoGraphics'
import CampaignInfoOperator from './CampaignInfoOperator'
import LinkButton from 'components/common/LinkButton'
import { campaignSliderUrls } from 'common/util/campaignImageUrls'
import CampaignPublicExpensesGrid from './CampaignPublicExpensesGrid'
import EditIcon from '@mui/icons-material/Edit'
import { useCampaignApprovedExpensesList } from 'common/hooks/expenses'
import { Assessment, InfoOutlined } from '@mui/icons-material'
import { routes } from 'common/routes'
import { useCanEditCampaign } from 'common/hooks/campaigns'
import { moneyPublic } from 'common/util/money'
import { routes } from 'common/routes'

import DonationWishes from './DonationWishes'
import CampaignInfo from './CampaignInfo/CampaignInfo'
import CampaignInfoGraphics from './CampaignInfoGraphics'
import CampaignInfoOperator from './CampaignInfoOperator'
import CampaignPublicExpensesGrid from './CampaignPublicExpensesGrid'
import CampaignPublicExpensesChart from './CampaignPublicExpensesChart'
import EmailIcon from '@mui/icons-material/Email'
import RenderCampaignSubscribeModal from '../notifications/CampaignSubscribeModal'

const ReactQuill = dynamic(() => import('react-quill'), { ssr: false })
Expand All @@ -38,7 +37,7 @@ const classes = {
banner: `${PREFIX}-banner`,
campaignTitle: `${PREFIX}-campaignTitle`,
linkButton: `${PREFIX}-linkButton`,
securityIcon: `${PREFIX}-securityIcon`,
irregularityIcon: `${PREFIX}-irregularityIcon`,
subscribeLink: `${PREFIX}-subscribe`,
financeSummary: `${PREFIX}-financeSummary`,
}
Expand Down Expand Up @@ -79,11 +78,11 @@ const StyledGrid = styled(Grid)(({ theme }) => ({
},

[`& .${classes.linkButton}`]: {
fontSize: theme.typography.pxToRem(10),
fontSize: theme.typography.pxToRem(16),
letterSpacing: theme.spacing(0.01),
lineHeight: '150%',
textDecoration: 'underline',
color: 'initial',
color: '#11356A',

'&:hover': {
textDecoration: 'underline',
Expand All @@ -92,7 +91,7 @@ const StyledGrid = styled(Grid)(({ theme }) => ({
},
},

[`& .${classes.securityIcon}`]: {
[`& .${classes.irregularityIcon}`]: {
width: theme.spacing(2.25),
height: theme.spacing(2.75),
},
Expand Down Expand Up @@ -221,22 +220,12 @@ export default function CampaignDetails({ campaign }: Props) {
<DonationWishes campaignId={campaign?.id} />
</Grid>
<Grid container item xs={12}>
<Grid item xs={12} mb={1}>
<LinkButton
startIcon={<SecurityIcon color="action" className={classes.securityIcon} />}
href={'/contact'}
className={classes.linkButton}>
{t('campaigns:campaign.feedback')}
</LinkButton>
</Grid>
<Grid item xs={12}>
<LinkButton
startIcon={<SecurityIcon color="action" className={classes.securityIcon} />}
href={`/campaigns/${campaign.slug}/irregularity`}
className={classes.linkButton}>
{t('campaigns:campaign.report-campaign')}
</LinkButton>
</Grid>
<LinkButton
startIcon={<NotificationsActiveOutlinedIcon className={classes.irregularityIcon} />}
href={`/campaigns/${campaign.slug}/irregularity`}
className={classes.linkButton}>
{t('campaigns:campaign.report-campaign')}
</LinkButton>
</Grid>
</Grid>
</StyledGrid>
Expand Down
Loading