Merge pull request #42 from jahongiry/fixFooter

Fix footer
jahongiry · Mar 9, 2024 · dfcfe1b · dfcfe1b
2 parents 9157470 + e3361d9
commit dfcfe1b
Show file tree

Hide file tree

Showing 7 changed files with 47 additions and 73 deletions.
diff --git a/src/component/footer/Footer.js b/src/component/footer/Footer.js
@@ -2,18 +2,15 @@ import React from 'react';
 import { Link } from 'react-router-dom';
 import './footer.css';
 import logo from './img/logo1_1.png';
-import twitchImg from './img/twitch.png';
-import robloxImg from './img/roblax.png';
-import asusImg from './img/asus.png';
-import canonImg from './img/canon.png';
-import microsoftImg from './img/microsoft.png';
 import { useSelector } from 'react-redux';
 import { selectTranslations } from '../../slices/languageSlice';
 
 const Footer = () => {
   const translations = useSelector(selectTranslations);
   return (
     <footer className='container footer'>
+
+      {/* footer-container start */}
       <div className='footer-container'>
         <div className='footer-content footer-logo'>
           <Link to='/'>
@@ -31,13 +28,13 @@ const Footer = () => {
 
           <ul>
             <li>
-              <Link>{translations.footer.link1}</Link>
+              <Link to='/pubgucoffer'>{translations.footer.link1}</Link>
             </li>
             <li>
-              <Link>{translations.footer.link2}</Link>
+              <Link to='/pubgaccountoffer'>{translations.footer.link2}</Link>
             </li>
             <li>
-              <Link>{translations.footer.link3}</Link>
+              <Link to='/cards'>{translations.footer.link3}</Link>
             </li>
           </ul>
         </div>
@@ -47,54 +44,17 @@ const Footer = () => {
 
           <ul>
             <li>
-              <Link>{translations.footer.link4}</Link>
-            </li>
-            <li>
-              <Link>{translations.footer.link5}</Link>
+              <Link to="/contact">{translations.footer.link4}</Link>
             </li>
+
             <li>
-              <Link>{translations.footer.link6}</Link>
+              <Link to='https://t.me/cyberswap_uz'>{translations.footer.link6}</Link>
             </li>
           </ul>
         </div>
 
-        <div className='footer-content resource'>
-          <h3>{translations.footer.socialmedia}</h3>
-
-          <ul>
-            <li>
-              <Link>{translations.footer.link7}</Link>
-            </li>
-            <li>
-              <Link>{translations.footer.link8}</Link>
-            </li>
-            <li>
-              <Link>{translations.footer.link9}</Link>
-            </li>
-          </ul>
-        </div>
       </div>
-      {/* footer-container start */}
-
-      {/* footer-partner start */}
-      <div className='footer-partner'>
-        <div className='img'>
-          <img src={twitchImg} alt='twitch' />
-        </div>
-        <div className='img'>
-          <img src={robloxImg} alt='roblox' />
-        </div>
-        <div className='img'>
-          <img src={asusImg} alt='asus' />
-        </div>
-        <div className='img'>
-          <img src={canonImg} alt='canon' />
-        </div>
-        <div className='img'>
-          <img src={microsoftImg} alt='microsoft' />
-        </div>
-      </div>
-      {/* footer-partner start */}
+      {/* footer-container end */}
 
       {/* footer-copyright start */}
       <div className='footer-copyright'>
@@ -121,6 +81,7 @@ const Footer = () => {
         </p>
       </div>
       {/* footer-copyright end */}
+
     </footer>
   );
 };

diff --git a/src/component/footer/footer.css b/src/component/footer/footer.css
@@ -1,5 +1,5 @@
 .footer {
-    padding-top: 6rem;
+    padding-top: 3rem;
     padding-bottom: 3rem;
     display: flex;
     flex-direction: column;
@@ -67,14 +67,6 @@
     text-transform: capitalize;
 }
 
-.footer-partner {
-    margin-top: 2rem;
-    width: 100%;
-    display: flex;
-    flex-wrap: wrap;
-    align-items: center;
-    gap: 2rem;
-}
 
 .footer-copyright {
     margin-top: 3rem;
@@ -118,19 +110,21 @@
     .footer-container {
         grid-template-columns: 3fr 2fr 2fr 2fr ;
     }
-
-
 }
 @media  screen and (max-width: 992px){
+    .footer {
+        padding-top: 1rem;
+    }
     .footer-container {
         grid-template-columns: 1fr 1fr 1fr;
+        gap: 1rem;
     }
     .footer-container .footer-logo {
         grid-column: auto / span 3;
     }
 
-    .footer-partner .img {
-        height: 3vw;
+    .footer-container .footer-logo > p  {
+        margin-top: 0.5rem;    
     }
     .footer-content > ul {
         margin-top: 1.6rem;

diff --git a/src/component/header/header.css b/src/component/header/header.css
@@ -222,6 +222,7 @@
   .header nav ul li {
     width: 100%;
     padding: 10px;
+    padding-left: 3rem;
     display: flex;
     justify-content: center;
     border: 2px solid black;
@@ -230,7 +231,6 @@
   }
   .header nav ul li a {
     display: flex;
-    margin-left: 3rem;
     width: 100%;
     color: #000;
   }
@@ -253,6 +253,12 @@
 }
 
 @media screen and (max-width: 576px) {
+  .header nav ul {
+    padding: 1.5rem;
+  }
+  .header nav ul li {
+    padding-left: 1.5rem;
+  }
   .language-btn {
     margin-right: 0;
   }
@@ -269,6 +275,9 @@
 }
 
 @media screen and (max-width: 360px) {
+  .header nav ul li {
+    padding-left: 1rem;
+  }
   .header-btns {
     gap: 10px;
   }

diff --git a/src/locales/ru.json b/src/locales/ru.json
@@ -40,11 +40,11 @@
   },
   "footer": {
     "paragraph1": "Платежные системы пока что работают только через Click evolution и Payme! Если сделка не будет завершена, деньги будут возвращены!",
-    "link1": "Продукция",
+    "link1": "Продажа UC",
     "help": "Помощь",
     "socialmedia": "Социальные сети",
-    "link2": "Приложение для телефона",
-    "link3": "О нас",
+    "link2": "Продажа аккаунтов",
+    "link3": "Объявления",
     "link4": "Связаться с нами",
     "link5": "Наши контакты",
     "link6": "Наш телеграм канал",

diff --git a/src/locales/uz.json b/src/locales/uz.json
@@ -40,16 +40,13 @@
   },
   "footer": {
     "paragraph1": "To'lov tizimlar hozircha faqat Click evolution va Payme orqali amalga oshiriladi! Agar savdo tuganlanmasa pul qaytarib beriladi!",
-    "link1": "Mahsulotlar",
+    "link1": "UC sotish",
     "help": "Yordam",
     "socialmedia": "Social Media",
-    "link2": "Telefonga application",
-    "link3": "Biz haqimizda",
+    "link2": "Akkount sotish",
+    "link3": "E'lonlar",
     "link4": "Biz bilan bog'lanish",
-    "link5": "Bizning kontactlar",
     "link6": "Telegram kanalimiz",
-    "link7": "youtube videolarimiz",
-    "link8": "Instagram accountimiz",
     "link9": "terms & conditions"
   },
   "topgames": {

diff --git a/src/pages/chat/chatFront/chatFront.css b/src/pages/chat/chatFront/chatFront.css
@@ -90,3 +90,10 @@
   color: #d0dfe8;
   font-weight: bold;
 }
+
+
+.no-chat {
+  padding: 1rem;
+  text-align: center;
+  font-family: monospace, sans-serif;
+}
diff --git a/src/pages/chat/chatFront/chatFront.js b/src/pages/chat/chatFront/chatFront.js
@@ -81,8 +81,13 @@ const FrontChat = () => {
           </button>
         </Link>
       </header>
+
       <div className='chat-list'>
-        {chatsArray.map((chat) => (
+
+        {chatsArray.length === 0 ? (
+          <h1 className='no-chat'>hozircha chat yaratilmagan</h1>
+        ) :
+        chatsArray.map((chat) => (
           <div
             key={chat.id}
             className='chat-info'
@@ -126,6 +131,7 @@ const FrontChat = () => {
             ) : null}
           </div>
         ))}
+
       </div>
       {selectedChatId && <Chat chatId={selectedChatId} />}
     </div>