diff --git a/Dockerfile b/Dockerfile index e58a0db..65149d3 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:latest +FROM node:20.11.1 ENV PUBLIC_BASE_URL=http://localhost:5170 diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte index 21caa14..939188b 100755 --- a/src/routes/(app)/+layout.svelte +++ b/src/routes/(app)/+layout.svelte @@ -4,7 +4,9 @@ import type { company, oilprice } from '$lib/types/types' export let company_data: company; export let oil_price_data: oilprice; - + import '/static/fonts.css'; + + let price_of_oil: string = ''; let company_name: string = ''; let company_phone_number: string = ''; @@ -53,7 +55,6 @@ window.dataLayer = window.dataLayer || []; function gtag(){dataLayer.push(arguments);} gtag('js', new Date()); - gtag('config', 'G-7R7B94HG9M'); @@ -64,7 +65,7 @@ -
+
@@ -155,11 +179,12 @@
-
{company_phone_number}
+
Phone: {company_phone_number}
+
Backup Phone: 508-859-8185
P.O. Box 174
Auburn Ma 01501
Mon - Fri 8:00 am - 5:00 pm
-
Sat Closed | Sun Closed
+
Sat 9:00 am - 12:00 pm | Sun Closed
Heating Oil lowest price near me @@ -189,4 +214,11 @@
- \ No newline at end of file + + + \ No newline at end of file diff --git a/src/routes/(app)/+page.svelte b/src/routes/(app)/+page.svelte index 0402ffb..9e39cce 100755 --- a/src/routes/(app)/+page.svelte +++ b/src/routes/(app)/+page.svelte @@ -133,13 +133,11 @@
Oxford
North Oxford
Webster
-
SouthBridge
Shrewsbury
Grafton
Dudley
-
Sutton
Charlton
Leicester
Cherry Valley
@@ -153,7 +151,6 @@
Auburn
Millbury
-
Sutton
Oxford
North Oxford
Webster
@@ -167,7 +164,6 @@
Rochdale
Spencer
Sutton
-
Southbridge
Worcester
diff --git a/src/routes/(app)/contact/+page.svelte b/src/routes/(app)/contact/+page.svelte index 7e9dfd5..9491ed2 100755 --- a/src/routes/(app)/contact/+page.svelte +++ b/src/routes/(app)/contact/+page.svelte @@ -56,6 +56,7 @@
Contact Us
Phone: {company_phone_number}
+
Backup Phone: 508-859-8185
Email: auburnoilservices@gmail.com
Auburn Oil
@@ -85,7 +86,7 @@
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.
+
Saturday: 9:00 a.m. – 12:00 p.m.
Sunday: Closed
diff --git a/src/routes/(app)/delivery/+page.svelte b/src/routes/(app)/delivery/+page.svelte index 29fb53f..a5c7f46 100755 --- a/src/routes/(app)/delivery/+page.svelte +++ b/src/routes/(app)/delivery/+page.svelte @@ -73,10 +73,8 @@ Worcester County
- - - - + +
diff --git a/src/routes/(app)/oil/+page.svelte b/src/routes/(app)/oil/+page.svelte index 54dd0e3..18a0f62 100644 --- a/src/routes/(app)/oil/+page.svelte +++ b/src/routes/(app)/oil/+page.svelte @@ -5,7 +5,6 @@ import type { company } from '$lib/types/types' export let company_data: company; - let company_name: string = ''; let tel_number: string = ''; @@ -33,7 +32,6 @@ class="max-w-7xl justify-center py-5 mx-auto font-bold text-white" >

Our Oil

- @@ -44,45 +42,42 @@
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. +
+ We do not add bio to our oil!
+
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® -
    • +
    + What is bio oil?
    +
      + Bio is leftover vegetable oil that comes from places like restaurants. + It hardens up in cold temperature just like butter. + It is much cheaper than standard #2 heating oil. + It has a higher likelihood of clogging fuel lines. + More frequent filter changes are required. + If you run out of biofuel, there's a higher chance of the fuel + lines becoming clogged compared to using standard #2 heating oil. You will more likely + need a service call to restart the heating system.
    -
    - +
    - Symptoms your oil company is selling you bad oil. Some companies are 50% plus bio in your oil! + Symptoms your oil company is selling you high bio oil.
    • - System needs filters frequently
      • -
    • - Furnace has bad flame and doesnt produce high heat
      • -
    • - System is clogged
      • +
    • - Furnace needs repairs much more frequently than normal
      • +
    • - Oil line 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.
    diff --git a/src/routes/(app)/servicearea/+page.svelte b/src/routes/(app)/servicearea/+page.svelte index 49286d4..76ed7a6 100755 --- a/src/routes/(app)/servicearea/+page.svelte +++ b/src/routes/(app)/servicearea/+page.svelte @@ -52,7 +52,6 @@
    Auburn
    Millbury
    -
    Sutton
    Oxford
    North Oxford
    Webster
    @@ -68,7 +67,6 @@
    Cherry Valley
    Rochdale
    Spencer
    -
    Southbridge
    Worcester
@@ -76,11 +74,9 @@
Auburn
Millbury
-
Sutton
Oxford
North Oxford
Webster
-
Southbridge
Shrewsbury
Grafton
Dudley
diff --git a/static/fonts.css b/static/fonts.css new file mode 100644 index 0000000..3d20a6c --- /dev/null +++ b/static/fonts.css @@ -0,0 +1,9 @@ +@font-face { + font-family: 'EnterS'; + font-style: normal; + font-weight: 500; + src: url('/fonts/entsans.tff'); /* IE9 Compat Modes */ + src: local(''), url('/fonts/entsans.ttf') format('truetype'), + /* Modern Browsers */ url('/fonts/entsans.ttf') format('truetype'), + +} \ No newline at end of file diff --git a/tailwind.config.js b/tailwind.config.js index c23cb3a..fb28e40 100755 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,4 +1,6 @@ /** @type {import('tailwindcss').Config}*/ + + const config = { content: [ "./src/**/*.{html,js,svelte,ts}", diff --git a/vite.config.ts b/vite.config.ts index bbf8c7d..010a281 100755 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,6 +1,16 @@ import { sveltekit } from '@sveltejs/kit/vite'; -import { defineConfig } from 'vite'; +import { defineConfig,searchForWorkspaceRoot } from 'vite'; export default defineConfig({ - plugins: [sveltekit()] + plugins: [sveltekit()], + server: { + fs: { + allow: [ + // search up for workspace root + searchForWorkspaceRoot(process.cwd()), + // your custom rules + '/static', + ], + }, + }, });