From 4d8834e8c63aa8b3754b6dbc49128619f35b4e4d Mon Sep 17 00:00:00 2001 From: Rodrigo Benitez Date: Thu, 24 Sep 2020 10:03:13 -0400 Subject: [PATCH 1/4] feat: Explore data landing page feat: Refactor layout structure --- portal/src/App.tsx | 2 +- .../src/assets/imgs/autoridades_electas.svg | 265 ++++++ portal/src/assets/imgs/background2.svg | 11 + portal/src/assets/imgs/background3.svg | 13 + portal/src/assets/imgs/buscador_personas.svg | 770 ++++++++++++++++++ portal/src/assets/imgs/declaraciones.svg | 71 ++ portal/src/assets/imgs/exoneradas_ande.svg | 71 ++ portal/src/assets/imgs/exoneradas_essap.svg | 73 ++ portal/src/components/BaseDatosPage.tsx | 22 +- .../components/{sidebar.tsx => Sidebar.tsx} | 0 .../layout/Footer.css} | 34 +- .../{Home => components/layout}/Footer.tsx | 27 +- .../layout/Header.css} | 21 +- .../{Home => components/layout}/Header.tsx | 6 +- .../layout/Layout.css} | 5 + portal/src/pages/ActionResearchLanding.tsx | 12 +- .../static/home.css => pages/Landing.css} | 196 +++-- .../{Home/Banner.tsx => pages/Landing.tsx} | 37 +- portal/src/pages/OCDSItemsRankingPage.tsx | 1 - portal/src/pages/Welcome.css | 28 + portal/src/pages/Welcome.tsx | 100 +-- 21 files changed, 1565 insertions(+), 200 deletions(-) create mode 100644 portal/src/assets/imgs/autoridades_electas.svg create mode 100644 portal/src/assets/imgs/background2.svg create mode 100644 portal/src/assets/imgs/background3.svg create mode 100644 portal/src/assets/imgs/buscador_personas.svg create mode 100644 portal/src/assets/imgs/declaraciones.svg create mode 100644 portal/src/assets/imgs/exoneradas_ande.svg create mode 100644 portal/src/assets/imgs/exoneradas_essap.svg rename portal/src/components/{sidebar.tsx => Sidebar.tsx} (100%) rename portal/src/{Home/static/footer.css => components/layout/Footer.css} (79%) rename portal/src/{Home => components/layout}/Footer.tsx (77%) rename portal/src/{Home/static/header.css => components/layout/Header.css} (84%) rename portal/src/{Home => components/layout}/Header.tsx (93%) rename portal/src/{Home/static/layout.css => components/layout/Layout.css} (91%) rename portal/src/{Home/static/home.css => pages/Landing.css} (76%) rename portal/src/{Home/Banner.tsx => pages/Landing.tsx} (67%) create mode 100644 portal/src/pages/Welcome.css diff --git a/portal/src/App.tsx b/portal/src/App.tsx index 3a4f6b6..d493d4b 100644 --- a/portal/src/App.tsx +++ b/portal/src/App.tsx @@ -22,7 +22,7 @@ import {ActionResearchLanding} from './pages/ActionResearchLanding'; import {OCDSBuyersPage} from './pages/OCDSBuyers'; import {OCDSSupplierWithSanctionPage} from './pages/OCDSSupplierWithSanction'; import {OCDSCovidTenders} from './pages/OCDSCovidTenders'; -import Banner from "./Home/Banner"; +import Banner from "./pages/Landing"; export default function App() { return diff --git a/portal/src/assets/imgs/autoridades_electas.svg b/portal/src/assets/imgs/autoridades_electas.svg new file mode 100644 index 0000000..e46e3ac --- /dev/null +++ b/portal/src/assets/imgs/autoridades_electas.svg @@ -0,0 +1,265 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/portal/src/assets/imgs/background2.svg b/portal/src/assets/imgs/background2.svg new file mode 100644 index 0000000..26c46e6 --- /dev/null +++ b/portal/src/assets/imgs/background2.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/portal/src/assets/imgs/background3.svg b/portal/src/assets/imgs/background3.svg new file mode 100644 index 0000000..73ddbdc --- /dev/null +++ b/portal/src/assets/imgs/background3.svg @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/portal/src/assets/imgs/buscador_personas.svg b/portal/src/assets/imgs/buscador_personas.svg new file mode 100644 index 0000000..1035749 --- /dev/null +++ b/portal/src/assets/imgs/buscador_personas.svg @@ -0,0 +1,770 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/portal/src/assets/imgs/declaraciones.svg b/portal/src/assets/imgs/declaraciones.svg new file mode 100644 index 0000000..8538d8c --- /dev/null +++ b/portal/src/assets/imgs/declaraciones.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/portal/src/assets/imgs/exoneradas_ande.svg b/portal/src/assets/imgs/exoneradas_ande.svg new file mode 100644 index 0000000..238b308 --- /dev/null +++ b/portal/src/assets/imgs/exoneradas_ande.svg @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/portal/src/assets/imgs/exoneradas_essap.svg b/portal/src/assets/imgs/exoneradas_essap.svg new file mode 100644 index 0000000..a76440d --- /dev/null +++ b/portal/src/assets/imgs/exoneradas_essap.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/portal/src/components/BaseDatosPage.tsx b/portal/src/components/BaseDatosPage.tsx index efd269c..20a91f3 100644 --- a/portal/src/components/BaseDatosPage.tsx +++ b/portal/src/components/BaseDatosPage.tsx @@ -1,9 +1,10 @@ import { ReactNode } from "react"; import React from "react"; -import { Header } from "../Home/Header"; +import { Header } from "./layout/Header"; import { Row, Col } from "antd"; -import { Sidebar } from "./sidebar"; -import Footer from "../Home/Footer"; +import { Sidebar } from "./Sidebar"; +import Footer from "./layout/Footer"; +import './layout/Layout.css' export function BaseDatosPage(props: { headerExtra?: boolean; @@ -15,12 +16,15 @@ export function BaseDatosPage(props: { return <>
- - - - {props.children} - - +
+ + + + + {props.children} + + +