Skip to content

Commit

Permalink
remove component-partial distinction
Browse files Browse the repository at this point in the history
  • Loading branch information
Reed Nelson committed Oct 3, 2023
1 parent 2cc8a8c commit 780c5dd
Show file tree
Hide file tree
Showing 24 changed files with 24 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/layouts/Base.astro
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
---
import config from "@/config/config.json";
import { plainify } from "@/lib/utils/textConverter";
import Footer from "@/partials/Footer.astro";
import Header from "@/partials/Header.astro";
import Footer from "@/components/Footer.astro";
import Header from "@/components/Header.astro";
import "@/styles/main.scss";
// types for frontmatters
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/about.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Base from "@/layouts/Base.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
import { markdownify } from "@/lib/utils/textConverter";
import { Image } from "@astrojs/image/components";
import { getEntryBySlug } from "astro:content";
Expand Down
2 changes: 1 addition & 1 deletion src/pages/blog/categories/[category].astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getTaxonomy } from "@/lib/taxonomyParser.astro";
import taxonomyFilter from "@/lib/utils/taxonomyFilter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
export async function getStaticPaths() {
const categories = await getTaxonomy(
Expand Down
2 changes: 1 addition & 1 deletion src/pages/blog/categories/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import { humanize } from "@/lib/utils/textConverter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
const { blog_folder }: { blog_folder: string } = config.settings;
const categories = await getTaxonomy(blog_folder, "categories");
Expand Down
4 changes: 2 additions & 2 deletions src/pages/blog/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import { sortByDate } from "@/lib/utils/sortFunctions";
import PageHeader from "@/partials/PageHeader.astro";
import BlogSidebar from "@/partials/BlogSidebar.astro";
import PageHeader from "@/components/PageHeader.astro";
import BlogSidebar from "@/components/BlogSidebar.astro";
import { getEntryBySlug } from "astro:content";
const { blog_folder } = config.settings;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/blog/page/[slug].astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import { sortByDate } from "@/lib/utils/sortFunctions";
import PageHeader from "@/partials/PageHeader.astro";
import BlogSidebar from "@/partials/BlogSidebar.astro";
import PageHeader from "@/components/PageHeader.astro";
import BlogSidebar from "@/components/BlogSidebar.astro";
import { getEntryBySlug } from "astro:content";
const { blog_folder } = config.settings;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/blog/tags/[tag].astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getTaxonomy } from "@/lib/taxonomyParser.astro";
import taxonomyFilter from "@/lib/utils/taxonomyFilter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
export async function getStaticPaths() {
const tags = await getTaxonomy(config.settings.blog_folder, "tags");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/blog/tags/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import { humanize } from "@/lib/utils/textConverter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
const { blog_folder }: { blog_folder: string } = config.settings;
const tags = await getTaxonomy(blog_folder, "tags");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/drink/bottles/[bottle].astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getTaxonomy } from "@/lib/taxonomyParser.astro";
import taxonomyFilter from "@/lib/utils/taxonomyFilter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
export async function getStaticPaths() {
const bottles = await getTaxonomy(
Expand Down
2 changes: 1 addition & 1 deletion src/pages/drink/bottles/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
const { drink_folder }: { drink_folder: string } = config.settings;
const bottles = await getTaxonomy(drink_folder, "bottles");
Expand Down
4 changes: 2 additions & 2 deletions src/pages/drink/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import PageHeader from "@/partials/PageHeader.astro";
import DrinkSidebar from "@/partials/DrinkSidebar.astro";
import PageHeader from "@/components/PageHeader.astro";
import DrinkSidebar from "@/components/DrinkSidebar.astro";
import { getEntryBySlug } from "astro:content";
const { drink_folder } = config.settings;
Expand Down
4 changes: 2 additions & 2 deletions src/pages/drink/page/[slug].astro
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import { sortByDate } from "@/lib/utils/sortFunctions";
import PageHeader from "@/partials/PageHeader.astro";
import DrinkSidebar from "@/partials/DrinkSidebar.astro";
import PageHeader from "@/components/PageHeader.astro";
import DrinkSidebar from "@/components/DrinkSidebar.astro";
import { getEntryBySlug } from "astro:content";
const { drink_folder } = config.settings;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/drink/spirits/[spirit].astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getTaxonomy } from "@/lib/taxonomyParser.astro";
import taxonomyFilter from "@/lib/utils/taxonomyFilter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
export async function getStaticPaths() {
const spirits = await getTaxonomy(
Expand Down
2 changes: 1 addition & 1 deletion src/pages/drink/spirits/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
const { drink_folder }: { drink_folder: string } = config.settings;
const spirits = await getTaxonomy(drink_folder, "spirits");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/drink/tags/[tag].astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import { getTaxonomy } from "@/lib/taxonomyParser.astro";
import taxonomyFilter from "@/lib/utils/taxonomyFilter";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
export async function getStaticPaths() {
const tags = await getTaxonomy(config.settings.drink_folder, "tags");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/drink/tags/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getAllTaxonomy, getTaxonomy } from "@/lib/taxonomyParser.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
const { drink_folder }: { drink_folder: string } = config.settings;
const tags = await getTaxonomy(drink_folder, "tags");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/projects.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Base from "@/layouts/Base.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
import { getEntryBySlug } from "astro:content";
const projects = await getEntryBySlug("projects", "-index");
Expand Down
2 changes: 1 addition & 1 deletion src/pages/puzzle/index.astro
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PuzzleCard from "@/components/PuzzleCard.astro";
import config from "@/config/config.json";
import Base from "@/layouts/Base.astro";
import { getSinglePage } from "@/lib/contentParser.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
import { getEntryBySlug } from "astro:content";
const { puzzle_folder } = config.settings;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/terms.astro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
import Base from "@/layouts/Base.astro";
import PageHeader from "@/partials/PageHeader.astro";
import PageHeader from "@/components/PageHeader.astro";
import { getEntryBySlug } from "astro:content";
const terms = await getEntryBySlug("terms", "-index");
Expand Down

0 comments on commit 780c5dd

Please sign in to comment.