Merge branch 'dev'

Katyusha-Group · Dec 15, 2023 · 91e6a68 · 91e6a68
2 parents 39dae9d + af5aeeb
commit 91e6a68
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/src/App.jsx b/src/App.jsx
@@ -32,7 +32,7 @@ import Timelinepage from "./views/TimeLine/Timelinepage.jsx";
 import { ErrorBoundary } from "react-error-boundary";
 import NotFound from "./views/404.jsx";
 import InternalServerError from "./views/500.jsx";
-import NewLandingpage from "./views/NewLandingpage.jsx";
+import NewLandingpage from "./views/NewLandingPage.jsx";
 import AdminPanel from "./views/admin/Admin.jsx"
 import Replies from "./views/TimeLine/Replies.jsx";
 import ErrorBoundrypage from "./views/ErrorBoundrypage.jsx";

diff --git a/src/components/Admin/Admin_SearchBar.jsx b/src/components/Admin/Admin_SearchBar.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from "react";
-import styles from "../../assets/css/Admin/Admin_Searchbar.module.css";
+import styles from "../../assets/css/admin/Admin_Searchbar.module.css";
 import Searchfield from "../../views/Searchfield"
 import UserSearchResponce from "../../views/UserSearchResponce";
 import { Card } from "reactstrap";

diff --git a/src/views/404.jsx b/src/views/404.jsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import Sidebar from './Sidebar/Sidebar'
-import styles from '../assets/css/Notfound.module.css'
+import styles from './../assets/css/NotFound.module.css'
 import Notfoundmain from '../components/notfoundmain'
 const NotFound = () => {
   return (

diff --git a/src/views/Landing/PlanningInLanding.jsx b/src/views/Landing/PlanningInLanding.jsx
@@ -1,7 +1,6 @@
 import React from "react";
-import styles from "../../assets/css/landing/mainpart.module.css";
-import image from "../../assets/img/imgdarkolive.jpg";
-
+import styles from "./../../assets/css/Landing/mainpart.module.css";
+import image from "./../../assets/img/imgdarkolive.jpg";
 const PlanningInLanding = () => {
   return (
     <div className={styles.FirstType}>

diff --git a/src/views/Landing/TimeLinelanding.jsx b/src/views/Landing/TimeLinelanding.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import styles from "../../assets/css/landing/mainpart.module.css";
+import styles from "../../assets/css/Landing/mainpart.module.css";
 import image from "../../assets/img/timelineeg.png";
 
 const TimeLinelanding = () => {

diff --git a/src/views/NewLandingPage.jsx b/src/views/NewLandingPage.jsx
@@ -1,13 +1,12 @@
 import React, { useEffect } from "react";
 import { motion, useScroll, useAnimation } from "framer-motion";
-import styles from "../assets/css/landing/newLanding.module.css";
-import Mainpart from "./Landing/Mainpart";
+import styles from "./../assets/css/Landing/newLanding.module.css";
 import PlanningInLanding from "./Landing/PlanningInLanding";
 import TimeLinelanding from "./Landing/TimeLinelanding";
 import ThirdLanding from "./Landing/ThirdLanding";
 import Fourthlanding from "./Landing/Fourthlanding";
 import FivethLanding from "./Landing/FivethLanding";
-
+import Mainpart from "./Landing/mainpart"
 const cardVariants = {
   offscreen: {
     opacity: 0,