♻️ Make Spinner reusable (not only by loading view)

src/_base.scss

@@ -1,6 +1,7 @@
 $font-size: 100vh * 0.01;
 $icon-size: $font-size * 2;
 
+// TODO: To remove once the design updated.
 $border-style: thin solid #BED6E0;
 
 $greyscale-90: #1B1B1B;
@@ -26,29 +27,46 @@ $color-primary-70: #005A75;
 $color-primary-60: #004059;
 $color-primary-50: #002740;
 
-$color-secondary_150: #EAE5F3;
+$color-secondary-150: #EAE5F3;
-$color-secondary_140: #D5CCE7;
+$color-secondary-140: #D5CCE7;
-$color-secondary_130: #BFB3DB;
+$color-secondary-130: #BFB3DB;
-$color-secondary_120: #AA9BCF;
+$color-secondary-120: #AA9BCF;
-$color-secondary_110: #9583C3;
+$color-secondary-110: #9583C3;
-$color-secondary_100: #7E6BB6;
+$color-secondary-100: #7E6BB6;
-$color-secondary_90: #6957A0;
+$color-secondary-90: #6957A0;
-$color-secondary_80: #53448A;
+$color-secondary-80: #53448A;
-$color-secondary_70: #3E3174;
+$color-secondary-70: #3E3174;
-$color-secondary_60: #281F5F;
+$color-secondary-60: #281F5F;
-$color-secondary_50: #110E4B;
+$color-secondary-50: #110E4B;
 
-$color-ternary_150: #FCE0E9;
+$color-ternary-150: #FCE0E9;
-$color-ternary_140: #F7C1D4;
+$color-ternary-140: #F7C1D4;
-$color-ternary_130: #F1A1BF;
+$color-ternary-130: #F1A1BF;
-$color-ternary_120: #E981AA;
+$color-ternary-120: #E981AA;
-$color-ternary_110: #E05F96;
+$color-ternary-110: #E05F96;
-$color-ternary_100: #D53583;
+$color-ternary-100: #D53583;
-$color-ternary_90: #BC106D;
+$color-ternary-90: #BC106D;
-$color-ternary_80: #A30059;
+$color-ternary-80: #A30059;
-$color-ternary_70: #8B0046;
+$color-ternary-70: #8B0046;
-$color-ternary_60: #720033;
+$color-ternary-60: #720033;
-$color-ternary_50: #5A0022;
+$color-ternary-50: #5A0022;
+
+$form-max-height: 1024px;
+$form-aspect-ratio: 1/1.618;
+
+$border-radius: 16px;
+
+$geist-font-path: "../fonts/Geist";
+
+@font-face {
+    src: url("#{$geist-font-path}/Geist-Bold.woff2") format("woff2");
+    font-family: "Geist";
+    font-weight: bold;
+}
+
+* {
+    font-family: "Geist";
+}
 
 body {
     height: 100vh;
@@ -56,7 +74,6 @@ body {
     margin: 0px;
     padding: 0px;
     outline: 0px;
-    font-family: Tahoma, sans-serif;
 }
 
 #main {
@@ -64,6 +81,7 @@ body {
     width: 100%;
 }
 
+// TODO: To remove once the design updated.
 .aeroButton {
     height: 50%;
     min-height: 16px;

src/components/loading.rs

@@ -1,8 +1,8 @@
 use dioxus::prelude::*;
 use tracing::debug;
 
-use crate::components::spinner::Spinner;
+use super::spinner::Spinner;
-use crate::components::wallpaper::Wallpaper;
+use super::wallpaper::Wallpaper;
 
 turf::style_sheet!("src/components/loading.scss");
 
@@ -18,7 +18,10 @@ pub fn LoadingPage(cx: Scope) -> Element {
 
             Wallpaper {},
 
-            Spinner {},
+            div {
+                class: ClassName::SPINNER,
+                Spinner {},
+            }
         }
     })
 }

src/components/loading.scss

@@ -1,4 +1,5 @@
 @import "../_base.scss"
