Optimize code, rebase api path, fix typo

cms/src/routes/qualifying/+page.server.ts

@@ -1,31 +1,20 @@
-
+import {apibase} from '$lib/data/CMSDataType'
 import { error } from '@sveltejs/kit';
 import type {CalendarEvent,Exam} from '$lib/data/CMSDataType'
 import dayjs from 'dayjs'
 import type { PageServerLoad } from './$types'
 export const load: PageServerLoad = async ({fetch}) => {
-	let content = ""
     let exams:Exam[] = []
-	let res = await fetch("/api/content?page=qualifying")
-	if(res.ok){
-		content = (await res.json()).content
-	}
-	res = await fetch("/api/qualifying")
-	if(!res.ok){
+	const res = await fetch(apibase+"/qualifying")
+	if(!res.ok)
         throw error(res.status, 'ไม่สามารถอ่านข้อมูลการสอบได้');
-	}
     exams = await res.json()
-
+    
     const events:CalendarEvent[]=[]
-    exams.forEach((e)=>{
-        if(!e.start){
-            e.date=""
-            return
-        }
-        e.date = e.start? dayjs(e.start).format("DD MMM BBBB"):""
-        const {id,title,start,end,category_id} = e
-        let backgroundColor =""
-        switch (category_id) {
+    exams.forEach((ex)=>{
+        const {id,title,start,end,category_id} = ex
+        let backgroundColor ="#23ccef"
+        switch (String(category_id)) {
             case "1":
                 backgroundColor="rgba(251,64,75,.2)"
                 break;
@@ -39,15 +28,18 @@ export const load: PageServerLoad = async ({fetch}) => {
                 break;
         }
         const url = "/qualifying/"+id
-        events.push({id,title,start,end,url,backgroundColor})
-        if(e.exam_date){
-            events.push({id,"title":"สอบ","start":e.exam_date,url,backgroundColor})
+        if(start){
+            ex.date = dayjs(start).format("DD MMM BBBB")
+            events.push({id,title,start,end,url,backgroundColor})
         }
-        if(e.announcement_date){
-            events.push({id,"title":"ผลสอบสอบ","start":e.announcement_date,url,backgroundColor})
+        if(ex.exam_date){
+            events.push({id,"title":"วันสอบคัดเลือก","start":ex.exam_date,url,backgroundColor})
+        }
+        if(ex.announcement_date){
+            events.push({id,"title":"ผลสอบคัดเลือก","start":ex.announcement_date,url,backgroundColor})
         }
 
     })
-    return {exams,events,content}
+    return {exams,events}
 }
 

cms/src/routes/qualifying/+page.svelte

@@ -2,8 +2,7 @@
 	import ActivityCalendar from '$lib/components/ActivityCalendar.svelte'
     import type { PageData } from './$types'
     export let data: PageData;
-	const exams = data.exams
-	const events = data.events
+	const {exams,events} = data
 </script>
 
 <section>
@@ -63,9 +62,13 @@
 					<tbody>
 						{#each exams as exam}
 						<tr>
-						<th class="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left"><a href={"/qualifying/"+exam.id}>{exam.date}</a></th> 
+						<th class="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">
+							<a href={"/qualifying/"+exam.id}>
+								{exam.date??""}
+							</a>
+						</th> 
 						<td class="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left"><a href={"/qualifying/"+exam.id}>{exam.title}</a></td> 
-						<td class="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">{exam.category}</td> 
+						<td class="border-t-0 px-6 align-middle border-l-0 border-r-0 text-xs whitespace-nowrap p-4 text-left">{exam.category??""}</td> 
 						{/each}
 					</tbody> 
 					</table>

cms/src/routes/qualifying/[id]/+page.server.ts

@@ -1,10 +1,10 @@
-//import type {Exam} from '$lib/data/CMSDataType'
+import {apibase} from '$lib/data/CMSDataType'
 import { error } from '@sveltejs/kit'
 import dayjs from 'dayjs'
 import type { PageServerLoad } from './$types'
 export const load: PageServerLoad = async ({params,fetch}) => {
     const id =  params.id+""
-	const res = await fetch("/api/qualifying/"+id)
+	const res = await fetch(apibase+"/qualifying/"+id)
 	if(res.status==404){
 		throw error(404,{message:`ค้นหาข้อมูลสอบคัดเลือก ${id}ไม่พบ`})
 	}

cms/src/routes/qualifying/[id]/+page.svelte

@@ -18,7 +18,7 @@
 					</a>
 				  </li> 
 				  <li>
-					<span class="breadTaxt">ประกาศเกี่ยวกับการคัดเลือกบุคลากรกทม.</span>
+					<span class="breadTaxt">ประกาศเกี่ยวกับการคัดเลือกบุคลากรของกทม.</span>
 				  </li>
 				</ul>
 			</div>