Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/types/react-18.2.53
Browse files Browse the repository at this point in the history
  • Loading branch information
firehawk89 authored Feb 8, 2024
2 parents 6b8e151 + 87d7fcf commit 6068428
Show file tree
Hide file tree
Showing 38 changed files with 857 additions and 91 deletions.
7 changes: 7 additions & 0 deletions content/projects/itour.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: 'iTour'
image: '/iTour.jpg'
technologies: ['JavaScript', 'React', 'Next.js', 'TailwindCSS', 'i18n']
---

iTour project info goes here
7 changes: 7 additions & 0 deletions content/projects/skauna.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
title: 'Skauna'
image: '/Skauna.jpg'
technologies: ['HTML', 'CSS', 'JavaScript']
---

Skauna project info goes here
155 changes: 153 additions & 2 deletions package-lock.json

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

9 changes: 8 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,21 @@
"prepare": "husky install"
},
"dependencies": {
"@emailjs/nodejs": "^2.2.0",
"@hookform/resolvers": "^3.3.4",
"class-variance-authority": "^0.7.0",
"clsx": "^2.1.0",
"gray-matter": "^4.0.3",
"marked": "^12.0.0",
"next": "14.1.0",
"next-themes": "^0.2.1",
"react": "^18",
"react-dom": "^18",
"react-hook-form": "^7.50.1",
"react-icons": "^5.0.1",
"tailwind-merge": "^2.2.1"
"sonner": "^1.4.0",
"tailwind-merge": "^2.2.1",
"zod": "^3.22.4"
},
"devDependencies": {
"@types/node": "^20",
Expand Down
5 changes: 4 additions & 1 deletion project-words.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,7 @@ raleway
Bochkovskyi
clsx
Nextdotjs
Tailwindcss
Tailwindcss
Skauna
hookform
sonner
Binary file not shown.
Binary file added public/Skauna.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/iTour.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion public/next.svg

This file was deleted.

1 change: 0 additions & 1 deletion public/vercel.svg

This file was deleted.

37 changes: 37 additions & 0 deletions src/app/actions.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
'use server'

import { ContactFormInputs, ContactFormSchema } from '@/utils'
import emailjs, { EmailJSResponseStatus } from '@emailjs/nodejs'

export const sendEmail = async (data: ContactFormInputs) => {
const dataParseResult = ContactFormSchema.safeParse(data)

if (dataParseResult.success) {
const parsedData = dataParseResult.data

try {
const response = await emailjs.send(
process.env.EMAILJS_SERVICE_ID!,
process.env.EMAILJS_TEMPLATE_ID!,
parsedData,
{
privateKey: process.env.EMAILJS_PRIVATE_KEY!,
publicKey: process.env.EMAILJS_PUBLIC_KEY!,
}
)

return { message: response.text, success: true }
} catch (error) {
if (error instanceof EmailJSResponseStatus) {
return { message: error.text, success: false }
}
}
}

if (!dataParseResult.success) {
return {
message: JSON.stringify(dataParseResult.error.format()),
success: false,
}
}
}
6 changes: 5 additions & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
import About from '@/components/sections/about'
import Contact from '@/components/sections/contact/contact'
import Hero from '@/components/sections/hero/hero'
import Projects from '@/components/sections/projects/projects'

export default function Home() {
return (
<>
<Hero />
<About />
<About className="py-16 md:py-24" id="about-me" />
<Projects className="py-16 md:py-24" id="my-projects" />
<Contact className="py-16 md:py-24" id="contact-me" />
</>
)
}
2 changes: 1 addition & 1 deletion src/components/header/header-navbar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const HeaderNavbar: FC<HeaderNavbarProps> = ({ className }) => {
orientation={isMobile ? 'vertical' : 'horizontal'}
>
<MenuItem href="/#about-me">About Me</MenuItem>
<MenuItem href="/#my-projects">My Work</MenuItem>
<MenuItem href="/#my-projects">My Projects</MenuItem>
<MenuItem href="/#contact-me">Contact Me</MenuItem>
</Menu>
<Socials className="mt-6 justify-center md:hidden" />
Expand Down
2 changes: 1 addition & 1 deletion src/components/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const Header: FC<HeaderProps> = ({ className }) => {
>
<HeaderNavbar />
<div className="relative z-30 flex items-center justify-between md:static">
<ThemeToggler className="-m-2 md:absolute md:right-10 md:top-1/2 md:m-0 md:-translate-y-1/2" />
<ThemeToggler className="-mx-5 -my-2 md:absolute md:right-5 md:top-1/2 md:m-0 md:-translate-y-1/2" />
<MenuIcon className="md:hidden" />
</div>
</header>
Expand Down
Loading

0 comments on commit 6068428

Please sign in to comment.