diff --git a/website/app/(pages)/acupuncture/views/AcuForDocs.tsx b/website/app/(pages)/acupuncture/views/AcuForDocs.tsx index 75c2b2e..0e406c3 100644 --- a/website/app/(pages)/acupuncture/views/AcuForDocs.tsx +++ b/website/app/(pages)/acupuncture/views/AcuForDocs.tsx @@ -1,8 +1,13 @@ +import View from "@/components/View"; import Link from "next/link"; const AcuForDocs = () => { return ( -
+
View Dr. Feely's resources for doctors:
{ Point Categories [PDF]
-
+ ); }; diff --git a/website/app/(pages)/acupuncture/views/BasicsAndHist.tsx b/website/app/(pages)/acupuncture/views/BasicsAndHist.tsx index 4d6c62a..8edcdd3 100644 --- a/website/app/(pages)/acupuncture/views/BasicsAndHist.tsx +++ b/website/app/(pages)/acupuncture/views/BasicsAndHist.tsx @@ -1,6 +1,12 @@ +import View from "@/components/View"; + const BasicsAndHist = () => { return ( -
+

Acupuncture, a practice originating in China over 5,000 years ago, diverges from Western paradigms with its emphasis on holistic patterns @@ -30,7 +36,7 @@ const BasicsAndHist = () => { traction over time, with many physicians incorporating it into their treatments.

-
+ ); }; diff --git a/website/app/(pages)/acupuncture/views/EarAcupuncture.tsx b/website/app/(pages)/acupuncture/views/EarAcupuncture.tsx index 77aa07d..664a78e 100644 --- a/website/app/(pages)/acupuncture/views/EarAcupuncture.tsx +++ b/website/app/(pages)/acupuncture/views/EarAcupuncture.tsx @@ -1,6 +1,12 @@ +import View from "@/components/View"; + const EarAcupuncture = () => { return ( -
+

Auriculotherapy utilizes the external ear's auricle to alleviate pain, dysfunction, and diseases throughout the body. The ear's auricle is a @@ -27,7 +33,7 @@ const EarAcupuncture = () => { in China, Dr. Nogier's work and further research revolutionized auriculotherapy, making it a powerful tool in modern healthcare.

-
+ ); }; diff --git a/website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx b/website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx index 0c0f0a0..12ac34d 100644 --- a/website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx +++ b/website/app/(pages)/acupuncture/views/ScalpAcupuncture.tsx @@ -1,8 +1,13 @@ +import View from "@/components/View"; import Link from "next/link"; const ScalpAcupuncture = () => { return ( -
+

In 1973, Dr. Toshikatsu Yamamoto introduced Yamamoto New Scalp Acupuncture (YNSA) in Miyazaki, Japan. Unlike traditional Chinese @@ -22,11 +27,11 @@ const ScalpAcupuncture = () => {

- This approach's efficacy has led Dr. Feely to integrate Dr. Yamamoto's methods - into his own practice, successfully addressing chronic and injury-related - symptoms. The technique's unique diagnostic process and interactive - nature contribute to its success in treating neurological conditions and - enhancing patients' well-being. + This approach's efficacy has led Dr. Feely to integrate Dr. Yamamoto's + methods into his own practice, successfully addressing chronic and + injury-related symptoms. The technique's unique diagnostic process and + interactive nature contribute to its success in treating neurological + conditions and enhancing patients' well-being.

{ > Patient Before-and-Afters [PDF] -
+ ); }; diff --git a/website/app/(pages)/articles/(content)/acupuncture-references/page.tsx b/website/app/(pages)/articles/(content)/acupuncture-references/page.tsx index 6de51f4..6308b27 100644 --- a/website/app/(pages)/articles/(content)/acupuncture-references/page.tsx +++ b/website/app/(pages)/articles/(content)/acupuncture-references/page.tsx @@ -1,4 +1,5 @@ import Article from "@/components/Article"; +import ReplaceLink from "@/components/ReplaceLink"; import Link from "next/link"; const ArticleAcupunctureReferences = () => { @@ -11,31 +12,31 @@ const ArticleAcupunctureReferences = () => {
diff --git a/website/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx b/website/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx index 6aa3075..ea5aeba 100644 --- a/website/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx +++ b/website/app/(pages)/articles/(content)/international-acupuncture-bibliography/page.tsx @@ -1,4 +1,5 @@ import Article from "@/components/Article"; +import ReplaceLink from "@/components/ReplaceLink"; import Link from "next/link"; const ArticleInternationalAcupunctureBibliography = () => { @@ -17,201 +18,215 @@ const ArticleInternationalAcupunctureBibliography = () => {
2.0 Clinical Research Areas
3.0 Addiction and Substance Abuse
4.0 Pain Disorders
6.0 Psychological Disorders
7.0 Visceral Disorders
@@ -219,26 +234,28 @@ const ArticleInternationalAcupunctureBibliography = () => {
@@ -246,29 +263,29 @@ const ArticleInternationalAcupunctureBibliography = () => {
diff --git a/website/app/(pages)/articles/(content)/layout.tsx b/website/app/(pages)/articles/(content)/layout.tsx index ac57f9e..24db750 100644 --- a/website/app/(pages)/articles/(content)/layout.tsx +++ b/website/app/(pages)/articles/(content)/layout.tsx @@ -38,13 +38,13 @@ const ArticlesLayout = ({ children }: Props) => { {isTopOfPage ? ( <> ) : ( - window.scrollTo(0, 0)} className="p-3 m-3 rounded-lg align-middle drop-shadow-md hover:drop-shadow-xl transition-all duration-300 fixed bottom-0 md:right-1/4 md:mr-[-4rem] right-0 mr-5 mb-5 bg-primary-100 flex items-center flex-col" >
To Top
- + )} ); diff --git a/website/app/(pages)/articles/views/ArtsForDocs.tsx b/website/app/(pages)/articles/views/ArtsForDocs.tsx index c3eb783..6bb319d 100644 --- a/website/app/(pages)/articles/views/ArtsForDocs.tsx +++ b/website/app/(pages)/articles/views/ArtsForDocs.tsx @@ -1,10 +1,18 @@ +import View from "@/components/View"; import Link from "next/link"; const ArtsForDocs = () => { return ( -
+ +

+ For Doctors +

-

Osteopathy

+

Osteopathy

Articles

@@ -47,7 +55,7 @@ const ArtsForDocs = () => {
-

Acupuncture

+

Acupuncture

Articles

@@ -77,7 +85,7 @@ const ArtsForDocs = () => {
-
+ ); }; diff --git a/website/app/(pages)/articles/views/ArtsForPatients.tsx b/website/app/(pages)/articles/views/ArtsForPatients.tsx index 730ffe0..eeb2faa 100644 --- a/website/app/(pages)/articles/views/ArtsForPatients.tsx +++ b/website/app/(pages)/articles/views/ArtsForPatients.tsx @@ -1,10 +1,20 @@ +import View from "@/components/View"; +import { Verify } from "crypto"; import Link from "next/link"; const ArtsForPatients = () => { return ( -
+ +

Articles

+

+ For Patients +

-

General

+

General

The Ten Stages of Grief @@ -19,7 +29,7 @@ const ArtsForPatients = () => {
-

What is Osteopathy?

+

What is Osteopathy?

Cranial Osteopathy @@ -52,7 +62,7 @@ const ArtsForPatients = () => {
-

Pediatric Osteopathy

+

Pediatric Osteopathy

Digestive Problems @@ -73,7 +83,7 @@ const ArtsForPatients = () => {
-

Acupuncture

+

Acupuncture

Acupuncture Basics @@ -96,7 +106,7 @@ const ArtsForPatients = () => { Yamamoto New Scalp Acupuncture FAQ
-
+ ); }; diff --git a/website/app/(pages)/nor/page.tsx b/website/app/(pages)/nor/page.tsx index 651c9ad..7c44f41 100644 --- a/website/app/(pages)/nor/page.tsx +++ b/website/app/(pages)/nor/page.tsx @@ -1,7 +1,5 @@ import { Metadata } from "next"; import NOR from "./views/NOR"; -import NORArticles from "./views/NORArticles"; -import NORVideos from "./views/NORVideos"; export const metadata: Metadata = { title: "Dr. Feely | NOR", @@ -15,8 +13,6 @@ const NeuroOcularRelease = () => { return (
- -
); }; diff --git a/website/app/(pages)/nor/views/NOR.tsx b/website/app/(pages)/nor/views/NOR.tsx index 16524e1..c4284b3 100644 --- a/website/app/(pages)/nor/views/NOR.tsx +++ b/website/app/(pages)/nor/views/NOR.tsx @@ -1,8 +1,23 @@ +import View from "@/components/View"; + const NOR = () => { return ( -
- NOR -
+ +

Neuro Ocular Release

+

+ Neuro-ocular release (NOR) is a new osteopathic method that is designed + to be used alongside other techniques. By utilizing the visual system, + NOR accesses pathways that reset the central and peripheral nervous + systems. In doing so, NOR more effectively alleviates somatic + disfunction in less time than traditional methods alone. +

+

Want to learn more?

+

+ Access to NOR content is only available to account holders. To request + access, contact Dr. Feely at the link below. +

+

Already have an account?

+ ); }; diff --git a/website/app/(pages)/nor/views/NORArticles.tsx b/website/app/(pages)/nor/views/NORArticles.tsx deleted file mode 100644 index 177013b..0000000 --- a/website/app/(pages)/nor/views/NORArticles.tsx +++ /dev/null @@ -1,9 +0,0 @@ -const NORArticles = () => { - return ( -
- NORArticles -
- ); -}; - -export default NORArticles; diff --git a/website/app/(pages)/nor/views/NORVideos.tsx b/website/app/(pages)/nor/views/NORVideos.tsx deleted file mode 100644 index 3573e3a..0000000 --- a/website/app/(pages)/nor/views/NORVideos.tsx +++ /dev/null @@ -1,9 +0,0 @@ -const NORVideos = () => { - return ( -
- NORVideos -
- ); -}; - -export default NORVideos; diff --git a/website/app/(pages)/osteopathy/views/OsteoBasics.tsx b/website/app/(pages)/osteopathy/views/OsteoBasics.tsx index 5e7f1fa..fe8f454 100644 --- a/website/app/(pages)/osteopathy/views/OsteoBasics.tsx +++ b/website/app/(pages)/osteopathy/views/OsteoBasics.tsx @@ -1,6 +1,12 @@ +import View from "@/components/View"; + const OsteoBasics = () => { return ( -
+

Osteopathic Medicine finds its roots in the pioneering work of Dr. Andrew Taylor Still, who challenged the medical practices of his time. @@ -49,7 +55,7 @@ const OsteoBasics = () => { also takes into account environmental, emotional, and psychological factors that contribute to a patient's well-being.

-
+ ); }; diff --git a/website/app/(pages)/osteopathy/views/OsteoForDocs.tsx b/website/app/(pages)/osteopathy/views/OsteoForDocs.tsx index 8f5db99..97985ff 100644 --- a/website/app/(pages)/osteopathy/views/OsteoForDocs.tsx +++ b/website/app/(pages)/osteopathy/views/OsteoForDocs.tsx @@ -1,8 +1,13 @@ +import View from "@/components/View"; import Link from "next/link"; const OsteoForDocs = () => { return ( -
+
View Dr. Feely's resources for doctors:
@@ -22,7 +27,7 @@ const OsteoForDocs = () => {
Or, learn more by reading his articles for doctors:
-
+ ); }; diff --git a/website/app/(pages)/osteopathy/views/PediatricCare.tsx b/website/app/(pages)/osteopathy/views/PediatricCare.tsx index a188359..5f8b34b 100644 --- a/website/app/(pages)/osteopathy/views/PediatricCare.tsx +++ b/website/app/(pages)/osteopathy/views/PediatricCare.tsx @@ -101,7 +101,7 @@ const PediatricCare = () => { diaphragm function, reducing the need for medication and improving immune responses.

- + Dive deeper into respitory health and osteopathy @@ -116,7 +116,7 @@ const PediatricCare = () => { nerve issues caused by birth, helping to resolve irritability, developmental delays, and other problems.

- + Learn more about OMT and infants diff --git a/website/app/views/AcademicWork.tsx b/website/app/views/AcademicWork.tsx index 6c723e5..cd49d44 100644 --- a/website/app/views/AcademicWork.tsx +++ b/website/app/views/AcademicWork.tsx @@ -1,6 +1,12 @@ +import View from "@/components/View"; + const AcademicWork = () => { return ( -
+

Academic Appointments

@@ -117,7 +123,7 @@ const AcademicWork = () => {
Kirksville College of Osteopathic Medicine
-
+ ); }; diff --git a/website/app/views/CertsAndFellows.tsx b/website/app/views/CertsAndFellows.tsx index 42dd564..35026b0 100644 --- a/website/app/views/CertsAndFellows.tsx +++ b/website/app/views/CertsAndFellows.tsx @@ -1,6 +1,12 @@ +import View from "@/components/View"; + const CertsAndFellows = () => { return ( -
+

Board Certifications

@@ -96,7 +102,7 @@ const CertsAndFellows = () => {
-
+ ); }; diff --git a/website/app/views/EduAndProExp.tsx b/website/app/views/EduAndProExp.tsx index 1b902be..4c7acae 100644 --- a/website/app/views/EduAndProExp.tsx +++ b/website/app/views/EduAndProExp.tsx @@ -1,6 +1,12 @@ +import View from "@/components/View"; + const EduAndProExp = () => { return ( -
+

Education

@@ -76,7 +82,7 @@ const EduAndProExp = () => {
-
+ ); }; diff --git a/website/app/views/Introduction.tsx b/website/app/views/Introduction.tsx index 6fe3b3c..5fa1007 100644 --- a/website/app/views/Introduction.tsx +++ b/website/app/views/Introduction.tsx @@ -1,18 +1,27 @@ "use client"; -import Carousel from "@/components/Carousel"; +import HomePageCarousel from "@/components/HomePageCarousel"; import { ChevronDoubleDownIcon } from "@heroicons/react/24/solid"; import drFeelyPic from "@/public/content/dr_feely_headshot.png"; import Image from "next/image"; +import View from "@/components/View"; +/* Here be dragons */ const Introduction = () => { return ( -
-
-
+ {/* "relative" above makes the background work */} + {/* we have to do some funky stuff with margins to get the look + we want for the home page */} +
+ {/* bumpers so the content doesn't overlap with the navbar*/} +
+
@@ -27,25 +36,30 @@ const Introduction = () => { and headaches.

-
+
Headshot of Dr. Feely
-
- - - -
+ {/* bumpers so the content doesn't overlap with the navbar. + need one on the bottom too because justify-between */} +
- -
+ + {/* bouncy arrow :) */} +
+ +
+ {/* background image magic */} + +
+ ); }; diff --git a/website/components/Carousel.tsx b/website/components/HomePageCarousel.tsx similarity index 97% rename from website/components/Carousel.tsx rename to website/components/HomePageCarousel.tsx index 59a7085..ea5055b 100644 --- a/website/components/Carousel.tsx +++ b/website/components/HomePageCarousel.tsx @@ -24,7 +24,7 @@ const Carousel = ({ className }: Props) => { setBackgroundIndex( (prevIndex) => (prevIndex + 1) % backgroundImages.length ); - }, 10000); + }, 9000); return () => clearInterval(interval); }, []); @@ -32,7 +32,7 @@ const Carousel = ({ className }: Props) => { const transitions = useTransition(backgroundIndex, { key: backgroundIndex, from: { opacity: 0 }, - enter: { opacity: 0.25 }, + enter: { opacity: 1 }, leave: { opacity: 0 }, config: { duration: 2500 }, exitBeforeEnter: true, diff --git a/website/components/Navbar/index.tsx b/website/components/Navbar/index.tsx index b2b74ce..63d0111 100644 --- a/website/components/Navbar/index.tsx +++ b/website/components/Navbar/index.tsx @@ -51,7 +51,7 @@ const Navbar = () => { className={ "font-cormorant text-2xl p-5 whitespace-nowrap transition-all " + (useSmallNav - ? "text-transparent select-none duration-100" + ? "text-transparent select-none w-0 duration-100" : "duration-300 delay-100") } > diff --git a/website/components/ReplaceLink.tsx b/website/components/ReplaceLink.tsx new file mode 100644 index 0000000..5c8fbf4 --- /dev/null +++ b/website/components/ReplaceLink.tsx @@ -0,0 +1,11 @@ +import Link from "next/link"; + +const NoReplaceLink = (props: any) => { + return ( + + {props.children} + + ); +}; + +export default NoReplaceLink; diff --git a/website/tailwind.config.js b/website/tailwind.config.js index 17fac9c..e0bdef4 100644 --- a/website/tailwind.config.js +++ b/website/tailwind.config.js @@ -29,8 +29,8 @@ module.exports = { cormorant: ["Cormorant", "serif"], }, screens: { - lg: "1100px", - md: "900px", + lg: "1200px", + md: "975px", }, keyframes: { fadeIn: { @@ -51,11 +51,11 @@ module.exports = { superPortraitL: "-75px 75px 250px 0px", }, content: { - textAccent: "url('/text_accent.png')", - textAccent2: "url('/text_accent_2.png')", - quote: "url('/quote.png')", - textAccent3: "url('/text_accent_3.png')", - textAccent4: "url('/text_accent_4.png')", + textAccent: "url('/content/text_accent.png')", + textAccent2: "url('/content/text_accent_2.png')", + quote: "url('/content/quote.png')", + textAccent3: "url('/content/text_accent_3.png')", + textAccent4: "url('/content/text_accent_4.png')", }, }, },