From 402cc14fc36a66edba7ea0a04c06e990a751580d Mon Sep 17 00:00:00 2001 From: riya-2206 Date: Wed, 5 Jun 2024 18:56:53 +0530 Subject: [PATCH 1/3] added react components for c4gt2024 page --- .gitignore | 1 + docusaurus.config.js | 22 ++- package-lock.json | 23 +++- package.json | 3 + src/components/C4GT2024Page.js | 68 ++++++++++ src/components/ProjectDescription.js | 84 ++++++++++++ src/components/SubDescription.js | 191 +++++++++++++++++++++++++++ src/css/custom.css | 24 ++++ src/pages/docs/2024/index.css | 79 +++++++++++ src/pages/docs/2024/index.js | 104 +++++++++++++++ src/pages/docs/2024/org/index.js | 153 +++++++++++++++++++++ src/pages/index.js | 1 + static/img/C4GT_Logo_Text.png | Bin 0 -> 21958 bytes static/img/link_icon.svg | 1 + 14 files changed, 747 insertions(+), 7 deletions(-) create mode 100644 src/components/C4GT2024Page.js create mode 100644 src/components/ProjectDescription.js create mode 100644 src/components/SubDescription.js create mode 100644 src/pages/docs/2024/index.css create mode 100644 src/pages/docs/2024/index.js create mode 100644 src/pages/docs/2024/org/index.js create mode 100644 static/img/C4GT_Logo_Text.png create mode 100644 static/img/link_icon.svg diff --git a/.gitignore b/.gitignore index 1beaf077f..9b98fff93 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ npm-shrinkwrap.json # Misc .DS_Store +.env .env.local .env.development.local .env.test.local diff --git a/docusaurus.config.js b/docusaurus.config.js index 2b3a7765b..378bf9c07 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -1,3 +1,4 @@ +require('dotenv').config() const lightCodeTheme = require('prism-react-renderer/themes/github'); const darkCodeTheme = require('prism-react-renderer/themes/dracula'); const year = new Date().getFullYear(); @@ -14,10 +15,10 @@ module.exports = { projectName: "c4gt", themeConfig: { navbar: { - title: "Home", + // title: "DMP", logo: { - alt: "Home", - src: "img/logo.png", + alt: "DMP", + src: "img/C4GT_Logo_Text.png", }, items: [ { @@ -220,6 +221,17 @@ module.exports = { }, ], + }, + { + label: "2024", + position: "left", + to: "/docs/2024/", + items: [ + { + label: "VedantKhairnar", + to: "/docs/2024/org?id=VedantKhairnar", + }, + ] } ], }, @@ -285,4 +297,8 @@ module.exports = { }, ], ], + customFields: { + API_BASE_URL: process.env.API_BASE_URL, // Assuming you have REACT_APP_API_URL set in your environment + API_AUTH_KEY: process.env.API_AUTH_KEY, + }, }; diff --git a/package-lock.json b/package-lock.json index e755f63b2..7c2c2bb73 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,6 +22,9 @@ "react-scripts": "5.0.0", "url-loader": "^4.1.1", "yarn": "^1.22.19" + }, + "devDependencies": { + "dotenv": "^16.4.5" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -12193,11 +12196,15 @@ } }, "node_modules/dotenv": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", - "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", + "dev": true, "engines": { - "node": ">=10" + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" } }, "node_modules/dotenv-expand": { @@ -24193,6 +24200,14 @@ } } }, + "node_modules/react-scripts/node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "engines": { + "node": ">=10" + } + }, "node_modules/react-textarea-autosize": { "version": "8.5.3", "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.5.3.tgz", diff --git a/package.json b/package.json index 215d9402b..422b268db 100644 --- a/package.json +++ b/package.json @@ -41,5 +41,8 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "devDependencies": { + "dotenv": "^16.4.5" } } diff --git a/src/components/C4GT2024Page.js b/src/components/C4GT2024Page.js new file mode 100644 index 000000000..e874fc4cd --- /dev/null +++ b/src/components/C4GT2024Page.js @@ -0,0 +1,68 @@ +import React from "react"; + +function C4GT2024Page() { + return ( +
+
+
+
+
+ +
+
+

C4GT'24

+
+

+ C4GT Mentoring Program has been conceptualized as a summer coding + program to create a close-knit community that can build and contribute + to global digital public goods. +

+
    +
  • + An opportunity for college students and working professionals in + India to experience the GovTech space +
    • +
  • Organized annually over 2 months (July-August)
    • +
  • + There will be a set of diverse and engaging GovTech problem + statements every year for the participants to work on +
    • +
  • + Shortlisted contributors will receive mentorship from leading + practitioners in GovTech ecosystem +
    • +
+

Thanks for being part of the community. 💚

