Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tweaks #13

Merged
merged 2 commits into from
Dec 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Nuxt 3 Minimal Starter
# Portfolio 2023

Look at the [Nuxt 3 documentation](https://nuxt.com/docs/getting-started/introduction) to learn more.
A portfolio site built in [Nuxt.js](https://nuxtjs.org) and [Tailwind CSS](https://tailwindcss.com).

## Setup

Expand Down
3 changes: 1 addition & 2 deletions components/project/ProjectShow.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<div class="mx-auto w-full mt-14 max-w-2xl sm:mt-16 lg:col-span-3 lg:row-span-2 lg:row-end-2 lg:mt-0 lg:max-w-none">
<div class="flex flex-col-reverse">
<div class="">
<h1 class="text-2xl font-bold tracking-tight sm:text-3xl text-zinc-900 dark:text-zinc-200">{{ project.title }}</h1>
<h1 class="text-2xl font-bold tracking-tight sm:text-3xl text-zinc-700 dark:text-zinc-100">{{ project.title }}</h1>

<h2 id="information-heading" class="sr-only">Date created</h2>
<p class="mt-2 text-sm text-lunar-700 dark:text-lunar-300 dark:opacity-80">
Expand Down Expand Up @@ -143,7 +143,6 @@ const props = defineProps({
})

const {getFullUrl} = useApiData();
const {jsonToHtml} = useSerialize();

const formatDate = (date: string) => {
return new Date(date).toLocaleDateString('en-GB', { year: 'numeric', month: 'short' });
Expand Down
18 changes: 17 additions & 1 deletion pages/about.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
<div v-if="pageData" class="text-center sm:text-left">
<TitleAndSubtitle :title="pageData.tagline" :subtitle="pageData.subtitle" />
</div>
<!-- About -->
<div v-if="aboutData && !aboutError" class="my-10 sm:my-16">
<div class="prose prose-polo dark:prose-invert" v-html="aboutData.intro_html">

</div>
</div>
<div v-else-if="aboutError">
<ErrorState class="text-center">
Error fetching about section
</ErrorState>
</div>

<!-- Setup -->
<div class="my-20">
Expand Down Expand Up @@ -40,11 +51,16 @@ import {FavouriteSection} from "~/types/Favourites";
import {usePageSetup} from "~/composables/usePageSetup";
import {useApiData} from "~/composables/useApiData";

const { fetchData} = useApiData();
const { fetchData, fetchItem} = useApiData();
const { setupPageHead, fetchPageData } = usePageSetup();

type aboutSection = {
intro_html: string;
}

// Fetch about content
const { data: allSections, error: error} = await fetchData<FavouriteSection[]>('/favourite-sections');
const { data: aboutData, error: aboutError} = await fetchItem<aboutSection>('/globals/about');

// Fetch page content
const {pageData, pageError} = await fetchPageData();
Expand Down
2 changes: 1 addition & 1 deletion tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ export default {
typography: ({ theme }) => ({
polo: {
css: {
'--tw-prose-body': theme('colors.zinc[800]'),
'--tw-prose-body': theme('colors.zinc[700]'),
'--tw-prose-headings': theme('colors.evening-sea[900]'),
'--tw-prose-lead': theme('colors.zinc[700]'),
'--tw-prose-links': theme('colors.lunar[700]'),
Expand Down