Skip to content

Commit

Permalink
Commit mayor de la entrega 3
Browse files Browse the repository at this point in the history
  • Loading branch information
@juadecha
juadecha committed Mar 7, 2021
1 parent 03600b3 commit a2123bf
Show file tree
Hide file tree
Showing 42 changed files with 1,761 additions and 579 deletions.
8 changes: 8 additions & 0 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
84 changes: 41 additions & 43 deletions src/App.tsx
View file
Original file line number Diff line number Diff line change
@@ -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';
Expand Down Expand Up @@ -43,69 +41,69 @@ 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';
<style type="text/css" dangerouslySetInnerHTML={{__html: "\n\n\t@media (min-width: 1200px) {\n\t\t.row-fluid { \n\t\t\tmax-width: 90%; \n\t\t}\n\t}\n\tbody { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-advertwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-slidewrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-introwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-showcasewrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-promowrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-topwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-maintopwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-mainbottomwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-bottomwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-userwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-footerwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-copyrightwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-debugwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t.slogan {\n\t\tfont-family: 'Helvetica Neue', Helvetica, sans-serif ;\n\t}\n\n" }} />
import { Action, createStore } from 'redux'
import IGlobalState, { initialState} from './state/globalState'
import { Provider } from 'react-redux'
import { INavbarCollapseAction } from './actions/NavbarActions'

<style type="text/css" dangerouslySetInnerHTML={{__html: "\n\n\t@media (min-width: 1200px) {\n\t\t.row-fluid { \n\t\t\tmax-width: 90%; \n\t\t}\n\t}\n\tbody { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-advertwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-slidewrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-introwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-showcasewrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-promowrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-topwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-maintopwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-mainbottomwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-bottomwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-userwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-footerwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-copyrightwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t#fav-debugwrap { \n\t\tbackground-repeat: repeat;\n\t}\n\t.slogan {\n\t\tfont-family: 'Helvetica Neue', Helvetica, sans-serif ;\n\t}\n\n" }} />

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 (
<div style={{margin: 'auto'}}>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />

<Advertwrap />

<Navbar />

const { width } = useWindowDimensions();

<Header />
return (
<Provider store={store}>
<div id="home" style={{margin: 'auto'}}>
<link
rel="stylesheet"
type="text/css"
href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick.min.css"
/>
<link
rel="stylesheet"
type="text/css"
href="https://cdnjs.cloudflare.com/ajax/libs/slick-carousel/1.6.0/slick-theme.min.css"
/>

<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />
<NB />
<Slidewrap />
<Newsshow width={width}/>
<JobComponent />

<Introwrap />

<Showcasewrap />

<Bottomwrap />

<Linewrap />

<Mainbottomwrap />

<Backtotop />

<Footerwrap />

{/* Backtotop mobile */}
<div className="container-fluid">
<div className="row-fluid">
<div id="fav-backtotop-mobile" className="span12">
<a href="https://www.informatica.us.es/" className="backtop" title="BACK TO TOP"><i className="fa fa-angle-up" />
</a>
</div>
</div>
</div>


{/* Copyright */}
<Copyrightwrap />
{/* Debug */}
<div className="container-fluid" id="fav-debugwrap">
<div className="row-fluid">
<div id="fav-debug" className="span12 ">
</div>
</div>
</div>
<div className="container-fluid">
<div className="row-fluid">
</div>
</div>

{/*[if lte IE 7]><![endif]*/}
<noscript>&lt;strong&gt;JavaScript is currently disabled.&lt;/strong&gt;Please enable it for a better experience of &lt;a href="http://2glux.com/projects/jumi"&gt;Jumi&lt;/a&gt;.</noscript>
</div>
</Provider>
);
}

