Merge pull request #719 from basedosdados/staging

Staging
basedosdados · Oct 24, 2023 · 79b1148 · 79b1148
2 parents 3f87fc1 + 3f1fedd
commit 79b1148
Show file tree

Hide file tree

Showing 16 changed files with 67 additions and 60 deletions.
diff --git a/next/components/molecules/DataInformationQuery.js b/next/components/molecules/DataInformationQuery.js
@@ -389,7 +389,7 @@ bd_read_table, ///
                     objectFit="contain"
                     border="2px solid #DEDFE0"
                     borderRadius="5px"
-                    src="https://basedosdados-static.s3.us-east-2.amazonaws.com/images/bd_qrcode.png"
+                    src="https://storage.googleapis.com/basedosdados-website/images/bd_qrcode.png"
                   />
 
                   <VStack

diff --git a/next/components/molecules/Footer.js b/next/components/molecules/Footer.js
@@ -123,6 +123,12 @@ export default function Footer({ pages }) {
               <FooterLink href="https://basedosdados.github.io/mais/access_data_packages/">
                 Pacotes
               </FooterLink>
+              <FooterLink href="https://info.basedosdados.org/bd-pro">
+                BD Pro
+              </FooterLink>
+              <FooterLink href="https://info.basedosdados.org/bd-edu">
+                BD Edu
+              </FooterLink>
             </SectionCategories>
 
             <SectionCategories title="SERVIÇOS" marginBottom={isMobileMod && "24px !important"}>
@@ -199,7 +205,7 @@ export default function Footer({ pages }) {
             alignItems="flex-start"
             marginTop={isMobileMod && "16px"}
           >
-            <BodyText color="#FFF" fontSize="16px" letterSpacing="0.2px">® 2022 Base dos Dados</BodyText>
+            <BodyText color="#FFF" fontSize="16px" letterSpacing="0.2px">® 2023 Base dos Dados</BodyText>
             {/* <Text>|</Text> // TODO: Não existem essas páginas ainda!
             <Link color="white">Termos de uso</Link>
             <Text>|</Text>

diff --git a/next/components/molecules/ThemeCatalog.js b/next/components/molecules/ThemeCatalog.js
@@ -105,7 +105,7 @@ function Themes ({
                 filter={found(elm.node.slug) && "invert(1)"}
                 _hover={{ filter:"invert(1)"}}
                 alt={`${elm.node.name}`}
-                src={`https://basedosdados-static.s3.us-east-2.amazonaws.com/category_icons/2022/icone_${elm.node.slug}.svg`}
+                src={`https://storage.googleapis.com/basedosdados-website/category_icons/2022/icone_${elm.node.slug}.svg`}
               />
             </Tooltip>
             <RemoveIcon

diff --git a/next/components/organisms/BePartner.js b/next/components/organisms/BePartner.js
@@ -18,7 +18,7 @@ function Testimonial({ children, name, position, src }) {
           alt="aspas"
           width="50px"
           height="36px"
-          src="https://basedosdados-static.s3.us-east-2.amazonaws.com/images/%E2%80%9C.png"
+          src="https://storage.googleapis.com/basedosdados-website/images/quote.png"
         />
       </Stack>
       <Text
@@ -109,14 +109,14 @@ export function BePartner() {
           justifyContent="center"
           flexWrap="wrap"
         >
-          <PartnerBox alt="tesouro nacional" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/tesouro_nacional.png" />
-          <PartnerBox alt="ipea" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/ipea.png" />
-          <PartnerBox alt="alziras" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/alziras.png" />
-          <PartnerBox alt="fiquem sabendo" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/fiquem_sabendo.png" />
-          <PartnerBox alt="bg lemann" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/bg__lemann.png" />
-          <PartnerBox alt="rio" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/rio.png" />
-          <PartnerBox alt="governosp" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/governosp.png" />
-          <PartnerBox alt="aponte" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/aponte.png" />
+          <PartnerBox alt="tesouro nacional" src="https://storage.googleapis.com/basedosdados-website/logos/2022/tesouro_nacional.png" />
+          <PartnerBox alt="ipea" src="https://storage.googleapis.com/basedosdados-website/logos/2022/ipea.png" />
+          <PartnerBox alt="alziras" src="https://storage.googleapis.com/basedosdados-website/logos/2022/alziras.png" />
+          <PartnerBox alt="fiquem sabendo" src="https://storage.googleapis.com/basedosdados-website/logos/2022/fiquem_sabendo.png" />
+          <PartnerBox alt="bg lemann" src="https://storage.googleapis.com/basedosdados-website/logos/2022/bg__lemann.png" />
+          <PartnerBox alt="rio" src="https://storage.googleapis.com/basedosdados-website/logos/2022/rio.png" />
+          <PartnerBox alt="governosp" src="https://storage.googleapis.com/basedosdados-website/logos/2022/governosp.png" />
+          <PartnerBox alt="aponte" src="https://storage.googleapis.com/basedosdados-website/logos/2022/aponte.png" />
         </Stack>
       </Stack>
       {!isMobile &&
@@ -136,7 +136,7 @@ export function BePartner() {
               <Testimonial
                 name="Fernando Barbalho"
                 position="Cientista de Dados do Tesouro Nacional"
-                src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/tesouro_nacional.png"
+                src="https://storage.googleapis.com/basedosdados-website/logos/2022/tesouro_nacional.png"
               >
                 O siconfiBD é um pacote que traz de forma rápida e programática os
                 dados da Secretaria do Tesouro Nacional.
@@ -150,7 +150,7 @@ export function BePartner() {
               <Testimonial
                 name="Marina Barros"
                 position="Diretora-Executiva do Instituto Alziras"
-                src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/alziras.png"
+                src="https://storage.googleapis.com/basedosdados-website/logos/2022/alziras.png"
               >
                 Com o apoio da Base dos Dados realizamos o levantamento das
                 desigualdades de gênero e raça nas eleições 2016-2020 e das
@@ -161,7 +161,7 @@ export function BePartner() {
               <Testimonial
                 name="Amanda de Albuquerque e Mariana Carvalho"
                 position="Co-fundadoras dA Ponte"
-                src="https://basedosdados-static.s3.us-east-2.amazonaws.com/logos/2022/aponte.png"
+                src="https://storage.googleapis.com/basedosdados-website/logos/2022/aponte.png"
               >
                 Criamos um importante produto nosso, a Fotografia do Município,
                 em parceria com a BD. A Fotografia

diff --git a/next/components/organisms/Database.js b/next/components/organisms/Database.js
@@ -214,7 +214,7 @@ export default function Database({
                           <CategoryIcon
                             alt={elm.name}
                             size="36px"
-                            url={`https://basedosdados-static.s3.us-east-2.amazonaws.com/category_icons/2022/icone_${elm.slug}.svg`}
+                            url={`https://storage.googleapis.com/basedosdados-website/category_icons/2022/icone_${elm.slug}.svg`}
                           />
                         </Link>
                       </Center>

diff --git a/next/components/organisms/DatabaseCard.js b/next/components/organisms/DatabaseCard.js
@@ -105,7 +105,7 @@ export default function DatabaseCard({
                   alt={c.name}
                   size="37px"
                   padding="4px"
-                  url={`https://basedosdados-static.s3.us-east-2.amazonaws.com/category_icons/2022/icone_${c.slug}.svg`}
+                  url={`https://storage.googleapis.com/basedosdados-website/category_icons/2022/icone_${c.slug}.svg`}
                 />
               </Link>
             </Center>

diff --git a/next/components/organisms/InformationRequestPage.js b/next/components/organisms/InformationRequestPage.js
@@ -80,7 +80,7 @@ export default function InformationRequestPage({ id }) {
       title: "Fundação Lemann",
       description: "Organização que trabalha para garantir educação de qualidade para todas as crianças brasileiras e apoia líderes focados no desenvolvimento social do Brasil.",
       url: "https://fundacaolemann.org.br/",
-      src: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/logos/flemann.png"
+      src: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/logos/flemann.png"
     }
   }
 

diff --git a/next/content/caseStudies.js b/next/content/caseStudies.js
@@ -17,13 +17,13 @@ export const CaseStudiesContent = [
   {
     id: "fundacao-lemann",
     displayTitle: "Fundação Lemann",
-    thumbnail: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/thumbnails/thumbnail_estudo_de_caso_flemann.png",
+    thumbnail: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/thumbnails/thumbnail_estudo_de_caso_flemann.png",
     title: "Fundação Lemann aprimora tomada de decisão e monitoramento de metas com tecnologia de análises e engenharia de dados desenvolvida pela BD",
-    img: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/imagens/estudo_de_caso_flemann.png",
+    img: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/imagens/estudo_de_caso_flemann.png",
     imgDescription: "Foto: Samuel Macedo para Fundação Lemann",
     description: "Com mais de 61 redes de ensino apoiadas e mais de 28 mil escolas envolvidas, implementar um fluxo de análise de dados e indicadores foi fundamental para a Fundação Lemann compreender melhor o cenário da educação no Brasil, avaliar os programas apoiados e estabelecer metas estratégicas para potencializar o avanço da educação e o impulsionamento de lideranças no país.",
     logo: {
-      img: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/logos/flemann.png",
+      img: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/logos/flemann.png",
       width: 245,
       height: 85
     },
@@ -212,13 +212,13 @@ export const CaseStudiesContent = [
   {
     id: "jota",
     displayTitle: "JOTA",
-    thumbnail: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/thumbnails/thumbnail_estudo_de_caso_jota.png",
+    thumbnail: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/thumbnails/thumbnail_estudo_de_caso_jota.png",
     title: "Plataforma traz mais transparência para a prestação de contas de candidaturas e partidos nas Eleições 2022",
-    img: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/imagens/estudo_de_caso_jota.png",
+    img: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/imagens/estudo_de_caso_jota.png",
     imgDescription: "Foto: Tribunal Superior Eleitoral (TSE)",
     description: "Criada pela BD em parceria com o JOTA, empresa de jornalismo e tecnologia, a plataforma Siga o Dinheiro auxiliou população e imprensa no monitoramento do financiamento de campanhas eleitorais nas eleições de 2022. O projeto se tornou uma importante ferramenta para a transparência pública e o combate à corrupção no processo eleitoral.",
     logo: {
-      img: "https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/logos/jota.svg",
+      img: "https://storage.googleapis.com/basedosdados-website/estudos_de_caso/logos/jota.svg",
       width: 222,
       height: 85
     },
@@ -268,7 +268,7 @@ export const CaseStudiesContent = [
 
           <div class="contentImgCenter" style="margin: 48px 0">
             <a href="https://sigaodinheiro.org/#desigualdades" target="_blank">
-              <img alt="seção "desigualdades” do painel Siga o Dinheiro" src="https://basedosdados-static.s3.us-east-2.amazonaws.com/estudos_de_caso/paineis/painel_siga_o_dinheiro.png">
+              <img alt="seção "desigualdades” do painel Siga o Dinheiro" src="https://storage.googleapis.com/basedosdados-website/estudos_de_caso/paineis/painel_siga_o_dinheiro.png">
             </a>
           </div>
 

diff --git a/next/next.config.js b/next/next.config.js
@@ -1,9 +1,10 @@
 module.exports = {
   images: {
+    unoptimized: true,
     disableStaticImages: true,
     domains: [
       "basedosdados.org",
-      "basedosdados-static.s3.us-east-2.amazonaws.com"
+      "storage.googleapis.com/basedosdados-website",
     ]
   },
   output: "standalone",

diff --git a/next/pages/_app.js b/next/pages/_app.js
@@ -15,7 +15,7 @@ function MyApp({ Component, pageProps }) {
         <link rel="icon" type="image/ico" href="/favicon.ico" />
         <link
           rel="image_src"
-          href="https://basedosdados-static.s3.us-east-2.amazonaws.com/thumbnails/2022/thumbnail_padrao.png"
+          href="https://storage.googleapis.com/basedosdados-website/thumbnails/2022/thumbnail_padrao.png"
         />
 
         <title>Base dos Dados</title>
@@ -34,14 +34,14 @@ function MyApp({ Component, pageProps }) {
         <meta name="twitter:creator" content="@basedosdados" />
         <meta
           name="twitter:image"
-          content="https://basedosdados-static.s3.us-east-2.amazonaws.com/thumbnails/2022/thumbnail_padrao.png"
+          content="https://storage.googleapis.com/basedosdados-website/thumbnails/2022/thumbnail_padrao.png"
           key="twimage"
         />
 
         {/* Open Graph */}
         <meta
           property="og:image"
-          content="https://basedosdados-static.s3.us-east-2.amazonaws.com/thumbnails/2022/thumbnail_padrao.png"
+          content="https://storage.googleapis.com/basedosdados-website/thumbnails/2022/thumbnail_padrao.png"
           key="ogimage"
         />
         <meta

diff --git a/next/pages/blog/[pageId].js b/next/pages/blog/[pageId].js
@@ -101,7 +101,7 @@ function BlogPage({ pages = [] }) {
               <Image
                 alt="fundo rede"
                 priority
-                src="https://basedosdados-static.s3.us-east-2.amazonaws.com/images/fundo_rede.png"
+                src="https://storage.googleapis.com/basedosdados-website/images/fundo_rede.png"
                 layout="fill"
                 objectFit="contain"
               />

diff --git a/next/pages/dataset/[dataset].js b/next/pages/dataset/[dataset].js
@@ -81,16 +81,16 @@ export default function DatasetPage ({
 
         <link
           rel="image_src"
-          href="https://basedosdados-static.s3.us-east-2.amazonaws.com/thumbnails/2022/thumbnail_conjunto.png"
+          href="https://storage.googleapis.com/basedosdados-website/thumbnails/2022/thumbnail_conjunto.png"
         />
         <meta
           property="og:image"
-          content="https://basedosdados-static.s3.us-east-2.amazonaws.com/thumbnails/2022/thumbnail_conjunto.png"
+          content="https://storage.googleapis.com/basedosdados-website/thumbnails/2022/thumbnail_conjunto.png"
           key="ogimage"
         />
         <meta
           name="twitter:image"
-          content="https://basedosdados-static.s3.us-east-2.amazonaws.com/thumbnails/2022/thumbnail_conjunto.png"
+          content="https://storage.googleapis.com/basedosdados-website/thumbnails/2022/thumbnail_conjunto.png"
           key="twimage"
         />
         <meta

diff --git a/next/pages/index.js b/next/pages/index.js
@@ -603,7 +603,7 @@ function Support({ pages }) {
                 height="250px"
                 objectFit="contain"
                 boxShadow="0 1.6px 16px rgba(100, 96, 103, 0.16)"
-                src="https://basedosdados-static.s3.us-east-2.amazonaws.com/images/bd_qrcode.png"
+                src="https://storage.googleapis.com/basedosdados-website/images/bd_qrcode.png"
               />
               <RoundedButton 
                 fontSize="15px"