From 9f249a5aa267409771cf57786769782cb0c84555 Mon Sep 17 00:00:00 2001 From: sohila Date: Sun, 9 Jul 2023 17:56:12 +0300 Subject: [PATCH] fix styles --- src/App.js | 3 +-- src/components/ArticlesCard/ArticlesCard.js | 1 - src/components/Footer/Footer.module.css | 1 + src/components/Header/Nav.js | 4 ++-- src/components/Header/Nav.module.css | 2 -- src/components/Header/google-signin/GoogleSignIn.js | 4 ---- .../registe-signin/ForgetPassword/ForgetPass.js | 1 - .../Header/registe-signin/Signin/SignIn.js | 1 - .../HomeSections/HomePage-sec3/Sec3.module.css | 10 +++++----- src/components/Otp/Otp.js | 2 +- src/components/PageOutLine/PageOutLine.js | 4 ++-- src/components/PopUp_Message/error/MPopUp.js | 1 - .../ProfileComp/Informations/Informations.js | 1 - src/components/ToursCard/ToursCard.js | 1 - src/components/ToursCard/ToursCard.module.css | 3 ++- src/components/outLineBtn/OutLineBtn.module.css | 1 - src/pages/About/About.module.css | 1 - src/pages/ContactUs/ContactUS.js | 1 - src/pages/ContactUs/ContactUs.module.css | 12 ------------ src/pages/Download/Download.module.css | 3 --- src/pages/Profile/Profile.js | 2 +- src/pages/Profile/Profile.module.css | 2 +- src/pages/QandA/QandA.js | 1 - src/pages/QandA/QandA.module.css | 4 ++++ src/pages/TermsAndConditions/Terms.js | 11 ----------- src/pages/TimeLine/KnowHistory.js | 2 -- src/pages/ToursInfo/ToursInfo.js | 1 - src/pages/ToursInfo/ToursInfo.module.css | 8 ++++++-- src/repositories/ContactUsRepo.js | 1 - src/repositories/ProfileRepo.js | 2 -- src/repositories/articleRepo.js | 2 ++ src/repositories/authRepo.js | 13 ------------- src/repositories/questionsRepo.js | 1 + src/repositories/timeLineRepo.js | 2 -- src/repositories/toursRepo.js | 2 -- 35 files changed, 29 insertions(+), 82 deletions(-) diff --git a/src/App.js b/src/App.js index 72177ba..8aec970 100644 --- a/src/App.js +++ b/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 ( diff --git a/src/components/ArticlesCard/ArticlesCard.js b/src/components/ArticlesCard/ArticlesCard.js index c90e17b..d9eaf47 100644 --- a/src/components/ArticlesCard/ArticlesCard.js +++ b/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"; diff --git a/src/components/Footer/Footer.module.css b/src/components/Footer/Footer.module.css index 677798a..94d8d67 100644 --- a/src/components/Footer/Footer.module.css +++ b/src/components/Footer/Footer.module.css @@ -124,6 +124,7 @@ .arrow_icon img{ width: 40px; + cursor: pointer; } .footer_prag3{ diff --git a/src/components/Header/Nav.js b/src/components/Header/Nav.js index 64189d8..63b7ce6 100644 --- a/src/components/Header/Nav.js +++ b/src/components/Header/Nav.js @@ -245,7 +245,7 @@ export default function Nav() { {NavList} {LogIn ? ( @@ -263,7 +263,7 @@ export default function Nav() { style={{ width: "18%", borderRadius: "50%" }} />   - {userData != null && userData.full_name != null + {userData != null && userData.full_name != null && userData.full_name != null ? {userData.full_name.split(" ")[0]}

{userData.email}

 : ""} diff --git a/src/components/Header/Nav.module.css b/src/components/Header/Nav.module.css index fcd01e2..a613265 100644 --- a/src/components/Header/Nav.module.css +++ b/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; diff --git a/src/components/Header/google-signin/GoogleSignIn.js b/src/components/Header/google-signin/GoogleSignIn.js index 170defe..0891c8b 100644 --- a/src/components/Header/google-signin/GoogleSignIn.js +++ b/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), diff --git a/src/components/Header/registe-signin/ForgetPassword/ForgetPass.js b/src/components/Header/registe-signin/ForgetPassword/ForgetPass.js index 192b0f6..f2ed250 100644 --- a/src/components/Header/registe-signin/ForgetPassword/ForgetPass.js +++ b/src/components/Header/registe-signin/ForgetPassword/ForgetPass.js @@ -80,7 +80,6 @@ export default function ForgetPass() { setTimeout(() => { setButtonPopup(false); }, 2000); - console.log(res.body) } }); }; diff --git a/src/components/Header/registe-signin/Signin/SignIn.js b/src/components/Header/registe-signin/Signin/SignIn.js index 52ef052..91bff5d 100644 --- a/src/components/Header/registe-signin/Signin/SignIn.js +++ b/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) } }); } diff --git a/src/components/HomeSections/HomePage-sec3/Sec3.module.css b/src/components/HomeSections/HomePage-sec3/Sec3.module.css index 88961f5..a3b9b83 100644 --- a/src/components/HomeSections/HomePage-sec3/Sec3.module.css +++ b/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 { diff --git a/src/components/Otp/Otp.js b/src/components/Otp/Otp.js index 19a465e..cf2178f 100644 --- a/src/components/Otp/Otp.js +++ b/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) { diff --git a/src/components/PageOutLine/PageOutLine.js b/src/components/PageOutLine/PageOutLine.js index 7577528..59717f6 100644 --- a/src/components/PageOutLine/PageOutLine.js +++ b/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) diff --git a/src/components/PopUp_Message/error/MPopUp.js b/src/components/PopUp_Message/error/MPopUp.js index 3371bcc..37bf87a 100644 --- a/src/components/PopUp_Message/error/MPopUp.js +++ b/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"; diff --git a/src/components/ProfileComp/Informations/Informations.js b/src/components/ProfileComp/Informations/Informations.js index 93fc5b1..177f4ac 100644 --- a/src/components/ProfileComp/Informations/Informations.js +++ b/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) { diff --git a/src/components/ToursCard/ToursCard.js b/src/components/ToursCard/ToursCard.js index 53c2b2e..c561716 100644 --- a/src/components/ToursCard/ToursCard.js +++ b/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(() => { diff --git a/src/components/ToursCard/ToursCard.module.css b/src/components/ToursCard/ToursCard.module.css index 1d49ebb..677f724 100644 --- a/src/components/ToursCard/ToursCard.module.css +++ b/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{ diff --git a/src/components/outLineBtn/OutLineBtn.module.css b/src/components/outLineBtn/OutLineBtn.module.css index 3983af0..47a8afd 100644 --- a/src/components/outLineBtn/OutLineBtn.module.css +++ b/src/components/outLineBtn/OutLineBtn.module.css @@ -12,5 +12,4 @@ .btn:hover{ transform: scale(1.1); background-color: var(--secondryColor); - /* border: none; */ } \ No newline at end of file diff --git a/src/pages/About/About.module.css b/src/pages/About/About.module.css index b7fc614..add5a8d 100644 --- a/src/pages/About/About.module.css +++ b/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; diff --git a/src/pages/ContactUs/ContactUS.js b/src/pages/ContactUs/ContactUS.js index 4e8dfcb..948bca4 100644 --- a/src/pages/ContactUs/ContactUS.js +++ b/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); diff --git a/src/pages/ContactUs/ContactUs.module.css b/src/pages/ContactUs/ContactUs.module.css index ffaf635..69f67fe 100644 --- a/src/pages/ContactUs/ContactUs.module.css +++ b/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; diff --git a/src/pages/Download/Download.module.css b/src/pages/Download/Download.module.css index 80b2bf2..173c0c0 100644 --- a/src/pages/Download/Download.module.css +++ b/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; } diff --git a/src/pages/Profile/Profile.js b/src/pages/Profile/Profile.js index 2aeac29..fa42e68 100644 --- a/src/pages/Profile/Profile.js +++ b/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'; diff --git a/src/pages/Profile/Profile.module.css b/src/pages/Profile/Profile.module.css index eaf47d1..a5332ac 100644 --- a/src/pages/Profile/Profile.module.css +++ b/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); } diff --git a/src/pages/QandA/QandA.js b/src/pages/QandA/QandA.js index 6fc70ac..989eea5 100644 --- a/src/pages/QandA/QandA.js +++ b/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); } diff --git a/src/pages/QandA/QandA.module.css b/src/pages/QandA/QandA.module.css index 0cfde2b..fb4ca91 100644 --- a/src/pages/QandA/QandA.module.css +++ b/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; diff --git a/src/pages/TermsAndConditions/Terms.js b/src/pages/TermsAndConditions/Terms.js index 47b00d7..9c408df 100644 --- a/src/pages/TermsAndConditions/Terms.js +++ b/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() ; }, []); diff --git a/src/pages/TimeLine/KnowHistory.js b/src/pages/TimeLine/KnowHistory.js index a8ad1ce..ed0bd6d 100644 --- a/src/pages/TimeLine/KnowHistory.js +++ b/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(); diff --git a/src/pages/ToursInfo/ToursInfo.js b/src/pages/ToursInfo/ToursInfo.js index 1a43159..a26fd6f 100644 --- a/src/pages/ToursInfo/ToursInfo.js +++ b/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]); diff --git a/src/pages/ToursInfo/ToursInfo.module.css b/src/pages/ToursInfo/ToursInfo.module.css index 2f0fa63..9f97062 100644 --- a/src/pages/ToursInfo/ToursInfo.module.css +++ b/src/pages/ToursInfo/ToursInfo.module.css @@ -10,6 +10,7 @@ .mySwiper_img { width: 530px; height: 300px; + border-radius: 20px; } .next_btn { @@ -17,7 +18,7 @@ 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, diff --git a/src/repositories/ContactUsRepo.js b/src/repositories/ContactUsRepo.js index c1b1565..8032750 100644 --- a/src/repositories/ContactUsRepo.js +++ b/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, diff --git a/src/repositories/ProfileRepo.js b/src/repositories/ProfileRepo.js index 3a2da17..9915495 100644 --- a/src/repositories/ProfileRepo.js +++ b/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, diff --git a/src/repositories/articleRepo.js b/src/repositories/articleRepo.js index 613d561..df81b58 100644 --- a/src/repositories/articleRepo.js +++ b/src/repositories/articleRepo.js @@ -24,6 +24,7 @@ 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, @@ -31,6 +32,7 @@ export async function addFav(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, diff --git a/src/repositories/authRepo.js b/src/repositories/authRepo.js index 7d79ed4..89553cb 100644 --- a/src/repositories/authRepo.js +++ b/src/repositories/authRepo.js @@ -27,21 +27,8 @@ export async function Logout(body) { }; } -// export async function refreshToken() { -// var refresh = localStorage.getItem("refresh"); -// const result = await Post( -// "auth/token/refresh/", -// JSON.stringify({ refresh: refresh }) -// ); -// if (!result.isError) { -// localStorage.setItem("access", result.body.access); -// localStorage.setItem("refresh", result.body.refresh); -// } -// } - export async function register(body) { const result = await Post("auth/register/", JSON.stringify(body)); - return { isError: result.isError, body: result.body, diff --git a/src/repositories/questionsRepo.js b/src/repositories/questionsRepo.js index ecb53e7..2825123 100644 --- a/src/repositories/questionsRepo.js +++ b/src/repositories/questionsRepo.js @@ -2,6 +2,7 @@ import { GET, Put } from "../helpers/apiService"; export async function getQuestionsByTitle(title) { const result = await GET(`questions/${title.toLowerCase()}/`); + console.log(result.body) return result; } diff --git a/src/repositories/timeLineRepo.js b/src/repositories/timeLineRepo.js index 1962479..ff015c9 100644 --- a/src/repositories/timeLineRepo.js +++ b/src/repositories/timeLineRepo.js @@ -2,7 +2,6 @@ import { GET } from "../helpers/apiService"; export async function getTimeLine() { const result = await GET("timeline/"); - console.log(result.body) return { isError: result.isError, body: result.body, @@ -10,7 +9,6 @@ export async function getTimeLine() { } export async function getTimeLineById(id) { const result = await GET(`timeline/${id}/`); - console.log(result.body) return { isError: result.isError, body: result.body, diff --git a/src/repositories/toursRepo.js b/src/repositories/toursRepo.js index 3a6d5cd..79d30df 100644 --- a/src/repositories/toursRepo.js +++ b/src/repositories/toursRepo.js @@ -2,7 +2,6 @@ import { GET } from "../helpers/apiService"; export async function getTours(pageNum) { const result = await GET(`tours/?page=${pageNum}`); - console.log(result.body) return { isError: result.isError, body: result.body, @@ -10,7 +9,6 @@ export async function getTours(pageNum) { } export async function getTourById(id) { const result = await GET(`tours/${id}/`); - console.log(result.body) return { isError: result.isError, body: result.body,