Skip to content
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 package.json
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
"eslint": "^7.32.0",
"eslint-config-prettier": "^9.1.0",
"next-unused": "^0.0.6",
"postcss": "8.4.31",
"postcss": "8.5.10",
"prettier": "2.7.1",
"prettier-plugin-tailwindcss": "0.1.13",
"reset-css": "5.0.1",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/lang/de/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"part2": "Verschlüsselter Cloud-Speicher"
},
"description": "Erhalten Sie jetzt {{discount}}% Rabatt",
"descriptionNormal": "auf alle Pläne",
"descriptionNormal": "auf Lifetime-Pläne",
"giftDescription": {
"line1": "Gewinne einen Gutschein bis zu 1.000 €!",
"line2": "Mach mit beim Internxt-Weihnachtsgewinnspiel"
Expand Down
4 changes: 2 additions & 2 deletions src/assets/lang/en/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@
"title": "**Private** by default, **secure** by\n design and **free** as in freedom",
"subtitle": {
"part1": "That's Internxt, ",
"part2": " encrypted cloud storage & more"
"part2": " encrypted cloud\n storage & more"
},
"description": "Get {{discount}}% off now,",
"descriptionNormal": "on all plans",
"descriptionNormal": "on lifetime plans",
"features": ["Complete privacy suite", "Post-quantum encryption", "Open source and audited"],
"giftDescription": {
"line1": "Enter our Christmas raffle to win up to €1000!",
Expand Down
2 changes: 1 addition & 1 deletion src/assets/lang/es/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"part2": "Tu aliado digital fiable"
},
"description": "{{discount}}% de descuento",
"descriptionNormal": "en todos los planes",
"descriptionNormal": "en planes de por vida",
"giftDescription": {
"line1": "¡Gana una tarjeta regalo de hasta 1.000€!",
"line2": "Únete a Internxt y participa en nuestro sorteo"
Expand Down
2 changes: 1 addition & 1 deletion src/assets/lang/fr/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"part2": "Stockage cloud chiffré"
},
"description": "Obtenez {{discount}}% de réduction ",
"descriptionNormal": "sur tous les plans",
"descriptionNormal": "sur les plans à vie",
"giftDescription": {
"line1": "Gagnez une carte cadeau jusqu'à 1 000 € !",
"line2": "Rejoignez Internxt et participez au tirage de Noël"
Expand Down
3 changes: 2 additions & 1 deletion src/assets/lang/it/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"part2": "archiviazione cloud crittografata"
},
"description": "Ottieni il {{discount}}% di sconto ora",
"descriptionNormal": "su tutti i piani",
"descriptionNormal": "sui piani a vita",
"giftDescription": {
"line1": "Vinci una carta regalo fino a 1.000€!",
"line2": "Unisciti a Internxt e partecipa all'estrazione di Natale"
Expand All @@ -68,6 +68,7 @@
"hotLabel": "{{discount}}% sconto",
"planTitles": {
"header": "Scegli il tuo piano",
"individuals": "Piani Annuali",
"homePage": "Scegli il piano giusto per te",
"lifetime": "Piani a vita",
"business": "Piani business",
Expand Down
3 changes: 2 additions & 1 deletion src/assets/lang/ru/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"part2": "зашифрованное облако."
},
"description": "Получите скидку {{discount}}% прямо сейчас",
"descriptionNormal": "на пожизненные",
"descriptionNormal": "на пожизненные планы",
"giftDescription": {
"line1": "Выиграйте подарочную карту на 1000 €!",
"line2": "Участвуйте в новогоднем розыгрыше от Internxt"
Expand All @@ -68,6 +68,7 @@
"hotLabel": "Скидка {{discount}}% ",
"planTitles": {
"header": " Выберите свой тариф",
"individuals": "Годовые Планы",
"homePage": "Выберите подходящий тариф",
"lifetime": "Пожизненные тарифы",
"business": "Бизнес-тарифы",
Expand Down
1 change: 1 addition & 0 deletions src/assets/lang/zh-tw/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@
"hotLabel": "{{discount}}% 折扣 ",
"planTitles": {
"header": " 選擇您的計劃",
"individuals": "年度計劃",
"homePage": "選擇適合您的方案",
"lifetime": "終身方案",
"business": "企業方案",
Expand Down
3 changes: 2 additions & 1 deletion src/assets/lang/zh/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
}
}
},
"title": "**預設私密**,**安全設計**,**天然自由**",
"title": "默認私密。**加密**提供額外**保護**。",
"subtitle": {
"part1": "这就是 Internxt - ",
"part2": "加密云存储"
Expand Down Expand Up @@ -68,6 +68,7 @@
"hotLabel": "{{discount}}% 折扣",
"planTitles": {
"header": "选择您的计划 ",
"individuals": "年度计划",
"homePage": "選擇適合您的方案",
"lifetime": "終身方案",
"business": "企業方案",
Expand Down
13 changes: 4 additions & 9 deletions src/components/home/HeroSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -126,17 +126,12 @@ export default function HeroSection({

<div className="flex w-full flex-col justify-center gap-4 lg:gap-8">
<div className="flex flex-col justify-center gap-4">
<p className="w-full text-30 font-semibold leading-tight text-gray-100 lg:text-3xl">
<h1 className="w-full text-30 font-semibold leading-tight text-gray-100 lg:text-3xl">
<HighlightText text={textContent.title} />
</h1>
<p className="font-regular whitespace-pre-line text-lg leading-tight text-gray-100 lg:whitespace-nowrap lg:text-2xl">
{textContent.subtitle.part1} {textContent.subtitle.part2}
</p>
<span className="flex lg:flex-row gap-1">
<p className="font-regular text-lg leading-tight text-gray-100 lg:text-2xl">
{textContent.subtitle.part1}
</p>
<h1 className="font-regular text-lg leading-tight text-gray-100 lg:text-2xl">
{textContent.subtitle.part2}
</h1>
</span>
</div>
<span className="flex w-min flex-nowrap items-center gap-1 whitespace-nowrap rounded-2 text-base font-semibold leading-tight text-gray-100 lg:text-xl">
<p className="bg-neutral-37 px-1 py-0.5 text-primary">{parsePercentText(textContent.description)}</p>
Expand Down
2 changes: 1 addition & 1 deletion src/components/pricing/ComparisonTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export default function ComparisonTableSection({
const isLifetime = billingFrequency === Interval.Lifetime;

const getPlanPrice = (planOrder: number) => {
const basePrice = products?.individuals?.[billingFrequency]?.[planOrder]?.price ?? 0;
const basePrice = Number(products?.individuals?.[billingFrequency]?.[planOrder]?.price ?? 0);
const finalPrice = decimalDiscount ? basePrice * (decimalDiscount / 100) : basePrice;
return finalPrice.toFixed(0);
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/shared/pricing/PriceCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -358,11 +358,11 @@
</div>
</div>
</div>
{isAnnual && (
{/*{isAnnual && (
<p className="text-10 font-normal italic text-gray-35">
{contentText.renewsInfo.replace('{{price}}', currency + originalPrice)}
</p>
)}
)}*/}

Check warning on line 365 in src/components/shared/pricing/PriceCard.tsx

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Remove this commented out code.

See more on https://sonarcloud.io/project/issues?id=internxt_website&issues=AZ3N_Amasd2Twq4Sh0c0&open=AZ3N_Amasd2Twq4Sh0c0&pullRequest=1892
</div>
);
};
5 changes: 4 additions & 1 deletion src/components/shared/pricing/PricingSectionWrapper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,10 @@ export const PricingSectionWrapper = ({
const onIndividualSwitchToggled = overrideOnIndividualSwitchToggled ?? localPlanSelection.onIndividualSwitchToggled;
const onBusinessSwitchToggled = overrideOnBusinessSwitchToggled ?? localPlanSelection.onBusinessSwitchToggled;

const actualDiscountValue = calculateDiscountPercentage(decimalDiscount?.individuals || decimalDiscount?.business);
const actualDiscountValue =
activeSwitchPlan === 'Lifetime'
? calculateDiscountPercentage(decimalDiscount?.lifetime)
: calculateDiscountPercentage(decimalDiscount?.individuals || decimalDiscount?.business);

const commonPricingProps = {
textContent,
Expand Down
1 change: 0 additions & 1 deletion src/pages/drive/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ const Drive = ({
lifetimeCoupon: lifetimeCoupon,
lifetimeCoupons,
} = usePricing({
couponCode: PromoCodeName.OFFSUB,
couponCodeForLifetime: PromoCodeName.OFFLFT,
});

Expand Down
1 change: 0 additions & 1 deletion src/pages/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ const HomePage = ({ metatagsDescriptions, textContent, lang, navbarLang, footerL
lifetimeCoupon: lifetimeCoupon,
lifetimeCoupons,
} = usePricing({
couponCode: PromoCodeName.OFFSUB,
couponCodeForLifetime: PromoCodeName.OFFLFT,
});
const locale = lang as string;
Expand Down
1 change: 0 additions & 1 deletion src/pages/pricing/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ const Pricing = ({
lifetimeCoupon: lifetimeCoupon,
lifetimeCoupons,
} = usePricing({
couponCode: PromoCodeName.OFFSUB,
couponCodeForLifetime: PromoCodeName.OFFLFT,
});

Expand Down
1 change: 0 additions & 1 deletion src/pages/refer-a-friend.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ const ReferAFriendPage = ({
lifetimeCoupon: lifetimeCoupon,
lifetimeCoupons,
} = usePricing({
couponCode: PromoCodeName.OFFSUB,
couponCodeForLifetime: PromoCodeName.OFFLFT,
});
const locale = lang as string;
Expand Down
47 changes: 16 additions & 31 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6664,10 +6664,10 @@ nan@^2.17.0:
resolved "https://registry.yarnpkg.com/nan/-/nan-2.22.2.tgz#6b504fd029fb8f38c0990e52ad5c26772fdacfbb"
integrity sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==

nanoid@^3.3.6, nanoid@^3.3.7:
version "3.3.8"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.8.tgz#b1be3030bee36aaff18bacb375e5cce521684baf"
integrity sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==
nanoid@^3.3.11, nanoid@^3.3.6:
version "3.3.11"
resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==

nanoid@^5.1.3:
version "5.1.6"
Expand Down Expand Up @@ -7169,17 +7169,7 @@ performance-now@^2.1.0:
resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
integrity sha512-7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow==

picocolors@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==

picocolors@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.1.tgz#a8ad579b571952f0e5d25892de5445bcfe25aaa1"
integrity sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==

picocolors@^1.1.1:
picocolors@^1.0.0, picocolors@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.1.1.tgz#3d321af3eab939b083c8f929a1d12cda81c26b6b"
integrity sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==
Expand Down Expand Up @@ -7273,14 +7263,14 @@ postcss@8.4.31:
picocolors "^1.0.0"
source-map-js "^1.0.2"

postcss@^8.1.7, postcss@^8.4.23:
version "8.4.41"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.41.tgz#d6104d3ba272d882fe18fc07d15dc2da62fa2681"
integrity sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==
postcss@8.5.10, postcss@^8.1.7, postcss@^8.4.23:
version "8.5.10"
resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.5.10.tgz#8992d8c30acf3f12169e7c09514a12fed7e48356"
integrity sha512-pMMHxBOZKFU6HgAZ4eyGnwXF/EvPGGqUr0MnZ5+99485wwW41kW91A4LOGxSHhgugZmSChL5AlElNdwlNgcnLQ==
dependencies:
nanoid "^3.3.7"
picocolors "^1.0.1"
source-map-js "^1.2.0"
nanoid "^3.3.11"
picocolors "^1.1.1"
source-map-js "^1.2.1"

prebuild-install@^7.1.3:
version "7.1.3"
Expand Down Expand Up @@ -8274,15 +8264,10 @@ slice-ansi@^4.0.0:
astral-regex "^2.0.0"
is-fullwidth-code-point "^3.0.0"

source-map-js@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==

source-map-js@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.0.tgz#16b809c162517b5b8c3e7dcd315a2a5c2612b2af"
integrity sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==
source-map-js@^1.0.2, source-map-js@^1.2.1:
version "1.2.1"
resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.2.1.tgz#1ce5650fddd87abc099eda37dcff024c2667ae46"
integrity sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==

source-map@^0.5.7:
version "0.5.7"
Expand Down
Loading