From 44b66009d4e40a2334d0fb87df4bc7f98d139dd4 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 31 Oct 2024 01:39:20 -0700 Subject: [PATCH 1/7] combine projectcard --- .vscode/c_cpp_properties.json | 14 ++++++++++++++ .vscode/settings.json | 5 +++++ src/app/page.tsx | 7 +++++++ src/components/course/layout.tsx | 29 +++++++++++++++++++++++++++-- 4 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 .vscode/c_cpp_properties.json create mode 100644 .vscode/settings.json diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json new file mode 100644 index 0000000..3228df1 --- /dev/null +++ b/.vscode/c_cpp_properties.json @@ -0,0 +1,14 @@ +{ + "configurations": [ + { + "name": "Win32", + "includePath": ["${workspaceFolder}/**"], + "defines": ["_DEBUG", "UNICODE", "_UNICODE"], + "compilerPath": "C:\\msys64\\ucrt64\\bin\\gcc.exe", + "cStandard": "c17", + "cppStandard": "gnu++17", + "intelliSenseMode": "windows-gcc-x64" + } + ], + "version": 4 +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..bb245ce --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,5 @@ +{ + "files.associations": { + "iostream": "cpp" + } +} diff --git a/src/app/page.tsx b/src/app/page.tsx index 32a2cb2..a1d9f05 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -5,6 +5,10 @@ import rectangle35 from "/public/landing/Rectangle35.webp"; import rectangle36 from "/public/landing/Rectangle36.webp"; import rectangle37 from "/public/landing/Rectangle37.webp"; import ellipse13 from "/public/landing/Ellipse13.webp"; +import ProjectCard from "@/components/home/ProjectCard"; +import backgroundImage from "/public/images/Projectshome1.webp"; +import { Layout } from "lucide-react"; +import CourseLayout from "@/components/course/layout"; const Home = () => { return ( @@ -56,6 +60,9 @@ const Home = () => { Lorem Ipsum

+
+ +
); }; diff --git a/src/components/course/layout.tsx b/src/components/course/layout.tsx index ff75078..5b5226c 100644 --- a/src/components/course/layout.tsx +++ b/src/components/course/layout.tsx @@ -1,12 +1,37 @@ +import ProjectCard from "../home/ProjectCard"; +import backgroundImage from "/public/images/Projectshome1.webp"; const CourseLayout = () => { return ( -
+
Our Projects
-
+
Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum
+
+
+ +
+
+ +
+
+ +
+
); }; From ebb77f585b0589b20abf67be9069c7f5e8bcda80 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 31 Oct 2024 01:40:07 -0700 Subject: [PATCH 2/7] Revert "combine projectcard" This reverts commit 44b66009d4e40a2334d0fb87df4bc7f98d139dd4. --- .vscode/c_cpp_properties.json | 14 -------------- .vscode/settings.json | 5 ----- src/app/page.tsx | 7 ------- src/components/course/layout.tsx | 29 ++--------------------------- 4 files changed, 2 insertions(+), 53 deletions(-) delete mode 100644 .vscode/c_cpp_properties.json delete mode 100644 .vscode/settings.json diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json deleted file mode 100644 index 3228df1..0000000 --- a/.vscode/c_cpp_properties.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "configurations": [ - { - "name": "Win32", - "includePath": ["${workspaceFolder}/**"], - "defines": ["_DEBUG", "UNICODE", "_UNICODE"], - "compilerPath": "C:\\msys64\\ucrt64\\bin\\gcc.exe", - "cStandard": "c17", - "cppStandard": "gnu++17", - "intelliSenseMode": "windows-gcc-x64" - } - ], - "version": 4 -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index bb245ce..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "files.associations": { - "iostream": "cpp" - } -} diff --git a/src/app/page.tsx b/src/app/page.tsx index a1d9f05..32a2cb2 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -5,10 +5,6 @@ import rectangle35 from "/public/landing/Rectangle35.webp"; import rectangle36 from "/public/landing/Rectangle36.webp"; import rectangle37 from "/public/landing/Rectangle37.webp"; import ellipse13 from "/public/landing/Ellipse13.webp"; -import ProjectCard from "@/components/home/ProjectCard"; -import backgroundImage from "/public/images/Projectshome1.webp"; -import { Layout } from "lucide-react"; -import CourseLayout from "@/components/course/layout"; const Home = () => { return ( @@ -60,9 +56,6 @@ const Home = () => { Lorem Ipsum

-
- -
); }; diff --git a/src/components/course/layout.tsx b/src/components/course/layout.tsx index 5b5226c..ff75078 100644 --- a/src/components/course/layout.tsx +++ b/src/components/course/layout.tsx @@ -1,37 +1,12 @@ -import ProjectCard from "../home/ProjectCard"; -import backgroundImage from "/public/images/Projectshome1.webp"; const CourseLayout = () => { return ( -
+
Our Projects
-
+
Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum
-
-
- -
-
- -
-
- -
-
); }; From ed1fc82f830499e0e088f29f46f7c72b89f6e705 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 31 Oct 2024 01:42:35 -0700 Subject: [PATCH 3/7] combine project card --- src/components/course/layout.tsx | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/components/course/layout.tsx b/src/components/course/layout.tsx index ff75078..767790f 100644 --- a/src/components/course/layout.tsx +++ b/src/components/course/layout.tsx @@ -1,12 +1,37 @@ +import ProjectCard from "../home/ProjectCard"; +import backgroundImage from "/public/images/Projectshome1.webp"; const CourseLayout = () => { return ( -
+
Our Projects
-
+
Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum
+
+
+ +
+
+ +
+
+ +
+
); }; From 8c2dd81368414cc70149918018783cdb98530ae1 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 31 Oct 2024 01:46:17 -0700 Subject: [PATCH 4/7] made project card image bottom margin responsive --- src/app/page.tsx | 4 ++++ src/components/home/ProjectCard.tsx | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index 32a2cb2..d4ec830 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -5,6 +5,7 @@ import rectangle35 from "/public/landing/Rectangle35.webp"; import rectangle36 from "/public/landing/Rectangle36.webp"; import rectangle37 from "/public/landing/Rectangle37.webp"; import ellipse13 from "/public/landing/Ellipse13.webp"; +import CourseLayout from "@/components/course/layout"; const Home = () => { return ( @@ -56,6 +57,9 @@ const Home = () => { Lorem Ipsum

+
+ +
); }; diff --git a/src/components/home/ProjectCard.tsx b/src/components/home/ProjectCard.tsx index 600bcfe..d7488a8 100644 --- a/src/components/home/ProjectCard.tsx +++ b/src/components/home/ProjectCard.tsx @@ -13,7 +13,7 @@ const ProjectCard: React.FC = ({ }) => { return (
-
+
{backgroundImage && ( {title} )} From 25b1410b8e3f36ca18fbb9fc189604b4308f8480 Mon Sep 17 00:00:00 2001 From: Daniel Lee Date: Thu, 31 Oct 2024 01:48:47 -0700 Subject: [PATCH 5/7] remove courselayout from page --- src/app/page.tsx | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index d4ec830..32a2cb2 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -5,7 +5,6 @@ import rectangle35 from "/public/landing/Rectangle35.webp"; import rectangle36 from "/public/landing/Rectangle36.webp"; import rectangle37 from "/public/landing/Rectangle37.webp"; import ellipse13 from "/public/landing/Ellipse13.webp"; -import CourseLayout from "@/components/course/layout"; const Home = () => { return ( @@ -57,9 +56,6 @@ const Home = () => { Lorem Ipsum

-
- -
); }; From b4976baa621f4b76c71021982bb9f9021c192c08 Mon Sep 17 00:00:00 2001 From: Stanley Lew Date: Sun, 3 Nov 2024 15:07:15 -0800 Subject: [PATCH 6/7] move files --- src/app/page.tsx | 63 +++---------------- src/components/home/Landing.tsx | 61 ++++++++++++++++++ .../{course/layout.tsx => home/Projects.tsx} | 8 +-- src/components/home/about.tsx | 2 +- 4 files changed, 73 insertions(+), 61 deletions(-) create mode 100644 src/components/home/Landing.tsx rename src/components/{course/layout.tsx => home/Projects.tsx} (88%) diff --git a/src/app/page.tsx b/src/app/page.tsx index 32a2cb2..afd7d66 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -1,61 +1,12 @@ -import Image from "next/image"; -import train from "/public/landing/landingpagetrain.webp"; -import path from "/public/landing/landingpagetrainpath.webp"; -import rectangle35 from "/public/landing/Rectangle35.webp"; -import rectangle36 from "/public/landing/Rectangle36.webp"; -import rectangle37 from "/public/landing/Rectangle37.webp"; -import ellipse13 from "/public/landing/Ellipse13.webp"; - +import Landing from "@/components/home/Landing"; +import About from "@/components/home/about"; +import Projects from "@/components/home/Projects"; const Home = () => { return ( -
-
-
-
-
-

LOGO

-
-
-
-
-
-
-
-
- -
- - -
- -

- DEVELOPER STATION -

-
-
-
- -
- - - -
- -
-

- Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem - Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum - Lorem Ipsum -

-
+
+ + +
); }; diff --git a/src/components/home/Landing.tsx b/src/components/home/Landing.tsx new file mode 100644 index 0000000..2d8fe9c --- /dev/null +++ b/src/components/home/Landing.tsx @@ -0,0 +1,61 @@ +import Image from "next/image"; +import train from "/public/landing/landingpagetrain.webp"; +import path from "/public/landing/landingpagetrainpath.webp"; +import rectangle35 from "/public/landing/Rectangle35.webp"; +import rectangle36 from "/public/landing/Rectangle36.webp"; +import rectangle37 from "/public/landing/Rectangle37.webp"; +import ellipse13 from "/public/landing/Ellipse13.webp"; +const Landing = () => { + return ( +
+
+
+
+

LOGO

+
+
+
+
+
+
+
+
+ +
+ + +
+ +

+ DEVELOPER STATION +

+
+
+
+ +
+ + + +
+ +
+

+ Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem + Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum + Lorem Ipsum +

+
+
+ ) +} + +export default Landing diff --git a/src/components/course/layout.tsx b/src/components/home/Projects.tsx similarity index 88% rename from src/components/course/layout.tsx rename to src/components/home/Projects.tsx index 767790f..23c834c 100644 --- a/src/components/course/layout.tsx +++ b/src/components/home/Projects.tsx @@ -1,15 +1,15 @@ import ProjectCard from "../home/ProjectCard"; import backgroundImage from "/public/images/Projectshome1.webp"; -const CourseLayout = () => { +const Projects = () => { return (
-
Our Projects
+
Our Projects
Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum
-
+
{ ); }; -export default CourseLayout; +export default Projects; diff --git a/src/components/home/about.tsx b/src/components/home/about.tsx index 9c3da06..49c211d 100644 --- a/src/components/home/about.tsx +++ b/src/components/home/about.tsx @@ -1,6 +1,6 @@ const About = () => { return ( -
+
About
"NAME"
From 7d20c68d423929fd1e50b057a93c16f81c841054 Mon Sep 17 00:00:00 2001 From: Stanley Lew Date: Sun, 3 Nov 2024 15:07:38 -0800 Subject: [PATCH 7/7] silly me i forgot to format --- src/app/page.tsx | 6 +++--- src/components/home/Landing.tsx | 6 +++--- src/components/home/Projects.tsx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/page.tsx b/src/app/page.tsx index afd7d66..b0af1f4 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -4,9 +4,9 @@ import Projects from "@/components/home/Projects"; const Home = () => { return (
- - - + + +
); }; diff --git a/src/components/home/Landing.tsx b/src/components/home/Landing.tsx index 2d8fe9c..82a8e6f 100644 --- a/src/components/home/Landing.tsx +++ b/src/components/home/Landing.tsx @@ -55,7 +55,7 @@ const Landing = () => {

- ) -} + ); +}; -export default Landing +export default Landing; diff --git a/src/components/home/Projects.tsx b/src/components/home/Projects.tsx index 23c834c..12f943b 100644 --- a/src/components/home/Projects.tsx +++ b/src/components/home/Projects.tsx @@ -3,13 +3,13 @@ import backgroundImage from "/public/images/Projectshome1.webp"; const Projects = () => { return (
-
Our Projects
+
Our Projects
Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum Lorem Ipsum
-
+