From 1a679d029e1f2f680394d39976af7cf489cb0ba9 Mon Sep 17 00:00:00 2001
From: BunyodL <blutfulloyev@bk.ru>
Date: Wed, 23 Apr 2025 23:03:20 +0500
Subject: [PATCH] update: change logo and fix headed-nav links

---
 public/file.svg                       |  1 -
 public/globe.svg                      |  1 -
 public/logo.svg                       | 44 ++++++++++++++++++++++++
 public/next.svg                       |  1 -
 public/vercel.svg                     |  1 -
 public/window.svg                     |  1 -
 src/shared/assets/logo.tsx            |  4 +--
 src/widgets/header/ui/desktop-nav.tsx | 48 +++++++++++++++++----------
 8 files changed, 76 insertions(+), 25 deletions(-)
 delete mode 100644 public/file.svg
 delete mode 100644 public/globe.svg
 create mode 100644 public/logo.svg
 delete mode 100644 public/next.svg
 delete mode 100644 public/vercel.svg
 delete mode 100644 public/window.svg

diff --git a/public/file.svg b/public/file.svg
deleted file mode 100644
index 004145c..0000000
--- a/public/file.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/public/globe.svg b/public/globe.svg
deleted file mode 100644
index 567f17b..0000000
--- a/public/globe.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>
\ No newline at end of file
diff --git a/public/logo.svg b/public/logo.svg
new file mode 100644
index 0000000..1c4a6ab
--- /dev/null
+++ b/public/logo.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="150.000000pt" height="200.000000pt" viewBox="0 0 150.000000 200.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,200.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M695 1825 c-33 -36 -72 -104 -81 -141 -3 -16 10 3 29 41 55 108 107
+145 107 77 1 -90 56 -208 172 -363 100 -134 131 -186 157 -260 10 -30 35 -81
+55 -114 102 -167 110 -375 23 -560 -53 -111 -166 -222 -265 -261 -30 -11 -31
+-13 -8 -9 86 17 213 135 274 253 98 188 92 399 -17 584 -21 37 -46 88 -55 115
+-23 68 -61 131 -159 263 -100 134 -141 212 -157 301 -19 103 -34 118 -75 74z"/>
+<path d="M686 1715 c-10 -20 -22 -60 -28 -89 -15 -68 5 -147 70 -279 81 -166
+88 -211 48 -290 -13 -26 -20 -47 -16 -47 15 0 125 87 157 123 37 43 57 105 47
+150 -3 18 -36 73 -73 122 -98 131 -139 202 -162 278 -12 37 -22 67 -24 67 -1
+0 -10 -16 -19 -35z"/>
+<path d="M603 1580 c0 -41 2 -58 4 -37 2 20 2 54 0 75 -2 20 -4 3 -4 -38z"/>
+<path d="M610 1490 c0 -12 21 -66 57 -147 4 -10 -6 -12 -38 -9 -24 2 -35 2
+-24 -1 11 -2 35 -8 53 -13 25 -7 32 -6 29 3 -3 7 -22 50 -41 97 -20 47 -36 78
+-36 70z"/>
+<path d="M434 1321 c-115 -41 -229 -132 -296 -235 -43 -67 -82 -182 -93 -271
+-12 -109 23 -256 84 -355 36 -58 212 -230 234 -229 7 0 1 8 -13 17 -52 34
+-191 179 -219 227 -189 325 -12 752 352 850 30 8 41 14 27 14 -14 0 -48 -8
+-76 -18z"/>
+<path d="M475 1275 c-157 -49 -276 -161 -341 -320 -26 -64 -29 -80 -28 -190 0
+-104 3 -128 24 -180 l25 -60 5 70 c12 148 116 270 331 389 169 93 233 237 129
+291 -34 18 -89 18 -145 0z"/>
+<path d="M1005 1178 c-6 -34 -20 -55 -69 -103 -53 -53 -85 -73 -241 -150 -204
+-100 -258 -132 -331 -198 -57 -51 -101 -133 -111 -203 -22 -159 136 -293 347
+-294 l64 0 -44 23 c-58 29 -90 77 -90 134 0 111 80 204 255 298 228 122 313
+276 256 464 -12 39 -23 71 -25 71 -3 0 -7 -19 -11 -42z"/>
+<path d="M1107 965 c-5 -21 -18 -57 -29 -78 -19 -38 -18 -95 2 -82 17 11 41
+105 38 152 l-3 48 -8 -40z"/>
+<path d="M1136 845 c-33 -113 -104 -205 -208 -272 -128 -81 -188 -151 -188
+-219 0 -63 19 -78 93 -71 47 4 71 13 114 43 100 69 176 179 208 299 15 61 19
+210 6 255 -7 22 -10 18 -25 -35z"/>
+<path d="M210 663 c-17 -53 -20 -80 -14 -123 l7 -55 12 60 c6 33 19 75 28 92
+17 32 15 77 -4 88 -4 3 -18 -25 -29 -62z"/>
+<path d="M415 211 c110 -54 365 -51 425 6 12 11 8 10 -16 -2 -78 -38 -262 -44
+-364 -12 -25 8 -54 17 -65 21 -11 3 -2 -3 20 -13z"/>
+</g>
+</svg>
diff --git a/public/next.svg b/public/next.svg
deleted file mode 100644
index 5174b28..0000000
--- a/public/next.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>
\ No newline at end of file
diff --git a/public/vercel.svg b/public/vercel.svg
deleted file mode 100644
index 7705396..0000000
--- a/public/vercel.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>
\ No newline at end of file
diff --git a/public/window.svg b/public/window.svg
deleted file mode 100644
index b2b2a44..0000000
--- a/public/window.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>
\ No newline at end of file
diff --git a/src/shared/assets/logo.tsx b/src/shared/assets/logo.tsx
index 9b77349..ee1bce8 100644
--- a/src/shared/assets/logo.tsx
+++ b/src/shared/assets/logo.tsx
@@ -1,10 +1,10 @@
-import { Fuel } from 'lucide-react';
+import Image from 'next/image';
 import Link from 'next/link';
 
 export const Logo = () => {
   return (
     <Link className='flex items-center gap-2' href={'/'}>
-      <Fuel className='h-6 w-6 text-red-600' />
+      <Image src='/logo.svg' alt='oriyo-logo' width={24} height={24} />
       <span className='text-xl font-bold'>Ориё</span>
     </Link>
   );
diff --git a/src/widgets/header/ui/desktop-nav.tsx b/src/widgets/header/ui/desktop-nav.tsx
index 2ba0008..d08b2fb 100644
--- a/src/widgets/header/ui/desktop-nav.tsx
+++ b/src/widgets/header/ui/desktop-nav.tsx
@@ -1,9 +1,6 @@
-'use client';
-
 import Link from 'next/link';
 import React from 'react';
 
-import { Logo } from '@/shared/assets/logo';
 import { cn } from '@/shared/lib/utils';
 import {
   NavigationMenu,
@@ -20,16 +17,22 @@ export function DesktopNav() {
     <NavigationMenu className='hidden md:flex'>
       <NavigationMenuList>
         <NavigationMenuItem>
-          <Link href='/' legacyBehavior passHref>
-            <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-              Главная
+          <Link href='/' scroll>
+            <NavigationMenuLink
+              asChild
+              className={navigationMenuTriggerStyle()}
+            >
+              <span>Главная</span>
             </NavigationMenuLink>
           </Link>
         </NavigationMenuItem>
         <NavigationMenuItem>
-          <Link href='/about' legacyBehavior passHref>
-            <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-              О нас
+          <Link href='/about' scroll>
+            <NavigationMenuLink
+              asChild
+              className={navigationMenuTriggerStyle()}
+            >
+              <span>О нас</span>
             </NavigationMenuLink>
           </Link>
         </NavigationMenuItem>
@@ -69,23 +72,32 @@ export function DesktopNav() {
           </NavigationMenuContent>
         </NavigationMenuItem>
         <NavigationMenuItem>
-          <Link href='/#stations' legacyBehavior passHref>
-            <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-              Наши заправки
+          <Link href='/#stations' scroll>
+            <NavigationMenuLink
+              asChild
+              className={navigationMenuTriggerStyle()}
+            >
+              <span>Наши заправки</span>
             </NavigationMenuLink>
           </Link>
         </NavigationMenuItem>
         <NavigationMenuItem>
-          <Link href='/#vacancies' legacyBehavior passHref>
-            <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-              Вакансии
+          <Link href='/#vacancies' scroll={true}>
+            <NavigationMenuLink
+              asChild
+              className={navigationMenuTriggerStyle()}
+            >
+              <span>Вакансии</span>
             </NavigationMenuLink>
           </Link>
         </NavigationMenuItem>
         <NavigationMenuItem>
-          <Link href='/#promotions' legacyBehavior passHref>
-            <NavigationMenuLink className={navigationMenuTriggerStyle()}>
-              Акции
+          <Link href='/#promotions' scroll>
+            <NavigationMenuLink
+              asChild
+              className={navigationMenuTriggerStyle()}
+            >
+              <span>Акции</span>
             </NavigationMenuLink>
           </Link>
         </NavigationMenuItem>