From c23209dd7ab11c3c9e6b2153812885411e891dc7 Mon Sep 17 00:00:00 2001 From: Edwin Eames Date: Mon, 23 Sep 2024 18:13:25 -0400 Subject: [PATCH] Added oil page. Typos . google fixes --- src/lib/types/types.ts | 6 ++ src/routes/(app)/+layout.svelte | 14 +-- src/routes/(app)/+page.svelte | 6 +- src/routes/(app)/about/+page.svelte | 66 ++++---------- src/routes/(app)/contact/+page.svelte | 23 +++-- src/routes/(app)/delivery/+page.svelte | 40 +++++++-- src/routes/(app)/oil/+page.svelte | 105 ++++++++++++++++++++++ src/routes/(app)/servicearea/+page.svelte | 2 +- 8 files changed, 187 insertions(+), 75 deletions(-) create mode 100644 src/routes/(app)/oil/+page.svelte diff --git a/src/lib/types/types.ts b/src/lib/types/types.ts index 4a5087e..c79f5ea 100644 --- a/src/lib/types/types.ts +++ b/src/lib/types/types.ts @@ -5,6 +5,12 @@ todays_price: string; } + export type priceitems = { + ok: boolean + price_emergency: string; + price_prime: string; + price_same_day: string; + } export type company = { ok: boolean company_name: string; diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 2fd32a4..36f93f7 100755 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -48,8 +48,9 @@ - - + +
@@ -102,7 +103,8 @@ class="menu menu-sm bg-orange-oil w-64 dropdown-content mt-3 z-[1] p-2 shadow rounded-box font-bold text-white" >
  • Home
    • -
  • Oil Delivery
    • +
  • Our Oil
    • +
  • Delivery
  • Delivery Area
  • About Us
  • Contact
    • @@ -113,7 +115,8 @@ diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte index 5663806..484276a 100755 --- a/src/routes/(app)/+page.svelte +++ b/src/routes/(app)/+page.svelte @@ -45,7 +45,7 @@ } }); -Auburn Oil: Heating Oil Delivery Service in Southern Worcester County +Auburn Oil: Quality Heating Oil Delivery in Southern Worcester County
    @@ -88,8 +88,8 @@
    Top Quality Oil
    - We dont cut our product with biodiesel. We use the best available - oil for your heating system + We dont cut our oil with biodiesel. We use the best available + fuel for your heating system
    diff --git a/src/routes/(app)/about/+page.svelte b/src/routes/(app)/about/+page.svelte index 77be91c..5a6d7a1 100755 --- a/src/routes/(app)/about/+page.svelte +++ b/src/routes/(app)/about/+page.svelte @@ -27,7 +27,7 @@ } }); - +About Auburn Oil
    - Our Oil Wont Ruin your heating system! + Mission Statement
    -
    +
    + After watching the oil community add more bio every year to there deliveries, we decided it was time to bring back some integrity to the oil industry. + Auburn oil was born with the idea of selling the purest heating oil we can deliver to our customers. Our slogan is "oil you can trust" and we stand behind it. + We are not adding more bio to your oil + every year to increase profits at the expense of the customer. You call, we deliver top quality oil. +
    +
    + Our history of delivering oil +
    +
    After 20 years delivering for other companies in Worcester. Our family - decided it was time to start our own small business. We have the - experience to ensure your family stays warm! -
    -
    - The best oil in your Tank -
    -
    -
      -
      - -
    • 2-5% biodiesel (B2–B5) is Bioheat® fuel (Our Oil)
      • -
      -
      -
    • - 5-20% biodiesel (B5–B20) is Bioheat Plus® fuel -
      • -
      -
      -
    • - 20% biodiesel and above (B20+) is Bioheat Super Plus® -
      • -
      -
    - -
    - -
    -
    - Symptoms your oil company is selling you bad oil -
    -
      -
    • - System needs filters frequently
      • -
    • - Furnace has bad flame and doesnt produce high heat
      • -
    • - System is clogged
      • -
    • - Tank goes bad all of a sudden!
      • -
    -
    -
    - See the slime? Imagine that all inside your tank and equipment! -
    -
    - Thats a bio filled system :( -
    - -
    - Oil burner cleaning + decided it was time to start a small business to serve customers. We have the + experience to ensure your family stays warm! Everyone in our family is a certified boiler technician.
    +
    - Delivering Oil + Delivering Oil
    diff --git a/src/routes/(app)/contact/+page.svelte b/src/routes/(app)/contact/+page.svelte index 7e6f1c5..7e9dfd5 100755 --- a/src/routes/(app)/contact/+page.svelte +++ b/src/routes/(app)/contact/+page.svelte @@ -43,7 +43,7 @@ } }); - +Contact Auburn Oil
    Contact Us
    -
    Phone: {company_phone_number}
    - +
    Phone: {company_phone_number}
    +
    Email: auburnoilservices@gmail.com
    +
    +
    Auburn Oil
    +
    P.O. Box 174
    +
    Auburn Ma 01501
    +
    Business Hours Summer
    Monday: 8:00 a.m. – 5:00 p.m.
    -
    Tuesday: 8:30 a.m. – 5:00 p.m.
    -
    Wednesday: 8:30 a.m. – 5:00 p.m.
    +
    Tuesday: 8:00 a.m. – 5:00 p.m.
    +
    Wednesday: 8:00 a.m. – 5:00 p.m.
    Thursday: 8:00 a.m. – 5:00 p.m.
    Friday: 8:00 a.m. – 3:00 p.m.
    Saturday: Closed
    Sunday: Closed
    -
    +
    Business Hours Winter
    Monday: 8:00 a.m. – 5:00 p.m.
    -
    Tuesday: 8:30 a.m. – 5:00 p.m.
    -
    Wednesday: 8:30 a.m. – 5:00 p.m.
    +
    Tuesday: 8:00 a.m. – 5:00 p.m.
    +
    Wednesday: 8:00 a.m. – 5:00 p.m.
    Thursday: 8:00 a.m. – 5:00 p.m.
    Friday: 8:00 a.m. – 5:00 p.m.
    Saturday: 8:00 a.m. – 1:00 p.m.
    Sunday: Closed
    -
    +
    diff --git a/src/routes/(app)/delivery/+page.svelte b/src/routes/(app)/delivery/+page.svelte index f178186..790af7d 100755 --- a/src/routes/(app)/delivery/+page.svelte +++ b/src/routes/(app)/delivery/+page.svelte @@ -2,14 +2,18 @@ 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, priceitems } from '$lib/types/types' export let company_data: company; - + export let oil_data: priceitems; let company_name: string = ''; let tel_number: string = ''; + let price_emergency: string = ''; + let price_prime: string = ''; + let price_same_day: string = ''; + onMount(async () => { await fetch(PUBLIC_BASE_URL + "/info/company", { method: "get", @@ -26,8 +30,27 @@ tel_number = company_data["company_phone_number"]; } }); + onMount(async () => { + await fetch(PUBLIC_BASE_URL + "/info/price/oil/items", { + method: "get", + credentials: "include", + headers: { + "Content-Type": "application/json", + }, + }) + .then((response) => response.json()) + .then((result) => (oil_data = result)); + + if (oil_data["ok"] == true) { + price_emergency = oil_data["price_emergency"]; + price_prime = oil_data["price_prime"]; + price_same_day = oil_data["price_same_day"]; + + } + }); + - + Home Heating Oil Delivery
      100 Gallon Minimum to Worcester County
    -
      Prime - 25$
    -
      Same Day - 150$
    +
      Prime - ${price_prime}
    +
      Same Day - ${price_same_day} + price oil
    +
      After Hours Emergency - $150 + price oil (prime included)
    @@ -63,6 +87,7 @@
      Cash on Delivery (C.O.D)
      Credit Card
      Money Order
    +
      Check (with credit card hold till it clears)
    @@ -90,7 +115,8 @@
  • - 4.) Pay with Credit Card or pay the driver cash + 4.) Pay with above payments mentioned. +
    • @@ -103,7 +129,7 @@
    - +
    diff --git a/src/routes/(app)/oil/+page.svelte b/src/routes/(app)/oil/+page.svelte new file mode 100644 index 0000000..54dd0e3 --- /dev/null +++ b/src/routes/(app)/oil/+page.svelte @@ -0,0 +1,105 @@ + + Our Oil at Auburn Oil +
    +
    +

    Our Oil

    + +
    +
    + +
    +
    +
    +
    +
    + Our Oil Wont Ruin your heating system! +
    +
    + We sell the best heating oil that is legally allowed on the market. + The government currently requires 5% bio mix be added before it is sold to heating companies and the public. +
    +
    + The best oil in your Tank +
    +
    +
      +
      + +
    • 2-5% biodiesel (B2–B5) is Bioheat® fuel (Our Oil)
      • +
      +
      +
    • + 5-20% biodiesel (B5–B20) is Bioheat Plus® fuel +
      • +
      +
      +
    • + 20% biodiesel and above (B20+) is Bioheat Super Plus® +
      • +
      +
    + +
    + +
    +
    + Symptoms your oil company is selling you bad oil. Some companies are 50% plus bio in your oil! +
    +
      +
    • - System needs filters frequently
      • +
    • - Furnace has bad flame and doesnt produce high heat
      • +
    • - System is clogged
      • +
    • - Tank goes bad all of a sudden!
      • +
    • - Frozen lines in the winter. Bio brings the freezing point much higher!
      • +
    +
    +
    + We sell better heating oil at a cheaper price. +
    +
    + See the slime? Imagine that all inside your tank and equipment! +
    +
    + Thats a bio filled system :( +
    + +
    + Oil burner cleaning +
    +
    +
    + Delivering Oil +
    +
    +
    + \ No newline at end of file diff --git a/src/routes/(app)/servicearea/+page.svelte b/src/routes/(app)/servicearea/+page.svelte index 8307d78..49286d4 100755 --- a/src/routes/(app)/servicearea/+page.svelte +++ b/src/routes/(app)/servicearea/+page.svelte @@ -28,7 +28,7 @@ }); -Auburn Oil: Heating Oil Delivery Service in Southern Worcester County +Delivery towns and Map