ENH:merge main

incubyte · Jul 4, 2023 · 3c5107c · 3c5107c
2 parents d71542f + cd6b744
commit 3c5107c
Show file tree

Hide file tree

Showing 22 changed files with 233 additions and 154 deletions.
diff --git a/admin/src/components/HomePage.tsx b/admin/src/components/HomePage.tsx
@@ -91,8 +91,8 @@ const HomePage = () => {
             dataTestId="courseCard"
             count={allCourse?.length}
             header="Total Courses"
-            link="/"
-            linkText="See All Course"
+            link="/courses"
+            linkText="See All Courses"
           ></HomeCard>
         </div>
         <ToastContainer />

diff --git a/admin/src/components/course/AddCourse.tsx b/admin/src/components/course/AddCourse.tsx
@@ -310,17 +310,17 @@ const AddCourse = () => {
 
       <Navbar
         isCourse={true}
-        isHome={true}
-        isProfile={true}
-        isUser={false}
+        isHome={false}
+        isProfile={false}
+        isUser={true}
         isTag={false}
       ></Navbar>
       <div>
         <h1
           className="text-center pt-10 text-3xl font-bold"
           data-testid="addCourseHeading"
         >
-          Add Courses
+          Add Course
         </h1>
       </div>
       <div className="flex justify-center">

diff --git a/admin/src/components/tag/Tags.tsx b/admin/src/components/tag/Tags.tsx
@@ -142,7 +142,7 @@ const Tags = () => {
                     className="text-3xl font-semibold"
                     data-testid="modelHeader"
                   >
-                    Update Tags here
+                    Update Tag here
                   </h3>
                   <button
                     className="TagModalUploadButton"

diff --git a/admin/src/components/user/AddUsers.tsx b/admin/src/components/user/AddUsers.tsx
@@ -76,7 +76,6 @@ const AddUser = (props: addUserProps) => {
         var workbook = XLSX.read(bstr, { type: "binary" });
         var first_sheet_name = workbook.SheetNames[0];
         var worksheet = workbook.Sheets[first_sheet_name];
-        console.log(XLSX.utils.sheet_to_json(worksheet, { raw: true }));
         arraylist = XLSX.utils.sheet_to_json(worksheet, { raw: true });
         if (arraylist.length > 0) handleSubmit();
       };

diff --git a/admin/src/components/utilities/Navbar.tsx b/admin/src/components/utilities/Navbar.tsx
@@ -66,25 +66,6 @@ const Navbar = (props: NavbarProps) => {
                       Home
                     </Link>
                   )}
-                  {props.isCourse && (
-                    <Link
-                      to="/courses"
-                      className="navbarHeaderItems"
-                      data-testid="navbarHeaderCourseLink"
-                    >
-                      Courses
-                    </Link>
-                  )}
-                  {!props.isCourse && (
-                    <Link
-                      to="/addCourse"
-                      className="navbarHeaderItems"
-                      data-testid="navbarHeaderCourseLink"
-                    >
-                      Add Course
-                    </Link>
-                  )}
-
                   {props.isUser && (
                     <Link
                       to="/users"
@@ -103,6 +84,24 @@ const Navbar = (props: NavbarProps) => {
                       Add User
                     </button>
                   )}
+                  {props.isCourse && (
+                    <Link
+                      to="/courses"
+                      className="navbarHeaderItems"
+                      data-testid="navbarHeaderCourseLink"
+                    >
+                      Courses
+                    </Link>
+                  )}
+                  {!props.isCourse && (
+                    <Link
+                      to="/addCourse"
+                      className="navbarHeaderItems"
+                      data-testid="navbarHeaderCourseLink"
+                    >
+                      Add Course
+                    </Link>
+                  )}
                   {!props.isTag && (
                     <Link
                       to="/tags"
@@ -157,8 +156,22 @@ const Navbar = (props: NavbarProps) => {
                     Home
                   </Link>
                 )}
+                {!props.isUser && (
+                  <button
+                    className="navbarHeaderItems"
+                    data-testid="navbarHeaderAddUserLink"
+                    onClick={addUser}
+                  >
+                    Add User
+                  </button>
+                )}
+                {props.isUser && (
+                  <Link to="/users" className="navbarHeaderItems">
+                    Users
+                  </Link>
+                )}
                 {props.isCourse && (
-                  <Link to="/course" className="navbarHeaderItems">
+                  <Link to="/courses" className="navbarHeaderItems">
                     Courses
                   </Link>
                 )}
@@ -171,19 +184,13 @@ const Navbar = (props: NavbarProps) => {
                     Add Courses
                   </Link>
                 )}
-
-                {!props.isUser && (
-                  <button
+                {!props.isTag && (
+                  <Link
+                    to="/tags"
                     className="navbarHeaderItems"
-                    data-testid="navbarHeaderAddUserLink"
-                    onClick={addUser}
+                    data-testid="navbarHeaderTagLink"
                   >
-                    Add User
-                  </button>
-                )}
-                {props.isUser && (
-                  <Link to="/users" className="navbarHeaderItems">
-                    Users
+                    Tags
                   </Link>
                 )}
                 <button

diff --git a/backend/package-lock.json b/backend/package-lock.json
diff --git a/backend/package.json b/backend/package.json
@@ -31,7 +31,7 @@
     "@nestjs/jwt": "^10.0.2",
     "@nestjs/passport": "^9.0.3",
     "@nestjs/platform-express": "^9.0.0",
-    "@prisma/client": "^4.11.0",
+    "@prisma/client": "^4.12.0",
     "bcrypt": "^5.1.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",
@@ -41,7 +41,6 @@
     "passport": "^0.6.0",
     "passport-jwt": "^4.0.1",
     "passport-local": "^1.0.0",
-    "prisma": "^4.11.0",
     "reflect-metadata": "^0.1.13",
     "rxjs": "^7.2.0",
     "validator": "^13.9.0"
@@ -63,6 +62,7 @@
     "eslint-plugin-prettier": "^4.0.0",
     "jest": "29.3.1",
     "prettier": "^2.3.2",
+    "prisma": "^4.12.0",
     "source-map-support": "^0.5.20",
     "supertest": "^6.1.3",
     "ts-jest": "29.0.3",

diff --git a/backend/prisma/migrations/20230620034845_delete_cascade_tag_course/migration.sql b/backend/prisma/migrations/20230620034845_delete_cascade_tag_course/migration.sql
@@ -0,0 +1,11 @@
+-- DropForeignKey
+ALTER TABLE "CourseTag" DROP CONSTRAINT "CourseTag_courseId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "CourseTag" DROP CONSTRAINT "CourseTag_tagId_fkey";
+
+-- AddForeignKey
+ALTER TABLE "CourseTag" ADD CONSTRAINT "CourseTag_courseId_fkey" FOREIGN KEY ("courseId") REFERENCES "Course"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "CourseTag" ADD CONSTRAINT "CourseTag_tagId_fkey" FOREIGN KEY ("tagId") REFERENCES "Tag"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/backend/prisma/migrations/20230620040935_remove_tags_from_course/migration.sql b/backend/prisma/migrations/20230620040935_remove_tags_from_course/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `tags` on the `Course` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Course" DROP COLUMN "tags";
diff --git a/backend/prisma/schema.prisma b/backend/prisma/schema.prisma
@@ -1,6 +1,3 @@
-// This is your Prisma schema file,
-// learn more about it in the docs: https://pris.ly/d/prisma-schema
-
 generator client {
   provider = "prisma-client-js"
 }
@@ -42,7 +39,6 @@ model Course {
   testUrls     String[]
   imageUrl     String
   credit       Float
-  tags         Int[]
   description  String?
   createdAt    DateTime     @default(now())
   updatedAt    DateTime     @updatedAt
@@ -59,9 +55,9 @@ model Tag {
 model CourseTag {
   id       Int    @id @default(autoincrement())
   courseId String
-  course   Course @relation(fields: [courseId], references: [id])
+  course   Course @relation(fields: [courseId], references: [id], onDelete: Cascade)
   tagId    Int
-  tag      Tag    @relation(fields: [tagId], references: [id])
+  tag      Tag    @relation(fields: [tagId], references: [id], onDelete: Cascade)
 }
 
 model UserCourse {