Skip to content

Commit

Permalink
Merge pull request #50 from Sagargupta16/44-contact-me-form-validation
Browse files Browse the repository at this point in the history
Update dependencies and fix formatting issues and Contact Page Regex
  • Loading branch information
Sagargupta16 authored Dec 25, 2023
2 parents 5b1e363 + b4d7246 commit ff1b24b
Show file tree
Hide file tree
Showing 29 changed files with 804 additions and 717 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Build and Deploy

on:
push:
branches: ["master"]
branches: ['master']

jobs:
build:
Expand Down
11 changes: 11 additions & 0 deletions .prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"semi": false,
"singleQuote": true,
"useTabs": false,
"tabWidth": 2,
"printWidth": 80,
"trailingComma": "none",
"bracketSpacing": true,
"jsxBracketSameLine": false,
"arrowParens": "avoid"
}
109 changes: 31 additions & 78 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"gh-pages": "^5.0.0",
"gh-pages": "^6.1.1",
"prettier": "3.0.0"
},
"eslintConfig": {
Expand Down
4 changes: 2 additions & 2 deletions public/favicon_io/site.webmanifest
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "",
"short_name": "",
"name": "PWA",
"short_name": "PWA",
"icons": [
{
"src": "/android-chrome-192x192.png",
Expand Down
1 change: 0 additions & 1 deletion public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
sizes="16x16"
href="./favicon_io/favicon-16x16.png"
/>
<link rel="manifest" href="./favicon_io/site.webmanifest" />
<link rel="icon" type="image/x-icon" href="./favicon.ico" />
<title>Personal Portfolio</title>
</head>
Expand Down
54 changes: 27 additions & 27 deletions src/App.jsx
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
import React, { useEffect, useState } from "react";
import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
import PropTypes from "prop-types";
import Header from "./components/header/Header";
import Nav from "./components/nav/Nav";
import About from "./components/about/About";
import Education from "./components/education/Education";
import Experience from "./components/experience/Experience";
import Skill from "./components/skill/Skill";
import Services from "./components/services/Services";
import Portfolio from "./components/portfolio/Portfolio";
import Testimonial from "./components/testimonials/Testimonial";
import Contact from "./components/contact/Contact";
import Footer from "./components/footer/Footer";
import React, { useEffect, useState } from 'react'
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'
import PropTypes from 'prop-types'
import Header from './components/header/Header'
import Nav from './components/nav/Nav'
import About from './components/about/About'
import Education from './components/education/Education'
import Experience from './components/experience/Experience'
import Skill from './components/skill/Skill'
import Services from './components/services/Services'
import Portfolio from './components/portfolio/Portfolio'
import Testimonial from './components/testimonials/Testimonial'
import Contact from './components/contact/Contact'
import Footer from './components/footer/Footer'

const RouterWrapper = ({ children, activeNav, setActiveNav }) => (
<Router basename="/portfolio-react">
<Nav setActiveNav={setActiveNav} activeNav={activeNav} />
{children}
<Footer />
</Router>
);
)

RouterWrapper.propTypes = {
children: PropTypes.node.isRequired,
activeNav: PropTypes.string.isRequired,
setActiveNav: PropTypes.func.isRequired,
};
setActiveNav: PropTypes.func.isRequired
}

const App = () => {
const [screenWidth, setScreenWidth] = useState(window.innerWidth);
const [activeNav, setActiveNav] = useState("#");
const [screenWidth, setScreenWidth] = useState(window.innerWidth)
const [activeNav, setActiveNav] = useState('#')

useEffect(() => {
const handleResize = () => setScreenWidth(window.innerWidth);
window.addEventListener("resize", handleResize);
const handleResize = () => setScreenWidth(window.innerWidth)
window.addEventListener('resize', handleResize)
return () => {
window.removeEventListener("resize", handleResize);
};
}, []);
window.removeEventListener('resize', handleResize)
}
}, [])

return (
<RouterWrapper activeNav={activeNav} setActiveNav={setActiveNav}>
Expand Down Expand Up @@ -67,7 +67,7 @@ const App = () => {
</>
)}
</RouterWrapper>
);
};
)
}

export default App;
export default App
Loading

0 comments on commit ff1b24b

Please sign in to comment.