From c36bdb2158a7bebae9a16881ac477a3a2ee40b5d Mon Sep 17 00:00:00 2001 From: zapguilded <167898252+zapguilded@users.noreply.github.com> Date: Wed, 31 Jul 2024 16:35:07 +0000 Subject: [PATCH 1/7] progressfr --- src/app.html | 2 +- src/app.postcss | 7 ++ src/routes/(auth)/login/+page.svelte | 33 +++---- src/routes/(auth)/login/[userId]/+page.svelte | 86 ++++++------------ src/routes/+layout.svelte | 47 ++++------ src/routes/+page.svelte | 54 ++++++----- static/proof.png | Bin 0 -> 4566 bytes 7 files changed, 100 insertions(+), 129 deletions(-) create mode 100644 static/proof.png diff --git a/src/app.html b/src/app.html index e31c74e..19b1e28 100644 --- a/src/app.html +++ b/src/app.html @@ -6,7 +6,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/app.postcss b/src/app.postcss index fb368c8..67ffc03 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -1,3 +1,5 @@ +@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap'); + @tailwind base; @tailwind components; @tailwind utilities; @@ -8,6 +10,7 @@ html, body { @apply h-full; + font-family: 'Inter'; } @font-face { @@ -19,3 +22,7 @@ body { --theme-font-family-base: 'Inter', sans-serif; --theme-font-family-heading: 'Inter', sans-serif; } + +.inter { + font-family: 'Inter'; +} diff --git a/src/routes/(auth)/login/+page.svelte b/src/routes/(auth)/login/+page.svelte index dca7f3f..4337c70 100644 --- a/src/routes/(auth)/login/+page.svelte +++ b/src/routes/(auth)/login/+page.svelte @@ -56,28 +56,18 @@ }); -
+
{#if message}

{message}

{/if} -

Link Guilded

+

Link Guilded

- We need to verify your identity! Please complete following steps to confirm your - identity: + in order to verify your identity, Please input your Username or ID below.

-
    -
  1. - Make sure you are signed in to Guilded with the Guilded account - you choose on this page. -
    2. -
  2. - Why do we need you to do this? Read Here. -
    3. -
-
- +
+
-
+
{#each users as user}
-

Or

+
OR
+ - +
diff --git a/src/routes/(auth)/login/[userId]/+page.svelte b/src/routes/(auth)/login/[userId]/+page.svelte index e6a64ac..efaeeb6 100644 --- a/src/routes/(auth)/login/[userId]/+page.svelte +++ b/src/routes/(auth)/login/[userId]/+page.svelte @@ -1,58 +1,30 @@ - - -
-

Are you really who you say you are?

-

- We need to verify your identity! Please complete following steps to confirm your - identity: -

-
    -
  1. - Go to Your Profile -
    2. -
  2. - Make sure you are signed in to the account you chose on the previous page and click on "Write a post" -
    3. -
  3. - Make the title of the post - - {data.userAuthToken} - - - . You can fill the body with anything! (Flex being a cool cardboard user!) -
    4. -
  4. - Click "Post" and then press "Check" over here. -
    5. -
-
- -
-
+export default { + darkMode: 'class', // <-- + content: [ + './src/**/*.{html,js,svelte,ts}', + join(require.resolve('@skeletonlabs/skeleton'), '../**/*.{html,js,svelte,ts}') + ], + theme: { + extend: {} + }, + plugins: [ + forms, + typography, + skeleton({ + themes: { + preset: [ + { + name: 'crimson', + enhancements: true + } + ] + } + }) + ] +} satisfies Config; diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 8dcf949..9dc7154 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,6 +3,19 @@ import { beforeNavigate } from '$app/navigation'; import { updated } from '$app/stores'; + import { onNavigate } from '$app/navigation'; + + onNavigate((navigation) => { + if (!document.startViewTransition) return; + + return new Promise((resolve) => { + document.startViewTransition(async () => { + resolve(); + await navigation.complete; + }); + }); + }); + beforeNavigate(({ willUnload, to }) => { if ($updated && !willUnload && to?.url) { location.href = to.url.href; @@ -76,14 +89,17 @@
- Link Guilded + Link Guilded {/if} {#if $page.data.user} @@ -215,7 +208,7 @@ {#if $page.data.user} -
-
+
{app.id}
{#if regeneratedSecret !== ''} @@ -163,7 +163,7 @@
- +
diff --git a/src/routes/(protected)/settings/your-apps/new/+page.svelte b/src/routes/(protected)/settings/your-apps/new/+page.svelte index 84fb3bf..fe50e88 100644 --- a/src/routes/(protected)/settings/your-apps/new/+page.svelte +++ b/src/routes/(protected)/settings/your-apps/new/+page.svelte @@ -4,9 +4,9 @@ const { form, errors, constraints } = superForm(data.form); -

Create an app

+

Create an app

-
- {#if !$page.data.user} - - -
-
-
-
Mode
- -
-
-
- Link Guilded - {/if} - {#if $page.data.user} - {$page.data.user.displayName} + {$page.data.user.displayName}
-
(modalVisible = true)} - on:mouseleave={() => (modalVisible = false)} - > -
+
+ + - -
-
-
-
Mode
- -
-
- -
-
-
- -
-
- -
-
+ +
{/if}
@@ -208,43 +127,51 @@ {#if $page.data.user} -
\ No newline at end of file diff --git a/src/routes/(protected)/settings/+page.svelte b/src/routes/(protected)/settings/+page.svelte index 210f5b2..4862edd 100644 --- a/src/routes/(protected)/settings/+page.svelte +++ b/src/routes/(protected)/settings/+page.svelte @@ -1,2 +1,2 @@ -

Welcome to settings!

+

Welcome to settings!

Choose an option from sidebar to get configuring! đŸ”Ĩ

diff --git a/src/routes/(protected)/settings/authorized-apps/+page.svelte b/src/routes/(protected)/settings/authorized-apps/+page.svelte index 9d55916..9fc430f 100644 --- a/src/routes/(protected)/settings/authorized-apps/+page.svelte +++ b/src/routes/(protected)/settings/authorized-apps/+page.svelte @@ -14,7 +14,7 @@ href={`/settings/authorized-apps/${appManager.app.id}`} class="card card-hover container bg-initial overflow-hidden flex flex-col w-[420px] justify-self-center" > -
+
User Banner -

+

{appManager.app.name}

-

Description

-

+

Description

+

{appManager.app.description}

-
+
-
- - Created By: {appManager.app.ownerUser.username} - - - Created At: {appManager.app.createdAt.toLocaleString()} +
+ + Creator: {appManager.app.ownerUser.username} {#if appManager.app.supportServer != ''} - - App Support: + Support Server{appManager.app.supportServer} + rel="noopener noreferrer"> + {/if}
@@ -70,4 +67,4 @@ {#if appManagers.length < 1}

You have no authorized apps.

{/if} -
+
\ No newline at end of file diff --git a/src/routes/(protected)/settings/authorized-apps/[id]/+page.svelte b/src/routes/(protected)/settings/authorized-apps/[id]/+page.svelte index 0851aa1..7bf824d 100644 --- a/src/routes/(protected)/settings/authorized-apps/[id]/+page.svelte +++ b/src/routes/(protected)/settings/authorized-apps/[id]/+page.svelte @@ -7,8 +7,8 @@
-

- Manage Your {appName?.name} Sessions +

+ Manage Your Sessions

@@ -23,7 +23,7 @@
{#if sessions.length === 0} -

+

You have no active sessions of {appName?.name}.

{:else} @@ -33,7 +33,7 @@
-
+
diff --git a/src/routes/(public)/info/+page.svelte b/src/routes/(public)/info/+page.svelte index a6595c2..fbac57f 100644 --- a/src/routes/(public)/info/+page.svelte +++ b/src/routes/(public)/info/+page.svelte @@ -1,48 +1,46 @@ -

Cardboard FAQ

+ -
-
-

What is Cardboard?

+

Cardboard FAQ

-

- Cardboard is an access manager, it currently supports Guilded. You can use it to link your - Guilded account to Guilded Bots and other services. -

-
-
-

Why Cardboard?

- -

- Cardboard is an access manager for platforms that don't have a way to link accounts. Currently +

+
+ + + What is Cardboard? + Cardboard is an access manager, it currently supports Guilded. You can use it to link your + Guilded account to Guilded Bots and other services. + + + Why Cardboard? + Cardboard is an access manager for platforms that don't have a way to link accounts. Currently platforms like Guilded lack one, so Cardboard is here to fill that gap. Cardboard is also open source - - , so you can see exactly what it does with your data. -

-
-
-

What can Cardboard see?

- -

- Cardboard can only see information on your account that can be seen by anyone on Guilded. This - includes your username, profile picture, and bio. -

-
-
-

I have more questions.

- -

- Sure! You can join our Guilded Server and ask - in the - Cardboard Docs channel. -

-
-
+ , + so you can see exactly what it does with your data. + + + What can Cardboard see? + Cardboard can only see information on your account that can be seen by anyone on Guilded. This + includes your username, profile picture, and bio. + + + I have more questions + Sure! You can join our Guilded Server and ask + in the + Cardboard Docs channel. + + +
+
\ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 9886754..91f21b1 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -16,51 +16,35 @@ } -
+
{#if $page.data.user}

{greeting()}, {$page.data.user.displayName}! 👋

- Welcome to the dashboard forCardBoard, the all in one Guilded authentication service.
Get started by Linking - creating a App! + Welcome to the dashboard for CardBoard, the all-in-one Guilded authentication service.
Get started by linking + creating a app

{:else}

{greeting()}, visitor! 👋

- Welcome to CardBoard, the all in one Guilded authentication service.
Get started by Linking + Welcome to CardBoard, the all-in-one Guilded authentication service.
Get started by linking your profile!

-
+
- - - - - - - +
{/if} -
+
{#if $page.data.user} - + - + {/if}
\ No newline at end of file diff --git a/static/proof.png b/static/proof.png index 7b3527fa1e2fe26e41733ab7068dd50cc0974fa6..04a482bdca934152be73ab1c699d517c36c77757 100644 GIT binary patch literal 6667 zcmbt(XH-*N&@RM)0i;WjUIi6`iU>#zU3%|LK&3YcAV{wgx=K(fQHp?sB0U6xbVVV6 zQlvzB0BI6>y8(Rf{c+d#>s#xr&3=%rno-d9JUkPEE;1NkT$GeP2Vxkc5Pk zKzw%skrRKtyIMntf22y}(Oq#xxR&RN|v} zk3vcqf0^Jn87}e`s1Xj-;E@0d#&HN z^s}}N)O(*6ytOATTvp?Gb6yJ|pa>Aa-USYb;C<7n|GIxE2~~?5=65Q*B+Zu`Pj+qe z=Cg#SW8wH4RO3;1u0_KqVKO**Fds6=ww*{$WJ)37qPn2v|u`>>-mg zRe&}jBqeHP20qce9&C`}*cwC?i8oDBnw%%6u_(1 z)5LhCUiV%K(y~pbqNF73x($~JK7GK)&U&Bg>+HFP0`~lXVn)I`P!w~t zf^qzoX%OC~XkxC>m*zS0IJCQ;HU-&HkA@u?SdKd{q$xIhEHAW>7({pCC4CLK1^ zyKan(pVb&Pwz7dJtEFjZXjnfu%CIS4L|cr$>55Hq^CrYGW-5fq10oa|0y#l~s~`heU?3a0u(?9jUbTal}qd%rj8r@W;M%of^k3j4H0ACV@IzAwEHWI0W9IJZLq zY|OeH^Vd?)*JS+Y0Yf34JPH!nWLuw2qtR^Z#hj?GK^8XC`BN%zy@)c%mz_*b+E!cV z%ops<0M}Ru!?sol6f^1$laVna2P<5GXs+E5c_wJxSf1%_{1pF9_mP{>>JwaYxli?M z=IDuND<{aFfbVC$<4osT;#LuWljo2zeV@@J)qNq9dw**=&LB^XUs945$0;8@Y!^lr zNAv3U7optfo`+}@c$Vep-tJ+JdoUrv5xw5gP?qbLL!R4Br{HlS9WLoNv4zw-+b?p`XAg5r>2$`J&3&DOHqNaI>D}|&_q|o zl^LVX{W`|We{DD(nv08*xj6ZJT3)W=w_RwAZBx)R&UT;aco!GeDs!@#jN0gM#Z`n- zZ?B!uY|e{@53W4t#V_f`-zv+F^gOY8DIsv?nHtfGU&%r?)@(a}1a~=19zOQQV|kHL zAXLvvr^1!J@k`puXC9l{ z05k;SwU|$67=;o$BgyopT0TeJjC=%abl+U)YwJ5+{9xXE=usNDW3yt`x14$rqkvEz zS4qv?9o5?yvO0;`IsTi&_2NZ#(wjH;>a#o(Ic1n(@WYG#Ysch$3MX#6&q4_+R*3;- z=%}^k15$;PJu#BFQId+g8+4iMqJ(cvIu=jPkvb4)D2y+(2V0<7jjpD2ip|SKH3jc{ zp4s4Iz4JqJZ4$|Diry(J9Qy>NDzg>sdU?&L!e#IgdT-w9*W=@rHb)FNEe?QJ; z%6qWg^_onW>%pm*X0Y6tJYYmk7)Gzyt#sCWWMY*+1QYO+6bIYfpV50%Z}7?=5M7P* z^||K>q>3Wn8fzD}C83>llVNjStbM9Yoo@Z&gJ|u#M)v?}&dA5PA*~b2?^t!os}_m3)|m^F*kNMb5B^fLv|@RbnVxFN0<{@`7ZCQ#`KuE zRyg-#rfI_hsSaqLr3mHhKCYLu&;fRIdz`kZzx{e~mftc@Z-x}Z%~f|148L+o zNO>$$P2<9d(+frEMajP2-l4EpCa*wW>&1Ouu=8@x7lzD?TA(l`C{3H?a7Nqmi%{s# zHvyiW7mbI1wA_qb(hlg6k`$!^T^xQZgs*--{+7W{m#Hf*;{4p36#2$j!FZk6e686A zZ94wk>pwpI)-=aH1YAkd4T#@mV`DX2*jyx3{K9!;hOGXz8A!12nfDLg8eA(kct8uB zHJ1c@4!`2J;2YOO(i^+6kp#3!Zni~>_CeJLaG~Y9Hcw0>*R{<4Ru^!jp~6X` zi_G%LJVS|t3Ht-Ld)sqZ@`$p+N60$Q`73Tr!-Y}PWqofWL&b5&vH_<~;;aBP6v1bx zz_iu%WF3!_nW0)(o&1dnT=Kr|ns*dW@6rcqgVjngHnOIp@o%z>r*rCGQ&guTtTY%c z++=;tEtbT{$mF)PU-O?S6n+G%evc61n@7?{M^5f1S^&=RYoDSz67k_ApU+JZQa8M1 z?{P{l!hx1?BxKna`mGjv9m>v=nulh1q%Op3kUcr(oRn14kW$_wYl5zd%xj+0gF@i1 zCPdve9cHz&u_C~QPZ6TW7|4819~1$_0>rVP&b;dXC{L|M92_0*cbI&8^{xIN`5~bg z7mf(rENt&lxCTiP(Vkaaki~DT`zoBBfP_Lo9Z}Gl^Ae#>S$}zCKz6CD>wfj`4_&^AR zRF+F@X~}iUztPh8Cha+kI=vVkdsavw+V-X0HFXaU(e&&c5f@0`_wUNKwqR?pB!D#6 z^3U^9$6nZfHW0wdlETN5z9vu_8yf>O!0WOukhOsVSVH~owvGa3D+T`i%rA*%M-%|F zz${9!q`A11o`(;;rP4RUg+%cajXUA>WKQC$6Ns3}fsb7?=U1e`qup}*WrsOfRI~uG z*-O;z^oh_W+PJU%W9Pl|&`MRjOuQy9iZdZm{foc>9{j`u)&Z|xd4j+9$@=B<)!da3 z)Igi}BkZ-F6DSwI;2Gh7w^)0L|F%-5s7^yj#s>|T+3>f^Di>G&`j6^}13bX^j2KUG zno^p77InH4ahJuf65H^9FEBrYgiNkR_Vs@@&yOLFMMo@z|IPUS<%;YSL2V5-xVXtc zb1O^X3jKcv==KJ9@ZgguB$)lQzOlnliAHdy(NYTM*~UYi&>qY3&|F&26!kbvLzXTP z4S0lPtileCl34uVCXbz}2EIPF^8EBN`^PXS=6Bj!1WA^m7o3Vlx_n(g#>3)6_or`6 zYyZ5?>0ZPgD%5W`^s^FB&e)t1_9j7`?o#XW7N4*ZEAvyPRYk=P^n*yYA`LY!KK$tD zXwk=ygNMI@HUnjUb*FBo>ZsU6qq$_snvh}?J*P}N!vB7Ye>#?lUtIWpb@J>CWd@Da@atIzZcWO|@ zMnQWS2+P#>uU}i^>G=tpJz^MRHyi7vsz=`qhYwh(p9&-BlS zo?5*75}=mRk6z9PxwATWQJI{!^H+@r+iU%z2$;%hUizOyS$YO|(&n?f!mAlrB{yH(sV@<)YmcG3f_nBRPz#$iOSuS`> z32O3c+iXV^+&TJW!5CCPdo;eci61WK-Y2XgpLSzlEMn7|PaEckKbnbMo?poO^qv6@ zwox*Hz8Y=hX1a6L<%#c;{stqV*||9vdA^Yh895Z`P3V$wmh=;5Azco$DLC?R3K#2b zC(vEb@gmb8Pfsukx|W(&jvsuO?g+<)bhKB84Pyg7ulOZhlAw^Rt9Y4lr7{AgA_{iE1uX_dKh68%&>mX_NV zCtLw+DlOGUKC8rwWnsc~RaJ$Bg4(@-ebP(&=$KT3|@s1|h6HClIW8hz`Z9`D&ZXvh~{v2pF z_NP$8V*jH278BpU*EQc7EeV1(HZRgsx?F&iI#T7Bk9{;n4s@zjBZx;N%vgo&P9K*S zm9{6BV}{h)_)}yfsh5ZIK9y*a;bwgE0&*wm^jZpa-rjsR;$8DgFGsc*4E@r@=B40- zr}O(`9_=w!SKLzPq%A`x_qr>_9q^qH=os!jV< zecA>&H%Z}Nzuw7278QYH{8x=hS*UDOBr*_I2CGI_aaLlxyjPO?j&(OHsTt)zf{#;u3>Gz-rcA#p^e2 z7?{`~Llzti`m$wMxDQvn=FOo#aCY96WfsYUh1{?*8&U=t{qYYeclp|X;TqiFl#MUn z+L z#gvGVF7*-)m%M>@cz0rMnUJ176QtUe%o&xCpvfUsVb?MKsX`QH$wr+<%oufdSOr{d zP-N|n>$@{4j&mP!U2$QAtJLJhxq(0dulruAHCp=(DGJFeW3?_kSv@Yv7I5;Yc#I#T zvvEiuMEF}h!r~E0@yN$fD zrmVE@XaWya)lU>~TShlNS?FccxLVb+@~gq9L%&u7QYT_UALi2livdpy9u4!QHU_Mi zLNe5%IO^Pn!7np1T)ELI-MP}i%nNQ`bAFAJZryN^Ukq`q88S4iJET$-g zO#zbOFP$A#_J0>}4Sj?1O)^Y@7kHD>ChKs?jp~U%-Z>ALUr~5~zDo|aYkohoBKX&? zcW(9zBR;r`)3pHRX1kAt0&)Z%x8)&l&uHcPGKm~2qO6KS*cbxaX^q*Na5O7xi2{TF6sN8o1XjPjCA?-LB3bsWzofm4C_Vh45}$ z9PRQ(|3QJC&DS*?Mj>l@RWfn}Z) z9H0MR8$d^C!{A(?g|Oh*+XCgm{59+GZNTRh|If>5w*l7^-h`<<6oJ5Fqksr#caISa zWxJlo#y9jXL)G(pIE&l9#f?XbvJ8gm6upCF)~$oT6NDiABh-2F!n#ZBARrXL;q$Xm z&T|E>o(}8N$BNHD9*UlZD-Rdx7!^t|lkX9qD_;WZ({S)?yg8lSgWQRW}FSRtJPrZ_PR!Et~JGFS!^#-s5a~ZzW*AjOHW5Q39&jfPC|Yw0kRl zuLtYNFF>++x?Hom_m-yb#FE;zT>1ptHf?v6YDZCD!*7R3S%{xmfhDa=jI`u#TwU`!k?K3x~s#ZCgdtcHT}e{wxNHdNSB zj22J-WdW^Dp0ZwjuK$SbbVcVdpdk<5=qq)2P?eJ<9Hm(Duav2+N;*dHYWtcO43 zeD!WRKrIX5(p0x=`oAu>C51kAFd;YQztY7Oq>nXfOKUh?;FS6P@8u&ZSg&XZ`lnSM zi)s=W)+MQzd-!Id?I3PP?+I}CaDC4uS$%rj_nrFKME5EaFB1R&SM~M4 z<^XVRkNzES={)_J>r$~sf1L|4*VP7)!+dmu{gpmg%QCWPYsM~+4->`sD}aR0pXn2r z{Ed@Qiw(GZ{+-@Sq1)?!niN3qG_gp0eLkD5(s!6%%Xgja3+ZGn+)ioV{;h!`M==txw)W%@$?O04nt?Vu)==wlu&8nJeSC({o6Z-V z004rvlZ6iSQ5~|*vjA)lE=2$dfOh)@;3C^+en2pRjYJ>ti$F%;lHdz9-~n)Z`W$fn z(toOM_XV;hk3YT}+FT0&k+&9cA>`TEwJXAm6sM{34XSWvY^eIk^^5Z!rkY^~(}|kY z$@ddvJ|JPp*I^!6V<0)?EgDErRqJnsIzUZ1ULl@0B&_ z3}0WEJPaeW?fa`o2KMk}>*~rNdqjW)rhKM4_3`3V*i8HhRa1SxxAe)| z)16Gv310J51rv1Bj2ZYSw)C()e&eQ-l5um;X`;+otmMS*iWQm|E116vuxC>Yb$aoy^2s*0c%a((w9df(h_4_?_^_%9}JCU2bTg$=F(_8>}@SGMxvapZ`?=9tM9#UwB z0_=&}OfT2N z_50VEE}xHIcB76@xi%uqt2d*F4C5DohA7_w4GM$tn8FsrR9fF?{|)-T>P{|JmJ2{a z*ngL7|5aXA;mOlFW|lW}*b=WI83AD8X})!xqq1@H;F)m-y(GO4@@f+Rl+y&68g0|= zzBE4YNJY{hYF1_w4%`6nmkrr#`o{pjYdDZVdA2gv&Q6NFqX<0svw^7g2@a!UfWH%~#k*q=85vLC|wu*JxX7$9B^_4*-4<_h}y3NCCO@ z5!1{^E;BRtdS&y6rQj0q45ZNr{JwjxC_y;?nrNveD*&XVq|Bxm-6@}Wu0~~G@ZjR& zd_VkcSf(@bq-FJGZW9!3rSI|^(dROBVB?;f{SM-UM)x;VCl^dfAznQ+tdD<)fyXM` z#?p@7(u&{Y|6Y&C%d_z*SW_wTDv);F0bwIch&4p=7yjH%IrSZccP5fTI|l%HbN4?) z^Ca>9aaMc#WSI_5@0?5vtK|S1b%Ze@9CW%VV^X4`uC8wL?S?^affob;wMCI2D8EV6 znr$WN_4{!DWfqcQ%ZpyD#L>;E#%tM72VB4$1Ca2bYJ7bt)aL+15%b%CpHeb=Ty3dK zKeW4T#kmaNUd@tNa`}cz38{UleM#=in~wd1qw3{8Uwg6cn8*m-q|)N%6DbDZ>DaFP zG-Z1hH#6oa=`qqxJ(zy-d!EDx7M=0OF$%odZbITW_aSviE1x45;|SHXTH6i_nH@}~ zrp#`U2>3O)Hgg{Ud?6s2AUKVWsJCRsI`fn{HU395fVyuN{1R|zY7 zS<5o2URrM6Gt$4+*B0fdY-ltdEZM)Kf||Su4>rD~LtiGFMZ!SWJD&Zv*(DzF)n)_~ zj}p~)0hRpdZi7!dfE_>xiKrFAie4PKV4ac~G!2(_d zO7d#Q2YqSC4dUMq!CG#roQ7Y4K*h5cAC~b)3!RH-l*QPdHrgCs>GEAK(hDkAIMjiX z2!;s>G^@uUJAGg-!O`xhpf1{keI5eQ-;ar{ey=r`xVDy$$J+^s0Fh$-`#fRhy5g~ETw3p?VKmqvh zd-(%gyGO9HRz>;|pbwUk%4%$sWN&S2TPtuTSV!34%){~fe4_6rTBGBgN^5G?ENgbE z#-G5UZ;(i&r-*s251CA^Z0+|Mu(I+qe1Ah{aFu)|EzO71x*ivN1Y%#_Rqg#dIXQ`U zUK(qz8P`$_QInXy}*4AmcGkPA)~`jm@8)#+8;-%;rNXX4Gj%NHMNnTqM91X#YAnPkw)akBx1RPWu$S??H(UH&qRnro~tSj<(9P? ziS)3i^_Cuf$kr0o7M9&-e>Ybg zU(gk>L`GWp>57Hy4P?RL>E(ABS*B4DBPAQ0UT-P|Q^42L`rvVM7iR1`bo8ebK`>eu zC790;-23oh+t#cMHrPWK^Ice1#4P=hP}yTWwm!O-j7O)`4nR=vga@6ODb*y|YxtMs z4tx^`pIn$_@(nQhPRWP4J%yUdfYFL zqrTTvG|EY#9)Hg0w=peh-xyY#Ek@uKLEnO=X`s`V)hKZ2AyO?lf&|-I8Z^`lf_(r+)FN@0$8K z*G^jcVJVh_{x#uQX3IC-_#B##K1zi6W$2s-5+shUk#x67c^8S{3YfYqe$5!Ad#49c zm?m&yc3FxwE+t3`v%+I-_Byu9o-j3KT717Q7x8fCAUGV=0m+Zuu=Mqqor7yR)E;q@ z`ds944eoHHLh33v7})DptaAq6tw#4bT_vOrkdZxhI@vEEKL_F?0H;^yLkcTUU!S-+tAR6%(rW1T}Z3i8#uCvzMEZt=MrnWb3yi9j_;{CciQ~d z*4FS%F*vC!SIG4xD)TCnm6rkBylH#<_6Hdilzzkwnm;Ed#hBPyyNXLy&c&#PY5WiU= zmE;UT+{nZ(qg;nbhjR)M|Y@M5ci1C?2mWFTWV&b2d)DyC-X2sfmV; zO7(mi*M<6NHRfF%`fL1KuwCuAB+l7Vbm6{Zog)S|vwh`cy@($|5!3<`j7Vy>*A(sjS=n73LtOW9n1m?Y8wUh&RY55orWEP!3^ zn+G`=c*`1D;94U=XVhwo41`PdK+_WuzV1-SiZ}f*BB{a-8+8Tjo(BVP-k#%Ee)hBR>(w_;tO3EpHy4B{4)+y1 zSE_r~Lf1Q3*L}A~eIeo#&3IpZ(&lx80AtXw43EL zEO|q`0wNt?RfF7!mezql4){7-^E(zBZOc;2C{#ISVQf>`2B{t{f`ASx)YWeN;hZ93 zcQ15NIVR>dR<>M33Bf2WYS;wLAFhwDk{m?%IWq}7wXkz^^r|cj@W7^`PESM zMk{Z|%W+*}79IKCsi1qtV~YH6+q@fNYnI{A)WvtfXv-&qb#8fl1bCG=I~qPV{-Liv z`eY%h@|<$LpuGM;S#|vh9J&N%$2_L?2TVM!xkU1 z#vYc$Z0EQQ2018l_;0Trv~keer*CYocaffXleZs-J)vYM%e<~B;9$zVqFT}ksc^xE z$H(_L|76C{cdtKkyu*rf`-o*-r)msWmd&>hG*%ee_U8F(fCkl>qKGP`&Xcc(`KT7Y zR76cwCVAm|r0IyY9jBF*vu&`0DekKE^|ajS$fsc z`Eu>RvZ68<3l+*!nOK>0nXz@O=2VP%uE7sH%^_3;2K?vGXlMARAn;F)R=^a2ZBgpxpx1@d*;I94{dnR17tD03 zX-OwqmhFX=c9IC$I7Xn|PI63~)3DM@3EzW%-fJ}GdsYSjfg#RXH~xPK;-4P>Pqo5x vD9|JBI1B(1GG&A5Q~6&)#{cy4H|<>KoQF*zHAaChi2(XKCSauY(`WwzHV@x7 From 136d75a8e2a84d44aed089280fdc5133c7b01839 Mon Sep 17 00:00:00 2001 From: zapguilded <167898252+zapguilded@users.noreply.github.com> Date: Thu, 1 Aug 2024 04:13:25 +0000 Subject: [PATCH 4/7] test --- my-custom-theme.ts | 95 ++++++++++++++++++++++++++++++++++++++++++++++ src/app.html | 2 +- src/app.postcss | 11 +----- tailwind.config.ts | 46 ++-------------------- 4 files changed, 101 insertions(+), 53 deletions(-) create mode 100644 my-custom-theme.ts diff --git a/my-custom-theme.ts b/my-custom-theme.ts new file mode 100644 index 0000000..d894612 --- /dev/null +++ b/my-custom-theme.ts @@ -0,0 +1,95 @@ + +import type { CustomThemeConfig } from '@skeletonlabs/tw-plugin'; + +export const myCustomTheme: CustomThemeConfig = { + name: 'my-custom-theme', + properties: { + // =~= Theme Properties =~= + '--theme-font-family-base': + "Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,\n\t\t'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'", + '--theme-font-family-heading': 'system-ui', + '--theme-font-color-base': 'var(--color-surface-900)', + '--theme-font-color-dark': 'var(--color-surface-50)', + '--theme-rounded-base': '24px', + '--theme-rounded-container': '24px', + '--theme-border-base': '1px', + '--on-primary': '255 255 255', + '--on-secondary': '255 255 255', + '--on-tertiary': '0 0 0', + '--on-success': '0 0 0', + '--on-warning': '0 0 0', + '--on-error': '0 0 0', + '--on-surface': '255 255 255', + '--color-primary-50': '249 220 226', + '--color-primary-100': '246 208 216', + '--color-primary-200': '244 197 206', + '--color-primary-300': '238 162 177', + '--color-primary-400': '225 92 119', + '--color-primary-500': '212 22 60', + '--color-primary-600': '191 20 54', + '--color-primary-700': '159 17 45', + '--color-primary-800': '127 13 36', + '--color-primary-900': '104 11 29', + '--color-secondary-50': '227 237 243', + '--color-secondary-100': '218 231 239', + '--color-secondary-200': '209 225 235', + '--color-secondary-300': '181 206 223', + '--color-secondary-400': '126 170 199', + '--color-secondary-500': '70 133 175', + '--color-secondary-600': '63 120 158', + '--color-secondary-700': '53 100 131', + '--color-secondary-800': '42 80 105', + '--color-secondary-900': '34 65 86', + '--color-tertiary-50': '246 244 244', + '--color-tertiary-100': '242 240 240', + '--color-tertiary-200': '239 237 236', + '--color-tertiary-300': '230 226 225', + '--color-tertiary-400': '211 204 203', + '--color-tertiary-500': '192 182 180', + '--color-tertiary-600': '173 164 162', + '--color-tertiary-700': '144 137 135', + '--color-tertiary-800': '115 109 108', + '--color-tertiary-900': '94 89 88', + '--color-success-50': '246 250 239', + '--color-success-100': '243 248 234', + '--color-success-200': '240 247 229', + '--color-success-300': '230 241 213', + '--color-success-400': '212 231 182', + '--color-success-500': '193 221 151', + '--color-success-600': '174 199 136', + '--color-success-700': '145 166 113', + '--color-success-800': '116 133 91', + '--color-success-900': '95 108 74', + '--color-warning-50': '251 246 231', + '--color-warning-100': '250 243 223', + '--color-warning-200': '248 240 215', + '--color-warning-300': '244 231 191', + '--color-warning-400': '236 212 142', + '--color-warning-500': '228 194 94', + '--color-warning-600': '205 175 85', + '--color-warning-700': '171 146 71', + '--color-warning-800': '137 116 56', + '--color-warning-900': '112 95 46', + '--color-error-50': '248 236 236', + '--color-error-100': '246 229 230', + '--color-error-200': '244 223 224', + '--color-error-300': '237 204 205', + '--color-error-400': '224 165 167', + '--color-error-500': '210 127 129', + '--color-error-600': '189 114 116', + '--color-error-700': '158 95 97', + '--color-error-800': '126 76 77', + '--color-error-900': '103 62 63', + '--color-surface-50': '223 224 226', + '--color-surface-100': '213 213 217', + '--color-surface-200': '202 203 207', + '--color-surface-300': '170 171 179', + '--color-surface-400': '107 109 121', + '--color-surface-500': '43 46 64', + '--color-surface-600': '39 41 58', + '--color-surface-700': '32 35 48', + '--color-surface-800': '26 28 38', + '--color-surface-900': '21 23 31' + }, + +} \ No newline at end of file diff --git a/src/app.html b/src/app.html index 19b1e28..c2c8b53 100644 --- a/src/app.html +++ b/src/app.html @@ -6,7 +6,7 @@ %sveltekit.head% - +
%sveltekit.body%
diff --git a/src/app.postcss b/src/app.postcss index a569d26..4e0c133 100644 --- a/src/app.postcss +++ b/src/app.postcss @@ -1,4 +1,3 @@ -@import url('https://fonts.googleapis.com/css2?family=Inter:wght@400;700&display=swap'); @tailwind base; @tailwind components; @@ -10,21 +9,13 @@ html, body { @apply h-full; - font-family: 'Inter'; } +@layer base { @font-face { font-family: 'Inter'; src: url('/fonts/Inter-VariableFont_slnt,wght.ttf'); } - -:root { - --theme-font-family-base: 'Inter', sans-serif; - --theme-font-family-heading: 'Inter', sans-serif; -} - -.inter { - font-family: 'Inter'; } diff --git a/tailwind.config.ts b/tailwind.config.ts index e0cbebd..438cb01 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -3,6 +3,7 @@ import type { Config } from 'tailwindcss'; import forms from '@tailwindcss/forms'; import typography from '@tailwindcss/typography'; import { skeleton } from '@skeletonlabs/tw-plugin'; +import { myCustomTheme } from "./my-custom-theme" export default { darkMode: 'class', @@ -18,49 +19,10 @@ export default { typography, skeleton({ themes: { - preset: [ - { - name: 'modern', - enhancements: true - }, - { - name: 'wintry', - enhancements: true - }, - { - name: 'hamlindigo', - enhancements: true - }, - { - name: 'rocket', - enhancements: true - }, - { - name: 'sahara', - enhancements: true - }, - { - name: 'gold-nouveau', - enhancements: true - }, - { - name: 'vintage', - enhancements: true - }, - { - name: 'seafoam', - enhancements: true - }, - { - name: 'crimson', - enhancements: true - }, - { - name: 'skeleton', - enhancements: true - } + custom: [ + myCustomTheme ] } }) ] -} satisfies Config; +} satisfies Config; \ No newline at end of file From a646f1aee06eef60d50f43a504d53ab50f0ae731 Mon Sep 17 00:00:00 2001 From: zapguilded <167898252+zapguilded@users.noreply.github.com> Date: Thu, 1 Aug 2024 04:23:13 +0000 Subject: [PATCH 5/7] font migrate --- my-custom-theme.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/my-custom-theme.ts b/my-custom-theme.ts index d894612..871f8a3 100644 --- a/my-custom-theme.ts +++ b/my-custom-theme.ts @@ -7,7 +7,7 @@ export const myCustomTheme: CustomThemeConfig = { // =~= Theme Properties =~= '--theme-font-family-base': "Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,\n\t\t'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji'", - '--theme-font-family-heading': 'system-ui', + '--theme-font-family-heading': 'Inter, system-ui', '--theme-font-color-base': 'var(--color-surface-900)', '--theme-font-color-dark': 'var(--color-surface-50)', '--theme-rounded-base': '24px', From 1d34f3a72bcb52fe2cb9b95730c7545cb2bfc3ab Mon Sep 17 00:00:00 2001 From: zapguilded <167898252+zapguilded@users.noreply.github.com> Date: Thu, 1 Aug 2024 04:53:51 +0000 Subject: [PATCH 6/7] inter torture of hell --- src/routes/(auth)/login/+page.svelte | 2 +- src/routes/(auth)/login/[userId]/+page.svelte | 6 +++--- src/routes/(protected)/a/[vanity]/+page.svelte | 4 ++-- src/routes/(protected)/profile/+page.svelte | 2 +- src/routes/(protected)/settings/+page.svelte | 2 +- .../(protected)/settings/authorized-apps/+page.svelte | 8 ++++---- .../settings/authorized-apps/[id]/+page.svelte | 4 ++-- src/routes/(protected)/settings/sessions/+page.svelte | 2 +- src/routes/(protected)/settings/your-apps/+page.svelte | 10 +++++----- .../(protected)/settings/your-apps/[id]/+page.svelte | 4 ++-- .../(protected)/settings/your-apps/new/+page.svelte | 4 ++-- src/routes/(public)/info/+page.svelte | 2 +- src/routes/+layout.svelte | 2 +- src/routes/+page.svelte | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/routes/(auth)/login/+page.svelte b/src/routes/(auth)/login/+page.svelte index 9707e2f..23014af 100644 --- a/src/routes/(auth)/login/+page.svelte +++ b/src/routes/(auth)/login/+page.svelte @@ -62,7 +62,7 @@ {message}

{/if} -

Link Guilded

+

Link Guilded

In order to verify your identity, please provide your Guilded username or ID.

diff --git a/src/routes/(auth)/login/[userId]/+page.svelte b/src/routes/(auth)/login/[userId]/+page.svelte index b85bb65..019b0c0 100644 --- a/src/routes/(auth)/login/[userId]/+page.svelte +++ b/src/routes/(auth)/login/[userId]/+page.svelte @@ -25,12 +25,12 @@
-

Is this really you?

+

Is this really you?

Before you can access CardBoard we need to verify that you own this account, follow the steps below to verify.

    {#if currentStep === 1} -

    Step 1:

    +

    Step 1:

  1. Go to your profileNext {:else if currentStep === 2}
  2. -

    Step 2:

    +

    Step 2:

    Once in the post creator set your post's title to the code below, then click post. -

    Authorizing

    +

    Authorizing

    @@ -46,7 +46,7 @@
    -

    Authentication

    +

    Authentication

    By authenticating, you allow {app.name} to access the following information:

-
+
{app.id}