Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commitf37b819

Browse files
author
Filip Hric
committed
small improvements
1 parent4439312 commitf37b819

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

‎backend/api/location-routes.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ app.get('/', (req, res, next) => {
2121
constresult={
2222
location:locale.toLowerCase(),
2323
currency:euCountries.includes(locale) ?'EUR' :locale==='UK' ?'GBP' :'USD',
24-
discountEligible:countryDiscount,
24+
discountEligible:countryDiscount ?true :false,
2525
discountAmount:countryDiscount?.discount
2626
}
2727

‎src/assets/icons/roundCheckbox.svg‎

Lines changed: 11 additions & 0 deletions
Loading

‎src/components/Pricing.vue‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<template>
22
<divclass="bg-white">
33
<divclass="container py-8 px-6 mx-auto">
4-
<pclass="text-xl text-center text-gray-500">
5-
Choose your plan
6-
</p>
7-
84
<h1class="mt-4 text-3xl font-semibold text-center text-gray-800 capitalize lg:text-4xl">
95
Pricing Plan
106
</h1>
11-
<pclass="mt-3 text-center">
12-
Seeing that you are from {{ emoji.emojify(`:flag-${pricing.location}:`) }}, {{ pricing.discountEligible ? `you are eligible for a discount of ${pricing.discountAmount}%` : 'you are unfortunately not eligible for discount' }}
13-
</p>
14-
7+
<div
8+
v-if="pricing.discountEligible"
9+
class="grid mt-4 bg-yellow-100 rounded-sm border border-yellow-300"
10+
>
11+
<pclass="pb-1 text-center">
12+
Your country is <spanclass="text-2xl">{{ emoji.emojify(`:flag-${pricing.location}:`) }}</span>, {{ pricing.discountEligible ? `you are eligible for a discount of ${pricing.discountAmount}%` : 'you are unfortunately not eligible for discount' }}
13+
</p>
14+
</div>
1515
<div
1616
v-for="plan in plans"
1717
:key="plan.id"
@@ -23,19 +23,10 @@
2323
@click="pricing.activePlan = plan.id"
2424
>
2525
<divclass="flex items-center">
26-
<svg
27-
xmlns="http://www.w3.org/2000/svg"
26+
<RoundCheckbox
2827
class="w-5 h-5 text-gray-400 sm:w-9 sm:h-9"
2928
:class="plan.id === pricing.activePlan && 'text-blue6'"
30-
viewBox="0 0 20 20"
31-
fill="currentColor"
32-
>
33-
<path
34-
fill-rule="evenodd"
35-
d="M10 18a8 8 0 100-16 8 8 0 000 16zm3.707-9.293a1 1 0 00-1.414-1.414L9 10.586 7.707 9.293a1 1 0 00-1.414 1.414l2 2a1 1 0 001.414 0l4-4z"
36-
clip-rule="evenodd"
37-
/>
38-
</svg>
29+
/>
3930

4031
<divclass="flex flex-col items-center mx-5 space-y-1">
4132
<h2
@@ -46,10 +37,9 @@
4637
</h2>
4738
</div>
4839
</div>
49-
5040
<h2
51-
class="text-2xl font-semiboldtext-gray-500sm:text-4xl"
52-
:class="plan.id === pricing.activePlan&& 'text-blue6'"
41+
class="text-2xl font-semibold sm:text-4xl"
42+
:class="plan.id === pricing.activePlan? 'text-blue6' : 'text-gray-500'"
5343
>
5444
{{ pricing.currency === 'EUR' ? '€' : pricing.currency === 'GBP' ? '£' : '$' }} {{ plan.price[pricing.currency] }} <spanclass="text-base font-medium">/ Month</span>
5545
</h2>
@@ -68,6 +58,7 @@
6858
import {useStore }from'@/store/store';
6959
import {storeToRefs }from'pinia';
7060
importemojifrom'node-emoji'
61+
importRoundCheckboxfrom'@/assets/icons/roundCheckbox.svg';
7162
const { pricing }=storeToRefs(useStore());
7263
const { getLocation }=useStore();
7364
getLocation()

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp