From b36bb813c19ef4032bc42002ea1e1d7f3a00d712 Mon Sep 17 00:00:00 2001
From: ThatOneCalculator <kainoa@t1c.dev>
Date: Wed, 27 Jul 2022 11:19:57 -0700
Subject: [PATCH] Spinner

---
 CALCKEY.md                                    |  1 +
 .../client/src/components/global/loading.vue  | 46 ++++++++++++-------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/CALCKEY.md b/CALCKEY.md
index 32f1fd7c55..2e1a25980f 100644
--- a/CALCKEY.md
+++ b/CALCKEY.md
@@ -45,6 +45,7 @@
 - Better welcome screen (not logged in)
 - Ability to turn off "Connection lost" message
 - Raw instance info only for moderators
+- New spinner animation
 - Spinner instead of "Loading..."
 - SearchX instead of Google
 - Spacing on group items
diff --git a/packages/client/src/components/global/loading.vue b/packages/client/src/components/global/loading.vue
index bcc6dfac01..d1ad7ad1f4 100644
--- a/packages/client/src/components/global/loading.vue
+++ b/packages/client/src/components/global/loading.vue
@@ -1,15 +1,18 @@
 <template>
 <div :class="[$style.root, { [$style.inline]: inline, [$style.colored]: colored, [$style.mini]: mini }]">
 	<div :class="$style.container">
-		<svg :class="[$style.spinner, $style.bg]" viewBox="0 0 168 168" xmlns="http://www.w3.org/2000/svg">
+		<!-- <svg :class="[$style.spinner, $style.bg]" viewBox="0 0 168 168" xmlns="http://www.w3.org/2000/svg">
 			<g transform="matrix(1.125,0,0,1.125,12,12)">
-				<circle cx="64" cy="64" r="64" style="fill:none;stroke:currentColor;stroke-width:21.33px;"/>
+				<circle cx="168" cy="64" r="64" style="fill:none;stroke:currentColor;stroke-width:21.33px;"/>
 			</g>
 		</svg>
 		<svg :class="[$style.spinner, $style.fg]" viewBox="0 0 168 168" xmlns="http://www.w3.org/2000/svg">
 			<g transform="matrix(1.125,0,0,1.125,12,12)">
 				<path d="M128,64C128,28.654 99.346,0 64,0C99.346,0 128,28.654 128,64Z" style="fill:none;stroke:currentColor;stroke-width:21.33px;"/>
 			</g>
+		</svg> -->
+		<svg :class="[$style.spinner, $style.bg]" viewBox="0 0 50 50">
+			<circle class="path" cx="25" cy="25" r="20" fill="none" stroke-width="5"></circle>
 		</svg>
 	</div>
 </div>
@@ -30,21 +33,34 @@ const props = withDefaults(defineProps<{
 </script>
 
 <style lang="scss" module>
-@keyframes spinner {
-	0% {
-		transform: rotate(0deg);
-	}
+/* Credit to https://codepen.io/supah/pen/BjYLdW */
+@keyframes rotate {
 	100% {
 		transform: rotate(360deg);
 	}
 }
 
+@keyframes dash {
+	0% {
+		stroke-dasharray: 1, 150;
+		stroke-dashoffset: 0;
+	}
+	50% {
+		stroke-dasharray: 90, 150;
+		stroke-dashoffset: -35;
+	}
+	100% {
+		stroke-dasharray: 90, 150;
+		stroke-dashoffset: -124;
+	}
+}
+
 .root {
 	padding: 32px;
 	text-align: center;
 	cursor: wait;
 
-	--size: 40px;
+	--size: 50px;
 
 	&.colored {
 		color: var(--accent);
@@ -75,18 +91,14 @@ const props = withDefaults(defineProps<{
 	left: 0;
 	width: var(--size);
 	height: var(--size);
-	fill-rule: evenodd;
-	clip-rule: evenodd;
 	stroke-linecap: round;
 	stroke-linejoin: round;
-	stroke-miterlimit: 1.5;
+
+	&.path {
+    stroke: var(--accent);
+    stroke-linecap: round;
+    animation: dash 1.5s ease-in-out infinite;
+  }
 }
 
-.bg {
-	opacity: 0.275;
-}
-
-.fg {
-	animation: spinner 0.5s linear infinite;
-}
 </style>