Merge branch 'develop-postgres' into issue#3073

PalisadoesFoundation · Dec 31, 2024 · 80b4e61 · 80b4e61
2 parents 9b9b8c8 + 6349f3f
commit 80b4e61
Show file tree

Hide file tree

Showing 30 changed files with 1,532 additions and 611 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -111,7 +111,6 @@ jobs:
             .eslintignore
             .prettierrc
             .prettierignore
-            .nojekyll
             vite.config.ts
             docker-compose.yaml
             Dockerfile
@@ -133,6 +132,11 @@ jobs:
             *.password
             *.secret
             *.credentials
+            .nojekyll
+            yarn.lock
+            docs/docusaurus.config.ts
+            docs/sidebar*
+            CNAME
             
       - name: List all changed unauthorized files
         if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true'

diff --git a/docs/README.md b/docs/README.md
@@ -1,16 +1,16 @@
-# Talawa-Admin Documentation Website
+# Talawa Admin Documentation Website
 
-[![N|Solid](static/img/markdown/misc/logo.png)](https://github.com/PalisadoesFoundation/docs-admin)
+[![N|Solid](static/img/markdown/misc/logo.png)](https://github.com/PalisadoesFoundation/talawa-admin)
 
 # Installation
 
-This document provides instructions on how to set up and start a running instance of docs-admin website on your local system. The instructions are written to be followed in sequence so make sure to go through each of them step by step without skipping any sections.
+This document provides instructions on how to set up and start a running instance of the [talawa-admin documentation website](https://docs-admin.talawa.io/) on your local system. The instructions are written to be followed in sequence so make sure to go through each of them step by step without skipping any sections.
 
 # Table of Contents
 
 <!-- /TOC -->
 
-- [Developer-Docs Installation](#docs-admin-installation)
+- [Developer-Docs Installation](#talawa-admin-installation)
 - [Table of Contents](#table-of-contents)
 - [Prerequisites for Developers](#prerequisites-for-developers)
   - [Install node.js](#install-nodejs)
@@ -25,7 +25,7 @@ This document provides instructions on how to set up and start a running instanc
 
 # Prerequisites for Developers
 
-The contents of the `docs-admin` repo is used to automatically create [the Talawa-Admin Documentation website](https://docs-admin.talawa.io/). The automation uses [Docusaurus](https://docusaurus.io/docs/), a modern static website generator.
+The contents of the `talawa-admin` repo is used to automatically create [the talawa-admin Documentation website](https://docs-admin.talawa.io/). The automation uses [Docusaurus](https://docusaurus.io/docs/), a modern static website generator.
 
 We recommend that you follow these steps before beginning development work in this repository.
 
@@ -46,8 +46,8 @@ $ yarn -version
 **Note:** Please bear in mind that to install docusaurus in your system, a Node.js version 16.14 or above (which can be checked by running node -v) is required. Other requirements that pertains to the installation of docusaurus can be found [here](https://docusaurus.io/docs/installation)
 
 ```console
-$ git clone https://github.com/PalisadoesFoundation/docs-admin.git
-$ cd docs-admin
+$ git clone https://github.com/PalisadoesFoundation/talawa-admin.git
+$ cd talawa-admin
 $ yarn add docusaurus
 ```
 
@@ -173,4 +173,4 @@ If you need to generate static HTML pages (unlikely), then follow these steps.
 $ yarn run build
 ```
 
-This command generates static content into the `/build` directory and can be served using any static contents hosting service.
+This command generates static content into the `/build` directory and can be served using any static contents hosting service.
diff --git a/docs/blog/2019-05-28-first-blog-post.md b/docs/blog/2019-05-28-first-blog-post.md
diff --git a/docs/blog/2019-05-29-long-blog-post.md b/docs/blog/2019-05-29-long-blog-post.md
diff --git a/docs/blog/2021-08-01-mdx-blog-post.mdx b/docs/blog/2021-08-01-mdx-blog-post.mdx
diff --git a/docs/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg b/docs/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg
diff --git a/docs/blog/2021-08-26-welcome/index.md b/docs/blog/2021-08-26-welcome/index.md
diff --git a/docs/blog/authors.yml b/docs/blog/authors.yml
diff --git a/docs/blog/tags.yml b/docs/blog/tags.yml
diff --git a/src/GraphQl/Queries/AgendaCategoryQueries.ts b/src/GraphQl/Queries/AgendaCategoryQueries.ts
@@ -8,8 +8,14 @@ import gql from 'graphql-tag';
  */
 
 export const AGENDA_ITEM_CATEGORY_LIST = gql`
-  query AgendaItemCategoriesByOrganization($organizationId: ID!) {
-    agendaItemCategoriesByOrganization(organizationId: $organizationId) {
+  query AgendaItemCategoriesByOrganization(
+    $organizationId: ID!
+    $where: AgendaItemCategoryWhereInput
+  ) {
+    agendaItemCategoriesByOrganization(
+      organizationId: $organizationId
+      where: $where
+    ) {
       _id
       name
       description

diff --git a/src/components/AgendaCategory/AgendaCategoryContainer.tsx b/src/components/AgendaCategory/AgendaCategoryContainer.tsx
@@ -211,9 +211,9 @@ function agendaCategoryContainer({
               <div className="ms-3">{t('name')}</div>
             </Col>
             <Col
-              className="align-self-center fw-bold d-none d-md-block"
+              className={`  align-self-center  fw-bold d-none d-md-block`}
               md={6}
-              lg={2}
+              lg={6}
             >
               {t('description')}
             </Col>
@@ -242,7 +242,7 @@ function agendaCategoryContainer({
                 </Col>
                 <Col
                   md={6}
-                  lg={2}
+                  lg={6}
                   className="p-1 d-none d-md-block align-self-center text-body-secondary"
                 >
                   {agendaCategory.description}

diff --git a/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryCreateModal.tsx b/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryCreateModal.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 import { Modal, Form, Button } from 'react-bootstrap';
 import type { ChangeEvent } from 'react';
-import styles from './OrganizationAgendaCategory.module.css';
-
+import styles from 'style/app.module.css';
 /**
  * InterfaceFormStateType is an object containing the form state
  */
@@ -48,12 +47,14 @@ const AgendaCategoryCreateModal: React.FC<
 }) => {
   return (
     <Modal
-      className={styles.AgendaCategoryModal}
+      className={`mt-5 ${styles.campaignModal}`}
       show={agendaCategoryCreateModalIsOpen}
       onHide={hideCreateModal}
     >
       <Modal.Header>
-        <p className={styles.titlemodal}>{t('agendaCategoryDetails')}</p>
+        <p className={styles.titlemodalOrganizationEvents}>
+          {t('agendaCategoryDetails')}
+        </p>
         <Button
           variant="danger"
           onClick={hideCreateModal}

diff --git a/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryDeleteModal.tsx b/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryDeleteModal.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Modal, Button } from 'react-bootstrap';
-import styles from './OrganizationAgendaCategory.module.css';
+import styles from 'style/app.module.css';
 
 /**
  * InterfaceAgendaCategoryDeleteModalProps is an object containing the props for AgendaCategoryDeleteModal component
@@ -35,7 +35,7 @@ const AgendaCategoryDeleteModal: React.FC<
     <Modal
       size="sm"
       id={`deleteAgendaCategoryModal`}
-      className={styles.agendaCategoryModal}
+      className={styles.campaignModal}
       show={agendaCategoryDeleteModalIsOpen}
       onHide={toggleDeleteModal}
       backdrop="static"

diff --git a/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryPreviewModal.tsx b/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryPreviewModal.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { Modal, Form, Button } from 'react-bootstrap';
 
-import styles from './OrganizationAgendaCategory.module.css';
+import styles from 'style/app.module.css';
 
 /**
  * InterfaceFormStateType is an object containing the form state
@@ -47,12 +47,14 @@ const AgendaCategoryPreviewModal: React.FC<
 }) => {
   return (
     <Modal
-      className={styles.AgendaCategoryModal}
+      className={styles.campaignModal}
       show={agendaCategoryPreviewModalIsOpen}
       onHide={hidePreviewModal}
     >
       <Modal.Header>
-        <p className={styles.titlemodal}>{t('agendaCategoryDetails')}</p>
+        <p className={styles.titlemodalOrganizationEvents}>
+          {t('agendaCategoryDetails')}
+        </p>
         <Button
           onClick={hidePreviewModal}
           data-testid="previewAgendaCategoryModalCloseBtn"

diff --git a/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryUpdateModal.tsx b/src/components/OrgSettings/AgendaItemCategories/AgendaCategoryUpdateModal.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { Modal, Form, Button } from 'react-bootstrap';
 import type { ChangeEvent } from 'react';
 
-import styles from './OrganizationAgendaCategory.module.css';
+import styles from 'style/app.module.css';
 
 /**
  * InterfaceFormStateType is an object containing the form state
@@ -49,12 +49,14 @@ const AgendaCategoryUpdateModal: React.FC<
 }) => {
   return (
     <Modal
-      className={styles.AgendaCategoryModal}
+      className={styles.campaignModal}
       show={agendaCategoryUpdateModalIsOpen}
       onHide={hideUpdateModal}
     >
       <Modal.Header>
-        <p className={styles.titlemodal}>{t('updateAgendaCategory')}</p>
+        <p className={styles.titlemodalOrganizationEvents}>
+          {t('updateAgendaCategory')}
+        </p>
         <Button
           onClick={hideUpdateModal}
           data-testid="updateAgendaCategoryModalCloseBtn"