From 3861296bb588d966b9edae1e5dfc919be13ddb91 Mon Sep 17 00:00:00 2001
From: jflessau <jan.jf@me.com>
Date: Fri, 22 Dec 2023 17:48:32 +0100
Subject: [PATCH] chore: comply with clippy

---
 api/src/handler/game/mod.rs                            |  2 +-
 api/src/main.rs                                        |  4 ++--
 api/src/server.rs                                      | 10 +++++++++-
 web/src/App.svelte                                     |  2 +-
 web/src/components/{Sackbar.svelte => Snackbar.svelte} |  2 +-
 web/src/routes/Game.svelte                             |  2 +-
 6 files changed, 15 insertions(+), 7 deletions(-)
 rename web/src/components/{Sackbar.svelte => Snackbar.svelte} (97%)

diff --git a/api/src/handler/game/mod.rs b/api/src/handler/game/mod.rs
index 916bc5d..e864417 100644
--- a/api/src/handler/game/mod.rs
+++ b/api/src/handler/game/mod.rs
@@ -112,7 +112,7 @@ fn walk(
 fn grid_size(field_amount: usize) -> Result<usize> {
     let grid_size = (field_amount as f32).sqrt();
 
-    if !(2..10).into_iter().any(|v| v as f32 == grid_size) {
+    if !(2..10).any(|v| v as f32 == grid_size) {
         return Err(Error::InternalServer);
     }
 
diff --git a/api/src/main.rs b/api/src/main.rs
index 6dc13e4..a7e6757 100644
--- a/api/src/main.rs
+++ b/api/src/main.rs
@@ -35,10 +35,10 @@ async fn main() {
 
     tokio::select!(
         _ = server::serve(pool.clone(), receiver.clone()) => {
-            tracing::error!("serfer::serve shut down"); return;
+            tracing::error!("serfer::serve shut down");
         },
         _ = pg_listen::listen(&pool, sender) => {
-            tracing::error!("pg_listener::listen shut down"); return;
+            tracing::error!("pg_listener::listen shut down");
         }
     );
 }
diff --git a/api/src/server.rs b/api/src/server.rs
index 16c40bc..ce85d73 100644
--- a/api/src/server.rs
+++ b/api/src/server.rs
@@ -43,6 +43,7 @@ pub async fn serve(pool: PgPool, receiver: Receiver<HashMap<Uuid, DateTime<Utc>>
             Method::POST,
             Method::DELETE,
             Method::PATCH,
+            Method::OPTIONS,
         ])
         .allow_origin(Origin::list(vec![env::var("CORS_ALLOWED_ORIGIN")
             .expect("CORS_ALLOWED_ORIGIN not set")
@@ -101,7 +102,14 @@ pub async fn serve(pool: PgPool, receiver: Receiver<HashMap<Uuid, DateTime<Utc>>
         .layer(middleware_stack)
         .layer(Extension(pool));
 
-    let addr = SocketAddr::from(([0, 0, 0, 0], port));
+    let environment = env::var("ENVIRONMENT").expect("ENVIRONMENT not set");
+
+    let addr = if environment == "production" {
+        SocketAddr::from(([0, 0, 0, 0], port))
+    } else {
+        SocketAddr::from(([127, 0, 0, 1], port))
+    };
+
     tracing::info!("listening on {}", addr);
 
     axum::Server::bind(&addr)
diff --git a/web/src/App.svelte b/web/src/App.svelte
index 7aadf0d..c8f4922 100644
--- a/web/src/App.svelte
+++ b/web/src/App.svelte
@@ -3,7 +3,7 @@
   import Home from './routes/Home.svelte';
   import Game from './routes/Game.svelte';
   import CreateTemplate from './routes/CreateTemplate.svelte';
-  import Snackbar from './components/Sackbar.svelte';
+  import Snackbar from './components/Snackbar.svelte';
   import { Router, Route } from 'svelte-routing';
   import { ApiClient } from './api.svelte';
   import { AuthStatus, authStore } from './store.svelte';
diff --git a/web/src/components/Sackbar.svelte b/web/src/components/Snackbar.svelte
similarity index 97%
rename from web/src/components/Sackbar.svelte
rename to web/src/components/Snackbar.svelte
index d2782d0..29185f3 100644
--- a/web/src/components/Sackbar.svelte
+++ b/web/src/components/Snackbar.svelte
@@ -1,6 +1,6 @@
 <script lang="ts" context="module">
   import { get } from 'svelte/store';
-  import { NotificationLevel, notificationsStore } from './../store.svelte';
+  import { NotificationLevel, notificationsStore } from '../store.svelte';
 
   export function createNotification(text: string) {
     let notificationsData = get(notificationsStore);
diff --git a/web/src/routes/Game.svelte b/web/src/routes/Game.svelte
index fcdb978..b211de8 100644
--- a/web/src/routes/Game.svelte
+++ b/web/src/routes/Game.svelte
@@ -2,7 +2,7 @@
   import Button from './../components/Button.svelte';
   import { Circle } from 'svelte-loading-spinners';
   import { Confetti } from 'svelte-confetti';
-  import { createNotification, toggleNotifications } from './../components/Sackbar.svelte';
+  import { createNotification, toggleNotifications } from '../components/Snackbar.svelte';
   import { onMount } from 'svelte';
   import { apiWsUrl, ApiClient } from './../api.svelte';
   import { notificationsStore } from './../store.svelte';