i fixed some errors in project

2025-05-05 11:53:29 -04:00
parent bfdaab9c36
commit dee20eacc3
7 changed files with 1024 additions and 1058 deletions
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -45,10 +45,7 @@
  });
 </script>

-<html lang="en">
-
-<head>
-
+<svelte:head>
 <!-- Google tag (gtag.js) -->
 <script async src="https://www.googletagmanager.com/gtag/js?id=G-7R7B94HG9M"></script>
 <script>
@@ -62,35 +59,34 @@
  <meta http-equiv="content-type" content="text/html; charset=UTF-8"> 
  <meta name="description" content="Auburn Oil provides reliable heating oil delivery and top quality oil. 
   Serving homes in Auburn, Worcester, Oxford, Sutton, and Webster. ">
-</head>
+</svelte:head>

+<div class="grid grid-cols-12 bg-blue-oil overflow-hidden custom-font">
+  <div class="col-span-12 md:col-span-3 text-3xl p-10 text-orange-oil font-bold invisible md:visible h-0 md:h-auto">
+    <div class="text-center pt-5 text-white">Call Today</div>
+    <div class="text-center ">508-426-8800</div>
+  </div>

-  <div class="grid grid-cols-12 bg-blue-oil overflow-hidden custom-font">
-    <div class="col-span-12 md:col-span-3 text-3xl p-10 text-orange-oil font-bold invisible md:visible h-0 md:h-auto">
-      <div class="text-center pt-5 text-white">Call Today</div>
-      <div class="text-center ">{company_phone_number}</div>
-    </div>
-
-    <div class="col-span-12 md:col-span-6 md:p-10 text-center font-bold ">
-      <div class="md:flex md:justify-center pb-5 md:pb-0 gap-5">
-        <a href="/">
-        <img class="" src="/images/logo/1.png" alt="Auburn Oil Near Me" />
-      </a>
-      </div>
-     
-    </div>
-
-
-    <div
-      class=" col-span-12 md:col-span-3 md:p-10 text-3xl text-orange-oil  font-bold"
-    >
-      <div class="text-center pt-5 text-white">Todays Price</div>
-      <div class="text-center ">${price_of_oil}</div>
+  <div class="col-span-12 md:col-span-6 md:p-10 text-center font-bold ">
+    <div class="md:flex md:justify-center pb-5 md:pb-0 gap-5">
+      <a href="/">
+      <img class="" src="/images/logo/1.png" alt="Auburn Oil Near Me" />
+    </a>
    </div>
   
  </div>


+  <div
+    class=" col-span-12 md:col-span-3 md:p-10 text-3xl text-orange-oil  font-bold"
+  >
+    <div class="text-center pt-5 text-white">Todays Price</div>
+    <div class="text-center ">${price_of_oil}</div>
+  </div>
+
+</div>
+
+
 <div class="navbar bg-orange-oil text-white">
  <div class="navbar-start">
    <div class="dropdown">
@@ -161,12 +157,9 @@
   
  </div>
 </div>
-<body>
 <div class="body bg-white text-black">
  <slot />
 </div>
-
-</body>
 <footer>
 <div class="grid grid-cols-12 bg-blue-oil py-10 w-full">
  <div
@@ -180,7 +173,7 @@
    class="col-span-12 md:col-span-4 text-center text-bold text-xl text-white pb-10"
  >
    <div class="">Phone: {company_phone_number}</div>
-    <div class="">Backup Phone: 508-859-8185</div>
+    <div class="">Backup Phone: 914-330-6100</div>
    <div class="">P.O. Box 174</div>
    <div class="">Auburn Ma 01501</div>
    <div class="">Mon - Fri 8:00 am - 5:00 pm</div>
@@ -214,7 +207,6 @@
  </div>
 </div>
 </footer>
