merge master

.github/workflows/gh-pages.yml

@@ -3,7 +3,7 @@ name: Node.js CI
 on:
   push:
     branches:
-      - master
+      - main
 
 jobs:
   build:

.gitignore

@@ -67,3 +67,6 @@ yarn-error.log
 .pnp.js
 # Yarn Integrity file
 .yarn-integrity
+
+#Ignore asdf nodejs version management
+.tool-versions

content/events/climate-dialogues/ai-for-climate-change/index.md

@@ -0,0 +1,20 @@
+--- 
+context: |
+    In the third webinar held on 8th August 2023, the panelists shared their learnings, use cases, and approaches to leveraging digital technologies for different sectors such as agriculture, irrigation, public health, and pollution.  They jointly stressed the need to share data and algorithms in the open to encourage further collaborations, which is the essence of Digital Public Goods (DPG) and how AI models can be used and leveraged to build a more sustainable and resilient future. 
+eventtype: "Climate Dialogues"
+image: ./climate-dialgoues-3.jpg
+name: "Climate Dialogues - Aug, 2023"
+resources: 
+  - 
+    link: "https://civicdatalab.in/resources/climate-dialogues-August-8.pdf"
+    title: "Event Report"
+    type: Doc
+  - 
+    link: "https://www.youtube.com/watch?v=RA9yZey76w4"
+    title: "Event Video"
+    type: Video
+summary: "Innovative Use of AI Models and Open Data for Climate Action"
+type: eventdetail
+url: "https://civicdatalab.in/resources/climate-dialogues-August-8.pdf"
+youtube: "https://www.youtube.com/watch?v=RA9yZey76w4"
+---

content/events/climate-dialogues/foss-climate-change/index.md

@@ -21,4 +21,4 @@ summary: "Free & Open-source Software (FOSS) and Climate Change"
 type: eventdetail
 url: "https://civicdatalab.in/resources/climate-dialogues-May-9.pdf"
 youtube: "https://www.youtube.com/watch?v=tZ_3JvPxRYM&t=2450s"
----
+---

content/events/climate-dialogues/green-budgeting/index.md

@@ -0,0 +1,29 @@
+--- 
+context: |
+    The panelists shared their learnings, and approaches to use green budgets for collaboration between
+    government, civil society, and the private sector to achieve climate goals. They jointly stressed the
+    Green Budget is a significant step towards mainstreaming environmental considerations into fiscal
+    policies . Each panel presentation was followed by Q&A with the attendees. Margaux-Lucrèce Lelong,
+    French Senior Civil Servant and Policy Analyst at the OECD, summarized the key points for all the
+    panelists. The event had over 44 attendees from 6 countries.
+eventtype: "Climate Dialogues"
+image: ./climate-dialouges-4.jpg
+name: "Climate Dialogues - September, 2023"
+resources: 
+  - 
+    link: "https://civicdatalab.in/resources/climate-dialogues-september.pdf"
+    title: "Event Report"
+    type: Doc
+  - 
+    link: "https://www.youtube.com/watch?v=QAIUNNRIlhE"
+    title: "Event Video"
+    type: Video
+  - 
+    link: "https://drive.google.com/drive/folders/1SW9C9vdNCGOfAnxnbDjYtCOHJM7JspXM"
+    title: "Event Presentations"
+    type: Doc
+summary: "Global Perspectives on Data-Driven Green Budgeting"
+type: eventdetail
+url: "https://civicdatalab.in/resources/climate-dialogues-september.pdf"
+youtube: "https://www.youtube.com/watch?v=QAIUNNRIlhE"
+---

content/team/apoorv/index.md

@@ -8,7 +8,7 @@ github: https://github.com/apoorv74
 twitter:
 linkedin: https://www.linkedin.com/in/apoorvanand
 image: ./apoorv.png
-sectors: Law & Justice, Public Finance, Digital Public Goods
+sectors: Law & Justice, Public Finance, Digital Public Goods, Urban Development
 accentcolor: '#567568'
 text: light
 projects: Justice Hub, Tracking the implementation of the POCSO Act, Zombie Tracker, Open Budgets India Platform 2.0, Budgets for Justice, Data Workshops, Analysing the implementation of child protection laws in India

content/team/ridhi/index.md

@@ -0,0 +1,20 @@
+---
+name: Ridhi Choudhary
+role: Senior Accountant
+medium:
+description:
+quote: Our dreams make us who we are, so dream big and beautiful!
+github:
+twitter:
+linkedin: https://www.linkedin.com/in/ridhi-choudhary-90b12077/
+behance:
+image: ./ridhi.png
+sectors:
+projects:
+accentcolor:
+text:
+---
+
+Ridhi is a Finance and Accounts professional who works as a Senior Accountant in CivicDataLab. She finds happiness in learning and trying out new things. She has always wanted to be a good Financial Analyst and Reporter since she completed her Masters. She tries to bring perfection in her work as much as possible.
+
+She loves keeping her creativity and passion alive through reading, singing, dancing and cooking. Her favourite sport to play is badminton and to watch is cricket.

