From d0ca2b967e88a11aaf5a1905b890c38684ba1479 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20T=C3=B6lle?= <julian.toelle97@gmail.com>
Date: Mon, 20 Feb 2023 23:50:13 +0100
Subject: [PATCH] refactor(frontend): unify SVG icons

---
 frontend/src/components/LoginLoading.tsx |  2 +-
 frontend/src/components/Spinner.tsx      | 26 ++++++------------------
 frontend/src/icons/Spinner.tsx           | 24 ++++++++++++++++++++++
 frontend/src/icons/Spotify.tsx           | 18 ++++++++--------
 4 files changed, 40 insertions(+), 30 deletions(-)
 create mode 100644 frontend/src/icons/Spinner.tsx

diff --git a/frontend/src/components/LoginLoading.tsx b/frontend/src/components/LoginLoading.tsx
index 6999bfd..2878d88 100644
--- a/frontend/src/components/LoginLoading.tsx
+++ b/frontend/src/components/LoginLoading.tsx
@@ -10,7 +10,7 @@ export const LoginLoading: React.FC = () => (
       <p className="text-2xl font-extralight text-gray-700 dark:text-gray-300 text-center p-6">
         Logging in
       </p>
-      <Spinner className="p-6" size={128} />
+      <Spinner className="p-6" iconClassName="h-32 w-32" />
     </div>
   </main>
 );
diff --git a/frontend/src/components/Spinner.tsx b/frontend/src/components/Spinner.tsx
index f2cb6bf..36fef4a 100644
--- a/frontend/src/components/Spinner.tsx
+++ b/frontend/src/components/Spinner.tsx
@@ -1,32 +1,18 @@
 import React from "react";
+import { SpinnerIcon } from "../icons/Spinner";
 
 interface SpinnerProps {
-  size?: number;
   className?: string;
+  iconClassName?: string;
 }
 
 export const Spinner: React.FC<SpinnerProps> = ({
-  size = 64,
   className = "",
+  iconClassName = "h-16 w-16",
 }) => (
   <div className={`flex justify-center ${className}`}>
-    <svg
-      role="status"
-      className="text-gray-300 dark:text-gray-700 animate-spin fill-green-500"
-      height={size}
-      width={size}
-      viewBox="0 0 100 101"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
-        fill="currentColor"
-      />
-      <path
-        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
-        fill="currentFill"
-      />
-    </svg>
+    <SpinnerIcon
+      className={`${iconClassName} text-gray-300 dark:text-gray-700 fill-green-500`}
+    />
   </div>
 );
diff --git a/frontend/src/icons/Spinner.tsx b/frontend/src/icons/Spinner.tsx
new file mode 100644
index 0000000..60e32c7
--- /dev/null
+++ b/frontend/src/icons/Spinner.tsx
@@ -0,0 +1,24 @@
+import React from "react";
+
+export const SpinnerIcon: React.FC<React.SVGProps<SVGSVGElement>> = (props) => {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      x="0"
+      y="0"
+      viewBox="0 0 100 101"
+      fill="none"
+      {...props}
+      className={`${props.className || ""} animate-spin`}
+    >
+      <path
+        d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
+        fill="currentColor"
+      />
+      <path
+        d="M93.9676 39.0409C96.393 38.4038 97.8624 35.9116 97.0079 33.5539C95.2932 28.8227 92.871 24.3692 89.8167 20.348C85.8452 15.1192 80.8826 10.7238 75.2124 7.41289C69.5422 4.10194 63.2754 1.94025 56.7698 1.05124C51.7666 0.367541 46.6976 0.446843 41.7345 1.27873C39.2613 1.69328 37.813 4.19778 38.4501 6.62326C39.0873 9.04874 41.5694 10.4717 44.0505 10.1071C47.8511 9.54855 51.7191 9.52689 55.5402 10.0491C60.8642 10.7766 65.9928 12.5457 70.6331 15.2552C75.2735 17.9648 79.3347 21.5619 82.5849 25.841C84.9175 28.9121 86.7997 32.2913 88.1811 35.8758C89.083 38.2158 91.5421 39.6781 93.9676 39.0409Z"
+        fill="currentFill"
+      />
+    </svg>
+  );
+};
diff --git a/frontend/src/icons/Spotify.tsx b/frontend/src/icons/Spotify.tsx
index d3c37e9..0f6e937 100644
--- a/frontend/src/icons/Spotify.tsx
+++ b/frontend/src/icons/Spotify.tsx
@@ -1,19 +1,19 @@
 import React from "react";
 
