Skip to content

Commit 404d6ed

Browse files
committed
some fixes
1 parent d30edf4 commit 404d6ed

File tree

15 files changed

+5747
-8041
lines changed

15 files changed

+5747
-8041
lines changed

.env

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
GENERATE_SOURCEMAP=false
2+
DISABLE_ESLINT_PLUGIN=true

package.json

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,20 @@
11
{
2-
"homepage": "http://ubaimutl.github.io/react-portfolio",
32
"name": "react-portfolio",
43
"version": "0.1.0",
54
"private": true,
65
"dependencies": {
7-
"@steveeeie/react-page-transition": "^1.2.1",
8-
"@testing-library/jest-dom": "^5.11.4",
9-
"@testing-library/react": "^11.1.0",
10-
"@testing-library/user-event": "^12.1.10",
11-
"bootstrap": "^4.6.0",
12-
"emailjs-com": "^2.6.4",
13-
"gh-pages": "^3.2.3",
14-
"react": "^17.0.1",
15-
"react-animated-cursor": "^2.1.8",
16-
"react-bootstrap": "^1.4.3",
17-
"react-dom": "^17.0.1",
6+
"bootstrap": "^5.2.3",
7+
"emailjs-com": "^3.2.0",
8+
"react": "^18.2.0",
9+
"react-bootstrap": "^2.7.0",
10+
"react-dom": "^18.2.0",
1811
"react-helmet-async": "^1.0.7",
1912
"react-icons": "^4.1.0",
20-
"react-router-dom": "^5.2.0",
21-
"react-scripts": "4.0.1",
13+
"react-router-dom": "^6.6.2",
14+
"react-scripts": "^5.0.1",
2215
"react-transition-group": "^4.4.2",
2316
"typewriter-effect": "^2.18.2",
24-
"web-vitals": "^0.2.4"
17+
"web-vitals": "^3.1.1"
2518
},
2619
"scripts": {
2720
"start": "react-scripts start",
@@ -49,4 +42,4 @@
4942
"last 1 safari version"
5043
]
5144
}
52-
}
45+
}

src/app/App.css

+11
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,15 @@
2828
top: 0;
2929
transform: translateY(-130%);
3030
transition: all 400ms ease-out;
31+
}
32+
33+
@media (min-width: 1400px) {
34+
.container,
35+
.container-lg,
36+
.container-md,
37+
.container-sm,
38+
.container-xl,
39+
.container-xxl {
40+
max-width: 1140px;
41+
}
3142
}

src/app/App.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import "bootstrap/dist/css/bootstrap.min.css";
33
import {
44
BrowserRouter as Router,
55
useLocation,
6-
withRouter,
76
} from "react-router-dom";
7+
import withRouter from "../hooks/withRouter";
88
import AppRoutes from "./routes";
99
import Headermain from "../header";
10-
import AnimatedCursor from "react-animated-cursor";
10+
import AnimatedCursor from "../hooks/AnimatedCursor";
1111
import "./App.css";
1212

1313
function _ScrollToTop(props) {

src/app/routes.js

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
import React from "react";
2-
import { Route, Switch, withRouter } from "react-router-dom";
3-
2+
import { Route, Routes} from "react-router-dom";
3+
import withRouter from "../hooks/withRouter"
44
import { Home } from "../pages/home";
55
import { Portfolio } from "../pages/portfolio";
66
import { ContactUs } from "../pages/contact";
77
import { About } from "../pages/about";
88
import { Socialicons } from "../components/socialicons";
99
import { CSSTransition, TransitionGroup } from "react-transition-group";
1010

11-
const AnimatedSwitch = withRouter(({ location }) => (
11+
const AnimatedRoutes = withRouter(({ location }) => (
1212
<TransitionGroup>
1313
<CSSTransition
1414
key={location.key}
@@ -19,21 +19,21 @@ const AnimatedSwitch = withRouter(({ location }) => (
1919
classNames="page"
2020
unmountOnExit
2121
>
22-
<Switch location={location}>
23-
<Route exact path="/" component={Home} />
24-
<Route path="/about" component={About} />
25-
<Route path="/portfolio" component={Portfolio} />
26-
<Route path="/contact" component={ContactUs} />
27-
<Route path="*" component={Home} />
28-
</Switch>
22+
<Routes location={location}>
23+
<Route exact path="/" element={<Home />} />
24+
<Route path="/about" element={<About />} />
25+
<Route path="/portfolio" element={<Portfolio />} />
26+
<Route path="/contact" element={<ContactUs />} />
27+
<Route path="*" element={<Home />} />
28+
</Routes>
2929
</CSSTransition>
3030
</TransitionGroup>
3131
));
3232

3333
function AppRoutes() {
3434
return (
3535
<div className="s_c">
36-
<AnimatedSwitch />
36+
<AnimatedRoutes />
3737
<Socialicons />
3838
</div>
3939
);

src/content_option.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,6 @@ const socialprofils = {
151151
facebook: "https://facebook.com",
152152
linkedin: "https://linkedin.com",
153153
twitter: "https://twitter.com",
154-
youtube: "https://youtube.com",
155-
twitch: "https://twitch.com",
156154
};
157155
export {
158156
meta,
@@ -165,4 +163,4 @@ export {
165163
contactConfig,
166164
socialprofils,
167165
logotext,
168-
};
166+
};

src/header/style.css

+6
Original file line numberDiff line numberDiff line change
@@ -179,9 +179,14 @@
179179
position: relative;
180180
transition: color 250ms cubic-bezier(0, 0, 0.58, 1) 0s;
181181
padding: 4px 0px;
182+
text-decoration: none;
182183
font-family: Marcellus;
183184
}
184185

186+
.the_menu .menu_item>a:hover {
187+
color: var(--text-color-3);
188+
}
189+
185190
@media (min-width: 768px) {
186191
.the_menu .menu_item>a {
187192
font-size: 4.8vw;
@@ -198,4 +203,5 @@
198203
.menu_footer a {
199204
color: var(--text-color-2);
200205
margin-right: 10px;
206+
text-decoration: none;
201207
}

0 commit comments

Comments
 (0)