From e53ce70c1707aaafab264727a4607584a83a4303 Mon Sep 17 00:00:00 2001
From: Anekdotin <eddwinn@gmail.com>
Date: Fri, 22 Mar 2024 19:06:49 -0400
Subject: [PATCH] fixed type errors

---
 .npmrc                           |  2 ++
 src/lib/types/types.ts           | 13 +++++++++++++
 src/routes/+layout.svelte        | 28 +++++++++++++++-------------
 src/routes/+page.svelte          | 29 +++++++++++++++--------------
 src/routes/contact/+page.svelte  | 28 +++++++++++++++-------------
 src/routes/delivery/+page.svelte | 21 ++++++++++++---------
 svelte.config.js                 |  2 +-
 7 files changed, 73 insertions(+), 50 deletions(-)
 create mode 100755 .npmrc
 create mode 100644 src/lib/types/types.ts

diff --git a/.npmrc b/.npmrc
new file mode 100755
index 0000000..0c05da4
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1,2 @@
+engine-strict=true
+resolution-mode=highest
diff --git a/src/lib/types/types.ts b/src/lib/types/types.ts
new file mode 100644
index 0000000..6e19d4f
--- /dev/null
+++ b/src/lib/types/types.ts
@@ -0,0 +1,13 @@
+
+
+    export type oilprice = {
+        ok: boolean
+        price: string;
+    }
+
+    export type company = {
+        ok: boolean
+        name: string;
+        telephone: string;
+
+    }
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 4400ac0..7371fb0 100755
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,13 +1,15 @@
-<script>
+<script lang="ts">
   import "../app.postcss";
   import { onMount } from "svelte";
   import { PUBLIC_BASE_URL } from "$env/static/public";
+  import  type { company, oilprice } from '$lib/types/types'
 
-  let oil_price = [];
-  let price_of_oil = 0;
-  let company = [];
-  let tel_number = "";
-  let company_name = "";
+  export let company_data: company;
+  export let oil_price_data: oilprice;
+  
+  let price_of_oil: string = '';
+  let company_name: string = '';
+  let tel_number: string = '';
 
   onMount(async () => {
     await fetch(PUBLIC_BASE_URL + "/info/price/oil", {
@@ -18,10 +20,10 @@
       },
     })
       .then((response) => response.json())
-      .then((result) => (oil_price = result));
+      .then((result) => (oil_price_data = result));
 
-    if (oil_price["ok"] == true) {
-      price_of_oil = oil_price["price"];
+    if (oil_price_data["ok"] == true) {
+      price_of_oil = oil_price_data["price"];
     }
   });
   onMount(async () => {
@@ -33,11 +35,11 @@
       },
     })
       .then((response) => response.json())
-      .then((result) => (company = result));
+      .then((result) => (company_data = result));
 
-    if (company["ok"] == true) {
-      company_name = company["name"];
-      tel_number = company["telephone"];
+    if (company_data["ok"] == true) {
+      company_name = company_data["name"];
+      tel_number = company_data["telephone"];
     }
   });
 </script>
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index fc3dc10..9a03030 100755
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,13 +1,15 @@
-<script>
+<script lang="ts">
   import "../app.postcss";
   import { onMount } from "svelte";
   import { PUBLIC_BASE_URL } from "$env/static/public";
+  import  type { company, oilprice } from '$lib/types/types'
 
-  let oil_price = [];
-  let price_of_oil = 0;
-  let company = [];
-  let tel_number = "";
-  let company_name = "";
+  export let company_data: company;
+  export let oil_price_data: oilprice;
+  
+  let price_of_oil: string = '';
+  let company_name: string = '';
+  let tel_number: string = '';
 
   onMount(async () => {
     await fetch(PUBLIC_BASE_URL + "/info/price/oil", {
@@ -18,11 +20,10 @@
       },
     })
       .then((response) => response.json())
-      .then((result) => (oil_price = result));
+      .then((result) => (oil_price_data = result));
 
-    if (oil_price["ok"] == true) {
-      price_of_oil = oil_price["price"];
-      console.log(price_of_oil);
+    if (oil_price_data["ok"] == true) {
+      price_of_oil = oil_price_data["price"];
     }
   });
   onMount(async () => {
@@ -34,11 +35,11 @@
       },
     })
       .then((response) => response.json())