content/team/sravani/index.md

@@ -0,0 +1,18 @@
+---
+name: Gedela Sravani Sruthi
+role: Javascript Engineer
+medium:
+description:
+quote: Don't wish for it, Work for it.
+github: https://github.com/Ssravani272
+twitter:
+linkedin: http://www.linkedin.com/in/sravanisruthi-07
+behance:
+image: ./sravani.jpg
+sectors: Digital Public Goods
+projects:
+accentcolor:
+text:
+---
+
+Sravani a self-taught web developer passionate about creating impactful online experiences and fascinated by the world of blockchain. Apart from that she find great joy in speaking and understanding different languages.

content/team/swati/index.md

@@ -0,0 +1,18 @@
+---
+name: Swati S
+role: Javascript Engineer
+medium:
+description:
+quote: It always seems impossible until it's done.
+github: https://github.com/sswadi
+twitter:
+linkedin: https://www.linkedin.com/in/swatis1/
+behance:
+image: ./swati.jpg
+sectors: Digital Public Goods
+projects:
+accentcolor:
+text:
+---
+
+Swati is a marketer turned self-taught developer with a deep passion for problem-solving. Her journey from the world of marketing and advertising to the tech realm has fuelled her curiosity and ambition. She finds joy in trying new things and embracing life's simple pleasures, like a cup of chai or the beauty of a sunset. She also enjoys playing badminton, traveling, and dancing.

content/work/dpg/index.md

@@ -1,7 +1,7 @@
 ---
 name: Digital Public Goods
 description: The State of Digital Public Goods in India report and our continuing advocacy aims to help governments switch over to FOSS and leverage the FOSS community to co-create software that is useful, equitable, transparent, and accountable.
-image: ./foss.jpg
-color: '#fcfcb2'
+image: ./dpg.png
+color: '#74719e'
 type: sector
 ---

content/work/lawandjustice/index.md

@@ -1,8 +1,8 @@
 ---
 name: Law & Justice
 description: We create and curate high quality public datasets in the areas of law and justice. We build open data portals to increase information accessibility and conduct trainings and workshops for our partners to enhance their data and tech capacity.
-image: ./lnj.jpg
-color: '#ed7263'
+image: ./lnj.png
+color: '#4b4140'
 type: sector
 projects: Tracking the implementation of POCSO law,Zombie Tracker,Justice Hub
 events:

content/work/opencontracting/index.md

@@ -1,8 +1,8 @@
 ---
 name: Open Contracting
 description: We curate Public Finance data by following the flow of funds through budgets all the way through to public procurements. We are working on building open source tools to track, visualize, and analyze this information.
-image: ./pf.jpg
-color: '#e8ded4'
+image: ./oci.png
+color: '#076775'
 type: sector
 projects: Open Budgets India Phase II, Public Procurements, Girl Education Spending Tracker
 ---

content/work/opencontracting/oci/index.md

@@ -10,6 +10,11 @@ facebook:
 linkedin:
 github:
 resources:
+  - {
+      title: 'Intelligent Data Ecosystem for Assam - Flood Response and Management (IDEA FRM)',
+      link: 'https://drive.google.com/file/d/1WjYlRdyoxliBhyAEJbmN_Q0IXQz8nJBk/view',
+      type: 'Reports'
+    }
   - {
       title: 'Setting the sustainability standard for India’s healthcare procurement',
       link: 'https://www.open-contracting.org/2020/12/14/setting-the-sustainability-standard-for-indias-healthcare-procurement/',

content/work/publicfinance/index.md

@@ -1,8 +1,8 @@
 ---
 name: Public Finance
 description: We curate Public Finance data by following the flow of funds through budgets all the way through to public procurements. We are working on building open source tools to track, visualize, and analyze this information.
-image: ./pf.jpg
-color: '#c2d7ea'
+image: ./pf.png
+color: '#525568'
 type: sector
 projects: Open Budgets India Phase II, Public Procurements, Girl Education Spending Tracker
 ---

content/work/publicfinance/obi/index.md

@@ -74,6 +74,11 @@ resources:
       title: 'Will Tripura show ambition in Budget 2021?',
       link: 'https://medium.com/civicdatalab/will-tripura-show-ambition-in-budget-2021-e1ee8924d5eb',
       type: 'Blog'
+    }  
+  - {
+      title: 'Recommendation to Action: Green Budgeting in Assam',
+      link: 'https://drive.google.com/file/d/1CutJ1mvNESB6kaForc49P-na-j1qlXEl/view',
+      type: 'Report'
     }
 sector: Public Finance
 type: project

