Skip to content

Commit

Permalink
Merge branch 'hotfix/v2.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
gillyhuga committed May 20, 2023
2 parents deea487 + ff1b1a8 commit 5da8ca9
Show file tree
Hide file tree
Showing 19 changed files with 552 additions and 102 deletions.
147 changes: 78 additions & 69 deletions components/common/NavigationBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,85 +34,94 @@ const menu = [
const Navbar = ({ router }: any) => {
return (
<Popover className="fixed inset-x-0 top-0 flex flex-row z-50 justify-between bg-clip-padding backdrop-filter bg-opacity-30 border-b dark:border-transparent backdrop-blur-md">
<div className="w-screen max-w-7xl mx-auto px-4 sm:px-6">
<div className="flex justify-between items-center py-3 md:justify-start md:space-x-10">
<div className="flex justify-start lg:w-0 lg:flex-1">
<Link href="/" className="h-8 w-auto sm:h-10">
<Image
src={logo}
alt="Gilly"
width={40}
height={40}
/>
</Link>
</div>
<div className="-mr-2 -my-2 md:hidden">
<Popover.Button className="bg-white dark:bg-gray-900 bg-opacity-50 rounded-md p-2 inline-flex items-center justify-center hover:text-gray-500 hover:bg-gray-100 ">
<HiOutlineDotsHorizontal className="h-6 w-6" aria-hidden="true" />
</Popover.Button>
</div>
<div className="hidden md:flex items-center justify-end md:flex-1 lg:w-0 space-x-4">
{menu.map((item) => (
<Link legacyBehavior
key={item.name}
href={item.href}
>
<a className={"rounded-lg px-3 py-2 text-base dark:text-white font-medium hover:bg-opacity-50 hover:bg-white hover:text-primary" + `${router.asPath.match(item.href) ? 'text-primary dark:text-white underline underline-offset-[6px] decoration-[3px] decoration-primary' : ''}`}>{item.name}</a>
</Link>
))}
<ThemeChanger />
</div>
</div>
</div>

<Transition
as={Fragment}
enter="duration-200 ease-out"
enterFrom="opacity-0 scale-95"
enterTo="opacity-100 scale-100"
leave="duration-100 ease-in"
leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"
>
<Popover.Panel className="absolute top-0 inset-x-0 p-2 transition transform origin-top-right md:hidden">
<div className="rounded-lg shadow-lg bg-white dark:bg-gray-900 divide-y-2 divide-gray-50">
<div className="pt-5 pb-6 px-5">
<div className="flex items-center justify-between">
<div>
{({ open }) => (
<>
<div className="w-screen max-w-7xl mx-auto px-4 sm:px-6">
<div className="flex justify-between items-center py-3 md:justify-start md:space-x-10">
<div className="flex justify-start lg:w-0 lg:flex-1">
<Link href="/" className="h-8 w-auto sm:h-10">
<Image
className="h-8 w-auto"
src={logo}
alt="G for Gilly"
alt="Gilly"
width={40}
height={40}
/>
</div>
<div className="-mr-2">
<div className="bg-white dark:bg-gray-900 rounded-md p-2 inline-flex items-center justify-center hover:bg-gray-100 hover:dark:bg-gray-800">
<ThemeChanger />
</div>
</div>
</Link>
</div>
<div className="mt-6">
<nav className="grid gap-y-2">
{menu.map((item) => (
<Link legacyBehavior
key={item.name}
href={item.href}
>
<a className={"p-3 flex items-center rounded-md bg-white dark:bg-gray-900 hover:bg-gray-100 hover:dark:bg-gray-800" + `${router.asPath.match(item.href) ? ' bg-gray-100 dark:bg-gray-800' : ''}`}>
<item.icon className="flex-shrink-0 h-6 w-6 text-primary" aria-hidden="true" />
<span className="ml-3 text-base font-medium dark:text-white">{item.name}</span>
</a>
</Link>
))}
</nav>
<div className="-mr-2 -my-2 md:hidden">
<Popover.Button className="bg-white dark:bg-gray-900 bg-opacity-50 rounded-md p-2 inline-flex items-center justify-center hover:text-gray-500 hover:bg-gray-100 ">
<HiOutlineDotsHorizontal className="h-6 w-6" aria-hidden="true" />
</Popover.Button>
</div>
<div className="hidden md:flex items-center justify-end md:flex-1 lg:w-0 space-x-4">
{menu.map((item) => (
<Link legacyBehavior
key={item.name}
href={item.href}
>
<a className={"rounded-lg px-3 py-2 text-base dark:text-white font-medium hover:bg-opacity-50 hover:bg-white hover:text-primary" + `${router.asPath.match(item.href) ? 'text-primary dark:text-white underline underline-offset-[6px] decoration-[3px] decoration-primary' : ''}`}>{item.name}</a>
</Link>
))}
<ThemeChanger />
</div>
</div>
</div>
</Popover.Panel>
</Transition>

<Transition
as={Fragment}
enter="duration-200 ease-out"
enterFrom="opacity-0 scale-95"
enterTo="opacity-100 scale-100"
leave="duration-100 ease-in"
leaveFrom="opacity-100 scale-100"
leaveTo="opacity-0 scale-95"
>
<Popover.Panel className="absolute top-0 inset-x-0 p-2 transition transform origin-top-right md:hidden">
{({ close }) => (
<div className="rounded-lg shadow-lg bg-white dark:bg-gray-900 divide-y-2 divide-gray-50">
<div className="pt-5 pb-6 px-5">
<div className="flex items-center justify-between">
<div>
<Image
className="h-8 w-auto"
src={logo}
alt="G for Gilly"
width={40}
height={40}
/>
</div>
<div className="-mr-2">
<div className="bg-white dark:bg-gray-900 rounded-md p-2 inline-flex items-center justify-center hover:bg-gray-100 hover:dark:bg-gray-800">
<ThemeChanger />
</div>
</div>
</div>
<div className="mt-6">
<nav className="grid gap-y-2">

{menu.map((item) => (
<Link legacyBehavior
key={item.name}
href={item.href}
>
<a onClick={() => close()} className={"p-3 flex items-center rounded-md bg-white dark:bg-gray-900 hover:bg-gray-100 hover:dark:bg-gray-800" + `${router.asPath.match(item.href) ? ' bg-gray-100 dark:bg-gray-800' : ''}`}>
<item.icon className="flex-shrink-0 h-6 w-6 text-primary" aria-hidden="true" />
<span className="ml-3 text-base font-medium dark:text-white">{item.name}</span>
</a>
</Link>
))}
</nav>
</div>
</div>
</div>
)}
</Popover.Panel>
</Transition>
</>
)}
</Popover>


)
}

Expand Down
8 changes: 4 additions & 4 deletions components/pages/about/AboutMe/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ const AboutMe = () => {
<h1 className="text-3xl py-5">
<RoughNotation type="underline" show strokeWidth={2} padding={2} color="#999999">About</RoughNotation>
</h1>
<p>
<p className="text-secondary dark:prose-dark">
Experienced in software engineering, especially in frontend engineer field, based in <a className='underline hover:no-underline font-semibold' href='https://www.google.com/search?q=Malang' target="_blank" rel="noopener noreferrer">Malang, Indonesia</a>.
I am currently continuing my 7th semester of Informatics majoring at the <a className='underline hover:no-underline font-semibold' href='https://umm.ac.id/' target="_blank" rel="noopener noreferrer">University Muhammadiyah Malang</a>. I have been programming from high school through college to learn about software engineering. I enjoy writing HTML, CSS, Javascript/Typescript, and React.
I am currently study in <a className='underline hover:no-underline font-semibold' href='https://umm.ac.id/' target="_blank" rel="noopener noreferrer">University Muhammadiyah Malang</a> with Bachelor&apos;s degree in Informatics (Computer Science). I have been programming from high school through college to learn about software engineering. I enjoy writing HTML, CSS, Javascript/Typescript, and React.
</p>
<p className="pt-5">
<p className="pt-5 text-secondary dark:prose-dark">
I love exploring everything related to technology. When i was in college i join many community and orgs to expand my knowledge, I&apos;m member of <a className='underline hover:no-underline font-semibold' href='https://infotech.umm.ac.id/' target="_blank" rel="noopener noreferrer">Infotech UMM</a> , part of Information Systems Division, and I&apos;m the <a className='underline hover:no-underline font-semibold' href='https://infotech.umm.ac.id/simutu/asisten/profile/MjAxOTEwMzcwMzExMzM2' target="_blank" rel="noopener noreferrer">Laboratory Assistant</a> of <a className='underline hover:no-underline font-semibold' href='https://infotech.umm.ac.id/' target="_blank" rel="noopener noreferrer">Informatics Laboratory UMM</a>.
</p>
<p className="pt-5">
<p className="pt-5 text-secondary dark:prose-dark">
When I&apos;m not in front of a computer screen, I&apos;m probably playing and <a className='underline hover:no-underline font-semibold' href='https://open.spotify.com/user/312tbfzm3r2i2eqeiurzp2uajpyy' target="_blank" rel="noopener noreferrer">listening music</a>.
</p>
</div>
Expand Down
4 changes: 2 additions & 2 deletions components/pages/about/Contact/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ const Contact = () => {
<h1 className="text-3xl py-5">
<RoughNotation type="underline" show strokeWidth={2} padding={2} color="#999999">Contact</RoughNotation>
</h1>
<p>
<p className="text-secondary dark:prose-dark">
Want to talk about technology related project or just drink something tasty together?
</p>
<p className="pt-5">
<p className="pt-5 text-secondary dark:prose-dark">
If yes, please don&apos;t be shy and just reach me at <a className='underline hover:no-underline font-semibold' href='mailto:[email protected]'>[email protected]</a>. Anyway, thanks for visiting my profile :)
</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions components/pages/blog/Card/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const BlogCard = ({ body, slug }: BlogType): JSX.Element => {
return (
<Link legacyBehavior href={`/blog/` + slug}>
<a className="w-full transform duration-300 border-gray-200 dark:border-gray-200 shadow-md overflow-hidden rounded-2xl hover:-translate-y-1 active:translate-y-0 active:scale-95">
<div className="flex flex-col h-full p-4 dark:bg-sky-500/5 bg-grey/10">
<div className="flex flex-col h-full p-4 dark:bg-gray-900 bg-grey/10">
<div className="flex rounded-lg overflow-hidden relative mb-3">
<div className="absolute top-2 right-2 z-10">
<div className="flex items-center bg-gray-700/60 px-2 py-1 rounded-md">
Expand All @@ -21,8 +21,8 @@ const BlogCard = ({ body, slug }: BlogType): JSX.Element => {
<Image
src={image ? image : "/images/no-thumbnail.png"}
alt={title}
fill
placeholder="blur"
height={400}
width={400}
blurDataURL={image ? image : "/images/no-thumbnail.png"}
priority
/>
Expand All @@ -31,7 +31,7 @@ const BlogCard = ({ body, slug }: BlogType): JSX.Element => {
<p className="text-2xl font-medium underline hover:no-underline underline-offset-1 dark:text-white">
{title}
</p>
<p className="text-base text-justify mb-auto mt-1">
<p className="text-base text-justify mb-auto mt-1 dark:prose-dark">
{description}
</p>
</div>
Expand Down
8 changes: 4 additions & 4 deletions components/pages/works/ProjectList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ function Projects({ offset, selectedTag, dataProjects }: ProjectsProps) {
>
{name}
</a>
<p className="text-left line-clamp-3">
<p className="text-left line-clamp-3 text-base dark:prose-dark">
{description}
</p>
<a
href={url}
className="bg-primary/5 rounded-full py-3 px-4 text-sm inline-block whitespace-nowrap my-2 w-full max-w-[335px] overflow-hidden text-ellipsis"
className="bg-primary/5 dark:bg-gray-900 rounded-lg py-3 px-4 text-sm inline-block whitespace-nowrap my-2 w-full max-w-[335px] overflow-hidden text-ellipsis"
target="_blank"
rel="noreferrer noopener"
title={`Open ${name} in new tab`}
Expand All @@ -60,7 +60,7 @@ function Projects({ offset, selectedTag, dataProjects }: ProjectsProps) {
const isSelected = selectedTag && selectedTag.toLowerCase() === tag.toLowerCase();

return (
<span key={idx} className={`py-2 px-4 select-none rounded bg-primary/5 text-sm font-medium ${isSelected ? "active" : ""}`}>
<span key={idx} className={`py-2 px-4 select-none rounded-lg dark:bg-gray-900 bg-primary/5 text-sm font-medium ${isSelected ? "active" : ""}`}>
{tag}
</span>
);
Expand All @@ -83,7 +83,7 @@ function Projects({ offset, selectedTag, dataProjects }: ProjectsProps) {
<Image
alt={name}
src={image}
className="w-full h-52 sm:w-[350px] sm:h-[350px]"
className="w-full h-52 sm:w-[350px] sm:h-[350px] "
/>
</div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion components/pages/works/SkeletonList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ const SkeletonCard = ({ visible }: SkeletonProps): JSX.Element => {
<Skeleton height={35} width={90} />
</div>
</div>
<div className="w-full flex-1 sm:max-w-[350px] mb-4 sm:mb-0 rounded overflow-hidden relative group">
<div className="w-full flex-1 sm:max-w-[350px] mb-4 sm:mb-0 rounded-lg overflow-hidden relative group">
<Skeleton className="w-full h-52 sm:w-[350px] sm:h-[350px] rounded-lg bg-white " />
</div>
</li>
Expand Down
2 changes: 1 addition & 1 deletion pages/about.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const About = (): JSX.Element => {
return (
<Layout>
<div className=" pt-28 pb-4 w-full text-lg">
<div className="whitespace-pre-line sm:mx-0 text-4xl md:text-5xl xl:text-8xl" >
<div className="whitespace-pre-line font-semibold sm:mx-0 text-4xl md:text-5xl xl:text-8xl" >
<RoughNotation type="underline" show strokeWidth={2} padding={2} color="#999999">Gilly Huga Anargya</RoughNotation>
</div>
<AboutMe />
Expand Down
Loading

1 comment on commit 5da8ca9

@vercel
Copy link

@vercel vercel bot commented on 5da8ca9 May 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.