From a2123bfbe4c537044be9bf91bc62ba306768e2dc Mon Sep 17 00:00:00 2001 From: Juanant98 Date: Sun, 7 Mar 2021 13:49:48 +0100 Subject: [PATCH] Commit mayor de la entrega 3 --- package.json | 8 + src/App.tsx | 84 +- src/Components/advertwrap.tsx | 3 - src/Components/backtotop.tsx | 41 +- src/Components/bottomwrap.tsx | 9 +- src/Components/copyrightwrap.tsx | 48 +- src/Components/footerwrap.tsx | 37 +- src/Components/header.tsx | 27 +- src/Components/jobComponent.tsx | 22 + src/Components/navbar.tsx | 62 +- src/Components/news.tsx | 95 +++ src/Components/newsshow.tsx | 118 ++- src/Components/setWindowDimensions.tsx | 24 + src/Components/slideshow.tsx | 76 +- src/Components/slidewrap.tsx | 2 - .../1e789ab5ed9db256034022488621a459(1).png | Bin 9521 -> 0 bytes .../1e789ab5ed9db256034022488621a459.png | Bin 117607 -> 0 bytes .../22f496a0aa0ac0129c30ffd191b18818.png | Bin 8968 -> 0 bytes .../7cf045a92dea308e8c40acbc9f0d6da9(1).png | Bin 10136 -> 0 bytes .../7cf045a92dea308e8c40acbc9f0d6da9.png | Bin 188809 -> 0 bytes src/Inicio_files/ETSII_Sevillajpg.jpg | Bin 0 -> 281636 bytes src/Inicio_files/US001.jpg | Bin 0 -> 384530 bytes .../b826c230029eb09ea2d15364501f0540.png | Bin 6384 -> 0 bytes src/Inicio_files/bg-pattern.png | Bin 125 -> 0 bytes src/Inicio_files/camera-loader.gif | Bin 9289 -> 0 bytes src/Inicio_files/camera_skins.png | Bin 3584 -> 0 bytes .../cbd8b05e22224d61619d149b2905810a(1).png | Bin 11167 -> 0 bytes .../cbd8b05e22224d61619d149b2905810a.png | Bin 233385 -> 0 bytes src/Inicio_files/escuela.jpg | Bin 0 -> 403987 bytes src/Inicio_files/est-grados-master.jpg | Bin 0 -> 129720 bytes src/Inicio_files/footerLogo.png | Bin 0 -> 12891 bytes .../ic_small_w100h100q100_admision.jpg | Bin 7821 -> 0 bytes .../ic_small_w100h100q100_slide1.jpg | Bin 7592 -> 0 bytes src/Inicio_files/joomla.css | 34 - src/Inicio_files/jumbotron.jpg | Bin 0 -> 144087 bytes src/Inicio_files/logotest.png | Bin 0 -> 169237 bytes src/Inicio_files/scss/custom.scss | 143 ++++ src/Inicio_files/template.css | 778 ++++++++++-------- src/actions/NavbarActions.ts | 5 + src/containers/navbar.tsx | 18 + src/state/globalState.ts | 9 + yarn.lock | 697 +++++++++++++++- 42 files changed, 1761 insertions(+), 579 deletions(-) create mode 100644 src/Components/jobComponent.tsx create mode 100644 src/Components/news.tsx create mode 100644 src/Components/setWindowDimensions.tsx delete mode 100644 src/Inicio_files/1e789ab5ed9db256034022488621a459(1).png delete mode 100644 src/Inicio_files/1e789ab5ed9db256034022488621a459.png delete mode 100644 src/Inicio_files/22f496a0aa0ac0129c30ffd191b18818.png delete mode 100644 src/Inicio_files/7cf045a92dea308e8c40acbc9f0d6da9(1).png delete mode 100644 src/Inicio_files/7cf045a92dea308e8c40acbc9f0d6da9.png create mode 100644 src/Inicio_files/ETSII_Sevillajpg.jpg create mode 100644 src/Inicio_files/US001.jpg delete mode 100644 src/Inicio_files/b826c230029eb09ea2d15364501f0540.png delete mode 100644 src/Inicio_files/bg-pattern.png delete mode 100644 src/Inicio_files/camera-loader.gif delete mode 100644 src/Inicio_files/camera_skins.png delete mode 100644 src/Inicio_files/cbd8b05e22224d61619d149b2905810a(1).png delete mode 100644 src/Inicio_files/cbd8b05e22224d61619d149b2905810a.png create mode 100644 src/Inicio_files/escuela.jpg create mode 100644 src/Inicio_files/est-grados-master.jpg create mode 100644 src/Inicio_files/footerLogo.png delete mode 100644 src/Inicio_files/ic_small_w100h100q100_admision.jpg delete mode 100644 src/Inicio_files/ic_small_w100h100q100_slide1.jpg create mode 100644 src/Inicio_files/jumbotron.jpg create mode 100644 src/Inicio_files/logotest.png create mode 100644 src/Inicio_files/scss/custom.scss create mode 100644 src/actions/NavbarActions.ts create mode 100644 src/containers/navbar.tsx create mode 100644 src/state/globalState.ts diff --git a/package.json b/package.json index dcbe6e2..22d2f2d 100644 --- a/package.json +++ b/package.json @@ -13,11 +13,19 @@ "@types/node": "^12.0.0", "@types/react": "^17.0.0", "@types/react-dom": "^17.0.0", + "@types/react-redux": "^7.1.16", + "@types/react-slick": "^0.23.4", + "bootstrap": "^4.6.0", "native-css": "^2.0.0", + "node-sass": "^5.0.0", "react": "^17.0.1", + "react-bootstrap": "^1.5.1", "react-dom": "^17.0.1", "react-fontawesome": "^1.7.1", + "react-redux": "^7.2.2", "react-scripts": "4.0.3", + "react-slick": "^0.28.0", + "redux": "^4.0.5", "typescript": "^4.1.2", "web-vitals": "^1.0.1" }, diff --git a/src/App.tsx b/src/App.tsx index e8626ef..cd6c12c 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,16 +1,14 @@ -import Advertwrap from './Components/advertwrap' -import Navbar from './Components/navbar' -import Header from './Components/header' +import NB from './containers/navbar' import Slidewrap from './Components/slidewrap' -import Introwrap from './Components/introwrap' -import Showcasewrap from './Components/showcasewrap' -import Bottomwrap from './Components/bottomwrap' - +import Bottomwrap from './Components/bottomwrap' +import Newsshow from './Components/newsshow' +import JobComponent from './Components/jobComponent' +import useWindowDimensions from './Components/setWindowDimensions' import './Inicio_files/simple-line-icons.css' import './Inicio_files/linea2.css' -import './Inicio_files/bootstrap.min.css' +import './Inicio_files/scss/custom.scss' import './Inicio_files/bootstrap-responsive.css' import './Inicio_files/font-awesome.css'; import './Inicio_files/favsocial.css'; @@ -43,35 +41,54 @@ import './Inicio_files/calendar-blue.css'; import './Inicio_files/balloon.css'; import './Inicio_files/estilos.css'; -import Linewrap from './Components/linewrap'; import Mainbottomwrap from './Components/mainbottomwrap'; import Backtotop from './Components/backtotop'; import Footerwrap from './Components/footerwrap'; import Copyrightwrap from './Components/copyrightwrap'; -