Merge pull request #35 from jahongiry/chat-v1

Finish chat part one
jahongiry · Feb 15, 2024 · 6c7b9a6 · 6c7b9a6
2 parents 4fcdca5 + b3484a5
commit 6c7b9a6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/src/img/pubg_winter.avif b/src/img/pubg_winter.avif
diff --git a/src/pages/login/Login.js b/src/pages/login/Login.js
@@ -90,6 +90,9 @@ const Login = () => {
                 onChange={handleInputChange}
               />
             </div>
+            <button type='submit' className='login-main'>
+              {translations.login.enter}
+            </button>
             <div className='login-footer'>
               <div>
                 <label htmlFor='button'>{translations.login.forget}</label>
@@ -107,9 +110,7 @@ const Login = () => {
                 </NavLink>
               </div>
             </div>
-            <button type='submit' className='login-main'>
-              {translations.login.enter}
-            </button>
+
             <div className='back-home'>
               <hr />
               <NavLink activeclassname='forgot-password' to='/'>

diff --git a/src/pages/login/login.css b/src/pages/login/login.css
@@ -219,11 +219,12 @@
 
 .login-section .login-main {
   width: 100%;
-  font-size: 1.2rem;
+  font-size: 1.5rem !important;
   font-weight: 800;
   letter-spacing: 2px;
-  padding: 5px;
+  padding: 10px !important;
   border-radius: 25px;
+  margin-top: 1rem;
   margin-bottom: 3rem;
   border-top: 2px solid #d6b1d6; /* Light blue top border */
   border-right: 2px solid #d969c6; /* Regular blue for the right border */

diff --git a/src/pages/signup/Signup.js b/src/pages/signup/Signup.js
@@ -103,6 +103,9 @@ const Signup = () => {
                 </div>
               )}
             </div>
+            <button type='submit' className='login-button login-main-signup'>
+              {translations.signup.signup}
+            </button>
             <div className='login-footer'>
               <div>
                 <label htmlFor='button'>
@@ -124,9 +127,6 @@ const Signup = () => {
                 </NavLink>
               </div>
             </div>
-            <button type='submit' className='login-button login-main-signup'>
-              {translations.signup.signup}
-            </button>
           </form>
           <div className='corner-item bottom-left'></div>
           <div className='corner-item bottom-right'></div>

diff --git a/src/pages/signup/signup.css b/src/pages/signup/signup.css
@@ -239,10 +239,10 @@
 
 .login-section .login-main-signup {
   width: 100%;
-  font-size: 1.2rem;
+  font-size: 1.5rem !important;
   font-weight: 800;
   letter-spacing: 2px;
-  padding: 5px;
+  padding: 10px !important;
   border-radius: 25px;
   margin-top: 2rem;
   margin-bottom: 3rem;

diff --git a/src/slices/cardSlice.js b/src/slices/cardSlice.js
@@ -12,7 +12,6 @@ export const fetchCards = createAsyncThunk(
   async (_, thunkAPI) => {
     try {
       const response = await axios.get('/offers');
-      console.log(response.data);
       return response.data;
     } catch (error) {
       return thunkAPI.rejectWithValue(error.response.data);