+@import "./spinner.scss"
 
 .root {
     height: 100%;
@@ -8,6 +9,73 @@
     align-items: center;
     justify-content: center;
 
-    overflow: hidden;
+    .spinner {
+        height: 5%;
+        aspect-ratio: $logo-aspect-ratio;
+
+        position: absolute;
+
+        $logo-center-pos: calc(50% + ($background-height / 2) - ($logo-height / 2));
+
+        @media (0px < height <= calc($background-height * 5)) {
+            top: $logo-center-pos;
+        }
+        @media (calc($background-height * 5) < height <= calc($background-height * 6)) {
+            top: calc($logo-center-pos + ($background-height * 1));
+        }
+        @media (calc($background-height * 6) < height <= calc($background-height * 8)) {
+            top: calc($logo-center-pos + ($background-height * 2));
+        }
+        @media (calc($background-height * 8) < height <= calc($background-height * 10)) {
+            top: calc($logo-center-pos + ($background-height * 3));
+        }
+        @media (calc($background-height * 10) < height <= calc($background-height * 12)) {
+            top: calc($logo-center-pos + ($background-height * 4));
+        }
+        @media (calc($background-height * 12) < height <= calc($background-height * 14)) {
+            top: calc($logo-center-pos + ($background-height * 5));
+        }
+        @media (calc($background-height * 14) < height <= calc($background-height * 16)) {
+            top: calc($logo-center-pos + ($background-height * 6));
+        }
+        @media (calc($background-height * 16) < height <= calc($background-height * 18)) {
+            top: calc($logo-center-pos + ($background-height * 7));
+        }
+        @media (calc($background-height * 18) < height <= calc($background-height * 20)) {
+            top: calc($logo-center-pos + ($background-height * 8));
+        }
+        @media (calc($background-height * 20) < height <= calc($background-height * 22)) {
+            top: calc($logo-center-pos + ($background-height * 9));
+        }
+        @media (calc($background-height * 22) < height <= calc($background-height * 24)) {
+            top: calc($logo-center-pos + ($background-height * 10));
+        }
+        @media (calc($background-height * 24) < height <= calc($background-height * 26)) {
+            top: calc($logo-center-pos + ($background-height * 11));
+        }
+        @media (calc($background-height * 26) < height <= calc($background-height * 28)) {
+            top: calc($logo-center-pos + ($background-height * 12));
+        }
+        @media (calc($background-height * 28) < height <= calc($background-height * 30)) {
+            top: calc($logo-center-pos + ($background-height * 13));
+        }
+        @media (calc($background-height * 30) < height <= calc($background-height * 32)) {
+            top: calc($logo-center-pos + ($background-height * 14));
+        }
+        @media (calc($background-height * 32) < height <= calc($background-height * 34)) {
+            top: calc($logo-center-pos + ($background-height * 15));
+        }
+        @media (calc($background-height * 34) < height <= calc($background-height * 36)) {
+            top: calc($logo-center-pos + ($background-height * 16));
+        }
+        @media (calc($background-height * 36) < height <= calc($background-height * 38)) {
+            top: calc($logo-center-pos + ($background-height * 17));
+        }
+        @media (calc($background-height * 38) < height <= calc($background-height * 40)) {
+            top: calc($logo-center-pos + ($background-height * 18));
+        }
+
+        background-color: $greyscale-0;
+    }
 
 }

src/components/spinner.scss

@@ -1,78 +1,14 @@
 @import "../_base.scss"
 
