diff --git a/.eslintrc b/.eslintrc index e77f55c..8bde002 100644 --- a/.eslintrc +++ b/.eslintrc @@ -11,6 +11,9 @@ "browser": true, "node": true }, + "rules": { + "linebreak-style": 0 + }, "globals": { "document": false } diff --git a/package-lock.json b/package-lock.json index 84b3676..fb3857d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", + "@mui/icons-material": "^5.1.0", "@mui/material": "^5.1.0", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", @@ -3637,6 +3638,27 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" }, + "node_modules/@mui/icons-material": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.1.0.tgz", + "integrity": "sha512-GD2cNZ2XTqoxX6DMUg+tos1fDUVg6kXWxwo9UuBiRIhK8N+B7CG7vjRDf28LLmewcqIjxqy+T2SEVqDLy1FOYQ==", + "dependencies": { + "@babel/runtime": "^7.16.0" + }, + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "@mui/material": "^5.0.0", + "@types/react": "^16.8.6 || ^17.0.0", + "react": "^17.0.2" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@mui/material": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.1.0.tgz", @@ -26500,6 +26522,14 @@ } } }, + "@mui/icons-material": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@mui/icons-material/-/icons-material-5.1.0.tgz", + "integrity": "sha512-GD2cNZ2XTqoxX6DMUg+tos1fDUVg6kXWxwo9UuBiRIhK8N+B7CG7vjRDf28LLmewcqIjxqy+T2SEVqDLy1FOYQ==", + "requires": { + "@babel/runtime": "^7.16.0" + } + }, "@mui/material": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/@mui/material/-/material-5.1.0.tgz", diff --git a/package.json b/package.json index 6962bed..9eda31e 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "dependencies": { "@emotion/react": "^11.5.0", "@emotion/styled": "^11.3.0", + "@mui/icons-material": "^5.1.0", "@mui/material": "^5.1.0", "@testing-library/jest-dom": "^5.14.1", "@testing-library/react": "^11.2.7", diff --git a/src/AboutUs/AboutUs.jsx b/src/AboutUs/AboutUs.jsx index 148ea41..eb7b535 100644 --- a/src/AboutUs/AboutUs.jsx +++ b/src/AboutUs/AboutUs.jsx @@ -6,64 +6,31 @@ export default function AboutUs() {

About Us

- IEEE Student Branch of Brescia - {' '} - is the reference for the - {' '} - IEEE - (Institute of Electrical and Electronics Engineers) in Brescia. Our - {' '} - main goal - {' '} - is to integrate the modus operandi of - scientific research into the academic and professional career of each - member, this takes place through group projects or individual research - in different fields of IT. + IEEE Student Branch of Brescia is the reference for the IEEE (Institute + of Electrical and Electronics Engineers) in Brescia. Our main goal is to + integrate the modus operandi of scientific research into the academic + and professional career of each member, this takes place through group + projects or individual research in different fields of IT.

- The - {' '} - Branch - {' '} - offers the opportunity to - {' '} - research - {' '} - at the same level as IEEE members from around the world, while remaining - completely immersed in the academic environment, with the support of the - teaching staff and doctoral students. + The Branch offers the opportunity to research at the same level as IEEE + members from around the world, while remaining completely immersed in + the academic environment, with the support of the teaching staff and + doctoral students.

The possibility to get in touch realities other than purely scholastic - allows one to have a different vision about what - {' '} - developing - {' '} - and - maintaining - {' '} - a project - mean, and also the ability to - learn - {' '} - new concepts. + allows one to have a different vision about what developing and + maintaining a project mean, and also the ability to learn new concepts.

- In addition to the - {' '} - projects - , we give our members the - opportunity to attend a conference, to talk about their project and the - difficulties they have encountered, as well as the things they have - learned. + In addition to the projects, we give our members the opportunity to + attend a conference, to talk about their project and the difficulties + they have encountered, as well as the things they have learned.

- Within the site there are some of the - {' '} - projects - {' '} - we are - developing or that we have carried out over the past year. + Within the site there are some of the projects we are developing or that + we have carried out over the past year.

); diff --git a/src/Navbar/Navbar.css b/src/Navbar/Navbar.css index 415fe70..d5960b4 100644 --- a/src/Navbar/Navbar.css +++ b/src/Navbar/Navbar.css @@ -1,58 +1,3 @@ -#Navbar { - background-color: #00629B; - width: 100%; - height: 45px; - align-items: center; -} - -.listaLink { - list-style-type: none; - display: inline; - margin: 0; - padding: 0; - height: 45px; - padding-inline-start: 0; -} - -#Listasx { - float: left; -} - -#Listadx { - float: right; -} - -li { - display: inline-block; - height: 40px; - padding-top: 5px; - padding-bottom: 0; - padding-right: 10px; - padding-left: 10px; - font-size: x-large; - vertical-align: middle; -} - -li:hover { - background-color: #FFA300; - -} - -.scalable:hover { - transform: scale(1.05); -} - - -.NavItem { - - color: #ffffff; +.link { text-decoration: none; - -} - -.logoSocial{ - display: inline-block; - width: 30px; - height: auto; - padding: 0; } diff --git a/src/Navbar/Navbar.jsx b/src/Navbar/Navbar.jsx index 1bcfbeb..9029ece 100644 --- a/src/Navbar/Navbar.jsx +++ b/src/Navbar/Navbar.jsx @@ -1,93 +1,103 @@ -import React from 'react'; +import * as React from 'react'; +import AppBar from '@mui/material/AppBar'; +import Box from '@mui/material/Box'; +import Toolbar from '@mui/material/Toolbar'; +import Button from '@mui/material/Button'; +import IconButton from '@mui/material/IconButton'; +import ButtonGroup from '@mui/material/ButtonGroup'; +import MenuIcon from '@mui/icons-material/Menu'; +import InstagramIcon from '@mui/icons-material/Instagram'; +import LinkedInIcon from '@mui/icons-material/LinkedIn'; +import YouTubeIcon from '@mui/icons-material/YouTube'; +import FacebookIcon from '@mui/icons-material/Facebook'; +import TwitterIcon from '@mui/icons-material/Twitter'; +import GitHubIcon from '@mui/icons-material/GitHub'; + +import './Navbar.css'; import { Link, BrowserRouter as Router, Switch, Route, } from 'react-router-dom'; -import './Navbar.css'; -import Sidebar from '../Sidebar/Sidebar'; -import Login from '../Login/Login'; import Projects from '../Projects/Projects'; import AboutUs from '../AboutUs/AboutUs'; -import instagram from '../logos/logo-instagram.png'; -import linkedin from '../logos/logo-linkedin.png'; -import youtube from '../logos/logo-youtube.png'; -import facebook from '../logos/logo-facebook.png'; -import twitter from '../logos/logo-twitter.jpg'; -import github from '../logos/logo-github.png'; - -export default function Navbar() { +export default function ButtonAppBar() { return ( - - - - - - - - - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + ); } diff --git a/src/index.css b/src/index.css index a757e93..07b051f 100644 --- a/src/index.css +++ b/src/index.css @@ -3,7 +3,6 @@ * { margin: 0; font-family: "Quicksand"; - color: #333; } html, @@ -40,3 +39,4 @@ p { p { padding: 5px; } + diff --git a/src/index.jsx b/src/index.jsx index 67024fa..b672820 100644 --- a/src/index.jsx +++ b/src/index.jsx @@ -1,11 +1,28 @@ import React from 'react'; import ReactDOM from 'react-dom'; import './index.css'; +import { createTheme, ThemeProvider } from '@mui/material/styles'; import App from './App'; +const theme = createTheme({ + palette: { + primary: { + main: '#00629B', + }, + secondary: { + main: '#FFA300', + }, + white: { + main: '#FFFFFF', + }, + }, +}); + ReactDOM.render( - + + + , document.getElementById('root'), ); diff --git a/src/logos/logo-facebook.png b/src/logos/logo-facebook.png deleted file mode 100644 index 8c94602..0000000 Binary files a/src/logos/logo-facebook.png and /dev/null differ diff --git a/src/logos/logo-github.png b/src/logos/logo-github.png deleted file mode 100644 index 9490ffc..0000000 Binary files a/src/logos/logo-github.png and /dev/null differ diff --git a/src/logos/logo-instagram.png b/src/logos/logo-instagram.png deleted file mode 100644 index d3b9817..0000000 Binary files a/src/logos/logo-instagram.png and /dev/null differ diff --git a/src/logos/logo-linkedin.png b/src/logos/logo-linkedin.png deleted file mode 100644 index 25f4c4b..0000000 Binary files a/src/logos/logo-linkedin.png and /dev/null differ diff --git a/src/logos/logo-twitter.jpg b/src/logos/logo-twitter.jpg deleted file mode 100644 index 565bd35..0000000 Binary files a/src/logos/logo-twitter.jpg and /dev/null differ diff --git a/src/logos/logo-youtube.png b/src/logos/logo-youtube.png deleted file mode 100644 index 4a90e22..0000000 Binary files a/src/logos/logo-youtube.png and /dev/null differ