Merge pull request #2 from ssoc2dzafeiris/Refactoring_FILES

Refactoring files

Author: ssoc2npetrolis

db.json

@@ -6,32 +6,32 @@
       "github": "https://github.com/ssoc2dzafeiris",
       "email": "kremou115@gmail.com",
       "linkedin": "https://www.linkedin.com/in/dimizafe/",
-      "bio": "Full Stack development",
+      "bio": "A passionate Software Developer from Greece, with experience in Web technologies.",
       "title": "Junior Software Developer"
     },
     {
       "fname": "Stelios",
       "lname": "Katsaberis",
       "github": "https://github.com/ssoc2skatsaberis",
-      "email": "",
+      "email": "katsaberisst@hotmail.com",
       "linkedin": "https://www.linkedin.com/in/stelios-katsaberis-a8b03737/",
       "bio": "",
-      "title": "Information Technology Teacher at Fasma, private cram school"
+      "title": "Information Technology Teacher"
     },
     {
       "fname": "Nikolaos",
       "lname": "Katsafados",
       "github": "https://github.com/ssoc2nkatsafados",
-      "email": "",
+      "email": "nikoskatsaphados@gmail.com",
       "linkedin": "https://www.linkedin.com/in/nikos-katsafados/",
-      "bio": "",
-      "title": "Aspiring Web Developer"
+      "bio": "Historian graduate with passion for technology and Web Development. Ι'm seeking to leverage my technical skills and i have a strong desire to learn more in the development of web application",
+      "title": "Web Developer"
     },
     {
       "fname": "Nikos",
       "lname": "Petrolis",
-      "github": "https://github.com/ssoc2npetrolis",
-      "email": "",
+      "github": "github.com/npetrolis",
+      "email": "npetrolis@gmail.com",
       "linkedin": "https://www.linkedin.com/in/nikospetrolis/",
       "bio": "",
       "title": "Aspiring Web Developer"
@@ -124,6 +124,5 @@
       "online": false,
       "description": "Το σεμινάριο απευθύνεται σε συμμετέχοντες που επιθυμούν να μάθουν πώς να επεξεργάζονται εικόνες και να δημιουργούν τα δικά τους γραφικά με εύκολο τρόπο. εικόνας. Χρησιμοποιώντας την online πλατφόρμα σχεδιασμού Canva θα φτιάξουμε εύκολα και γρήγορα δελεαστικά δημιουργικά. Αν θέλεις να ανεβάζεις ελκυστικές αναρτήσεις στο διαδίκτυο, αυτό το σεμινάριο είναι φτιαγμένο για σένα!"
     }
-    
   ]
-}
+}

public/images/courses/notfound.png

@@ -1,11 +1,15 @@
 import { BrowserRouter, Routes, Route } from "react-router-dom"
