Skip to content

Commit a5f9bc2

Browse files
committed
updated build to deploy
1 parent d4802be commit a5f9bc2

File tree

12 files changed

+58
-62
lines changed

12 files changed

+58
-62
lines changed

animations.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,21 @@ export const stagger = {
2020
};
2121

2222
export const routeFade = {
23-
hidden: {
24-
opacity: 0,
25-
},
26-
visible: {
27-
opacity: 1,
28-
transition: {
29-
delay: 0.3,
30-
duration: 0.1,
31-
},
23+
hidden: {
24+
opacity: 0,
25+
},
26+
visible: {
27+
opacity: 1,
28+
transition: {
29+
delay: 0.1,
30+
duration: 0.1,
3231
},
33-
exit: {
34-
opacity: 0,
35-
transition: {
36-
delay: 0.3,
37-
ease: 'easeInOut',
38-
},
32+
},
33+
exit: {
34+
opacity: 0,
35+
transition: {
36+
delay: 0.1,
37+
ease: "easeInOut",
3938
},
40-
}
39+
},
40+
};

components/Bar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { FunctionComponent } from "react"
2-
import { languages, iSkill } from "../type"
2+
import { iSkill } from "../type"
33
import { motion } from "framer-motion"
44

55

6-
const Bar: FunctionComponent<{ value: iSkill }> = ({
6+
const Bar: FunctionComponent<{ data: iSkill }> = ({
77
data: { Icon, level, name },
88
}) => {
99
const bar_width = `${level}%`;

components/Navbar.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { useState, useEffect } from 'react'
2+
import { FunctionComponent } from 'react'
23

34
import Link from 'next/link';
45
import {useRouter} from 'next/router'
56

67

8+
79
const NavItem: FunctionComponent<{
810
activeItem:string,
911
setActiveItem:Function,
@@ -34,8 +36,9 @@ export default function Navbar() {
3436

3537
return (
3638
<div className="flex justify-between px-5 py-3 my-3">
37-
<span className="text-xl font-bold text-purple border-b-4 border-grey md:text-2xl">{activeItem}</span>
39+
<span className="text-xl font-bold border-b-4 text-purple border-grey md:text-2xl">{activeItem}</span>
3840
<div className='flex space-x-5 text-lg'>
41+
3942
<NavItem activeItem={activeItem} setActiveItem={setActiveItem} name="About" route='/'/>
4043
<NavItem activeItem={activeItem} setActiveItem={setActiveItem} name="Projects" route='/projects'/>
4144
<NavItem activeItem={activeItem} setActiveItem={setActiveItem} name="Resume" route='/resume'/>

components/ProjectCard.tsx

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ const ProjectCard: FunctionComponent<{
4646

4747
{showDetail === id && (
4848

49-
<div className="absolute top-0 left-0 z-10 grid w-full h-auto p-2 md:p-10 text-black bg-gray-100
50-
md:grid-cols-2 gap-x-12 dark:text-white dark:bg-dark-100 rounded-lg"
49+
<div className="absolute top-0 left-0 z-10 grid w-full h-auto p-2 text-black bg-gray-100 rounded-lg md:p-10 md:grid-cols-2 gap-x-12 dark:text-white dark:bg-dark-100"
5150
>
5251
<motion.div variants={stagger} initial="initial" animate="animate">
5352
{/* <img src={image_path} alt={name} /> */}
@@ -64,9 +63,6 @@ const ProjectCard: FunctionComponent<{
6463
<a href={github_url} className="flex items-center px-4 py-2 space-x-3 text-lg bg-gray-300 dark:bg-dark-800">
6564
<AiFillGithub /> <span>Github</span>
6665
</a>
67-
<a href={deployed_url} className="flex items-center px-4 py-2 space-x-3 text-lg bg-gray-300 dark:bg-dark-800">
68-
<AiFillProject /> <span>Project</span>
69-
</a>
7066
</motion.div>
7167
</motion.div>
7268

@@ -77,7 +73,7 @@ const ProjectCard: FunctionComponent<{
7773
{key_techs.map((tech) => (
7874
<span
7975
key={tech}
80-
className="px-2 py-1 my-1 bg-gray-300 dark:bg-dark-800 rounded-sm"
76+
className="px-2 py-1 my-1 bg-gray-300 rounded-sm dark:bg-dark-800"
8177
>
8278
{tech}
8379
</span>
@@ -87,7 +83,7 @@ const ProjectCard: FunctionComponent<{
8783

8884
<button onClick={()=>setShowDetail(null)}
8985

90-
className="absolute top-3 right-3 rounded-full p-1 focus:outline-none bg-gray-200 dark:bg-dark-200">
86+
className="absolute p-1 bg-gray-300 rounded-full top-3 right-3 focus:outline-none dark:bg-gray-700">
9187
<MdClose size={30}/>
9288
</button>
9389
</div>

components/ProjectsNavbar.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Category } from "../types"
1+
import { Category } from "../type"
22
import { FunctionComponent} from "react"
33

44
export const NavItem:FunctionComponent<{
@@ -22,7 +22,7 @@ export const NavItem:FunctionComponent<{
2222

2323
const ProjectsNavbar: FunctionComponent<{handlerFilterCategory:Function, active:string}> = (props) => {
2424
return (
25-
<div className="flex px-3 py-2 space-x-3 overflow-x-auto list-none font-bold">
25+
<div className="flex px-3 py-2 space-x-3 overflow-x-auto font-bold list-none">
2626
<NavItem value = "all" {...props}/>
2727
<NavItem value = "React" {...props}/>
2828
<NavItem value = "jQuery" {...props}/>

components/Resume.tsx

Whitespace-only changes.

components/Sidebar.tsx

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react'
22
import {AiFillGithub, AiFillLinkedin, AiFillYoutube} from 'react-icons/ai'
33
import {GoLocation} from 'react-icons/go'
4-
import {RiDownloadFill} from 'react-icons/Ri'
4+
import { GiTie } from "react-icons/gi";
55
import { useTheme} from 'next-themes'
66

77
import Image from 'next/image'
@@ -19,7 +19,7 @@ export default function Sidebar() {
1919
<Image
2020
src="https://avatars.githubusercontent.com/u/43428818?v=4"
2121
alt="user avatar"
22-
className="w-32 h-32 mx-auto rounded-full"
22+
className="mx-auto border rounded-full "
2323
height='128px'
2424
width="128px"
2525
layout="intrinsic"
@@ -29,23 +29,20 @@ export default function Sidebar() {
2929
<span className="text-purple">Adam </span>
3030
Mohammed
3131
</h3>
32-
<p className="px-2 py-1 my-3 bg-gray-200 rounded-full dark:bg-dark-700 dark:bg-black-500">
32+
<p className="px-2 py-2 my-3 bg-gray-200 rounded-full dark:bg-dark-700 dark:bg-black-500">
3333
Full Stack Developer
3434
</p>
3535
<a
36-
className="flex items-center justify-center px-2 py-1 my-3 bg-gray-200 rounded-full cursor-pointer dark:bg-dark-700 dark:bg-black-500"
36+
className="flex items-center justify-center px-2 py-2 my-3 bg-gray-200 rounded-full cursor-pointer dark:bg-dark-700 dark:bg-black-500"
3737
href="https://www.canva.com/design/DAEaJQFqN9Q/3SN6eAmM0wpp-S4-WxUCyw/view?utm_content=DAEaJQFqN9Q&utm_campaign=designshare&utm_medium=link&utm_source=publishsharelink"
3838
download="Adam Resume">
39-
<RiDownloadFill className="w-6 h-6 mr-2"/>Resume
39+
<GiTie className="w-6 h-6 mr-2"/>Resume
4040
</a>
41-
<div className="flex justify-around w-9/12 mx-auto my-5 text-blue-500 md:w-full">
42-
<a href="">
43-
<AiFillYoutube className="w-8 h-8 cursor-pointer"/>
44-
</a>
45-
<a href="">
41+
<div className="flex justify-around w-6/12 mx-auto my-5 text-blue-500 md:w-full">
42+
<a href="https://github.com/adamm13">
4643
<AiFillGithub className="w-8 h-8 cursor-pointer"/>
4744
</a>
48-
<a href="">
45+
<a href="https://www.linkedin.com/in/adamm13/">
4946
<AiFillLinkedin className="w-8 h-8 cursor-pointer"/>
5047
</a>
5148
</div>

data.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ export const services: iService[] = [
3333
Icon: AiOutlineAntDesign,
3434
title: "UI/UX designer",
3535
about:
36-
"Builds robust user interfaces using <b>Figma</b> and <b>Framer</b> ",
36+
"Builds robust user interfaces using <b>Figma</b> ",
3737
},
3838
{
3939
Icon: RiComputerLine,
4040
title: "Software Expert",
4141
about:
42-
"Proficient in both Office and Adobe suite of products.",
42+
"Proficient in both <b>Office</b> and <b>Adobe</b> suite of products.",
4343
},
4444
];
4545

@@ -185,7 +185,7 @@ export const projects: iProject[] = [
185185
{
186186
id: 7,
187187
name: "Weather App",
188-
image_path: "/images/logo.png",
188+
image_path: "/images/cold-bg.jpeg",
189189
deployed_url: "https://www.google.ca/",
190190
github_url: "https://github.com/adamm13/weather-app",
191191
category: ["React"],

pages/_app.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ function MyApp({ Component, pageProps, router }) {
99
return (
1010
<ThemeProvider attribute="class">
1111
<div className="grid grid-cols-12 gap-6 px-5 lg:px-48 my-14 sm:px-20 md:pc-32">
12-
<div className="col-span-12 p-4 text-center bg-white dark:bg-dark-500 lg:col-span-3 rounded-2xl shadow-custom-light dark:shadow-custom-dark">
12+
<div className="col-span-12 p-5 text-center bg-white dark:bg-dark-500 lg:col-span-3 rounded-2xl shadow-custom-light dark:shadow-custom-dark">
1313
<Sidebar/>
1414
</div>
1515
<div className="flex flex-col col-span-12 overflow-hidden bg-white lg:col-span-9 rounded-2xl dark:bg-dark-500 dark:text-white shadow-custom-light dark:shadow-custom-dark">

pages/index.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { services } from '../data'
44
import { fadeInUp, stagger, routeFade } from "../animations";
55
import { motion } from "framer-motion";
66

7-
const index = () => {
7+
const About = () => {
88
// console.log('CLIENT:', services) <-----client dom side rendering
99

1010
return (
@@ -32,7 +32,7 @@ const index = () => {
3232
>
3333
{services.map(service => (
3434
<motion.div
35-
className="bg-gray-200 rounded-lg dark:bg-dark-200 lg:col-span-1 "
35+
className="py-2 bg-gray-200 rounded-lg dark:bg-gray-900 lg:col-span-1 "
3636
key={service.title}
3737
variants={fadeInUp}
3838
>
@@ -45,22 +45,22 @@ const index = () => {
4545
)
4646
}
4747

48-
export default index;
48+
export default About;
4949

50-
// export const getServerSideProps = async (
51-
// context:GetServerSidePropsContext
52-
// ) => {
53-
// // calculation
54-
55-
// const res = await fetch('http://localhost:3000/api/services')
56-
// const data = await res.json()
50+
export const getServerSideProps = async (
51+
context:GetServerSidePropsContext
52+
) => {
53+
// calculation
5754

58-
// return {
59-
// props:{
60-
// services: data.services,
61-
// }
62-
// }
63-
// }
55+
const res = await fetch(`${process.env.VERCEL_URL}/api/services`)
56+
const data = await res.json()
57+
console.log(services)
58+
return {
59+
props:{
60+
services: data.services,
61+
}
62+
}
63+
}
6464

6565
// export const getStaticProps = async (
6666
// context:GetStaticPropsContext

0 commit comments

Comments
 (0)