From 0508bba8b86df9273f76a06145f91d73ead0f3e8 Mon Sep 17 00:00:00 2001 From: Chulinuwu Date: Sat, 14 Sep 2024 13:26:54 +0700 Subject: [PATCH 1/4] fix:move pic/svg --- package.json | 3 +- src/lib/assets/icons/sccu.svg | 12 ++++ src/lib/assets/images/suculogo.png | Bin 0 -> 1904 bytes src/lib/components/Footer/Footer.svelte | 83 ++++-------------------- 4 files changed, 25 insertions(+), 73 deletions(-) create mode 100644 src/lib/assets/icons/sccu.svg create mode 100644 src/lib/assets/images/suculogo.png diff --git a/package.json b/package.json index 971a9ec..61c57b0 100644 --- a/package.json +++ b/package.json @@ -42,6 +42,7 @@ "clsx": "^2.1.1", "svelte-fa": "^4.0.2", "tailwind-merge": "^2.5.2", - "tailwind-variants": "^0.2.1" + "tailwind-variants": "^0.2.1", + "vite-plugin-svelte-svg": "^2.3.0" } } diff --git a/src/lib/assets/icons/sccu.svg b/src/lib/assets/icons/sccu.svg new file mode 100644 index 0000000..f556a02 --- /dev/null +++ b/src/lib/assets/icons/sccu.svg @@ -0,0 +1,12 @@ + + + \ No newline at end of file diff --git a/src/lib/assets/images/suculogo.png b/src/lib/assets/images/suculogo.png new file mode 100644 index 0000000000000000000000000000000000000000..d576c97d518ce86c5bde991e5f0dd4993def7b01 GIT binary patch literal 1904 zcmV-$2aouPP)Px+DoI2^R9Fe!nG1}aMHRRs^)XlR}ZQ#RO1W+P^*X`1ZSd z@3vdrN8%l{bdA^3*f|d=bq`?5#k%->Rac-$*&?*`(%)8hm)63 z{OHJOfdTRT5rmJgcEr4_Z>k(j*!> zC$0SM0JVJOVJOPif#jj!+I?#tmaaV}#382(gRbXQlLzq4RY#-Io)6-IH26+9-Wj1R z2kG(iRr?6MUWRLR&VLPretkDce%hUd$sTxl4o+gM1 zo_C-z^u7QSeS|C>h2hv$oYJ}^3uY(`PO zsoIhJ0LSOR%Og>dcZ2vQ6y^J?_Wq%_z--3=oIDMZ#UP1Ek}J=x@>kLq;P}$2U!kvs z=Zp5*;1daA7Ygy_bFxmCME{0a$f;npV%-eSx5DKMw>*wQXPf0CyYoi-6kM*a0%=Sm zt#6FPw|BSzXF>7+ZiF$?^77~}#B1e#HZHV?AeZH0)1$o_As_%uQEutgjM<0yq@hj4Jg_tj%`Pu*-%a;Tb~=-KH)M* zPm5Nr_x0+8hQ0?R+tNw60?St(HdYT#&rM^j9oshHGDuTKRyK1d6azcJJO` z_XRA|BhrpNdcXj=16=F;I0%o_j^#@r`Ptr(f42FJtZNc}^;;3I8`*K$Ny{Jm9;oXc z&@-rcW?GF6Xl{Kuigp$5#~aLS1+FalqBaiG#iKfz{%FC>tkM(oNY$!mA;T(b-~=mu+zJ3($T}5WIdjOzdR@#2Z0u?m30|@~fj0 zhB$M7E@uhSDN0V$7>Ju zxN6nW@Z|^KkS9sWxt+qHT-PCEZXr*B_z6pDKzxb4&j`X}K`bfiT2Yscc)1xQ{|t-p zIya2vMIi1tzCpKGb9h*wmo=g6^p6%O)6m_* zCP{952fQvpL(Tw|r^CthaRt07_X6?vW1W;i@7m@Zc=-xQ9*yGreNqke+&; qj}O-iuM1HO9Gi7wiVzOP;r{_#+;xe}N;p;k0000 import { typography } from '../../../styles/tailwind/typography'; - import sucuImg from '$lib/components/Footer/suculogo.png'; + import sucuImg from '$lib/assets/images/suculogo.png' + import { faFacebook, faInstagram } from '@fortawesome/free-brands-svg-icons'; + import Sccusvg from '$lib/assets/icons/sccu.svg'; + import Fa from 'svelte-fa'; + + console.log("svg" ,Sccusvg);
@@ -8,100 +13,34 @@
- - - + sccu icon
สภานิสิตจุฬาลงกรณ์มหาวิทยาลัย
- - - - +
สภานิสิตจุฬาลงกรณ์มหาวิทยาลัย
- - - - +
sapanisitchula
- sucuicon
สภานิสิตจุฬาลงกรณ์มหาวิทยาลัย
- - - - +
องค์การบริหารสโมสรนิสิตจุฬาลงกรณ์มหาวิทยาลัย (อบจ.)
- - - - +
sgcu.chula
From 8528f848167a1d7b5c32cd0b02c6d56bfaeff730 Mon Sep 17 00:00:00 2001 From: Chulinuwu Date: Sat, 14 Sep 2024 13:27:19 +0700 Subject: [PATCH 2/4] fix:lint --- src/lib/components/Footer/Footer.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/Footer/Footer.svelte b/src/lib/components/Footer/Footer.svelte index 2a5b126..9eb41e3 100644 --- a/src/lib/components/Footer/Footer.svelte +++ b/src/lib/components/Footer/Footer.svelte @@ -1,11 +1,11 @@
@@ -13,7 +13,7 @@
- sccu icon + sccu icon
สภานิสิตจุฬาลงกรณ์มหาวิทยาลัย
From f5a221f9e2ac3885b48bbd6dc3b9aa4258c455e3 Mon Sep 17 00:00:00 2001 From: Chulinuwu Date: Sat, 14 Sep 2024 23:16:43 +0700 Subject: [PATCH 3/4] refactor:cn --- src/lib/components/Footer/Footer.svelte | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/lib/components/Footer/Footer.svelte b/src/lib/components/Footer/Footer.svelte index 9eb41e3..8cc4c97 100644 --- a/src/lib/components/Footer/Footer.svelte +++ b/src/lib/components/Footer/Footer.svelte @@ -4,8 +4,7 @@ import { faFacebook, faInstagram } from '@fortawesome/free-brands-svg-icons'; import Sccusvg from '$lib/assets/icons/sccu.svg'; import Fa from 'svelte-fa'; - - console.log('svg', Sccusvg); + import { cn } from '$lib/utils/cn';
@@ -56,29 +55,33 @@
-
ประกาศ
+
+ ประกาศ +
-
เอกสาร
+
+ เอกสาร +
-
+
งบประมาณและสถิติ
-
+
สโมสรนิสิตฯ
-
+
สภานิสิตจุฬาลงกรณ์มหาวิทยาลัย
-
+
องค์การบริหารสโมสรนิสิตจุฬาฯ (อบจ.)
-
+
© 2024 SGCU. All rights reserved Develop by ISD
From 8118e8d318857b1b3259e4fabc1bdb6e6f4e527f Mon Sep 17 00:00:00 2001 From: Chulinuwu Date: Sat, 14 Sep 2024 23:17:44 +0700 Subject: [PATCH 4/4] refactor:tailwindUnit --- src/lib/components/Footer/Footer.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/components/Footer/Footer.svelte b/src/lib/components/Footer/Footer.svelte index 8cc4c97..1f642b9 100644 --- a/src/lib/components/Footer/Footer.svelte +++ b/src/lib/components/Footer/Footer.svelte @@ -7,7 +7,7 @@ import { cn } from '$lib/utils/cn'; -
+