Skip to content
Open
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
16 changes: 8 additions & 8 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@next/mdx": "^13.0.2",
"@tailwindcss/typography": "^0.5.4",
"autoprefixer": "^10.4.12",
"axios": "^1.2.0",
"axios": "^1.7.3",
"clsx": "^2.0.0",
"fast-glob": "^3.2.11",
"feed": "^4.2.2",
Expand Down
9 changes: 7 additions & 2 deletions src/api/axiosConfig.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import axios from "axios"
import { isHyperlink } from '@/lib/isHyperlink'

const BASE_URL = process.env.DOTNET_SERVER_URL

const BASE_URL = process.env.DOTNET_SERVER_URL || 'http://localhost:5000/api';


const AXIOS_BASE = axios.create({
baseURL: BASE_URL,
})
timeout: 1000,
});


const JSON_CLIENT = isHyperlink(BASE_URL) ? AXIOS_BASE : false


export default JSON_CLIENT
32 changes: 15 additions & 17 deletions src/api/postsApi.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,21 @@
import API from './axiosConfig'
import JSON_CLIENT from '@/api/axiosConfig';

export const getPosts = () => {
export const getPosts = async () => {
try {
return API.get('/posts/')
.then((res) => res.data)
const response = await JSON_CLIENT.get('/posts');
return response.data;
} catch (error) {
console.error('Failed to fetch posts:', error);
return [];
}
catch (e) {
console.error(e)
return []
}
}
};

export const getPost = (postSlug) => {
export const getPost = async (slug) => {
try {
return API.get(`/posts/${postSlug}`)
.then((res) => res.data)
}
catch (e) {
console.error(e)
return {}
const response = await JSON_CLIENT.get(`/posts/${slug}`);
return response.data;
} catch (error) {
console.error('Failed to fetch post:', error);
return null;
}
}
};
45 changes: 45 additions & 0 deletions src/components/Header.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import { useRouter } from 'next/router'
import { Popover, Transition } from '@headlessui/react'
import clsx from 'clsx'


import { Container } from '@/components/Container'
import LoginLogoutLink from "@/components/LoginLogoutLink"
import avatarImage from '@/images/avatar.jpg'


