Merge pull request #20 from jahongiry/desktop

media signup and login
jahongiry · Jan 16, 2024 · 488a2bd · 488a2bd
2 parents 2842c5d + 0b0ebff
commit 488a2bd
Show file tree

Hide file tree

Showing 12 changed files with 259 additions and 156 deletions.
diff --git a/src/App.js b/src/App.js
@@ -4,7 +4,7 @@ import './App.css';
 import Header from './component/header/Header';
 import Footer from './component/footer/Footer';
 import Home from './pages/home/Home';
-import About from './pages/about/About';
+import Advertisement from './pages/advertisement/Advertisement';
 import Contact from './pages/contact/Contact';
 import Login from './pages/login/Login';
 import Signup from './pages/signup/Signup';
@@ -23,7 +23,7 @@ function App() {
       <Header />
       <Routes>
         <Route path='/' exact element={<Home />} />
-        <Route path='/about' element={<About />} />
+        <Route path='/advertisement' element={<Advertisement />} />
         <Route path='/contact' element={<Contact />} />
         <Route path='/login' exact element={<Login />} />
         <Route path='/signup' exact element={<Signup />} />

diff --git a/src/component/header/Header.js b/src/component/header/Header.js
@@ -26,7 +26,7 @@ const Header = () => {
             </NavLink>
           </li>
           <li onClick={navBtn}>
-            <NavLink to='/about'><i className="fa-solid fa-circle-info"></i>Biz haqimizda</NavLink>
+            <NavLink to='/advertisement'><i className="fa-solid fa-circle-info"></i>E'lonlar</NavLink>
           </li>
           <li onClick={navBtn}>
             <NavLink to='/contact'><i className="fa-solid fa-comments"></i>Bog'lanish</NavLink>

diff --git a/src/pages/profile/img/bg2.jpg → src/img/bg2.jpg b/src/pages/profile/img/bg2.jpg → src/img/bg2.jpg
diff --git a/src/pages/about/About.js b/src/pages/about/About.js
diff --git a/src/pages/about/about.css b/src/pages/about/about.css
diff --git a/src/pages/advertisement/Advertisement.js b/src/pages/advertisement/Advertisement.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import "./advertisement.css";
+
+const Advertisement = () => {
+  return (
+    <div className='advertisement-container'>
+      <h1>Advertisement</h1>
+    </div>
+  )
+}
+
+export default Advertisement;
diff --git a/src/pages/advertisement/advertisement.css b/src/pages/advertisement/advertisement.css
@@ -0,0 +1,3 @@
+.advertisement-container {
+    padding-top: 100px;
+}
diff --git a/src/pages/login/Login.js b/src/pages/login/Login.js
@@ -1,61 +1,61 @@
-import React from 'react';
-import './login.css';
-import logo1 from '../../component/header/logo1_1.png';
-import { NavLink, Link } from 'react-router-dom';
+import React from "react";
+import "./login.css";
+import logo1 from "../../component/header/logo1_1.png";
+import { NavLink, Link } from "react-router-dom";
 
 const Login = () => {
   return (
-    <div className='about-container'>
-      <div className='login-container'>
-        <div className='login-border'>
-          <div className='line'>
-            <div className='corner-item top-left'></div>
+    <div className="login-section">
+      <div className="login-container">
+        <div className="login-border">
+          <div className="line">
+            <div className="corner-item top-left"></div>
             <hr />
             <hr />
-            <div className='corner-item top-right'></div>
+            <div className="corner-item top-right"></div>
           </div>
-          <img className='logo-in' src={logo1} alt='logo' />
+          <img className="logo-in" src={logo1} alt="logo" />
           <h2>Hush kelibsiz</h2>
-          <form className='login-form'>
-            <div className='input-container'>
-              <label htmlFor='username'>Telefon nomer</label>
-              <input type='text' id='username' placeholder='+998912345678' />
+          <form className="login-form">
+            <div className="input-container">
+              <label htmlFor="username">Telefon nomer</label>
+              <input type="text" id="username" placeholder="+998912345678" />
             </div>
-            <div className='input-container'>
-              <label htmlFor='password'>Parolingiz</label>
-              <input type='password' id='password' placeholder='Password' />
+            <div className="input-container">
+              <label htmlFor="password">Parolingiz</label>
+              <input type="password" id="password" placeholder="Password" />
             </div>
-            <div className='login-footer'>
+            <div className="login-footer">
               <div>
-                <label htmlFor='button'>Parol esdan chiqdi</label>
-                <button type='button' className='signup-button'>
+                <label htmlFor="button">Parol esdan chiqdi</label>
+                <button type="button" className="signup-button">
                   Parol tiklash
                 </button>
               </div>
-              <hr class='vertical-hr' />
+              <hr class="vertical-hr" />
               <div>
-                <hr className='horizontal-hr' />
-                <NavLink to='/signup'>
-                  <button type='submit' className='login-button royhat-login'>
+                <hr className="horizontal-hr" />
+                <NavLink to="/signup">
+                  <button type="submit" className="login-button royhat-login">
                     Royhatdan o'tish
                   </button>
                 </NavLink>
               </div>
             </div>
-            <button type='submit' className='login-main'>
+            <button type="submit" className="login-main">
               Kirish
             </button>
-            <div className='back-home'>
+            <div className="back-home">
               <hr />
-              <NavLink activeclassname='forgot-password' to='/'>
+              <NavLink activeclassname="forgot-password" to="/">
                 ASOSIYGA QAYTISH
               </NavLink>
               <hr />
             </div>
-            <hr className='bottom-line' />
+            <hr className="bottom-line" />
           </form>
-          <div className='corner-item bottom-left'></div>
-          <div className='corner-item bottom-right'></div>
+          <div className="corner-item bottom-left"></div>
+          <div className="corner-item bottom-right"></div>
         </div>
       </div>
     </div>