diff --git a/components/Images/Logo.tsx b/components/Images/Logo.tsx index 0a7469b..3d1b662 100644 --- a/components/Images/Logo.tsx +++ b/components/Images/Logo.tsx @@ -1,29 +1,20 @@ const Logo = (props) => ( - - - - - - - - - - - - + + + + + + + + + + + + + + + + ) diff --git a/pages/_app.tsx b/pages/_app.tsx index cd17339..e66a9a7 100644 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -26,13 +26,13 @@ function MyApp({ Component, pageProps }: AppProps) { return <>
-
+
diff --git a/pages/index.tsx b/pages/index.tsx index 1b1a846..876eb48 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -13,6 +13,45 @@ import Skills from '../components/Skills'; import Projects from '../components/Projects'; import useOnScreen from '../util/hooks/useOnScreen'; +const Graphics = [ + { + name: 'Personal Logo', + src: '/img/designs/NewPersonalLogo.png', + }, + { + name: 'Old Personal Logo', + src: '/img/designs/PersonalLogo.png', + }, + { + name: 'Demo App Icon', + src: '/img/designs/AppIcon.png', + }, + { + name: 'Stryx Logo', + src: '/img/designs/Stryx.png', + }, + { + name: 'Isometric Building', + src: '/img/designs/IsometricBuilding.png', + }, + { + name: 'AmusedGrape Icon', + src: '/img/designs/Grape.png', + }, + { + name: 'New Stryx Icon', + src: '/img/designs/StryxNew.png', + }, + { + name: 'Nyxx Logo', + src: '/img/designs/Nyxx.png', + }, + { + name: 'Lunar Design Logo', + src: '/img/designs/LunarDesign.png', + }, +]; + const IndexPage = () => { const [timeString, setTimeString] = useState( (new Date().getHours() < 12 ? 'Morning' : (new Date().getHours() >= 12 && new Date().getHours() <= 17 ? 'Afternoon' : (new Date().getHours() >= 17 && new Date().getHours() <= 24 ? 'Evening' : 'Morning'))) @@ -62,22 +101,22 @@ const IndexPage = () => { { view: 'Graphics', viewing: viewingGraphics }, { view: 'Contact', viewing: viewingContact }, ]} /> -
-
-

Good {timeString}! I'm Jack Merrill.

+
+
+

Good {timeString}! I'm Jack Merrill.

-
-

A {calculateAge()} year old Graphic and UI Designer and Fullstack Developer from the Windy City.

+
+

A {calculateAge()} year old Graphic and UI Designer and Fullstack Developer from the Windy City.

-
+
- + See my Work - or + or - + Contact Me @@ -90,82 +129,52 @@ const IndexPage = () => {
-
-

My Designs

-

Here are a few designs I've made!

-
+
+

My Designs

+

Here are a few designs I've made!

+
-
- Personal Logo -
- -
- Demo App Icon -
- -
- Stryx Logo -
- -
- Comet Design -
- -
- Isometric Building Design -
- -
- Grape Logo -
- -
- New Stryx Logo -
- -
- Nyxx Logo -
- -
- Lunar Design Logo -
+ {Graphics.map((gfx) => ( +
+ {gfx.name} +
+ ))}
-

Want to contact me?

-
+

Want to contact me?

+ -
+ -
+ diff --git a/public/favicon.ico b/public/favicon.ico index be34207..d442bf2 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/public/img/FRCMS.png b/public/img/FRCMS.png deleted file mode 100644 index b9860f4..0000000 Binary files a/public/img/FRCMS.png and /dev/null differ diff --git a/public/img/Ricky.cat.png b/public/img/Ricky.cat.png deleted file mode 100644 index fadbbaf..0000000 Binary files a/public/img/Ricky.cat.png and /dev/null differ diff --git a/public/img/Snacc.chat.png b/public/img/Snacc.chat.png deleted file mode 100644 index 5d1c9ac..0000000 Binary files a/public/img/Snacc.chat.png and /dev/null differ diff --git a/public/img/Stryx.png b/public/img/Stryx.png deleted file mode 100644 index f7a8f48..0000000 Binary files a/public/img/Stryx.png and /dev/null differ diff --git a/public/img/Stryx.webp b/public/img/Stryx.webp deleted file mode 100644 index 4a951f6..0000000 Binary files a/public/img/Stryx.webp and /dev/null differ diff --git a/public/img/designs/NewPersonalLogo.png b/public/img/designs/NewPersonalLogo.png new file mode 100644 index 0000000..a38d46c Binary files /dev/null and b/public/img/designs/NewPersonalLogo.png differ