function CloseIcon(props) {
return (
<svg viewBox="0 0 24 24" aria-hidden="true" {...props}>
Expand All @@ -24,6 +26,7 @@ function CloseIcon(props) {
)
}


function ChevronDownIcon(props) {
return (
<svg viewBox="0 0 8 6" aria-hidden="true" {...props}>
Expand All @@ -38,6 +41,7 @@ function ChevronDownIcon(props) {
)
}


function MobileNavItem({ href, children }) {
return (
<li>
Expand All @@ -48,6 +52,7 @@ function MobileNavItem({ href, children }) {
)
}


function MobileNavigation(props) {
return (
<Popover {...props}>
Expand Down Expand Up @@ -92,6 +97,11 @@ function MobileNavigation(props) {
<ul className="-my-2 divide-y divide-zinc-100 text-base text-zinc-800">
<MobileNavItem href="/about">About</MobileNavItem>
<MobileNavItem href="/posts">Posts</MobileNavItem>
<li>
<Popover.Button as = {Link} href = " /posts/create-post" className = "block py-2">
Create Post
</Popover.Button>
</li>
<MobileNavItem href="/projects">Projects</MobileNavItem>
<MobileNavItem href="/speaking">Speaking</MobileNavItem>
<MobileNavItem href="/uses">Uses</MobileNavItem>
Expand All @@ -105,9 +115,11 @@ function MobileNavigation(props) {
)
}


function NavItem({ href, children }) {
let isActive = useRouter().pathname === href


return (
<li>
<Link
Expand All @@ -128,12 +140,20 @@ function NavItem({ href, children }) {
)
}


function DesktopNavigation(props) {
return (
<nav {...props}>
<ul className="flex rounded-full bg-white/90 px-3 text-sm font-medium text-zinc-800 shadow-lg shadow-zinc-800/5 ring-1 ring-zinc-900/5 backdrop-blur">
<NavItem href="/about">About</NavItem>
<NavItem href="/posts">Posts</NavItem>
<li>
<Link
href = "/posts/create-post"
className = "relative block px-3 py-2 transition hover:text-teal-500">
Create Post
</Link>
</li>
<NavItem href="/projects">Projects</NavItem>
<NavItem href="/speaking">Speaking</NavItem>
<NavItem href="/uses">Uses</NavItem>
Expand All @@ -143,12 +163,14 @@ function DesktopNavigation(props) {
)
}


function clamp(number, a, b) {
let min = Math.min(a, b)
let max = Math.max(a, b)
return Math.min(Math.max(number, min), max)
}


function AvatarContainer({ className, ...props }) {
return (
<div
Expand All @@ -161,6 +183,7 @@ function AvatarContainer({ className, ...props }) {
)
}


function Avatar({ large = false, className, ...props }) {
return (
<Link
Expand All @@ -183,25 +206,31 @@ function Avatar({ large = false, className, ...props }) {
)
}


export function Header() {
let isHomePage = useRouter().pathname === '/'


let headerRef = useRef()
let avatarRef = useRef()
let isInitial = useRef(true)


useEffect(() => {
let downDelay = avatarRef.current?.offsetTop ?? 0
let upDelay = 64


function setProperty(property, value) {
document.documentElement.style.setProperty(property, value)
}


function removeProperty(property) {
document.documentElement.style.removeProperty(property)
}


function updateHeaderStyles() {
let { top, height } = headerRef.current.getBoundingClientRect()
let scrollY = clamp(
Expand All @@ -210,12 +239,15 @@ export function Header() {
document.body.scrollHeight - window.innerHeight
)


if (isInitial.current) {
setProperty('--header-position', 'sticky')
}


setProperty('--content-offset', `${downDelay}px`)


if (isInitial.current || scrollY < downDelay) {
setProperty('--header-height', `${downDelay + height}px`)
setProperty('--header-mb', `${-downDelay}px`)
Expand All @@ -228,6 +260,7 @@ export function Header() {
setProperty('--header-mb', `${-scrollY}px`)
}


if (top === 0 && scrollY > 0 && scrollY >= downDelay) {
setProperty('--header-inner-position', 'fixed')
removeProperty('--header-top')
Expand All @@ -239,53 +272,65 @@ export function Header() {
}
}


function updateAvatarStyles() {
if (!isHomePage) {
return
}


let fromScale = 1
let toScale = 36 / 64
let fromX = 0
let toX = 2 / 16


let scrollY = downDelay - window.scrollY


let scale = (scrollY * (fromScale - toScale)) / downDelay + toScale
scale = clamp(scale, fromScale, toScale)


let x = (scrollY * (fromX - toX)) / downDelay + toX
x = clamp(x, fromX, toX)


setProperty(
'--avatar-image-transform',
`translate3d(${x}rem, 0, 0) scale(${scale})`
)


let borderScale = 1 / (toScale / scale)
let borderX = (-toX + x) * borderScale
let borderTransform = `translate3d(${borderX}rem, 0, 0) scale(${borderScale})`


setProperty('--avatar-border-transform', borderTransform)
setProperty('--avatar-border-opacity', scale === toScale ? 1 : 0)
}


function updateStyles() {
updateHeaderStyles()
updateAvatarStyles()
isInitial.current = false
}


updateStyles()
window.addEventListener('scroll', updateStyles, { passive: true })
window.addEventListener('resize', updateStyles)


return () => {
window.removeEventListener('scroll', updateStyles, { passive: true })
window.removeEventListener('resize', updateStyles)
}
}, [isHomePage])


return (
<>
<header
Expand Down
15 changes: 6 additions & 9 deletions src/pages/posts/[slug].jsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,29 @@ import { getPost, getPosts } from "@/api/postsApi"
import { postParameters } from "@/lib/postUtilities"

export async function getStaticPaths() {
const posts = await getPosts()

const postParams = posts ? postParameters(posts) : []

const posts = await getPosts();
const postParams = posts ? postParameters(posts) : [];
return {
paths: postParams,
fallback: false,
}
}

export async function getStaticProps(context) {
const currentPost = await getPost(context.params.slug)

const currentPost = await getPost(context.params.slug);
return {
props: { post: currentPost || {} },
}
}

export default function Post({ post }) {

export default function Post({ post }) {
const meta = {
author: 'Spencer Sharp',
date: post.createdDate,
date: post.createdDate, //bug fixes
title: post.title,
description: post.body,
}
};

return (
<ArticleLayout meta={meta}>
Expand Down
Loading