content/work/urbandevelopment/index.md

@@ -1,7 +1,7 @@
 ---
 name: Urban Development
 description: We are delving into the space of urban governance, where we work towards facilitating citizen engagement through making public information accessible on open data platforms. We also work towards involving the citizens in generating information relevant to their well-being, especially during the time of disasters.
-image: ./ud.jpg
-color: '#dfc481'
+image: ./ud.png
+color: '#4b4140'
 type: sector
 ---

src/components/ImageEventItem.js

@@ -36,32 +36,37 @@ const ImageEventContainer = styled(Link)`
   }
 `;
 
-const EventLabel = styled.p`
+const EventLabel = styled.span`
   padding: 4px 10px;
-  color: black !important;
+  color: white !important;
   background-color: ${(props) => (props.color ? props.color : '#fa7fe7')};
   position: absolute;
   z-index: 500;
-  top: 120px;
+  top: 60%;
   right: 0;
   font-weight: 500 !important;
 
+  @media(max-width:1024px) {
+    top:50%;
+  }
   @media (min-width: 1280px) {
-    top: 60%;
+    top: 55%;
   }
 `;
 
 const IconBackground = styled.div`
   background-image: ${(props) => (props.iconImg ? `url(${props.iconImg})` : `url(${fileImg})`)};
-  background-size: 100% 100%;
+  background-size: 60% 60%;
+  background-position: center;
+  background-repeat: no-repeat;
 `;
 
 const sectors = [
-  { name: 'Digital Public Goods', color: '#fcfcb2' },
-  { name: 'Law & Justice', color: '#ed7263' },
-  { name: 'Public Finance', color: '#c2d7ea' },
-  { name: 'Urban Development', color: '#dfc481' },
-  { name: 'Open Contracting', color: '#e8ded4' }
+  { name: 'Digital Public Goods', color: '#74719e' },
+  { name: 'Law & Justice', color: '#4b4140' },
+  { name: 'Public Finance', color: '#525568' },
+  { name: 'Urban Development', color: '#4b4140' },
+  { name: 'Open Contracting', color: '#076775' }
 ];
 
 const sectorLabelColorGenerator = (eventName) => {

src/components/ImageItem.js

@@ -51,11 +51,11 @@ const SectorLabel = styled.p`
 `;
 
 const sectors = [
-  { name: 'Digital Public Goods', color: '#fcfcb2' },
-  { name: 'Law & Justice', color: '#ed7263' },
-  { name: 'Public Finance', color: '#c2d7ea' },
-  { name: 'Urban Development', color: '#dfc481' },
-  { name: 'Open Contracting', color: '#e8ded4' }
+  { name: 'Digital Public Goods', color: '#74719e' },
+  { name: 'Law & Justice', color: '#4b4140' },
+  { name: 'Public Finance', color: '#525568' },
+  { name: 'Urban Development', color: '#4b4140' },
+  { name: 'Open Contracting', color: '#076775' }
 ];
 
 const sectorLabelColorGenerator = (sectorName) => {

src/components/Layout/Navbar.js

@@ -260,7 +260,7 @@ const Navbar = ({ dark, overlay }) => {
               <StyledLink
                 dark={dark?.toString()}
                 activeClassName="active-link"
-                partiallyActive={link.name === 'Work' || link.name === 'Team'}
+                partiallyActive={link.name === 'Work' || link.name === 'Team' || link.name === 'Events'}
                 to={link.path}
               >
                 {link.name}

src/components/SectorCard.js

@@ -119,10 +119,16 @@ const CardLink = styled(Link)`
 const SectorCard = ({ name, description, link, color, image, about }) => {
   return (
     <Card color={color}>
-      <Image fluid={image} />
+      <Image
+        fluid={image}
+        imgStyle={{
+          objectFit: 'contain',
+          objectPosition: '50% 50%'
+        }}
+      />
       <CardContent>
         <h4 style={{ color: color }} className={'sector-name'}>
-          {name === 'Digital Public Goods' ? 'DPG' : name}
+          {name === 'Digital Public Goods' ? 'Digital Public Goods (DPG)' : name}
         </h4>
         <p>{description}</p>
         <CardLink to={link}>

src/pages/events.js

@@ -47,6 +47,9 @@ export const EventsContent = styled.div`
   display: grid;
   grid-template-rows: auto auto;
   grid-template-columns: 1fr;
+  min-height: 90vh;
+  align-items: start;
+  align-content: start;
 
   @media (min-width: 1024px) {
     padding: 0;