From 34e0413ee75c043ac32714fa594ab2d5b30c7949 Mon Sep 17 00:00:00 2001
From: swve <bdswve@gmail.com>
Date: Sat, 5 Nov 2022 18:24:54 +0100
Subject: [PATCH] feat: courses refactor

---
 front/components/drags/chapter.tsx                  |  4 ++--
 front/components/drags/element.tsx                  |  4 ++--
 .../org/[orgslug]/course/[courseid]/edit/index.tsx  |  2 +-
 front/pages/org/[orgslug]/courses/index.tsx         | 13 ++++++-------
 src/main.py                                         |  3 ++-
 src/routers/{ => courses}/chapters.py               |  2 +-
 src/routers/{ => courses}/collections.py            |  2 +-
 src/routers/{ => courses}/courses.py                |  2 +-
 src/services/{ => courses}/chapters.py              |  3 +--
 src/services/{ => courses}/collections.py           |  0
 src/services/{ => courses}/courses.py               |  0
 11 files changed, 17 insertions(+), 18 deletions(-)
 rename src/routers/{ => courses}/chapters.py (90%)
 rename src/routers/{ => courses}/collections.py (90%)
 rename src/routers/{ => courses}/courses.py (93%)
 rename src/services/{ => courses}/chapters.py (99%)
 rename src/services/{ => courses}/collections.py (100%)
 rename src/services/{ => courses}/courses.py (100%)

