From f0b383049f806726adcd5e77162bab1c7999d4cb Mon Sep 17 00:00:00 2001
From: Josh <josh.dredge@outlook.com>
Date: Sun, 5 May 2024 20:21:57 +1000
Subject: [PATCH] SVG updates

---
 .gitignore                                             | 2 +-
 .idea/.idea.AirportAlphabetGame/.idea/watcherTasks.xml | 2 +-
 AirportAlphabetGame/Program.fs                         | 2 --
 AirportAlphabetGame/View.fs                            | 7 +------
 AirportAlphabetGame/sass/core.sass                     | 4 ++--
 AirportAlphabetGame/wwwroot/images/loading.svg         | 7 +++++++
 AirportAlphabetGame/wwwroot/styles/core.css            | 4 ++--
 7 files changed, 14 insertions(+), 14 deletions(-)
 create mode 100644 AirportAlphabetGame/wwwroot/images/loading.svg

diff --git a/.gitignore b/.gitignore
index 961444a..a307a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,4 @@ obj/
 riderModule.iml
 /_ReSharper.Caches/
 /.vs
-./idea
\ No newline at end of file
+.idea
\ No newline at end of file
diff --git a/.idea/.idea.AirportAlphabetGame/.idea/watcherTasks.xml b/.idea/.idea.AirportAlphabetGame/.idea/watcherTasks.xml
index 6d29a23..9d5e85b 100644
--- a/.idea/.idea.AirportAlphabetGame/.idea/watcherTasks.xml
+++ b/.idea/.idea.AirportAlphabetGame/.idea/watcherTasks.xml
@@ -2,7 +2,7 @@
 <project version="4">
   <component name="ProjectTasksOptions">
     <TaskOptions isEnabled="true">
-      <option name="arguments" value="$FileName$:../public/styles/$FileNameWithoutExtension$.css" />
+      <option name="arguments" value="$FileName$:../wwwroot/styles/$FileNameWithoutExtension$.css" />
       <option name="checkSyntaxErrors" value="true" />
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
diff --git a/AirportAlphabetGame/Program.fs b/AirportAlphabetGame/Program.fs
index e0fafd6..4f20abd 100644
--- a/AirportAlphabetGame/Program.fs
+++ b/AirportAlphabetGame/Program.fs
@@ -1,6 +1,4 @@
-open Microsoft.AspNetCore.Mvc
 open Microsoft.Extensions.DependencyInjection
-open Microsoft.AspNetCore.Http
 open Saturn
 open Giraffe
 open Types
diff --git a/AirportAlphabetGame/View.fs b/AirportAlphabetGame/View.fs
index 461f5ca..3fe267c 100644
--- a/AirportAlphabetGame/View.fs
+++ b/AirportAlphabetGame/View.fs
@@ -36,12 +36,7 @@ let index content =
                               ] [
                             input [_type "text"; _name "fr24user"; _autocomplete "off"; _placeholder "Enter your MyFlightRadar24 username..."; _required; _hxValidate "true"; _pattern ".{4,}"]
                             button [_type "submit";] [str "Let's find out!"]
-                            Svg.svg [_width "200"; _height "30"] [
-                                Svg.rect [_width "200"; _height "30"; Svg._fill "lightgray"] []
-                                Svg.rect [_width "50"; _height "30"; Svg._fill "white"] [
-                                    Svg.animate [Svg._attributeName "x"; Svg._attributeType "XML"; Svg._values "0;150;0"; Svg._dur "2s"; Svg._begin "0s"; Svg._repeatCount "indefinite"] []
-                                ]
-                            ]
+                            img [_class "loading"; _alt "Loading..."; _width "200"; _height "30"; _src "/images/loading.svg"]
                         ]
                     ]
                 ]
diff --git a/AirportAlphabetGame/sass/core.sass b/AirportAlphabetGame/sass/core.sass
index 284e25b..2d6e010 100644
--- a/AirportAlphabetGame/sass/core.sass
+++ b/AirportAlphabetGame/sass/core.sass
@@ -86,7 +86,7 @@ h1
                     color: white
                     background: grey
 
-                svg
+                .loading
                     display: none
 
 
@@ -114,7 +114,7 @@ h1
                 input, button
                     display: none
 
-                svg
+                .loading
                     display: block
 
     section#results
diff --git a/AirportAlphabetGame/wwwroot/images/loading.svg b/AirportAlphabetGame/wwwroot/images/loading.svg
new file mode 100644
index 0000000..699a9cb
--- /dev/null
+++ b/AirportAlphabetGame/wwwroot/images/loading.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="200" height="30">
+    <rect width="200" height="30" fill="lightgray" />
+    <rect width="50" height="30" fill="white">
+        <animate attributeName="x" attributeType="XML" values="0;150;0" dur="2s" begin="0s" repeatCount="indefinite" />
+    </rect>
+</svg>
\ No newline at end of file
diff --git a/AirportAlphabetGame/wwwroot/styles/core.css b/AirportAlphabetGame/wwwroot/styles/core.css
index 6767638..e9780b5 100644
--- a/AirportAlphabetGame/wwwroot/styles/core.css
+++ b/AirportAlphabetGame/wwwroot/styles/core.css
@@ -86,7 +86,7 @@ h1 {
   color: white;
   background: grey;
 }
-#pageContainer section#input article form svg {
+#pageContainer section#input article form .loading {
   display: none;
 }
 @media screen and (max-width: 900px) {
@@ -112,7 +112,7 @@ h1 {
 #pageContainer section#input article form.htmx-request input, #pageContainer section#input article form.htmx-request button {
   display: none;
 }
-#pageContainer section#input article form.htmx-request svg {
+#pageContainer section#input article form.htmx-request .loading {
   display: block;
 }
 #pageContainer section#results {