Actualización de diseño según UX

chrmarand · Mar 1, 2021 · 0886ea4 · 0886ea4
1 parent 0102800
commit 0886ea4
Show file tree

Hide file tree

Showing 18 changed files with 3,074 additions and 13 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,6 +14,7 @@
     "@types/react": "^17.0.1",
     "@types/react-dom": "^17.0.0",
     "@types/styled-components": "^5.1.7",
+    "admin-lte": "^3.0.5",
     "bootstrap": "^4.6.0",
     "react": "^17.0.1",
     "react-dom": "^17.0.1",

diff --git a/public/Comisiones_files/etsii.css b/public/Comisiones_files/etsii.css
@@ -342,7 +342,7 @@ margin-left: 5px;
 .colum_97
 {
     float: left;
-    width: 96.5%;
+    width: 49.5%;
     margin-top: 1%;
     margin-left: 0.5%;
 }

diff --git a/src/App.tsx b/src/App.tsx
@@ -15,6 +15,13 @@ import { Action, createStore } from 'redux';
 import IGlobalState, { initialState } from './state/globalState';
 import { IMenuComisionesAction, IMenuComisionesAprobacionAction, IMenuComisionesEventosAction, IMenuComisionesFuncionesAction, IMenuComisionesMiembrosAction, IMenuComisionesParrafoAction, IMenuComisionesTitleAction, MenuComisionesActions } from './actions/MenuComisionesActions';
 import { Provider } from 'react-redux';
+import Selector from './containers/Selector';
+import CardsCentro from './containers/CardsCentro';
+import { ChangePageActions, IPageChangeAction } from './actions/ChangePageActions';
+import { ISelectorCentroAction, ISelectorESTUDIOSAction, ISelectorGRADOAction, ISelectorMASTERAction, SelectorActions } from './actions/SelectorActions';
+import CardsEstudio from './containers/CardsEstudio';
+import CardsGrado from './containers/CardsGrado';
+import CardsMaster from './containers/CardsMaster';
 
 
 const reducer = (state: IGlobalState = initialState, action: Action) => {
@@ -41,12 +48,31 @@ const reducer = (state: IGlobalState = initialState, action: Action) => {
       return { ...state, parrafo: parrafoAction.payload }
     case MenuComisionesActions.MIEMBROS:
       const miembrosAction = action as IMenuComisionesMiembrosAction;
-      console.log(miembrosAction.payload)
       return { ...state, miembros: miembrosAction.payload }
 
     case MenuComisionesActions.APROBACION:
       const aprobacionAction = action as IMenuComisionesAprobacionAction;
       return { ...state, aprobacion: aprobacionAction.payload }
+
+
+
+    case ChangePageActions.PAGECHANGE:
+      const pageChangeAction = action as IPageChangeAction;
+      return { ...state, pageNumber: pageChangeAction.payload }
+
+    case SelectorActions.CENTRO:
+      const selectorcentroAction = action as ISelectorCentroAction;
+      return { ...state, collapsedCenter: selectorcentroAction.payload }
+    case SelectorActions.ESTUDIOS:
+      const selectorEstudiosAction = action as ISelectorESTUDIOSAction;
+      return { ...state, collapsedEstudios: selectorEstudiosAction.payload }
+    case SelectorActions.GRADO:
+      const selectorGradoAction = action as ISelectorGRADOAction;
+      return { ...state, collapsedGrado: selectorGradoAction.payload }
+    case SelectorActions.MASTER:
+      const selectormasterAction = action as ISelectorMASTERAction;
+      return { ...state, collapsedMaster: selectormasterAction.payload }
+
   }
   return state;
 }
@@ -66,13 +92,19 @@ function App() {
 
               <Menulateral></Menulateral>
               <div id="fav-maincontent" className="span9">
+
                 <div id="system-message-container">
+
                 </div>
                 <div className="item-page" >
 
-
-                  <MenuComisiones></MenuComisiones>
-                  <IndividualDetails></IndividualDetails>
+                  <Selector></Selector>
+                  <CardsCentro></CardsCentro>
+                  <CardsEstudio></CardsEstudio>
+                  <CardsGrado></CardsGrado>
+                  <CardsMaster></CardsMaster>
+                  {/* <MenuComisiones></MenuComisiones>
+                  <IndividualDetails></IndividualDetails> */}
 
                 </div>
               </div>

diff --git a/src/actions/ChangePageActions.ts b/src/actions/ChangePageActions.ts
@@ -0,0 +1,9 @@
+import { Action } from 'redux';
+
+export enum ChangePageActions {
+    PAGECHANGE = 'PAGECHANGE',
+
+}
+export interface IPageChangeAction extends Action {
+    payload: number;
+}
diff --git a/src/actions/SelectorActions.ts b/src/actions/SelectorActions.ts
@@ -0,0 +1,21 @@
+import { Action } from 'redux';
+
+export enum SelectorActions {
+    CENTRO = 'CENTRO',
+    ESTUDIOS = 'ESTUDIOS',
+    GRADO = 'GRADO',
+    MASTER = 'MASTER',
+
+}
+export interface ISelectorCentroAction extends Action {
+    payload: boolean;
+}
+export interface ISelectorESTUDIOSAction extends Action {
+    payload: boolean;
+}
+export interface ISelectorGRADOAction extends Action {
+    payload: boolean;
+}
+export interface ISelectorMASTERAction extends Action {
+    payload: boolean;
+}