From b0c5e73a35e6ead5720a2205147044885d52977c Mon Sep 17 00:00:00 2001 From: Beatriz Correa Lopera Date: Sun, 7 Mar 2021 22:57:06 +0100 Subject: [PATCH] Entregable #3A --- package-lock.json | 15 ++ package.json | 3 + src/actions/Actions.ts | 16 +++ src/assets/css/logo-etsii251.png | Bin 0 -> 14468 bytes src/assets/css/logo-us49.png | Bin 0 -> 7369 bytes src/assets/css/style.css | 3 +- src/assets/scss/_calendario.scss | 16 +++ src/assets/scss/_main.scss | 39 +++++- src/assets/scss/_noticias.scss | 66 +++++++++ src/assets/scss/index.scss | 1 + src/components/1.html | 0 src/components/Documentos.tsx | 2 - src/components/DocumentosCaja.tsx | 146 ++++++++++++++++++++ src/components/Header.tsx | 18 ++- src/components/Main.tsx | 1 - src/components/NavBar.tsx | 31 ++--- src/components/Noticias.tsx | 9 +- src/components/NoticiasCaja.tsx | 110 +++++++++++++++ src/components/TablaNoticias.tsx | 4 - src/components/TablaPrimeraConvocatoria.tsx | 38 ++--- src/components/TablaSegundaConvocatoria.tsx | 40 ++---- src/containers/DocumentosCaja.tsx | 18 +++ src/containers/NoticiasCaja.tsx | 18 +++ src/state/globalState.ts | 22 ++- 24 files changed, 517 insertions(+), 99 deletions(-) create mode 100644 src/actions/Actions.ts create mode 100644 src/assets/css/logo-etsii251.png create mode 100644 src/assets/css/logo-us49.png create mode 100644 src/assets/scss/_noticias.scss delete mode 100644 src/components/1.html create mode 100644 src/components/DocumentosCaja.tsx create mode 100644 src/components/NoticiasCaja.tsx create mode 100644 src/containers/DocumentosCaja.tsx create mode 100644 src/containers/NoticiasCaja.tsx diff --git a/package-lock.json b/package-lock.json index 227539a..2701323 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2260,6 +2260,15 @@ "pretty-format": "^26.0.0" } }, + "@types/jquery": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.5.tgz", + "integrity": "sha512-6RXU9Xzpc6vxNrS6FPPapN1SxSHgQ336WC6Jj/N8q30OiaBZ00l1GBgeP7usjVZPivSkGUfL1z/WW6TX989M+w==", + "dev": true, + "requires": { + "@types/sizzle": "*" + } + }, "@types/json-schema": { "version": "7.0.7", "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.7.tgz", @@ -2330,6 +2339,12 @@ "@types/node": "*" } }, + "@types/sizzle": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", + "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==", + "dev": true + }, "@types/source-list-map": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz", diff --git a/package.json b/package.json index 7de1a7e..802b1d4 100644 --- a/package.json +++ b/package.json @@ -41,5 +41,8 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "@types/jquery": "^3.5.5" } } diff --git a/src/actions/Actions.ts b/src/actions/Actions.ts new file mode 100644 index 0000000..27289c0 --- /dev/null +++ b/src/actions/Actions.ts @@ -0,0 +1,16 @@ +import { Action } from 'redux'; + +export enum Actions { + VER_MAS_NOTICIAS = "VER_MAS_NOTICIAS", + VER_MAS_DOCUMENTOS = "VER_MAS_DOCUMENTOS" +} + +export interface IVerMasNoticiasAction extends Action { + payload: boolean; + nombre: string; +} + +export interface IVerMasDocumentosAction extends Action { + payload: boolean; + nombreDocumentos: string; +} diff --git a/src/assets/css/logo-etsii251.png b/src/assets/css/logo-etsii251.png new file mode 100644 index 0000000000000000000000000000000000000000..a2e3c6a77b8b3d6f20645f707efff2f3c07c9f31 GIT binary patch literal 14468 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 literal 0 HcmV?d00001 diff --git a/src/assets/css/logo-us49.png b/src/assets/css/logo-us49.png new file mode 100644 index 0000000000000000000000000000000000000000..595734fefedb0842fddbe373451e2a88ec5872c8 GIT binary patch literal 7369 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 vVOW5$g3x;K&@o7o1T;1C{2&eiX#U>->dT#=cQl { -
-
Título
diff --git a/src/components/DocumentosCaja.tsx b/src/components/DocumentosCaja.tsx new file mode 100644 index 0000000..8689555 --- /dev/null +++ b/src/components/DocumentosCaja.tsx @@ -0,0 +1,146 @@ +import React from 'react'; +import '../assets/scss/index.scss'; +import '../assets/css/style.css'; + +interface IDocumentosCajaProps { + verMasDocumentos: boolean; + nombreDocumentos: string; + onVerMasDocumentosClick: (verMasDocumentos: boolean, nombreDocumentos: string) => any; +} +interface IDocumentosCajaState { + verMasDocumentos: boolean; + nombreDocumentos: string; +} + +class DocumentosCaja extends React.Component { + constructor(props: IDocumentosCajaProps) { + super(props); + this.state = { verMasDocumentos: this.props.verMasDocumentos, nombreDocumentos: this.props.nombreDocumentos } + }; + + public onVerMasDocumentosClick = () => { + this.props.onVerMasDocumentosClick(this.props.verMasDocumentos === true ? false : true, this.props.nombreDocumentos === "Ver menos" ? "Ver más" : "Ver menos"); + this.setState({ verMasDocumentos: this.props.verMasDocumentos === true ? false : true, nombreDocumentos: this.props.nombreDocumentos === "Ver menos" ? "Ver más" : "Ver menos" }); + } + + public render() { + return ( + + ); + } +} + +export default DocumentosCaja; \ No newline at end of file diff --git a/src/components/Header.tsx b/src/components/Header.tsx index dbce108..c0bc47c 100644 --- a/src/components/Header.tsx +++ b/src/components/Header.tsx @@ -2,14 +2,14 @@ import React from 'react'; import '../assets/scss/index.scss'; import '../assets/css/style.css'; import users from '../assets/css/users.png'; -import logoSevilla from '../assets/css/Universidad_Sevilla_8.png'; +import logoSevilla from '../assets/css/logo-us49.png'; import tfgAlfa from '../assets/css/TfG_alfa_3.png'; -import logoETSII from '../assets/css/logo_ETSII_3.png'; +import logoETSII from '../assets/css/logo-etsii251.png'; class Header extends React.Component { public render() { return ( -
+
@@ -20,14 +20,18 @@ class Header extends React.Component {
-
- +
- + TFG
- + + ETSII +
diff --git a/src/components/Main.tsx b/src/components/Main.tsx index c9bc996..93fcec6 100644 --- a/src/components/Main.tsx +++ b/src/components/Main.tsx @@ -52,7 +52,6 @@ class Main extends React.Component {
-
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx index 48d379a..03f6f76 100644 --- a/src/components/NavBar.tsx +++ b/src/components/NavBar.tsx @@ -3,7 +3,6 @@ import '../assets/scss/index.scss'; import '../assets/css/style.css'; import Noticias from '../containers/Noticias'; import Calendario from '../containers/Calendario'; -import Documentos from '../containers/Documentos'; import Propuestas from '../containers/Propuestas'; interface INavBarProps { @@ -44,59 +43,58 @@ class NavBar extends React.Component { } public render() { - console.log("this.state.cambiarTab: ", this.state.cambiarTab) return (
{this.state.cambiarTab==="Noticias" ? : } {this.state.cambiarTab==="Calendario" ? : } - {this.state.cambiarTab==="Documentos" ? : } + } */} {this.state.cambiarTab==="Propuestas" ? :
-
+
-
Noticias
+
Inicio
 -
+
-
Noticias
+
Inicio
-
+
Calendario
 -
+
Calendario
 + {/* {this.state.cambiarTab==="Documentos" ?
-
+
Documentos
 -
+
Documentos
-
-
+
Propuestas
 -
+
Propuestas
@@ -109,10 +107,11 @@ class NavBar extends React.Component {
- {this.state.cambiarTab === "Noticias" ? : this.state.cambiarTab === "Calendario" ? : this.state.cambiarTab === "Documentos" ? : } + {this.state.cambiarTab === "Noticias" ? : this.state.cambiarTab === "Calendario" ? : }
); } } -export default NavBar; \ No newline at end of file +export default NavBar; +//: this.state.cambiarTab === "Documentos" ? \ No newline at end of file diff --git a/src/components/Noticias.tsx b/src/components/Noticias.tsx index b520ca7..2fd9a60 100644 --- a/src/components/Noticias.tsx +++ b/src/components/Noticias.tsx @@ -1,7 +1,8 @@ import React from 'react'; import '../assets/scss/index.scss'; import '../assets/css/style.css'; -import TablaNoticias from './TablaNoticias'; +import NoticiasCaja from '../containers/NoticiasCaja'; +import DocumentosCaja from '../containers/DocumentosCaja'; interface INoticiasProps { cambiarTab: string; @@ -20,8 +21,10 @@ class Noticias extends React.Component { return (
- -
+
+ + +
); diff --git a/src/components/NoticiasCaja.tsx b/src/components/NoticiasCaja.tsx new file mode 100644 index 0000000..9aa77f7 --- /dev/null +++ b/src/components/NoticiasCaja.tsx @@ -0,0 +1,110 @@ +import React from 'react'; +import '../assets/scss/index.scss'; +import '../assets/css/style.css'; + +interface INoticiasCajaProps { + verMasNoticias: boolean; + nombre: string; + onVerMasNoticiasClick: (verMasNoticias: boolean, nombre: string) => any; +} +interface INoticiasCajaState { + verMasNoticias: boolean; + nombre: string; +} + +class NoticiasCaja extends React.Component { + constructor(props: INoticiasCajaProps) { + super(props); + this.state = { verMasNoticias: this.props.verMasNoticias, nombre: this.props.nombre } + }; + + public onVerMasNoticiasClick = () => { + this.props.onVerMasNoticiasClick(true, "Ver menos"); + this.setState({ verMasNoticias: true, nombre: "Ver menos" }); + } + public render() { + return ( + + ); + } +} + +export default NoticiasCaja; \ No newline at end of file diff --git a/src/components/TablaNoticias.tsx b/src/components/TablaNoticias.tsx index 9e6b4db..2ffbc84 100644 --- a/src/components/TablaNoticias.tsx +++ b/src/components/TablaNoticias.tsx @@ -32,13 +32,9 @@ class TablaNoticias extends React.Component { -
-
Fecha
-
-
Mensaje
diff --git a/src/components/TablaPrimeraConvocatoria.tsx b/src/components/TablaPrimeraConvocatoria.tsx index ce92a0e..47798c9 100644 --- a/src/components/TablaPrimeraConvocatoria.tsx +++ b/src/components/TablaPrimeraConvocatoria.tsx @@ -7,7 +7,7 @@ class TablaPrimeraConvocatoria extends React.Component { return (
-
[Curso: 2020/2021] [Convocatoria: Primera (Junio-Julio)]
+
[Curso: 2020/2021] [Convocatoria: Primera (Junio-Julio)]
@@ -15,30 +15,20 @@ class TablaPrimeraConvocatoria extends React.Component { - - - - - @@ -47,12 +37,12 @@ class TablaPrimeraConvocatoria extends React.Component {
-
-
+
+
-
-
-
Departamento
+ 		+
Departamento
 -
-
-
Entrega Memoria
+ 		+
Entrega Memoria
 -
-
-
Inscripción
+ 		+
Inscripción
 -
-
-
Entrega Presentación
+ 		+
Entrega Presentación
 -
-
-
Exposición Oral
+ 		+
Exposición Oral
- + diff --git a/src/components/TablaSegundaConvocatoria.tsx b/src/components/TablaSegundaConvocatoria.tsx index f226e32..6053020 100644 --- a/src/components/TablaSegundaConvocatoria.tsx +++ b/src/components/TablaSegundaConvocatoria.tsx @@ -5,9 +5,9 @@ import '../assets/css/style.css'; class TablaSegundaConvocatoria extends React.Component { public render() { return ( -
+
-
[Curso: 2020/2021] [Convocatoria: Segunda (Septiembre)]
+
[Curso: 2020/2021] [Convocatoria: Segunda (Septiembre)]
@@ -15,30 +15,20 @@ class TablaSegundaConvocatoria extends React.Component {
Ciencias de la Computación e Inteligencia Artificial
- - - - - @@ -47,14 +37,14 @@ class TablaSegundaConvocatoria extends React.Component {
-
-
+
+
-
-
-
Departamento
+ 		+
Departamento
 -
-
-
Entrega Memoria
+ 		+
Entrega Memoria
 -
-
-
Inscripción
+ 		+
Inscripción
 -
-
-
Entrega Presentación
+ 		+
Entrega Presentación
 -
-
-
Exposición Oral
+ 		+
Exposición Oral
-
Ciencias de la Computación e Inteligencia Artificial
+
Ciencias de la Computación e Inteligencia Artificial
08-09-2021
diff --git a/src/containers/DocumentosCaja.tsx b/src/containers/DocumentosCaja.tsx new file mode 100644 index 0000000..8b3c524 --- /dev/null +++ b/src/containers/DocumentosCaja.tsx @@ -0,0 +1,18 @@ +import { connect } from 'react-redux'; +import IGlobalState from '../state/globalState'; +import { Dispatch } from 'redux'; +import DocumentosCaja from '../components/DocumentosCaja'; +import { Actions } from '../actions/Actions'; + +const mapStateToProps = (state: IGlobalState) => ({ + verMasDocumentos: state.verMasDocumentos, + nombreDocumentos: state.nombreNoticias +}) + +const mapDispatchToProps = (dispatch: Dispatch) => ({ + onVerMasDocumentosClick: (value: boolean, nombreDocumentos: string) => { + dispatch({ type: Actions.VER_MAS_NOTICIAS, payload: value, nombreDocumentos: nombreDocumentos }) + } +}) + +export default connect(mapStateToProps, mapDispatchToProps)(DocumentosCaja); \ No newline at end of file diff --git a/src/containers/NoticiasCaja.tsx b/src/containers/NoticiasCaja.tsx new file mode 100644 index 0000000..15f3124 --- /dev/null +++ b/src/containers/NoticiasCaja.tsx @@ -0,0 +1,18 @@ +import { connect } from 'react-redux'; +import IGlobalState from '../state/globalState'; +import { Dispatch } from 'redux'; +import NoticiasCaja from '../components/NoticiasCaja'; +import { Actions } from '../actions/Actions'; + +const mapStateToProps = (state: IGlobalState) => ({ + verMasNoticias: state.verMasNoticias, + nombre: state.nombreNoticias +}) + +const mapDispatchToProps = (dispatch: Dispatch) => ({ + onVerMasNoticiasClick: (value: boolean, nombre: string) => { + dispatch({ type: Actions.VER_MAS_NOTICIAS, payload: value, nombre: nombre }) + } +}) + +export default connect(mapStateToProps, mapDispatchToProps)(NoticiasCaja); \ No newline at end of file diff --git a/src/state/globalState.ts b/src/state/globalState.ts index 34cf5a6..f03aacc 100644 --- a/src/state/globalState.ts +++ b/src/state/globalState.ts @@ -1,21 +1,17 @@ -// import Color from "color"; - interface IGlobalState { - textAreaText: string; - width: string; - height: string; - // colorBorder: Color; - sizeBorder: string; cambiarTab: string; + verMasNoticias: boolean; + nombreNoticias: string; + verMasDocumentos: boolean; + nombreDocumentos: string; } export default IGlobalState; export const initialState: IGlobalState = { - textAreaText: "Input your text", - width: "100", - height: "50", - // colorBorder: Color("#ffffff"), - sizeBorder: "1", - cambiarTab: "Noticias" + cambiarTab: "Noticias", + verMasNoticias: false, + nombreNoticias: "Ver más", + verMasDocumentos: false, + nombreDocumentos: "Ver más" } \ No newline at end of file