Merge remote-tracking branch 'upstream/develop' into develop

palisadoes · Dec 23, 2023 · 512881a · 512881a
2 parents d93a553 + e52d39e
commit 512881a
Show file tree

Hide file tree

Showing 26 changed files with 811 additions and 122 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -47,7 +47,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "Talawa Admin Portal",
     "menu": "Menu",
-    "organizations": "Organizations",
+    "my organizations": "My Organizations",
     "requests": "Requests",
     "users": "Users",
     "logout": "Logout"
@@ -84,7 +84,7 @@
     "designation": "Designation",
     "email": "Email",
     "searchByName": "Search By Name",
-    "organizations": "Organizations",
+    "my organizations": "My Organizations",
     "createOrganization": "Create Organization",
     "createSampleOrganization": "Create Sample Organization",
     "description": "Description",
@@ -682,7 +682,11 @@
     "deleteAdvertisement": "Delete Advertisement",
     "deleteAdvertisementMsg": "Do you want to remove this advertisement?",
     "no": "No",
-    "yes": "Yes"
+    "yes": "Yes",
+    "view": "View",
+    "edit": "Edit",
+    "editAdvertisement": "Edit Advertisement",
+    "saveChanges": "Save Changes"
   },
   "userChat": {
     "chat": "Chat",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "Portail d'administration Talawa",
     "menu": "Menu",
-    "organizations": "Organisations",
+    "my organizations": "Mes Organisations",
     "requests": "Demandes",
     "users": "Utilisateurs",
     "logout": "Déconnexion"
@@ -78,7 +78,7 @@
     "designation": "La désignation",
     "email": "E-mail",
     "searchByName": "Rechercher par nom",
-    "organizations": "Organisations",
+    "my organizations": "Mes Organisations",
     "createOrganization": "Créer une organisation",
     "createSampleOrganization": "Créer une organisation d'exemple",
     "description": "La description",
@@ -662,7 +662,11 @@
     "deleteAdvertisement": "Supprimer l'annonce",
     "deleteAdvertisementMsg": "Voulez-vous supprimer cette annonce ?",
     "no": "Non",
-    "yes": "Oui"
+    "yes": "Oui",
+    "view": "Voir",
+    "edit": "Éditer",
+    "editAdvertisement": "Éditer l'annonce",
+    "saveChanges": "Enregistrer les modifications"
   },
   "userChat": {
     "chat": "Chat",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "तलावा व्यवस्थापक पोर्टल",
     "menu": "मेन्यू",
-    "organizations": "संगठन",
+    "my organizations": "मेरे संगठन",
     "requests": "अनुरोध",
     "users": "उपयोगकर्ता",
     "logout": "लॉग आउट"
@@ -78,7 +78,7 @@
     "designation": "पद",
     "email": "ईमेल",
     "searchByName": "नाम से खोजें",
-    "organizations": "संगठन",
+    "my organizations": "मेरे संगठन",
     "createOrganization": "संगठन बनाएं",
     "createSampleOrganization": " सैंपल संगठन बनाएं",
     "description": "विवरण",
@@ -662,7 +662,11 @@
     "deleteAdvertisement": "विज्ञापन हटाएं",
     "deleteAdvertisementMsg": "क्या आप इस विज्ञापन को हटाना चाहते हैं?",
     "no": "नहीं",
-    "yes": "हाँ"
+    "yes": "हाँ",
+    "view": "देखें",
+    "edit": "संपादित करें",
+    "editAdvertisement": "विज्ञापन संपादित करें",
+    "saveChanges": "परिवर्तन सहेजें"
   },
   "userChat": {
     "chat": "बात",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "Portal de administración de Talawa",
     "menu": "Menú",
-    "organizations": "Organizaciones",
+    "my organizations": "Mis Organizaciones",
     "requests": "Solicitudes",
     "users": "Usuarios",
     "logout": "Cerrar sesión"
@@ -78,7 +78,7 @@
     "designation": "Designacion",
     "email": "Correo electrónico",
     "searchByName": "Buscar por nombre",
-    "organizations": "Organizaciones",
+    "my organizations": "Mis Organizaciones.",
     "createOrganization": "Crear organización",
     "createSampleOrganization": "Crear organización de muestra",
     "description": "Descripción",
@@ -662,7 +662,11 @@
     "deleteAdvertisement": "Eliminar anuncio",
     "deleteAdvertisementMsg": "¿Desea eliminar este anuncio?",
     "no": "No",
-    "yes": "Sí"
+    "yes": "Sí",
+    "view": "Ver",
+    "edit": "Editar",
+    "editAdvertisement": "Editar Anuncio",
+    "saveChanges": "Guardar Cambios"
   },
   "userChat": {
     "chat": "Charlar",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "塔拉瓦管理门户",
     "menu": "菜单",
-    "organizations": "组织",
+    "my organizations": "我的组织",
     "requests": "请求",
     "users": "用户",
     "logout": "退出登录"
@@ -78,7 +78,7 @@
     "designation": "指定",
     "email": "電子郵件",
     "searchByName": "按名稱搜索",
-    "organizations": "组织",
+    "my organizations": "我的组织",
     "createOrganization": "創建組織",
     "createSampleOrganization": "创建示范组织",
     "description": "描述",
@@ -662,7 +662,11 @@
     "deleteAdvertisement": "删除广告",
     "deleteAdvertisementMsg": "您是否要删除此广告？",
     "no": "不",
-    "yes": "是"
+    "yes": "是",
+    "view": "查看",
+    "edit": "编辑",
+    "editAdvertisement": "编辑广告",
+    "saveChanges": "保存更改"
   },
   "userChat": {
     "chat": "聊天",

diff --git a/src/GraphQl/Mutations/mutations.ts b/src/GraphQl/Mutations/mutations.ts
@@ -440,6 +440,29 @@ export const ADD_ADVERTISEMENT_MUTATION = gql`
     }
   }
 `;
+export const UPDATE_ADVERTISEMENT_MUTATION = gql`
+  mutation UpdateAdvertisement(
+    $id: ID!
+    $name: String
+    $link: String
+    $type: String
+    $startDate: Date
+    $endDate: Date
+  ) {
+    updateAdvertisement(
+      id: $id
+      data: {
+        name: $name
+        link: $link
+        type: $type
+        startDate: $startDate
+        endDate: $endDate
+      }
+    ) {
+      _id
+    }
+  }
+`;
 export const DELETE_ADVERTISEMENT_BY_ID = gql`
   mutation ($id: ID!) {
     deleteAdvertisementById(id: $id) {