-      .then((result) => (company = result));
+      .then((result) => (company_data = result));
 
-    if (company["ok"] == true) {
-      company_name = company["name"];
-      tel_number = company["telephone"];
+    if (company_data["ok"] == true) {
+      company_name = company_data["name"];
+      tel_number = company_data["telephone"];
     }
   });
 </script>
diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte
index 422cf7d..02111b7 100755
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/contact/+page.svelte
@@ -1,13 +1,15 @@
-<script>
+<script lang="ts">
   import "../../app.postcss";
   import { onMount } from "svelte";
   import { PUBLIC_BASE_URL } from "$env/static/public";
+  import  type { company, oilprice } from '$lib/types/types'
 
-  let oil_price = [];
-  let price_of_oil = 0;
-  let company = [];
-  let tel_number = "";
-  let company_name = "";
+  export let company_data: company;
+  export let oil_price_data: oilprice;
+  
+  let price_of_oil: string = '';
+  let company_name: string = '';
+  let tel_number: string = '';
 
   onMount(async () => {
     await fetch(PUBLIC_BASE_URL + "/info/price/oil", {
@@ -18,10 +20,10 @@
       },
     })
       .then((response) => response.json())
-      .then((result) => (oil_price = result));
+      .then((result) => (oil_price_data = result));
 
-    if (oil_price["ok"] == true) {
-      price_of_oil = oil_price["price"];
+    if (oil_price_data["ok"] == true) {
+      price_of_oil = oil_price_data["price"];
     }
   });
   onMount(async () => {
@@ -33,11 +35,11 @@
       },
     })
       .then((response) => response.json())
-      .then((result) => (company = result));
+      .then((result) => (company_data = result));
 
-    if (company["ok"] == true) {
-      company_name = company["name"];
-      tel_number = company["telephone"];
+    if (company_data["ok"] == true) {
+      company_name = company_data["name"];
+      tel_number = company_data["telephone"];
     }
   });
 </script>
diff --git a/src/routes/delivery/+page.svelte b/src/routes/delivery/+page.svelte
index a3ca780..1588221 100755
--- a/src/routes/delivery/+page.svelte
+++ b/src/routes/delivery/+page.svelte
@@ -2,11 +2,14 @@
     import "../../app.postcss";
     import { onMount } from "svelte";
     import { PUBLIC_BASE_URL } from "$env/static/public";
-  
-    let company=  [];
-    let tel_number = "";
-    let company_name = "";
-  
+    import  type { company, oilprice } from '$lib/types/types'
+
+    export let company_data: company;
+    export let oil_price_data: oilprice;
+    
+    let company_name: string = '';
+    let tel_number: string = '';
+
     onMount(async () => {
       await fetch(PUBLIC_BASE_URL + "/info/company", {
         method: "get",
@@ -16,11 +19,11 @@
         },
       })
         .then((response) => response.json())
-        .then((result) => (company = result));
+        .then((result) => (company_data = result));
   
-      if (company["ok"] == true) {
-        company_name = company["name"];
-        tel_number = company["telephone"];
+      if (company_data["ok"] == true) {
+        company_name = company_data["name"];
+        tel_number = company_data["telephone"];
       }
     });
   </script>
diff --git a/svelte.config.js b/svelte.config.js
index 77d5460..43eecb6 100755
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -4,7 +4,7 @@ import { vitePreprocess } from "@sveltejs/kit/vite";
 /** @type {import('@sveltejs/kit').Config} */
 const config = {
  
-
+  preprocess: [vitePreprocess()],
   kit: {
     // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
     // If your environment is not supported or you settled on a specific environment, switch out the adapter.