diff --git a/front/components/drags/chapter.tsx b/front/components/drags/chapter.tsx
index d8058c8b..86aa9512 100644
--- a/front/components/drags/chapter.tsx
+++ b/front/components/drags/chapter.tsx
@@ -23,11 +23,11 @@ function Chapter(props: any) {
       {(provided, snapshot) => (
         <ChapterWrapper {...provided.dragHandleProps} {...provided.draggableProps} ref={provided.innerRef} isDragging={snapshot.isDragging} key={props.info.list.chapter.id}>
           <h3>{props.info.list.chapter.name} <button onClick={() => {props.deleteChapter(props.info.list.chapter.id)}}>X</button></h3>
-          <Droppable droppableId={props.info.list.chapter.id} type="element">
+          <Droppable key={props.info.list.chapter.id} droppableId={props.info.list.chapter.id} type="element">
             {(provided) => (
               <ElementsList {...provided.droppableProps} ref={provided.innerRef}>
                 {props.info.list.elements.map((element: any, index: any) => (
-                 <div key={element.id}> <Element key={element.id} element={element} index={index}></Element></div>
+                  <Element key={element.id} element={element} index={index}></Element>
                 ))}
                 {provided.placeholder}
               </ElementsList>
diff --git a/front/components/drags/element.tsx b/front/components/drags/element.tsx
index ea7b5b84..98711de1 100644
--- a/front/components/drags/element.tsx
+++ b/front/components/drags/element.tsx
@@ -4,9 +4,9 @@ import styled from "styled-components";
 
 function Element(props: any) {
   return (
-    <Draggable draggableId={props.element.id} index={props.index}>
+    <Draggable key={props.element.id} draggableId={props.element.id} index={props.index}>
       {(provided) => (
-        <ElementWrapper {...provided.draggableProps} {...provided.dragHandleProps} ref={provided.innerRef}>
+        <ElementWrapper key={props.element.id} {...provided.draggableProps} {...provided.dragHandleProps} ref={provided.innerRef}>
           {props.element.content}
         </ElementWrapper>
       )}
diff --git a/front/pages/org/[orgslug]/course/[courseid]/edit/index.tsx b/front/pages/org/[orgslug]/course/[courseid]/edit/index.tsx
index 56b3496b..7f7f6ace 100644
--- a/front/pages/org/[orgslug]/course/[courseid]/edit/index.tsx
+++ b/front/pages/org/[orgslug]/course/[courseid]/edit/index.tsx
@@ -182,7 +182,7 @@ function CourseEdit() {
       {winReady &&   (
         <ChapterlistWrapper>
           <DragDropContext onDragEnd={onDragEnd}>
-            <Droppable droppableId="chapters" type="chapter">
+            <Droppable key="chapters" droppableId="chapters" type="chapter">
               {(provided) => (
                 <div key={"chapters"} {...provided.droppableProps} ref={provided.innerRef}>
                   {getChapters().map((info: any, index: any) => (
diff --git a/front/pages/org/[orgslug]/courses/index.tsx b/front/pages/org/[orgslug]/courses/index.tsx
index a0bbcd54..e84d7412 100644
--- a/front/pages/org/[orgslug]/courses/index.tsx
+++ b/front/pages/org/[orgslug]/courses/index.tsx
@@ -67,15 +67,16 @@ const CoursesIndexPage = () => {
                 <a>
                   <h2>{course.name}</h2>
                   <CourseWrapper>
-            <img src={`${getBackendUrl()}content/uploads/img/${course.thumbnail}`} alt="" />
-          </CourseWrapper>
+                    <img src={`${getBackendUrl()}content/uploads/img/${course.thumbnail}`} alt="" />
+                  </CourseWrapper>
                 </a>
-                
               </Link>
-              <button style={{backgroundColor:"red" , border:"none"}} onClick={() => deleteCourses(course.course_id)}>Delete</button>
+              <button style={{ backgroundColor: "red", border: "none" }} onClick={() => deleteCourses(course.course_id)}>
+                Delete
+              </button>
               <Link href={"/org/" + orgslug + "/course/" + removeCoursePrefix(course.course_id) + "/edit"}>
                 <a>
-                  <button >Edit Chapters</button>
+                  <button>Edit Chapters</button>
                 </a>
               </Link>
             </div>
@@ -91,10 +92,8 @@ export default CoursesIndexPage;
 const CourseWrapper = styled.div`
   display: flex;
   img {
-    
     width: 269px;
     height: 151px;
-    
 
     background: url(), #d9d9d9;
     border: 1px solid rgba(255, 255, 255, 0.19);
diff --git a/src/main.py b/src/main.py
index 31bbd354..1124cff7 100644
--- a/src/main.py
+++ b/src/main.py
@@ -1,5 +1,6 @@
 from fastapi import APIRouter
-from src.routers import chapters, collections, courses, users, auth, houses, orgs, roles
+from src.routers import users, auth, houses, orgs, roles
+from src.routers.courses import chapters, collections, courses
 
 
 global_router = APIRouter(prefix="/api")
diff --git a/src/routers/chapters.py b/src/routers/courses/chapters.py
similarity index 90%
rename from src/routers/chapters.py
rename to src/routers/courses/chapters.py
index 2ebb7b9f..bd12b2cd 100644
--- a/src/routers/chapters.py
+++ b/src/routers/courses/chapters.py
@@ -1,6 +1,6 @@
 from fastapi import APIRouter, Depends, UploadFile, Form
 
-from src.services.chapters import CourseChapter, CourseChapterMetaData, create_coursechapter, delete_coursechapter, get_coursechapter, get_coursechapters, get_coursechapters_meta, update_coursechapter, update_coursechapters_meta
+from src.services.courses.chapters import CourseChapter, CourseChapterMetaData, create_coursechapter, delete_coursechapter, get_coursechapter, get_coursechapters, get_coursechapters_meta, update_coursechapter, update_coursechapters_meta
 from src.services.users import PublicUser
 from src.services.auth import get_current_user
 
diff --git a/src/routers/collections.py b/src/routers/courses/collections.py
similarity index 90%
rename from src/routers/collections.py
rename to src/routers/courses/collections.py
index 797351bf..65702dae 100644
--- a/src/routers/collections.py
+++ b/src/routers/courses/collections.py
@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends
 from src.services.auth import get_current_user
 from src.services.users import PublicUser, User
-from src.services.collections import Collection, create_collection, get_collection, get_collections, update_collection, delete_collection
+from src.services.courses.collections import Collection, create_collection, get_collection, get_collections, update_collection, delete_collection
 
 
 router = APIRouter()
diff --git a/src/routers/courses.py b/src/routers/courses/courses.py
similarity index 93%
rename from src/routers/courses.py
rename to src/routers/courses/courses.py
index 68e173ac..3e4f0a55 100644
--- a/src/routers/courses.py
+++ b/src/routers/courses/courses.py
@@ -1,7 +1,7 @@
 from fastapi import APIRouter, Depends, UploadFile, Form
 from src.services.auth import get_current_user
 
-from src.services.courses import Course,  create_course,  get_course, get_courses, update_course, delete_course, update_course_thumbnail
+from src.services.courses.courses import Course,  create_course,  get_course, get_courses, update_course, delete_course, update_course_thumbnail
 from src.services.users import PublicUser
 
 
diff --git a/src/services/chapters.py b/src/services/courses/chapters.py
similarity index 99%
rename from src/services/chapters.py
rename to src/services/courses/chapters.py
index 522f1fc1..3e8a48e4 100644
--- a/src/services/chapters.py
+++ b/src/services/courses/chapters.py
@@ -1,10 +1,9 @@
-from cmath import log
 from datetime import datetime
 import json
 from typing import List
 from uuid import uuid4
 from pydantic import BaseModel
-from src.services.courses import Course, CourseInDB
+from src.services.courses.courses import Course, CourseInDB
 from src.services.database import create_config_collection, check_database, create_database, learnhouseDB, learnhouseDB
 from src.services.security import verify_user_rights_with_roles
 from src.services.users import PublicUser
diff --git a/src/services/collections.py b/src/services/courses/collections.py
similarity index 100%
rename from src/services/collections.py
rename to src/services/courses/collections.py
diff --git a/src/services/courses.py b/src/services/courses/courses.py
similarity index 100%
rename from src/services/courses.py
rename to src/services/courses/courses.py