-interface SVGProps {
-  className?: string;
-}
-
-export const SpotifyLogo: React.FC<SVGProps> = ({ className }) => {
+export const SpotifyLogo: React.FC<React.SVGProps<SVGSVGElement>> = (props) => {
   return (
     <svg
       xmlns="http://www.w3.org/2000/svg"
-      width="168"
-      height="168"
+      x="0"
+      y="0"
       viewBox="0 0 168 168"
-      className={className}
+      fill="#fff"
+      {...props}
     >
-      <path d="M83.996.277C37.747.277.253 37.77.253 84.019c0 46.251 37.494 83.741 83.743 83.741 46.254 0 83.744-37.49 83.744-83.741 0-46.246-37.49-83.738-83.745-83.738l.001-.004zm38.404 120.78a5.217 5.217 0 01-7.18 1.73c-19.662-12.01-44.414-14.73-73.564-8.07a5.222 5.222 0 01-6.249-3.93 5.213 5.213 0 013.926-6.25c31.9-7.291 59.263-4.15 81.337 9.34 2.46 1.51 3.24 4.72 1.73 7.18zm10.25-22.805c-1.89 3.075-5.91 4.045-8.98 2.155-22.51-13.839-56.823-17.846-83.448-9.764-3.453 1.043-7.1-.903-8.148-4.35a6.538 6.538 0 014.354-8.143c30.413-9.228 68.222-4.758 94.072 11.127 3.07 1.89 4.04 5.91 2.15 8.976v-.001zm.88-23.744c-26.99-16.031-71.52-17.505-97.289-9.684-4.138 1.255-8.514-1.081-9.768-5.219a7.835 7.835 0 015.221-9.771c29.581-8.98 78.756-7.245 109.83 11.202a7.823 7.823 0 012.74 10.733c-2.2 3.722-7.02 4.949-10.73 2.739z"></path>
+      <path
+        fill="fill"
+        d="M83.996.277C37.747.277.253 37.77.253 84.019c0 46.251 37.494 83.741 83.743 83.741 46.254 0 83.744-37.49 83.744-83.741 0-46.246-37.49-83.738-83.745-83.738l.001-.004zm38.404 120.78a5.217 5.217 0 01-7.18 1.73c-19.662-12.01-44.414-14.73-73.564-8.07a5.222 5.222 0 01-6.249-3.93 5.213 5.213 0 013.926-6.25c31.9-7.291 59.263-4.15 81.337 9.34 2.46 1.51 3.24 4.72 1.73 7.18zm10.25-22.805c-1.89 3.075-5.91 4.045-8.98 2.155-22.51-13.839-56.823-17.846-83.448-9.764-3.453 1.043-7.1-.903-8.148-4.35a6.538 6.538 0 014.354-8.143c30.413-9.228 68.222-4.758 94.072 11.127 3.07 1.89 4.04 5.91 2.15 8.976v-.001zm.88-23.744c-26.99-16.031-71.52-17.505-97.289-9.684-4.138 1.255-8.514-1.081-9.768-5.219a7.835 7.835 0 015.221-9.771c29.581-8.98 78.756-7.245 109.83 11.202a7.823 7.823 0 012.74 10.733c-2.2 3.722-7.02 4.949-10.73 2.739z"
+      ></path>
     </svg>
   );
 };