+
+
+
+
+
+
+ ); +} + +export default C4GT2024Page; diff --git a/src/components/ProjectDescription.js b/src/components/ProjectDescription.js new file mode 100644 index 000000000..f610dedd1 --- /dev/null +++ b/src/components/ProjectDescription.js @@ -0,0 +1,84 @@ +import React, { useEffect, useState } from "react"; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; + +function ProjectDescription({currentIssue, currentIssueData}) { + const { siteConfig } = useDocusaurusContext(); + const API_BASE_URL = siteConfig.customFields.API_BASE_URL; + const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + const [description,setDescription] = useState(null) + + useEffect(()=>{ + fetch(`${API_BASE_URL}/issues/${currentIssue}`, { + method: 'GET', + headers:{ + 'X-Secret-Key':API_AUTH_KEY, + } + }) + .then(response => { + return response.json(); + }) + .then(data => { + setDescription(()=>data) + }) + .catch(error => { + console.log("error",error.message); + }); +},[currentIssue]) + return ( +
+
+
+
+
+ +
+
+

{description?.name}

+
+

{description?.description} + {/* when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum */} +

+ {/*

Following are the list of Issues associated with the organization

+ {currentIssueData?.length!=0 &&
    + {currentIssueData?.map((d,i)=>{ + return
  • + + {d.name} + +
    • + })} + +
} */} +
+
+
+
+
+
+ ); +} + +export default ProjectDescription; diff --git a/src/components/SubDescription.js b/src/components/SubDescription.js new file mode 100644 index 000000000..4f0b49109 --- /dev/null +++ b/src/components/SubDescription.js @@ -0,0 +1,191 @@ +import React, { useEffect, useState } from "react"; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; + +function SubProjectDescription({ selectedProject,issueNumber, currentIssue }) { + const [description, setDescription] = useState(null); + const { siteConfig } = useDocusaurusContext(); + const API_BASE_URL = siteConfig.customFields.API_BASE_URL; + const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + + useEffect(() => { + fetch( + `${API_BASE_URL}/issues/${currentIssue}/${issueNumber}`, + { + method: "GET", + headers: { + "X-Secret-Key": API_AUTH_KEY, + }, + }, + ) + .then((response) => { + return response.json(); + }) + .then((data) => { + setDescription(() => data); + }) + .catch((error) => { + console.log("error", error.message); + }); + }, [selectedProject]); + + const parseMarkdown = (markdown) => { + markdown = markdown.replace(/^### (.*$)/gim, "

$1

"); + markdown = markdown.replace(/^## (.*$)/gim, `

$1

`); + markdown = markdown.replace(/^# (.*$)/gim, `

$1

`); + + markdown = markdown.replace(/\*\*(.*)\*\*/gim, "$1"); + markdown = markdown.replace(/\*(.*)\*/gim, "$1"); + + markdown = markdown.replace( + /- \[ \] (.*$)/gim, + ' $1', + ); + markdown = markdown.replace( + /- \[x\] (.*$)/gim, + ' $1', + ); + + markdown = markdown.replace(/^\s*-\s+(.*$)/gim, "
  • $1
    • "); + markdown = markdown.replace(/(
  • .*<\/li>)/gim, ""); + + markdown = markdown.replace(/\r\n\r\n/g, ""); + markdown = markdown.replace(/(?:\r\n|\r|\n)/g, "
    "); + + // markdown = markdown.replace(/\n/gim, "
    "); + console.log(markdown) + + return markdown.trim(); + }; + + return ( +
    + {description && ( +
    +
    +
    +
    +
    +
    +

    {selectedProject}

    +
    +
    + + + +
    +
    + {description?.description && <>

    Overview

    +

    + {description?.description} +

    } +
    +
    + {description?.overall_progress != null && <>
    +
    {description?.overall_progress + "%"} +
    + + +
    + {/*
    {description?.overall_progress + "%"}
    */} + } + + {description?.contributor_name && + + + } + {description?.mentor_name.length!=0 && <> + + + + {description?.mentor_name.length > 1 && ( + <> + {description?.mentor_name?.map((d, i) => { + if (i != 0) { + return ( + + + + ); + } else return <>; + })} + + )}} + {description?.org_name && + + + } +
    Contributor Name + {description?.contributor_name} +
    + Mentor Name + + {description?.mentor_name[0]} +
    + {d} +
    Org Name + + {description?.org_name} + +
    +
    +
    +
    + {description?.weekly_goals_html &&
    } + {/* {parseMarkdown(description?.weekly_goals_html)} */} +
    +
    + {description?.weekly_learnings_html &&
    } +
    +

    Overall Project PR Table

    + + + + + + + + + + + {description?.pr_details?.map((tdata, i) => { + return ( + + + + + + + ); + })} + +
    WeekPR NameLinkStatus
    {tdata.week}{tdata.name} + {tdata.link} + {tdata.status}
    +
    +
    + )} +
    + ); +} + +export default SubProjectDescription; diff --git a/src/css/custom.css b/src/css/custom.css index 6bbb300c4..b88843c14 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -15,3 +15,27 @@ margin: 0 calc(-1 * var(--ifm-pre-padding)); padding: 0 var(--ifm-pre-padding); } + +.dropdown__link--active, .dropdown__link--active:hover { + color: #1c1e21; +} +.dropdown__link--active { + background-color: #ffffff; +} + +.progress-bar-container { + width: 100%; + background-color: #e0e0df; + border-radius: 25px; + overflow: hidden; + margin: 20px 0; +} + +.progress-bar { + height: 25px; + background-color: #7DF774; + text-align: center; + line-height: 25px; + color: #1c1e21; + border-radius: 25px 0 0 25px; +} diff --git a/src/pages/docs/2024/index.css b/src/pages/docs/2024/index.css new file mode 100644 index 000000000..6b5a1cf05 --- /dev/null +++ b/src/pages/docs/2024/index.css @@ -0,0 +1,79 @@ +.sidebar-container-2024{ + display: none; +} +.main-container{ +display: flex; +width: 100%; +} +.breadcrumbs-items{ +--ifm-breadcrumb-size-multiplier: 0.7 !important; +background: #f5f6f7; +margin-bottom: .4rem; +} +.table-container{ +max-height: calc(100vh - 5.75rem); +overflow-y: auto; +position: sticky; +top: calc(4.75rem); +} +.right-side-table{ +display: flex; +align-items: center; +flex-direction: column; +justify-content: center; +padding-right: 0; +} +.header-layout{ +width: 100%; +display: flex; +justify-content: space-between; +gap: 28px; +} +.h2-font{ +font-size: 32px; +} +@media screen and (max-width: 779px){ +.header-layout{ + flex-direction: column; +} +} +@media screen and (min-width: 997px) { +.sidebar-container-2024{ + display: block; + width: 300px; + margin-top: calc(-1* 3.75rem); + will-change: width; + clip-path: inset(0px); + border-right: 1px solid #dadde1; + transition: width 200ms ease; + } +.sidebar-styles{ + display: flex; + flex-direction: column; + height: 100%; + max-height: 100vh; + padding-top: 3.75rem; + position: sticky; + top: 0; + transition: opacity 50ms; + width: 300px; +} +.menu_styles{ + flex-grow: 1; + padding: .5rem; +} +.main-container{ + flex-grow: 1; + max-width: calc(100% - 300px); +} +.width{ + max-width: 75% !important; +} +.breadcrumbs-items{ + --ifm-breadcrumb-size-multiplier: 0.8; +} + +.right-side-table{ +padding-right: 0; +} +} \ No newline at end of file diff --git a/src/pages/docs/2024/index.js b/src/pages/docs/2024/index.js new file mode 100644 index 000000000..5416e5d3d --- /dev/null +++ b/src/pages/docs/2024/index.js @@ -0,0 +1,104 @@ +import React, { useEffect, useState } from "react"; +import Layout from "@theme/Layout"; +import C4GT2024Page from "../../../components/C4GT2024Page"; +import './index.css'; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +// import { useLocation, useParams } from 'react-router-dom'; + +function C4GT2024() { + const { siteConfig } = useDocusaurusContext(); + const [currentTab, setCurrentTab] = useState("c4gt"); + const [issueData,setIssueData] = useState(null) + const API_BASE_URL = siteConfig.customFields.API_BASE_URL; + const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + + useEffect(()=>{ + fetch(`${API_BASE_URL}/issues`, { + method: 'GET', + headers:{ + 'X-Secret-Key':API_AUTH_KEY, + } + }) + .then(response => { + return response.json(); + }) + .then(data => { + setIssueData(()=>data) + }) + .catch(error => { + console.log("error",error.message); + }); +},[]) + // const { search } = useLocation(); + // const params = useParams(); + + // useEffect(() => { + // window.location.reload(); + // const queryString = window.location.search; + // const urlParams = new URLSearchParams(queryString); + // const product = urlParams.get("id"); + // console.log(product) + // }, [search,params]); + + + return ( + +
    +
    + +
    + {currentTab == "c4gt" ? :<>} +
    +
    +
    +     + ); +} +export default C4GT2024; diff --git a/src/pages/docs/2024/org/index.js b/src/pages/docs/2024/org/index.js new file mode 100644 index 000000000..dfa997901 --- /dev/null +++ b/src/pages/docs/2024/org/index.js @@ -0,0 +1,153 @@ +import React, { useEffect, useState } from "react"; +import Layout from "@theme/Layout"; +import ProjectDescription from "../../../../components/ProjectDescription"; +import SubProjectDescription from "../../../../components/SubDescription"; +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +import '../index.css'; +// import { useLocation, useParams } from 'react-router-dom'; + +function C4GT2024() { + const { siteConfig } = useDocusaurusContext(); + const API_BASE_URL = siteConfig.customFields.API_BASE_URL; + const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + const [currentTab, setCurrentTab] = useState("description"); + const [currentIssue, setCurrentIssue] = useState(null); + const [currentIssueData, setCurrentIssueData] = useState(null) + const [issueData,setIssueData] = useState(null); + const [selectedProject, setSelectedProject] = useState(null); + const [issueNumber,setIssueNumber] = useState(null); + + useEffect(()=>{ + const queryString = window.location.search; + const urlParams = new URLSearchParams(queryString); + const product = urlParams.get("id")?urlParams.get("id"):"c4gt"; + setCurrentIssue(()=>product) + fetch(`${API_BASE_URL}/issues`, { + method: 'GET', + headers:{ + 'X-Secret-Key':API_AUTH_KEY, + } + }) + .then(response => { + return response.json(); + }) + .then(data => { + setIssueData(()=>data) + }) + .catch(error => { + console.log("error",error.message); + }); +},[]) + // const { search } = useLocation(); + // const params = useParams(); + + // useEffect(() => { + // window.location.reload(); + // const queryString = window.location.search; + // const urlParams = new URLSearchParams(queryString); + // const product = urlParams.get("id"); + // console.log(product) + // }, [search,params]); + + + return ( + +
    +
    + +
    + {(currentTab == "description" && currentIssue!=null) ? :<>} + {currentTab == "subDescription" ? + :<>} +
    +
    +
    +     + ); +} +export default C4GT2024; diff --git a/src/pages/index.js b/src/pages/index.js index eeebd0a38..519724c99 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -8,6 +8,7 @@ import ParticipantImages from "../components/ParticipantImages"; function HomepageHeader() { const { siteConfig } = useDocusaurusContext(); + console.log(siteConfig.customFields.API_BASE_URL) return (
    diff --git a/static/img/C4GT_Logo_Text.png b/static/img/C4GT_Logo_Text.png new file mode 100644 index 0000000000000000000000000000000000000000..2bf3e5e9e641d3c8437edce5dbecd6f031e06c68 GIT binary patch literal 21958 zcmdpe^;29;(C#8ZlHf^jw;;jYB`>;2Ah?D_gL{z0LXZRq?(Qy&%OZi`?k>S~3AQ-* z^%4X^nZUvTo*X2} zaRGm@ofPz3K_CwLf4?YS3M4&1AR3V3d+Co~(vMf*4zCp(Pyg=B^zYY>y%u9~3&zHl zn^(o+=0@=dVPx23<7!7;ie*e+KqrF8Fjo_F1s{cDEx10j%8Ku)8mvvVS)75Fwb*Lu zcs}{Z^7Fo2rGEGT|2$J#`VtWR|LYHl`2U@mb$k3ge{nH(c{3=NXc5OgG`rm`8T~YB zKkZx6eE;g{4#7V3MlW$>STd{ao_iAp0%c2L9boR<`daW0!L)9)-2;slz(FlX14GnP zHPn3{4YR7Y0$YWXer_*U%H4k9y}22>k2^#K1-KDRBR{gt`_Kfgdapb3zB6|&BAkCG z=Nc{Q0&O=N-FzY3m@{T$pre-v6?pPJJL@w z*k|2u(a)9$c>mg`9ImgZqxlLm6NPpx>cs0k7z~D-Dxjjo5KJ>yVs;s4HpBB#ko0-) zcG{?}-bPoMReqhKP1pmp^gUz$bXfae4myI9G$$>RcCSOiq*-wt@^XTS(MQS<{W82o z!en6pW+&No_CtiJ+6TF{{jleJ=p~i7*UctR;Mn9~f6%Rn=6;h} zC`mrSbQx_iCLMjTS_JwzbZi-ysrrS@dY5lXGls|Ay*hJoqrSrKL$|sJ0{!wc)`8ET zTi@;a_{+~e@`l-mjkNyF5~K=TS-fi-|6W9|KT^-_vK0>Re4*K$`*xF=RXL_pNVv>f z;z0tony%9l1>Q1sN+wK-j&hF6YW(q`*pKtyA)B~-3c26D?F3H()42H@w2p$|>*e$W zEsvW3dprUILlZ3!@~_5;Q_df?c%(@Z!x`v?AE2~D`>1X}JV;>f2(r5eqzDWbs5X;e<8WtGraxB_aDpxgd@t9y6!g&WpFS})GL zS6|JQ2=ducJXOr6Ekhx^x;Nqyr7^~_k>4A5j!vDeC&4!U+(8{GHRI= zyh6F;D6XY$vrkduo<+xqW@u)%@y86ymO#b6k{~!*so~IDT9v#gaODZPA)uvHmM8A6 zXAKm$r;f%QbinwYZLCK-pBFV>i3}7+fwGCBU*$Q`o`XSdVFNYYa_UuKreh2FRe|EW zLRhGG&O%#aXe*ywj!p@t*=Xm_6EUygdWWg56t4mwgq$)1PbheWJ?60vUgIC}Csw7# z_~vyBYu9vdEqquPLyH;E_%&=#Diq{RiNL-hGf3J@YJrT_e1|Y;MWODJhW&u05zrLl zfkP5gf+t7i2ICI4Y6+tEge^&X{&gql?NG?XXyKqCa!jr{4%_(d93mO)~Oh`G2VNz1b; zNi?e)mu}Bjy>DiqT+)IW(eCM9Z2BYb0k(qEE(T_YiyWh>@mu2tf?z_!6^AUR+ z!I7X`tr5Eh!3_74$ks`w5LHF?`hgbzSx#zaq^o%lR|R_#7Ebv|^hP(xA z*CBqb&#foUXyipVJ$}z^laI?9v(`ulLm+Xo|q92Rt`G6iOo=@EBjPg`>#R#WI9JVOfQDY z)lt&x2BLF6(%ii{35F80X6_{Aa4xAVG+If|vh_$zwLtPJBFI*k8$F zTf{9OyFG;icHvc>G#u+lxcqx`UVb0!9$%n#LZP$IRn7c^JSO6e{a`&Q(JtvJO&mm4 zjCz4Hw-4(eEj*)O%yuvC#T5gDx|TpUGXA#@!G`$v;b!P;k$VecwdD8vhBBTKqL}`E z)1!!o5OfyMa&R(*?a8HPl&3$zv`_5D)4blT6-)f`^n3z;Bjf{46Jv6i(N2upfXeHV zj;M@<@RbcR@qN2qwR`F>v-#H&~Cr> zh}sYJoJ`xt{f<bxHE& z%ujyfk0K5=uudcNZdQhFBG(ixCEgaI^NlCIdQQB2898=YFstMN2DUOVVLLlgT-wa=PtzBB7HOP( z*r=-#OksB=VY{Q?(OI(XJO0K#+p+0%QErr49% zm81zFs8`O2D=T>fd4~6OXmXd%>ToVW&UT$?7D~mNgL)xdJWx}EBn{*V^2X#LWz@z% zx`5ngYeIIOh^{ZqR0dlquAQugabM^ypY*hh3HJqH2?<}tGO~w;X0NIYvqQ@<3&>K| z$@3tD-nr)G>z~F&uM|TWXRV3!mZRRcjqx5F1ZK&AqmIwp#HRt3h}fKx@rrjTe3B-# z=`e7nV%RCKXeaORkKEa2p`%LjB=CSZNT^7W?S&ut9g5Q{Hm5x;nzmq4=WEGrBo-+} z-*Yl=Ny5!vc5)ujc34=o*{d$&MhRtTRRboyczb6>fN0<79jt`$o?x1j_R_Y7X%mNO zJuc@)qN0|X&6-4`&pxG$#78vw!<)~tt+W}9BnV1dRifz9ZmF7n8Ue9j%5A}+--GBJ zw+#!^ojpQhwJ|tey{uid25S{0$8RjON#5x>2=|1|$D{XG10smoOi45`1pnh6buFh6 zd|g9D6>sUrHt3c3LDMusrd%;Arhr-^=yuyoCH8@0AF58L7fm9UKpXQRoJ7ws2=4Ge zxxXSjMv`%Oo{%9$ufmcdJB~8vnp=dfpoLhwF-;lHJBVN75=*z+$U2>Y6 zQtBOs@c}=*Z&g32Rqa-hIQ|-iW#k^Cx&^0F_;eB`Zgw6B@|#r}QSC!biM_4#(`s;i zdT&<`m*rQux@7WSJKeTS%x_%YD1}i<#a#k^+DG=$&j{GrS%!EsdyKHCm=ZO#luC!+ z{nPRTxwM?5!q?I&i}-rw#C^m6Oa~0dCtE zvt_kPp*-S+G?c7qzvVSO4TY;XJsZbMlL%F|b0)4YJd$tUH_ryKKV0Ka&p{q+(Yep; z6eF@FdfTu*Lh1;xHigtNui_cm`$7RR@x%Dt5RxX6!(`1=Zd5y|Z?tj0g*{Mx|05dC za;k~IlNOhIH~C!NT$#(QW^f4WfZIIBBTC#1d&rrtxQciaMW$2G7b4kLe!}OQ4$1xo z9IhhvPr}CNmzP)vfmi(`C{q8P@iO&AkxPpQ&}J7>Ntt{D7IEO@VpC2X&lF4d1YZh) zo=!1Dm`DR)RT@`RP&IbF>k&&FL|T1K{PRKRPyRL(P)C!5i5HRe$?822&mDzY08nTg z@$ZEco%z_e2dON}r1S3)*;GI}*P;$6VP_gnAuXPb;O-*0~U}YL&BGGo4_qy*v)_i`-A=hQdvfQ zmmVY?$8P@eN$?61`4}@$6B;OS&7!QEiz^L z|8(9@nF>Y6pc|q}&@_-K{F#P4c}DbkZCS`e2o5P~olv|PFSc|Ot9y8W4K>4YjVVEB zM|dCAjAn#g!Uz6%>`F&?TDs8OG61Wx55S(vCQvm1hTyu=4{vLmu)_)Pqv|(%Rr9)u zHz_pbBia|Rlc!Cwm4#@5v%_{LA1>3Fi~f>6LzDpW;KI{H8DqyFE$*aKjJ;)vtt>~k z5$t|on|!ne*il3yT`?lshKoLPx8_+kV6*7HD+^HXKIdLr=z- z={F{fTUUoQqqX~OkruDNzD1#?H(ZI{zBO~x*aZh;1Z?*M4(y$#WHq}(gsM_MCbYbh zOZ%!t6D9$T*k&J?^kkl`2N&UhDDbB_3A|>#%5&_rCWXWQ8UHKXT#`N;hq;0&tv1pEX;1##)&hY{Z1ASYRM1e0Z9@tmF^ zY2wenlzc(Wy1QOlsB1ZN>*QR`9uP+A)yOj%G$}OnOI*5H1M)lZs^$~>jALNGcL)S| zzQ4Yf`>#{*Id_$jk|U^-KpNhviGhUiQ0}5SMV9)zGyi)fdLW% z;uMnhkIyBK0jFr#XT;!V@arKCGfV%Up>>3~C~MUN^<=eEy$UZuUx1bu|FYdMMxh$& z%$%Ov;m?%pEcM@CvtM0`t->+Ckm9R(nG{`f>@#()34EWi2vf17)FoaV}JllH}|T9Ivhq82svUEAfMU}+6s z;BGdXN&8~%x&EWyap<2e03xADqx?NgRpD{Ub;%@c6rq31-rH@A+M65*$KI2?{6h6# zIj#}Mj>2HEqSO=18F#XBGd-viO&Z=YkMeCHn$=@`3ruxeBe6zjhW+vAoZ?&vgLd~3 zy49G$cEs@Vhl~_;Ypqw$4G83qe)-5jubMmpS9QLT9boT!d61i6)E~Ss-?cdkn8O)8 zFDc5}`T!P~cvsM}j}nBjEvQ;VP4v+?t18{2`g3?ml^`Ok2VELa>p#O^T!%E-qTdbK zG8Ii7N6#I$knXdeq$Jh0Z>eEGU=*aR9CRD>#eUh-_O(YHi|Dt@A``jTXuQM_4Z*aa zD_t7Ylqhv)vf z4@*Y6Psl84XCoO}_VI9Gm zExNY{9r^o^Iq8xV+XY?wASFq!T-CiirExX$8*1bxl}H6jr7w0o$^W`|yBvb<%RLu4 zs?)sxr;A!#IV*1QwlZkIS1VoBGczF@VcSP;;Xcz$#!#!5oKi%;J9FG*3r7^p0^y6tN)VWZ1x}{|^sb25D3&0%_Gap4=ae#dcfg*;h}Fc*u$OD~U8#2%qso?eb;H`y@LunRa)@ z6gW0fKNRS>s7=rLHad6Jp%U`~TN>(vNohA~7Ke$viFKmR$6XLUjWZp+7dsK+%}6Wa zaaI*^QWHH{H+NA5oBDtGM`E4t;u{<&3m{9)}yU;Nb zvLq{nTnY@aNE{b(uOr(zM8cTY9XQwA%$C1^1 z-7NTgSMs-OmZH_S8TAnRq=6a`K87@ulaWTwQDuzy?HU^=}1ol!x9R@(rHNmkX7 zNA-`=AHHFdGoY0@vvv2`epuY}i8E-ASGxmSibtiDvND91@BAa02)0Z=)uE3ZhUYlg zhQ>k=gpV%`rQxZ~3jIi;i0MWcQBC$E(@49Ol+V@CG3tQ^BxQ|$iE`(>~^p>Hvrf9sM#8pu`|a><$pXI2qo0$qi_!C%HVCHf7cr3xfdoJ}3QV zZcS?qRYdQzb6lrH7%9rb`UmZ2pzi={qVUEuu5)#vyoxPDVK%0-J%f~g_G?3QKqib8 z1R#N`;D0X>{0-<=6&H{9dD_OZYEpP0Anv~=nCIkA4v6Y(k5NXwl^#MkE=q#J0{(G3 z)y$fgWo0?f+z8vm@`-l0JT%x*9!!l0$I+w=kKU3?w+qhz-g!+gkrMau1*hP=ma6&O zg35xs$J^G{5Dy^R#}hauD{S-2%rHZt;o-R?_(%DT^egk7VLoQ-2yJObq9P>;W)k(!3ZMeDNUKw)uZ9y4^iAgFIZ~56u9s}HlK3s`WWV+uF!TDmN;uqjMI8> z^8kUZ<`e5$;1xjK%8p*DGfx^1-V_~Klf2Q8xJ>aO15N&?o`r=SF#KGYskNE2>mlFD zJUr?*q(&~WpUlzgS&AhOuT@sR`ljCV%@Bqh1B*;ar6RMA4cj}MX{ zqVSC#W|x+t`R4k-H*uE!-^Q|u^9c$_0Zke@2KYEI!@LhWieGuBBa3f6|laB7f1ZE|yZ4-VNTja3UXKht@U(cE`7 zCV=u}=r=6<_(KDz58Q@k`!O(_Ha>&CfK_#Cy0%9O$LXQ`-=Wq)0e($=UI&f!6}5_q z7Kdk$#|OzXMCCv7?VZ18s>Q;er9Pe78fqPY=9Zu>Mx+1@BiVM+qeyLKd1ER(T_XeO}1Nz@3O25Ts^D{}`yX%8eVoU%dn=$|m>VXDv77H&1 z28%3XEK;zK)L3RvQd<{>9E5zkC|7*a;H2}OzdBcrEN*xulYJa(RVve*Z|sjSX&5!A zpG1aW(BH6B{9!9zobl1c*_46Rj=QVBGZqM3ArQz$SA{P;l!~@kP3mWmSK1QU6QHkb z94&nlCI}RUcyb&?=(ckL%fXCwK(DtX!fQM1Px-~8eemz%?81Mk)Hp!0@C3Yy=HFdI`qJ4MSl$dF zVUxi6fKcg*b(k*C%}bs>$+1Zg%%g!o!T+gODJZEHGe6CU1pZrOUGz&OhU_)ctt4AV zqrn)U7d}WDj=G@!J)nIRBhCuY=+{4rmgzSY?t$|D!l!0sU;L$Ts}VK1q5Hbk%oeJxEso{zryJ49_0zu|%X;ESajA{E z*SxW^D{Ox>+CK;6bfN&9sI7t3A*D(Le+qJneTbt2>RWGpXLd%Gv?Gt|%Nyt}dA9d8 z<)@S6pF5z#OH?4t)iC#_uHRh%r_r%)RSNZ95Ey|u=IfnSt@n82&ngc3Hsa`@JY30c z2us)0_%_n44zKg=%4VG)vxOjc?ZwWg`n0*eKDxL7&R1vwbed0U4OHqLwMixQCdkz@ zI}~5*<)6!;o81S3IEvY=)PLXM0W+y570n)d99T}1^5GqV#bG%%vf4fXTLK_isB379 zk_MP%xYm){;n0e({!T4}oZt45;LCKj@+ zz^ZwoUyk(jGwh-~3~wOh7z5!~{artL+692Uh3P)@YWA={IDAKej>i8{5HPZZJ|5HB z%WZR?RV&=Ip@9PU2&V6T#1u#>m24G;V7GLz!mrHj5A9l+`!*8G5gi<5=;G1B#H$wX zfd#thP_>W@>KH!hv>SeQF*LGj?^Dfs{L5cSG1_HGy{&`TWi9Q_-w*L_$Zhp#g{n$% zgCy~%)hNS%k7|!l+9&&{PZ$3&-5yyYcHLWzzhtT?_4zXO39+4+k6kWOCW@ZXNH2MA zW5YD{Yzm11E8=)1&!KAW;s7&0uOU7Qh^i^8wqch{HVSUl#m4ULicQ>5#P6u6!|Vk6 z4L?Z2kpi~xebZ8hE12SjP$j0FL6OVLr&vfbm^}4YY@*9Uh@-Apyv-VW}%IsT@`!huCrWeGZT>5!< zKe=F4@tfp;^@%cm=>pYO*Rj2iPi>OX>!89_%xl8_U1X+qka^y*O&Z)|&m&i`% zIWS*myqn>NoATIAyC}d&SOI=CPu%PLt%uWW;!PVME=eg68Zq3+o1*4SVx#))hx@{- zVf5=F9vH#lt)2ot0NP+SMqZ`UIrrlmo-(EyxGwXb&ORCVMKN{)B&I2AMsDTeOk3WC zcSPXs$g1R=TJYBNaqWR6;!2E~VEORVCAqwYWe%zNsHX0Z_8iR$V%1MJ%5f4)*BWU8vV^5p0_BM%stOhl@oH{~PT)FE0_H+J6 z88+GJ{YXcq!$DbQ?ds*;_pmFI0-{nmCNA5^=hl%RcE${aNW#`VMhz_Gpm8MjvvUD2 zCx7;BcE#A+zg6K(irO!_pjP%VZ?FqHJQhX=AI{zPGKx6xr(37mPq zQQ_vhoD6X>N8L5Q?DOCa?pJa*&}nU^1E=7flF362?G>zr z!8G{NCW)>5l>pf3Y1M5@>lcI+ z6VF-AQlDZbHs*ye(R>=C5N7R$xlaFd>qL4}ADScq+RHuH#x-RYNYxCjkq*VD;@p{- z@$`=`pM9gTej9h=!C*@bw~u4D%R;-&{n0)XI3$daCEbs5dmKlVhLew!)7Cd&lQ>Cb zO+7!F(Uv&K_S4HdZ{M4$?BDxOySC(VJ`j$6A)EHnD`wH~8zTo{X^zQGvX=8AZLx_= zka)dZG^QVtVf=VASl8t6O#JHyzN3(y16CJ@jWSZ z?jXu>6Ypf+uGN8%(gj5?l^*9 z{}tbQZxg2LQgTEx@-0X=NQP7oMsil%Zgaaw;bKc@fxTfH5EnqYrtKaOpZI6I?Wf}c zJcjFiaymM+8;qfF@8&mrC$8G?{lLsw%250^oOpVm_fJRse+~2 z&8UgdDj_Z2*Tea;I*@DEc z#SU$R4LW=eNv<$?RXM;BM`U!&zG`sv)WFFP+a8X-73p~% z4Kv&P>gdtSmy-Q|9XvEIb;|7L$^*&eT{O^Q3NP* zLHJ%3eiA#=dwB2hM!^5+Gk}$(f{q`s@CqLQONj%ClAEv`Qst*@MkPKw`|r$i1Yz_>Nxu%wvX*SL)yI)sGRbU4GHuM$8)0w3{FF4tnGs1$5VcmC z;%4|7pLzJ^w$3n#m>{!Yr%Ck$er(6k>iM>#q^LQav4vn$+V2#AtfBUaynHBE0CoWH z?0yQyHI3eY{3c9yXGxiqO7sh6n4fy7FbqFEU0t%9W6tK}?XWebAA;QxECv#*_$i`_ z9S>Ishom7_S09BM%L?P@`W$&>25j>-=VHE5jLFRv87A!{Q~h^+eZ+MLpn*)wka)1M zIRWgVFo&<}Ua^>%FYxT2>`l@mezqe_{Xb_Px2N_q1P}K66nSgK;sPXe$xX0w`IZ7R zLh3IU!(;Ei2%Jp!BP2fhom^RH6bWM>mng=T;f;-q@{40kOtd}#@2wD^fq6YOoWE=- zQ8&l|AQ+25XIwsG128Ji2is?LKLI!BX7!1Q{*6Msi=`J6sd~cI!|KwKK(_O7D_YfP zRQYW#>2NCet{cBk(^!@l(m`hZtESLv?@+T+ab%P*#TySGdz+FmWCjKK4q0bVZ_^_{ z)(+OwB0hS_#Q6HBozga1luC}1MKieUd}z0Tc2CpNZ16Tj&4TuDe(KeQUO#cXYu*Bj zlDNSWc>i`9EYyWYWN~Q2ubrV9YqTVCH@$s#7kd`hz(>CHRhNkVA24K#6Xh34FWad{ z^G(8g-seNOSNqz={AuAo0jNH`hd#;_W#Q2V5IApf#3$Wa1)AhnT6SW;wvzQt#b+!Z zt*jQ2WwgfcZcy5&Y$ZTM=m{3ZgKnM4HhDhi`lX=TCO9O_n~@yhtVf;-Ah?n3NPMP)fl7blZpF6uh$GpCn>I*eK^Uh?(Q(IIEnh zD`zPUXr)=OEwwlPvQ;&I4+L_+M71K2^+!H%Fa>?e5kD*ML7i6wP zxs+135@X`y@nrD|@_68?Jwcvy|2U2*cCnH|R&jjZmtz%<%6e+qW6qHGd z$e+fwMlW$Y;Ody@H@!OEm(YtesA_K4dPA-LWuzuAkMCcVMFx|;nfqjqEW_M_KmY19 zh1F1#R#X-!>rtLwI?PQv>Y~2(W*Pdpqn({8XJBf49=%C5Y=U+}#gfwtH3!_E{7&{- zFX6N;-!g6J96#z>;o(f^vfJm(@#W{!%J#>n64zD7ysQqD??KP&-m9<0)K~CQ@jN8x z(-g&SJa>;&S|@Lz-^y@K%5afg^#pK?eCZOh2+YQ!@eSAIi(9;0$UiqHmlzr$kq|K% z=7Edj6&W%*>&Um~7Cby@Wpu*u95lpG%}oZ}I;$!Yc1;J1%k0ZC=Zz4?Yx#=W)6NxT z)f=)=@3HL!ql5z`#3E95pq%w~zzV_u!hI0VP$7VDB3d*(U;p1T(%n#HlYd7UjYbrzPk%Mcvp8STmntH#pG6kli0? z`ki?pj9#}PH3k$yx$qncBB4Ck3QR`emV1CpDBL*&P#d(M4a>qsas<_coIL9CmX`Mt z9Q~VQJOoW#_GZK-RqwbxrC0Xz5Q&t+5z4R&DxeU%4*$cSySnJGBJwT3>1~ zH%ejUsOC|8{0)&sQuF}S^|#&Lj~u(7_S$rc<@a)o#X$P7bba+#OG(+Flzk3)yvbH^ zIEmg%jAByd0>1?Uadd0Hv4;28prOE@ppW%g%V<)$KvgLj5Lf-js#*pMeYd_R#g_ws!KgS9q8b2v)_b|;!ocRN1jsk1c8Qf&1mGuzxprhe;gS)!~J>+xYhE{N1^g{JIn9cY!GXZ03h^pcF6u_wlqs(eD1HFHFa;(kG8 z_i+aK76WtG<&TuvoL1Tweh8eE{f#h6z9D~J^#UjYBZ(nzSNT3?F*vD4`Bp}Y27R8= zZ#I_?I^<~6X7~9{*&pKD5!oq9-ba!liw=M=jNBZwO05(-VOFI+o*!+FKYEKnMCKDL zOoQIHfJJWunewOnlv`q0ZeJP}Vmm(+1>PGxy!@U?4T0geqCXikPR7`DVEU}k6Ga}H zi7|XXMyR)ewE=z|BzG>>baX%g(25?=|hHQ908i7KI7w_p8@p8!RUQQ5~6Rnuy& z4NLbRd6bRX5nS~5ao|74T2dz23DDL3?2k&WE-n|B^Jq!y<(TC~RzXLn)`n|kgu3#~ z?i*y3zDai<$|`g_7Bt6Z9og!0%nv45f^IR)M-Gw&t84<=J^2G?-QI%xWMGrf0@7@w zo&&c5h45K-e8{&VR@yPO;!Rochg0kNrBKR>;Jo@_*wB035v%nY7khZGWwhwypcD#DD2qHn5AT*Gt<4eF{+p+W4)d3GZV+ypFVbs|a$7%5JB{CTyMewU&il z5fg5eaOI&EqD_2t--B9v^vv?3`3TQt@fo*f*DB@^N)^R#n*|*?*(5}Q8LD;0=7+Wn zD`KWn`Y_Z}kprrGiv2DQbvyJQDnmyJrW;+SH{^&4YwlQ6?r6%YlL-O<2lbEkW8!_1 zxa8j>Z_)q?YNpf|IUKH}?W~@ah1lhNnUk_HQ`Ek2Wo)Nh7^g$Jek5#XJ@*5T&^K|{fN#00zC;6sssnq)$X z{bUdLrQgNt0DPke4^w#oO&-dyp*JWt?GwwNf;|rFq?xxAgp0@W-z`Vu_LLmf#GCq= zG{4Ij+QSPmA4}^FJ_EJ+X7gg)nwVG+k8EoEl=r&mMs12jf z1Dws8eCzS;LMFg1VqETsKP5iHKckU+dU>n*d>k8Fu_6+K4Fw{c3C$^!UH zKbNr$60*b~`IO)$5knVux?+58T8{6^oebPHpS3^ zoRv2PGV(D*gk=PBn1V*DXBR>7h3_3#%q+bRt|P*qe^moj})>l9MqFCKdo)^XH$ z^c_^yNTx8zDeFuP@C!bH!$%sTgoS+Gn0=#4X%k6&kF7|{5T0!uSh7InW$Mq+M-vwg zX7LgD70Xg<@EO+KOPRQ??#*kQ_FYu9$j);i--sIUby42=sq9!KBll=hIMVP~0?ezV zSd=lw43s#q^MWMUzb}j6K~8o9`-!r+mh2AtY*p~F>z_xADS~}~@ zMd%lMIKYK{1`yRRr59e+d$A)*&}Zo;uapXJ{i47${vEq|dn71Gn_#3A-oR&$G;wMR z{^R-X%FkWf&^r;YtFQnn=)dm+;`kqcu<=0UIP1*Vm1}#|=!w@OGw{(wUV9jpn-=cC zu`MgQo_YD{4_6E1;0OVS+rPL?u9u7nXrB_$MZJ@7k8+69=9vUt07dXn^ZmY1@zNE( zuCagB0`c>gZ+ud=dDd#UV3SFRXscb!zg)4S36|p{=z2mi;b#uJfN_ZN2YVdJk zCHUxS`q~}s90Jn}D8MC8FCyMhyUq7D?Ju!(FVeuB`N7C0 zZUdYfH9V_t`gb3{-Zf8;N`m>{CLDQw?{j3Oq!mb%aeU}4QI>7Tp8Qupdx9<9zGI4z`6FrsYMt!#m1kYoR9!U+` z-`tHDCpOOA=_OWpT*o*p1-6?fz34+IL}dtv#6?M{vi3P(Ava|`I^v}L<4xM&!UdeU)R+y03}Asf2QVL@<8!&?qPzh1}!~prM->c{SNvm zP}TW==SN{dd^9SG^Jk``xn9G>`fp<3+b9@&+SB7M^?6UnCc_YHu0XQA4tfGK0k*zD z|C;{%f#bErRL17xU6y}a$#v@oiK%GasFbpj<_7<#^PhT4-5ahezt6TOTwTE)8nt)GztMomG&ssD2dW51#k5@RisFp`zM>W1{ufH^r5-Ygakb(I zkpz9u)JMhRG@%j~6zncpCSehfD4Y;ue^}7^y(T^iv(van&=-t-lsMTT(G~~eDdRO0 z6^!vQY(sVqu0(Fm_Pm(p`dinY?(+`x^(?zLTYgxy-lrG_31Qb={nIlv+>n0z&gz5f z)0a40y_;qJ7!x(u=ENY(;dk)2&xG8M)yX9gnhswvCswzS>i^-JG;m1ncyhFhc{_;k z%cEyX&;LP*HII4d_yApMN;Tgf(k`HVyai^Rgi&^gupUVt0KVsY)Me||egw}VW6EWO zg&xW;QZS@ZVN58{6zqUCf3J&s&F;gNdr=m1JL;sz)~oa6mt{APOx4ky!mk0{$gW+# zSrh*lzWj2%J#k*;0xgue6WSR>${6|RNJzjP5P&l655Oyg3m!jIB6a=ICwn5VhOII1 zg^2QBg6TtS(%>|VW*boc0Dp7|8ODsdUsWll&hQxDtDLG1oaV|Q*@mGn&&Ffof2vsE zBLUrsf_+)h{aBvqY$N_AogIeyt{|1Fjtg?n$!~>r5Sxpu3nH3uJH#+D(Ps}X8~ce> za;W_ov3`;Ur2*Zi z-J!f)e`ejm8RG3ji7)bRhJY2R=08A)Q3*J1q1?6enYTEEP#8?pgJ|v< zsbpJ|J>q?Pvivpe(hxA*OjXa-<-Vrz+;q_SM0Avr1vAjdih`Ibi)A~aWbA?HK->~% zZBvS;YS3+Ns|1S8rz@;xHoekBa@C1eI2;S zBQMMrdt$J8fy z>|qPZyqfuAe`WU}!)0|eV*55_aBh!1NAc8C!l0kH>Mgb1JyplkOMZ6~WXsr9*2I;OsJKAUvN z#rX!jbWP=xd+0BG^YJ5F+Uye;?(Cbl{FN#3F~!QtH$72T8b061u8YfdK7zCD+#?f3 z3?i#qzuz&tsg&EJ*B<|U>PYOMjz6@1zvR=B8&|QonjmMC7s)kHZ)1Sr-gtbEJuttt zm~&icVfb5EAa&tj@nt%l_4y@V3UPX z3Fo%jzty+gc+!)EXzNP0UXW(=A36+?O_LV@^rNVkzOQNja~{s;{+F)n*d`6$w+(pZ zc!{C=o2A*S=Phhc4u8L>KKIWYaCgyviO-IV^%`F$HPZDM8_@8&sj0Piy6O<~e*AUS z%D=W*;`>uH19~H&Dcqn#g?CHBU(`&903$zBEBp6bs{?QU8AEsYWiz4xBD$HFk zurGbg%4H>ft?Zz6Q9|=?OKpX@*2hQxSzGO(8%W=W)_Y#ce-5_4#&s8P@ns|hSQ9qY z?gI8%t!)I^V-Gb)6mw9jbL5*?isF`rbJLM{Xp?0YR2#wCcu2drZn*je9zElQw|Esrtj_!|E;AIJ%V$wP!yG@<-WV)_u7Kl82D9C4c2eXggaSVo!QR# zCZRQJ!vE?c@ZAjl_26HX$b=Md1be9gEE2Yy2 zwQUVOFkZ7Wb6a!aZ04A|bq#Cz(==0q>!@5VjV5niD(JCEN4T9?6;7r>#%g_P*z3=$HQOB88>kI z{FaZaT?=}#%dx8MmTkqeoRXE) zm)P0n!7|CX_E36yTb4K{SOv8rO6;spm*^|!Ckp#$xI0>4_>IulgE&Zk}q6st?3X)>YgU+@Dq(^u|T| zkPcGNhIy;C zK&5XkaXd4^g1A|>MSm8DlsSI%37Qahe2HTA;we4x;y{5{yc^sSxm73mklcS4kC5ZG zZ3cl}%l-Sm0Go4wGkLPrW3DNL4omKTsaBWO^xC?mHziq{I@80BjWsJL5)-Hb%dB6H! ziTHfg^8?Xkx6;2p3iulJq>C_QrR~xnVpEgTFbT?@IJjMyXv^7XqGdMe5(jU&8htaq zw76d48>Oi{ZX*CPz>8O@uke^E)o!c!1=rHn+Odq931_q(CGu?0>inKJ+ps00l`^IE zUubvyhLIMfpjYDJ;*eFrmb%~S51&1-q5LMBQc3CH$eB-`n76pIf_em*G*q{t*Q3?! zy0KroP{WOp*xv{;d)0N68hOStazV>8+~(_lgR|(X_H=SEX7n7S{D!1?QC7Rl68}6~-vM(p&ug$LCmK z1UBWqJF%)|vA;I|=-~VbG~_eNdZn>|8?RekFPd>o^==H^K&r!yD)^{`i$#35!S-a} z#n5@ToAu{i!sId9^Z4&swLJKh$>{Cn@bX1jW*xz&Vry;B<*ikrYWC-+LD}tOhtr`J zX$)y|(AkHN&n`5Zn=^&QK;&v}=gTyM%xvu!{A{S_-(+!|j4^HQqTKOb&GF|SQjJT8 z__MX&E&pxh{LB>oIY|{g}G!mkK)^7|SS!WFPwJ z(LRd`XdOo!kWIa&sQjuKiX0Vo zgzai*Gxil5wn|hD(h)0K<@$=*_2q;YTlnMJ@n2w4vDMBm9*X7>#A0(k-MHyVWyOtY zN-(RjJ+|17PE2B#xU817d(I%ds~$L!a?SabW6Hi|^qSO(hv;J@h>C@VPARza}_1jI*yojiu6r4-9dRy7u|1mUG*Ni+G!lNK^~lc6a|GkHD*5r!y3o$0`wa$d#z{Dtt?R_vJ3; zf!X^NQOW>|GTv>5ZvFNoLDov5BAj8d#sAaHwf{50{%@qDMCDOQIz7nQlS+@%M5P=? zVPhC6BW&bs45b`OD2FXZL{7tKm@^^PHq3cuSjDi06``5hwf5hjv`=|SLy{;eb z_xrxy*ZVSbQ9#WNNz3uFksrCGfx7SNGApaY+1H@vNh?O)s1@>y4R$#!^|4m)O3Ngz zWmquPB%@i;0@FSDWwJe%n4%lydesXsk$Sy!(Q<&TSs$%tcjL~P+c$wxE(&%v#RnM{A0$x)FUjO z=Fb_Z@5ZvYs#=y!Xt6m%PqJ^p znar;=8oW^xeOxowJlHkv+Y4hw^$Uq(s@`#x>|<}0mDOeMYKiiFJ>r$X|t0vjqu+you`ntNd44zXAtye*5?`Y$v`(%{raUz!mmL5?;-nTN7 z%QAF=jN~D>PTvKW$iof5{U8-_Pib?cssFd_9gaJ%}Xrc zJ@@rUMD1OCHd!yD7oJaYe(L-)68~Ly43P1JiW2k3oQrZvd62=ww}DWfqmNVIq>meX zsF=LV1$KCA?*Q1SMwRK{U}837LEL|yK#HhH;CGfi|Uv;hk1*dX=u1_ZgRJ+mweGCN?&%O*!Orcp93YYaby9xR8EA zITF_8F)}?N^z_@+yu|cro79Y2@f^iT@2=(ry*2VZ_`@h62~nZ-d*;)wR!73J4iYUt zandONF_Y~P=}jI^IP_+t#8iEKJO}_6jbHw^MZAa2J?j^tnUi{B42VKxYHdu6jl^?5 zZJvN^*|Yj%a(+y24;1#7*aHpd+6ztnDp5q*`^j={l3!B-f_SX%x?a&X z-(rC}p<>TEF!h#IeoD2z3ZS9d)Sk$V6K{}>g(+@z=X?RUE3U*t%rf#kr-k_z1xH*h z(umuna9w>lQ%@$a)H$my=L1V!sgAA+rmTHSHit{gZ#4yL& zTp1OXNIj1sZ_i;zelEk{?8%DEtl~P)d&qA;a6b8a+)VI!AMWHyGOyHE&h;23RV}{S zw|v`C(|T~xcnO@)V-st%zPNrYY zmy>@9yksa0w<=)iWfesX!?#NV1h;u_Y(Wf_xcU7Pg4F11%qz(QS4#xmOz8+NSov^n zh)_Vx{Qz|$a;hDM{Qs@4J)`@@zn0^0HiaTkM`NoDNmb~jOeqvUvK|OtR|_B1uArEN z&+MbYV3@-iWpnVTSMWrqLnZg0xhzjsHkQmwFLQjKew-mXz!u3g;%1F@5v2K;9|nPL z-qB$Av>CBHio7J;_J?I2>h`9aIufzHu)>TH0eI=W)26`YIzub*7gZz80k_{b8eA)R zq=wN5u%_~O&L+@$S;Vo%w=;T-Cd9Q4`=3o*y`-Q+FQ_CWC^bWaxo8UV9`*iK5ujIr z`tuuKc)z9ex_217QFR?(&T(ZXye#2o1sgo_lME`JI+h{o7HI~D(- zs`tJj82I}o9<$p@{`_(|CrGlc?I=_Z>)8}?I+t~8rYQGtr7y;WtZ%64s$)eiaU-&; z7{D;exGl7LB6pV(+Zoi1T- zx>x^>#wM$1$V3pL(Y*`+dC)OydbH}++XIN>>qcjitQa9%ap;gJe z2I$4+`&<-hB1HZ7{t^k7SA<_}R*Z#0T(E0Br@+s}%g{TVFl~vofua4Te2$O5n7)l& zI(XNDKxF%cj}g}VWdZb(<(&^HNe~M=GVFm7y*Q0Kk(#3QFVQ&Gb&o)=<&EH_Z_lYQ z1*y2LjkvK9EcUywsV2#ZaxHH54zw(&rxXSsmW>=K&)IFbT%%Pf^=)mieJ$HaFK<;J z1CX(IIrhB~?~%owExfPxS?Ow?u1tqe7KyErheUwaS^)Iv(RAgh>J!Ck?TLstn`lyr z{W-sJDyy?x(+YrD_F%${+o&pVXE+b4@Q89z(^hwYzvTD|^zzNbOf_oYn4IYw+QTAS z$XMPd%N~Ec2|1dx)x;#U&D)H8oH25r3r8sK;AT05sL(M1n?xZpf9NdS*lF2zGo%jO z`q~DktwVaeY>3idhm~#vm+p*pw$|n+aW~5&dTZ<0N5$8d>z$`NFE5p7n);)8a#zRu ziaP6ny=0ajNURd4{N7Al1i;=${7TvcJ()-^-a&zDf2xiAlnlu|Bg}D{uzUny01`9t zqj`qwz*4m0LFB!h{HtDj(LxG#tHmuqq|jiC0yYXT7fPvEu%3&U;fRwLwjJaKB_O040&x$fGSm|;cipC*gc1%yZV0ToI{B)-0=TsvB095xbD;PQ#m9=Mfat-?@ zDzyW=M6$bLzzGEq+%t^XywH{q&z@>1WU{bZc{6F*I0&?vsD%Uxq6y!JA~3pzLk|k! zQACNA3)CQ2pw__{3RAn9k{(vN+QR=wFfx2dKSRRuL!k5rPUafrA^{HJuPr>8xa(%? zS|(e`OuF#NSMS3G@@c2jOARt{LM~_r7HC8zV;bGhS_};8lhcdDxZrc{$AjX!(a18O;@!l z(yIhi)>T{WQ*)clbiLn}$V(rl%?zC~dDjduv#;H`2l+2|wQ^@+=qj^dB~n={Re%e5 z7_-wJa@oxxcXo2fB6vqAOS!d|_Al&eTba1YO+H2i?Y?8@YAX4cS;yTrbZEczpKQK! zEv!3VZZf;OS+7=QqP-5)zAeZ_TlJ$+rMRBI?p(XWa!X?O;jCfo_x zjzLdRI)9q{_?EBOf@fMa{ZSl}u!yz~+5C)3bm}h&{5byJ9CEUM4#?c^b4u7vhxQ_Iiy$}` z?$hLtqlDKv-jX!9(2Y@&@~Rc!`DQga1i;rasEbF3U|Rl8f9p^s3*p zvQio&Za$PWH(IBnaO#G~@!?H5(y*TX=$M1bcO5^M`C($FmCtHwJeApGM7t!pMg4mi zDNl>i4^dRxY@fOv_uAk5w(&Lv6QJ>FnU8HWc090}oO< z(;%2g2+|CY{WFVNgeLS(=fd zPq5^%FfE?92K&Y9o4lZO_&}HuZp!UoP&C>kYOMD@NU;@~#>>%xILi-4*?ip8u1F_# z*B??h2tu02-<#=f#V9?QY-gPhuwt(n)~^L2;CezkQ|yX?VnrAK;n7byyiiuLb#W&$ zA8ZthR;fPe<_`HfQ66?G@mWE;;sR{H-`w>?d--oss-0$_A7^h1 zp5(SbeUioqzY59C%-XKdTzBfcU^|WP51vFuRBXnlZZn z*U9JU^a!V5s7tIPVE4LyLa68`YkW##{D2+*1OpKKQdx$|5DPM$a^2~$xO?PbGxYydVr#~oYD2cpy{&*X37aCap z2+AgD=%h)-AS?tI)#~@WyU=)?d2-CJe(?1CZXeaxhw1!Z)(TajRz(K;LT>-gg>T~m zvYOFo+nM)-$?HhDWbe@cF_Eo==Y(r0ui-o3H)liUbTgq&&kIx+6LgG2bG@VH-q;lH zjNe2`PV5ym7AZ(8E0<_qsO!9wT-8hJ4Xr)Kq$p)x6cvdS8gY}Vb0I7|^WJT}F zmFo;lSB0Yq?+-$Fe}X;4#v{K*OcMCo3im}tUMZ_Q>EKk;oKle)X!WM5kf@H>Mg~IwP6z_3;1BB=~<9$=NrW u)EyI{$L4k}Lefl#QyS)E;ROVW{I?*v|Nn6h+h_cDvbbq;18;UO?*9N!4qtcx literal 0 HcmV?d00001 diff --git a/static/img/link_icon.svg b/static/img/link_icon.svg new file mode 100644 index 000000000..69c27ae82 --- /dev/null +++ b/static/img/link_icon.svg @@ -0,0 +1 @@ + \ No newline at end of file From 44cc8005847658a34c846cccadf4582cd0ef5692 Mon Sep 17 00:00:00 2001 From: riya-2206 Date: Fri, 7 Jun 2024 00:40:00 +0530 Subject: [PATCH 2/3] changes done as mentioned in the PR --- docusaurus.config.js | 4 + src/components/C4GT2024Page.js | 117 +++++------ src/components/ProjectDescription.js | 209 +++++++++++++------- src/components/SubDescription.js | 282 ++++++++++++++++----------- src/css/custom.css | 11 ++ src/hooks/useParseMarkdown.js | 72 +++++++ src/pages/docs/2024/index.css | 5 + src/pages/docs/2024/index.js | 162 +++++++-------- src/pages/docs/2024/org/index.js | 250 ++++++++++++++---------- src/pages/index.js | 1 - 10 files changed, 688 insertions(+), 425 deletions(-) create mode 100644 src/hooks/useParseMarkdown.js diff --git a/docusaurus.config.js b/docusaurus.config.js index 378bf9c07..3aaa5fb87 100644 --- a/docusaurus.config.js +++ b/docusaurus.config.js @@ -231,6 +231,10 @@ module.exports = { label: "VedantKhairnar", to: "/docs/2024/org?id=VedantKhairnar", }, + { + label: "AbhimanyuSamagra", + to: "/docs/2024/org?id=AbhimanyuSamagra", + }, ] } ], diff --git a/src/components/C4GT2024Page.js b/src/components/C4GT2024Page.js index e874fc4cd..4d1e9c7d5 100644 --- a/src/components/C4GT2024Page.js +++ b/src/components/C4GT2024Page.js @@ -2,65 +2,66 @@ import React from "react"; function C4GT2024Page() { return ( -
    -
    -
    -
    -
    - -
    -
    -

    C4GT'24

    -
    -

    - C4GT Mentoring Program has been conceptualized as a summer coding - program to create a close-knit community that can build and contribute - to global digital public goods. -

    -
      -
    • - An opportunity for college students and working professionals in - India to experience the GovTech space -
      • -
    • Organized annually over 2 months (July-August)
      • -
    • - There will be a set of diverse and engaging GovTech problem - statements every year for the participants to work on -
      • -
    • - Shortlisted contributors will receive mentorship from leading - practitioners in GovTech ecosystem -
      • -
    -

    Thanks for being part of the community. 💚

    +
    +
    +
    +
    +
    + +
    +
    +

    C4GT'24

    +
    +

    + C4GT Mentoring Program has been conceptualized as a summer + coding program to create a close-knit community that can build + and contribute to global digital public goods. +

    +
      +
    • + An opportunity for college students and working + professionals in India to experience the GovTech space +
      • +
    • Organized annually over 2 months (July-August)
      • +
    • + There will be a set of diverse and engaging GovTech problem + statements every year for the participants to work on +
      • +
    • + Shortlisted contributors will receive mentorship from + leading practitioners in GovTech ecosystem +
      • +
    +

    Thanks for being part of the community. 💚

    +
    +
    +
    +
    -
    -
    -
    -
    ); } diff --git a/src/components/ProjectDescription.js b/src/components/ProjectDescription.js index f610dedd1..9abdca61c 100644 --- a/src/components/ProjectDescription.js +++ b/src/components/ProjectDescription.js @@ -1,83 +1,152 @@ import React, { useEffect, useState } from "react"; -import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +import { useHistory } from "react-router-dom"; +import useParseMarkdown from "../hooks/useParseMarkdown"; -function ProjectDescription({currentIssue, currentIssueData}) { - const { siteConfig } = useDocusaurusContext(); - const API_BASE_URL = siteConfig.customFields.API_BASE_URL; - const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; - const [description,setDescription] = useState(null) +function ProjectDescription({ + currentIssue, + currentIssueData, + setCurrentTab, + setSelectedProject, + setIssueNumber, +}) { + const history = useHistory(); + const {API_AUTH_KEY,API_BASE_URL} = useParseMarkdown(); + const [description, setDescription] = useState(null); + const [mobile, setMobile] = useState(false); + const [error, setError] = useState(null); - useEffect(()=>{ + useEffect(() => { + setError(()=>null); fetch(`${API_BASE_URL}/issues/${currentIssue}`, { - method: 'GET', - headers:{ - 'X-Secret-Key':API_AUTH_KEY, + method: "GET", + headers: { + "X-Secret-Key": API_AUTH_KEY, + }, + }) + .then((response) => { + if (!response.ok) { + throw new Error(`Error! status: ${response.status}`); } - }) - .then(response => { return response.json(); }) - .then(data => { - setDescription(()=>data) + .then((data) => { + setDescription(() => data); }) - .catch(error => { - console.log("error",error.message); + .catch((error) => { + setError(error); }); -},[currentIssue]) + }, [currentIssue]); + + useEffect(() => { + const handleResize = () => { + if (window.innerWidth < 997) { + setMobile(true); + } else { + setMobile(false); + } + }; + handleResize(); + + window.addEventListener("resize", handleResize); + + return () => { + window.removeEventListener("resize", handleResize); + }; + }, []); return ( -
    -
    -
    -
    -
    - -
    -
    -

    {description?.name}

    -
    -

    {description?.description} - {/* when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries, but also the leap into electronic typesetting, remaining essentially unchanged. It was popularised in the 1960s with the release of Letraset sheets containing Lorem Ipsum passages, and more recently with desktop publishing software like Aldus PageMaker including versions of Lorem Ipsum */} -

    - {/*

    Following are the list of Issues associated with the organization

    - {currentIssueData?.length!=0 &&
      - {currentIssueData?.map((d,i)=>{ - return
    • - - {d.name} - -
      • - })} - -
    } */} -
    -
    -
    -
    -
    -
    + <> + {error ? ( +
    +

    {error.message}

    + +
    + ) : ( +
    +
    +
    +
    +
    + +
    +
    +

    {description?.name}

    +
    +

    {description?.description}

    + {mobile && ( + <> +

    + Following are the list of Issues associated with the + organization +

    + {currentIssueData?.length != 0 && ( + + )} + + )} +
    +
    +
    +
    +
    +
    + )} + ); } diff --git a/src/components/SubDescription.js b/src/components/SubDescription.js index 4f0b49109..3a29e3914 100644 --- a/src/components/SubDescription.js +++ b/src/components/SubDescription.js @@ -1,69 +1,84 @@ import React, { useEffect, useState } from "react"; -import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; +import useParseMarkdown from "../hooks/useParseMarkdown"; -function SubProjectDescription({ selectedProject,issueNumber, currentIssue }) { +function SubProjectDescription({ selectedProject, issueNumber, currentIssue }) { + const {weeklyGoals, weeklyLearnings,API_AUTH_KEY,API_BASE_URL} = useParseMarkdown(); const [description, setDescription] = useState(null); - const { siteConfig } = useDocusaurusContext(); - const API_BASE_URL = siteConfig.customFields.API_BASE_URL; - const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + const [error, setError] = useState(null); useEffect(() => { - fetch( - `${API_BASE_URL}/issues/${currentIssue}/${issueNumber}`, - { - method: "GET", - headers: { - "X-Secret-Key": API_AUTH_KEY, - }, + setError(()=>null); + fetch(`${API_BASE_URL}/issues/${currentIssue}/${issueNumber}`, { + method: "GET", + headers: { + "X-Secret-Key": API_AUTH_KEY, }, - ) + }) .then((response) => { + if (!response.ok) { + throw new Error(`Error! status: ${response.status}`); + } return response.json(); }) .then((data) => { setDescription(() => data); }) .catch((error) => { - console.log("error", error.message); + setError(()=>error) }); }, [selectedProject]); - const parseMarkdown = (markdown) => { - markdown = markdown.replace(/^### (.*$)/gim, "

    $1

    "); - markdown = markdown.replace(/^## (.*$)/gim, `

    $1

    `); - markdown = markdown.replace(/^# (.*$)/gim, `

    $1

    `); - - markdown = markdown.replace(/\*\*(.*)\*\*/gim, "$1"); - markdown = markdown.replace(/\*(.*)\*/gim, "$1"); - - markdown = markdown.replace( - /- \[ \] (.*$)/gim, - ' $1', - ); - markdown = markdown.replace( - /- \[x\] (.*$)/gim, - ' $1', - ); - - markdown = markdown.replace(/^\s*-\s+(.*$)/gim, "
  • $1
    • "); - markdown = markdown.replace(/(
  • .*<\/li>)/gim, "
      $1
    "); - - markdown = markdown.replace(/\r\n\r\n/g, ""); - markdown = markdown.replace(/(?:\r\n|\r|\n)/g, "
    "); - - // markdown = markdown.replace(/\n/gim, "
    "); - console.log(markdown) - - return markdown.trim(); - }; - - return ( -
    + return (<> + {error ? +
    +

    {error.message}

    + +
    + :
    {description && (
    • - {description?.description && <>

    Overview

    -

    - {description?.description} -

    } + {description?.description && ( + <> +

    Overview

    +

    {description?.description}

    + + )}
    - {description?.overall_progress != null && <>
    -
    {description?.overall_progress + "%"} + {description?.overall_progress != null && ( + <> +
    +
    + {description?.overall_progress > 0 + ? description?.overall_progress + "%" + : ""} +
    - - -
    - {/*
    {description?.overall_progress + "%"}
    */} - } + + )} - {description?.contributor_name && - - - } - {description?.mentor_name.length!=0 && <> - - - - {description?.mentor_name.length > 1 && ( + {description?.contributor_name && ( + + + + + )} + {description?.mentor_name?.length != 0 && ( <> - {description?.mentor_name?.map((d, i) => { - if (i != 0) { - return ( - - - - ); - } else return <>; - })} + + + + + {description?.mentor_name?.length > 1 && ( + <> + {description?.mentor_name?.map((d, i) => { + if (i != 0) { + return ( + + + + ); + } else return <>; + })} + + )} - )}} - {description?.org_name && - - - } + )} + {description?.org_name && ( + + + + + )}
    Contributor Name - {description?.contributor_name} -
    - Mentor Name - - {description?.mentor_name[0]} -
    Contributor Name + + {description?.contributor_name} + +
    - {d} -
    + Mentor Name + + + {description?.mentor_name[0]} + +
    + + {d} + +
    Org Name - - {description?.org_name} - -
    Org Name + + {description?.org_name} + +
    -
    - {description?.weekly_goals_html &&
    } - {/* {parseMarkdown(description?.weekly_goals_html)} */} +
    + {description?.weekly_goals_html && ( +
    + )}
    -
    - {description?.weekly_learnings_html &&
    } +
    + {description?.weekly_learnings_html && ( +
    + )}
    -

    Overall Project PR Table

    - +

    Overall Project PR Table

    +
    @@ -173,7 +221,9 @@ function SubProjectDescription({ selectedProject,issueNumber, currentIssue }) { @@ -184,7 +234,7 @@ function SubProjectDescription({ selectedProject,issueNumber, currentIssue }) { )} - + } ); } diff --git a/src/css/custom.css b/src/css/custom.css index b88843c14..86f6fc9dd 100644 --- a/src/css/custom.css +++ b/src/css/custom.css @@ -16,6 +16,17 @@ padding: 0 var(--ifm-pre-padding); } + + +@media screen and (max-width: 966px) { + .menu__link--active, .menu__link--active:hover { + color: #1c1e21 !important; + } + .menu__link--active { + background: #ffffff !important; + } +} + .dropdown__link--active, .dropdown__link--active:hover { color: #1c1e21; } diff --git a/src/hooks/useParseMarkdown.js b/src/hooks/useParseMarkdown.js new file mode 100644 index 000000000..e4c5ad255 --- /dev/null +++ b/src/hooks/useParseMarkdown.js @@ -0,0 +1,72 @@ +import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; + +function useParseMarkdown() { + const { siteConfig } = useDocusaurusContext(); + const API_BASE_URL = siteConfig.customFields.API_BASE_URL; + const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + + const weeklyGoals = (markdown) => { + markdown = markdown.replace(/^### (.*$)/gim, "

    $1

    "); + markdown = markdown.replace(/^## (.*$)/gim, `

    $1

    `); + markdown = markdown.replace(/^# (.*$)/gim, `

    $1

    `); + + markdown = markdown.replace(/\*\*(.*)\*\*/gim, "$1"); + markdown = markdown.replace(/\*(.*)\*/gim, "$1"); + + markdown = markdown.replace( + /- \[ \] (.*$)/gim, + ' $1', + ); + markdown = markdown.replace( + /- \[x\] (.*$)/gim, + ' $1', + ); + + markdown = markdown.replace(/^\s*-\s+(.*$)/gim, "
  • $1
    • "); + markdown = markdown.replace(/(
  • .*<\/li>)/gim, "
      $1
    "); + + markdown = markdown.replace( + /!\[(.*?)\]\((.*?)\)/gim, + "$1", + ); + + markdown = markdown.replace(/\r\n\r\n/g, ""); + markdown = markdown.replace(/(?:\r\n|\r|\n)/g, "
    "); + + return markdown.trim(); + } + const weeklyLearnings = (markdown) => { + markdown = markdown.replace(/^### (.*$)/gim, "

    $1

    "); + markdown = markdown.replace(/^## (.*$)/gim, `

    $1

    `); + markdown = markdown.replace(/^# (.*$)/gim, `

    $1

    `); + + markdown = markdown.replace(/\*\*(.*)\*\*/gim, "$1"); + markdown = markdown.replace(/\*(.*)\*/gim, "$1"); + + markdown = markdown.replace( + /- \[ \] (.*$)/gim, + ' $1', + ); + markdown = markdown.replace( + /- \[x\] (.*$)/gim, + ' $1', + ); + + markdown = markdown.replace(/^\s*-\s+(.*$)/gim, "
  • $1
    • "); + markdown = markdown.replace(/(
  • .*<\/li>)/gim, "
      $1
    "); + + markdown = markdown.replace( + /!\[(.*?)\]\((.*?)\)/gim, + "$1", + ); + + markdown = markdown.replace(/\r\n\r\n/g, ""); + markdown = markdown.replace(/(?:\r\n|\r|\n)/g, ""); + + return markdown.trim(); + } + + return { weeklyGoals, weeklyLearnings,API_BASE_URL,API_AUTH_KEY }; + } + + export default useParseMarkdown; \ No newline at end of file diff --git a/src/pages/docs/2024/index.css b/src/pages/docs/2024/index.css index 6b5a1cf05..bb685f8df 100644 --- a/src/pages/docs/2024/index.css +++ b/src/pages/docs/2024/index.css @@ -32,6 +32,7 @@ gap: 28px; .h2-font{ font-size: 32px; } + @media screen and (max-width: 779px){ .header-layout{ flex-direction: column; @@ -76,4 +77,8 @@ font-size: 32px; .right-side-table{ padding-right: 0; } +.fullwidth-table{ + width: 100%; + display: table; +} } \ No newline at end of file diff --git a/src/pages/docs/2024/index.js b/src/pages/docs/2024/index.js index 5416e5d3d..f9667e0b9 100644 --- a/src/pages/docs/2024/index.js +++ b/src/pages/docs/2024/index.js @@ -1,103 +1,109 @@ import React, { useEffect, useState } from "react"; import Layout from "@theme/Layout"; import C4GT2024Page from "../../../components/C4GT2024Page"; -import './index.css'; -import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; -// import { useLocation, useParams } from 'react-router-dom'; +import "./index.css"; +import useParseMarkdown from "../../../hooks/useParseMarkdown"; function C4GT2024() { - const { siteConfig } = useDocusaurusContext(); + const {API_AUTH_KEY,API_BASE_URL} = useParseMarkdown(); const [currentTab, setCurrentTab] = useState("c4gt"); - const [issueData,setIssueData] = useState(null) - const API_BASE_URL = siteConfig.customFields.API_BASE_URL; - const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + const [issueData, setIssueData] = useState(null); + const [error, setError] = useState(null); - useEffect(()=>{ + useEffect(() => { + setError(()=>null); fetch(`${API_BASE_URL}/issues`, { - method: 'GET', - headers:{ - 'X-Secret-Key':API_AUTH_KEY, + method: "GET", + headers: { + "X-Secret-Key": API_AUTH_KEY, + }, + }) + .then((response) => { + if (!response.ok) { + throw new Error(`Error! status: ${response.status}`); } - }) - .then(response => { return response.json(); }) - .then(data => { - setIssueData(()=>data) + .then((data) => { + setIssueData(() => data); }) - .catch(error => { - console.log("error",error.message); + .catch((error) => { + setError(() => error); }); -},[]) - // const { search } = useLocation(); - // const params = useParams(); - - // useEffect(() => { - // window.location.reload(); - // const queryString = window.location.search; - // const urlParams = new URLSearchParams(queryString); - // const product = urlParams.get("id"); - // console.log(product) - // }, [search,params]); + }, []); - return ( -
    -
    - +
    + {currentTab == "c4gt" ? : <>} +
    +
    - + )}     ); } diff --git a/src/pages/docs/2024/org/index.js b/src/pages/docs/2024/org/index.js index dfa997901..c1a3016c3 100644 --- a/src/pages/docs/2024/org/index.js +++ b/src/pages/docs/2024/org/index.js @@ -3,59 +3,81 @@ import Layout from "@theme/Layout"; import ProjectDescription from "../../../../components/ProjectDescription"; import SubProjectDescription from "../../../../components/SubDescription"; import useDocusaurusContext from "@docusaurus/useDocusaurusContext"; -import '../index.css'; -// import { useLocation, useParams } from 'react-router-dom'; +import "../index.css"; +import { useHistory, useLocation } from "react-router-dom"; +import useParseMarkdown from "../../../../hooks/useParseMarkdown"; function C4GT2024() { - const { siteConfig } = useDocusaurusContext(); - const API_BASE_URL = siteConfig.customFields.API_BASE_URL; - const API_AUTH_KEY = siteConfig.customFields.API_AUTH_KEY; + const location = useLocation(); + const history = useHistory(); + const {API_AUTH_KEY,API_BASE_URL} = useParseMarkdown(); const [currentTab, setCurrentTab] = useState("description"); const [currentIssue, setCurrentIssue] = useState(null); - const [currentIssueData, setCurrentIssueData] = useState(null) - const [issueData,setIssueData] = useState(null); + const [currentIssueData, setCurrentIssueData] = useState(null); + const [issueData, setIssueData] = useState(null); const [selectedProject, setSelectedProject] = useState(null); - const [issueNumber,setIssueNumber] = useState(null); + const [issueNumber, setIssueNumber] = useState(null); + const [error, setError] = useState(null); - useEffect(()=>{ - const queryString = window.location.search; + useEffect(() => { + const queryString = location.search; const urlParams = new URLSearchParams(queryString); - const product = urlParams.get("id")?urlParams.get("id"):"c4gt"; - setCurrentIssue(()=>product) + const product = urlParams.get("id") ? urlParams.get("id") : "c4gt"; + setSelectedProject(() => + urlParams.get("issue") ? urlParams.get("issue") : null, + ); + const newUrl = `/docs/2024/org?id=${product}`; + history.push(newUrl); + setCurrentIssue(() => product); + setError(()=>null); fetch(`${API_BASE_URL}/issues`, { - method: 'GET', - headers:{ - 'X-Secret-Key':API_AUTH_KEY, - } - }) - .then(response => { + method: "GET", + headers: { + "X-Secret-Key": API_AUTH_KEY, + }, + }) + .then((response) => { + if (!response.ok) { + throw new Error(`Error! status: ${response.status}`); + } return response.json(); }) - .then(data => { - setIssueData(()=>data) + .then((data) => { + setIssueData(() => data); }) - .catch(error => { - console.log("error",error.message); + .catch((error) => { + setError(()=>error); }); -},[]) - // const { search } = useLocation(); - // const params = useParams(); + }, []); - // useEffect(() => { - // window.location.reload(); - // const queryString = window.location.search; - // const urlParams = new URLSearchParams(queryString); - // const product = urlParams.get("id"); - // console.log(product) - // }, [search,params]); + useEffect(() => { + const queryString = location.search; + const urlParams = new URLSearchParams(queryString); + const product = urlParams.get("id") ? urlParams.get("id") : "c4gt"; + setCurrentIssue(() => product); + }, [location]); - return ( -
    -
    + {error ? ( +
    +

    {error.message}

    + +
    + ) : ( +
    +
    • - { - issueData?.map((data,i)=>{ - return
  • -
    { - setCurrentIssue(()=>data?.org_name); - setSelectedProject(()=>null); - setIssueNumber(()=>null); - setCurrentTab(()=>"description"); - setCurrentIssueData(()=>data?.issues) - }} + {issueData?.map((data, i) => { + return ( +
  • { + const newUrl = `/docs/2024/org?id=${data?.org_name}`; + history.push(newUrl); + setCurrentIssue(() => data?.org_name); + setSelectedProject(() => null); + setIssueNumber(() => null); + setCurrentTab(() => "description"); + setCurrentIssueData(() => data?.issues); + }} > - {data?.org_name} -
    - - - {(currentIssue==data?.org_name) ?
      - {data?.issues?.map((d,i)=>{ - return
    • { - setCurrentTab(()=>"subDescription"); - setSelectedProject(()=>d.name); - setIssueNumber(()=>d.issue_number); - }} + className={`menu__link ${currentIssue == data?.org_name ? "menu__link--active" : ""}`} > - {d.name} + {data?.org_name}
      -
      • - })} - -
    :<>} -
    • - }) - } - + + + {currentIssue == data?.org_name ? ( +
      + {data?.issues?.map((d, i) => { + if (d?.name != null) + return ( +
    • +
      { + const newUrl = `/docs/2024/org?id=${currentIssue}&issue=${d.name}`; + history.push(newUrl); + setCurrentTab(() => "subDescription"); + setSelectedProject(() => d.name); + setIssueNumber(() => d.issue_number); + }} + > + {d.name} +
      +
      • + ); + else <>; + })} +
    + ) : ( + <> + )} + + ); + })} -
    - {(currentTab == "description" && currentIssue!=null) ? :<>} - {currentTab == "subDescription" ? - :<>} +
    + {currentTab == "description" && currentIssue != null ? ( + + ) : ( + <> + )} + {currentTab == "subDescription" && selectedProject != null ? ( + + ) : ( + <> + )}
    - + )} ); } diff --git a/src/pages/index.js b/src/pages/index.js index 519724c99..eeebd0a38 100644 --- a/src/pages/index.js +++ b/src/pages/index.js @@ -8,7 +8,6 @@ import ParticipantImages from "../components/ParticipantImages"; function HomepageHeader() { const { siteConfig } = useDocusaurusContext(); - console.log(siteConfig.customFields.API_BASE_URL) return (
    From 6179c0593c140a0fe0278c541f5ea4747949f713 Mon Sep 17 00:00:00 2001 From: riya-2206 Date: Fri, 7 Jun 2024 12:01:18 +0530 Subject: [PATCH 3/3] added error handling logic --- src/components/ProjectDescription.js | 21 +++------------ src/components/SubDescription.js | 21 ++------------- src/pages/docs/2024/index.js | 17 +++++------- src/pages/docs/2024/org/index.js | 40 +++++++++++++++------------- 4 files changed, 33 insertions(+), 66 deletions(-) diff --git a/src/components/ProjectDescription.js b/src/components/ProjectDescription.js index 9abdca61c..8c36a67eb 100644 --- a/src/components/ProjectDescription.js +++ b/src/components/ProjectDescription.js @@ -8,12 +8,13 @@ function ProjectDescription({ setCurrentTab, setSelectedProject, setIssueNumber, + error, + setError }) { const history = useHistory(); const {API_AUTH_KEY,API_BASE_URL} = useParseMarkdown(); const [description, setDescription] = useState(null); const [mobile, setMobile] = useState(false); - const [error, setError] = useState(null); useEffect(() => { setError(()=>null); @@ -55,23 +56,7 @@ function ProjectDescription({ }, []); return ( <> - {error ? ( -
    -

    {error.message}

    - -
    - ) : ( + {!error && (
    { setError(()=>null); @@ -29,23 +28,7 @@ function SubProjectDescription({ selectedProject, issueNumber, currentIssue }) { }, [selectedProject]); return (<> - {error ? -
    -

    {error.message}

    - -
    - :
    diff --git a/src/pages/docs/2024/index.js b/src/pages/docs/2024/index.js index f9667e0b9..57edee8d2 100644 --- a/src/pages/docs/2024/index.js +++ b/src/pages/docs/2024/index.js @@ -32,25 +32,22 @@ function C4GT2024() { }); }, []); - return ( - - {error ? ( + return (<> + {error ? (
    + >

    Oops, something went wrong

    {error.message}

    -
    ) : ( +
    - )} - + )} + ); } export default C4GT2024; diff --git a/src/pages/docs/2024/org/index.js b/src/pages/docs/2024/org/index.js index c1a3016c3..63fecb012 100644 --- a/src/pages/docs/2024/org/index.js +++ b/src/pages/docs/2024/org/index.js @@ -57,25 +57,22 @@ function C4GT2024() { setCurrentIssue(() => product); }, [location]); - return ( - - {error ? ( + return (<> + {error ? (
    -

    {error.message}

    - -
    + style={{ + display: "flex", + justifyContent: "center", + alignItems: "center", + width: "100%", + height: "100vh", + flexDirection: "column", + }} + >

    Oops, something went wrong

    +

    {error.message}

    + ) : ( +
    -
    )} -     + +     )} + ); } export default C4GT2024;
    Week{tdata.week} {tdata.name} - {tdata.link} + + {tdata.link} + {tdata.status}