Skip to content

Commit 2846f35

Browse files
Shikhar97Shikhar97
committed
Fixed rendering issues
1 parent 5d0bde0 commit 2846f35

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+14365
-16996
lines changed

‎.eslintrc.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"extends": "next/core-web-vitals"
3+
}

‎.new-component-config.json

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{ "lang": "ts" }

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
auto-install-peers=true

‎breakpoints.ts

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ const MIN_DESKTOP = `(min-width: ${BREAKPOINTS.desktop}px)`;
55
const MIN_LARGE_DESKTOP = `(min-width: ${BREAKPOINTS.largeDesktop}px)`;
66

77
export const MIN_WIDTH = {
8-
tablet: MIN_TABLET,
9-
desktop: MIN_DESKTOP,
10-
largeDesktop: MIN_LARGE_DESKTOP,
8+
tablet: MIN_TABLET,
9+
desktop: MIN_DESKTOP,
10+
largeDesktop: MIN_LARGE_DESKTOP,
1111
};
1212

1313
export const QUERIES = {
14-
tabletAndUp: `@media ${MIN_TABLET}`,
15-
desktopAndUp: `@media ${MIN_DESKTOP}`,
16-
largeDesktopAndUp: `@media ${MIN_LARGE_DESKTOP}`,
14+
tabletAndUp: `@media ${MIN_TABLET}`,
15+
desktopAndUp: `@media ${MIN_DESKTOP}`,
16+
largeDesktopAndUp: `@media ${MIN_LARGE_DESKTOP}`,
1717
};
1818

1919
export default BREAKPOINTS;

‎package-lock.json

+8,079-13,926
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+13-8
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
11
{
22
"name": "portfolio",
3-
"version": "0.1.0",
3+
"version": "2.1.0",
44
"private": true,
55
"scripts": {
66
"dev": "next dev",
77
"build": "next build",
88
"start": "next start",
9-
"lint": "next lint"
9+
"lint": "next lint",
10+
"nc": "new-component"
1011
},
1112
"dependencies": {
13+
"@next/third-parties": "^14.2.1",
14+
"@types/js-cookie": "^3.0.6",
1215
"@types/node": "18.14.0",
1316
"@types/react": "18.0.28",
1417
"@types/react-dom": "18.0.11",
15-
"@types/styled-components": "^5.1.26",
18+
"clsx": "^2.1.0",
1619
"eslint": "8.34.0",
17-
"eslint-config-next": "13.1.6",
20+
"eslint-config-next": "^14.2.1",
1821
"hamburger-react": "^2.5.0",
1922
"jquery": "^3.7.0",
20-
"next": "^14.1.0",
23+
"js-cookie": "^3.0.5",
24+
"next": "^14.2.1",
2125
"react": "^18.2.0",
2226
"react-dom": "^18.2.0",
2327
"react-icons": "^4.10.1",
24-
"react-intersection-observer": "^9.5.2",
28+
"react-intersection-observer": "^9.10.2",
2529
"react-parallax-tilt": "^1.7.161",
2630
"react-toggle-dark-mode": "^1.1.1",
27-
"styled-components": "^5.3.6",
31+
"styled-components": "^6.1.11",
2832
"typescript": "4.9.5"
2933
},
3034
"devDependencies": {
31-
"@types/gtag.js": "^0.0.19"
35+
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
36+
"new-component": "^5.0.2"
3237
}
3338
}

‎public/images/shikhar.jpeg

1.24 MB
Loading

