diff --git a/.gitignore b/.gitignore index 4af75c5..43ed78e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,39 @@ # See https://help.github.com/articles/ignoring-files/ for more about ignoring files. # dependencies -website/node_modules -website/.pnp -website/.pnp.js +node_modules +.pnp +.pnp.js # testing -website/coverage +coverage # next.js -website/.next/ -website/out/ +.next/ +out/ # production -website/build -website/out +build +out # misc -website/.DS_Store -website/*.pem +.DS_Store +*.pem # debug -website/npm-debug.log* -website/yarn-debug.log* -website/yarn-error.log* +npm-debug.log* +yarn-debug.log* +yarn-error.log* # local env files -website/.env*.local +.env*.local # vercel -website/.vercel +.vercel # typescript -website/*.tsbuildinfo -website/next-env.d.ts +*.tsbuildinfo +next-env.d.ts # private assets -website/private +private diff --git a/website/README.md b/README.md similarity index 100% rename from website/README.md rename to README.md diff --git a/website/app/(pages)/acupuncture/page.tsx b/app/(pages)/acupuncture/page.tsx similarity index 100% rename from website/app/(pages)/acupuncture/page.tsx rename to app/(pages)/acupuncture/page.tsx diff --git a/website/app/(pages)/acupuncture/views/AcuForDocs.tsx b/app/(pages)/acupuncture/views/AcuForDocs.tsx similarity index 96% rename from website/app/(pages)/acupuncture/views/AcuForDocs.tsx rename to app/(pages)/acupuncture/views/AcuForDocs.tsx index 4780150..6d0fedb 100644 --- a/website/app/(pages)/acupuncture/views/AcuForDocs.tsx +++ b/app/(pages)/acupuncture/views/AcuForDocs.tsx @@ -1,4 +1,4 @@ -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import LearnMoreLinkLight from "@/components/LearnMoreLinkLight"; import View from "@/components/View"; import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid"; diff --git a/website/app/(pages)/acupuncture/views/BasicsAndHist.tsx b/app/(pages)/acupuncture/views/BasicsAndHist.tsx similarity index 97% rename from website/app/(pages)/acupuncture/views/BasicsAndHist.tsx rename to app/(pages)/acupuncture/views/BasicsAndHist.tsx index c21389e..cf56efc 100644 --- a/website/app/(pages)/acupuncture/views/BasicsAndHist.tsx +++ b/app/(pages)/acupuncture/views/BasicsAndHist.tsx @@ -1,7 +1,7 @@ import LearnMoreLinkLight from "@/components/LearnMoreLinkLight"; import View from "@/components/View"; import acuManu from "@/public/content/acupuncture_manuscript.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import acu1 from "@/public/content/acupuncture_1.jpg"; const BasicsAndHist = () => { diff --git a/website/app/(pages)/acupuncture/views/EarAcupuncture.tsx b/app/(pages)/acupuncture/views/EarAcupuncture.tsx similarity index 97% rename from website/app/(pages)/acupuncture/views/EarAcupuncture.tsx rename to app/(pages)/acupuncture/views/EarAcupuncture.tsx index 3eb0d4a..7899c70 100644 --- a/website/app/(pages)/acupuncture/views/EarAcupuncture.tsx +++ b/app/(pages)/acupuncture/views/EarAcupuncture.tsx @@ -1,7 +1,7 @@ import CenterView from "@/components/CenterView"; import LearnMoreLink from "@/components/LearnMoreLink"; import earAcu1 from "@/public/content/auricular_accupuncture.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; const EarAcupuncture = () => { return ( diff --git a/website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx b/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx similarity index 98% rename from website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx rename to app/(pages)/acupuncture/views/ScalpAcupuncture.tsx index 377ab06..0c1aeb0 100644 --- a/website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx +++ b/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx @@ -2,7 +2,7 @@ import Card from "@/components/Card"; import CenterView from "@/components/CenterView"; import LearnMoreLink from "@/components/LearnMoreLink"; import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import scalpPoints from "@/public/content/scalp_points.png"; import ExtLearnMoreLink from "@/components/ExtLearnMoreLink"; diff --git a/website/app/(pages)/articles/(content)/acupuncture-basics/page.tsx b/app/(pages)/articles/(content)/acupuncture-basics/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/acupuncture-basics/page.tsx rename to app/(pages)/articles/(content)/acupuncture-basics/page.tsx diff --git a/website/app/(pages)/articles/(content)/acupuncture-history/page.tsx b/app/(pages)/articles/(content)/acupuncture-history/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/acupuncture-history/page.tsx rename to app/(pages)/articles/(content)/acupuncture-history/page.tsx diff --git a/website/app/(pages)/articles/(content)/acupuncture-letter/page.tsx b/app/(pages)/articles/(content)/acupuncture-letter/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/acupuncture-letter/page.tsx rename to app/(pages)/articles/(content)/acupuncture-letter/page.tsx diff --git a/website/app/(pages)/articles/(content)/acupuncture-references/page.tsx b/app/(pages)/articles/(content)/acupuncture-references/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/acupuncture-references/page.tsx rename to app/(pages)/articles/(content)/acupuncture-references/page.tsx diff --git a/website/app/(pages)/articles/(content)/arthritis-and-exercise/page.tsx b/app/(pages)/articles/(content)/arthritis-and-exercise/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/arthritis-and-exercise/page.tsx rename to app/(pages)/articles/(content)/arthritis-and-exercise/page.tsx diff --git a/website/app/(pages)/articles/(content)/chronic-muscle-pain/page.tsx b/app/(pages)/articles/(content)/chronic-muscle-pain/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/chronic-muscle-pain/page.tsx rename to app/(pages)/articles/(content)/chronic-muscle-pain/page.tsx diff --git a/website/app/(pages)/articles/(content)/coccydynia-case-report/page.tsx b/app/(pages)/articles/(content)/coccydynia-case-report/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/coccydynia-case-report/page.tsx rename to app/(pages)/articles/(content)/coccydynia-case-report/page.tsx diff --git a/website/app/(pages)/articles/(content)/cranial-manipulation/page.tsx b/app/(pages)/articles/(content)/cranial-manipulation/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/cranial-manipulation/page.tsx rename to app/(pages)/articles/(content)/cranial-manipulation/page.tsx diff --git a/website/app/(pages)/articles/(content)/cranial-osteopathy-faq/page.tsx b/app/(pages)/articles/(content)/cranial-osteopathy-faq/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/cranial-osteopathy-faq/page.tsx rename to app/(pages)/articles/(content)/cranial-osteopathy-faq/page.tsx diff --git a/website/app/(pages)/articles/(content)/cranial-osteopathy/page.tsx b/app/(pages)/articles/(content)/cranial-osteopathy/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/cranial-osteopathy/page.tsx rename to app/(pages)/articles/(content)/cranial-osteopathy/page.tsx diff --git a/website/app/(pages)/articles/(content)/ear-acupuncture-faq/page.tsx b/app/(pages)/articles/(content)/ear-acupuncture-faq/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/ear-acupuncture-faq/page.tsx rename to app/(pages)/articles/(content)/ear-acupuncture-faq/page.tsx diff --git a/website/app/(pages)/articles/(content)/ear-acupuncture/page.tsx b/app/(pages)/articles/(content)/ear-acupuncture/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/ear-acupuncture/page.tsx rename to app/(pages)/articles/(content)/ear-acupuncture/page.tsx diff --git a/website/app/(pages)/articles/(content)/feelys-osteopathic-dictionary/page.tsx b/app/(pages)/articles/(content)/feelys-osteopathic-dictionary/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/feelys-osteopathic-dictionary/page.tsx rename to app/(pages)/articles/(content)/feelys-osteopathic-dictionary/page.tsx diff --git a/website/app/(pages)/articles/(content)/five-element-acupuncture/page.tsx b/app/(pages)/articles/(content)/five-element-acupuncture/page.tsx similarity index 99% rename from website/app/(pages)/articles/(content)/five-element-acupuncture/page.tsx rename to app/(pages)/articles/(content)/five-element-acupuncture/page.tsx index 3611798..0d55b23 100644 --- a/website/app/(pages)/articles/(content)/five-element-acupuncture/page.tsx +++ b/app/(pages)/articles/(content)/five-element-acupuncture/page.tsx @@ -1,7 +1,7 @@ import Article from "@/components/Article"; import { Metadata } from "next"; import fiveElements from "@/public/content/acupuncture_elements.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; export const metadata: Metadata = { title: "Article - Five Element Acupuncture | Dr. Feely", diff --git a/website/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx b/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx rename to app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx diff --git a/website/app/(pages)/articles/(content)/intervertebral-disc-herniation/page.tsx b/app/(pages)/articles/(content)/intervertebral-disc-herniation/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/intervertebral-disc-herniation/page.tsx rename to app/(pages)/articles/(content)/intervertebral-disc-herniation/page.tsx diff --git a/website/app/(pages)/articles/(content)/intro-to-osteopathy/page.tsx b/app/(pages)/articles/(content)/intro-to-osteopathy/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/intro-to-osteopathy/page.tsx rename to app/(pages)/articles/(content)/intro-to-osteopathy/page.tsx diff --git a/website/app/(pages)/articles/(content)/layout.tsx b/app/(pages)/articles/(content)/layout.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/layout.tsx rename to app/(pages)/articles/(content)/layout.tsx diff --git a/website/app/(pages)/articles/(content)/neural-biological-mechanisms/page.tsx b/app/(pages)/articles/(content)/neural-biological-mechanisms/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/neural-biological-mechanisms/page.tsx rename to app/(pages)/articles/(content)/neural-biological-mechanisms/page.tsx diff --git a/website/app/(pages)/articles/(content)/new_article b/app/(pages)/articles/(content)/new_article similarity index 100% rename from website/app/(pages)/articles/(content)/new_article rename to app/(pages)/articles/(content)/new_article diff --git a/website/app/(pages)/articles/(content)/omt-codes/page.tsx b/app/(pages)/articles/(content)/omt-codes/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/omt-codes/page.tsx rename to app/(pages)/articles/(content)/omt-codes/page.tsx diff --git a/website/app/(pages)/articles/(content)/osteopath-comparison-table/page.tsx b/app/(pages)/articles/(content)/osteopath-comparison-table/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/osteopath-comparison-table/page.tsx rename to app/(pages)/articles/(content)/osteopath-comparison-table/page.tsx diff --git a/website/app/(pages)/articles/(content)/osteopathic-head-pain/page.tsx b/app/(pages)/articles/(content)/osteopathic-head-pain/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/osteopathic-head-pain/page.tsx rename to app/(pages)/articles/(content)/osteopathic-head-pain/page.tsx diff --git a/website/app/(pages)/articles/(content)/osteopathic-manipulation-in-pregnancy/page.tsx b/app/(pages)/articles/(content)/osteopathic-manipulation-in-pregnancy/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/osteopathic-manipulation-in-pregnancy/page.tsx rename to app/(pages)/articles/(content)/osteopathic-manipulation-in-pregnancy/page.tsx diff --git a/website/app/(pages)/articles/(content)/osteopathic-manipulative-treatment/page.tsx b/app/(pages)/articles/(content)/osteopathic-manipulative-treatment/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/osteopathic-manipulative-treatment/page.tsx rename to app/(pages)/articles/(content)/osteopathic-manipulative-treatment/page.tsx diff --git a/website/app/(pages)/articles/(content)/osteopathy-faq/page.tsx b/app/(pages)/articles/(content)/osteopathy-faq/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/osteopathy-faq/page.tsx rename to app/(pages)/articles/(content)/osteopathy-faq/page.tsx diff --git a/website/app/(pages)/articles/(content)/pediatric-digestive-problems/page.tsx b/app/(pages)/articles/(content)/pediatric-digestive-problems/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/pediatric-digestive-problems/page.tsx rename to app/(pages)/articles/(content)/pediatric-digestive-problems/page.tsx diff --git a/website/app/(pages)/articles/(content)/pediatric-down-syndrome/page.tsx b/app/(pages)/articles/(content)/pediatric-down-syndrome/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/pediatric-down-syndrome/page.tsx rename to app/(pages)/articles/(content)/pediatric-down-syndrome/page.tsx diff --git a/website/app/(pages)/articles/(content)/pediatric-orthopedic-problems/page.tsx b/app/(pages)/articles/(content)/pediatric-orthopedic-problems/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/pediatric-orthopedic-problems/page.tsx rename to app/(pages)/articles/(content)/pediatric-orthopedic-problems/page.tsx diff --git a/website/app/(pages)/articles/(content)/pediatric-respiratory-health/page.tsx b/app/(pages)/articles/(content)/pediatric-respiratory-health/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/pediatric-respiratory-health/page.tsx rename to app/(pages)/articles/(content)/pediatric-respiratory-health/page.tsx diff --git a/website/app/(pages)/articles/(content)/pediatric-treatment-for-newborns/page.tsx b/app/(pages)/articles/(content)/pediatric-treatment-for-newborns/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/pediatric-treatment-for-newborns/page.tsx rename to app/(pages)/articles/(content)/pediatric-treatment-for-newborns/page.tsx diff --git a/website/app/(pages)/articles/(content)/scalp-acupuncture/page.tsx b/app/(pages)/articles/(content)/scalp-acupuncture/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/scalp-acupuncture/page.tsx rename to app/(pages)/articles/(content)/scalp-acupuncture/page.tsx diff --git a/website/app/(pages)/articles/(content)/ten-stages-of-grief/page.tsx b/app/(pages)/articles/(content)/ten-stages-of-grief/page.tsx similarity index 98% rename from website/app/(pages)/articles/(content)/ten-stages-of-grief/page.tsx rename to app/(pages)/articles/(content)/ten-stages-of-grief/page.tsx index 2c4d762..db897bd 100644 --- a/website/app/(pages)/articles/(content)/ten-stages-of-grief/page.tsx +++ b/app/(pages)/articles/(content)/ten-stages-of-grief/page.tsx @@ -1,7 +1,7 @@ import Article from "@/components/Article"; import { Metadata } from "next"; import griefPic from "@/public/content/stages_of_grief.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; export const metadata: Metadata = { title: "Article - The Ten Stages of Grief | Dr. Feely", diff --git a/website/app/(pages)/articles/(content)/the-trauma-of-birth/page.tsx b/app/(pages)/articles/(content)/the-trauma-of-birth/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/the-trauma-of-birth/page.tsx rename to app/(pages)/articles/(content)/the-trauma-of-birth/page.tsx diff --git a/website/app/(pages)/articles/(content)/what-is-a-do/page.tsx b/app/(pages)/articles/(content)/what-is-a-do/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/what-is-a-do/page.tsx rename to app/(pages)/articles/(content)/what-is-a-do/page.tsx diff --git a/website/app/(pages)/articles/(content)/yamamoto-new-scalp-acupuncture-faq/page.tsx b/app/(pages)/articles/(content)/yamamoto-new-scalp-acupuncture-faq/page.tsx similarity index 100% rename from website/app/(pages)/articles/(content)/yamamoto-new-scalp-acupuncture-faq/page.tsx rename to app/(pages)/articles/(content)/yamamoto-new-scalp-acupuncture-faq/page.tsx diff --git a/website/app/(pages)/articles/page.tsx b/app/(pages)/articles/page.tsx similarity index 100% rename from website/app/(pages)/articles/page.tsx rename to app/(pages)/articles/page.tsx diff --git a/website/app/(pages)/articles/views/ArtsForDocs.tsx b/app/(pages)/articles/views/ArtsForDocs.tsx similarity index 99% rename from website/app/(pages)/articles/views/ArtsForDocs.tsx rename to app/(pages)/articles/views/ArtsForDocs.tsx index 3d5a74a..2037961 100644 --- a/website/app/(pages)/articles/views/ArtsForDocs.tsx +++ b/app/(pages)/articles/views/ArtsForDocs.tsx @@ -3,7 +3,7 @@ import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid"; import ArtLink from "@/components/ArtLink"; import CenterView from "@/components/CenterView"; import docWithClip from "@/public/content/doctor_w_clipboard.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; const ArtsForDocs = () => { return ( diff --git a/website/app/(pages)/articles/views/ArtsForPatients.tsx b/app/(pages)/articles/views/ArtsForPatients.tsx similarity index 99% rename from website/app/(pages)/articles/views/ArtsForPatients.tsx rename to app/(pages)/articles/views/ArtsForPatients.tsx index 3032dc4..70bdef0 100644 --- a/website/app/(pages)/articles/views/ArtsForPatients.tsx +++ b/app/(pages)/articles/views/ArtsForPatients.tsx @@ -2,7 +2,7 @@ import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid"; import ArtLink from "@/components/ArtLink"; import CenterView from "@/components/CenterView"; import doctorBack from "@/public/content/doctor_back.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import View from "@/components/View"; const ArtsForPatients = () => { diff --git a/website/app/(pages)/nor/page.tsx b/app/(pages)/nor/page.tsx similarity index 100% rename from website/app/(pages)/nor/page.tsx rename to app/(pages)/nor/page.tsx diff --git a/website/app/(pages)/nor/views/NOR.tsx b/app/(pages)/nor/views/NOR.tsx similarity index 96% rename from website/app/(pages)/nor/views/NOR.tsx rename to app/(pages)/nor/views/NOR.tsx index 6901e91..604c73d 100644 --- a/website/app/(pages)/nor/views/NOR.tsx +++ b/app/(pages)/nor/views/NOR.tsx @@ -2,7 +2,7 @@ import ArtLink from "@/components/ArtLink"; import CenterView from "@/components/CenterView"; import ExtLearnMoreLink from "@/components/ExtLearnMoreLink"; import NORBrain from "@/public/content/NOR_brain.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; const NOR = () => { return ( diff --git a/website/app/(pages)/osteopathy/page.tsx b/app/(pages)/osteopathy/page.tsx similarity index 100% rename from website/app/(pages)/osteopathy/page.tsx rename to app/(pages)/osteopathy/page.tsx diff --git a/website/app/(pages)/osteopathy/views/OsteoBasics.tsx b/app/(pages)/osteopathy/views/OsteoBasics.tsx similarity index 98% rename from website/app/(pages)/osteopathy/views/OsteoBasics.tsx rename to app/(pages)/osteopathy/views/OsteoBasics.tsx index 77d9eee..91bedad 100644 --- a/website/app/(pages)/osteopathy/views/OsteoBasics.tsx +++ b/app/(pages)/osteopathy/views/OsteoBasics.tsx @@ -1,5 +1,5 @@ import View from "@/components/View"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import drStill from "@/public/content/dr_still.jpeg"; import Card from "@/components/Card"; import LearnMoreLink from "@/components/LearnMoreLink"; diff --git a/website/app/(pages)/osteopathy/views/OsteoForDocs.tsx b/app/(pages)/osteopathy/views/OsteoForDocs.tsx similarity index 96% rename from website/app/(pages)/osteopathy/views/OsteoForDocs.tsx rename to app/(pages)/osteopathy/views/OsteoForDocs.tsx index e035021..6ba9e65 100644 --- a/website/app/(pages)/osteopathy/views/OsteoForDocs.tsx +++ b/app/(pages)/osteopathy/views/OsteoForDocs.tsx @@ -1,6 +1,6 @@ import View from "@/components/View"; import drStill2 from "@/public/content/dr_still_2.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import ArtLink from "@/components/ArtLink"; import { ArrowTopRightOnSquareIcon } from "@heroicons/react/24/solid"; import LearnMoreLinkLight from "@/components/LearnMoreLinkLight"; diff --git a/website/app/(pages)/osteopathy/views/PediatricCare.tsx b/app/(pages)/osteopathy/views/PediatricCare.tsx similarity index 98% rename from website/app/(pages)/osteopathy/views/PediatricCare.tsx rename to app/(pages)/osteopathy/views/PediatricCare.tsx index 0564669..8cfffbd 100644 --- a/website/app/(pages)/osteopathy/views/PediatricCare.tsx +++ b/app/(pages)/osteopathy/views/PediatricCare.tsx @@ -5,7 +5,7 @@ import childWithCold from "@/public/content/child_with_cold.jpg"; import infant from "@/public/content/infant.jpg"; import sickChild from "@/public/content/sick_child.jpg"; import downSyndrome from "@/public/content/down_syndrome.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import Card from "@/components/Card"; const PediatricCare = () => { diff --git a/website/app/globals.css b/app/globals.css similarity index 100% rename from website/app/globals.css rename to app/globals.css diff --git a/website/app/icon.png b/app/icon.png similarity index 100% rename from website/app/icon.png rename to app/icon.png diff --git a/website/app/layout.tsx b/app/layout.tsx similarity index 100% rename from website/app/layout.tsx rename to app/layout.tsx diff --git a/website/app/page.tsx b/app/page.tsx similarity index 100% rename from website/app/page.tsx rename to app/page.tsx diff --git a/website/app/views/AcademicWork.tsx b/app/views/AcademicWork.tsx similarity index 100% rename from website/app/views/AcademicWork.tsx rename to app/views/AcademicWork.tsx diff --git a/website/app/views/CertsAndFellows.tsx b/app/views/CertsAndFellows.tsx similarity index 94% rename from website/app/views/CertsAndFellows.tsx rename to app/views/CertsAndFellows.tsx index 99b7aaf..c9c47d5 100644 --- a/website/app/views/CertsAndFellows.tsx +++ b/app/views/CertsAndFellows.tsx @@ -3,7 +3,7 @@ import BoardCerts from "./components/BoardCerts"; import Fellowships from "./components/Fellowships"; import Awards from "./components/Awards"; import headshot from "@/public/content/dr_feely_headshot.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; const CertsAndFellows = () => { return ( diff --git a/website/app/views/EduAndProExp.tsx b/app/views/EduAndProExp.tsx similarity index 100% rename from website/app/views/EduAndProExp.tsx rename to app/views/EduAndProExp.tsx diff --git a/website/app/views/Introduction.tsx b/app/views/Introduction.tsx similarity index 97% rename from website/app/views/Introduction.tsx rename to app/views/Introduction.tsx index 8c09568..c856439 100644 --- a/website/app/views/Introduction.tsx +++ b/app/views/Introduction.tsx @@ -3,7 +3,7 @@ import HomePageCarousel from "@/components/HomePageCarousel"; import { ChevronDoubleDownIcon } from "@heroicons/react/24/solid"; import drFeelyPic from "@/public/content/dr_feely_headshot2.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import View from "@/components/View"; /* Here be dragons */ diff --git a/website/app/views/components/AcademicAppts.tsx b/app/views/components/AcademicAppts.tsx similarity index 96% rename from website/app/views/components/AcademicAppts.tsx rename to app/views/components/AcademicAppts.tsx index 350bfbe..a016eee 100644 --- a/website/app/views/components/AcademicAppts.tsx +++ b/app/views/components/AcademicAppts.tsx @@ -5,11 +5,11 @@ import { ArrowDownIcon, ArrowUpIcon } from "@heroicons/react/24/solid"; import { useState } from "react"; import midwesternLogo from "@/public/content/midwestern_college.png"; import tuoroLogo from "@/public/content/tuoro_university.png"; -import atStillLogo from "@/public/content/at_still.svg"; +import atStillLogo from "@/public/content/at_still.png"; import westernULogo from "@/public/content/western_university.png"; import cranialLogo from "@/public/content/osteopathic_cranial_academy.png"; -import aaoLogo from "@/public/content/aao.webp"; -import Image from "next/image"; +import aaoLogo from "@/public/content/aao.png"; +import { default as Image } from "next-image-export-optimizer"; interface Props { className?: string; diff --git a/website/app/views/components/Articles.tsx b/app/views/components/Articles.tsx similarity index 100% rename from website/app/views/components/Articles.tsx rename to app/views/components/Articles.tsx diff --git a/website/app/views/components/Awards.tsx b/app/views/components/Awards.tsx similarity index 100% rename from website/app/views/components/Awards.tsx rename to app/views/components/Awards.tsx diff --git a/website/app/views/components/BoardCerts.tsx b/app/views/components/BoardCerts.tsx similarity index 100% rename from website/app/views/components/BoardCerts.tsx rename to app/views/components/BoardCerts.tsx diff --git a/website/app/views/components/Books.tsx b/app/views/components/Books.tsx similarity index 96% rename from website/app/views/components/Books.tsx rename to app/views/components/Books.tsx index e4c1452..93b9d85 100644 --- a/website/app/views/components/Books.tsx +++ b/app/views/components/Books.tsx @@ -1,6 +1,6 @@ import Card from "@/components/Card"; import bookCover from "@/public/content/acu_book.jpg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; const Books = () => { const titleStyle = "font-bold"; diff --git a/website/app/views/components/Edu.tsx b/app/views/components/Edu.tsx similarity index 97% rename from website/app/views/components/Edu.tsx rename to app/views/components/Edu.tsx index ccdd7b5..ed0d34f 100644 --- a/website/app/views/components/Edu.tsx +++ b/app/views/components/Edu.tsx @@ -2,7 +2,7 @@ import ImageCard from "@/components/ImageCard"; import atStillU from "@/public/content/at_still_university.jpg"; import davenportHospital from "@/public/content/davenport_hospital.png"; import trumanState from "@/public/content/truman-state.jpeg"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; interface Props { className?: string; diff --git a/website/app/views/components/Fellowships.tsx b/app/views/components/Fellowships.tsx similarity index 100% rename from website/app/views/components/Fellowships.tsx rename to app/views/components/Fellowships.tsx diff --git a/website/app/views/components/ProExp.tsx b/app/views/components/ProExp.tsx similarity index 98% rename from website/app/views/components/ProExp.tsx rename to app/views/components/ProExp.tsx index acda10b..e1820ae 100644 --- a/website/app/views/components/ProExp.tsx +++ b/app/views/components/ProExp.tsx @@ -8,7 +8,7 @@ import ommTestsLogo from "@/public/content/omm_logo.png"; import tcmmTestsLogo from "@/public/content/tcm_tests.png"; import womack from "@/public/content/womack.png"; import tivity from "@/public/content/tivity.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import whoLogo from "@/public/content/who.png"; interface Props { diff --git a/website/components/ArtLink.tsx b/components/ArtLink.tsx similarity index 100% rename from website/components/ArtLink.tsx rename to components/ArtLink.tsx diff --git a/website/components/Article.tsx b/components/Article.tsx similarity index 100% rename from website/components/Article.tsx rename to components/Article.tsx diff --git a/website/components/Button.tsx b/components/Button.tsx similarity index 100% rename from website/components/Button.tsx rename to components/Button.tsx diff --git a/website/components/Card.tsx b/components/Card.tsx similarity index 100% rename from website/components/Card.tsx rename to components/Card.tsx diff --git a/website/components/CenterView.tsx b/components/CenterView.tsx similarity index 100% rename from website/components/CenterView.tsx rename to components/CenterView.tsx diff --git a/website/components/Contact.tsx b/components/Contact.tsx similarity index 95% rename from website/components/Contact.tsx rename to components/Contact.tsx index cdcd369..90724a9 100644 --- a/website/components/Contact.tsx +++ b/components/Contact.tsx @@ -2,7 +2,7 @@ import ArtLink from "./ArtLink"; import View from "./View"; import left from "@/public/content/logo_unicorn.png"; import right from "@/public/content/logo_lion.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; const Contact = () => { return ( diff --git a/website/components/ExtLearnMoreLink.tsx b/components/ExtLearnMoreLink.tsx similarity index 100% rename from website/components/ExtLearnMoreLink.tsx rename to components/ExtLearnMoreLink.tsx diff --git a/website/components/Footer.tsx b/components/Footer.tsx similarity index 100% rename from website/components/Footer.tsx rename to components/Footer.tsx diff --git a/website/components/HomePageCarousel.tsx b/components/HomePageCarousel.tsx similarity index 91% rename from website/components/HomePageCarousel.tsx rename to components/HomePageCarousel.tsx index 9a129f2..5bb4038 100644 --- a/website/components/HomePageCarousel.tsx +++ b/components/HomePageCarousel.tsx @@ -1,8 +1,8 @@ "use client"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import chicagoPic from "@/public/content/chicago.jpg"; -import indianapolisPic from "@/public/content/indianapolis.webp"; +import indianapolisPic from "@/public/content/indianapolis.png"; import naturePic from "@/public/content/nature.jpg"; import { useEffect, useState } from "react"; import { useTransition, animated } from "@react-spring/web"; diff --git a/website/components/ImageCard.tsx b/components/ImageCard.tsx similarity index 100% rename from website/components/ImageCard.tsx rename to components/ImageCard.tsx diff --git a/website/components/LearnMoreLink.tsx b/components/LearnMoreLink.tsx similarity index 100% rename from website/components/LearnMoreLink.tsx rename to components/LearnMoreLink.tsx diff --git a/website/components/LearnMoreLinkLight.tsx b/components/LearnMoreLinkLight.tsx similarity index 100% rename from website/components/LearnMoreLinkLight.tsx rename to components/LearnMoreLinkLight.tsx diff --git a/website/components/Navbar/NavLink.tsx b/components/Navbar/NavLink.tsx similarity index 100% rename from website/components/Navbar/NavLink.tsx rename to components/Navbar/NavLink.tsx diff --git a/website/components/Navbar/NavPages.tsx b/components/Navbar/NavPages.tsx similarity index 100% rename from website/components/Navbar/NavPages.tsx rename to components/Navbar/NavPages.tsx diff --git a/website/components/Navbar/index.tsx b/components/Navbar/index.tsx similarity index 95% rename from website/components/Navbar/index.tsx rename to components/Navbar/index.tsx index 5b9ca35..103884a 100644 --- a/website/components/Navbar/index.tsx +++ b/components/Navbar/index.tsx @@ -5,7 +5,7 @@ import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/solid"; import NavPages from "./NavPages"; import logo from "@/public/content/logo.png"; import logo_small from "@/public/content/logo_small.png"; -import Image from "next/image"; +import { default as Image } from "next-image-export-optimizer"; import { usePathname } from "next/navigation"; const Navbar = () => { @@ -31,7 +31,7 @@ const Navbar = () => { return (