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'; - +import { Action, createStore } from 'redux' +import IGlobalState, { initialState} from './state/globalState' +import { Provider } from 'react-redux' +import { INavbarCollapseAction } from './actions/NavbarActions' + +const reducer = (state: IGlobalState = initialState, action: Action) => { + switch(action.type){ + case 'COLLAPSED': + const collapsedAction = action as INavbarCollapseAction + return{...state, collapsed: collapsedAction.payload} + } + return state; +} +const store = createStore(reducer, initialState) function App() { - return ( -
Escuela Técnica Superior de Ingeniería Informática - Universidad de Sevilla
Av. Reina Mercedes s/n, 41012 Sevilla - tlfno +(34) 954556817
Our themes are licensed under the GPLv3. FAVOURITE can be used for personal or commercial use on unlimited personal or commercial websites.
- */}La Escuela
+Estudios
+Organización Docente
+Relaciones Externas
+Servicios
+Perfiles
++ Con nuestras ferias de prácticas y contactos en empresas, podemos posicionar a nuestros alumnos y egresados en empresas del más alto nivel. ¡No pierdas la oportunidad! +
++ +
+Navega por la web para encontrar lo que buscas.
+