Merge pull request #75 from Etlas-SCU/quiz

fix styles

src/App.js

@@ -5,7 +5,7 @@ import Nav from "./components/Header/Nav.js";
 import Download from "./pages/Download/Download";
 import AboutUs from "./pages/About/AboutUs";
 import KnowHistory from "./pages/TimeLine/KnowHistory";
-import { Context, Provider } from "./components/Context/Context";
+import { Provider } from "./components/Context/Context";
 import Articles from "./pages/Articles/Articles";
 import Tours from "./pages/Tours/Tours";
 import ArticleInfo from "./pages/ArticleInfo/ArticleInfo";
@@ -24,7 +24,6 @@ function App() {
 
   useEffect(() => {
     window.scrollTo(0, 0);
-    // localStorage.removeItem("access");
   }, [pathname]);
 
   return (

src/components/ArticlesCard/ArticlesCard.js

@@ -1,6 +1,5 @@
 import { Box, Skeleton } from "@mui/material";
 import React, { useEffect, useState } from "react";
-// import article from "../../images/Pngs/article.png";
 import styles from "./ArticlesCard.module.css";
 import KeyboardArrowRightIcon from "@mui/icons-material/KeyboardArrowRight";
 import { Link } from "react-router-dom";

src/components/Footer/Footer.module.css

@@ -124,6 +124,7 @@
 
 .arrow_icon img{
     width: 40px;
+    cursor: pointer;
 }
 
 .footer_prag3{

src/components/Header/Nav.js

@@ -245,7 +245,7 @@ export default function Nav() {
               {NavList}
               {LogIn ? (
                 <Box
-                  width="28%"
+                  width="29%"
                   display="flex"
                   alignItems="center"
                 >
@@ -263,7 +263,7 @@ export default function Nav() {
                         style={{ width: "18%", borderRadius: "50%" }}
                       />
                         &nbsp;
-                        {userData != null && userData.full_name != null
+                        {userData != null && userData.full_name != null && userData.full_name != null
                           ? <Stack>{userData.full_name.split(" ")[0]}<p style={{fontSize:"0.5vw"}}>{userData.email}</p></Stack>
                           : ""}
                     </NavLink>

src/components/Header/Nav.module.css

@@ -87,9 +87,7 @@ padding: 8px;
   color:var(--mainColor) ;
   font-weight:900 ;
   text-align: center;
-  /* width: 160px; */
   margin: 0 auto;
-  /* font-size:0.9vw ; */
   background-color:#d9d9d9;
   border-radius:6px;
   margin-bottom: 15px;

src/components/Header/google-signin/GoogleSignIn.js

@@ -10,10 +10,6 @@ export default function GoogleSignIn() {
     onSuccess: (codeResponse) => {
       localStorage.setItem("access", codeResponse.body.access_token);
       console.log(codeResponse);
-      // localStorage.setItem("refresh", result.body.tokens.refresh);
-      // const expiryDate = new Date();
-      // expiryDate.setTime(expiryDate.getTime() + (3 * 60 * 1000));
-      // localStorage.setItem("tokenExpiry", expiryDate.getTime());
       setButtonPopup([false, ""]);
     },
     onError: (errorResponse) => console.log(errorResponse),

src/components/Header/registe-signin/ForgetPassword/ForgetPass.js

@@ -80,7 +80,6 @@ export default function ForgetPass() {
         setTimeout(() => {
           setButtonPopup(false);
         }, 2000);
-        console.log(res.body)
       }
     });
   };

src/components/Header/registe-signin/Signin/SignIn.js

@@ -53,7 +53,6 @@ export default function SignIn() {
         if(result.body.detail === "Email is not verified"){
           setOtp(true);
         }
-        console.log(result.body)
       }
     });
   }

src/components/HomeSections/HomePage-sec3/Sec3.module.css

@@ -57,12 +57,12 @@
 .disCont::after{
     content: '';
     position: absolute;
-    bottom: -12px;
-    left: -33px;
-    width: 100%;
-    height: 45px;
+    bottom: -26px;
+    left: -13px;
+    width: 110%;
+    height: 60px;
     background-color: #dfdadafc;
-    filter: blur(15px);
+    filter: blur(9px);
 }
 
 .slider__title {

src/components/Otp/Otp.js

@@ -3,7 +3,7 @@ import OTPInput from "react-otp-input";
 import { Box, Typography } from "@mui/material";
 import styles from "../Header/registe-signin/Signin/sign_reg.module.css";
 import { Context } from "../Context/Context";
-import { PasswordResetOtp, RequestOtp, emailVerify } from "../../repositories/authRepo";
+import { RequestOtp, emailVerify } from "../../repositories/authRepo";
 import MPopUp from "../PopUp_Message/error/MPopUp";
 
 export default function Otp(props) {

src/components/PageOutLine/PageOutLine.js

@@ -1,12 +1,12 @@
 import { Pagination, Stack } from "@mui/material";
-import React, { useContext, useEffect, useState } from "react";
+import React, { useContext } from "react";
 import filter from "../../images/Icons/Filter.png";
 import SearchInput from "../SearchInput/SearchInput";
 import styles from "./PageOutLine.module.css";
 import { Context } from "../Context/Context";
 
 export default function PageOutLine({ children, value }) {
-  const {pageNum, setPageNum } = useContext(Context);
+  const { setPageNum } = useContext(Context);
 
   const handleChange=(e,p)=>{
     setPageNum(p)

src/components/PopUp_Message/error/MPopUp.js

@@ -1,6 +1,5 @@
 import { Box, Stack } from "@mui/material";
 import React from "react";
-import close from "../../../images/Icons/close.png";
 import styles from "./MPopUp.module.css";
 import error from "../../../images/Pngs/error.png";
 import warning from "../../../images/Pngs/warning.png";

src/components/ProfileComp/Informations/Informations.js

@@ -49,7 +49,6 @@ export default function Informations() {
             phone_number: phone
         }
 
-        console.log(editProfile);
 
         var result = await editUserInfo(editProfile);
         if (result.isError) {

src/components/ToursCard/ToursCard.js

@@ -6,7 +6,6 @@ import Stars from '../Stars/Stars'
 import { Fade } from 'react-awesome-reveal';
 
 export default function ToursCard({ id ,tour }) {
-    console.log(tour)
     const [isLoading, setIsLoading] = useState(true);
 
     useEffect(() => {

src/components/ToursCard/ToursCard.module.css

@@ -26,7 +26,8 @@
     width: 95% ;
     height: 170px;
     margin-right: 5px ;
-    border-radius: 15px;
+    border-radius: 15px 0 0 15px;
+    object-fit: cover;
 }
 
 .tours_sec2{

src/components/outLineBtn/OutLineBtn.module.css

@@ -12,5 +12,4 @@
 .btn:hover{
     transform: scale(1.1);
     background-color: var(--secondryColor);
-    /* border: none; */
 }

src/pages/About/About.module.css

@@ -24,7 +24,6 @@
     font-size: 60px;
     font-family: 'CapitalisTypOasis';
     color: var(--mainColor);
-    /* transform: rotate(-270deg); */
     rotate: 90deg;
     position: absolute;
     top: 229px;

src/pages/ContactUs/ContactUS.js

@@ -18,7 +18,6 @@ export default function ContactUS() {
     const [subject, setSubject] = useState("");
     const [message, setMessage] = useState("");
 
-    // const [buttonPopup, setButtonPopup] = useState(false);
     const { setButtonPopup, setMassagePopup } = useContext(Context);
     const [popup, setPopup] = useState(null);
 

src/pages/ContactUs/ContactUs.module.css

@@ -102,18 +102,6 @@
     height: 99.5%;
 }
 
-/* .title_popup{
-    padding: 40px 0 20px 0;
-    color: var(--mainColor);
-
-}
-
-.prag_popup{
-    color: var(--mainColor);
-    font-size: 15px;
-    font-weight: 500;
-} */
-
 @media only screen and (max-width: 1000px){
     .contact_eimg{
         display: none;

src/pages/Download/Download.module.css

@@ -1,7 +1,5 @@
 .down{
     padding: 105px 25px 0px 25px;
-    /* margin: 0 0 30px; */
-
     color: var(--mainColor);
 }
 .title{
@@ -45,7 +43,6 @@
     position: absolute;
     width: 397px;
     right: -181px;
-    /* bottom: 200px; */
     top: -95px;
 
 }

src/pages/Profile/Profile.js

@@ -1,4 +1,4 @@
-import React, { useState , useEffect } from 'react';
+import React, { useState } from 'react';
 import Style from './Profile.module.css';
 import { Box } from '@mui/material';
 import ProfilePic from '../../images/Pngs/ProfilePic.jpg';

src/pages/Profile/Profile.module.css

@@ -2,7 +2,7 @@
     display: flex;
     flex-direction: row;
     justify-content: space-between;
-    padding-top: 100px;
+    padding-top: 150px;
     height: 100%;
     background: var(--mainColor);
 }

src/pages/QandA/QandA.js

@@ -28,7 +28,6 @@ export default function QandA() {
       setIsLoading(true);
       var result = await getQuestionsByTitle(title);
       setIsLoading(false);
-      console.log(result.body)
       if (!result.isError) {
         setQuestions(result.body);
       }

src/pages/QandA/QandA.module.css

@@ -49,6 +49,7 @@
     width: 50%;
     border: none;
     display: block;
+    color: var(--mainColor);
 
 }
 
@@ -80,6 +81,9 @@
     border: none;
     cursor: pointer;
 }
+.hint img{
+    width: 100px;
+}
 .finish{
     text-align: center;
     color: white;

src/pages/TermsAndConditions/Terms.js

@@ -4,26 +4,15 @@ import React, { useState, useEffect } from 'react';
 import Pic from '../../images/Pics/pic1.png'
 import Status from '../../images/Pngs/hat-stock 1.png'
 import { Skeleton } from '@mui/material';
-// import { getTerms , isSuccessfulRequest } from '../../helpers/apiService';
-// import DOMPurify from 'dompurify';
 
 export default function Terms(props) {
 
     const [isLoading, setIsLoading] = useState(true);
-    // const [terms , setTerms] = useState(null) ;
 
     useEffect(() => {
         setTimeout(() => {
             setIsLoading(false);
         }, 2000);
-        // async function fetchData (){
-        //     const {statusCode , data} = await getTerms() ;
-        //     setIsLoading(false) ;
-        //     if(isSuccessfulRequest(statusCode)){
-        //         setTerms(DOMPurify.sanitize(data)) ;
-        //     }
-        // }
-        // fetchData() ;
     }, []);
 
 

src/pages/TimeLine/KnowHistory.js

@@ -18,8 +18,6 @@ export default function KnowHistory() {
   const { timeLineSections ,timeLine} = useContext(Context);
   const { t } = useTranslation();
 
-  console.log(timeLine)
-
   const sectionRefs = useRef([]);
   const location = useLocation();
 

src/pages/ToursInfo/ToursInfo.js

@@ -37,7 +37,6 @@ export default function ToursInfo(props) {
   }
   useEffect(() => {
     getTour(id);
-    console.log(tour);
   }, []);
 
   SwiperCore.use([EffectCoverflow, Pagination, Navigation, Autoplay]);

src/pages/ToursInfo/ToursInfo.module.css

@@ -10,14 +10,15 @@
 .mySwiper_img {
     width: 530px;
     height: 300px;
+    border-radius: 20px;
 }
 
 .next_btn {
     border: none;
     width: 50px;
     height: 50px;
     position: absolute;
-    right: 24%;
+    right: 2%;
     top: 140px;
     z-index: 9999;
     background: #003441;
@@ -26,6 +27,7 @@
     justify-content: center;
     vertical-align: middle;
     display: flex;
+    cursor: pointer;
 }
 
 .btn_inacitve {
@@ -37,7 +39,7 @@
     width: 50px;
     height: 50px;
     position: absolute;
-    left: 32%;
+    left: 2%;
     top: 140px;
     z-index: 9999;
     background: #003441;
@@ -46,6 +48,8 @@
     justify-content: center;
     vertical-align: middle;
     display: flex;
+    cursor: pointer;
+
 }
 
 .next_img,

src/repositories/ContactUsRepo.js

@@ -3,7 +3,6 @@ import { Post } from '../helpers/apiService'
 
 export async function ContactUs(body) {
     const result = await Post("contact-us/message/", JSON.stringify(body))
-    console.log(result.body) ;
     return {
         isError: result.isError,
         body: result.body,

src/repositories/ProfileRepo.js

@@ -26,7 +26,6 @@ export async function getBestScore(){
 
 export async function getFavoriteArticle(){
   const result = await GET("favorites/") ;
-  console.log(result.body.results);
   return {
     isError: result.isError,
     body: result.body,
@@ -35,7 +34,6 @@ export async function getFavoriteArticle(){
 
 export async function deleteFavorite(body){
   const result = await DELETE(`favorites/articles/delete/` , JSON.stringify(body)) ;
-  console.log(result.body) ;
   return{
     isError: result.isError,
     body: result.body,

src/repositories/articleRepo.js

@@ -24,13 +24,15 @@ export async function isFavorite(body) {
 }
 export async function addFav(body) {
   const result = await Post("favorites/article/add/", JSON.stringify(body));
+  console.log(result.body)
   return {
     isError: result.isError,
     body: result.body,
   };
 }
 export async function delFav(body) {
   const result = await DELETE("favorites/article/delete/", JSON.stringify(body));
+  console.log(result.body)
   return {
     isError: result.isError,
     body: result.body,