From d9988158570f4b89bb7f223692a19194d589e6b4 Mon Sep 17 00:00:00 2001 From: khadiatullo Date: Sat, 26 Apr 2025 20:15:39 +0300 Subject: [PATCH 1/4] fix: fix page login --- src/features/auth/login-form/ui/login-form.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/features/auth/login-form/ui/login-form.tsx b/src/features/auth/login-form/ui/login-form.tsx index b89887b..5a53ab3 100644 --- a/src/features/auth/login-form/ui/login-form.tsx +++ b/src/features/auth/login-form/ui/login-form.tsx @@ -55,8 +55,8 @@ export const LoginForm = ({}: LoginFormProps) => { }; return ( -
- + + Date: Sat, 26 Apr 2025 20:18:25 +0300 Subject: [PATCH 2/4] add: added animations for the block --- src/app/globals.css | 46 +++++++++++++++++++++++++++++++ src/widgets/footer.tsx | 3 +- src/widgets/hero-section.tsx | 11 +++++--- src/widgets/vacancies-section.tsx | 2 ++ tailwind.config.js | 2 +- 5 files changed, 58 insertions(+), 6 deletions(-) diff --git a/src/app/globals.css b/src/app/globals.css index ac2e376..2090000 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -120,3 +120,49 @@ @apply bg-background text-foreground; } } + +.tracking-in-expand { + animation: tracking-in-expand 2s cubic-bezier(0.215, 0.610, 0.355, 1.000) both; +} + +@keyframes tracking-in-expand { + 0% { + letter-spacing: -0.5em; + opacity: 0; + } + 40% { + opacity: 0.6; + } + 100% { + opacity: 1; + } +} + + +.heartbeat { + animation: heartbeat 1.5s ease-in-out infinite both; +} + +@keyframes heartbeat { + from { + transform: scale(1); + transform-origin: center center; + animation-timing-function: ease-out; + } + 10% { + transform: scale(0.91); + animation-timing-function: ease-in; + } + 17% { + transform: scale(0.98); + animation-timing-function: ease-out; + } + 33% { + transform: scale(0.87); + animation-timing-function: ease-in; + } + 45% { + transform: scale(1); + animation-timing-function: ease-out; + } +} \ No newline at end of file diff --git a/src/widgets/footer.tsx b/src/widgets/footer.tsx index b7ab63a..9593170 100644 --- a/src/widgets/footer.tsx +++ b/src/widgets/footer.tsx @@ -1,5 +1,6 @@ import { Fuel, Mail, MapPin, Phone } from 'lucide-react'; import Link from 'next/link'; +import '.././app/globals.css' import { Button } from '@/shared/shadcn-ui/button'; @@ -137,7 +138,7 @@ export const Footer = () => { placeholder='Ваш email' className='w-full rounded-md border border-gray-700 bg-gray-800 px-4 py-2 text-white' /> - diff --git a/src/widgets/hero-section.tsx b/src/widgets/hero-section.tsx index bd5ca18..e0e92ec 100644 --- a/src/widgets/hero-section.tsx +++ b/src/widgets/hero-section.tsx @@ -1,5 +1,6 @@ import { MapPin } from 'lucide-react'; import Image from 'next/image'; +import '../../src/app/globals.css' import { Button } from '@/shared/shadcn-ui/button'; @@ -18,9 +19,11 @@ export const HeroSection = () => {
-

- Сеть современных заправок в Таджикистане -

+
+

+ Сеть современных заправок в Таджикистане +

+

Качественное топливо, удобное расположение и отличный сервис для наших клиентов @@ -29,7 +32,7 @@ export const HeroSection = () => { - diff --git a/src/widgets/vacancies-section.tsx b/src/widgets/vacancies-section.tsx index 4f711fe..8e2a2b6 100644 --- a/src/widgets/vacancies-section.tsx +++ b/src/widgets/vacancies-section.tsx @@ -79,6 +79,7 @@ export const VacanciesSection = () => {

@@ -112,6 +113,7 @@ export const VacanciesSection = () => {
diff --git a/tailwind.config.js b/tailwind.config.js index 51632a4..d4a3173 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -80,7 +80,7 @@ module.exports = { from: { height: 'var(--radix-accordion-content-height)' }, to: { height: '0' }, }, - 'caret-blink': { + 'caret-blink11': { '0%,70%,100%': { opacity: '1' }, '20%,50%': { opacity: '0' }, }, From e587c1690dc1056d6d46d52490c48d801c298158 Mon Sep 17 00:00:00 2001 From: khadiatullo Date: Sat, 26 Apr 2025 21:04:46 +0300 Subject: [PATCH 3/4] add: added animations for the buttonsand text --- src/widgets/cta-section.tsx | 2 +- src/widgets/footer.tsx | 2 +- src/widgets/hero-section.tsx | 10 ++++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/widgets/cta-section.tsx b/src/widgets/cta-section.tsx index 3e2f9e5..038ee2e 100644 --- a/src/widgets/cta-section.tsx +++ b/src/widgets/cta-section.tsx @@ -16,7 +16,7 @@ export const CtaSection = () => {

{t('home.cta.description')}

-
diff --git a/src/widgets/footer.tsx b/src/widgets/footer.tsx index bdbc63d..fd994cd 100644 --- a/src/widgets/footer.tsx +++ b/src/widgets/footer.tsx @@ -134,7 +134,7 @@ export const Footer = () => { placeholder={t('common.footer.yourEmail')} className='w-full rounded-md border border-gray-700 bg-gray-800 px-4 py-2 text-white' /> - diff --git a/src/widgets/hero-section.tsx b/src/widgets/hero-section.tsx index 6cb1ef5..9f73618 100644 --- a/src/widgets/hero-section.tsx +++ b/src/widgets/hero-section.tsx @@ -24,9 +24,11 @@ export const HeroSection = () => {
-

- Сеть современных заправок в Таджикистане -

+
+

+ Сеть современных заправок в Таджикистане +

+

{t('home.hero.description')}

@@ -35,7 +37,7 @@ export const HeroSection = () => { {t('common.buttons.findStation')}{' '} - From b50fff6411e060b08a2321eec6ec0135907bbb0e Mon Sep 17 00:00:00 2001 From: khadiatullo Date: Sat, 26 Apr 2025 21:48:32 +0300 Subject: [PATCH 4/4] change: changed hero-section and footer --- src/widgets/footer.tsx | 2 +- src/widgets/hero-section.tsx | 4 ++-- tailwind.config.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/widgets/footer.tsx b/src/widgets/footer.tsx index fd994cd..8c2d5a8 100644 --- a/src/widgets/footer.tsx +++ b/src/widgets/footer.tsx @@ -135,7 +135,7 @@ export const Footer = () => { className='w-full rounded-md border border-gray-700 bg-gray-800 px-4 py-2 text-white' />
diff --git a/src/widgets/hero-section.tsx b/src/widgets/hero-section.tsx index 9f73618..daddb15 100644 --- a/src/widgets/hero-section.tsx +++ b/src/widgets/hero-section.tsx @@ -26,7 +26,7 @@ export const HeroSection = () => {

- Сеть современных заправок в Таджикистане + {t('home.hero.title')}

@@ -39,7 +39,7 @@ export const HeroSection = () => {

diff --git a/tailwind.config.js b/tailwind.config.js index d4a3173..51632a4 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -80,7 +80,7 @@ module.exports = { from: { height: 'var(--radix-accordion-content-height)' }, to: { height: '0' }, }, - 'caret-blink11': { + 'caret-blink': { '0%,70%,100%': { opacity: '1' }, '20%,50%': { opacity: '0' }, },