refactor: make repo linear

Lombardoc4 · Jan 17, 2024 · c1eceeb · c1eceeb
1 parent e2e35e2
commit c1eceeb
Show file tree

Hide file tree

Showing 13 changed files with 2,194 additions and 775 deletions.
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/components/Bubble.tsx b/src/components/Bubble.tsx
@@ -1,4 +1,5 @@
 import { motion } from "framer-motion";
+import React from "react";
 import { useCallback, useEffect, useRef, useState } from "react";
 import { Link } from "react-router-dom";
 

diff --git a/src/components/Button.tsx b/src/components/Button.tsx
@@ -1,3 +1,4 @@
+import React from "react"
 
 
 interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {

diff --git a/src/components/ContactForm.tsx b/src/components/ContactForm.tsx
@@ -1,30 +1,8 @@
-import { useMemo, useState } from "react";
+import React, { useState, useMemo } from "react";
+import { AlertIcon } from "../icons";
 import { SpringBubbles } from "./Bubble";
 import { Button } from "./Button";
-<<<<<<< 5532f426d62f724c3b20896f5b3e3b31b9a8e7ad
-import { FormError, StyledContactForm } from "../styledComponents/StyledContactForm";
-=======
-<<<<<<< ref
-<<<<<<< 3442e20374e84d166f54c6985e09ce6583222261
-=======
-<<<<<<< ref
-<<<<<<< ref
->>>>>>> modify file structure
-import { FormError, StyledContactForm } from "../styledComponents/StyledContactForm";
-=======
-import { FormError, StyledContactForm } from "./StyledContactForm";
->>>>>>> contact form cors
-<<<<<<< 3442e20374e84d166f54c6985e09ce6583222261
-=======
-=======
-import { FormError, StyledContactForm } from "../styledComponents/StyledContactForm";
->>>>>>> massive update for mobile and desktop styling
-=======
-import { FormError, StyledContactForm } from "./styledComponents/StyledContactForm";
->>>>>>> modify file structure
->>>>>>> modify file structure
->>>>>>> modify file structure
-import { AlertIcon } from "../icons";
+import { StyledContactForm, FormError } from "./styledComponents/StyledContactForm";
 
 
 interface ContactInfo {

diff --git a/src/layout.tsx b/src/layout.tsx
@@ -1,28 +1,7 @@
-import { Outlet, useLocation } from "react-router-dom";
-import Nav from "./components/Nav";
-<<<<<<< refactor
-import { useEffect, useLayoutEffect, useState } from "react";
-import { HorizontalBubbles } from "./components/Bubble";
-// import { VerticalBubbles } from "./components/Bubble";
-// import { useScroll } from "framer-motion";
-<<<<<<< 26a3f963309b086f5fa123423a3dbf40bc21b19b
-=======
-=======
-import { VerticalBubbles } from "./components/Bubble";
-import { useScroll } from "framer-motion";
->>>>>>> adding beta warning for desktop
-<<<<<<< 6285bddc74f3ccb8af586a38e0b292a6dd48e7b5
-=======
-=======
-// import { VerticalBubbles } from "./components/Bubble";
-// import { useScroll } from "framer-motion";
->>>>>>> commenting out unused vars
-=======
-import { useLayoutEffect } from "react";
+import React, { useLayoutEffect } from "react";
+import { useLocation, Outlet } from "react-router-dom";
 import { Footer } from "./components/Footer";
->>>>>>> massive update for mobile and desktop styling
->>>>>>> massive update for mobile and desktop styling
->>>>>>> massive update for mobile and desktop styling
+import Nav from "./components/Nav";
 
 const ScrollToTopWrapper = ({ children }: { children: React.ReactNode }) => {
     const location = useLocation();
@@ -34,115 +13,13 @@ const ScrollToTopWrapper = ({ children }: { children: React.ReactNode }) => {
 
 function Layout({children}: {children?: React.ReactNode}) {
     return (
-<<<<<<< refactor
-        <Wrapper>
-            <>
-<<<<<<< f6ebbe0476f90ba4b83bfdf01b9eb4e2ba8dc99f
-=======
-<<<<<<< refactor
-<<<<<<< 8e0d2f0db73631d2d9c28c11ebf39404db94fd4b
-=======
-<<<<<<< refactor
-<<<<<<< refactor
->>>>>>> contact form cors
->>>>>>> contact form cors
-                <div className="page-bg"/>
-=======
-                <div className='page-bg' />
->>>>>>> contact form cors
-
-                {!isMobile && (
-                    <div style={{ position: "fixed", inset: "1rem", bottom: "unset", zIndex: 1000 }}>
-                        <div
-                            className='my-1 card'
-                            style={{
-                                display: "flex",
-                                alignItems: "center",
-                                gap: "0.5rem",
-                                marginInline: "auto",
-                                width: "fit-content",
-                            }}
-                        >
-                            <svg
-                                xmlns='http://www.w3.org/2000/svg'
-                                width='20'
-                                height='20'
-                                fill='var(--color-secondary)'
-                                viewBox='0 0 16 16'
-                            >
-                                <path d='M16 8A8 8 0 1 1 0 8a8 8 0 0 1 16 0zM8 4a.905.905 0 0 0-.9.995l.35 3.507a.552.552 0 0 0 1.1 0l.35-3.507A.905.905 0 0 0 8 4zm.002 6a1 1 0 1 0 0 2 1 1 0 0 0 0-2z' />
-                            </svg>{" "}
-                            This site is currently optimized for mobile
-                        </div>
-                    </div>
-                )}
-
-                <Nav />
-                <Outlet />
-                <footer
-                    style={{
-                        paddingBlock: "1rem 6rem",
-                        color: "var(--color-white)",
-                    }}
-                >
-<<<<<<< refactor
-
-                    {/* <VerticalBubbles count={Math.floor((window.innerWidth - 200) / 2)} /> */}
-                    <div>[email protected]</div>
-                    <Link to='https://github.com/lombardoc4' className='roboto d-block'>
-                        Github
-                    </Link>
-                    <Link to='https://github.com/lombardoc4' className='roboto d-block'>
-                        View CV
-                    </Link>
-
-                    <div className='mt-1'>
-                        <h3 className='pixel'>
-                            Cris Lombardo @ {new Date().getFullYear()}
-                            <br />
-                            Based in Fort Lee, NJ
-                        </h3>
-                    </div>
-=======
-                    <HorizontalBubbles count={1} marginClass='my-4' />
-                    <div
-                        className='container'
-                        style={{
-                            display: "flex",
-                            flexDirection: "column",
-                            gap: "0.75rem",
-                        }}
-                    >
-                        {/* <VerticalBubbles count={Math.floor((window.innerWidth - 200) / 2)} /> */}
-                        <Link to='https://github.com/lombardoc4' className='roboto d-block'>
-                            Github
-                        </Link>
-                        <Link target="_blank" to='https://drive.google.com/file/d/1ewXd_Z0H8X59Kh5vYX1bnnJLVukUa4fW/view?usp=sharing' className='roboto d-block'>
-                            View CV
-                        </Link>
-                        <div>[email protected]</div>
-
-                        <div className='mt-1'>
-                            <h3 className='pixel'>
-                                Cris Lombardo @ {new Date().getFullYear()}
-                                <br />
-                                Based in Fort Lee, NJ
-                            </h3>
-                        </div>
->>>>>>> contact form cors
-                    </div>
-                </footer>
-            </>
-        </Wrapper>
-=======
         <ScrollToTopWrapper>
             <div className='page-bg' />
             <Nav />
             <Outlet />
             {children}
             <Footer />
         </ScrollToTopWrapper>
->>>>>>> massive update for mobile and desktop styling
     );
 }
 

diff --git a/src/pages/about.tsx b/src/pages/about.tsx
@@ -1,41 +1,8 @@
 import { HorizontalBubbles } from "../components/Bubble";
-<<<<<<< ref
 import WorkPage from "./work";
-import { PhotoHeader } from "./home";
-<<<<<<< 3442e20374e84d166f54c6985e09ce6583222261
-=======
-<<<<<<< ref
-<<<<<<< 5d2e24a5f0d326aa2cdfa640170c43dcc873ebed
-=======
-<<<<<<< ref
-<<<<<<< 6a8d716ec69108655a73221b499dddec74db3c72
-=======
-<<<<<<< ref
-=======
-import WorkPage from "./work/index";
 import { PhotoHeader } from "./home/PhotoHeader";
->>>>>>> init refactor
->>>>>>> init refactor
->>>>>>> init refactor
->>>>>>> init refactor
 // import { StyledHomeLink } from "../styledComponents/StyledHomePage";
-<<<<<<< ref
-import { StyledAboutContainer } from "../styledComponents/StyledAboutPage";
-<<<<<<< 3442e20374e84d166f54c6985e09ce6583222261
-=======
-=======
->>>>>>> massive update for mobile and desktop styling
-<<<<<<< 5d2e24a5f0d326aa2cdfa640170c43dcc873ebed
-=======
-=======
-import { StyledHomeLink } from "../styledComponents/StyledHomePage";
-import { StyledAboutContainer } from "../styledComponents/StyledAboutPage";
->>>>>>> final responsive touches with error page attached
-=======
 import { StyledAboutContainer } from "../components/styledComponents/StyledAboutPage";
->>>>>>> modify file structure
->>>>>>> modify file structure
->>>>>>> modify file structure
 
 function AboutPage() {
     return (

diff --git a/src/pages/art.tsx b/src/pages/art.tsx
@@ -1,37 +1,9 @@
+import { useScroll, useTransform, motion } from "framer-motion";
+import React, { Fragment, useRef, useState, useEffect } from "react";
 import { Outlet } from "react-router-dom";
-
-<<<<<<< ref
-import { IArtPiece, artLibrary } from "../artLibrary";
-<<<<<<< 2a3a6540c1aa106841fbe78f952c3e32d534ce0f
-=======
-<<<<<<< refactor
-<<<<<<< 94f7ad83ba0f29f9addff2df421c651c3e2060e9
-=======
-<<<<<<< refactor
-<<<<<<< refactor
->>>>>>> massive update for mobile and desktop styling
-=======
-import { SpringBubbles } from "../components/Bubble";
->>>>>>> remove typescript errors
->>>>>>> massive update for mobile and desktop styling
-import { Fragment } from "react";
-=======
-<<<<<<< 3442e20374e84d166f54c6985e09ce6583222261
-=======
-=======
-import { Outlet } from "react-router-dom";
-import { AnalogTitle, ArtTitle, DigitalTitle, VideoTitle } from "../main";
-import { IArtPiece, artLibrary } from "../artLibrary";
->>>>>>> massive update for mobile and desktop styling
-=======
-import { IArtPiece, ARTLIBRARY } from "../artLibrary";
->>>>>>> init refactor
->>>>>>> init refactor
-import { Fragment, useEffect, useRef, useState } from "react";
-import { StyledArtNav, StyledArtNavLink, StyledArtPiece, StyledArtPieceAsset } from "../components/styledComponents/StyledArtPage";
 import { TransitionTitle } from "../components/TransitionTitle";
-import { motion, useScroll, useTransform } from "framer-motion";
->>>>>>> massive update for mobile and desktop styling
+import { ARTLIBRARY, IArtPiece } from "../artLibrary";
+import { StyledArtNav, StyledArtNavLink, StyledArtPiece, StyledArtPieceAsset } from "../components/styledComponents/StyledArtPage";
 
 
 const AnalogTitle = () => <><span className='pixel'>A</span>n<span className='pixel'>a</span>l<span className='pixel'>o</span>g</>
Original file line number	Diff line number	Diff line change
		@@ -1,3 +1,4 @@
		import React from "react"


		interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {
Expand Down