Skip to content

Commit

Permalink
Changes
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminbelloeil committed Jul 10, 2024
1 parent bf126bc commit 67bcc33
Show file tree
Hide file tree
Showing 13 changed files with 120 additions and 43 deletions.
12 changes: 12 additions & 0 deletions config-overrides.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = function override(config, env) {
config.module.rules.push({
test: /\.mjs$/,
enforce: 'pre',
use: ['source-map-loader'],
resolve: {
fullySpecified: false,
},
exclude: /node_modules\/@react-three\/drei\/node_modules\/@mediapipe\/tasks-vision/,
});
return config;
};
66 changes: 58 additions & 8 deletions package-lock.json

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

12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"start": "react-app-rewired start",
"build": "react-app-rewired build",
"test": "react-app-rewired test",
"eject": "react-scripts eject",
"predeploy": "npm run build",
"deploy" : "gh-pages -d build"
"deploy": "gh-pages -d build"
},
"eslintConfig": {
"extends": [
Expand All @@ -59,6 +59,8 @@
]
},
"devDependencies": {
"gh-pages": "^6.1.1"
"gh-pages": "^6.1.1",
"react-app-rewired": "^2.2.1",
"source-map-loader": "^5.0.0"
}
}
1 change: 0 additions & 1 deletion src/components/About/AboutStyle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import styled from 'styled-components';
import _default from '../../themes/default';


export const SocialMediaIcons = styled.div`
Expand Down
1 change: 0 additions & 1 deletion src/components/HeroSection/HeroStyle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import styled from "styled-components";
import _default from "../../themes/default";

export const HeroContainer = styled.div`
background: ${({ theme }) => theme.card_light};
Expand Down
3 changes: 1 addition & 2 deletions src/components/HeroSection/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import HeroBgAnimation from '../HeroBgAnimation'
import { HeroContainer, HeroBg, HeroLeftContainer, Img, HeroRightContainer, HeroInnerContainer, TextLoop, Title, Span, SubTitle,SocialMediaIcons,SocialMediaIcon, ResumeButton } from './HeroStyle'
import { HeroContainer, HeroBg, HeroLeftContainer, Img, HeroRightContainer, HeroInnerContainer, TextLoop, Title, Span, SubTitle, ResumeButton } from './HeroStyle'
import HeroImg from '../../images/Heroimage.jpeg'
import Typewriter from 'typewriter-effect';
import { Bio } from '../../data/constants';
Expand Down
1 change: 0 additions & 1 deletion src/components/Navbar/NavbarStyledComponent.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { Link as LinkR } from 'react-router-dom';
import styled from 'styled-components';
import _default from '../../themes/default';

export const Nav = styled.div`
background-color: ${({theme}) => theme.card_light};
Expand Down
4 changes: 2 additions & 2 deletions src/components/Navbar/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ const Navbar = () => {
return (
<Nav>
<NavbarContainer>
<NavLogo to='/'>
<a style={{ display: "flex", alignItems: "center", color: "white", marginBottom: '20;', cursor: 'pointer' }}>
<NavLogo>
<a href='/' style={{ display: "flex", alignItems: "center", color: "white", textDecoration: "none", marginBottom: '20;', cursor: 'pointer' }}>
<DiCssdeck size="3rem" /> <Span>Portfolio</Span>
</a>
</NavLogo>
Expand Down
42 changes: 21 additions & 21 deletions src/components/ProjectDetails/index.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CloseRounded, GitHub, LinkedIn } from '@mui/icons-material';
import { CloseRounded} from '@mui/icons-material';
import { Modal } from '@mui/material';
import React from 'react'
import styled from 'styled-components'
Expand Down Expand Up @@ -54,16 +54,16 @@ const Date = styled.div`



const Desc = styled.div`
font-size: 16px;
font-weight: 400;
color: ${({ theme }) => theme.text_primary};
margin: 8px 6px;
@media only screen and (max-width: 600px) {
font-size: 14px;
margin: 6px 6px;
}
`;
// const Desc = styled.div`
// font-size: 16px;
// font-weight: 400;
// color: ${({ theme }) => theme.text_primary};
// margin: 8px 6px;
// @media only screen and (max-width: 600px) {
// font-size: 14px;
// margin: 6px 6px;
// }
// `;

const Image = styled.img`
width: 100%;
Expand All @@ -73,16 +73,16 @@ const Image = styled.img`
box-shadow: 0px 0px 10px 0px rgba(0,0,0,0.3);
`;

const Label = styled.div`
font-size: 20px;
font-weight: 600;
color: ${({ theme }) => theme.text_primary};
margin: 8px 6px;
@media only screen and (max-width: 600px) {
font-size: 16px;
margin: 8px 6px;
}
`;
// const Label = styled.div`
// font-size: 20px;
// font-weight: 600;
// color: ${({ theme }) => theme.text_primary};
// margin: 8px 6px;
// @media only screen and (max-width: 600px) {
// font-size: 16px;
// margin: 8px 6px;
// }
// `;

const Tags = styled.div`
display: flex;
Expand Down
1 change: 0 additions & 1 deletion src/components/Projects/ProjectsStyle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import styled from 'styled-components';
import _default from '../../themes/default';

export const Container = styled.div`
background: linear-gradient(343.07deg, rgba(0, 0, 255, 0.06) 5.71%, rgba(0, 0, 255, 0) 64.83%);
Expand Down
1 change: 1 addition & 0 deletions src/data/constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import usfinternational from '../images/usfinterWeb.png';




export const Bio = {
name: "Benjamin Belloeil",
roles: [
Expand Down
4 changes: 3 additions & 1 deletion src/themes/default.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
const defaultTheme = {
// Temp fonts
fonts: {
title: "Space Grotesk, sans-serif",
Expand All @@ -24,3 +24,5 @@ export default {
xl: 'screen and (max-width: 1280px)'
},
};

export default defaultTheme;
15 changes: 15 additions & 0 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
module.exports = {
module: {
rules: [
{
test: /\.mjs$/,
enforce: 'pre',
use: ['source-map-loader'],
resolve: {
fullySpecified: false,
},
exclude: /node_modules\/@react-three\/drei\/node_modules\/@mediapipe\/tasks-vision/,
},
],
},
};

0 comments on commit 67bcc33

Please sign in to comment.