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

fix: changes to the accept proposal page #331

Merged
merged 3 commits into from
Jan 31, 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
4 changes: 3 additions & 1 deletion src/components/proposals/proposal-package-reply.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,9 @@
'bg-foreground dark:bg-background-offset text-foreground border rounded-b-lg'
)}
>
<h3 class="text-2xl text-white w-2/3 lg:w-full">{t('proposals.reply.description')}</h3>
<h3 class="text-xl font-semibold text-white w-2/3 lg:w-full">
{t('proposals.reply.description')}
</h3>

<Button as="a" href={`${$page.url.pathname}/accept`} class="bg-white text-black mt-6 lg:mt-0"
>{t('proposals.nav.action.long')}</Button
Expand Down
6 changes: 4 additions & 2 deletions src/components/proposals/proposal-timeline.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script lang="ts">
import { t } from '$lib/i18n';
import { DAYS_PER_MONTH } from '$lib/utils/proposals';
import type { ProposalPackagePricingStoryblok } from '$types/bloks';
import clsx from 'clsx';

Expand Down Expand Up @@ -138,7 +139,8 @@
{projectManagement.department.name}

<span class="text-foreground/50"
>~ {(20 * +projectManagement.rate_value * +projectManagement.team_size) / 100}
>~ {(DAYS_PER_MONTH * +projectManagement.rate_value * +projectManagement.team_size) /
100}
{t('proposals.days-per-month')}</span
>
</p>
Expand All @@ -155,7 +157,7 @@
{qualityAssurance.department.name}

<span class="text-foreground/50"
>~ {(20 * +qualityAssurance.rate_value * +qualityAssurance.team_size) / 100}
>~ {(DAYS_PER_MONTH * +qualityAssurance.rate_value * +qualityAssurance.team_size) / 100}
{t('proposals.days-per-month')}</span
>
</p>
Expand Down
6 changes: 3 additions & 3 deletions src/lib/i18n/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,9 +142,9 @@
"proposals.accept.secondary-title": "Is this binding? No.",
"proposals.accept.secondary-subtitle": "It is a declaration of interest? Yes.",
"proposals.accept.button": "Accept proposal",
"proposals.accept.contact.title": "Discuss further.",
"proposals.accept.contact.subtitle": "If you wish to discussing things further, we'll be happy to do so. ",
"proposals.accept.contact.button": "Contact us",
"proposals.accept.contact.title": "Want to discuss further? ",
"proposals.accept.contact.subtitle": "Let's go! But beware, the button below will open your email client. ",
"proposals.accept.contact.button": "Contact {{name}}",
"proposals.accept.error": "Unfortunately we couldn't receive your response. Please contact us by email.",
"proposals.month": "month",
"proposals.months": "months",
Expand Down
20 changes: 14 additions & 6 deletions src/routes/(proposals)/proposal/[slug]/accept/+page.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,17 @@

<div class="mt-12 flex flex-col md:flex-row justify-between">
<div>
<p>{t('proposals.accept.secondary-title')}</p>
<p class="text-foreground-secondary">{t('proposals.accept.secondary-subtitle')}</p>
<p class="font-semibold">{t('proposals.accept.secondary-title')}</p>
<p class="font-semibold text-foreground-secondary">
{t('proposals.accept.secondary-subtitle')}
</p>
</div>

<Button variant="primary" class="mt-6 md:mt-0" on:click={approveProposal}
>{t('proposals.accept.button')}</Button
<Button
variant="primary"
disabled={result === 'success'}
class="mt-6 md:mt-0"
on:click={approveProposal}>{t('proposals.accept.button')}</Button
>
</div>
</div>
Expand All @@ -119,8 +124,11 @@
variant="secondary"
class="mt-6 md:mt-0"
as="a"
href="mailto:{proposal?.created_by.content.email}"
>{t('proposals.accept.contact.button')}</Button
href="mailto:{proposal?.created_by.content
.email}?subject={proposal?.title}. Discussion about Significa proposal"
>{t('proposals.accept.contact.button', {
name: proposal?.created_by.name.split(' ')[0]
})}</Button
>
</div>
{/if}
Expand Down
Loading