-import Dashboard from "./Dashboard"
-import Cards from "./cards"
-import AddNewCourse from "./AddNewCourse"
-import About from './About'
-import Error from "./ErrorPage";
-import SharedLayout from "./SharedLayout"
-import CourseDetails from './CoursePractisePage';
+
+// imported all the basics pages
+import Dashboard from "./Pages/Dashboard";
+import Cards from "./Pages/cards";
+import AddNewCourse from "./Pages/AddNewCourse";
+import About from './Pages/About';
+import Error from "./Pages/ErrorPage";
+import CourseDetails from './Pages/CourseDetails';
+
+// import the shared layout component
+import SharedLayout from "./Layout/SharedLayout";
 
 
 const App = () => {

src/components/App.js renamed to src/App.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Outlet } from 'react-router-dom';
-import Navbar from './Navbar';
-import PageFooter from "./Footer"
+import Navbar from './Navbar'
+import PageFooter from './Footer'
 
 export default function SharedLayout(){
 

src/components/Footer.js renamed to src/Layout/Footer.js

@@ -0,0 +1,25 @@
+import React from 'react';
+import {Link} from 'react-router-dom';
+import TeamSection from '../components/Others/Team';
+
+export default function About(){
+    return(
+        <div className="container mt-2 bg-white text-slate-700 flex flex-wrap items-center px-5 mx-auto">
+             <div className="flex flex-col">
+                <Link to='/' className='text-black-50 px-2 col-md-5'>Back | <i className="fa fa-home-alt"></i></Link>
+            </div>
+            <section className='flex flex-col'>
+            <h1>About our project</h1>
+            <p>
+                Στα πλαίσια του προγράμματος Start School of Code της Socialinov Front End Development, στην ομάδα μας τέθηκε ως εργασία η εξής εργασία¨
+                <br/>
+                <ul>
+                    <li></li>
+                </ul>
+                </p>
+            </section>
+           
+            <TeamSection />
+            </div>
+    )
+}

src/components/Navbar.js renamed to src/Layout/Navbar.js

@@ -52,8 +52,8 @@ const AddNewCourse = () => {
             <div className="w-5/6 mt-5 mx-auto flex justify-center items-center h-screens">
                 <form onSubmit={handleSubmit} className=" max-h-90vh w-5/6 bg-white p-8 rounded-lg shadow-md overflow-y-auto ">
                     {showAlert && (
-                        <div class="p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:bg-gray-800 dark:text-green-400" role="alert">
-                            <span class="font-medium">Το μάθημα καταχωρήθηκε επιτυχώς!</span>
+                        <div className="p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:bg-gray-800 dark:text-green-400" role="alert">
+                            <span className="font-medium">Το μάθημα καταχωρήθηκε επιτυχώς!</span>
                         </div>
                     )}
                     <h1 className="font-extrabold font-weight: 900 text-5xl mb-8  ">Add Course</h1>

src/components/SharedLayout.js renamed to src/Layout/SharedLayout.js

@@ -1,15 +1,14 @@
 import {useState,useEffect} from 'react';
 import {useParams} from "react-router-dom";
-import LoadingSpinner from './LoadingSpinner';
+import LoadingSpinner from '../components/Utilities/Loaders/LoadingSpinner.js';
 
-import Buttons from "./buttons";
+import Buttons from "../components/Utilities/Buttons/buttons";
 
-export default function CoursePractisePage(){
+export default function CourseDetails(){
 
     const API = 'http://localhost:3001/courses/';
     const params = useParams();
     const [course,setCourse]= useState(null);
-    const [isLoading, setIsLoading] = useState(false);
     // const navigate = useNavigate();
 
     const fetchDetails = () =>{
@@ -26,20 +25,17 @@ export default function CoursePractisePage(){
     }
     useEffect(()=>{
         fetchDetails()
-        // .then(navigate("/courses/01"))
     },[]);
 
 
     if (!course) {
-        return(
-            <div><LoadingSpinner/></div>
-        );
+        return(<div><LoadingSpinner/></div>);
     }else{
         return(
             <>
             <div className="flex flex-wrap items-center my-5 p-5 rounded-2xl shadow-3xl bg-white selection:bg-fuchsia-200 selection:text-fuchsia-900">
                 <div className="max-w-full md:w-6/12 ml-auto mr-auto mt-auto flex flex-col">
-                    <img src={`/images${course.imagePath}`} alt={course.title} className='object-cover object-center rounded-lg shadow-lg' />
+                    <img src={course.imagePath ? `/images${course.imagePath}` : `/images/courses/notfound.png`} alt={course.title} className='object-cover object-center rounded-lg shadow-lg' />
                     </div>
                         <div className="w-full md:w-5/12 ml-auto mr-auto flex flex-col">
                         <div className="md:pr-12">

src/Pages/About.js

@@ -1,7 +1,7 @@
 import React from "react";
-import Stats from "./Stats";
-import Welcome from "./Welcome";
-import CourseTable from "./CourseTable";
+import Stats from "../components/Others/Stats";
+import Welcome from "../components/Others/Welcome";
+import CourseTable from "../components/CourseTable";
 
 export default function Dashboard() {