+$background-height: 128px;
+$background-width: 384px;
+$logo-height: calc(32px * 2);
+$logo-width: calc(64px * 2);
+$logo-aspect-ratio: calc($logo-width / $logo-height);
+
 .root {
-    $background-height: 128px;
+    height: 100%;
-    $background-width: 384px;
+    width: 100%;
-    $logo-height: calc(32px * 2);
-    $logo-width: calc(64px * 2);
-
-    height: $logo-height;
-    width: $logo-width;
-
-    position: absolute;
-    z-index: 1;
-
-    $logo-center-pos: calc(50% + ($background-height / 2) - ($logo-height / 2));
-
-    @media (0px < height <= calc($background-height * 5)) {
-        top: $logo-center-pos;
-    }
-    @media (calc($background-height * 5) < height <= calc($background-height * 6)) {
-        top: calc($logo-center-pos + ($background-height * 1));
-    }
-    @media (calc($background-height * 6) < height <= calc($background-height * 8)) {
-        top: calc($logo-center-pos + ($background-height * 2));
-    }
-    @media (calc($background-height * 8) < height <= calc($background-height * 10)) {
-        top: calc($logo-center-pos + ($background-height * 3));
-    }
-    @media (calc($background-height * 10) < height <= calc($background-height * 12)) {
-        top: calc($logo-center-pos + ($background-height * 4));
-    }
-    @media (calc($background-height * 12) < height <= calc($background-height * 14)) {
-        top: calc($logo-center-pos + ($background-height * 5));
-    }
-    @media (calc($background-height * 14) < height <= calc($background-height * 16)) {
-        top: calc($logo-center-pos + ($background-height * 6));
-    }
-    @media (calc($background-height * 16) < height <= calc($background-height * 18)) {
-        top: calc($logo-center-pos + ($background-height * 7));
-    }
-    @media (calc($background-height * 18) < height <= calc($background-height * 20)) {
-        top: calc($logo-center-pos + ($background-height * 8));
-    }
-    @media (calc($background-height * 20) < height <= calc($background-height * 22)) {
-        top: calc($logo-center-pos + ($background-height * 9));
-    }
-    @media (calc($background-height * 22) < height <= calc($background-height * 24)) {
-        top: calc($logo-center-pos + ($background-height * 10));
-    }
-    @media (calc($background-height * 24) < height <= calc($background-height * 26)) {
-        top: calc($logo-center-pos + ($background-height * 11));
-    }
-    @media (calc($background-height * 26) < height <= calc($background-height * 28)) {
-        top: calc($logo-center-pos + ($background-height * 12));
-    }
-    @media (calc($background-height * 28) < height <= calc($background-height * 30)) {
-        top: calc($logo-center-pos + ($background-height * 13));
-    }
-    @media (calc($background-height * 30) < height <= calc($background-height * 32)) {
-        top: calc($logo-center-pos + ($background-height * 14));
-    }
-    @media (calc($background-height * 32) < height <= calc($background-height * 34)) {
-        top: calc($logo-center-pos + ($background-height * 15));
-    }
-    @media (calc($background-height * 34) < height <= calc($background-height * 36)) {
-        top: calc($logo-center-pos + ($background-height * 16));
-    }
-    @media (calc($background-height * 36) < height <= calc($background-height * 38)) {
-        top: calc($logo-center-pos + ($background-height * 17));
-    }
-    @media (calc($background-height * 38) < height <= calc($background-height * 40)) {
-        top: calc($logo-center-pos + ($background-height * 18));
-    }
-
-    background-color: $greyscale-0;
 
     svg {
         $fps: 4;

src/components/wallpaper.rs

@@ -8,6 +8,10 @@ pub fn Wallpaper(cx: Scope) -> Element {
         style { STYLE_SHEET },
         div {
             class: ClassName::ROOT,
+
+            div {
+                class: ClassName::CONTENT,
+            }
         }
     })
 }

src/components/wallpaper.scss

@@ -1,9 +1,21 @@
 @import "../_base.scss"
 
 .root {
-    background-image: url("./images/background.svg");
+    height: 100%;
-    background-position: center;
+    width: 100%;
+    z-index: -1;
 
-    width: 150%;
+    display: flex;
-    height: 150%;
+    align-items: center;
+    justify-content: center;
+
+    overflow: hidden;
+
+    .content {
+        background-image: url("./images/background.svg");
+        background-position: center;
+
+        width: 150%;
+        height: 150%;
+    }
 }

src/fonts/Geist/LICENSE.TXT

@@ -0,0 +1,92 @@
+Geist Sans and Geist Mono Font
+(C) 2023 Vercel, made in collaboration with basement.studio
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is available with a FAQ at: http://scripts.sil.org/OFL and copied below
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded,
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION AND CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.