diff --git a/src/info/components/basic-page.js b/src/info/components/basic-page.js index a1ad299..3f94e16 100644 --- a/src/info/components/basic-page.js +++ b/src/info/components/basic-page.js @@ -3,7 +3,14 @@ import TCard from "../components/title-card"; import FCard from "./footer-card"; import PButton from "../components/page-button"; -export default function BasicPage({ page_title, card_title, children }) { +export default function BasicPage({ + page_title, + card_title, + children, + back_url, +}) { + const url = Boolean(back_url) ? back_url : "/"; + return (
@@ -19,7 +26,7 @@ export default function BasicPage({ page_title, card_title, children }) { { src: "/emoji/pixel_alexis.png", alt: "Pixel Alexis!" }, { src: "/emoji/blue_heart.svg", alt: "Blue heart" }, ]} - url="/" + url={url} /> {children} @@ -30,7 +37,7 @@ export default function BasicPage({ page_title, card_title, children }) { { src: "/emoji/pixel_alexis.png", alt: "Pixel Alexis!" }, { src: "/emoji/blue_heart.svg", alt: "Blue heart" }, ]} - url="/" + url={url} /> diff --git a/src/info/components/contacts-link.js b/src/info/components/contacts-link.js index 1e99046..9f0518c 100644 --- a/src/info/components/contacts-link.js +++ b/src/info/components/contacts-link.js @@ -1,21 +1,22 @@ +import Link from "next/link"; import Image from "next/image"; export default function ContactsLink({ src, alt, url, description, url_text }) { return ( -

- - - {alt} - - {" "} - {description}{" "} - - {url_text} - -

+
+ + +
+ + {alt} + {" "} + {description}{" "} +
+ {url_text} +
+
+ + +
); } diff --git a/src/info/components/faq-block.js b/src/info/components/faq-block.js index 6a18100..401de39 100644 --- a/src/info/components/faq-block.js +++ b/src/info/components/faq-block.js @@ -2,7 +2,7 @@ import FCard from "./faq-card"; export default function FAQBlock({ faqs }) { return ( -
+
{Object.keys(faqs).map((faq) => ( +

{question}

-
-
- - +
+ + +
+
{alt} - - -
-
-

- {answer} -
- {"- "} - - {`@shadow8t4`} - -

-
+
+
+ {answer} +
+ {"- @shadow8t4"} +
+
+ +
); diff --git a/src/info/components/footer-card.js b/src/info/components/footer-card.js index 701a194..4a06e58 100644 --- a/src/info/components/footer-card.js +++ b/src/info/components/footer-card.js @@ -12,7 +12,7 @@ export default function FooterCard() { />
-

+

This site uses{" "}
-

+
); } diff --git a/src/info/components/project-block.js b/src/info/components/project-block.js index 723674d..a46943c 100644 --- a/src/info/components/project-block.js +++ b/src/info/components/project-block.js @@ -2,26 +2,24 @@ import PCard from "./project-card"; export default function ProjectCardBlock({ title, cards }) { return ( -
-
+
+

{title}

-
-
    - {Object.keys(cards).map((card) => ( - - ))} -
-
+
    + {Object.keys(cards).map((card) => ( + + ))} +
); } diff --git a/src/info/components/project-card.js b/src/info/components/project-card.js index 98e0a9e..8037006 100644 --- a/src/info/components/project-card.js +++ b/src/info/components/project-card.js @@ -12,34 +12,20 @@ export default function projectCard({ const open_new_tab = new_tab ? "_blank" : ""; return ( -
  • -
    - -
    -

    - {description} -

    -
    -
    -
    • + ); } diff --git a/src/info/components/testimonial-card.js b/src/info/components/testimonial-card.js index 0872299..d7838a2 100644 --- a/src/info/components/testimonial-card.js +++ b/src/info/components/testimonial-card.js @@ -3,55 +3,38 @@ import Link from "next/link"; export default function TestimonialCard({ src, alt, url, innerText, user }) { const finalsrc = Boolean(src) ? src : "/images/logo.png"; - const isMe = - user == "Shadow8t4" - ? "text-werefox-blue-dark dark:text-werefox-blue" - : "text-werefox-pink-dark dark:text-werefox-pink"; - const isMeLink = - user == "Shadow8t4" - ? "hover:text-werefox-pink-dark dark:hover:text-werefox-pink" - : "hover:text-werefox-blue-dark dark:hover:text-werefox-blue"; let testimonialarray = innerText.split("\n"); testimonialarray = testimonialarray.slice(0, testimonialarray.length - 1); const testimonialdict = Object.assign({}, testimonialarray); return ( -
    - -
    -
    - {Object.keys(testimonialdict).map((t) => ( -

    - {testimonialdict[t] == "" ?
    : testimonialdict[t]} -

    - ))} -

    - {"- "} - - {`@${user}`} - -

    -
    -
    + ); } diff --git a/src/info/components/title-card.js b/src/info/components/title-card.js index db3e3ae..79039c4 100644 --- a/src/info/components/title-card.js +++ b/src/info/components/title-card.js @@ -1,20 +1,19 @@ +import Link from "next/link"; import Image from "next/image"; export default function TitleCard({ card_title }) { return ( -
    -

    - - Pixel Alexis! - - {"- "} - {card_title} -

    +
    + + Pixel Alexis! + + {"- "} + {card_title}
    ); } diff --git a/src/info/data/identities/partners.yml b/src/info/data/identities/partners.yml index 46ed9b1..8809e31 100644 --- a/src/info/data/identities/partners.yml +++ b/src/info/data/identities/partners.yml @@ -4,7 +4,7 @@ lindsays: url: "https://hackers.town/@lindsays" avi: "/images/lindsays.png" fields: - with!: "@Kitredgrave@vulpine.club, @muggle@hackers.town, @autumnal@hackers.town (when she is around), @moonbolt@mst3k.interlinked.me::*, @alexis@masto.werefox.dev, $RO, $BUN | polysaturated" + with!: "@Kitredgrave@vulpine.club, @muggle@hackers.town, @autumnal@hackers.town (when she is around), @moonbolt@mst3k.interlinked.me::*, @alexis@masto.werefox.dev, $RO, $BUN, $EM | polysaturated" "Matrix: ask!": "discord: no!" queeeeer: ":qhTrans: :qhPolyro: :qhPolyam:" LiberaPay: "https://liberapay.com/Lindsayschmocker" @@ -21,8 +21,8 @@ karma: url: "https://awoo.space/@karma" avi: "/images/karma.png" fields: - ">:3": "flubebnez" age: 29 + pronouns: "she/her" bio: | Karma / Beatrice / Bea diff --git a/src/info/pages/projects/other/index.js b/src/info/pages/projects/other/index.js index 6c79634..9725faa 100644 --- a/src/info/pages/projects/other/index.js +++ b/src/info/pages/projects/other/index.js @@ -22,7 +22,7 @@ export async function getStaticProps() { export default function Services({ OTHER }) { return ( - +
    diff --git a/src/info/pages/projects/private/index.js b/src/info/pages/projects/private/index.js index cc0738c..18ed181 100644 --- a/src/info/pages/projects/private/index.js +++ b/src/info/pages/projects/private/index.js @@ -22,7 +22,7 @@ export async function getStaticProps() { export default function Services({ PRIVATE }) { return ( - +
    diff --git a/src/info/pages/projects/services/index.js b/src/info/pages/projects/services/index.js index b70b6d6..9bb64da 100644 --- a/src/info/pages/projects/services/index.js +++ b/src/info/pages/projects/services/index.js @@ -22,7 +22,7 @@ export async function getStaticProps() { export default function Services({ SERVICES }) { return ( - +
    diff --git a/src/info/pages/projects/streaming/index.js b/src/info/pages/projects/streaming/index.js index f659c3c..5c12017 100644 --- a/src/info/pages/projects/streaming/index.js +++ b/src/info/pages/projects/streaming/index.js @@ -22,7 +22,7 @@ export async function getStaticProps() { export default function Services({ STREAMING }) { return ( - +
    diff --git a/src/info/pages/testimonials/index.js b/src/info/pages/testimonials/index.js index 2b19ee8..b0d6872 100644 --- a/src/info/pages/testimonials/index.js +++ b/src/info/pages/testimonials/index.js @@ -47,7 +47,7 @@ export default function Testimonials({ iconUrls, TESTIMONIALS }) { innerText={`Sometimes, people say some nice things about me. Here are some examples!`} > -
    +
    {Object.keys(TESTIMONIALS).map((user) => (