TS174-AlteracaoRevisaoEmonitor (#236)

* #235 - Changing apis card title to e-monitor * #235 - Add letter spacing in wikilegis and audiences pages * #235 - Removing spacing in wikilegis and audiences pages * #235 - Leaving the wikilegis ranking table the same as the audiences table
labhackercd · Dec 14, 2021 · 4fea6f5 · 4fea6f5
1 parent 65802e5
commit 4fea6f5
Show file tree

Hide file tree

Showing 14 changed files with 40 additions and 16 deletions.
diff --git a/.env.development b/.env.development
@@ -5,7 +5,7 @@ NEXT_PUBLIC_GA_ID_TOKEN=UA-70690943-5
 NEXT_PUBLIC_EDEMOCRACIA_BASE_URL=https://edemocracia.camara.leg.br
 NEXT_PUBLIC_AUDIENCIAS_SITE_URL=https://edemocracia.camara.leg.br/audiencias/
 NEXT_PUBLIC_WIKILEGIS_SITE_URL=https://edemocracia.camara.leg.br/wikilegis/
-NEXT_PUBLIC_PARTICIPATION_SITE_URL=https://tes.edemocracia.camara.leg.br/participacao
+NEXT_PUBLIC_PARTICIPATION_SITE_URL=https://tes.edemocracia.camara.leg.br/emonitor
 
 # APP NEXTJS ROUTES
 NEXT_PUBLIC_INITIAL_PAGE_URL=/

diff --git a/.env.production b/.env.production
@@ -5,7 +5,7 @@ NEXT_PUBLIC_GA_ID_TOKEN=UA-70690943-3
 NEXT_PUBLIC_EDEMOCRACIA_BASE_URL=https://edemocracia.camara.leg.br
 NEXT_PUBLIC_AUDIENCIAS_SITE_URL=https://edemocracia.camara.leg.br/audiencias/
 NEXT_PUBLIC_WIKILEGIS_SITE_URL=https://edemocracia.camara.leg.br/wikilegis/
-NEXT_PUBLIC_PARTICIPATION_SITE_URL=https://edemocracia.camara.leg.br/participacao
+NEXT_PUBLIC_PARTICIPATION_SITE_URL=https://edemocracia.camara.leg.br/emonitor
 
 # APP NEXTJS ROUTES
 NEXT_PUBLIC_INITIAL_PAGE_URL=/

diff --git a/.env.test b/.env.test
@@ -5,7 +5,7 @@ NEXT_PUBLIC_GA_ID_TOKEN=UA-70690943-5
 NEXT_PUBLIC_EDEMOCRACIA_BASE_URL=https://edemocracia.camara.leg.br
 NEXT_PUBLIC_AUDIENCIAS_SITE_URL=https://edemocracia.camara.leg.br/audiencias/
 NEXT_PUBLIC_WIKILEGIS_SITE_URL=https://edemocracia.camara.leg.br/wikilegis/
-NEXT_PUBLIC_PARTICIPATION_SITE_URL=https://tes.edemocracia.camara.leg.br/participacao
+NEXT_PUBLIC_PARTICIPATION_SITE_URL=https://tes.edemocracia.camara.leg.br/emonitor
 
 # APP NEXTJS ROUTES
 NEXT_PUBLIC_INITIAL_PAGE_URL=/

diff --git a/src/components/Headers/SectionHeader/index.js b/src/components/Headers/SectionHeader/index.js
@@ -13,7 +13,7 @@ export default function SectionHeader(props) {
   return (
     <Box display="flex" flexFlow="wrap" justifyContent="space-between" alignItems="center">
       <Box display="flex">
-        <Typography className={classes.typographyHeaderSection} component="div" variant="h2">
+        <Typography className={`${classes.typographyHeaderSection} ${classes.typography}`} component="div" variant="h2">
           <Box fontWeight="fontWeightBold">
             {title}
           </Box>

diff --git a/src/containers/Audiencias/index.js b/src/containers/Audiencias/index.js
@@ -690,7 +690,7 @@ function Audiencias(props) {
             )}
         </Grid>
 
-        <Grid item xs={12} className={classes.spacing}>
+        <Grid item xs={12} className={classes.spacing} style={{ padding: 0 }}>
           <SectionHeader
             classes={classes}
             title={TEXTCONSTANTS.distributionOfParticipationSectionTexts.title}
@@ -729,7 +729,7 @@ function Audiencias(props) {
             )}
         </Grid>
 
-        <Grid item xs={12} className={classes.spacing}>
+        <Grid item xs={12} className={classes.spacing} style={{ padding: 0 }}>
           <SectionHeader
             classes={classes}
             toolTipColor={customTheme.palette.audiencias.seabuckthorn}
@@ -781,7 +781,7 @@ function Audiencias(props) {
           />
         </Grid>
 
-        <Grid item xs={12} className={classes.spacing}>
+        <Grid item xs={12} className={classes.spacing} style={{ padding: 0 }}>
           <SubSectionHeader
             style={{ marginTop: '0px' }}
             title={TEXTCONSTANTS.usersSectionTexts.subSectionNewUsers.title}
@@ -813,7 +813,7 @@ function Audiencias(props) {
           )}
         </Grid>
 
-        <Grid item xs={12} className={classes.spacing}>
+        <Grid item xs={12} className={classes.spacing} style={{ padding: 0 }}>
           <SubSectionHeader
             title={
               TEXTCONSTANTS.usersSectionTexts

diff --git a/src/containers/Audiencias/style.js b/src/containers/Audiencias/style.js
@@ -37,6 +37,10 @@ export const useStyles = makeStyles((theme) => ({
   toolTipIcon: {
     color: theme.palette.audiencias.toolTip,
   },
+  typography: {
+    fontFamily: 'Open Sans',
+    letterSpacing: '0.05em',
+  },
   typographyHeaderSection: {
     fontSize: '16px',
     paddingBottom: '16px',

diff --git a/src/containers/Wikilegis/index.js b/src/containers/Wikilegis/index.js
@@ -578,8 +578,9 @@ function Wikilegis(props) {
           />
         </Grid>
 
-        <Grid item xs={12} className={classes.spacing}>
+        <Grid item xs={12} className={classes.spacing} style={{ padding: 0 }}>
           <SubSectionHeader
+            style={{ marginTop: '0px' }}
             title={TEXTCONSTANTS.usersSectionTexts.subSectionNewUsers.title}
             toolTipText={TEXTCONSTANTS.usersSectionTexts.subSectionNewUsers.toolTip}
             toolTipAriaLabel={TEXTCONSTANTS.usersSectionTexts.subSectionNewUsers.toolTipAriaLabel}

diff --git a/src/containers/Wikilegis/settings/rankingSettings.js b/src/containers/Wikilegis/settings/rankingSettings.js
@@ -10,50 +10,57 @@ export const rankingWikilegisColumns = [
     name: 'Proposta Legilastiva',
     selector: 'document.title',
     sortable: true,
-    minWidth: '550px',
+    maxWidth: '500px',
+    fixedHeader: true,
     cell: (row) => (
       <a
         href={`${process.env.NEXT_PUBLIC_EDEMOCRACIA_BASE_URL}${row.get_absolute_url}`}
         target="_blank"
         rel="noopener noreferrer"
-        style={{ color: '#ffffff', textDecoration: 'none' }}
+        style={{ color: '#ffffff' }}
       >
         {row.document.title}
       </a>
     ),
   },
   {
     name: 'Data de Abertura',
+    maxWidth: '80px',
     selector: 'openning_date',
     sortable: true,
     cell: (row) => formatDate(row.openning_date),
   },
   {
     name: 'Data de Encerramento',
     selector: 'closing_date',
+    maxWidth: '80px',
     sortable: true,
     cell: (row) => formatDate(row.closing_date),
   },
   {
     name: 'Participantes',
     selector: 'participants_count',
+    maxWidth: '50px',
     sortable: true,
     center: true,
   },
   {
     name: 'Opiniões',
     selector: 'suggestions_count',
+    maxWidth: '50px',
     sortable: true,
     center: true,
   },
   {
     name: 'Votos',
     selector: 'vote_count',
+    maxWidth: '50px',
     sortable: true,
     center: true,
   },
   {
     name: 'Parlamentar Responsável',
+    maxWidth: '150px',
     selector: 'document.responsible.name',
     sortable: true,
     center: true,

diff --git a/src/containers/Wikilegis/style.js b/src/containers/Wikilegis/style.js
@@ -37,6 +37,10 @@ export const useStyles = makeStyles((theme) => ({
   toolTipIcon: {
     color: theme.palette.wikilegis.jade,
   },
+  typography: {
+    fontFamily: 'Open Sans',
+    letterSpacing: '0.05em',
+  },
   typographyHeaderSection: {
     fontSize: '16px',
     paddingBottom: '16px',

diff --git a/src/pages/audiencias.js b/src/pages/audiencias.js
@@ -28,11 +28,11 @@ function AudienciasPage({
   function AudienciasHeader() {
     return (
       <Box className={classes.boxTitle}>
-        <Typography className={classes.typographyTitle} variant="h1" component="div">
+        <Typography className={`${classes.typography} ${classes.typographyTitle}`} variant="h1" component="div">
           {TEXTCONSTANTS.pageTitle}
         </Typography>
         <div>
-          <Typography className={classes.typographyDescription} component="div" variant="h4">
+          <Typography className={`${classes.typography} ${classes.typographyDescription}`} component="div" variant="h4">
             {TEXTCONSTANTS.pageSubTitle}
           </Typography>
         </div>

diff --git a/src/pages/wikilegis.js b/src/pages/wikilegis.js
@@ -29,11 +29,11 @@ function WikilegisPage({
   function WikilegisHeader() {
     return (
       <Box className={classes.boxTitle}>
-        <Typography className={classes.typographyTitle} variant="h1" component="div">
+        <Typography className={`${classes.typography} ${classes.typographyTitle}`} variant="h1" component="div">
           {TEXTCONSTANTS.pageTitle}
         </Typography>
         <div>
-          <Typography className={classes.typographyDescription} component="div" variant="h4">
+          <Typography className={`${classes.typography} ${classes.typographyDescription}`} component="div" variant="h4">
             {TEXTCONSTANTS.pageSubTitle}
           </Typography>
         </div>

diff --git a/src/settings/texts/ApisPage/index.js b/src/settings/texts/ApisPage/index.js
@@ -32,7 +32,7 @@ export const apiCardsInfo = [
     },
   },
   {
-    title: 'Painel da Participação',
+    title: 'E-Monitor',
     infoText: 'Mostra o histórico de utilização de ferramentas na plataforma e-Democracia por meio de gráficos, totais e tabelas.',
     toolColor: '#E438B4',
     urls: {

diff --git a/src/styles/pages/audienciasPageStyle.js b/src/styles/pages/audienciasPageStyle.js
@@ -42,6 +42,10 @@ export const useStyles = makeStyles((theme) => ({
     height: '100%',
     maxWidth: '100%',
   },
+  typography: {
+    fontFamily: 'Open Sans',
+    letterSpacing: '0.05em',
+  },
   typographyTitle: {
     fontSize: '20px',
     fontWeight: 'bold',

diff --git a/src/styles/pages/wikilegisPageStyle.js b/src/styles/pages/wikilegisPageStyle.js
@@ -64,6 +64,10 @@ export const useStyles = makeStyles((theme) => ({
     height: '100%',
     maxWidth: '100%',
   },
+  typography: {
+    fontFamily: 'Open Sans',
+    letterSpacing: '0.05em',
+  },
   typographyTitle: {
     fontSize: '20px',
     fontWeight: 'bold',