Expand Down
3 changes: 0 additions & 3 deletions src/Components/advertwrap.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ class Advertwrap extends React.Component {
<div className="clr" />
</div>
</div>
{/* <div id="system-message-container">
</div>
*/}
</div>
</div>
</div>
Expand Down
41 changes: 26 additions & 15 deletions src/Components/backtotop.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,29 @@
import React from 'react'

class Backtotop extends React.Component {
public render () {

return(
<div className="container-fluid">
<div className="row-fluid">
<div id="fav-backtotop" className="span12">
<a href="localhost:3000" className="backtop" title="BACK TO TOP"><i className="fa fa-angle-up" />
</a>
</div>
</div>
import React, {useState} from 'react';


const ScrollArrow = () =>{

const [showScroll, setShowScroll] = useState(false)

const checkScrollTop = () => {
if (!showScroll && window.pageYOffset > 400){
setShowScroll(true)
} else if (showScroll && window.pageYOffset <= 400){
setShowScroll(false)
}
};

const scrollTop = () =>{
window.scrollTo({top: 0, behavior: 'smooth'});
};

window.addEventListener('scroll', checkScrollTop)

return (
<div>
<i className="fa fa-arrow-circle-up fa-3x scrollTop" onClick={scrollTop} style={{display: showScroll ? 'flex' : 'none'}}/>
</div>
) }
);
}

export default Backtotop;
export default ScrollArrow;
9 changes: 5 additions & 4 deletions src/Components/bottomwrap.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ class Bottomwrap extends React.Component {

return(
<div className="container-fluid" id="fav-topwrap">
<div className="row-fluid">
<div className="title topwrapTitle">
<h2 className="cardTitleText">Enlaces de Interés</h2>
</div>
<div className="row-fluid topwrapImgsDiv">
<div id="fav-top" className="clearfix">
<div id="fav-top1" className="span3">


<BottomwrapElement img={footer1} classname="favpromote400" link="https://www.informatica.us.es/index.php/secretaria" dsihtml=".favpromote400 { background-color: #FFFFFF; border: 1px solid #DDDDDD; -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; }.favpromote400:hover { background-color: #B8B8B8; }"/>
</div>
<div id="fav-top2" className="span3">
Expand Down Expand Up @@ -60,7 +61,7 @@ class BottomwrapElement extends React.Component<IBottomwrapElementProps, IBottom
<div className="moduletable">
<style type="text/css" dangerouslySetInnerHTML={{__html: this.state.dsihtml}}/>
<div id="favpromote" className={this.state.classname}>
<div id="favpromote-uploadimage" style={{height: '100%', textAlign: 'center'}}>
<div id="favpromote-uploadimage" className="topwrapImgs">
<a href={this.state.link} target="_self">
<img src={this.state.img} alt=""/>
</a>
Expand Down
48 changes: 4 additions & 44 deletions src/Components/copyrightwrap.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,54 +4,14 @@ class Copyrightwrap extends React.Component {
public render () {

return(
<div className="container-fluid" id="fav-copyrightwrap">
<div className="container-fluid footerCopyright" id="fav-copyrightwrap">
<div className="row-fluid">
<div id="fav-copyright" className="clearfix">
<div id="fav-showcopyright" className="span3">
<p>© 2021
<a href="https://www.informatica.us.es/" target="_blank noopener">
ETSII </a>
<p className="footerText">© 2021
<a className="footerText" href="https://www.informatica.us.es/" target="_blank noopener">
ETSII</a>
</p>
</div>
<div id="fav-copyright2" className="span9">
<div className="moduletable">
<div id="favsocial" style={{float: 'right'}}>
<ul id="favsocial-list">
<li id="favsocial-icon2">
<a href="https://twitter.com/etsii" target="_blank noopener" style={{backgroundColor: '#EEEEEE', padding: '0.3em', WebkitBorderRadius: 4, MozBorderRadius: 4, borderRadius: 4}}>
<span className="fa-stack">
<i className="fa fa-twitter fa-stack-2x" style={{color: '#00ACED', fontSize: 24}}>
</i>
<i className="fa fa-stack-1x" style={{color: '#', fontSize: ''}}>
</i>
</span>
</a>
</li>
<li id="favsocial-icon3">
<a href="https://www.facebook.com/pages/Secretar%C3%ADa-ETS-Ingenier%C3%ADa-Inform%C3%A1tica-Univ-Sevilla/196373487061548?ref=ts" target="_blank noopener" style={{backgroundColor: '#EEEEEE', padding: '0.3em', WebkitBorderRadius: 4, MozBorderRadius: 4, borderRadius: 4}}>
<span className="fa-stack">
<i className="fa fa-facebook fa-stack-2x" style={{color: '#3B5998', fontSize: 24}}>
</i>
<i className="fa fa-stack-1x" style={{color: '#', fontSize: ''}}>
</i>
</span>
</a>
</li>
<li id="favsocial-icon9">
<a href="https://www.youtube.com/channel/UCic5LtftOI4kAvckx-24gKQ" target="_blank noopener" style={{backgroundColor: '#CD332D', padding: '0.3em', WebkitBorderRadius: 4, MozBorderRadius: 4, borderRadius: 4}}>
<span className="fa-stack">
<i className="fa fa-youtube fa-stack-2x" style={{color: '#EEEEEE', fontSize: 24}}>
</i>
<i className="fa fa-stack-1x" style={{color: '#', fontSize: ''}}>
</i>
</span>
</a>
</li>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
) }
Expand Down
37 changes: 31 additions & 6 deletions src/Components/footerwrap.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,43 @@
import React from 'react'
import footerLogo from '../Inicio_files/footerLogo.png'

class Footerwrap extends React.Component {
public render () {

return(
<div className="container-fluid" id="fav-footerwrap">
<div className="container-fluid footer" id="fav-footerwrap">
<div className="row-fluid">
<div id="fav-footer" className="clearfix">
<div id="fav-footer1" className="span12">
<div id="fav-footer1" className="span3">
<div className="moduletable">
<div className="custom">
<p>Escuela Técnica Superior de Ingeniería Informática - Universidad de Sevilla<br /> Av. Reina Mercedes s/n, 41012 Sevilla - tlfno +(34) 954556817</p>
{/* <p>Our themes are licensed under the GPLv3. FAVOURITE can be used for personal or commercial use on unlimited personal or commercial websites.</p>
<div style="margin-top: 14px;"><a href="http://www.favthemes.com/terms-and-conditions.html" target="_blank">Read More...</a></div> */}</div>
<div className="custom footerCustom">
<img src={footerLogo} alt="" /></div>
</div>
</div>
<div id="fav-footer1" className="span2">
<div className="moduletable">
<div className="custom footerCustom">
<h4 className="footerTitle">Enlaces</h4>
<a href="https://www.informatica.us.es/index.php/la-escuela" ref="_blank noopener noreferrer"><p className="footerText">La Escuela</p></a>
<a href="https://www.informatica.us.es/index.php/estudios" ref="_blank noopener noreferrer"><p className="footerText">Estudios</p></a>
<a href="https://www.informatica.us.es/index.php/organizacion-docente" ref="_blank noopener noreferrer"><p className="footerText">Organización Docente</p></a>
<a href="https://www.informatica.us.es/index.php/rel-externas" ref="_blank noopener noreferrer"><p className="footerText">Relaciones Externas</p></a>
<a href="https://www.informatica.us.es/index.php/servicios" ref="_blank noopener noreferrer"><p className="footerText">Servicios</p></a>
<a href="https://www.informatica.us.es/index.php/usuarios" ref="_blank noopener noreferrer"><p className="footerText">Perfiles</p></a>
</div>
</div>
</div>
<div id="fav-footer1" className="span4 footerRight">
<div className="moduletable">
<div className="custom footerCustom">
<p className="footerText">Escuela Técnica Superior de Ingeniería Informática</p>
<p className="footerText">Av. Reina Mercedes s/n, 41012 Sevilla</p>
<p className="footerText">Contacto: +(34) 954556817</p>
<p className="footerText">Encuéntranos en redes sociales:</p>
<a href="https://www.facebook.com/pages/Secretar%C3%ADa-ETS-Ingenier%C3%ADa-Inform%C3%A1tica-Univ-Sevilla/196373487061548?ref=ts"><i className="fa fa-facebook-square footerText fa-2x" /> </a>
<a href="https://twitter.com/etsii"><i className="fa fa-twitter-square footerText fa-2x" /> </a>
<a href="https://www.youtube.com/channel/UCic5LtftOI4kAvckx-24gKQ"><i className="fa fa-youtube-square footerText fa-2x" /> </a>
</div>
</div>
</div>
</div>
Expand Down
27 changes: 26 additions & 1 deletion src/Components/header.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react'
import etsiilogo from '../Inicio_files/logo-etsii251.png'
import uslogo from '../Inicio_files/logo-us49.png'
import { Button, DropdownButton, Dropdown } from 'react-bootstrap';

class Header extends React.Component {
public render () {
Expand All @@ -9,7 +10,7 @@ class Header extends React.Component {
<div className="container-fluid" id="fav-headerwrap">
<div className="row-fluid">
<div id="fav-header" className="span12">
<div id="fav-logo" className="span4">
<div id="fav-logo" className="span8">
<h1>
<a className="mediaLogo" href="https://www.us.es/" title="ETSII">
<img src={uslogo} alt="ETSII" />
Expand All @@ -22,6 +23,30 @@ class Header extends React.Component {
</a>
</h1>
</div>
<div id="fav-logo" style={{float: 'right'}} className="span4">
<div className="externallogin" style={{float: 'right'}}>
<form action="https://www.informatica.us.es/index.php" method="post" id="external-login" style= {{ margin: '10px 0 0'}}>
<fieldset className="loginform">
<Button variant="outline-primary" value="Submit" size="sm" type="submit">Iniciar sesión</Button>
</fieldset>
</form>
<div className="clr" />
</div>
<div style={{float: 'right'}}>
<Button variant="outline-primary" size="sm" style={{margin: '10px 25px 0'}}>Iniciar sesión</Button>
</div>
<div style={{float: 'right'}}>
<DropdownButton id="dropdown-basic-button" size="sm" variant="outline-primary" title="Menú" style={{margin: '10px 0 0'}}>
<Dropdown.Item href="https://www.informatica.us.es/index.php/buscar">Buscar</Dropdown.Item>
<Dropdown.Item href="https://www.informatica.us.es/index.php/noticias">Noticias</Dropdown.Item>
<Dropdown.Item href="https://www.informatica.us.es/index.php/directorio">Directorio</Dropdown.Item>
<Dropdown.Item href="https://www.informatica.us.es/index.php/practicas-en-empresas/tablon-de-anuncios/otras-ofertas">Tablón de anuncios</Dropdown.Item>
<Dropdown.Item href="https://www.informatica.us.es/index.php/mapa-del-sitio">Mapa del sitio</Dropdown.Item>
</DropdownButton>
</div>


</div>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit a2123bf

Please sign in to comment.