Merge branch 'develop' into priyanshu

public/locales/en.json

@@ -360,16 +360,18 @@
     "yes": "Yes"
   },
   "eventListCard": {
-    "location": "Location",
-    "on": "On",
-    "end": "End",
+    "location": "Event Location",
     "deleteEvent": "Delete Event",
     "deleteEventMsg": "Do you want to remove this event?",
     "no": "No",
     "yes": "Yes",
-    "editEvent": "Edit Event",
-    "eventTitle": "Title",
-    "description": "Description",
+    "registerEvent": "Register",
+    "alreadyRegistered": "Already registered",
+    "editEvent": "Update Event",
+    "eventTitle": "Event Title",
+    "description": "Event Description",
+    "regDate": "Start Date",
+    "regEndDate": "End Date",
     "startTime": "Start Time",
     "endTime": "End Time",
     "allDay": "All Day",
@@ -975,7 +977,8 @@
     "view": "View",
     "edit": "Edit",
     "editAdvertisement": "Edit Advertisement",
-    "saveChanges": "Save Changes"
+    "saveChanges": "Save Changes",
+    "endOfResults": "End of results"
   },
   "userChat": {
     "chat": "Chat",

public/locales/fr.json

@@ -362,16 +362,18 @@
     "yes": "Oui"
   },
   "eventListCard": {
-    "location": "Emplacement",
-    "on": "Sur",
-    "end": "Fin",
+    "location": "Lieu de l'événement",
     "deleteEvent": "Supprimer l'événement",
     "deleteEventMsg": "Voulez-vous supprimer cet événement ?",
     "no": "Non",
     "yes": "Oui",
-    "editEvent": "Modifier l'événement",
-    "eventTitle": "Titre",
-    "description": "La description",
+    "registerEvent": "Registre",
+    "alreadyRegistered": "Déjà enregistré",
+    "editEvent": "Événement de mise à jour",
+    "eventTitle": "Titre de l'événement",
+    "description": "Description de l'évenement",
+    "regDate": "Date de début",
+    "regEndDate": "Date de fin",
     "startTime": "Heure de début",
     "endTime": "Heure de fin",
     "allDay": "Toute la journée",
@@ -960,7 +962,8 @@
     "view": "Voir",
     "edit": "Éditer",
     "editAdvertisement": "Éditer l'annonce",
-    "saveChanges": "Enregistrer les modifications"
+    "saveChanges": "Enregistrer les modifications",
+    "endOfResults": "Fin des résultats"
   },
   "userChat": {
     "chat": "Chat",

public/locales/hi.json

@@ -363,16 +363,18 @@
     "yes": "हाँ"
   },
   "eventListCard": {
-    "location": "स्थान",
-    "on": "पर",
-    "end": "समाप्त",
+    "location": "आयोजन स्थान",
     "deleteEvent": "घटना हटाएं",
     "deleteEventMsg": "क्या आप इस इवेंट को हटाना चाहते हैं?",
     "no": "नहीं",
     "yes": "हाँ",
-    "editEvent": "घटना संपादित करें",
-    "eventTitle": "शीर्षक",
-    "description": "विवरण",
+    "registerEvent": "रजिस्टर करें",
+    "alreadyRegistered": "पहले से ही पंजीकृत",
+    "editEvent": "अपडेट इवेंट",
+    "eventTitle": "इवेंट शीर्षक",
+    "description": "इवेंट विवरण",
+    "regDate": "आरंभ करने की तिथि",
+    "regEndDate": "समाप्ति तिथि",
     "startTime": "समय शुरू",
     "endTime": "अंत समय",
     "allDay": "पूरे दिन",
@@ -965,7 +967,8 @@
     "view": "देखें",
     "edit": "संपादित करें",
     "editAdvertisement": "विज्ञापन संपादित करें",
-    "saveChanges": "परिवर्तन सहेजें"
+    "saveChanges": "परिवर्तन सहेजें",
+    "endOfResults": "परिणामों का अंत"
   },
   "userChat": {
     "chat": "बात",

public/locales/sp.json

@@ -362,16 +362,18 @@
     "yes": "Sí"
   },
   "eventListCard": {
-    "location": "Ubicación",
-    "on": "En",
-    "end": "Final",
+    "location": "Lugar del evento",
     "deleteEvent": "Eliminar evento",
     "deleteEventMsg": "¿Quieres eliminar este evento?",
     "no": "No",
     "yes": "Sí",
-    "editEvent": "Editar evento",
-    "eventTitle": "Título",
-    "description": "Descripción",
+    "registerEvent": "Registro",
+    "alreadyRegistered": "Ya registrado",
+    "editEvent": "Evento de actualización",
+    "eventTitle": "Título del evento",
+    "description": "Descripción del evento",
+    "regDate": "Fecha de inicio",
+    "regEndDate": "Fecha final",
     "startTime": "Hora de inicio",
     "endTime": "Hora de finalización",
     "allDay": "Todo el dia",
@@ -962,7 +964,8 @@
     "view": "Ver",
     "edit": "Editar",
     "editAdvertisement": "Editar Anuncio",
-    "saveChanges": "Guardar Cambios"
+    "saveChanges": "Guardar Cambios",
+    "endOfResults": "Fin de los resultados"
   },
   "userChat": {
     "chat": "Charlar",

public/locales/zh.json

@@ -442,16 +442,18 @@
     "yes": "是"
   },
   "eventListCard": {
-    "location": "地點",
-    "on": "上",
-    "end": "結尾",
+    "location": "活動地點",
     "deleteEvent": "刪除事件",
     "deleteEventMsg": "您要刪除此活動嗎？",
     "no": "不",
     "yes": "是的",
-    "editEvent": "編輯事件",
-    "eventTitle": "標題",
-    "description": "描述",
+    "registerEvent": "登記",
+    "alreadyRegistered": "已經註冊",
+    "editEvent": "更新事件",
+    "eventTitle": "活動標題",
+    "description": "活動說明",
+    "regDate": "開始日期",
+    "regEndDate": "結束日期",
     "startTime": "開始時間",
     "endTime": "時間結束",
     "allDay": "一整天",
@@ -963,7 +965,8 @@
     "view": "查看",
     "edit": "编辑",
     "editAdvertisement": "编辑广告",
-    "saveChanges": "保存更改"
+    "saveChanges": "保存更改",
+    "endOfResults": "結果結束"
   },
   "userChat": {
     "chat": "聊天",

schema.graphql

@@ -70,6 +70,17 @@ enum AdvertisementType {
   POPUP
 }
 
+type AdvertisementEdge {
+  cursor: String
+  node: Advertisement
+}
+
+type AdvertisementsConnection {
+  edges: [AdvertisementEdge]
+  pageInfo: DefaultConnectionPageInfo
+  totalCount: Int
+}
+
 type AgendaCategory {
   _id: ID!
   createdAt: Date!
@@ -1055,7 +1066,7 @@ type Query {
     skip: Int
     where: EventWhereInput
   ): [Event!]!
-  advertisementsConnection: [Advertisement]
+  advertisementsConnection(after: String, before: String, first: PositiveInt, last: PositiveInt): AdvertisementsConnection
   getDonationById(id: ID!): Donation!
   getDonationByOrgId(orgId: ID!): [Donation]
   getDonationByOrgIdConnection(

src/GraphQl/Mutations/mutations.ts

@@ -148,13 +148,15 @@ export const SIGNUP_MUTATION = gql`
     $lastName: String!
     $email: EmailAddress!
     $password: String!
+    $orgId: ID!
   ) {
     signUp(
       data: {
         firstName: $firstName
         lastName: $lastName
         email: $email
         password: $password
+        selectedOrganization: $orgId
       }
     ) {
       user {
@@ -348,7 +350,9 @@ export const ADD_ADMIN_MUTATION = gql`
 export const ADD_MEMBER_MUTATION = gql`
   mutation CreateMember($orgid: ID!, $userid: ID!) {
     createMember(input: { organizationId: $orgid, userId: $userid }) {
-      _id
+      organization {
+        _id
+      }
     }
   }
 `;
@@ -564,6 +568,8 @@ export const UPDATE_EVENT_MUTATION = gql`
     $isPublic: Boolean!
     $isRegisterable: Boolean!
     $allDay: Boolean!
+    $startDate: Date!
+    $endDate: Date!
     $startTime: Time
     $endTime: Time
     $location: String
@@ -577,6 +583,8 @@ export const UPDATE_EVENT_MUTATION = gql`
         isPublic: $isPublic
         isRegisterable: $isRegisterable
         allDay: $allDay
+        startDate: $startDate
+        endDate: $endDate
         startTime: $startTime
         endTime: $endTime
         location: $location

src/GraphQl/Queries/OrganizationQueries.ts

@@ -71,6 +71,44 @@ export const ORGANIZATION_POST_LIST = gql`
   }
 `;
 
+export const ORGANIZATION_ADVERTISEMENT_LIST = gql`
+  query Organizations(
+    $id: ID!
+    $after: String
+    $before: String
+    $first: Int
+    $last: Int
+  ) {
+    organizations(id: $id) {
+      _id
+      advertisements(
+        after: $after
+        before: $before
+        first: $first
+        last: $last
+      ) {
+        edges {
+          node {
+            _id
+            name
+            startDate
+            endDate
+            mediaUrl
+          }
+          cursor
+        }
+        pageInfo {
+          startCursor
+          endCursor
+          hasNextPage
+          hasPreviousPage
+        }
+        totalCount
+      }
+    }
+  }
+`;
+
 /**
  * GraphQL query to retrieve organizations based on user connection.
  *

src/GraphQl/Queries/Queries.ts

@@ -782,7 +782,10 @@ export {
 } from './PlugInQueries';
 
 // display posts
-export { ORGANIZATION_POST_LIST } from './OrganizationQueries';
+export {
+  ORGANIZATION_POST_LIST,
+  ORGANIZATION_ADVERTISEMENT_LIST,
+} from './OrganizationQueries';
 
 export {
   ORGANIZATION_ADMINS_LIST,