-</html>

 <style>
 .custom-font {
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -62,11 +62,16 @@
  </div>

  <div class="mx-auto p-10">
-    <div class="mx-auto pb-5 text-5xl text-center">Order Now</div>
-    <div class="mx-auto text-5xl text-center">
-      {company_phone_number}
+    <div class="flex justify-center gap-20">
+      <div class="text-center">
+        <div class="pb-5 text-5xl">Call Us</div>
+        <div class="text-5xl">508-426-8800</div>
+      </div>
+      <div class="text-center">
+        <div class="pb-5 text-5xl">Txt Us</div>
+        <div class="text-5xl">914-330-6100</div>
+      </div>
    </div>
-
    <div class="grid grid-cols-12 gap-5 px-5 text-center mt-10">
      <div class="col-span-12 font-bold text-4xl text-blue-400 mx-auto ">
        Why call Auburn Oil?
@@ -82,7 +87,8 @@
      <div class="col-span-12 lg:col-span-4 bg-base-100 p-10">
        <div class="text-4xl mb-3">Phone Support</div>
        <div class="text-lg">
-          Real live person on the phone when you call.
+          Real live person on the phone when you call.  Txt us if you prefer.
+          We are here to help you.
        </div>
      </div>
      <div class="col-span-12 lg:col-span-4 bg-base-100 p-10">
@@ -133,7 +139,6 @@
              <div class="text-2xl">Oxford</div>
              <div class="text-2xl">North Oxford</div>
              <div class="text-2xl">Webster</div>
-              <div class="text-2xl">Shrewsbury</div>
              <div class="text-2xl">Grafton</div>
            </div>
            <div >
@@ -155,7 +160,6 @@
              <div class="text-2xl">North Oxford</div>
              <div class="text-2xl">Webster</div>
              <div class="text-2xl">Southbridge</div>
-              <div class="text-2xl">Shrewsbury</div>
              <div class="text-2xl">Grafton</div>
              <div class="text-2xl">Dudley</div>
              <div class="text-2xl">Charlton</div>
--- a/src/routes/(app)/oil/+page.svelte
+++ b/src/routes/(app)/oil/+page.svelte
@@ -2,7 +2,7 @@
    import "../../../app.postcss";
    import { onMount } from "svelte";
    import { PUBLIC_BASE_URL } from "$env/static/public";
-    import  type { company } from '$lib/types/types'
+    import type { company } from '$lib/types/types';
  
    export let company_data: company;
    
@@ -97,4 +97,3 @@
        <img class="w-full p-0 m-0" src="/images/oildelivery.jpg" alt="Delivering Oil" />
      </div>
    </div>
-  </div>
--- a/src/routes/(app)/servicearea/+page.svelte
+++ b/src/routes/(app)/servicearea/+page.svelte
@@ -56,7 +56,6 @@
                    <div class="text-2xl">North Oxford</div>
                    <div class="text-2xl">Webster</div>
                    <div class="text-2xl">Southbridge</div>
-                    <div class="text-2xl">Shrewsbury</div>
                    <div class="text-2xl">Grafton</div>
                  </div>
                  <div >
@@ -77,7 +76,6 @@
                        <div class="text-2xl">Oxford</div>
                        <div class="text-2xl">North Oxford</div>
                        <div class="text-2xl">Webster</div>
-                        <div class="text-2xl">Shrewsbury</div>
                        <div class="text-2xl">Grafton</div>
                        <div class="text-2xl">Dudley</div>
                        <div class="text-2xl">Charlton</div>
--- a/svelte.config.js
+++ b/svelte.config.js
@@ -1,10 +1,7 @@
 import adapter from "@sveltejs/adapter-node";
-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.
@@ -19,4 +16,3 @@ const config = {
 };

 export default config;
-
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,7 +9,8 @@
 		"resolveJsonModule": true,
 		"skipLibCheck": true,
 		"sourceMap": true,
-		"strict": true
+		"strict": true,
+		"verbatimModuleSyntax": true
 	}
 	
 }