Merge pull request #131 from AnataAria/Thang

Thang/Add Paypal email, Add revenue dashboard
AnataAria · Nov 16, 2023 · 3a7762c · 3a7762c
2 parents e003923 + f7e1412
commit 3a7762c
Show file tree

Hide file tree

Showing 7 changed files with 352 additions and 166 deletions.
diff --git a/...selling/src/main/java/com/group1/drawingcouseselling/controller/InstructorController.java b/...selling/src/main/java/com/group1/drawingcouseselling/controller/InstructorController.java
@@ -23,9 +23,9 @@ public ResponseEntity<InstructorDto> getInstructorInfo(
         return ResponseEntity.ok(instructorService.findInstructorDtoByInstructorEmail(email));
     }
 
-    @PostMapping("/instructor/paypal")
-    public ResponseEntity<InstructorDto> addPayPalEmail(@RequestHeader(value = "Authorization") String instructorToken,
-                                                        @RequestParam(value = "paypalEmail")  String paypalEmail){
+    @GetMapping("/instructor/paypal")
+    public ResponseEntity<InstructorDto> addPayPalEmail(@RequestHeader(value = "Authorization", defaultValue = "") String instructorToken,
+                                                        @RequestParam String paypalEmail){
         String email = jwtService.extractUserEmail(instructorToken.substring(7));
         return ResponseEntity.ok(instructorService.addInstructorPayPalEmail(email,paypalEmail));
     }

diff --git a/frontend/my-app/src/lib/types.ts b/frontend/my-app/src/lib/types.ts
@@ -1,10 +1,26 @@
 import { type } from "os";
+export type MonthlyData = {
+  year?: number | null;
+  firstMonth: number;
+  secondMonth: number;
+  thirdMonth: number;
+  fourthMonth: number;
+  fifthMonth: number;
+  sixthMonth: number;
+  seventhMonth: number;
+  eighthMonth: number;
+  ninthMonth: number;
+  tenthMonth: number;
+  eleventhMonth: number;
+  twelfthMonth: number;
+}
 export type InstructorInfo = {
   id: number;
   fullName: string;
   specialization:string;
   phone:number;
   avatar:string;
+  paypalEmail:string;
 };
 export type InstructorSalary = {
   instructorInfo: InstructorInfo;

diff --git a/frontend/my-app/src/routes/CourseCard.svelte b/frontend/my-app/src/routes/CourseCard.svelte
@@ -14,6 +14,7 @@
   export let isFetchManual: boolean;
   import { Card, Rating, Badge } from "flowbite-svelte";
   let open = true;
+  let tmpRating: number;
   let counter = 6;
   let message = "";
   let errorMsg = "";
@@ -91,7 +92,10 @@
     await axios
       .get(apiBaseUrl + `review/rating?courseID=${id}`)
       .then((response) => {
-        if (response.status === 200) rating = response.data;
+        if (response.status === 200){
+          tmpRating = response.data;
+          rating = parseFloat(tmpRating.toFixed(1));
+        } 
       });
   }
   let status = false;
@@ -146,7 +150,7 @@
         </h5>
       </a>
       <Rating {rating} class="mt-2.5 mb-5">
-        <Badge slot="text" class="ml-3">{rating.toFixed(1)}</Badge>
+        <Badge slot="text" class="ml-3">{rating}</Badge>
       </Rating>
       <div class="flex justify-between items-center">
         <span class="text-3xl font-bold text-gray-900 dark:text-white"

diff --git a/frontend/my-app/src/routes/Header.svelte b/frontend/my-app/src/routes/Header.svelte
@@ -124,9 +124,11 @@
     <NavHamburger />
   </div>
   <NavUl>
-    {#if jwtData.role == "CUSTOMER"}
+    {#if jwtData.role === "CUSTOMER"}
       <NavLi href="/mylearning">My Learning</NavLi>
       <NavLi href="/cart">Your Cart</NavLi>
+      {:else if jwtData.role === "STAFF"}
+      <NavLi href="/staff/revenuestatistics">Staff Management Dashboard</NavLi>
     {:else}
       <NavLi href="/teaching">Assign Instructor</NavLi>
     {/if}
@@ -136,7 +138,7 @@
       <Avatar id="user-drop" src="" class="cursor-pointer" />
       <Dropdown triggeredBy="#user-drop">
         <DropdownHeader>
-          <span class="block text-sm">User</span>
+          <span class="block text-sm">{jwtData.role}</span>
           <span class="block truncate text-sm font-medium">{jwtData.email}</span
           >
         </DropdownHeader>