‎src/app/layout.tsx

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
import "../styles/global.css";
2+
import "../styles/reset.css";
3+
import { GoogleAnalytics } from "@next/third-parties/google";
4+
import { ThemeProvider } from "@/context/ThemeContext";
5+
import { Metadata } from "next";
6+
import { cookies } from "next/headers";
7+
import { DARK_COLORS, LIGHT_COLORS } from "theme";
8+
9+
export const metadata: Metadata = {
10+
title: "Shikhar Gupta | Computer Science Graduate Student | Software Developer | Cloud Engineer | ML Engineer",
11+
description:
12+
"Shikhar Gupta is a Computer Science Graduate Student at Arizona State University, who loves learning new things.",
13+
openGraph: {
14+
type: "website",
15+
locale: "en_US",
16+
url: "https://shikhar97.github.io/",
17+
title: "Shikhar Gupta | Computer Science Graduate Student | Software Developer | Cloud Engineer | ML Engineer",
18+
images: ["https://ogcdn.net/e4b8c678-7bd5-445d-ba03-bfaad510c686/v3/shikhar97.github.io/Shikhar%20Gupta%20%7C%20Computer%20Science%20Graduate%20Student%20%7C%20Software%20Developer%20%7C%20Cloud%20Engineer%20%7C%20ML%20Engineer/https%3A%2F%2Fopengraph.b-cdn.net%2Fproduction%2Fdocuments%2F4c58f7e1-8524-4c7b-a5c3-305cdb16dc61.jpg%3Ftoken%3D2dK5g8ViJZYACO--guzL6sOi3xKQpg77X0m6yX6NzSo%26height%3D513%26width%3D1200%26expires%3D33244548259/og.png"],
19+
},
20+
};
21+
22+
function RootLayout({ children }: { children: React.ReactNode }) {
23+
const theme = cookies().get("color-theme")?.value ?? "light";
24+
const themeColors = theme === "light" ? LIGHT_COLORS : DARK_COLORS;
25+
26+
return (
27+
<html
28+
lang="en"
29+
suppressHydrationWarning
30+
className="bg-neutral-900"
31+
data-color-theme={theme}
32+
//@ts-ignore
33+
style={themeColors}
34+
>
35+
<GoogleAnalytics gaId="G-JJBG91P2EL" />
36+
<body>
37+
<ThemeProvider initialTheme={theme}>{children}</ThemeProvider>
38+
</body>
39+
</html>
40+
);
41+
}
42+
43+
export default RootLayout;

‎src/app/page.tsx

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
import Home from "@/components/Home";
2+
3+
const HomePage = () => {
4+
return <Home />;
5+
};
6+
7+
export default HomePage;

‎src/pages/resume.tsx renamed to ‎src/app/resume/page.tsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1+
"use client"
12
import PDFViewer from '@/components/PDFViewer';
23
import PDFJSBackend from '@/backends/pdfjs';
34
import {useEffect, useState} from "react";
4-
import {DARK_THEME, LIGHT_THEME} from "../../theme";
5+
import {DARK_THEME, LIGHT_THEME} from "../../../theme";
56

67

78
export default function Resume() {
8-
const [theme, setTheme] = useState<"light" | "dark">("light");
9+
const [theme, setTheme] = useState<"light" | "dark">("dark");
910
const toggleTheme = () => {
1011
setTheme(theme === "light" ? "dark" : "light");
1112
};

‎src/components/About/About.module.css

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
.about {
2+
display: grid;
3+
padding: 32px;
4+
padding-bottom: 0px;
5+
row-gap: 80px;
6+
grid-template-areas:
7+
"aboutme"
8+
"picture";
9+
}
10+
11+
.aboutme {
12+
grid-area: aboutme;
13+
display: flex;
14+
flex-direction: column;
15+
gap: 16px;
16+
}
17+
18+
.description {
19+
font-weight: 400;
20+
}
21+
22+
.picture {
23+
grid-area: picture;
24+
justify-self: center;
25+
width: 300px;
26+
}
27+
28+
.download {
29+
align-self: start;
30+
margin-top: 32px;
31+
}
32+
33+
@media (min-width: 768px) {
34+
.about {
35+
grid-template-areas: "picture aboutme";
36+
grid-template-columns: 1fr 1fr;
37+
column-gap: 0px;
38+
padding: 64px;
39+
}
40+
41+
.aboutme {
42+
justify-self: start;
43+
max-width: min(400px, 100%);
44+
}
45+
46+
.picture {
47+
width: min(50vw, 250px);
48+
}
49+
}
50+
51+
@media (min-width: 1024px) {
52+
.about {
53+
column-gap: 80px;
54+
padding-bottom: 0px;
55+
}
56+
57+
.picture {
58+
justify-self: end;
59+
width: min(50vw, 500px);
60+
}
61+
}

0 commit comments

Comments
 (0)