diff --git a/cms/src/routes/api/competitive/+server.ts b/cms/src/routes/api/competitive/+server.ts
index 2a667a9..24f3248 100644
--- a/cms/src/routes/api/competitive/+server.ts
+++ b/cms/src/routes/api/competitive/+server.ts
@@ -1,6 +1,19 @@
-import type {RequestHandler } from './$types'
import {json} from '@sveltejs/kit'
+import type {Exam} from '$lib/data/CMSDataType'
import exams from "$lib/data/competitive-exam.json"
-export const GET: RequestHandler = async () => {
- return json(exams)
+import type { RequestEvent,RequestHandler } from './$types'
+export const GET: RequestHandler = async ({url}: RequestEvent) => {
+ const limit= Number(url.searchParams.get("limit"))
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ let ex:Exam[] = exams.map(({files,images,detail,...minimal})=>{
+ if(images && images[0]){
+ const image = images[0].url
+ return {...minimal,image}
+ }
+ return minimal
+ })
+ if(limit>0){
+ ex = exams.slice(0,limit)
+ }
+ return json(ex)
}
\ No newline at end of file
diff --git a/cms/src/routes/api/dev/+server.ts b/cms/src/routes/api/dev/+server.ts
new file mode 100644
index 0000000..5787096
--- /dev/null
+++ b/cms/src/routes/api/dev/+server.ts
@@ -0,0 +1,8 @@
+import ver from "$lib/ver.json"
+import {json} from '@sveltejs/kit'
+import type { RequestHandler } from './$types'
+export const GET: RequestHandler = async () => {
+ const version = ver.version
+ const builddate = ver.builddate
+ return json({version,builddate})
+}
\ No newline at end of file
diff --git a/cms/src/routes/api/info/+server.ts b/cms/src/routes/api/info/+server.ts
index cdaf637..d8998b1 100644
--- a/cms/src/routes/api/info/+server.ts
+++ b/cms/src/routes/api/info/+server.ts
@@ -1,9 +1,6 @@
-import ver from "$lib/ver.json"
import {json} from '@sveltejs/kit'
import info from "$lib/data/info.json"
import type { RequestHandler } from './$types'
export const GET: RequestHandler = async () => {
- const version = ver.version
- const builddate = ver.builddate
- return json({...info,version,builddate})
+ return json(info)
}
\ No newline at end of file
diff --git a/cms/src/routes/api/qualifying/+server.ts b/cms/src/routes/api/qualifying/+server.ts
index 9d6bc00..527b1dd 100644
--- a/cms/src/routes/api/qualifying/+server.ts
+++ b/cms/src/routes/api/qualifying/+server.ts
@@ -1,6 +1,19 @@
-import type { RequestHandler } from './$types'
import {json} from '@sveltejs/kit'
+import type {Exam} from '$lib/data/CMSDataType'
import exams from "$lib/data/qualify-exam.json"
-export const GET: RequestHandler = async () => {
- return json(exams)
+import type { RequestEvent,RequestHandler } from './$types'
+export const GET: RequestHandler = async ({url}: RequestEvent) => {
+ const limit= Number(url.searchParams.get("limit"))
+ // eslint-disable-next-line @typescript-eslint/no-unused-vars
+ let ex:Exam[] = exams.map(({files,images,detail,...minimal})=>{
+ if(images && images[0]){
+ const image = images[0].url
+ return {...minimal,image}
+ }
+ return minimal
+ })
+ if(limit>0){
+ ex = exams.slice(0,limit)
+ }
+ return json(ex)
}
\ No newline at end of file
diff --git a/cms/src/routes/competitive/+page.server.ts b/cms/src/routes/competitive/+page.server.ts
index d7c2c60..14263de 100644
--- a/cms/src/routes/competitive/+page.server.ts
+++ b/cms/src/routes/competitive/+page.server.ts
@@ -1,6 +1,7 @@
-import type { PageServerLoad } from './$types'
+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[] = []
@@ -10,9 +11,10 @@ export const load: PageServerLoad = async ({fetch}) => {
}
res = await fetch("/api/competitive")
- if(res.ok){
- exams = await res.json()
+ if(!res.ok){
+ throw error(res.status, 'ไม่สามารถอ่านข้อมูลการสอบได้');
}
+ exams = await res.json()
const events:CalendarEvent[]=[]
exams.forEach((e)=>{
diff --git a/cms/src/routes/qualifying/+page.server.ts b/cms/src/routes/qualifying/+page.server.ts
index 010c191..ed0f363 100644
--- a/cms/src/routes/qualifying/+page.server.ts
+++ b/cms/src/routes/qualifying/+page.server.ts
@@ -1,4 +1,5 @@
+import { error } from '@sveltejs/kit';
import type {CalendarEvent,Exam} from '$lib/data/CMSDataType'
import dayjs from 'dayjs'
import type { PageServerLoad } from './$types'
@@ -10,16 +11,18 @@ export const load: PageServerLoad = async ({fetch}) => {
content = (await res.json()).content
}
res = await fetch("/api/qualifying")
- if(res.ok){
- exams = await res.json()
+ 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= dayjs(e.start).format("DD MMM BBBB")
+ e.date = e.start? dayjs(e.start).format("DD MMM BBBB"):""
const {id,title,start,end,category_id} = e
let backgroundColor =""
switch (category_id) {
