Merge branch 'main' of github.com-work:Frappet/BMA-EHR-RECRUIT-QUALIFYING-EXAM

cms/src/app.postcss

@@ -7,16 +7,16 @@
       font-family: 'Noto Sans Thai', sans-serif;
     }
     h1 {
-      @apply text-4xl;
-    }
-    h2 {
       @apply text-2xl;
     }
+    h2 {
+      @apply text-xl;
+    }
     ul{
-      @apply list-disc
+      @apply list-disc;
     }
     ol{
-      @apply list-decimal
+      @apply list-decimal;
     }
     .cardxl{
       padding-right: 2rem;
@@ -41,14 +41,15 @@
     .parallax-inner > h2{
       color: #fff;
       text-transform: uppercase;
-      letter-spacing: 5px;
+      letter-spacing: 2px;
       position: absolute;
       top: 50%;
       left: 0;
       margin-top: -20.5px;
       width: 100%;
       text-align: center;
-      font-weight: 500;
+      font-weight: 600;
+      font-size: 1.5rem !important;
     }
     .breadTaxt{
       font-weight: 300;

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

@@ -5,13 +5,38 @@
     export let data: PageData;
 
 </script>
-<section class="items-start h-screen flex max-h-860-px pt-10  bg-blueGray-100">
+<section>
-    <div class="container mx-auto items-start flex flex-wrap px-4">
+    <div class="p-one parallax-inner">
-        <div >
+      <h2>เกี่ยวกับเรา</h2>
-            {@html data.content}
+    </div>
+</section>
+<section class="pb-40 relative bg-blueGray-100">
+	<div class="container mx-auto justify-center flex flex-wrap">
+		<div class=" bg-blueGray-100 -mt-6 px-5 top-0 bottom-auto absolute z-40 rounded-md" >
+			<div class="text-sm breadcrumbs">
+				<ul>
+				  <li class="text-pink-500 hover:text-pink-700 ">
+					<a href="/" >
+						<svg xmlns="http://www.w3.org/2000/svg" class="h-4 w-4" fill="none" viewBox="0 0 24 24" stroke="currentColor"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M3 12l2-2m0 0l7-7 7 7M5 10v10a1 1 0 001 1h3m10-11l2 2m-2-2v10a1 1 0 01-1 1h-3m-6 0a1 1 0 001-1v-4a1 1 0 011-1h2a1 1 0 011 1v4a1 1 0 001 1m-6 0h6" /></svg>
+					</a>
+				  </li> 
+				  <li>
+					<span class="breadTaxt">เกี่ยวกับเรา</span>
+				  </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+	<div class="container mx-auto items-start flex flex-wrap px-4 pt-11">
+        <div class="card  bg-white shadow-xl w-full p-8">
+            <div>
+                {@html data.detail}
+            </div>
+            <div class="mt-4">{data.contact.description}</div>
+
+            <div class="pt-12">{ver.version}</div>
+            <div>{ver.builddate}</div>
         </div>
-        <div>{ver.version}</div>
-        <div>{ver.builddate}</div>
     </div>
 </section>
 

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

@@ -33,7 +33,7 @@
 			<div class="flex flex-wrap items-center">
 			<div class="relative w-full px-4 max-w-full flex-grow flex-1">
 				<h3
-				class="font-semibold text-lg text-blueGray-700'"
+				class="text-lg text-blueGray-700'"
 				>
 					รายการสอบ
 				</h3>

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

@@ -6,13 +6,16 @@ export const load: PageServerLoad = async () => {
     const exams = await getQualifyExams()
     const events:CalendarEvent[]=[]
     exams.forEach(({id,title,start,institute_id})=>{
-        let backgroundColor ="#1111EE"
+        let backgroundColor =""
         switch (institute_id) {
             case 1:
-                backgroundColor="#EE1111"
+                backgroundColor="rgba(251,64,75,.2)"
                 break;
             case 2:
-                backgroundColor="#11EE11"
+                backgroundColor="#23ccef"
+                break;
+            case 3:
+                backgroundColor="rgba(68,125,247,.2)"
                 break;
             default:
                 break;

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

@@ -29,20 +29,20 @@
 		</div>
 	</div>
 	<div class="container mx-auto items-start flex flex-wrap px-4 pt-11">
-		<div class="w-full lg:w-6/12 cardxl">
+		<div class="w-full lg:w-7/12 cardxl">
 			<div class="card  bg-white shadow-xl w-full">
 				<ActivityCalendar {events} />
 			</div>
 		</div>
-		<div class="w-full lg:w-6/12">
+		<div class="w-full lg:w-5/12">
 			<div
-			class=" card bg-white shadow-xl flex flex-col min-w-0 break-words w-full"
+			class=" card bg-white shadow-xl flex flex-col min-w-0 break-words w-full auto-rows-max"
 			>
 			<div class="rounded-t mb-0 px-4 py-3 border-0">
 				<div class="flex flex-wrap items-center">
 				<div class="relative w-full px-4 max-w-full flex-grow flex-1">
 					<h3
-					class="font-semibold text-lg text-blueGray-700'"
+					class="text-lg text-blueGray-700'"
 					>
 						รายการสอบ
 					</h3>

cms/static/styles/fullcalendar.css

@@ -42,11 +42,19 @@ button:active {outline:none;}
 	background: #e3e3e3 ;
 	color : #66615b;
 }
-/* ----------- table ----------- */
-
 .fc .fc-toolbar-title{
 	font-size: 1.4rem;
 }
+@media only screen and (max-width: 1024px) {
+	.fc .fc-toolbar-title{
+		font-size: 1.2rem;
+	}
+ 
+}
+
+/* ----------- table ----------- */
+
+
 
 thead tr.fc-first{
 	border-color: #cdcdcd;
@@ -84,4 +92,24 @@ table.fc-border-separate{
 /* ----------- table today ----------- */
 .fc .fc-daygrid-day.fc-day-today{
 	background-color: rgba(100, 116, 139, 0.06);
+}
+
+/* ----------- table event ----------- */
+.fc-h-event{
+	width: auto;
+	border: none;
+}
+.fc-h-event .fc-event-title{
+	padding-left: 0.5em;
+	white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+	color:#334155;
+	font-weight:400 !important;
+}
+.fc-daygrid-event .fc-event-title{
+	white-space: wrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+	font-weight: 400;
 }