From 35cb0e84dd02d868862aff222fe62023b74fbb10 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 22 Apr 2021 09:17:45 +0300
Subject: [PATCH 01/29] Roles supporting backend

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../models/events/enums/EventType.prisma      |  8 +++
 packages/core/prisma/models/roles/Role.prisma | 15 +++++
 packages/core/prisma/models/users/User.prisma |  3 +
 packages/core/prisma/schema.prisma            | 27 +++++++++
 packages/core/src/domain/validation/index.ts  |  9 ++-
 packages/core/src/index.ts                    |  4 +-
 .../core/src/services/authorization/index.ts  |  6 +-
 .../src/services/authorization/userCan.ts     | 30 ++++++++++
 packages/core/src/services/index.ts           |  1 +
 .../roles/commands/createRoleCommand.ts       | 42 ++++++++++++++
 .../permissions/addRolePermissionCommand.ts   |  0
 .../removeRolePermissionCommand.ts            |  0
 .../commands/users/addUserToRoleCommand.ts    | 55 ++++++++++++++++++
 .../users/rebuildUserPermissionsCommand.ts    | 56 +++++++++++++++++++
 .../users/removeUserFromRoleCommand.ts        | 31 ++++++++++
 packages/core/src/services/roles/index.ts     | 30 ++++++++++
 16 files changed, 313 insertions(+), 4 deletions(-)
 create mode 100644 packages/core/prisma/models/roles/Role.prisma
 create mode 100644 packages/core/src/services/authorization/userCan.ts
 create mode 100644 packages/core/src/services/roles/commands/createRoleCommand.ts
 create mode 100644 packages/core/src/services/roles/commands/permissions/addRolePermissionCommand.ts
 create mode 100644 packages/core/src/services/roles/commands/permissions/removeRolePermissionCommand.ts
 create mode 100644 packages/core/src/services/roles/commands/users/addUserToRoleCommand.ts
 create mode 100644 packages/core/src/services/roles/commands/users/rebuildUserPermissionsCommand.ts
 create mode 100644 packages/core/src/services/roles/commands/users/removeUserFromRoleCommand.ts
 create mode 100644 packages/core/src/services/roles/index.ts

diff --git a/packages/core/prisma/models/events/enums/EventType.prisma b/packages/core/prisma/models/events/enums/EventType.prisma
index f7d0a2f44..2a6fdcc66 100644
--- a/packages/core/prisma/models/events/enums/EventType.prisma
+++ b/packages/core/prisma/models/events/enums/EventType.prisma
@@ -46,4 +46,12 @@ enum EventType {
 
   ReportRespected
   ReportDismissed
+
+  RoleCreated
+  RolePermissionAdded
+  RolePermissionRemoved
+  RoleDeleted
+
+  UserAddedToRole
+  UserRemovedFromRole
 }
\ No newline at end of file
diff --git a/packages/core/prisma/models/roles/Role.prisma b/packages/core/prisma/models/roles/Role.prisma
new file mode 100644
index 000000000..01aa23ed5
--- /dev/null
+++ b/packages/core/prisma/models/roles/Role.prisma
@@ -0,0 +1,15 @@
+model Role {
+  id String @id @default(uuid())
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  name        String @unique
+  displayName String
+
+  description String
+
+  permissions String[]
+
+  users User[]
+}
diff --git a/packages/core/prisma/models/users/User.prisma b/packages/core/prisma/models/users/User.prisma
index db98d2f57..1099adec4 100644
--- a/packages/core/prisma/models/users/User.prisma
+++ b/packages/core/prisma/models/users/User.prisma
@@ -29,4 +29,7 @@ model User {
   notificationLanguage NotificationLanguage @default(EN)
 
   notificationTokens UserNotificationToken[]
+
+  roles       Role[]
+  permissions String[]
 }
\ No newline at end of file
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index 3c8a4c977..dc1242c3a 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -151,6 +151,22 @@ model CommonMember {
   @@unique([userId, commonId])
 }
 
+model Role {
+  id String @id @default(uuid())
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  name        String @unique
+  displayName String
+
+  description String
+
+  permissions String[]
+
+  users User[]
+}
+
 enum SubscriptionStatus {
   Pending
 
@@ -340,6 +356,9 @@ model User {
   notificationLanguage NotificationLanguage @default(EN)
 
   notificationTokens UserNotificationToken[]
+
+  roles       Role[]
+  permissions String[]
 }
 
 enum UserNotificationTokenState {
@@ -413,6 +432,14 @@ enum EventType {
 
   ReportRespected
   ReportDismissed
+
+  RoleCreated
+  RolePermissionAdded
+  RolePermissionRemoved
+  RoleDeleted
+
+  UserAddedToRole
+  UserRemovedFromRole
 }
 
 model Event {
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index 8ce30a507..bbb5cc7d2 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -1,4 +1,11 @@
+import * as z from 'zod';
+
 export { ProposalLinkSchema } from './schemas/ProposalLink.schema';
 export { BillingDetailsSchema } from './schemas/BillingDetails.schema';
 export { ProposalImageSchema } from './schemas/ProposalImage.schema';
-export { ProposalFileSchema } from './schemas/ProposalFile.schema';
\ No newline at end of file
+export { ProposalFileSchema } from './schemas/ProposalFile.schema';
+
+export const PermissionValidator = z.enum([
+  'admin.report.read',
+  'admin.report.act'
+]);
\ No newline at end of file
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 2f7028527..e95b7ad45 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -4,14 +4,14 @@ import { FirebaseToolkit, SendgridToolkit } from '@toolkits';
 FirebaseToolkit.InitializeFirebase();
 SendgridToolkit.InitializeSendgrid();
 
-export { prisma, pubSub } from '@toolkits';
 export { logger } from '@logger';
+export { prisma, pubSub } from '@toolkits';
 
 // Domain
 export { CommonError } from '@errors';
 
-
 // Services
+export { roleService } from './services/roles';
 export { cardService } from './services/cards';
 export { voteService } from './services/votes';
 export { userService } from './services/users';
diff --git a/packages/core/src/services/authorization/index.ts b/packages/core/src/services/authorization/index.ts
index 5595a4127..3b157a10e 100644
--- a/packages/core/src/services/authorization/index.ts
+++ b/packages/core/src/services/authorization/index.ts
@@ -3,6 +3,8 @@ import { canSeeCommonReports } from './reports/canSeeCommonReports';
 import { canSeeMessageReports } from './reports/canSeeMessageReports';
 import { canActOnReport } from './reports/canActOnReport';
 
+import { userCan } from './userCan';
+
 export const authorizationService = {
   discussions: {
     canChangeSubscription: canChangeDiscussionSubscription
@@ -11,5 +13,7 @@ export const authorizationService = {
     canActOnReport: canActOnReport,
     canSeeCommonReports: canSeeCommonReports,
     canSeeMessageReports: canSeeMessageReports
-  }
+  },
+
+  can: userCan
 };
\ No newline at end of file
diff --git a/packages/core/src/services/authorization/userCan.ts b/packages/core/src/services/authorization/userCan.ts
new file mode 100644
index 000000000..6c98b7e1a
--- /dev/null
+++ b/packages/core/src/services/authorization/userCan.ts
@@ -0,0 +1,30 @@
+import * as z from 'zod';
+
+import { logger } from '@logger';
+import { prisma } from '@toolkits';
+import { PermissionValidator } from '@validation';
+
+export const userCan = async (userId: string, permission: z.infer<typeof PermissionValidator>): Promise<boolean> => {
+  const user = await prisma.user.findUnique({
+    where: {
+      id: userId
+    },
+    select: {
+      permissions: true
+    }
+  });
+
+  if (!user) {
+    logger.debug('User cannot because it was not found', {
+      userId
+    });
+
+    return false;
+  }
+
+  const can = user.permissions.includes(permission);
+
+  logger.debug(`User ${can ? 'has' : 'does not have'} ${permission} permission`);
+
+  return can;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/index.ts b/packages/core/src/services/index.ts
index 243265828..9ef0a7fbd 100644
--- a/packages/core/src/services/index.ts
+++ b/packages/core/src/services/index.ts
@@ -1,3 +1,4 @@
+export { roleService } from './roles';
 export { userService } from './users';
 export { voteService } from './votes';
 export { cardService } from './cards';
diff --git a/packages/core/src/services/roles/commands/createRoleCommand.ts b/packages/core/src/services/roles/commands/createRoleCommand.ts
new file mode 100644
index 000000000..47109ad5d
--- /dev/null
+++ b/packages/core/src/services/roles/commands/createRoleCommand.ts
@@ -0,0 +1,42 @@
+import * as z from 'zod';
+import { Role, EventType } from '@prisma/client';
+
+import { prisma } from '@toolkits';
+import { eventService } from '@services';
+import { PermissionValidator } from '@validation';
+
+const schema = z.object({
+  permissions: z.array(PermissionValidator)
+    .nonempty(),
+
+  name: z.string()
+    .nonempty(),
+
+  displayName: z.string()
+    .nonempty(),
+
+  description: z.string()
+    .nonempty()
+});
+
+export const createRoleCommand = async (payload: z.infer<typeof schema>): Promise<Role> => {
+  // Validate the payload
+  schema.parse(payload);
+
+  // Create the role
+  const role = await prisma.role.create({
+    data: payload
+  });
+
+  // Create event
+  eventService.create({
+    type: EventType.RoleCreated,
+    payload: {
+      roleId: role.id,
+      permissions: role.permissions
+    }
+  });
+
+  // Return the created role
+  return role;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/roles/commands/permissions/addRolePermissionCommand.ts b/packages/core/src/services/roles/commands/permissions/addRolePermissionCommand.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/core/src/services/roles/commands/permissions/removeRolePermissionCommand.ts b/packages/core/src/services/roles/commands/permissions/removeRolePermissionCommand.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/core/src/services/roles/commands/users/addUserToRoleCommand.ts b/packages/core/src/services/roles/commands/users/addUserToRoleCommand.ts
new file mode 100644
index 000000000..518d0a172
--- /dev/null
+++ b/packages/core/src/services/roles/commands/users/addUserToRoleCommand.ts
@@ -0,0 +1,55 @@
+import { prisma } from '@toolkits';
+import { CommonError } from '@errors';
+import { logger as $logger } from '@logger';
+import { rebuildUserPermissionsCommand } from './rebuildUserPermissionsCommand';
+
+export const addUserToRoleCommand = async (userId: string, roleId: string): Promise<void> => {
+  const logger = $logger.child({
+    userId,
+    roleId
+  });
+
+  // Find the user and check if they are already in that role
+  const userRoles = await prisma.user
+    .findUnique({
+      where: {
+        id: userId
+      }
+    })
+    .roles({
+      where: {
+        id: roleId
+      }
+    });
+
+  if (userRoles.length) {
+    throw new CommonError('Cannot add the user twice to the same role', {
+      userId,
+      roleId
+    });
+  }
+
+  // Link the user to the role if they are not
+  logger.debug('Linking user to role');
+
+  await prisma.user.update({
+    where: {
+      id: userId
+    },
+    data: {
+      roles: {
+        connect: {
+          id: roleId
+        }
+      }
+    },
+    select: {
+      id: true
+    }
+  });
+
+  logger.info('User linked to role');
+
+  // Rebuild the permissions
+  await rebuildUserPermissionsCommand(userId);
+};
\ No newline at end of file
diff --git a/packages/core/src/services/roles/commands/users/rebuildUserPermissionsCommand.ts b/packages/core/src/services/roles/commands/users/rebuildUserPermissionsCommand.ts
new file mode 100644
index 000000000..b1fbe62a8
--- /dev/null
+++ b/packages/core/src/services/roles/commands/users/rebuildUserPermissionsCommand.ts
@@ -0,0 +1,56 @@
+import { User } from '@prisma/client';
+
+import { logger } from '@logger';
+import { prisma } from '@toolkits';
+import { CommonError } from '@errors';
+
+export const rebuildUserPermissionsCommand = async (userId: string): Promise<User> => {
+  logger.debug(`Rebuilding roles for user (${userId})`, { userId });
+
+  // Find the user and all roles they have
+  const user = await prisma.user.findUnique({
+    where: {
+      id: userId
+    },
+    include: {
+      roles: {
+        select: {
+          permissions: true
+        }
+      }
+    }
+  });
+
+  // Check if the user exists
+  if (!user) {
+    throw new CommonError('Cannot rebuild permissions for non existent user');
+  }
+
+  // Create the new permission that the use has to have
+  const permissions = Array.from(
+    new Set(...user.roles.map(r => r.permissions))
+  );
+
+  // Update the user permissions in the database
+  const updatedUser = await prisma.user.update({
+    where: {
+      id: userId
+    },
+    data: {
+      permissions
+    }
+  });
+
+  // Log the permission difference
+  const removedPermissions = user.permissions.filter(permission => !permission.includes(permission));
+  const addedPermissions = permissions.filter(permission => !user.permissions.includes(permission));
+
+  logger.info('User permission update report', {
+    userId,
+    addedPermissions,
+    removedPermissions
+  });
+
+  // Return the updated user
+  return updatedUser;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/roles/commands/users/removeUserFromRoleCommand.ts b/packages/core/src/services/roles/commands/users/removeUserFromRoleCommand.ts
new file mode 100644
index 000000000..651dd8c3c
--- /dev/null
+++ b/packages/core/src/services/roles/commands/users/removeUserFromRoleCommand.ts
@@ -0,0 +1,31 @@
+import { prisma } from '@toolkits';
+import { rebuildUserPermissionsCommand } from './rebuildUserPermissionsCommand';
+import { logger as $logger } from '@logger';
+
+export const removeUserFromRoleCommand = async (userId: string, roleId: string): Promise<void> => {
+  const logger = $logger.child({
+    userId,
+    roleId
+  });
+
+  // Unlink the user from the role
+  logger.debug('Removing user from role');
+
+  await prisma.user.update({
+    where: {
+      id: userId
+    },
+    data: {
+      roles: {
+        disconnect: {
+          id: roleId
+        }
+      }
+    }
+  });
+
+  logger.info('User removed from role');
+
+  // Rebuild the user permissions
+  await rebuildUserPermissionsCommand(userId);
+};
\ No newline at end of file
diff --git a/packages/core/src/services/roles/index.ts b/packages/core/src/services/roles/index.ts
new file mode 100644
index 000000000..14648622c
--- /dev/null
+++ b/packages/core/src/services/roles/index.ts
@@ -0,0 +1,30 @@
+import { createRoleCommand } from './commands/createRoleCommand';
+
+import { addUserToRoleCommand } from './commands/users/addUserToRoleCommand';
+import { removeUserFromRoleCommand } from './commands/users/removeUserFromRoleCommand';
+import { rebuildUserPermissionsCommand } from './commands/users/rebuildUserPermissionsCommand';
+
+export const roleService = {
+  /**
+   * Create new role
+   */
+  create: createRoleCommand,
+
+  users: {
+    /**
+     * Add one user to one role
+     */
+    addToRole: addUserToRoleCommand,
+
+    /**
+     * Remove one role from one user
+     */
+    removeFromRole: removeUserFromRoleCommand,
+
+    /**
+     * Rebuild the user permissions
+     */
+    rebuildPermissions: rebuildUserPermissionsCommand
+  },
+  permissions: {}
+};
\ No newline at end of file

From 1ae24b29a51b8a3e2bdca70a4d08851bf994b926 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 22 Apr 2021 10:13:01 +0300
Subject: [PATCH 02/29] GraphQL role initial additions

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .run/GraphQL.run.xml                          | 13 +++--
 .../migration.sql                             | 36 ++++++++++++
 .../20210422054519_role_events/migration.sql  | 14 +++++
 packages/core/prisma/seed.ts                  | 56 ++++++++++---------
 packages/core/src/domain/validation/index.ts  | 14 ++++-
 .../graphql/src/generated/nexus-typegen.ts    | 46 ++++++++++++++-
 packages/graphql/src/generated/schema.graphql | 30 ++++++++++
 .../schema/Shared/Inputs/Paginate.input.ts    | 12 ++++
 .../Types/Roles/Queries/GetRoles.query.ts     | 21 +++++++
 .../src/schema/Types/Roles/Types/Role.type.ts | 16 ++++++
 .../graphql/src/schema/Types/Roles/index.ts   |  9 +++
 .../src/schema/Types/Users/Types/User.type.ts | 17 ++++++
 packages/graphql/src/schema/index.ts          |  7 ++-
 13 files changed, 254 insertions(+), 37 deletions(-)
 create mode 100644 packages/core/prisma/migrations/20210422051828_roles_and_permissions_migration/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210422054519_role_events/migration.sql
 create mode 100644 packages/graphql/src/schema/Shared/Inputs/Paginate.input.ts
 create mode 100644 packages/graphql/src/schema/Types/Roles/Queries/GetRoles.query.ts
 create mode 100644 packages/graphql/src/schema/Types/Roles/Types/Role.type.ts
 create mode 100644 packages/graphql/src/schema/Types/Roles/index.ts

diff --git a/.run/GraphQL.run.xml b/.run/GraphQL.run.xml
index 9b88fdc09..125e89a31 100644
--- a/.run/GraphQL.run.xml
+++ b/.run/GraphQL.run.xml
@@ -1,12 +1,13 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="GraphQL" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/packages/graphql/package.json" />
-    <command value="run" />
+    <package-json value="$PROJECT_DIR$/packages/graphql/package.json"/>
+    <command value="run"/>
     <scripts>
-      <script value="dev" />
+      <script value="dev"/>
     </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
+    <node-interpreter value="/usr/local/bin/node"/>
+    <package-manager value="/usr/local/Cellar/yarn/1.22.10/libexec"/>
+    <envs/>
+    <method v="2"/>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/packages/core/prisma/migrations/20210422051828_roles_and_permissions_migration/migration.sql b/packages/core/prisma/migrations/20210422051828_roles_and_permissions_migration/migration.sql
new file mode 100644
index 000000000..e264594bd
--- /dev/null
+++ b/packages/core/prisma/migrations/20210422051828_roles_and_permissions_migration/migration.sql
@@ -0,0 +1,36 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "permissions" TEXT[];
+
+-- CreateTable
+CREATE TABLE "Role" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "name" TEXT NOT NULL,
+    "displayName" TEXT NOT NULL,
+    "description" TEXT NOT NULL,
+    "permissions" TEXT[],
+
+    PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "_RoleToUser" (
+    "A" TEXT NOT NULL,
+    "B" TEXT NOT NULL
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "Role.name_unique" ON "Role"("name");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "_RoleToUser_AB_unique" ON "_RoleToUser"("A", "B");
+
+-- CreateIndex
+CREATE INDEX "_RoleToUser_B_index" ON "_RoleToUser"("B");
+
+-- AddForeignKey
+ALTER TABLE "_RoleToUser" ADD FOREIGN KEY ("A") REFERENCES "Role"("id") ON DELETE CASCADE ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "_RoleToUser" ADD FOREIGN KEY ("B") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
diff --git a/packages/core/prisma/migrations/20210422054519_role_events/migration.sql b/packages/core/prisma/migrations/20210422054519_role_events/migration.sql
new file mode 100644
index 000000000..796d30f3a
--- /dev/null
+++ b/packages/core/prisma/migrations/20210422054519_role_events/migration.sql
@@ -0,0 +1,14 @@
+-- AlterEnum
+-- This migration adds more than one value to an enum.
+-- With PostgreSQL versions 11 and earlier, this is not possible
+-- in a single migration. This can be worked around by creating
+-- multiple migrations, each migration adding only one value to
+-- the enum.
+
+
+ALTER TYPE "EventType" ADD VALUE 'RoleCreated';
+ALTER TYPE "EventType" ADD VALUE 'RolePermissionAdded';
+ALTER TYPE "EventType" ADD VALUE 'RolePermissionRemoved';
+ALTER TYPE "EventType" ADD VALUE 'RoleDeleted';
+ALTER TYPE "EventType" ADD VALUE 'UserAddedToRole';
+ALTER TYPE "EventType" ADD VALUE 'UserRemovedFromRole';
diff --git a/packages/core/prisma/seed.ts b/packages/core/prisma/seed.ts
index 4768264d2..4c1634263 100644
--- a/packages/core/prisma/seed.ts
+++ b/packages/core/prisma/seed.ts
@@ -9,32 +9,36 @@ async function main() {
   await seedNotificationSystemSetting();
   await seedNotificationTemplated();
 
-  // Create templates
-  // await seeder.notificationTemplate.upsert({
-  //   where: {
-  //     forType_templateType_language: {
-  //       forType: NotificationType.FundingRequestAccepted,
-  //       templateType: NotificationTemplateType.EmailNotification,
-  //       language: 'EN'
-  //     }
-  //   },
-  //   update: {},
-  //   create: {
-  //     forType: NotificationType.FundingRequestAccepted,
-  //     templateType: NotificationTemplateType.EmailNotification,
-  //     language: 'EN',
-  //
-  //     subject: 'Good news {{user.firstName}} {{user.lastName}}',
-  //     content: 'Your Proposal {{proposal.title}} for {{proposal.funding.amount}} was accepted',
-  //
-  //     stubs: [
-  //       'user.firstName',
-  //       'user.lastName',
-  //       'proposal.title',
-  //       'proposal.funding.amount'
-  //     ]
-  //   }
-  // });
+  // See roles
+  await seeder.role.upsert({
+    where: {
+      name: 'admin'
+    },
+
+    create: {
+      name: 'admin',
+      displayName: 'Admin',
+      description: 'The ultimate role with all permissions'
+    },
+
+    update: {
+      permissions: [
+        'admin.report.read',
+        'admin.report.act',
+
+        'admin.roles.create',
+        'admin.roles.update',
+
+        'admin.roles.permissions.add',
+        'admin.roles.permissions.remove',
+
+        'admin.roles.assign',
+        'admin.roles.unassign',
+
+        'user.permissions.read'
+      ]
+    }
+  });
 }
 
 main()
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index bbb5cc7d2..11ac0df63 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -7,5 +7,17 @@ export { ProposalFileSchema } from './schemas/ProposalFile.schema';
 
 export const PermissionValidator = z.enum([
   'admin.report.read',
-  'admin.report.act'
+  'admin.report.act',
+
+  'admin.roles.read',
+  'admin.roles.create',
+  'admin.roles.update',
+
+  'admin.roles.permissions.add',
+  'admin.roles.permissions.remove',
+
+  'admin.roles.assign',
+  'admin.roles.unassign',
+
+  'user.permissions.read'
 ]);
\ No newline at end of file
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 86d9ab2ca..c5172853b 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -159,6 +159,10 @@ export interface NexusGenInputs {
   NotificationWhereUniqueInput: { // input type
     id?: NexusGenScalars['UUID'] | null; // UUID
   }
+  PaginateInput: { // input type
+    skip?: number | null; // Int
+    take: number; // Int!
+  }
   ProposalFileInput: { // input type
     value: string; // String!
   }
@@ -208,7 +212,7 @@ export interface NexusGenEnums {
   DiscussionMessageType: "Message"
   DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
   DiscussionType: "CommonDiscussion" | "ProposalDiscussion"
-  EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "VoteCreated"
+  EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
   FundingType: "Monthly" | "OneTime"
   NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
   NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
@@ -334,12 +338,22 @@ export interface NexusGenObjects {
     status: NexusGenEnums['ReportStatus']; // ReportStatus!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
+  Role: { // root type
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description: string; // String!
+    displayName: string; // String!
+    id: NexusGenScalars['UUID']; // UUID!
+    name: string; // String!
+    permissions: string[]; // [String!]!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+  }
   Subscription: {};
   User: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     firstName: string; // String!
     id: string; // ID!
     lastName: string; // String!
+    permissions: string[]; // [String!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   UserNotificationToken: { // root type
@@ -359,7 +373,7 @@ export interface NexusGenObjects {
 }
 
 export interface NexusGenInterfaces {
-  BaseEntity: NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['UserNotificationToken'];
+  BaseEntity: NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['UserNotificationToken'];
 }
 
 export interface NexusGenUnions {
@@ -492,6 +506,7 @@ export interface NexusGenFieldTypes {
     discussion: NexusGenRootTypes['Discussion'] | null; // Discussion
     generateUserAuthToken: string; // String!
     proposal: NexusGenRootTypes['Proposal'] | null; // Proposal
+    roles: Array<NexusGenRootTypes['Role'] | null> | null; // [Role]
     user: NexusGenRootTypes['User'] | null; // User
   }
   Report: { // field return type
@@ -507,6 +522,15 @@ export interface NexusGenFieldTypes {
     status: NexusGenEnums['ReportStatus']; // ReportStatus!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
+  Role: { // field return type
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description: string; // String!
+    displayName: string; // String!
+    id: NexusGenScalars['UUID']; // UUID!
+    name: string; // String!
+    permissions: string[]; // [String!]!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+  }
   Subscription: { // field return type
     discussionMessageCreated: NexusGenRootTypes['DiscussionMessage'] | null; // DiscussionMessage
     notificationCreated: NexusGenRootTypes['Notification'] | null; // Notification
@@ -522,6 +546,7 @@ export interface NexusGenFieldTypes {
     lastName: string; // String!
     notificationTokens: NexusGenRootTypes['UserNotificationToken'][]; // [UserNotificationToken!]!
     notifications: NexusGenRootTypes['Notification'][]; // [Notification!]!
+    permissions: string[]; // [String!]!
     proposals: NexusGenRootTypes['Proposal'][]; // [Proposal!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
@@ -670,6 +695,7 @@ export interface NexusGenFieldTypeNames {
     discussion: 'Discussion'
     generateUserAuthToken: 'String'
     proposal: 'Proposal'
+    roles: 'Role'
     user: 'User'
   }
   Report: { // field return type name
@@ -685,6 +711,15 @@ export interface NexusGenFieldTypeNames {
     status: 'ReportStatus'
     updatedAt: 'DateTime'
   }
+  Role: { // field return type name
+    createdAt: 'DateTime'
+    description: 'String'
+    displayName: 'String'
+    id: 'UUID'
+    name: 'String'
+    permissions: 'String'
+    updatedAt: 'DateTime'
+  }
   Subscription: { // field return type name
     discussionMessageCreated: 'DiscussionMessage'
     notificationCreated: 'Notification'
@@ -700,6 +735,7 @@ export interface NexusGenFieldTypeNames {
     lastName: 'String'
     notificationTokens: 'UserNotificationToken'
     notifications: 'Notification'
+    permissions: 'String'
     proposals: 'Proposal'
     updatedAt: 'DateTime'
   }
@@ -828,6 +864,9 @@ export interface NexusGenArgTypes {
     proposal: { // args
       where: NexusGenInputs['ProposalWhereUniqueInput']; // ProposalWhereUniqueInput!
     }
+    roles: { // args
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
+    }
     user: { // args
       userId?: string | null; // ID
     }
@@ -866,7 +905,7 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "Notification" | "Report" | "UserNotificationToken"
+  BaseEntity: "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "Notification" | "Report" | "Role" | "UserNotificationToken"
 }
 
 export interface NexusGenTypeInterfaces {
@@ -875,6 +914,7 @@ export interface NexusGenTypeInterfaces {
   DiscussionSubscription: "BaseEntity"
   Notification: "BaseEntity"
   Report: "BaseEntity"
+  Role: "BaseEntity"
   UserNotificationToken: "BaseEntity"
 }
 
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 04a7cd81f..a74c77cfa 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -306,11 +306,17 @@ enum EventType {
   ReportCreated
   ReportDismissed
   ReportRespected
+  RoleCreated
+  RoleDeleted
+  RolePermissionAdded
+  RolePermissionRemoved
+  UserAddedToRole
   UserCreated
   UserNotificationTokenCreated
   UserNotificationTokenExpired
   UserNotificationTokenRefreshed
   UserNotificationTokenVoided
+  UserRemovedFromRole
   VoteCreated
 }
 
@@ -462,6 +468,11 @@ input NotificationWhereUniqueInput {
   id: UUID
 }
 
+input PaginateInput {
+  skip: Int = 0
+  take: Int!
+}
+
 type Proposal {
   """The date, at which the item was created"""
   createdAt: DateTime!
@@ -514,6 +525,7 @@ type Query {
   discussion(id: ID!): Discussion
   generateUserAuthToken(authId: String!): String!
   proposal(where: ProposalWhereUniqueInput!): Proposal
+  roles(paginate: PaginateInput): [Role]
 
   """
   Provide ID to fetch specific user or do not pass anything to get the currently authenticated user
@@ -589,6 +601,21 @@ input ReportWhereInput {
   status: ReportStatusFilterInput
 }
 
+type Role implements BaseEntity {
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  description: String!
+  displayName: String!
+
+  """The main identifier of the item"""
+  id: UUID!
+  name: String!
+  permissions: [String!]!
+
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+
 enum SortOrder {
   asc
   desc
@@ -650,6 +677,9 @@ type User {
   lastName: String!
   notificationTokens: [UserNotificationToken!]!
   notifications(cursor: NotificationWhereUniqueInput, orderBy: NotificationOrderByInput = {createdAt: desc}, skip: Int, take: Int = 10): [Notification!]!
+
+  """List of all the users permissions"""
+  permissions: [String!]!
   proposals(skip: Int = 0, take: Int = 10, where: ProposalWhereInput): [Proposal!]!
 
   """The date, at which the item was last modified"""
diff --git a/packages/graphql/src/schema/Shared/Inputs/Paginate.input.ts b/packages/graphql/src/schema/Shared/Inputs/Paginate.input.ts
new file mode 100644
index 000000000..12a2234ae
--- /dev/null
+++ b/packages/graphql/src/schema/Shared/Inputs/Paginate.input.ts
@@ -0,0 +1,12 @@
+import { inputObjectType } from 'nexus';
+
+export const PaginateInput = inputObjectType({
+  name: 'PaginateInput',
+  definition(t) {
+    t.nonNull.int('take');
+
+    t.int('skip', {
+      default: 0
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Roles/Queries/GetRoles.query.ts b/packages/graphql/src/schema/Types/Roles/Queries/GetRoles.query.ts
new file mode 100644
index 000000000..0c8a554d3
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Roles/Queries/GetRoles.query.ts
@@ -0,0 +1,21 @@
+import { queryField, list, arg } from 'nexus';
+import { prisma, authorizationService } from '@common/core';
+
+export const GetRolesQuery = queryField('roles', {
+  type: list('Role'),
+  args: {
+    paginate: arg({
+      type: 'PaginateInput'
+    })
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.roles.read');
+  },
+  resolve: (root, args) => {
+    return prisma.role
+      .findMany({
+        skip: args.paginate?.skip || undefined,
+        take: args.paginate?.take || undefined
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Roles/Types/Role.type.ts b/packages/graphql/src/schema/Types/Roles/Types/Role.type.ts
new file mode 100644
index 000000000..0d1a27786
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Roles/Types/Role.type.ts
@@ -0,0 +1,16 @@
+import { objectType } from 'nexus';
+
+export const RoleType = objectType({
+  name: 'Role',
+  definition(t) {
+    t.implements('BaseEntity');
+
+    t.nonNull.string('name');
+    t.nonNull.string('displayName');
+
+    t.nonNull.string('description');
+
+
+    t.nonNull.list.nonNull.string('permissions');
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Roles/index.ts b/packages/graphql/src/schema/Types/Roles/index.ts
new file mode 100644
index 000000000..d5fef7882
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Roles/index.ts
@@ -0,0 +1,9 @@
+import { RoleType } from './Types/Role.type';
+
+import { GetRolesQuery } from './Queries/GetRoles.query';
+
+export const RoleTypes = [
+  RoleType,
+
+  GetRolesQuery
+];
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/Types/User.type.ts b/packages/graphql/src/schema/Types/Users/Types/User.type.ts
index 4f9a3476b..39838f328 100644
--- a/packages/graphql/src/schema/Types/Users/Types/User.type.ts
+++ b/packages/graphql/src/schema/Types/Users/Types/User.type.ts
@@ -1,4 +1,5 @@
 import { objectType } from 'nexus';
+import { authorizationService } from '@common/core';
 
 export const UserType = objectType({
   name: 'User',
@@ -29,5 +30,21 @@ export const UserType = objectType({
         return `${root.firstName[0].toUpperCase()}. ${root.lastName}`;
       }
     });
+
+    t.nonNull.list.nonNull.string('permissions', {
+      description: 'List of all the users permissions',
+      authorize: async (root, args, ctx) => {
+        const userId = await ctx.getUserId();
+
+        return (
+          // If the user is reading it's permissions
+          userId === root.id ||
+
+          // If the user can read other users permissions
+          await authorizationService.can(userId, 'user.permissions.read')
+        );
+
+      }
+    });
   }
 });
diff --git a/packages/graphql/src/schema/index.ts b/packages/graphql/src/schema/index.ts
index 99708fd70..fb9b8c128 100644
--- a/packages/graphql/src/schema/index.ts
+++ b/packages/graphql/src/schema/index.ts
@@ -4,6 +4,7 @@ import { makeSchema, queryComplexityPlugin, fieldAuthorizePlugin } from 'nexus';
 import { UserTypes } from './Types/Users';
 import { CardTypes } from './Types/Cards';
 import { VoteTypes } from './Types/Votes';
+import { RoleTypes } from './Types/Roles';
 import { EventTypes } from './Types/Events';
 import { CommonTypes } from './Types/Commons';
 import { ReportTypes } from './Types/Reports';
@@ -21,12 +22,15 @@ import { LinkType, LinkInputType } from './Shared/Types/Link.type';
 
 import { BaseEntityInterface } from './Shared/Interfaces/BaseEntity.interface';
 
-import { BillingDetailsInput } from './Shared/Inputs/BillingDetails.input';
+import { PaginateInput } from './Shared/Inputs/Paginate.input';
 import { StringFilterInput } from './Shared/Inputs/StringFilter.input';
+import { BillingDetailsInput } from './Shared/Inputs/BillingDetails.input';
+
 import { SortOrder } from './Shared/Enums/SortBy.enum';
 
 const types = [
   UserTypes,
+  RoleTypes,
   CardTypes,
   VoteTypes,
   EventTypes,
@@ -53,6 +57,7 @@ const types = [
   BaseEntityInterface,
 
   // Shared Input Types
+  PaginateInput,
   LinkInputType,
   StringFilterInput,
   BillingDetailsInput

From 2fd7518ba8dbb8840414d820a8d8c683dd7519a7 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 22 Apr 2021 15:36:30 +0300
Subject: [PATCH 03/29] Role assigning

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../src/services/authorization/userCan.ts     |  2 +-
 .../graphql/src/generated/nexus-typegen.ts    | 29 +++++++++++++++---
 packages/graphql/src/generated/schema.graphql | 11 +++++++
 .../src/schema/Shared/Scalars/Void.scalar.ts  |  6 ++++
 .../Roles/Mutations/AssignRole.mutation.ts    | 16 ++++++++++
 .../Roles/Mutations/CreateRole.mutation.ts    | 30 +++++++++++++++++++
 .../graphql/src/schema/Types/Roles/index.ts   |  8 ++++-
 packages/graphql/src/schema/index.ts          |  2 ++
 8 files changed, 98 insertions(+), 6 deletions(-)
 create mode 100644 packages/graphql/src/schema/Shared/Scalars/Void.scalar.ts
 create mode 100644 packages/graphql/src/schema/Types/Roles/Mutations/AssignRole.mutation.ts
 create mode 100644 packages/graphql/src/schema/Types/Roles/Mutations/CreateRole.mutation.ts

diff --git a/packages/core/src/services/authorization/userCan.ts b/packages/core/src/services/authorization/userCan.ts
index 6c98b7e1a..19db98972 100644
--- a/packages/core/src/services/authorization/userCan.ts
+++ b/packages/core/src/services/authorization/userCan.ts
@@ -24,7 +24,7 @@ export const userCan = async (userId: string, permission: z.infer<typeof Permiss
 
   const can = user.permissions.includes(permission);
 
-  logger.debug(`User ${can ? 'has' : 'does not have'} ${permission} permission`);
+  logger.debug(`User ${can ? 'has' : 'does not have'} "${permission}" permission`);
 
   return can;
 };
\ No newline at end of file
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index c5172853b..d57f7ca8c 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,10 +4,11 @@
  */
 
 
-import { IRequestContext } from "./../context"
-import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
-import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
-import { core } from "nexus"
+import { IRequestContext } from './../context';
+import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
+import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
+import { core } from 'nexus';
+
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -26,6 +27,7 @@ declare global {
      * A field whose value is a generic Universally Unique Identifier: https://en.wikipedia.org/wiki/Universally_unique_identifier.
      */
     uuid<FieldName extends string>(fieldName: FieldName, opts?: core.CommonInputFieldConfig<TypeName, FieldName>): void // "UUID";
+    void<FieldName extends string>(fieldName: FieldName, opts?: core.CommonInputFieldConfig<TypeName, FieldName>): void // "Void";
   }
 }
 declare global {
@@ -46,6 +48,7 @@ declare global {
      * A field whose value is a generic Universally Unique Identifier: https://en.wikipedia.org/wiki/Universally_unique_identifier.
      */
     uuid<FieldName extends string>(fieldName: FieldName, ...opts: core.ScalarOutSpread<TypeName, FieldName>): void // "UUID";
+    void<FieldName extends string>(fieldName: FieldName, ...opts: core.ScalarOutSpread<TypeName, FieldName>): void // "Void";
   }
 }
 
@@ -113,6 +116,12 @@ export interface NexusGenInputs {
     links?: NexusGenInputs['LinkInput'][] | null; // [LinkInput!]
     title: string; // String!
   }
+  CreateRoleInput: { // input type
+    description: string; // String!
+    displayName: string; // String!
+    name: string; // String!
+    permissions: string[]; // [String!]!
+  }
   CreateUserInput: { // input type
     email: string; // String!
     firstName: string; // String!
@@ -237,6 +246,7 @@ export interface NexusGenScalars {
   JSON: any
   URL: any
   UUID: any
+  Void: any
 }
 
 export interface NexusGenObjects {
@@ -463,6 +473,7 @@ export interface NexusGenFieldTypes {
   }
   Mutation: { // field return type
     actOnReport: NexusGenRootTypes['Report'] | null; // Report
+    assignRole: NexusGenScalars['Void'] | null; // Void
     changeDiscussionSubscriptionType: NexusGenRootTypes['DiscussionSubscription'] | null; // DiscussionSubscription
     createCard: NexusGenRootTypes['Card']; // Card!
     createCommon: NexusGenRootTypes['Common']; // Common!
@@ -470,6 +481,7 @@ export interface NexusGenFieldTypes {
     createDiscussionMessage: NexusGenRootTypes['DiscussionMessage']; // DiscussionMessage!
     createFundingProposal: NexusGenRootTypes['Proposal']; // Proposal!
     createJoinProposal: NexusGenRootTypes['Proposal']; // Proposal!
+    createRole: NexusGenRootTypes['Role'] | null; // Role
     createUser: NexusGenRootTypes['User']; // User!
     createUserNotificationToken: NexusGenRootTypes['UserNotificationToken']; // UserNotificationToken!
     createVote: NexusGenRootTypes['Vote']; // Vote!
@@ -652,6 +664,7 @@ export interface NexusGenFieldTypeNames {
   }
   Mutation: { // field return type name
     actOnReport: 'Report'
+    assignRole: 'Void'
     changeDiscussionSubscriptionType: 'DiscussionSubscription'
     createCard: 'Card'
     createCommon: 'Common'
@@ -659,6 +672,7 @@ export interface NexusGenFieldTypeNames {
     createDiscussionMessage: 'DiscussionMessage'
     createFundingProposal: 'Proposal'
     createJoinProposal: 'Proposal'
+    createRole: 'Role'
     createUser: 'User'
     createUserNotificationToken: 'UserNotificationToken'
     createVote: 'Vote'
@@ -804,6 +818,10 @@ export interface NexusGenArgTypes {
     actOnReport: { // args
       input: NexusGenInputs['ActOnReportInput']; // ActOnReportInput!
     }
+    assignRole: { // args
+      roleId: string; // ID!
+      userId: string; // ID!
+    }
     changeDiscussionSubscriptionType: { // args
       id: string; // ID!
       type: NexusGenEnums['DiscussionSubscriptionType']; // DiscussionSubscriptionType!
@@ -826,6 +844,9 @@ export interface NexusGenArgTypes {
     createJoinProposal: { // args
       input: NexusGenInputs['CreateJoinProposalInput']; // CreateJoinProposalInput!
     }
+    createRole: { // args
+      input: NexusGenInputs['CreateRoleInput']; // CreateRoleInput!
+    }
     createUser: { // args
       input: NexusGenInputs['CreateUserInput']; // CreateUserInput!
     }
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index a74c77cfa..08d1a638f 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -145,6 +145,13 @@ input CreateJoinProposalInput {
   title: String!
 }
 
+input CreateRoleInput {
+  description: String!
+  displayName: String!
+  name: String!
+  permissions: [String!]!
+}
+
 input CreateUserInput {
   email: String!
   firstName: String!
@@ -371,6 +378,7 @@ input LinkInput {
 
 type Mutation {
   actOnReport(input: ActOnReportInput!): Report
+  assignRole(roleId: ID!, userId: ID!): Void
   changeDiscussionSubscriptionType(
     """The ID of the discussion subscription to change"""
     id: ID!
@@ -386,6 +394,7 @@ type Mutation {
 
   """Create new proposal of type JOIN."""
   createJoinProposal(input: CreateJoinProposalInput!): Proposal!
+  createRole(input: CreateRoleInput!): Role
 
   """Creates new user in the system"""
   createUser(input: CreateUserInput!): User!
@@ -708,6 +717,8 @@ enum UserNotificationTokenState {
   Voided
 }
 
+scalar Void
+
 type Vote {
   """The date, at which the item was created"""
   createdAt: DateTime!
diff --git a/packages/graphql/src/schema/Shared/Scalars/Void.scalar.ts b/packages/graphql/src/schema/Shared/Scalars/Void.scalar.ts
new file mode 100644
index 000000000..1110cb19f
--- /dev/null
+++ b/packages/graphql/src/schema/Shared/Scalars/Void.scalar.ts
@@ -0,0 +1,6 @@
+import { scalarType } from 'nexus';
+
+export const VoidScalar = scalarType({
+  name: 'Void',
+  asNexusMethod: 'void'
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Roles/Mutations/AssignRole.mutation.ts b/packages/graphql/src/schema/Types/Roles/Mutations/AssignRole.mutation.ts
new file mode 100644
index 000000000..b6be51e81
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Roles/Mutations/AssignRole.mutation.ts
@@ -0,0 +1,16 @@
+import { mutationField, nonNull, idArg } from 'nexus';
+import { authorizationService, roleService } from '@common/core';
+
+export const AssignRoleMutation = mutationField('assignRole', {
+  type: 'Void',
+  args: {
+    userId: nonNull(idArg()),
+    roleId: nonNull(idArg())
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.roles.assign');
+  },
+  resolve: async (root, args) => {
+    await roleService.users.addToRole(args.userId, args.roleId);
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Roles/Mutations/CreateRole.mutation.ts b/packages/graphql/src/schema/Types/Roles/Mutations/CreateRole.mutation.ts
new file mode 100644
index 000000000..002639c34
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Roles/Mutations/CreateRole.mutation.ts
@@ -0,0 +1,30 @@
+import { mutationField, inputObjectType, arg, nonNull } from 'nexus';
+import { roleService, authorizationService } from '@common/core';
+
+export const CreateRoleInput = inputObjectType({
+  name: 'CreateRoleInput',
+  definition(t) {
+    t.nonNull.string('name');
+    t.nonNull.string('displayName');
+    t.nonNull.string('description');
+
+    t.nonNull.list.nonNull.string('permissions');
+  }
+});
+
+export const CreateRoleMutation = mutationField('createRole', {
+  type: 'Role',
+  args: {
+    input: nonNull(arg({
+      type: CreateRoleInput
+    }))
+  },
+  authorize: async (root, args, ctx) =>
+    authorizationService.can(await ctx.getUserId(), 'admin.roles.create'),
+  resolve: async (root, args) => {
+    return roleService.create({
+      ...args.input,
+      permissions: args.input.permissions as any
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Roles/index.ts b/packages/graphql/src/schema/Types/Roles/index.ts
index d5fef7882..f56dc19f4 100644
--- a/packages/graphql/src/schema/Types/Roles/index.ts
+++ b/packages/graphql/src/schema/Types/Roles/index.ts
@@ -2,8 +2,14 @@ import { RoleType } from './Types/Role.type';
 
 import { GetRolesQuery } from './Queries/GetRoles.query';
 
+import { CreateRoleMutation } from './Mutations/CreateRole.mutation';
+import { AssignRoleMutation } from './Mutations/AssignRole.mutation';
+
 export const RoleTypes = [
   RoleType,
 
-  GetRolesQuery
+  GetRolesQuery,
+
+  CreateRoleMutation,
+  AssignRoleMutation
 ];
\ No newline at end of file
diff --git a/packages/graphql/src/schema/index.ts b/packages/graphql/src/schema/index.ts
index fb9b8c128..9c08a71e3 100644
--- a/packages/graphql/src/schema/index.ts
+++ b/packages/graphql/src/schema/index.ts
@@ -14,6 +14,7 @@ import { CommonMemberTypes } from './Types/CommonMember';
 import { NotificationTypes } from './Types/Notifications';
 
 import { UrlScalar } from './Shared/Scalars/Url.scalar';
+import { VoidScalar } from './Shared/Scalars/Void.scalar';
 import { DateScalar } from './Shared/Scalars/Date.scalar';
 import { JsonScalar } from './Shared/Scalars/Json.scalar';
 import { UuidScalar } from './Shared/Scalars/Uuid.scalar';
@@ -46,6 +47,7 @@ const types = [
   DateScalar,
   JsonScalar,
   UuidScalar,
+  VoidScalar,
 
   // Shared Enums
   SortOrder,

From 2799dd1c870f8f1a954506f81e80dbe66a63835b Mon Sep 17 00:00:00 2001
From: watchtower314 <moore3.14159@gmail.com>
Date: Thu, 22 Apr 2021 08:44:20 -0400
Subject: [PATCH 04/29] fix permission getting

---
 .../functions/src/common/business/updateCommon.ts      | 10 ++++++----
 .../functions/src/moderation/business/hideContent.ts   |  3 ++-
 .../functions/src/moderation/business/showContent.ts   |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/firebase/functions/src/common/business/updateCommon.ts b/packages/firebase/functions/src/common/business/updateCommon.ts
index fc376ac06..5c0f021ac 100644
--- a/packages/firebase/functions/src/common/business/updateCommon.ts
+++ b/packages/firebase/functions/src/common/business/updateCommon.ts
@@ -4,12 +4,13 @@ import { ICommonUpdate } from '@common/types';
 import { IUpdatableCommonEntity } from '../database/updateCommon';
 import { commonDb } from '../database';
 import { createCommonHistory } from '../../commonEditHistory/business';
-import { CommonError } from '../../util/errors';
+import { UnauthorizedError } from '../../util/errors';
 import { createEvent } from '../../util/db/eventDbService';
 import { EVENT_TYPES } from '../../event/event';
 import { commonRuleValidationSchema } from '../../util/schemas';
 import { validate } from '../../util/validate';
 import { urlRegex } from '../../util/regex';
+import { hasPermission } from '../../core/domain/users/business';
 
 
 const updateCommonDataValidationScheme = yup.object({
@@ -48,10 +49,11 @@ export const updateCommon = async (payload: UpdateCommonPayload): Promise<IUpdat
 
   await validate<UpdateCommonPayload>(payload, updateCommonDataValidationScheme);
   const currCommon = await commonDb.get(payload.commonId);
-  // TODO check if user has permission to edit this common when permissions pr is merged
 
-  if (currCommon.metadata.founderId !== payload.userId) {
-    throw new CommonError('Try again when you created the common');
+  const canEditCommon = await hasPermission(payload.userId, payload.commonId);
+
+  if (!canEditCommon) {
+    throw new UnauthorizedError();
   }
 
   // the doc that was saved in the commonEditHistory collection
diff --git a/packages/firebase/functions/src/moderation/business/hideContent.ts b/packages/firebase/functions/src/moderation/business/hideContent.ts
index d03c28fe0..d2d39c4c4 100644
--- a/packages/firebase/functions/src/moderation/business/hideContent.ts
+++ b/packages/firebase/functions/src/moderation/business/hideContent.ts
@@ -36,7 +36,8 @@ export const hideContent = async (hideContentPayload: HideContentPayload): Promi
 
 	//Only users with permissions can hide content
   const { itemId, commonId, userId, type } = hideContentPayload;
-  if (!hasPermission(userId, commonId)) {
+  const isModerator = await hasPermission(userId, commonId);
+  if (!isModerator) {
     throw new UnauthorizedError();
   }
 
diff --git a/packages/firebase/functions/src/moderation/business/showContent.ts b/packages/firebase/functions/src/moderation/business/showContent.ts
index 8407bb26f..5928d4525 100644
--- a/packages/firebase/functions/src/moderation/business/showContent.ts
+++ b/packages/firebase/functions/src/moderation/business/showContent.ts
@@ -34,7 +34,8 @@ export const showContent = async (showContentPayload: ShowContentPayload): Promi
 
   //Only users with permissions can make content visible
   const { itemId, commonId, userId, type } = showContentPayload;
-  if (!hasPermission(userId, commonId)) {
+  const isModerator = await hasPermission(userId, commonId);
+  if (!isModerator) {
     throw new UnauthorizedError();
   }
 

From 455fa45786e685935ff61ed1e926615dd665b28e Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Mon, 26 Apr 2021 07:26:03 +0300
Subject: [PATCH 05/29] Saving changes

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../migration.sql                             |  2 +
 .../migration.sql                             |  2 +
 .../migration.sql                             |  2 +
 .../models/events/enums/EventType.prisma      |  1 +
 packages/core/prisma/models/users/User.prisma |  2 +
 packages/core/prisma/schema.prisma            |  3 ++
 packages/core/prisma/seed.ts                  |  7 ++-
 .../roles/commands/editRoleCommand.ts         | 50 +++++++++++++++++++
 packages/core/src/services/roles/index.ts     |  6 +++
 .../graphql/src/generated/nexus-typegen.ts    | 18 +++++--
 packages/graphql/src/generated/schema.graphql |  6 +++
 .../Roles/Mutations/UnassignRole.mutation.ts  | 17 +++++++
 .../graphql/src/schema/Types/Roles/index.ts   |  4 +-
 .../src/schema/Types/Users/Types/User.type.ts |  6 +++
 14 files changed, 118 insertions(+), 8 deletions(-)
 create mode 100644 packages/core/prisma/migrations/20210423043927_role_updated_event/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210423174643_user_photo_m_igration/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210423174702_user_photo_migration/migration.sql
 create mode 100644 packages/core/src/services/roles/commands/editRoleCommand.ts
 create mode 100644 packages/graphql/src/schema/Types/Roles/Mutations/UnassignRole.mutation.ts

diff --git a/packages/core/prisma/migrations/20210423043927_role_updated_event/migration.sql b/packages/core/prisma/migrations/20210423043927_role_updated_event/migration.sql
new file mode 100644
index 000000000..9fa25295d
--- /dev/null
+++ b/packages/core/prisma/migrations/20210423043927_role_updated_event/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "EventType" ADD VALUE 'RoleUpdated';
diff --git a/packages/core/prisma/migrations/20210423174643_user_photo_m_igration/migration.sql b/packages/core/prisma/migrations/20210423174643_user_photo_m_igration/migration.sql
new file mode 100644
index 000000000..78b162adc
--- /dev/null
+++ b/packages/core/prisma/migrations/20210423174643_user_photo_m_igration/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "photo" TEXT NOT NULL DEFAULT E'https://firebasestorage.googleapis.com/v0/b/common-daostack.appspot.com/o/public_img%2Fimg_1602247014163.jpg?alt=media&token=32379da2-0f20-47ed-84b6-9247709673ca';
diff --git a/packages/core/prisma/migrations/20210423174702_user_photo_migration/migration.sql b/packages/core/prisma/migrations/20210423174702_user_photo_migration/migration.sql
new file mode 100644
index 000000000..93689ac2d
--- /dev/null
+++ b/packages/core/prisma/migrations/20210423174702_user_photo_migration/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "photo" DROP DEFAULT;
diff --git a/packages/core/prisma/models/events/enums/EventType.prisma b/packages/core/prisma/models/events/enums/EventType.prisma
index 2a6fdcc66..8c580de8b 100644
--- a/packages/core/prisma/models/events/enums/EventType.prisma
+++ b/packages/core/prisma/models/events/enums/EventType.prisma
@@ -48,6 +48,7 @@ enum EventType {
   ReportDismissed
 
   RoleCreated
+  RoleUpdated
   RolePermissionAdded
   RolePermissionRemoved
   RoleDeleted
diff --git a/packages/core/prisma/models/users/User.prisma b/packages/core/prisma/models/users/User.prisma
index 1099adec4..baf355654 100644
--- a/packages/core/prisma/models/users/User.prisma
+++ b/packages/core/prisma/models/users/User.prisma
@@ -7,6 +7,8 @@ model User {
   firstName String
   lastName  String
 
+  photo String
+
   email         String  @unique
   emailVerified Boolean @default(false)
 
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index dc1242c3a..493122219 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -334,6 +334,8 @@ model User {
   firstName String
   lastName  String
 
+  photo String
+
   email         String  @unique
   emailVerified Boolean @default(false)
 
@@ -434,6 +436,7 @@ enum EventType {
   ReportDismissed
 
   RoleCreated
+  RoleUpdated
   RolePermissionAdded
   RolePermissionRemoved
   RoleDeleted
diff --git a/packages/core/prisma/seed.ts b/packages/core/prisma/seed.ts
index 4c1634263..875ed7e86 100644
--- a/packages/core/prisma/seed.ts
+++ b/packages/core/prisma/seed.ts
@@ -1,13 +1,11 @@
 import { PrismaClient } from '@prisma/client';
-import { seedNotificationSystemSetting } from './seed/notificationSystemSettings';
-import { seedNotificationTemplated } from './seed/notificationTemplates';
 
 export const seeder = new PrismaClient();
 
 async function main() {
   // Seed Notification Settings
-  await seedNotificationSystemSetting();
-  await seedNotificationTemplated();
+  // await seedNotificationSystemSetting();
+  // await seedNotificationTemplated();
 
   // See roles
   await seeder.role.upsert({
@@ -26,6 +24,7 @@ async function main() {
         'admin.report.read',
         'admin.report.act',
 
+        'admin.roles.read',
         'admin.roles.create',
         'admin.roles.update',
 
diff --git a/packages/core/src/services/roles/commands/editRoleCommand.ts b/packages/core/src/services/roles/commands/editRoleCommand.ts
new file mode 100644
index 000000000..2446ca402
--- /dev/null
+++ b/packages/core/src/services/roles/commands/editRoleCommand.ts
@@ -0,0 +1,50 @@
+import * as z from 'zod';
+import { Role, EventType } from '@prisma/client';
+
+import { prisma } from '@toolkits';
+import { eventService } from '@services';
+
+const schema = z.object({
+  id: z.string()
+    .nonempty(),
+
+  name: z.string()
+    .nonempty()
+    .optional(),
+
+  displayName: z.string()
+    .nonempty()
+    .optional(),
+
+  description: z.string()
+    .nonempty()
+    .optional()
+});
+
+export const editRoleCommand = async (payload: z.infer<typeof schema>): Promise<Role> => {
+  // Validate the schema
+  schema.parse(payload);
+
+  const { id, ...updateData } = payload;
+
+  // Update the role
+  const role = await prisma.role
+    .update({
+      where: {
+        id
+      },
+      data: updateData
+    });
+
+  // Broadcast an event
+  eventService.create({
+    type: EventType.RoleUpdated,
+    payload: {
+      roleId: id,
+      updateData
+    }
+  });
+
+  // Return the updated role
+  return role;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/roles/index.ts b/packages/core/src/services/roles/index.ts
index 14648622c..a9748ae76 100644
--- a/packages/core/src/services/roles/index.ts
+++ b/packages/core/src/services/roles/index.ts
@@ -3,6 +3,7 @@ import { createRoleCommand } from './commands/createRoleCommand';
 import { addUserToRoleCommand } from './commands/users/addUserToRoleCommand';
 import { removeUserFromRoleCommand } from './commands/users/removeUserFromRoleCommand';
 import { rebuildUserPermissionsCommand } from './commands/users/rebuildUserPermissionsCommand';
+import { editRoleCommand } from './commands/editRoleCommand';
 
 export const roleService = {
   /**
@@ -10,6 +11,11 @@ export const roleService = {
    */
   create: createRoleCommand,
 
+  /**
+   * Edit one role
+   */
+  edit: editRoleCommand,
+
   users: {
     /**
      * Add one user to one role
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index d57f7ca8c..bd61f4bc0 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -220,9 +220,9 @@ export interface NexusGenEnums {
   DiscussionMessageFlag: "Clear" | "Hidden" | "Reported"
   DiscussionMessageType: "Message"
   DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
-  DiscussionType: "CommonDiscussion" | "ProposalDiscussion"
-  EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
-  FundingType: "Monthly" | "OneTime"
+  DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
+  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
+  FundingType: 'Monthly' | 'OneTime'
   NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
   NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
   ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
@@ -360,10 +360,12 @@ export interface NexusGenObjects {
   Subscription: {};
   User: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
+    email: string; // String!
     firstName: string; // String!
     id: string; // ID!
     lastName: string; // String!
     permissions: string[]; // [String!]!
+    photo: string; // String!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   UserNotificationToken: { // root type
@@ -487,6 +489,7 @@ export interface NexusGenFieldTypes {
     createVote: NexusGenRootTypes['Vote']; // Vote!
     finalizeProposal: boolean; // Boolean!
     reportDiscussionMessage: NexusGenRootTypes['Report']; // Report!
+    unassignRole: NexusGenScalars['Void'] | null; // Void
     voidUserNotificationToken: NexusGenRootTypes['UserNotificationToken']; // UserNotificationToken!
   }
   Notification: { // field return type
@@ -552,6 +555,7 @@ export interface NexusGenFieldTypes {
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     discussionSubscriptions: NexusGenRootTypes['DiscussionSubscription'][]; // [DiscussionSubscription!]!
     displayName: string; // String!
+    email: string; // String!
     events: NexusGenRootTypes['Event'][]; // [Event!]!
     firstName: string; // String!
     id: string; // ID!
@@ -559,6 +563,7 @@ export interface NexusGenFieldTypes {
     notificationTokens: NexusGenRootTypes['UserNotificationToken'][]; // [UserNotificationToken!]!
     notifications: NexusGenRootTypes['Notification'][]; // [Notification!]!
     permissions: string[]; // [String!]!
+    photo: string; // String!
     proposals: NexusGenRootTypes['Proposal'][]; // [Proposal!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
@@ -678,6 +683,7 @@ export interface NexusGenFieldTypeNames {
     createVote: 'Vote'
     finalizeProposal: 'Boolean'
     reportDiscussionMessage: 'Report'
+    unassignRole: 'Void'
     voidUserNotificationToken: 'UserNotificationToken'
   }
   Notification: { // field return type name
@@ -743,6 +749,7 @@ export interface NexusGenFieldTypeNames {
     createdAt: 'DateTime'
     discussionSubscriptions: 'DiscussionSubscription'
     displayName: 'String'
+    email: 'String'
     events: 'Event'
     firstName: 'String'
     id: 'ID'
@@ -750,6 +757,7 @@ export interface NexusGenFieldTypeNames {
     notificationTokens: 'UserNotificationToken'
     notifications: 'Notification'
     permissions: 'String'
+    photo: 'String'
     proposals: 'Proposal'
     updatedAt: 'DateTime'
   }
@@ -862,6 +870,10 @@ export interface NexusGenArgTypes {
     reportDiscussionMessage: { // args
       input: NexusGenInputs['ReportDiscussionMessageInput']; // ReportDiscussionMessageInput!
     }
+    unassignRole: { // args
+      roleId: string; // ID!
+      userId: string; // ID!
+    }
     voidUserNotificationToken: { // args
       tokenId: string; // ID!
     }
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 08d1a638f..4699b78b3 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -317,6 +317,7 @@ enum EventType {
   RoleDeleted
   RolePermissionAdded
   RolePermissionRemoved
+  RoleUpdated
   UserAddedToRole
   UserCreated
   UserNotificationTokenCreated
@@ -402,6 +403,7 @@ type Mutation {
   createVote(input: CreateVoteInput!): Vote!
   finalizeProposal(proposalId: ID!): Boolean!
   reportDiscussionMessage(input: ReportDiscussionMessageInput!): Report!
+  unassignRole(roleId: ID!, userId: ID!): Void
   voidUserNotificationToken(tokenId: ID!): UserNotificationToken!
 }
 
@@ -673,6 +675,9 @@ type User {
   """The display name of the user"""
   displayName: String!
 
+  """The email of the user"""
+  email: String!
+
   """List of events, that occurred and are related to this user"""
   events(orderBy: EventOrderByInput, skip: Int = 0, take: Int = 10): [Event!]!
 
@@ -689,6 +694,7 @@ type User {
 
   """List of all the users permissions"""
   permissions: [String!]!
+  photo: String!
   proposals(skip: Int = 0, take: Int = 10, where: ProposalWhereInput): [Proposal!]!
 
   """The date, at which the item was last modified"""
diff --git a/packages/graphql/src/schema/Types/Roles/Mutations/UnassignRole.mutation.ts b/packages/graphql/src/schema/Types/Roles/Mutations/UnassignRole.mutation.ts
new file mode 100644
index 000000000..2ebebc646
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Roles/Mutations/UnassignRole.mutation.ts
@@ -0,0 +1,17 @@
+import { mutationField, nonNull, idArg } from 'nexus';
+import { authorizationService, roleService } from '@common/core';
+
+export const UnassignRoleMutation = mutationField('unassignRole', {
+  type: 'Void',
+  args: {
+    userId: nonNull(idArg()),
+    roleId: nonNull(idArg())
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.roles.unassign');
+  },
+  resolve: (root, args) => {
+    return roleService.users.removeFromRole(args.userId, args.roleId);
+  }
+});
+
diff --git a/packages/graphql/src/schema/Types/Roles/index.ts b/packages/graphql/src/schema/Types/Roles/index.ts
index f56dc19f4..eb37cce13 100644
--- a/packages/graphql/src/schema/Types/Roles/index.ts
+++ b/packages/graphql/src/schema/Types/Roles/index.ts
@@ -4,6 +4,7 @@ import { GetRolesQuery } from './Queries/GetRoles.query';
 
 import { CreateRoleMutation } from './Mutations/CreateRole.mutation';
 import { AssignRoleMutation } from './Mutations/AssignRole.mutation';
+import { UnassignRoleMutation } from './Mutations/UnassignRole.mutation';
 
 export const RoleTypes = [
   RoleType,
@@ -11,5 +12,6 @@ export const RoleTypes = [
   GetRolesQuery,
 
   CreateRoleMutation,
-  AssignRoleMutation
+  AssignRoleMutation,
+  UnassignRoleMutation
 ];
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/Types/User.type.ts b/packages/graphql/src/schema/Types/Users/Types/User.type.ts
index 39838f328..b843e002a 100644
--- a/packages/graphql/src/schema/Types/Users/Types/User.type.ts
+++ b/packages/graphql/src/schema/Types/Users/Types/User.type.ts
@@ -31,6 +31,12 @@ export const UserType = objectType({
       }
     });
 
+    t.nonNull.string('photo');
+
+    t.nonNull.string('email', {
+      description: 'The email of the user'
+    });
+
     t.nonNull.list.nonNull.string('permissions', {
       description: 'List of all the users permissions',
       authorize: async (root, args, ctx) => {

From c6d90c2a37b276b56f56389f2ccbe6cf590e757f Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Mon, 26 Apr 2021 11:16:39 +0300
Subject: [PATCH 06/29] Importers in progress

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/core/prisma/firestore/firestore.ts   |  5 +
 .../firestore/importers/importCommons.ts      | 86 +++++++++++++++++
 .../importers/importFundingProposals.ts       | 96 +++++++++++++++++++
 .../prisma/firestore/importers/importUsers.ts | 49 ++++++++++
 .../migration.sql                             |  4 +
 .../migration.sql                             |  3 +
 .../migration.sql                             |  8 ++
 .../20210426074706_rename_link/migration.sql  |  9 ++
 .../core/prisma/models/commons/Common.prisma  |  9 ++
 .../prisma/models/proposals/Proposal.prisma   |  2 +-
 packages/core/prisma/schema.prisma            | 11 ++-
 packages/core/prisma/seed.ts                  |  9 ++
 .../src/domain/toolkits/FirebaseToolkit.ts    |  9 +-
 .../funding/createFundingProposalCommand.ts   |  2 +-
 .../join/createJoinProposalCommand.ts         |  2 +-
 .../users/commands/createUserCommand.ts       |  3 +
 packages/firebase/package.json                |  2 +-
 .../Users/Mutations/CreateUser.mutation.ts    |  3 +-
 18 files changed, 305 insertions(+), 7 deletions(-)
 create mode 100644 packages/core/prisma/firestore/firestore.ts
 create mode 100644 packages/core/prisma/firestore/importers/importCommons.ts
 create mode 100644 packages/core/prisma/firestore/importers/importFundingProposals.ts
 create mode 100644 packages/core/prisma/firestore/importers/importUsers.ts
 create mode 100644 packages/core/prisma/migrations/20210426052554_common_descriptions/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210426052746_common_links_and_rules/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210426054913_image_migration/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210426074706_rename_link/migration.sql

diff --git a/packages/core/prisma/firestore/firestore.ts b/packages/core/prisma/firestore/firestore.ts
new file mode 100644
index 000000000..efd38efa8
--- /dev/null
+++ b/packages/core/prisma/firestore/firestore.ts
@@ -0,0 +1,5 @@
+import { FirebaseToolkit } from '@common/core';
+
+FirebaseToolkit.InitializeFirebase();
+
+export const db = FirebaseToolkit.getDb();
\ No newline at end of file
diff --git a/packages/core/prisma/firestore/importers/importCommons.ts b/packages/core/prisma/firestore/importers/importCommons.ts
new file mode 100644
index 000000000..7cba9382b
--- /dev/null
+++ b/packages/core/prisma/firestore/importers/importCommons.ts
@@ -0,0 +1,86 @@
+import { Common, CommonMemberRole, FundingType } from '@prisma/client';
+import { seeder } from '../../seed';
+import { db } from '../firestore';
+
+export const importCommons = async () => {
+  const CommonsCollection = db.collection('daos');
+
+  const firebaseCommons = (await CommonsCollection.get()).docs.map(u => u.data());
+
+  const failedCommons: {
+    error: Error,
+    from: any
+  }[] = [];
+
+  const createdCommons: {
+    commons: Common,
+    from: any
+  }[] = [];
+
+  for (const common of firebaseCommons) {
+    console.log(`Importing ${common.name}`);
+
+    try {
+      const createdCommon = await seeder.common.create({
+        data: {
+          id: common.id,
+
+          name: common.name,
+          image: common.image,
+
+          balance: common.balance,
+          raised: common.raised,
+
+          byline: common.metadata.byline,
+          description: common.metadata.description,
+
+          whitelisted: common.whitelisted === 'registered',
+
+          fundingType: common.metadata.contributionType === 'monthly'
+            ? FundingType.Monthly
+            : FundingType.OneTime,
+
+          fundingMinimumAmount: common.metadata.minFeeToJoin
+        }
+      });
+
+      createdCommons.push({
+        commons: createdCommon,
+        from: common
+      });
+
+      console.info('Import of the common finished!');
+      console.info('Importing common members');
+
+      for (const member of common.members) {
+        const roles = [];
+
+        if (member.userId === common.metadata.founderId) {
+          roles.push(CommonMemberRole.Founder);
+        }
+
+        try {
+          await seeder.commonMember.create({
+            data: {
+              commonId: createdCommon.id,
+              userId: member.userId,
+              roles: roles as any
+            }
+          });
+        } catch (e) {
+          console.error('Cannot add common member', e);
+        }
+      }
+    } catch (e) {
+      failedCommons.push({
+        error: e,
+        from: common
+      });
+
+      console.info('Import failed!');
+    }
+  }
+
+  console.log(failedCommons);
+  console.log(createdCommons);
+};
\ No newline at end of file
diff --git a/packages/core/prisma/firestore/importers/importFundingProposals.ts b/packages/core/prisma/firestore/importers/importFundingProposals.ts
new file mode 100644
index 000000000..3e08a6435
--- /dev/null
+++ b/packages/core/prisma/firestore/importers/importFundingProposals.ts
@@ -0,0 +1,96 @@
+import { db } from '../firestore';
+import { seeder } from '../../seed';
+import { IFundingRequestProposal, FundingRequestState } from '@common/types';
+import { FundingState, ProposalState, ProposalType } from '@prisma/client';
+
+const transformState = (state: FundingRequestState): ProposalState => {
+  switch (state) {
+    case 'failed':
+      return ProposalState.Rejected;
+    case 'passed':
+    case 'passedInsufficientBalance':
+      return ProposalState.Accepted;
+    case 'countdown':
+      return ProposalState.Countdown;
+  }
+};
+
+export const importFundingProposals = async () => {
+  const ProposalsCollection = db.collection('proposals');
+
+  const firebaseFundingProposals = (await ProposalsCollection
+    .where('type', '==', 'fundingRequest').get())
+    .docs.map(e => e.data());
+
+  for (const fp of firebaseFundingProposals as IFundingRequestProposal[]) {
+    console.log('Importing proposal');
+
+    try {
+      const ifp = await seeder.proposal
+        .create({
+          data: {
+            common: {
+              connect: {
+                id: fp.commonId
+              }
+            },
+
+            commonMember: {
+              connect: {
+                userId_commonId: {
+                  userId: fp.proposerId,
+                  commonId: fp.commonId
+                }
+              }
+            },
+
+            user: {
+              connect: {
+                id: fp.proposerId
+              }
+            },
+
+            type: ProposalType.FundingRequest,
+
+            title: (fp.description as any).title,
+            description: (fp.description as any).description,
+
+            files: (fp.description as any)?.files.map((f: any) => ({
+              value: f.value
+            })),
+
+            images: (fp.description as any)?.images.map((f: any) => ({
+              value: f.value
+            })),
+
+            links: (fp.description as any)?.links.map((f: any) => ({
+              title: f.title || '',
+              url: f.value
+            })),
+
+            state: transformState(fp.state),
+
+            expiresAt:
+              new Date(
+                fp.createdAt.toDate().getTime() +
+                fp.countdownPeriod * 1000
+              ),
+
+            votesFor: fp.votesFor,
+            votesAgainst: fp.votesAgainst,
+
+            funding: {
+              create: {
+                fundingState: FundingState.NotEligible,
+                amount: fp.fundingRequest.amount
+              }
+            }
+          }
+        });
+
+      console.log('Imported proposal');
+    } catch (e) {
+      console.log('Failed importing funding request', e);
+    }
+  }
+};
\ No newline at end of file
diff --git a/packages/core/prisma/firestore/importers/importUsers.ts b/packages/core/prisma/firestore/importers/importUsers.ts
new file mode 100644
index 000000000..c38171d8e
--- /dev/null
+++ b/packages/core/prisma/firestore/importers/importUsers.ts
@@ -0,0 +1,49 @@
+import { User } from '@prisma/client';
+import { db } from '../firestore';
+import { seeder } from '../../seed';
+
+export const importUsers = async () => {
+  const UsersCollection = db.collection('users');
+
+  const firebaseUsers = (await UsersCollection.get()).docs.map(u => u.data());
+
+  const failedUsers: {
+    error: Error,
+    from: any
+  }[] = [];
+  const createdUsers: {
+    user: User,
+    from: any
+  }[] = [];
+
+  for (const user of firebaseUsers) {
+    console.log(`Importing ${user.firstName} ${user.lastName}`);
+
+    try {
+      createdUsers.push({
+        user: await seeder.user.create({
+          data: {
+            id: user.uid,
+            firstName: user.firstName || '',
+            lastName: user.lastName || '',
+            email: user.email,
+            photo: user.photoURL
+          }
+        }),
+        from: user
+      });
+
+      console.info('Import finished!');
+    } catch (e) {
+      failedUsers.push({
+        error: e,
+        from: user
+      });
+
+      console.info('Import failed!');
+    }
+  }
+
+  console.log(failedUsers);
+  console.log(createdUsers);
+};
\ No newline at end of file
diff --git a/packages/core/prisma/migrations/20210426052554_common_descriptions/migration.sql b/packages/core/prisma/migrations/20210426052554_common_descriptions/migration.sql
new file mode 100644
index 000000000..bb34a6609
--- /dev/null
+++ b/packages/core/prisma/migrations/20210426052554_common_descriptions/migration.sql
@@ -0,0 +1,4 @@
+-- AlterTable
+ALTER TABLE "Common" ADD COLUMN     "action" TEXT,
+ADD COLUMN     "byline" TEXT,
+ADD COLUMN     "description" TEXT;
diff --git a/packages/core/prisma/migrations/20210426052746_common_links_and_rules/migration.sql b/packages/core/prisma/migrations/20210426052746_common_links_and_rules/migration.sql
new file mode 100644
index 000000000..ea12500c1
--- /dev/null
+++ b/packages/core/prisma/migrations/20210426052746_common_links_and_rules/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "Common" ADD COLUMN     "links" JSONB,
+ADD COLUMN     "rules" JSONB;
diff --git a/packages/core/prisma/migrations/20210426054913_image_migration/migration.sql b/packages/core/prisma/migrations/20210426054913_image_migration/migration.sql
new file mode 100644
index 000000000..1ea11ae06
--- /dev/null
+++ b/packages/core/prisma/migrations/20210426054913_image_migration/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Added the required column `image` to the `Common` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Common" ADD COLUMN     "image" TEXT NOT NULL;
diff --git a/packages/core/prisma/migrations/20210426074706_rename_link/migration.sql b/packages/core/prisma/migrations/20210426074706_rename_link/migration.sql
new file mode 100644
index 000000000..965ded090
--- /dev/null
+++ b/packages/core/prisma/migrations/20210426074706_rename_link/migration.sql
@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `link` on the `Proposal` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "Proposal" DROP COLUMN "link",
+ADD COLUMN     "links" JSONB;
diff --git a/packages/core/prisma/models/commons/Common.prisma b/packages/core/prisma/models/commons/Common.prisma
index 1745dfae8..467225198 100644
--- a/packages/core/prisma/models/commons/Common.prisma
+++ b/packages/core/prisma/models/commons/Common.prisma
@@ -9,6 +9,15 @@ model Common {
   balance Int @default(0)
   raised  Int @default(0)
 
+  image String
+
+  action String?
+  byline String?
+  description String?
+
+  links   Json?
+  rules  Json?
+
   whitelisted Boolean @default(false)
 
   fundingType          FundingType
diff --git a/packages/core/prisma/models/proposals/Proposal.prisma b/packages/core/prisma/models/proposals/Proposal.prisma
index ccc11c2cd..3f1a0b4a3 100644
--- a/packages/core/prisma/models/proposals/Proposal.prisma
+++ b/packages/core/prisma/models/proposals/Proposal.prisma
@@ -9,7 +9,7 @@ model Proposal {
   title       String?
   description String?
 
-  link   Json?
+  links   Json?
   files  Json?
   images Json?
 
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index 493122219..49ad95c70 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -107,6 +107,15 @@ model Common {
   balance Int @default(0)
   raised  Int @default(0)
 
+  image String
+
+  action      String?
+  byline      String?
+  description String?
+
+  links Json?
+  rules Json?
+
   whitelisted Boolean @default(false)
 
   fundingType          FundingType
@@ -652,7 +661,7 @@ model Proposal {
   title       String?
   description String?
 
-  link   Json?
+  links  Json?
   files  Json?
   images Json?
 
diff --git a/packages/core/prisma/seed.ts b/packages/core/prisma/seed.ts
index 875ed7e86..9dda6dd99 100644
--- a/packages/core/prisma/seed.ts
+++ b/packages/core/prisma/seed.ts
@@ -1,5 +1,9 @@
 import { PrismaClient } from '@prisma/client';
 
+import { importUsers } from './firestore/importers/importUsers';
+import { importCommons } from './firestore/importers/importCommons';
+import { importFundingProposals } from './firestore/importers/importFundingProposals';
+
 export const seeder = new PrismaClient();
 
 async function main() {
@@ -7,6 +11,11 @@ async function main() {
   // await seedNotificationSystemSetting();
   // await seedNotificationTemplated();
 
+  // Import firestore
+  await importUsers();
+  await importCommons();
+  await importFundingProposals();
+
   // See roles
   await seeder.role.upsert({
     where: {
diff --git a/packages/core/src/domain/toolkits/FirebaseToolkit.ts b/packages/core/src/domain/toolkits/FirebaseToolkit.ts
index 72c8b23e0..132f3672f 100644
--- a/packages/core/src/domain/toolkits/FirebaseToolkit.ts
+++ b/packages/core/src/domain/toolkits/FirebaseToolkit.ts
@@ -26,4 +26,11 @@ export const messaging = (() => {
   InitializeFirebase();
 
   return admin.messaging();
-})();
\ No newline at end of file
+})();
+
+/**
+ * @deprecated
+ *
+ * @todo Delete this :(
+ */
+export const getDb = () => admin.firestore();
\ No newline at end of file
diff --git a/packages/core/src/services/proposals/commands/funding/createFundingProposalCommand.ts b/packages/core/src/services/proposals/commands/funding/createFundingProposalCommand.ts
index 2a4d0344e..0cba39407 100644
--- a/packages/core/src/services/proposals/commands/funding/createFundingProposalCommand.ts
+++ b/packages/core/src/services/proposals/commands/funding/createFundingProposalCommand.ts
@@ -95,7 +95,7 @@ export const createFundingProposalCommand = async (command: z.infer<typeof schem
       description: command.description,
       type: ProposalType.FundingRequest,
 
-      link: command.links,
+      links: command.links,
       files: command.files,
       images: command.images,
 
diff --git a/packages/core/src/services/proposals/commands/join/createJoinProposalCommand.ts b/packages/core/src/services/proposals/commands/join/createJoinProposalCommand.ts
index 44fb5b69a..a06de1682 100644
--- a/packages/core/src/services/proposals/commands/join/createJoinProposalCommand.ts
+++ b/packages/core/src/services/proposals/commands/join/createJoinProposalCommand.ts
@@ -109,7 +109,7 @@ export const createJoinProposalCommand = async (command: z.infer<typeof schema>)
     data: {
       type: ProposalType.JoinRequest,
 
-      link: command.links,
+      links: command.links,
       title: command.title,
       description: command.description,
 
diff --git a/packages/core/src/services/users/commands/createUserCommand.ts b/packages/core/src/services/users/commands/createUserCommand.ts
index 81609f286..72117f871 100644
--- a/packages/core/src/services/users/commands/createUserCommand.ts
+++ b/packages/core/src/services/users/commands/createUserCommand.ts
@@ -21,6 +21,9 @@ const schema = z.object({
   lastName: z.string()
     .nonempty(),
 
+  photo: z.string()
+    .nonempty(),
+
   email: z.string()
     .nonempty()
     .email()
diff --git a/packages/firebase/package.json b/packages/firebase/package.json
index 051f49fe7..6e7419d32 100644
--- a/packages/firebase/package.json
+++ b/packages/firebase/package.json
@@ -12,7 +12,7 @@
     "tab:compile:types:watch": "ttab -t 'Types Compilation' yarn compile:types",
     "tab:start": "ttab -t 'Firebase Runtime' yarn start",
     "dev": "yarn tab:compile:types:watch && yarn tab:compile:watch && yarn tab:start",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "typecheck": "tsc -p tsconfig.json --noEmit", 
     "lint": "eslint ./",
     "clean": "find ./ -name '*.log' -delete",
     "logs": "firebase functions:log",
diff --git a/packages/graphql/src/schema/Types/Users/Mutations/CreateUser.mutation.ts b/packages/graphql/src/schema/Types/Users/Mutations/CreateUser.mutation.ts
index 5cdcc64e4..2e59fa9a7 100644
--- a/packages/graphql/src/schema/Types/Users/Mutations/CreateUser.mutation.ts
+++ b/packages/graphql/src/schema/Types/Users/Mutations/CreateUser.mutation.ts
@@ -8,6 +8,7 @@ export const CreateUserInput = inputObjectType({
     t.nonNull.string('firstName');
     t.nonNull.string('lastName');
     t.nonNull.string('email');
+    t.nonNull.string('photo');
   }
 });
 
@@ -28,7 +29,7 @@ export const CreateUserMutation = extendType({
       resolve: async (root, args, ctx) => {
         const userDecodedToken = await ctx.getUserDecodedToken();
 
-        return userService.commands.create({
+        return userService.create({
           ...args.input,
           id: userDecodedToken.uid,
           emailVerified: userDecodedToken.email === args.input.email && userDecodedToken.email_verified

From 9ef1830100a983ac5643d226d8aa0cd7ff1c51cb Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Tue, 27 Apr 2021 09:00:01 +0300
Subject: [PATCH 07/29] Get admin in order

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/.env                           |    5 +
 packages/admin/.env.local                     |    7 +-
 packages/admin/.env.local.example             |    6 +
 packages/admin/codegen.yml                    |   10 +-
 .../admin/src/components/CommonSettings.tsx   |    2 +-
 .../admin/src/components/HasPermission.tsx    |   37 +-
 packages/admin/src/components/Header.tsx      |   39 +-
 .../src/components/helpers/ClientOnly.tsx     |   19 +
 .../admin/src/components/helpers/index.ts     |    1 +
 .../components/layout/AuthenticatedLayout.tsx |   18 +
 .../layout/AuthenticationBasedLayout.tsx      |   40 -
 .../components/providers/ApolloProvider.tsx   |   53 +-
 .../providers/AuthenticationProvider.tsx      |   59 +
 .../admin/src/components/providers/index.ts   |    2 +
 .../components/tables/LatestEventsTable.tsx   |  128 +-
 .../src/components/tables/PaymentsTable.tsx   |    2 +-
 packages/admin/src/context/AuthContext.tsx    |   56 -
 .../admin/src/context/PermissionsContext.tsx  |   62 -
 packages/admin/src/context/index.ts           |    2 -
 packages/admin/src/core/constants/index.ts    |    6 +
 .../admin/src/core/context/UserContext.tsx    |   75 +
 packages/admin/src/core/context/index.ts      |    1 +
 packages/admin/src/core/graphql/index.ts      |  942 +++
 .../admin/src/core/graphql/schema.graphql     |  587 ++
 .../admin/src/{ => core}/graphql/schema.json  | 5516 +++++++++++------
 packages/admin/src/graphql/index.ts           | 2154 -------
 packages/admin/src/graphql/schema.graphql     |  416 --
 .../admin/src/helpers/hoc/withPermission.tsx  |    9 +-
 packages/admin/src/pages/_app.tsx             |   54 +-
 packages/admin/src/pages/accounts/login.tsx   |  138 +
 packages/admin/src/pages/auth/index.tsx       |  147 -
 .../src/pages/commons/details/[commonId].tsx  |    2 +-
 packages/admin/src/pages/commons/index.tsx    |    8 +-
 packages/admin/src/pages/dashboard/index.tsx  |   75 +-
 .../admin/src/pages/error/unauthorized.tsx    |    2 +-
 .../src/pages/events/details/[eventId].tsx    |    2 +-
 packages/admin/src/pages/events/index.tsx     |    2 +-
 packages/admin/src/pages/financials/index.tsx |    2 +-
 .../src/pages/financials/payments/index.tsx   |   25 +-
 .../src/pages/financials/payouts/confirm.tsx  |    4 +-
 .../pages/financials/payouts/create/batch.tsx |    2 +-
 .../financials/payouts/details/[payoutId].tsx |    2 +-
 .../src/pages/financials/payouts/index.tsx    |    2 +-
 .../pages/proposals/details/[proposalId].tsx  |    2 +-
 packages/admin/src/pages/proposals/index.tsx  |    2 +-
 .../src/pages/users/details/[userId].tsx      |    2 +-
 packages/admin/src/pages/users/index.tsx      |    8 +-
 packages/admin/tsconfig.json                  |   31 +-
 .../graphql/src/generated/nexus-typegen.ts    |   29 +-
 packages/graphql/src/generated/schema.graphql |    1 +
 50 files changed, 5784 insertions(+), 5012 deletions(-)
 create mode 100644 packages/admin/.env.local.example
 create mode 100644 packages/admin/src/components/helpers/ClientOnly.tsx
 create mode 100644 packages/admin/src/components/helpers/index.ts
 create mode 100644 packages/admin/src/components/layout/AuthenticatedLayout.tsx
 delete mode 100644 packages/admin/src/components/layout/AuthenticationBasedLayout.tsx
 create mode 100644 packages/admin/src/components/providers/AuthenticationProvider.tsx
 create mode 100644 packages/admin/src/components/providers/index.ts
 delete mode 100644 packages/admin/src/context/AuthContext.tsx
 delete mode 100644 packages/admin/src/context/PermissionsContext.tsx
 delete mode 100644 packages/admin/src/context/index.ts
 create mode 100644 packages/admin/src/core/constants/index.ts
 create mode 100644 packages/admin/src/core/context/UserContext.tsx
 create mode 100644 packages/admin/src/core/context/index.ts
 create mode 100644 packages/admin/src/core/graphql/index.ts
 create mode 100644 packages/admin/src/core/graphql/schema.graphql
 rename packages/admin/src/{ => core}/graphql/schema.json (61%)
 delete mode 100644 packages/admin/src/graphql/index.ts
 delete mode 100644 packages/admin/src/graphql/schema.graphql
 create mode 100644 packages/admin/src/pages/accounts/login.tsx
 delete mode 100644 packages/admin/src/pages/auth/index.tsx

diff --git a/packages/admin/.env b/packages/admin/.env
index b4a8fdfa5..61380ab56 100644
--- a/packages/admin/.env
+++ b/packages/admin/.env
@@ -1 +1,6 @@
+NEXT_PUBLIC_Firebase.ApiKey="AIzaSyClh8UZh-PDyVgwPrHZwURoA4HWuiXUbR8"
+NEXT_PUBLIC_Firebase.ProjectId="common-staging-50741"
+NEXT_PUBLIC_Firebase.AuthDomain="common-staging-50741.firebaseapp.com"
+NEXT_PUBLIC_Firebase.DatabaseUrl="https://common-staging-50741.firebaseio.com"
+
 NEXT_PUBLIC_ADMIN_GRAPH_ENDPOINT=https://us-central1-common-staging-50741.cloudfunctions.net/graph/graphql
diff --git a/packages/admin/.env.local b/packages/admin/.env.local
index 8a0009588..6c3f37f40 100644
--- a/packages/admin/.env.local
+++ b/packages/admin/.env.local
@@ -1 +1,6 @@
-NEXT_PUBLIC_ADMIN_GRAPH_ENDPOINT=http://localhost:5003/common-staging-50741/us-central1/graph/graphql
\ No newline at end of file
+NEXT_PUBLIC_Firebase.ApiKey="AIzaSyClh8UZh-PDyVgwPrHZwURoA4HWuiXUbR8"
+NEXT_PUBLIC_Firebase.ProjectId="common-staging-50741"
+NEXT_PUBLIC_Firebase.AuthDomain="common-staging-50741.firebaseapp.com"
+NEXT_PUBLIC_Firebase.DatabaseUrl="https://common-staging-50741.firebaseio.com"
+
+NEXT_PUBLIC_GraphQl.Endpoint=http://locahost:4000/graphql
\ No newline at end of file
diff --git a/packages/admin/.env.local.example b/packages/admin/.env.local.example
new file mode 100644
index 000000000..6c3f37f40
--- /dev/null
+++ b/packages/admin/.env.local.example
@@ -0,0 +1,6 @@
+NEXT_PUBLIC_Firebase.ApiKey="AIzaSyClh8UZh-PDyVgwPrHZwURoA4HWuiXUbR8"
+NEXT_PUBLIC_Firebase.ProjectId="common-staging-50741"
+NEXT_PUBLIC_Firebase.AuthDomain="common-staging-50741.firebaseapp.com"
+NEXT_PUBLIC_Firebase.DatabaseUrl="https://common-staging-50741.firebaseio.com"
+
+NEXT_PUBLIC_GraphQl.Endpoint=http://locahost:4000/graphql
\ No newline at end of file
diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index d2a8082e9..2ca3a6ac8 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -1,16 +1,16 @@
 overwrite: true
-schema: "http://localhost:5003/common-staging-50741/us-central1/graph/graphql"
-documents: "src/**/*.tsx"
+schema: "http://localhost:4000/graphql"
+documents: "src/core/**/*.tsx"
 generates:
-  ./src/graphql/index.ts:
+  ./src/core/graphql/index.ts:
     plugins:
       - "typescript"
       - "typescript-operations"
       - "typescript-react-apollo"
-  ./src/graphql/schema.json:
+  ./src/core/graphql/schema.json:
     plugins:
       - "introspection"
-  ./src/graphql/schema.graphql:
+  ./src/core/graphql/schema.graphql:
     plugins:
       - schema-ast
     config:
diff --git a/packages/admin/src/components/CommonSettings.tsx b/packages/admin/src/components/CommonSettings.tsx
index 2a089cbd7..2cdde1cdb 100644
--- a/packages/admin/src/components/CommonSettings.tsx
+++ b/packages/admin/src/components/CommonSettings.tsx
@@ -5,7 +5,7 @@ import { Tooltip, Row, useToasts, Spacer } from '@geist-ui/react';
 import { Settings, Award, RefreshCcw, Edit, Trash2 } from '@geist-ui/react-icons';
 
 import { Centered } from '@components/Centered';
-import { useWhitelistCommonMutation } from '@graphql';
+import { useWhitelistCommonMutation } from '@core/graphql';
 
 interface ICommonSettingsProps {
   commonId: string;
diff --git a/packages/admin/src/components/HasPermission.tsx b/packages/admin/src/components/HasPermission.tsx
index 9026f8349..9cd69ac14 100644
--- a/packages/admin/src/components/HasPermission.tsx
+++ b/packages/admin/src/components/HasPermission.tsx
@@ -1,7 +1,7 @@
 import React, { PropsWithChildren } from 'react';
 
-import { usePermissionsContext, useAuthContext } from '@context';
 import { useRouter } from 'next/router';
+import { useUserContext } from '@core/context';
 
 interface IHasPermissionProps {
   permission: string;
@@ -10,43 +10,38 @@ interface IHasPermissionProps {
 }
 
 export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = ({ children, permission, redirect }) => {
-  const permissionsContext = usePermissionsContext();
-  const authContext = useAuthContext();
   const router = useRouter();
+  const userContext = useUserContext();
 
   const hasPermission = (permission: string): boolean => {
     let hasPermission = false;
 
-    if (permissionsContext.loaded) {
+    if (userContext.loaded) {
+      const permissions = userContext.permissions;
+
       if (permission.includes('*')) {
-        hasPermission = permissionsContext.permissions
-          .some((userPermission) => matchRuleExpl(userPermission, permission));
+        hasPermission = permissions.some((userPermission) =>
+          matchRuleExpl(userPermission, permission));
       } else {
-        hasPermission = permissionsContext.permissions.includes(permission);
+        hasPermission = permissions.includes(permission);
       }
     }
 
     console.debug(`Permission check for [${permission}]: ${hasPermission}`);
 
     if (!hasPermission && redirect) {
-      if (authContext.authenticated) {
-        router.push({
+      router
+        .push({
           pathname: '/error/unauthorized',
           query: {
             redirected: true,
             redirectedFrom: router.pathname,
             failedPermission: permission
           }
+        })
+        .then(() => {
+          console.log('Redirected unauthorized request');
         });
-      } else {
-        router.push({
-          pathname: '/auth',
-          query: {
-            redirected: true,
-            redirectedFrom: router.pathname
-          }
-        });
-      }
     }
 
     return hasPermission;
@@ -74,11 +69,7 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
 
   return (
     <React.Fragment>
-      {permissionsContext.loaded && hasPermission(permission) && (
-        <React.Fragment>
-          {children}
-        </React.Fragment>
-      )}
+      {children}
     </React.Fragment>
   );
 };
\ No newline at end of file
diff --git a/packages/admin/src/components/Header.tsx b/packages/admin/src/components/Header.tsx
index 9ce6ea2e7..c99a99ff6 100644
--- a/packages/admin/src/components/Header.tsx
+++ b/packages/admin/src/components/Header.tsx
@@ -1,16 +1,14 @@
 import React from 'react';
+import firebase from 'firebase/app';
+import { useRouter } from 'next/router';
+
 import { Avatar, Divider, Link, Page, Tabs, Tooltip, Text } from '@geist-ui/react';
 import { HasPermission } from '@components/HasPermission';
-import { useCreateIntentionMutation, IntentionType } from '@graphql';
-import { useAuthContext } from '@context';
-import { useRouter } from 'next/router';
-import firebase from 'firebase/app';
+import { useUserContext } from '@core/context';
 
 export const Header: React.FC = () => {
-  const [createIntention] = useCreateIntentionMutation();
-
+  const userContext = useUserContext();
   const [currentTab, setCurrentTab] = React.useState<string>('dashboard');
-  const authContext = useAuthContext();
 
 
   // Hooks
@@ -21,14 +19,6 @@ export const Header: React.FC = () => {
     setCurrentTab(router.pathname.split('/')[1]);
   });
 
-  React.useEffect(() => {
-    if (authContext.loaded) {
-      if (!authContext.authenticated && router.pathname !== '/auth') {
-        router.push('/auth');
-      }
-    }
-  }, [authContext]);
-
   // Actions
   const onTabChange = (value: string): void => {
     setCurrentTab(value);
@@ -42,17 +32,6 @@ export const Header: React.FC = () => {
     router.push('/');
   };
 
-  const commitIntention = (intention: string) => {
-    return () => {
-      createIntention({
-        variables: {
-          type: IntentionType.Request,
-          intention
-        }
-      });
-    };
-  };
-
 
   return (
     <Page.Header>
@@ -65,14 +44,14 @@ export const Header: React.FC = () => {
           marginTop: '2.5vh'
         }}
       >
-        <Text p style={{ margin: 0 }}>{authContext.userInfo.displayName}</Text>
+        <Text p style={{ margin: 0 }}>{userContext.displayName}</Text>
         <Tooltip
           trigger="click"
           placement="bottomEnd"
           text={(
             <div style={{ minWidth: '10vw' }}>
-              <b onClick={commitIntention('admin.theme.toggle')}>Theme </b> <br/>
-              <b onClick={commitIntention('admin.notification.toggle')}>Notifications </b>
+              {/*<b onClick={commitIntention('admin.theme.toggle')}>Theme </b> <br/>*/}
+              {/*<b onClick={commitIntention('admin.notification.toggle')}>Notifications </b>*/}
 
               <Divider y={0.5}/>
 
@@ -86,7 +65,7 @@ export const Header: React.FC = () => {
           }}
         >
           <div style={{ cursor: 'pointer' }}>
-            <Avatar src={authContext.userInfo.photoURL}/>
+            <Avatar src={userContext.photo}/>
           </div>
         </Tooltip>
       </div>
diff --git a/packages/admin/src/components/helpers/ClientOnly.tsx b/packages/admin/src/components/helpers/ClientOnly.tsx
new file mode 100644
index 000000000..626eff4fb
--- /dev/null
+++ b/packages/admin/src/components/helpers/ClientOnly.tsx
@@ -0,0 +1,19 @@
+import React, { useEffect, useState, PropsWithChildren } from 'react';
+
+export const ClientOnly: React.FC<PropsWithChildren<any>> = ({ children }) => {
+  const [hasMounted, setHasMounted] = useState(false);
+
+  useEffect(() => {
+    setHasMounted(true);
+  }, []);
+
+  if (!hasMounted) {
+    return null;
+  }
+
+  return (
+    <React.Fragment>
+      {children}
+    </React.Fragment>
+  );
+};
\ No newline at end of file
diff --git a/packages/admin/src/components/helpers/index.ts b/packages/admin/src/components/helpers/index.ts
new file mode 100644
index 000000000..292fba2d1
--- /dev/null
+++ b/packages/admin/src/components/helpers/index.ts
@@ -0,0 +1 @@
+export { ClientOnly } from './ClientOnly';
\ No newline at end of file
diff --git a/packages/admin/src/components/layout/AuthenticatedLayout.tsx b/packages/admin/src/components/layout/AuthenticatedLayout.tsx
new file mode 100644
index 000000000..e44cf9ba4
--- /dev/null
+++ b/packages/admin/src/components/layout/AuthenticatedLayout.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { Page, Spacer } from '@geist-ui/react';
+
+import { Header } from '@components/Header';
+
+export const AuthenticatedLayout: React.FC<React.PropsWithChildren<any>> = ({ children, ...rest }) => {
+  return (
+    <Page>
+      <Header/>
+
+      <Page.Body style={{ paddingTop: 0 }}>
+        <Spacer y={1}/>
+
+        {React.isValidElement(children) && React.cloneElement(children, { ...rest })}
+      </Page.Body>
+    </Page>
+  );
+};
\ No newline at end of file
diff --git a/packages/admin/src/components/layout/AuthenticationBasedLayout.tsx b/packages/admin/src/components/layout/AuthenticationBasedLayout.tsx
deleted file mode 100644
index 7dfa05da5..000000000
--- a/packages/admin/src/components/layout/AuthenticationBasedLayout.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import React, { PropsWithChildren } from 'react';
-import { Page, Spacer } from '@geist-ui/react';
-
-
-import { PermissionsContextProvider, useAuthContext } from '@context';
-
-import { ApolloProvider } from '@components/providers/ApolloProvider';
-import { Header } from '@components/Header';
-
-export const AuthenticationBasedLayout: React.FC<PropsWithChildren<any>> = ({ children, ...rest }) => {
-  const authContext = useAuthContext();
-
-  return (
-    <React.Fragment>
-      {authContext.loaded && (
-        <React.Fragment>
-          {(authContext.authenticated) ? (
-            <ApolloProvider>
-              <PermissionsContextProvider>
-                <Page>
-                  <Header />
-
-                  <Page.Body style={{ paddingTop: 0 }}>
-                    <Spacer y={1}/>
-
-                    {React.isValidElement(children) && React.cloneElement(children, { ...rest })}
-                  </Page.Body>
-                </Page>
-              </PermissionsContextProvider>
-            </ApolloProvider>
-          ) : (
-            <React.Fragment>
-              {React.isValidElement(children) && React.cloneElement(children, { ...rest })}
-            </React.Fragment>
-          )}
-        </React.Fragment>
-      )}
-    </React.Fragment>
-  );
-};
\ No newline at end of file
diff --git a/packages/admin/src/components/providers/ApolloProvider.tsx b/packages/admin/src/components/providers/ApolloProvider.tsx
index 8bb513ca6..3dde9ede3 100644
--- a/packages/admin/src/components/providers/ApolloProvider.tsx
+++ b/packages/admin/src/components/providers/ApolloProvider.tsx
@@ -1,16 +1,49 @@
-import React, { PropsWithChildren } from 'react';
+import React from 'react';
 
-import { ApolloProvider as BareApolloProvider } from '@apollo/client';
-import { useApollo } from '@hooks';
-import { useAuthContext } from '@context';
+import { setContext } from '@apollo/client/link/context';
+import { ApolloClient, InMemoryCache, ApolloProvider, ApolloLink, HttpLink } from '@apollo/client';
 
-export const ApolloProvider: React.FC<PropsWithChildren<any>> = ({ children, ...rest }) => {
-  const authContext = useAuthContext();
-  const apollo = useApollo(process.env.NEXT_PUBLIC_ADMIN_GRAPH_ENDPOINT, authContext.token);
+import firebase from 'firebase/app';
 
+const cache = new InMemoryCache();
+
+const authLink = setContext(async (_, { headers }) => {
+  const token = await firebase.auth()
+    .currentUser
+    .getIdToken();
+
+  return {
+    headers: {
+      ...headers,
+      authorization: token
+    }
+  };
+});
+
+const generateClient = () => {
+  const links: any[] = [
+    authLink
+  ];
+
+  console.log('Creating GraphQL Client');
+
+  return new ApolloClient({
+    cache,
+    link: ApolloLink.from([
+      ...links,
+      new HttpLink({
+        uri: process.env['NEXT_PUBLIC_GraphQl.Endpoint'] as string
+      })
+    ])
+  });
+};
+
+const client = generateClient();
+
+export const CommonApolloProvider: React.FC<React.PropsWithChildren<any>> = ({ children }) => {
   return (
-    <BareApolloProvider client={apollo}>
-      {React.isValidElement(children) && React.cloneElement(children, { ...rest })}
-    </BareApolloProvider>
+    <ApolloProvider client={client}>
+      {children}
+    </ApolloProvider>
   );
 };
\ No newline at end of file
diff --git a/packages/admin/src/components/providers/AuthenticationProvider.tsx b/packages/admin/src/components/providers/AuthenticationProvider.tsx
new file mode 100644
index 000000000..54907fb9a
--- /dev/null
+++ b/packages/admin/src/components/providers/AuthenticationProvider.tsx
@@ -0,0 +1,59 @@
+import 'firebase/auth';
+
+import React from 'react';
+import firebase from 'firebase/app';
+import { useRouter } from 'next/router';
+import { FirebaseAuthProvider, IfFirebaseUnAuthed, IfFirebaseAuthed } from '@react-firebase/auth';
+
+import { Paths } from '@core/constants';
+
+const config = {
+  apiKey: process.env['NEXT_PUBLIC_Firebase.ApiKey'],
+  projectId: process.env['NEXT_PUBLIC_Firebase.ProjectId'],
+  authDomain: process.env['NEXT_PUBLIC_Firebase.AuthDomain'],
+  databaseURL: process.env['NEXT_PUBLIC_Firebase.DatabaseUrl']
+};
+
+export const AuthenticationProvider: React.FC<React.PropsWithChildren<any>> = ({ children }) => {
+  const router = useRouter();
+
+  return (
+    <React.Fragment>
+      <FirebaseAuthProvider firebase={firebase} {...config}>
+        {children}
+
+        <IfFirebaseUnAuthed>
+          {() => {
+            // If the user is not authenticated and is not on the login
+            // page redirect it to that page
+            if (router.pathname !== Paths.auth.login) {
+              router.push(Paths.auth.login)
+                .then(() => {
+                  console.log(
+                    'Redirected unauthenticated user ' +
+                    'to the login page'
+                  );
+                });
+            }
+          }}
+        </IfFirebaseUnAuthed>
+
+        <IfFirebaseAuthed>
+          {() => {
+            // If the user is authenticated and is on the login page
+            // redirect it to the homepage
+            if (router.pathname === Paths.auth.login) {
+              router.push(Paths.dashboard)
+                .then(() => {
+                  console.log(
+                    'Redirected authenticated user away ' +
+                    'from the login page'
+                  );
+                });
+            }
+          }}
+        </IfFirebaseAuthed>
+      </FirebaseAuthProvider>
+    </React.Fragment>
+  );
+};
\ No newline at end of file
diff --git a/packages/admin/src/components/providers/index.ts b/packages/admin/src/components/providers/index.ts
new file mode 100644
index 000000000..4e44cec0d
--- /dev/null
+++ b/packages/admin/src/components/providers/index.ts
@@ -0,0 +1,2 @@
+export { CommonApolloProvider } from './ApolloProvider';
+export { AuthenticationProvider } from './AuthenticationProvider';
\ No newline at end of file
diff --git a/packages/admin/src/components/tables/LatestEventsTable.tsx b/packages/admin/src/components/tables/LatestEventsTable.tsx
index ce54a919a..d59372003 100644
--- a/packages/admin/src/components/tables/LatestEventsTable.tsx
+++ b/packages/admin/src/components/tables/LatestEventsTable.tsx
@@ -1,36 +1,34 @@
 import React from 'react';
-
-import { gql } from '@apollo/client';
-import { Avatar, Table, Tag, Text, useToasts } from '@geist-ui/react';
+import { Table, Text, useToasts } from '@geist-ui/react';
 
 import { HasPermission } from '@components/HasPermission';
-import { useGetLatestEventsQuery } from '@graphql';
+// import { useGetLatestEventsQuery } from '@core/graphql';
 import useSound from 'use-sound';
 import { useRouter } from 'next/router';
 
-const GetLatestEventsQuery = gql`
-  query GetLatestEvents($last: Int = 10, $after: Int = 0) {
-    events(
-      last: $last,
-      after: $after
-    ) {
-      id
-
-      createdAt
-
-      type
-
-      user {
-        id
-
-        firstName
-        lastName
-
-        photoURL
-      }
-    }
-  }
-`;
+// const GetLatestEventsQuery = gql`
+//   query GetLatestEvents($last: Int = 10, $after: Int = 0) {
+//     events(
+//       last: $last,
+//       after: $after
+//     ) {
+//       id
+//
+//       createdAt
+//
+//       type
+//
+//       user {
+//         id
+//
+//         firstName
+//         lastName
+//
+//         photoURL
+//       }
+//     }
+//   }
+// `;
 
 interface ILatestEventsTableProps {
   pagination?: boolean;
@@ -45,9 +43,9 @@ export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ paginatio
   const [play] = useSound('assets/sounds/notification.mp3');
 
 
-  const { data, previousData } = useGetLatestEventsQuery({
-    pollInterval: 5 * 1000
-  });
+  // const { data, previousData } = useGetLatestEventsQuery({
+  //   pollInterval: 5 * 1000
+  // });
 
   React.useEffect(() => {
     if (notify && !refresh) {
@@ -55,48 +53,33 @@ export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ paginatio
     }
   }, [refresh, notify]);
 
-  React.useEffect(() => {
-    if (previousData?.events?.length && notify) {
-      const newEvents = data.events.filter(e => !previousData.events.includes(e));
-
-      if (newEvents) {
-        play();
-
-        newEvents.forEach((e) => {
-          setToast({
-            text: `New event: ${e.type}`,
-            delay: 2000
-          });
-        });
-      }
-    }
-  }, [data, previousData]);
 
   const transformDataForTable = () => {
-    return data.events.map((e) => ({
-      id: e.id,
-
-      occurredAt: new Date(e.createdAt).toLocaleString(),
-
-      eventType: (
-        <Tag>
-          {e.type}
-        </Tag>
-      ),
-
-      user: (
-        <React.Fragment>
-          {e.user ? (
-            <React.Fragment>
-              <Avatar src={e.user.photoURL} />
-              <Text b style={{ marginLeft: 10 }}>
-                {e.user.firstName} {e.user.lastName}
-              </Text>
-            </React.Fragment>
-          ) : '-'}
-        </React.Fragment>
-      )
-    }));
+    return [];
+    // return data.events.map((e) => ({
+    //   id: e.id,
+    //
+    //   occurredAt: new Date(e.createdAt).toLocaleString(),
+    //
+    //   eventType: (
+    //     <Tag>
+    //       {e.type}
+    //     </Tag>
+    //   ),
+    //
+    //   user: (
+    //     <React.Fragment>
+    //       {e.user ? (
+    //         <React.Fragment>
+    //           <Avatar src={e.user.photoURL} />
+    //           <Text b style={{ marginLeft: 10 }}>
+    //             {e.user.firstName} {e.user.lastName}
+    //           </Text>
+    //         </React.Fragment>
+    //       ) : '-'}
+    //     </React.Fragment>
+    //   )
+    // }));
   };
 
   const onRowClick = (data: any): void => {
@@ -109,8 +92,7 @@ export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ paginatio
 
   return (
     <HasPermission permission="admin.events.read.list">
-      {console.log('data', data)}
-      {data && (
+      {/*{data && (*/}
         <React.Fragment>
           <Text h3>Latest events</Text>
 
@@ -120,7 +102,7 @@ export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ paginatio
             <Table.Column prop="eventType" label="Event Type"/>
           </Table>
         </React.Fragment>
-      )}
+      {/*)}*/}
     </HasPermission>
   );
 };
\ No newline at end of file
diff --git a/packages/admin/src/components/tables/PaymentsTable.tsx b/packages/admin/src/components/tables/PaymentsTable.tsx
index f75c1ac61..ed8f9e43b 100644
--- a/packages/admin/src/components/tables/PaymentsTable.tsx
+++ b/packages/admin/src/components/tables/PaymentsTable.tsx
@@ -5,7 +5,7 @@ import { Link } from '@components/Link';
 import { Card, Row, Col, Text, Spacer, Tag, User, Divider, useTheme } from '@geist-ui/react';
 import { ChevronLeftCircle, ChevronRightCircle, ChevronDownCircle, ChevronUpCircle } from '@geist-ui/react-icons';
 import { gql } from '@apollo/client';
-import { useGetPaymentDetailsLazyQuery, useGetPaymentsQuery } from '@graphql';
+import { useGetPaymentDetailsLazyQuery, useGetPaymentsQuery } from '@core/graphql';
 import { useRouter } from 'next/router';
 
 
diff --git a/packages/admin/src/context/AuthContext.tsx b/packages/admin/src/context/AuthContext.tsx
deleted file mode 100644
index 316bab152..000000000
--- a/packages/admin/src/context/AuthContext.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import firebase from 'firebase/app';
-import React, { PropsWithChildren } from 'react';
-
-interface IAuthContext {
-  token?: string;
-  loaded: boolean;
-  userInfo?: firebase.UserInfo;
-  authenticated?: boolean;
-}
-
-const defaultAppContext: IAuthContext = {
-  loaded: false
-};
-
-const AuthContext = React.createContext<IAuthContext>(defaultAppContext);
-
-export const useAuthContext = () => {
-  return React.useContext<IAuthContext>(AuthContext);
-};
-
-export const AuthContextProvider: React.FC<PropsWithChildren<any>> = ({ children }) => {
-  const [context, setContext] = React.useState<IAuthContext>(defaultAppContext);
-
-  React.useEffect(() => {
-    return firebase.auth().onIdTokenChanged(async (user) => {
-      if (user) {
-        const token = await user.getIdToken();
-
-        setContext((prevContext) => ({
-          ...prevContext,
-
-          token,
-          loaded: true,
-          userInfo: user,
-          authenticated: true
-        }));
-      } else {
-        setContext((prevContext) => ({
-          ...prevContext,
-
-          token: null,
-          loaded: true,
-          userInfo: null,
-          authenticated: false
-        }));
-      }
-    });
-  }, []);
-
-
-  return (
-    <AuthContext.Provider value={context}>
-      {children}
-    </AuthContext.Provider>
-  );
-};
\ No newline at end of file
diff --git a/packages/admin/src/context/PermissionsContext.tsx b/packages/admin/src/context/PermissionsContext.tsx
deleted file mode 100644
index 67bc8528d..000000000
--- a/packages/admin/src/context/PermissionsContext.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-import { gql } from '@apollo/client';
-import React, { PropsWithChildren } from 'react';
-import { useAuthContext } from './AuthContext';
-import { useGetUserPermissionsQuery } from '@graphql';
-
-interface IPermissionsContext {
-  loaded: boolean;
-  permissions: string[];
-}
-
-const defaultPermissionsContext: IPermissionsContext = {
-  loaded: false,
-  permissions: []
-};
-
-const PermissionsContext = React.createContext<IPermissionsContext>(defaultPermissionsContext);
-
-export const usePermissionsContext = () => {
-  return React.useContext(PermissionsContext);
-};
-
-const LoadPermissionsQuery = gql`
-  query getUserPermissions($userId: ID!) {
-    user(id: $userId) {
-      permissions
-    }
-  }
-`;
-
-export const PermissionsContextProvider: React.FC<PropsWithChildren<any>> = ({ children }) => {
-  const authContext = useAuthContext();
-
-  const { data, loading } = useGetUserPermissionsQuery({
-    skip: !authContext.loaded && !authContext.authenticated,
-    pollInterval: 120 * 1000,
-    variables: {
-      userId: authContext.userInfo?.uid
-    }
-  });
-
-  const [context, setContext] = React.useState<IPermissionsContext>(defaultPermissionsContext);
-
-  React.useEffect(() => {
-    if (authContext.authenticated && data?.user) {
-      setContext({
-        loaded: true,
-        permissions: data.user.permissions
-      });
-    } else {
-      setContext({
-        loaded: !loading && authContext.authenticated,
-        permissions: []
-      });
-    }
-  }, [authContext, data]);
-
-  return (
-    <PermissionsContext.Provider value={context}>
-      {children}
-    </PermissionsContext.Provider>
-  );
-};
\ No newline at end of file
diff --git a/packages/admin/src/context/index.ts b/packages/admin/src/context/index.ts
deleted file mode 100644
index 7dd4b2061..000000000
--- a/packages/admin/src/context/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './AuthContext';
-export * from './PermissionsContext';
\ No newline at end of file
diff --git a/packages/admin/src/core/constants/index.ts b/packages/admin/src/core/constants/index.ts
new file mode 100644
index 000000000..f7f228ba3
--- /dev/null
+++ b/packages/admin/src/core/constants/index.ts
@@ -0,0 +1,6 @@
+export const Paths = {
+  dashboard: '/',
+  auth: {
+    login: '/accounts/login'
+  }
+};
\ No newline at end of file
diff --git a/packages/admin/src/core/context/UserContext.tsx b/packages/admin/src/core/context/UserContext.tsx
new file mode 100644
index 000000000..ed5ca2a96
--- /dev/null
+++ b/packages/admin/src/core/context/UserContext.tsx
@@ -0,0 +1,75 @@
+import React from 'react';
+import { gql } from '@apollo/client';
+
+import { useLoadUserContextQuery } from '@core/graphql';
+
+interface UserContext {
+  loaded: boolean;
+
+  id?: string;
+
+  firstName?: string;
+  lastName?: string;
+
+  displayName?: string;
+
+  email?: string;
+  photo?: string;
+
+  permissions?: string[];
+}
+
+const defaultUserContext: UserContext = {
+  loaded: false
+};
+
+const UserContext = React.createContext<UserContext>(defaultUserContext);
+
+export const useUserContext = () => {
+  return React.useContext(UserContext);
+};
+
+const LoadUserContextQuery = gql`
+  query loadUserContext {
+    user {
+      id
+
+      firstName
+      lastName
+
+      displayName
+
+      email
+      photo
+
+      permissions
+    }
+  }
+`;
+
+export const UserContextProvider: React.FC<React.PropsWithChildren<any>> = ({ children }) => {
+  // State
+  const [context, setContext] = React.useState<UserContext>(defaultUserContext);
+
+  // Data Fetching
+  const { data } = useLoadUserContextQuery();
+
+  // Effects
+  React.useEffect(() => {
+    console.log(data);
+
+    if (data) {
+      setContext({
+        loaded: true,
+        ...data.user
+      });
+    }
+  }, [data]);
+
+  // Render
+  return (
+    <UserContext.Provider value={context}>
+      {children}
+    </UserContext.Provider>
+  );
+};
\ No newline at end of file
diff --git a/packages/admin/src/core/context/index.ts b/packages/admin/src/core/context/index.ts
new file mode 100644
index 000000000..38751f180
--- /dev/null
+++ b/packages/admin/src/core/context/index.ts
@@ -0,0 +1 @@
+export { UserContextProvider, useUserContext } from './UserContext';
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
new file mode 100644
index 000000000..5561d534d
--- /dev/null
+++ b/packages/admin/src/core/graphql/index.ts
@@ -0,0 +1,942 @@
+import * as Apollo from '@apollo/client';
+import { gql } from '@apollo/client';
+
+export type Maybe<T> = T | null;
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: string;
+  String: string;
+  Boolean: boolean;
+  Int: number;
+  Float: number;
+  /** A field whose value conforms to the standard URL format as specified in RFC3986: https://www.ietf.org/rfc/rfc3986.txt. */
+  URL: any;
+  /** A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar. */
+  DateTime: any;
+  /** The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf). */
+  JSON: any;
+  /** A field whose value is a generic Universally Unique Identifier: https://en.wikipedia.org/wiki/Universally_unique_identifier. */
+  UUID: any;
+  Void: any;
+};
+
+
+export type User = {
+  __typename?: 'User';
+  /** The system Id of the user */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  /** The first name of the user */
+  firstName: Scalars['String'];
+  /** The last name of the user */
+  lastName: Scalars['String'];
+  /** The display name of the user */
+  displayName: Scalars['String'];
+  photo: Scalars['String'];
+  /** The email of the user */
+  email: Scalars['String'];
+  /** List of all the users permissions */
+  permissions: Array<Scalars['String']>;
+  /** List of events, that occurred and are related to this user */
+  events: Array<Event>;
+  proposals: Array<Proposal>;
+  notifications: Array<Notification>;
+  notificationTokens: Array<UserNotificationToken>;
+  discussionSubscriptions: Array<DiscussionSubscription>;
+};
+
+
+export type UserEventsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  orderBy?: Maybe<EventOrderByInput>;
+};
+
+
+export type UserProposalsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  where?: Maybe<ProposalWhereInput>;
+};
+
+
+export type UserNotificationsArgs = {
+  orderBy?: Maybe<NotificationOrderByInput>;
+  cursor?: Maybe<NotificationWhereUniqueInput>;
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+};
+
+
+export type UserDiscussionSubscriptionsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  orderBy?: Maybe<DiscussionSubscriptionOrderByInput>;
+};
+
+export type UserNotificationToken = BaseEntity & {
+  __typename?: 'UserNotificationToken';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  state: UserNotificationTokenState;
+  token: Scalars['String'];
+  description: Scalars['String'];
+  lastUsed: Scalars['DateTime'];
+  lastVerified: Scalars['DateTime'];
+};
+
+export type CreateUserInput = {
+  firstName: Scalars['String'];
+  lastName: Scalars['String'];
+  email: Scalars['String'];
+  photo: Scalars['String'];
+};
+
+export type CreateUserNotificationTokenInput = {
+  token: Scalars['String'];
+  description: Scalars['String'];
+};
+
+export enum UserNotificationTokenState {
+  Active = 'Active',
+  Expired = 'Expired',
+  Voided = 'Voided'
+}
+
+export type Role = BaseEntity & {
+  __typename?: 'Role';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  name: Scalars['String'];
+  displayName: Scalars['String'];
+  description: Scalars['String'];
+  permissions: Array<Scalars['String']>;
+};
+
+export type Card = {
+  __typename?: 'Card';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+};
+
+export type CreateCardInput = {
+  /** The ID of the key used for the encryption of the sensitive data */
+  keyId: Scalars['String'];
+  /** The sensitive part of the card as encrypted card */
+  encryptedData: Scalars['String'];
+  expYear: Scalars['Int'];
+  expMonth: Scalars['Int'];
+  billingDetails: BillingDetailsInput;
+};
+
+export type Vote = {
+  __typename?: 'Vote';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+};
+
+export enum VoteOutcome {
+  Approve = 'Approve',
+  Condemn = 'Condemn'
+}
+
+export type CreateVoteInput = {
+  outcome: VoteOutcome;
+  /** The ID of the root of the proposal whether it is funding one or join */
+  proposalId: Scalars['ID'];
+};
+
+export type Event = {
+  __typename?: 'Event';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  /** The type of the event in one of the predefined event types */
+  type: EventType;
+  payload?: Maybe<Scalars['JSON']>;
+  /** The ID of the event creator */
+  userId?: Maybe<Scalars['ID']>;
+  /** The ID of the common, for whom the event was created */
+  commonId?: Maybe<Scalars['ID']>;
+};
+
+export enum EventType {
+  CommonCreated = 'CommonCreated',
+  CommonMemberCreated = 'CommonMemberCreated',
+  CommonMemberRoleAdded = 'CommonMemberRoleAdded',
+  CommonMemberRoleRemoved = 'CommonMemberRoleRemoved',
+  JoinRequestCreated = 'JoinRequestCreated',
+  JoinRequestAccepted = 'JoinRequestAccepted',
+  JoinRequestRejected = 'JoinRequestRejected',
+  FundingRequestCreated = 'FundingRequestCreated',
+  FundingRequestAccepted = 'FundingRequestAccepted',
+  FundingRequestRejected = 'FundingRequestRejected',
+  CardCreated = 'CardCreated',
+  CardCvvVerificationPassed = 'CardCvvVerificationPassed',
+  CardCvvVerificationFailed = 'CardCvvVerificationFailed',
+  PaymentCreated = 'PaymentCreated',
+  PaymentSucceeded = 'PaymentSucceeded',
+  PaymentFailed = 'PaymentFailed',
+  ProposalMajorityReached = 'ProposalMajorityReached',
+  ProposalExpired = 'ProposalExpired',
+  VoteCreated = 'VoteCreated',
+  UserCreated = 'UserCreated',
+  DiscussionCreated = 'DiscussionCreated',
+  DiscussionMessageCreated = 'DiscussionMessageCreated',
+  DiscussionSubscriptionCreated = 'DiscussionSubscriptionCreated',
+  DiscussionSubscriptionTypeChanged = 'DiscussionSubscriptionTypeChanged',
+  NotificationTemplateCreated = 'NotificationTemplateCreated',
+  NotificationTemplateUpdated = 'NotificationTemplateUpdated',
+  UserNotificationTokenVoided = 'UserNotificationTokenVoided',
+  UserNotificationTokenExpired = 'UserNotificationTokenExpired',
+  UserNotificationTokenCreated = 'UserNotificationTokenCreated',
+  UserNotificationTokenRefreshed = 'UserNotificationTokenRefreshed',
+  ReportCreated = 'ReportCreated',
+  ReportRespected = 'ReportRespected',
+  ReportDismissed = 'ReportDismissed',
+  RoleCreated = 'RoleCreated',
+  RoleUpdated = 'RoleUpdated',
+  RolePermissionAdded = 'RolePermissionAdded',
+  RolePermissionRemoved = 'RolePermissionRemoved',
+  RoleDeleted = 'RoleDeleted',
+  UserAddedToRole = 'UserAddedToRole',
+  UserRemovedFromRole = 'UserRemovedFromRole'
+}
+
+export type EventOrderByInput = {
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+  type?: Maybe<SortOrder>;
+};
+
+export type Common = {
+  __typename?: 'Common';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  /** The name of the common as provided */
+  name: Scalars['String'];
+  /** The whitelisting state of a common */
+  whitelisted: Scalars['Boolean'];
+  /** List of events, that occurred in a common */
+  events: Array<Event>;
+  reports: Array<Report>;
+  proposals: Array<Proposal>;
+  discussions: Array<Discussion>;
+  members: Array<Maybe<CommonMember>>;
+};
+
+
+export type CommonEventsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  orderBy?: Maybe<EventOrderByInput>;
+};
+
+
+export type CommonReportsArgs = {
+  where?: Maybe<ReportWhereInput>;
+};
+
+
+export type CommonProposalsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  where?: Maybe<ProposalWhereInput>;
+};
+
+
+export type CommonDiscussionsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+};
+
+
+export type CommonMembersArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  orderBy?: Maybe<CommonMemberOrderByInput>;
+};
+
+/** The funding type of the common */
+export enum FundingType {
+  OneTime = 'OneTime',
+  Monthly = 'Monthly'
+}
+
+export type CreateCommonInput = {
+  name: Scalars['String'];
+  fundingMinimumAmount: Scalars['Int'];
+  fundingType: FundingType;
+};
+
+export type CommonWhereUniqueInput = {
+  id: Scalars['ID'];
+};
+
+export type Report = BaseEntity & {
+  __typename?: 'Report';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  /** The current status of the report */
+  status: ReportStatus;
+  /** The type of violation that this report is for */
+  for: ReportFor;
+  /** The note that the report has left for the content */
+  note: Scalars['String'];
+  /** The date on which the report was last reviewed if reviewed */
+  reviewedOn?: Maybe<Scalars['DateTime']>;
+  reporterId: Scalars['ID'];
+  reporter: User;
+  messageId: Scalars['UUID'];
+  message: DiscussionMessage;
+};
+
+export enum ReportFor {
+  Nudity = 'Nudity',
+  Violance = 'Violance',
+  Harassment = 'Harassment',
+  FalseNews = 'FalseNews',
+  Spam = 'Spam',
+  Hate = 'Hate',
+  Other = 'Other'
+}
+
+export enum ReportAction {
+  Respected = 'Respected',
+  Dismissed = 'Dismissed'
+}
+
+export enum ReportStatus {
+  Active = 'Active',
+  Clossed = 'Clossed'
+}
+
+export enum ReportAuditor {
+  CommonModerator = 'CommonModerator',
+  SystemAdmin = 'SystemAdmin'
+}
+
+export type ReportWhereInput = {
+  status?: Maybe<ReportStatusFilterInput>;
+  for?: Maybe<ReportFor>;
+};
+
+export type ReportStatusFilterInput = {
+  in?: Maybe<Array<Maybe<ReportStatus>>>;
+  not?: Maybe<Array<Maybe<ReportStatus>>>;
+};
+
+export type ActOnReportInput = {
+  reportId: Scalars['UUID'];
+  action: ReportAction;
+};
+
+export type ReportDiscussionMessageInput = {
+  messageId: Scalars['UUID'];
+  note: Scalars['String'];
+  for: ReportFor;
+};
+
+export type Proposal = {
+  __typename?: 'Proposal';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  type: ProposalType;
+  state: ProposalState;
+  discussions: Array<Discussion>;
+};
+
+
+export type ProposalDiscussionsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+};
+
+export type JoinProposal = {
+  __typename?: 'JoinProposal';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+};
+
+export type FundingProposal = {
+  __typename?: 'FundingProposal';
+  /** The main identifier of the item */
+  id: Scalars['ID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+};
+
+export type ProposalWhereInput = {
+  type?: Maybe<ProposalType>;
+};
+
+export type CreateJoinProposalInput = {
+  title: Scalars['String'];
+  description: Scalars['String'];
+  fundingAmount: Scalars['Int'];
+  cardId: Scalars['String'];
+  commonId: Scalars['String'];
+  links?: Maybe<Array<LinkInput>>;
+};
+
+export type CreateFundingProposalInput = {
+  commonId: Scalars['ID'];
+  amount: Scalars['Int'];
+  title: Scalars['String'];
+  description: Scalars['String'];
+  links?: Maybe<Array<ProposalLinkInput>>;
+  files?: Maybe<Array<ProposalFileInput>>;
+  images?: Maybe<Array<ProposalImageInput>>;
+};
+
+export type ProposalLinkInput = {
+  title: Scalars['String'];
+  url: Scalars['String'];
+};
+
+export type ProposalFileInput = {
+  value: Scalars['String'];
+};
+
+export type ProposalImageInput = {
+  value: Scalars['String'];
+};
+
+export enum ProposalType {
+  FundingRequest = 'FundingRequest',
+  JoinRequest = 'JoinRequest'
+}
+
+export enum ProposalState {
+  Countdown = 'Countdown',
+  Finalizing = 'Finalizing',
+  Rejected = 'Rejected',
+  Accepted = 'Accepted'
+}
+
+export type ProposalWhereUniqueInput = {
+  id: Scalars['UUID'];
+};
+
+export type Discussion = BaseEntity & {
+  __typename?: 'Discussion';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  /** What this discussion is about */
+  topic: Scalars['String'];
+  /** Short description of the topic */
+  description: Scalars['String'];
+  /** The date at which the last message on the discussion was added */
+  latestMessage: Scalars['DateTime'];
+  type: DiscussionType;
+  messages: Array<DiscussionMessage>;
+};
+
+
+export type DiscussionMessagesArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  orderBy?: Maybe<DiscussionMessagesOrderByInput>;
+};
+
+export type DiscussionMessage = BaseEntity & {
+  __typename?: 'DiscussionMessage';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  message: Scalars['String'];
+  type: DiscussionMessageType;
+  flag: DiscussionMessageFlag;
+  reports: Array<Report>;
+};
+
+export type DiscussionSubscription = BaseEntity & {
+  __typename?: 'DiscussionSubscription';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  type: DiscussionSubscriptionType;
+  userId: Scalars['String'];
+  discussionId: Scalars['UUID'];
+  discussion: Discussion;
+};
+
+export enum DiscussionType {
+  ProposalDiscussion = 'ProposalDiscussion',
+  CommonDiscussion = 'CommonDiscussion'
+}
+
+export enum DiscussionMessageType {
+  Message = 'Message'
+}
+
+export enum DiscussionMessageFlag {
+  Clear = 'Clear',
+  Reported = 'Reported',
+  Hidden = 'Hidden'
+}
+
+export enum DiscussionSubscriptionType {
+  AllNotifications = 'AllNotifications',
+  OnlyMentions = 'OnlyMentions',
+  NoNotification = 'NoNotification'
+}
+
+export type DiscussionMessagesOrderByInput = {
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+};
+
+export type DiscussionSubscriptionOrderByInput = {
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+};
+
+export type CreateDiscussionInput = {
+  /** The topic of the discussion to be created */
+  topic: Scalars['String'];
+  /** Short description about the topic */
+  description: Scalars['String'];
+  /** The ID of the common, for which we are creating the discussion */
+  commonId: Scalars['ID'];
+  /** The ID of the proposal, if this is proposal discussion */
+  proposalId?: Maybe<Scalars['ID']>;
+};
+
+export type CreateDiscussionMessageInput = {
+  /** The ID of the discussion, for which we are creating the message */
+  discussionId: Scalars['ID'];
+  /** The message itself */
+  message: Scalars['String'];
+};
+
+export type CommonMember = {
+  __typename?: 'CommonMember';
+  id: Scalars['ID'];
+  userId: Scalars['ID'];
+  commonId: Scalars['ID'];
+  roles: Array<CommonMemberRole>;
+  user?: Maybe<User>;
+  common?: Maybe<Common>;
+  proposals: Array<Proposal>;
+};
+
+
+export type CommonMemberProposalsArgs = {
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+  where?: Maybe<ProposalWhereInput>;
+};
+
+export type CommonMemberOrderByInput = {
+  createdAt: SortOrder;
+};
+
+export enum CommonMemberRole {
+  Founder = 'Founder',
+  Moderator = 'Moderator'
+}
+
+export enum NotificationType {
+  JoinRequestAccepted = 'JoinRequestAccepted',
+  JoinRequestRejected = 'JoinRequestRejected',
+  FundingRequestAccepted = 'FundingRequestAccepted',
+  FundingRequestRejected = 'FundingRequestRejected'
+}
+
+export enum NotificationSeenStatus {
+  NotSeen = 'NotSeen',
+  Seen = 'Seen',
+  Done = 'Done'
+}
+
+export type Notification = BaseEntity & {
+  __typename?: 'Notification';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  /** Whether the notification should be shown in the user notification feed */
+  show: Scalars['Boolean'];
+  type: NotificationType;
+  seenStatus: NotificationSeenStatus;
+  /** The ID of the linked user */
+  userId: Scalars['UUID'];
+  /** The linked user. Expensive operation */
+  user: User;
+  /** The ID of the linked common. May be null */
+  commonId?: Maybe<Scalars['UUID']>;
+  /** The linked common. Expensive operation that may return null */
+  common?: Maybe<Common>;
+  /** The ID of the linked proposal. May be null */
+  proposalId?: Maybe<Scalars['UUID']>;
+  /** The linked proposal. Expensive operation that may return null */
+  proposal?: Maybe<Proposal>;
+  /** The ID of the linked discussion. May be null */
+  discussionId?: Maybe<Scalars['UUID']>;
+  /** The linked discussion. Expensive operation that may return null */
+  discussion?: Maybe<Discussion>;
+};
+
+export type NotificationWhereInput = {
+  seenStatus?: Maybe<NotificationSeenStatus>;
+  type?: Maybe<NotificationType>;
+  userId?: Maybe<Scalars['ID']>;
+  commonId?: Maybe<Scalars['UUID']>;
+  proposalId?: Maybe<Scalars['UUID']>;
+  discussionId?: Maybe<Scalars['UUID']>;
+};
+
+export type NotificationWhereUniqueInput = {
+  id?: Maybe<Scalars['UUID']>;
+};
+
+export type NotificationOrderByInput = {
+  createdAt?: Maybe<SortOrder>;
+  updatedAt?: Maybe<SortOrder>;
+  status?: Maybe<SortOrder>;
+};
+
+
+export enum SortOrder {
+  Asc = 'asc',
+  Desc = 'desc'
+}
+
+export type Link = {
+  __typename?: 'Link';
+  /** The display title of the link */
+  title: Scalars['String'];
+  /** The actual link part of the link */
+  url: Scalars['String'];
+};
+
+export type BaseEntity = {
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+};
+
+export type PaginateInput = {
+  take: Scalars['Int'];
+  skip?: Maybe<Scalars['Int']>;
+};
+
+export type LinkInput = {
+  /** The display title of the link */
+  title: Scalars['String'];
+  /** The actual link part of the link */
+  url: Scalars['String'];
+};
+
+export type StringFilter = {
+  contains?: Maybe<Scalars['String']>;
+  endsWith?: Maybe<Scalars['String']>;
+  equals?: Maybe<Scalars['String']>;
+  gt?: Maybe<Scalars['String']>;
+  gte?: Maybe<Scalars['String']>;
+  lt?: Maybe<Scalars['String']>;
+  lte?: Maybe<Scalars['String']>;
+  startsWith?: Maybe<Scalars['String']>;
+  in?: Maybe<Array<Scalars['String']>>;
+  notIn?: Maybe<Array<Scalars['String']>>;
+};
+
+export type BillingDetailsInput = {
+  name: Scalars['String'];
+  city: Scalars['String'];
+  country: Scalars['String'];
+  line1: Scalars['String'];
+  postalCode: Scalars['String'];
+  line2?: Maybe<Scalars['String']>;
+  district?: Maybe<Scalars['String']>;
+};
+
+export type CreateRoleInput = {
+  name: Scalars['String'];
+  displayName: Scalars['String'];
+  description: Scalars['String'];
+  permissions: Array<Scalars['String']>;
+};
+
+export type Query = {
+  __typename?: 'Query';
+  /** Provide ID to fetch specific user or do not pass anything to get the currently authenticated user */
+  user?: Maybe<User>;
+  generateUserAuthToken: Scalars['String'];
+  roles?: Maybe<Array<Maybe<Role>>>;
+  common?: Maybe<Common>;
+  proposal?: Maybe<Proposal>;
+  discussion?: Maybe<Discussion>;
+};
+
+
+export type QueryUserArgs = {
+  userId?: Maybe<Scalars['ID']>;
+};
+
+
+export type QueryGenerateUserAuthTokenArgs = {
+  authId: Scalars['String'];
+};
+
+
+export type QueryRolesArgs = {
+  paginate?: Maybe<PaginateInput>;
+};
+
+
+export type QueryCommonArgs = {
+  where: CommonWhereUniqueInput;
+};
+
+
+export type QueryProposalArgs = {
+  where: ProposalWhereUniqueInput;
+};
+
+
+export type QueryDiscussionArgs = {
+  id: Scalars['ID'];
+};
+
+export type Mutation = {
+  __typename?: 'Mutation';
+  /** Creates new user in the system */
+  createUser: User;
+  createUserNotificationToken: UserNotificationToken;
+  voidUserNotificationToken: UserNotificationToken;
+  createRole?: Maybe<Role>;
+  assignRole?: Maybe<Scalars['Void']>;
+  unassignRole?: Maybe<Scalars['Void']>;
+  createCard: Card;
+  createVote: Vote;
+  createCommon: Common;
+  actOnReport?: Maybe<Report>;
+  reportDiscussionMessage: Report;
+  finalizeProposal: Scalars['Boolean'];
+  /** Create new proposal of type JOIN. */
+  createJoinProposal: Proposal;
+  createFundingProposal: Proposal;
+  createDiscussion: Discussion;
+  createDiscussionMessage: DiscussionMessage;
+  changeDiscussionSubscriptionType?: Maybe<DiscussionSubscription>;
+};
+
+
+export type MutationCreateUserArgs = {
+  input: CreateUserInput;
+};
+
+
+export type MutationCreateUserNotificationTokenArgs = {
+  input: CreateUserNotificationTokenInput;
+};
+
+
+export type MutationVoidUserNotificationTokenArgs = {
+  tokenId: Scalars['ID'];
+};
+
+
+export type MutationCreateRoleArgs = {
+  input: CreateRoleInput;
+};
+
+
+export type MutationAssignRoleArgs = {
+  userId: Scalars['ID'];
+  roleId: Scalars['ID'];
+};
+
+
+export type MutationUnassignRoleArgs = {
+  userId: Scalars['ID'];
+  roleId: Scalars['ID'];
+};
+
+
+export type MutationCreateCardArgs = {
+  input: CreateCardInput;
+};
+
+
+export type MutationCreateVoteArgs = {
+  input: CreateVoteInput;
+};
+
+
+export type MutationCreateCommonArgs = {
+  input: CreateCommonInput;
+};
+
+
+export type MutationActOnReportArgs = {
+  input: ActOnReportInput;
+};
+
+
+export type MutationReportDiscussionMessageArgs = {
+  input: ReportDiscussionMessageInput;
+};
+
+
+export type MutationFinalizeProposalArgs = {
+  proposalId: Scalars['ID'];
+};
+
+
+export type MutationCreateJoinProposalArgs = {
+  input: CreateJoinProposalInput;
+};
+
+
+export type MutationCreateFundingProposalArgs = {
+  input: CreateFundingProposalInput;
+};
+
+
+export type MutationCreateDiscussionArgs = {
+  input: CreateDiscussionInput;
+};
+
+
+export type MutationCreateDiscussionMessageArgs = {
+  input: CreateDiscussionMessageInput;
+};
+
+
+export type MutationChangeDiscussionSubscriptionTypeArgs = {
+  id: Scalars['ID'];
+  type: DiscussionSubscriptionType;
+};
+
+export type Subscription = {
+  __typename?: 'Subscription';
+  onProposalChange?: Maybe<Proposal>;
+  discussionMessageCreated?: Maybe<DiscussionMessage>;
+  notificationCreated?: Maybe<Notification>;
+};
+
+
+export type SubscriptionOnProposalChangeArgs = {
+  proposalId: Scalars['ID'];
+};
+
+
+export type SubscriptionDiscussionMessageCreatedArgs = {
+  discussionId: Scalars['ID'];
+};
+
+export type LoadUserContextQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type LoadUserContextQuery = (
+  { __typename?: 'Query' }
+  & {
+  user?: Maybe<(
+    { __typename?: 'User' }
+    & Pick<User, 'id' | 'firstName' | 'lastName' | 'displayName' | 'email' | 'photo' | 'permissions'>
+    )>
+}
+  );
+
+
+export const LoadUserContextDocument = gql`
+  query loadUserContext {
+    user {
+      id
+      firstName
+      lastName
+      displayName
+      email
+      photo
+      permissions
+    }
+  }
+`;
+
+/**
+ * __useLoadUserContextQuery__
+ *
+ * To run a query within a React component, call `useLoadUserContextQuery` and pass it any options that fit your needs.
+ * When your component renders, `useLoadUserContextQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useLoadUserContextQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useLoadUserContextQuery(baseOptions?: Apollo.QueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
+  return Apollo.useQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
+}
+
+export function useLoadUserContextLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
+  return Apollo.useLazyQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
+}
+
+export type LoadUserContextQueryHookResult = ReturnType<typeof useLoadUserContextQuery>;
+export type LoadUserContextLazyQueryHookResult = ReturnType<typeof useLoadUserContextLazyQuery>;
+export type LoadUserContextQueryResult = Apollo.QueryResult<LoadUserContextQuery, LoadUserContextQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
new file mode 100644
index 000000000..bd0a34232
--- /dev/null
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -0,0 +1,587 @@
+schema {
+  query: Query
+  mutation: Mutation
+  subscription: Subscription
+}
+"""A field whose value conforms to the standard URL format as specified in RFC3986: https://www.ietf.org/rfc/rfc3986.txt."""
+scalar URL
+"""A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar."""
+scalar DateTime
+"""The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf)."""
+scalar JSON
+"""A field whose value is a generic Universally Unique Identifier: https://en.wikipedia.org/wiki/Universally_unique_identifier."""
+scalar UUID
+type User {
+  """The system Id of the user"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  """The first name of the user"""
+  firstName: String!
+  """The last name of the user"""
+  lastName: String!
+  """The display name of the user"""
+  displayName: String!
+  photo: String!
+  """The email of the user"""
+  email: String!
+  """List of all the users permissions"""
+  permissions: [String!]!
+  """List of events, that occurred and are related to this user"""
+  events(take: Int = 10, skip: Int = 0, orderBy: EventOrderByInput): [Event!]!
+  proposals(take: Int = 10, skip: Int = 0, where: ProposalWhereInput): [Proposal!]!
+  notifications(orderBy: NotificationOrderByInput = {createdAt: desc}, cursor: NotificationWhereUniqueInput, take: Int = 10, skip: Int): [Notification!]!
+  notificationTokens: [UserNotificationToken!]!
+  discussionSubscriptions(take: Int = 10, skip: Int = 0, orderBy: DiscussionSubscriptionOrderByInput): [DiscussionSubscription!]!
+}
+type UserNotificationToken implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  state: UserNotificationTokenState!
+  token: String!
+  description: String!
+  lastUsed: DateTime!
+  lastVerified: DateTime!
+}
+input CreateUserInput {
+  firstName: String!
+  lastName: String!
+  email: String!
+  photo: String!
+}
+input CreateUserNotificationTokenInput {
+  token: String!
+  description: String!
+}
+enum UserNotificationTokenState {
+  Active
+  Expired
+  Voided
+}
+type Role implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  name: String!
+  displayName: String!
+  description: String!
+  permissions: [String!]!
+}
+type Card {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+input CreateCardInput {
+  """The ID of the key used for the encryption of the sensitive data"""
+  keyId: String!
+  """The sensitive part of the card as encrypted card"""
+  encryptedData: String!
+  expYear: Int!
+  expMonth: Int!
+  billingDetails: BillingDetailsInput!
+}
+type Vote {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+enum VoteOutcome {
+  Approve
+  Condemn
+}
+input CreateVoteInput {
+  outcome: VoteOutcome!
+  """The ID of the root of the proposal whether it is funding one or join"""
+  proposalId: ID!
+}
+type Event {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  """The type of the event in one of the predefined event types"""
+  type: EventType!
+  payload: JSON
+  """The ID of the event creator"""
+  userId: ID
+  """The ID of the common, for whom the event was created"""
+  commonId: ID
+}
+enum EventType {
+  CommonCreated
+  CommonMemberCreated
+  CommonMemberRoleAdded
+  CommonMemberRoleRemoved
+  JoinRequestCreated
+  JoinRequestAccepted
+  JoinRequestRejected
+  FundingRequestCreated
+  FundingRequestAccepted
+  FundingRequestRejected
+  CardCreated
+  CardCvvVerificationPassed
+  CardCvvVerificationFailed
+  PaymentCreated
+  PaymentSucceeded
+  PaymentFailed
+  ProposalMajorityReached
+  ProposalExpired
+  VoteCreated
+  UserCreated
+  DiscussionCreated
+  DiscussionMessageCreated
+  DiscussionSubscriptionCreated
+  DiscussionSubscriptionTypeChanged
+  NotificationTemplateCreated
+  NotificationTemplateUpdated
+  UserNotificationTokenVoided
+  UserNotificationTokenExpired
+  UserNotificationTokenCreated
+  UserNotificationTokenRefreshed
+  ReportCreated
+  ReportRespected
+  ReportDismissed
+  RoleCreated
+  RoleUpdated
+  RolePermissionAdded
+  RolePermissionRemoved
+  RoleDeleted
+  UserAddedToRole
+  UserRemovedFromRole
+}
+input EventOrderByInput {
+  createdAt: SortOrder
+  updatedAt: SortOrder
+  type: SortOrder
+}
+type Common {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  """The name of the common as provided"""
+  name: String!
+  """The whitelisting state of a common"""
+  whitelisted: Boolean!
+  """List of events, that occurred in a common"""
+  events(take: Int = 10, skip: Int = 0, orderBy: EventOrderByInput): [Event!]!
+  reports(where: ReportWhereInput = {status: {in: [Active]}}): [Report!]!
+  proposals(take: Int = 10, skip: Int = 0, where: ProposalWhereInput): [Proposal!]!
+  discussions(take: Int, skip: Int): [Discussion!]!
+  members(take: Int, skip: Int, orderBy: CommonMemberOrderByInput): [CommonMember]!
+}
+"""The funding type of the common"""
+enum FundingType {
+  OneTime
+  Monthly
+}
+input CreateCommonInput {
+  name: String!
+  fundingMinimumAmount: Int!
+  fundingType: FundingType!
+}
+input CommonWhereUniqueInput {
+  id: ID!
+}
+type Report implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  """The current status of the report"""
+  status: ReportStatus!
+  """The type of violation that this report is for"""
+  for: ReportFor!
+  """The note that the report has left for the content"""
+  note: String!
+  """The date on which the report was last reviewed if reviewed"""
+  reviewedOn: DateTime
+  reporterId: ID!
+  reporter: User!
+  messageId: UUID!
+  message: DiscussionMessage!
+}
+enum ReportFor {
+  Nudity
+  Violance
+  Harassment
+  FalseNews
+  Spam
+  Hate
+  Other
+}
+enum ReportAction {
+  Respected
+  Dismissed
+}
+enum ReportStatus {
+  Active
+  Clossed
+}
+enum ReportAuditor {
+  CommonModerator
+  SystemAdmin
+}
+input ReportWhereInput {
+  status: ReportStatusFilterInput
+  for: ReportFor
+}
+input ReportStatusFilterInput {
+  in: [ReportStatus]
+  not: [ReportStatus]
+}
+input ActOnReportInput {
+  reportId: UUID!
+  action: ReportAction!
+}
+input ReportDiscussionMessageInput {
+  messageId: UUID!
+  note: String!
+  for: ReportFor!
+}
+type Proposal {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  type: ProposalType!
+  state: ProposalState!
+  discussions(take: Int, skip: Int): [Discussion!]!
+}
+type JoinProposal {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+type FundingProposal {
+  """The main identifier of the item"""
+  id: ID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+input ProposalWhereInput {
+  type: ProposalType
+}
+input CreateJoinProposalInput {
+  title: String!
+  description: String!
+  fundingAmount: Int!
+  cardId: String!
+  commonId: String!
+  links: [LinkInput!]
+}
+input CreateFundingProposalInput {
+  commonId: ID!
+  amount: Int!
+  title: String!
+  description: String!
+  links: [ProposalLinkInput!]
+  files: [ProposalFileInput!]
+  images: [ProposalImageInput!]
+}
+input ProposalLinkInput {
+  title: String!
+  url: String!
+}
+input ProposalFileInput {
+  value: String!
+}
+input ProposalImageInput {
+  value: String!
+}
+enum ProposalType {
+  FundingRequest
+  JoinRequest
+}
+enum ProposalState {
+  Countdown
+  Finalizing
+  Rejected
+  Accepted
+}
+input ProposalWhereUniqueInput {
+  id: UUID!
+}
+type Discussion implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  """What this discussion is about"""
+  topic: String!
+  """Short description of the topic"""
+  description: String!
+  """The date at which the last message on the discussion was added"""
+  latestMessage: DateTime!
+  type: DiscussionType!
+  messages(take: Int = 10, skip: Int = 0, orderBy: DiscussionMessagesOrderByInput = {createdAt: asc}): [DiscussionMessage!]!
+}
+type DiscussionMessage implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  message: String!
+  type: DiscussionMessageType!
+  flag: DiscussionMessageFlag!
+  reports: [Report!]!
+}
+type DiscussionSubscription implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  type: DiscussionSubscriptionType!
+  userId: String!
+  discussionId: UUID!
+  discussion: Discussion!
+}
+enum DiscussionType {
+  ProposalDiscussion
+  CommonDiscussion
+}
+enum DiscussionMessageType {
+  Message
+}
+enum DiscussionMessageFlag {
+  Clear
+  Reported
+  Hidden
+}
+enum DiscussionSubscriptionType {
+  AllNotifications
+  OnlyMentions
+  NoNotification
+}
+input DiscussionMessagesOrderByInput {
+  createdAt: SortOrder
+  updatedAt: SortOrder
+}
+input DiscussionSubscriptionOrderByInput {
+  createdAt: SortOrder
+  updatedAt: SortOrder
+}
+input CreateDiscussionInput {
+  """The topic of the discussion to be created"""
+  topic: String!
+  """Short description about the topic"""
+  description: String!
+  """The ID of the common, for which we are creating the discussion"""
+  commonId: ID!
+  """The ID of the proposal, if this is proposal discussion"""
+  proposalId: ID
+}
+input CreateDiscussionMessageInput {
+  """The ID of the discussion, for which we are creating the message"""
+  discussionId: ID!
+  """The message itself"""
+  message: String!
+}
+type CommonMember {
+  id: ID!
+  userId: ID!
+  commonId: ID!
+  roles: [CommonMemberRole!]!
+  user: User
+  common: Common
+  proposals(take: Int = 10, skip: Int = 0, where: ProposalWhereInput): [Proposal!]!
+}
+input CommonMemberOrderByInput {
+  createdAt: SortOrder!
+}
+enum CommonMemberRole {
+  Founder
+  Moderator
+}
+enum NotificationType {
+  JoinRequestAccepted
+  JoinRequestRejected
+  FundingRequestAccepted
+  FundingRequestRejected
+}
+enum NotificationSeenStatus {
+  NotSeen
+  Seen
+  Done
+}
+type Notification implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  """Whether the notification should be shown in the user notification feed"""
+  show: Boolean!
+  type: NotificationType!
+  seenStatus: NotificationSeenStatus!
+  """The ID of the linked user"""
+  userId: UUID!
+  """The linked user. Expensive operation"""
+  user: User!
+  """The ID of the linked common. May be null"""
+  commonId: UUID
+  """The linked common. Expensive operation that may return null"""
+  common: Common
+  """The ID of the linked proposal. May be null"""
+  proposalId: UUID
+  """The linked proposal. Expensive operation that may return null"""
+  proposal: Proposal
+  """The ID of the linked discussion. May be null"""
+  discussionId: UUID
+  """The linked discussion. Expensive operation that may return null"""
+  discussion: Discussion
+}
+input NotificationWhereInput {
+  seenStatus: NotificationSeenStatus
+  type: NotificationType
+  userId: ID
+  commonId: UUID
+  proposalId: UUID
+  discussionId: UUID
+}
+input NotificationWhereUniqueInput {
+  id: UUID
+}
+input NotificationOrderByInput {
+  createdAt: SortOrder
+  updatedAt: SortOrder
+  status: SortOrder
+}
+scalar Void
+enum SortOrder {
+  asc
+  desc
+}
+type Link {
+  """The display title of the link"""
+  title: String!
+  """The actual link part of the link"""
+  url: String!
+}
+interface BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+input PaginateInput {
+  take: Int!
+  skip: Int
+}
+input LinkInput {
+  """The display title of the link"""
+  title: String!
+  """The actual link part of the link"""
+  url: String!
+}
+input StringFilter {
+  contains: String
+  endsWith: String
+  equals: String
+  gt: String
+  gte: String
+  lt: String
+  lte: String
+  startsWith: String
+  in: [String!]
+  notIn: [String!]
+}
+input BillingDetailsInput {
+  name: String!
+  city: String!
+  country: String!
+  line1: String!
+  postalCode: String!
+  line2: String
+  district: String
+}
+input CreateRoleInput {
+  name: String!
+  displayName: String!
+  description: String!
+  permissions: [String!]!
+}
+type Query {
+  """Provide ID to fetch specific user or do not pass anything to get the currently authenticated user"""
+  user(userId: ID): User
+  generateUserAuthToken(authId: String!): String!
+  roles(paginate: PaginateInput): [Role]
+  common(where: CommonWhereUniqueInput!): Common
+  proposal(where: ProposalWhereUniqueInput!): Proposal
+  discussion(id: ID!): Discussion
+}
+type Mutation {
+  """Creates new user in the system"""
+  createUser(input: CreateUserInput!): User!
+  createUserNotificationToken(input: CreateUserNotificationTokenInput!): UserNotificationToken!
+  voidUserNotificationToken(tokenId: ID!): UserNotificationToken!
+  createRole(input: CreateRoleInput!): Role
+  assignRole(userId: ID!, roleId: ID!): Void
+  unassignRole(userId: ID!, roleId: ID!): Void
+  createCard(input: CreateCardInput!): Card!
+  createVote(input: CreateVoteInput!): Vote!
+  createCommon(input: CreateCommonInput!): Common!
+  actOnReport(input: ActOnReportInput!): Report
+  reportDiscussionMessage(input: ReportDiscussionMessageInput!): Report!
+  finalizeProposal(proposalId: ID!): Boolean!
+  """Create new proposal of type JOIN."""
+  createJoinProposal(input: CreateJoinProposalInput!): Proposal!
+  createFundingProposal(input: CreateFundingProposalInput!): Proposal!
+  createDiscussion(input: CreateDiscussionInput!): Discussion!
+  createDiscussionMessage(input: CreateDiscussionMessageInput!): DiscussionMessage!
+  changeDiscussionSubscriptionType(
+    """The ID of the discussion subscription to change"""
+    id: ID!
+    """The new subscription type"""
+    type: DiscussionSubscriptionType!
+  ): DiscussionSubscription
+}
+type Subscription {
+  onProposalChange(
+    """The ID of the proposal that you wish to subscribe to"""
+    proposalId: ID!
+  ): Proposal
+  discussionMessageCreated(
+    """The ID of the discussion, for which messages you want to subscribe"""
+    discussionId: ID!
+  ): DiscussionMessage
+  notificationCreated: Notification
+}
\ No newline at end of file
diff --git a/packages/admin/src/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
similarity index 61%
rename from packages/admin/src/graphql/schema.json
rename to packages/admin/src/core/graphql/schema.json
index 070a5174e..129ea318d 100644
--- a/packages/admin/src/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -12,8 +12,8 @@
     "types": [
       {
         "kind": "SCALAR",
-        "name": "Date",
-        "description": null,
+        "name": "URL",
+        "description": "A field whose value conforms to the standard URL format as specified in RFC3986: https://www.ietf.org/rfc/rfc3986.txt.",
         "fields": null,
         "inputFields": null,
         "interfaces": null,
@@ -21,36 +21,43 @@
         "possibleTypes": null
       },
       {
-        "kind": "ENUM",
-        "name": "CardNetwork",
-        "description": null,
+        "kind": "SCALAR",
+        "name": "DateTime",
+        "description": "A date-time string at UTC, such as 2007-12-03T10:15:30Z, compliant with the `date-time` format outlined in section 5.6 of the RFC 3339 profile of the ISO 8601 standard for representation of dates and times using the Gregorian calendar.",
         "fields": null,
         "inputFields": null,
         "interfaces": null,
-        "enumValues": [
-          {
-            "name": "visa",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "mastercard",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "SCALAR",
+        "name": "JSON",
+        "description": "The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "SCALAR",
+        "name": "UUID",
+        "description": "A field whose value is a generic Universally Unique Identifier: https://en.wikipedia.org/wiki/Universally_unique_identifier.",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "OBJECT",
-        "name": "Card",
+        "name": "User",
         "description": null,
         "fields": [
           {
             "name": "id",
-            "description": "The ID of the payment",
+            "description": "The system Id of the user",
             "args": [],
             "type": {
               "kind": "NON_NULL",
@@ -66,14 +73,14 @@
           },
           {
             "name": "createdAt",
-            "description": "The date at witch the payment was created",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -82,14 +89,14 @@
           },
           {
             "name": "updatedAt",
-            "description": "The date at witch the payment was last updated",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -97,15 +104,15 @@
             "deprecationReason": null
           },
           {
-            "name": "circleCardId",
-            "description": null,
+            "name": "firstName",
+            "description": "The first name of the user",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
@@ -113,15 +120,15 @@
             "deprecationReason": null
           },
           {
-            "name": "ownerId",
-            "description": null,
+            "name": "lastName",
+            "description": "The last name of the user",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
@@ -129,216 +136,1514 @@
             "deprecationReason": null
           },
           {
-            "name": "metadata",
-            "description": null,
+            "name": "displayName",
+            "description": "The display name of the user",
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "CardMetadata",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "verification",
+            "name": "photo",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "CardVerification",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "SCALAR",
-        "name": "ID",
-        "description": "The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `\"4\"`) or integer (such as `4`) input value will be accepted as an ID.",
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "CardMetadata",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "digits",
-            "description": null,
+            "name": "email",
+            "description": "The email of the user",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "network",
-            "description": null,
+            "name": "permissions",
+            "description": "List of all the users permissions",
             "args": [],
             "type": {
-              "kind": "ENUM",
-              "name": "CardNetwork",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "billingDetails",
-            "description": null,
-            "args": [],
+            "name": "events",
+            "description": "List of events, that occurred and are related to this user",
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "orderBy",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "EventOrderByInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "OBJECT",
-              "name": "CardBillingDetails",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Event",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "SCALAR",
-        "name": "String",
-        "description": "The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.",
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "CardVerification",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "cvv",
+            "name": "proposals",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Proposal",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "CardBillingDetails",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "name",
+            "name": "notifications",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "orderBy",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NotificationOrderByInput",
+                  "ofType": null
+                },
+                "defaultValue": "{createdAt: desc}",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "cursor",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NotificationWhereUniqueInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Notification",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "notificationTokens",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "UserNotificationToken",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "discussionSubscriptions",
+            "description": null,
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "orderBy",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "DiscussionSubscriptionOrderByInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "DiscussionSubscription",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "SCALAR",
+        "name": "ID",
+        "description": "The `ID` scalar type represents a unique identifier, often used to refetch an object or as key for a cache. The ID type appears in a JSON response as a String; however, it is not intended to be human-readable. When expected as an input type, any string (such as `\"4\"`) or integer (such as `4`) input value will be accepted as an ID.",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "SCALAR",
+        "name": "String",
+        "description": "The `String` scalar type represents textual data, represented as UTF-8 character sequences. The String type is most often used by GraphQL to represent free-form human-readable text.",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "SCALAR",
+        "name": "Int",
+        "description": "The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1.",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "UserNotificationToken",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "state",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "UserNotificationTokenState",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "token",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastUsed",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastVerified",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateUserInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "firstName",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastName",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "email",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "photo",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateUserNotificationTokenInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "token",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "UserNotificationTokenState",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "Active",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Expired",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Voided",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Role",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "name",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "displayName",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "permissions",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Card",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateCardInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "keyId",
+            "description": "The ID of the key used for the encryption of the sensitive data",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "encryptedData",
+            "description": "The sensitive part of the card as encrypted card",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "expYear",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "expMonth",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "billingDetails",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "INPUT_OBJECT",
+                "name": "BillingDetailsInput",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Vote",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "VoteOutcome",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "Approve",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Condemn",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateVoteInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "outcome",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "VoteOutcome",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "proposalId",
+            "description": "The ID of the root of the proposal whether it is funding one or join",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Event",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "type",
+            "description": "The type of the event in one of the predefined event types",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "EventType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "payload",
+            "description": null,
+            "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "String",
+              "name": "JSON",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "userId",
+            "description": "The ID of the event creator",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "ID",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "commonId",
+            "description": "The ID of the common, for whom the event was created",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "ID",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "EventType",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "CommonCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CommonMemberCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CommonMemberRoleAdded",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CommonMemberRoleRemoved",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           },
           {
-            "name": "city",
+            "name": "JoinRequestCreated",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "country",
+            "name": "JoinRequestAccepted",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "postalCode",
+            "name": "JoinRequestRejected",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "FundingRequestCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "FundingRequestAccepted",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "FundingRequestRejected",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CardCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CardCvvVerificationPassed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CardCvvVerificationFailed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "PaymentCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "PaymentSucceeded",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "PaymentFailed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ProposalMajorityReached",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ProposalExpired",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "VoteCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "DiscussionCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "DiscussionMessageCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "DiscussionSubscriptionCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "DiscussionSubscriptionTypeChanged",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "NotificationTemplateCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "NotificationTemplateUpdated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserNotificationTokenVoided",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserNotificationTokenExpired",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserNotificationTokenCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserNotificationTokenRefreshed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ReportCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ReportRespected",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ReportDismissed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "RoleCreated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "RoleUpdated",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "RolePermissionAdded",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "RolePermissionRemoved",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "RoleDeleted",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserAddedToRole",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "UserRemovedFromRole",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "EventOrderByInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "createdAt",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
+              "kind": "ENUM",
+              "name": "SortOrder",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "district",
+            "name": "updatedAt",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
+              "kind": "ENUM",
+              "name": "SortOrder",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "line1",
+            "name": "type",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
+              "kind": "ENUM",
+              "name": "SortOrder",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "OBJECT",
-        "name": "User",
+        "name": "Common",
         "description": null,
         "fields": [
           {
             "name": "id",
-            "description": null,
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
@@ -353,148 +1658,311 @@
             "deprecationReason": null
           },
           {
-            "name": "firstName",
-            "description": null,
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "lastName",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "email",
-            "description": null,
+            "name": "name",
+            "description": "The name of the common as provided",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "photoURL",
-            "description": null,
+            "name": "whitelisted",
+            "description": "The whitelisting state of a common",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "createdAt",
-            "description": null,
-            "args": [],
+            "name": "events",
+            "description": "List of events, that occurred in a common",
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "orderBy",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "EventOrderByInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Event",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "tokens",
+            "name": "reports",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ReportWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": "{status: {in: [Active]}}",
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Report",
+                    "ofType": null
+                  }
+                }
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "permissions",
+            "name": "proposals",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Proposal",
+                    "ofType": null
+                  }
+                }
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposals",
+            "name": "discussions",
             "description": null,
             "args": [
               {
-                "name": "page",
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
                 "description": null,
                 "type": {
                   "kind": "SCALAR",
                   "name": "Int",
                   "ofType": null
                 },
-                "defaultValue": "1",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "Proposal",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Discussion",
+                    "ofType": null
+                  }
+                }
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "subscriptions",
+            "name": "members",
             "description": null,
             "args": [
               {
-                "name": "page",
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
                 "description": null,
                 "type": {
                   "kind": "SCALAR",
                   "name": "Int",
                   "ofType": null
                 },
-                "defaultValue": "1",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               },
               {
-                "name": "status",
+                "name": "orderBy",
                 "description": null,
                 "type": {
-                  "kind": "ENUM",
-                  "name": "SubscriptionStatus",
+                  "kind": "INPUT_OBJECT",
+                  "name": "CommonMemberOrderByInput",
                   "ofType": null
                 },
                 "defaultValue": null,
@@ -503,12 +1971,16 @@
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "Subscription",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "OBJECT",
+                  "name": "CommonMember",
+                  "ofType": null
+                }
               }
             },
             "isDeprecated": false,
@@ -522,8 +1994,8 @@
       },
       {
         "kind": "SCALAR",
-        "name": "Int",
-        "description": "The `Int` scalar type represents non-fractional signed whole numeric values. Int can represent values between -(2^31) and 2^31 - 1.",
+        "name": "Boolean",
+        "description": "The `Boolean` scalar type represents `true` or `false`.",
         "fields": null,
         "inputFields": null,
         "interfaces": null,
@@ -531,481 +2003,613 @@
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "Wire",
-        "description": null,
-        "fields": [
-          {
-            "name": "id",
-            "description": "The local ID of the payout",
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "createdAt",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "updatedAt",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "description",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
+        "kind": "ENUM",
+        "name": "FundingType",
+        "description": "The funding type of the common",
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
           {
-            "name": "bank",
+            "name": "OneTime",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "WireBank",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "billingDetails",
+            "name": "Monthly",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "WireBillingDetailsType",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "WireBank",
+        "kind": "INPUT_OBJECT",
+        "name": "CreateCommonInput",
         "description": null,
-        "fields": [
+        "fields": null,
+        "inputFields": [
           {
-            "name": "bankName",
+            "name": "name",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "city",
+            "name": "fundingMinimumAmount",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "country",
+            "name": "fundingType",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "FundingType",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "WireBillingDetailsType",
+        "kind": "INPUT_OBJECT",
+        "name": "CommonWhereUniqueInput",
         "description": null,
-        "fields": [
+        "fields": null,
+        "inputFields": [
           {
-            "name": "city",
+            "name": "id",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Report",
+        "description": null,
+        "fields": [
           {
-            "name": "country",
-            "description": null,
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "line1",
-            "description": null,
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "line2",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "name",
-            "description": null,
+            "name": "status",
+            "description": "The current status of the report",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ReportStatus",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "postalCode",
-            "description": null,
+            "name": "for",
+            "description": "The type of violation that this report is for",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ReportFor",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "ENUM",
-        "name": "EventType",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "commonCreated",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "commonCreationFailed",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "commonWhitelisted",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "commonMemberAdded",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "commonMemberRemoved",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "commonUpdated",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "requestToJoinCreated",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "requestToJoinAccepted",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "requestToJoinRejected",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "requestToJoinExecuted",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "fundingRequestCreated",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
           },
           {
-            "name": "fundingRequestRejected",
-            "description": null,
+            "name": "note",
+            "description": "The note that the report has left for the content",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingRequestExecuted",
-            "description": null,
+            "name": "reviewedOn",
+            "description": "The date on which the report was last reviewed if reviewed",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "DateTime",
+              "ofType": null
+            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingRequestAccepted",
+            "name": "reporterId",
             "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingRequestAcceptedInsufficientFunds",
+            "name": "reporter",
             "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "User",
+                "ofType": null
+              }
+            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "voteCreated",
+            "name": "messageId",
             "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "paymentCreated",
+            "name": "message",
             "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "DiscussionMessage",
+                "ofType": null
+              }
+            },
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
           {
-            "name": "paymentConfirmed",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "ReportFor",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
           {
-            "name": "paymentFailed",
+            "name": "Nudity",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "paymentPaid",
+            "name": "Violance",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payoutCreated",
+            "name": "Harassment",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payoutApproved",
+            "name": "FalseNews",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payoutExecuted",
+            "name": "Spam",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payoutVoided",
+            "name": "Hate",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payoutCompleted",
+            "name": "Other",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "ReportAction",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
           {
-            "name": "payoutFailed",
+            "name": "Respected",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "cardCreated",
+            "name": "Dismissed",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "ReportStatus",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
           {
-            "name": "discussionCreated",
+            "name": "Active",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "messageCreated",
+            "name": "Clossed",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "ReportAuditor",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
           {
-            "name": "subscriptionCreated",
+            "name": "CommonModerator",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "subscriptionPaymentCreated",
+            "name": "SystemAdmin",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "ReportWhereInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "subscriptionPaymentFailed",
+            "name": "status",
             "description": null,
+            "type": {
+              "kind": "INPUT_OBJECT",
+              "name": "ReportStatusFilterInput",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "subscriptionPaymentConfirmed",
+            "name": "for",
             "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "ReportFor",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "ReportStatusFilterInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "subscriptionPaymentStuck",
+            "name": "in",
             "description": null,
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ReportStatus",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "subscriptionCanceledByUser",
+            "name": "not",
             "description": null,
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ReportStatus",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "ActOnReportInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "subscriptionCanceledByPaymentFailure",
+            "name": "reportId",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "membershipRevoked",
+            "name": "action",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ReportAction",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "ReportDiscussionMessageInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "discussionMessageReported",
+            "name": "messageId",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposalReported",
+            "name": "note",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "discussionReported",
+            "name": "for",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ReportFor",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "OBJECT",
-        "name": "Event",
+        "name": "Proposal",
         "description": null,
         "fields": [
           {
             "name": "id",
-            "description": "The unique identifier of the event",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
@@ -1020,15 +2624,15 @@
             "deprecationReason": null
           },
           {
-            "name": "type",
-            "description": "The type of the event",
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "ENUM",
-                "name": "EventType",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1036,15 +2640,15 @@
             "deprecationReason": null
           },
           {
-            "name": "createdAt",
-            "description": "The date, at which the event was created",
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1052,15 +2656,15 @@
             "deprecationReason": null
           },
           {
-            "name": "updatedAt",
-            "description": "The date, at which the event was last updated",
+            "name": "type",
+            "description": null,
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "Date",
+                "kind": "ENUM",
+                "name": "ProposalType",
                 "ofType": null
               }
             },
@@ -1068,37 +2672,66 @@
             "deprecationReason": null
           },
           {
-            "name": "objectId",
-            "description": "The id of the object on which was acted to created the event",
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "ID",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "userId",
-            "description": "The id of the actor",
+            "name": "state",
+            "description": null,
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "ID",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "ProposalState",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "user",
+            "name": "discussions",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "OBJECT",
-              "name": "User",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Discussion",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -1109,37 +2742,14 @@
         "enumValues": null,
         "possibleTypes": null
       },
-      {
-        "kind": "ENUM",
-        "name": "CommonContributionType",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "oneTime",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "monthly",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
       {
         "kind": "OBJECT",
-        "name": "CommonMember",
+        "name": "JoinProposal",
         "description": null,
         "fields": [
           {
-            "name": "userId",
-            "description": "The user ID of the member",
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
@@ -1154,25 +2764,33 @@
             "deprecationReason": null
           },
           {
-            "name": "joinedAt",
-            "description": "The date, at witch the member joined the common",
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "user",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "User",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
@@ -1185,35 +2803,19 @@
       },
       {
         "kind": "OBJECT",
-        "name": "CommonMetadata",
+        "name": "FundingProposal",
         "description": null,
         "fields": [
           {
-            "name": "byline",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "description",
-            "description": null,
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "ID",
                 "ofType": null
               }
             },
@@ -1221,15 +2823,15 @@
             "deprecationReason": null
           },
           {
-            "name": "founderId",
-            "description": null,
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "String",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1237,178 +2839,220 @@
             "deprecationReason": null
           },
           {
-            "name": "minFeeToJoin",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "DateTime",
                 "ofType": null
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "ProposalWhereInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "contributionType",
+            "name": "type",
             "description": null,
-            "args": [],
             "type": {
               "kind": "ENUM",
-              "name": "CommonContributionType",
+              "name": "ProposalType",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "Payout",
+        "kind": "INPUT_OBJECT",
+        "name": "CreateJoinProposalInput",
         "description": null,
-        "fields": [
+        "fields": null,
+        "inputFields": [
           {
-            "name": "id",
+            "name": "title",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "createdAt",
+            "name": "description",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "updatedAt",
+            "name": "fundingAmount",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "Int",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "circlePayoutId",
+            "name": "cardId",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "amount",
+            "name": "commonId",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "executed",
+            "name": "links",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
-              "ofType": null
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "LinkInput",
+                  "ofType": null
+                }
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateFundingProposalInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "voided",
+            "name": "commonId",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "status",
+            "name": "amount",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "ENUM",
-              "name": "PayoutStatus",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "security",
+            "name": "title",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "PayoutSecurity",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposalIds",
+            "name": "description",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
@@ -1416,157 +3060,161 @@
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposals",
+            "name": "links",
             "description": null,
-            "args": [],
             "type": {
               "kind": "LIST",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "Proposal",
-                "ofType": null
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalLinkInput",
+                  "ofType": null
+                }
               }
             },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "SCALAR",
-        "name": "Boolean",
-        "description": "The `Boolean` scalar type represents `true` or `false`.",
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "PayoutSecurity",
-        "description": null,
-        "fields": [
-          {
-            "name": "id",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
-            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "redemptionAttempts",
+            "name": "files",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalFileInput",
+                  "ofType": null
+                }
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "redeemed",
+            "name": "images",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
-              "ofType": null
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalImageInput",
+                  "ofType": null
+                }
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "ENUM",
-        "name": "PayoutStatus",
+        "kind": "INPUT_OBJECT",
+        "name": "ProposalLinkInput",
         "description": null,
         "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "pending",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
+        "inputFields": [
           {
-            "name": "complete",
+            "name": "title",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "failed",
+            "name": "url",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "INPUT_OBJECT",
-        "name": "ExecutePayoutInput",
+        "name": "ProposalFileInput",
         "description": null,
         "fields": null,
         "inputFields": [
           {
-            "name": "wireId",
-            "description": "The ID of the the wire to witch the payout will be made",
+            "name": "value",
+            "description": null,
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "ProposalImageInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "proposalIds",
-            "description": "List of the all proposals IDs that are in this batch",
+            "name": "value",
+            "description": null,
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "LIST",
-                "name": null,
-                "ofType": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
-                    "ofType": null
-                  }
-                }
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
               }
             },
             "defaultValue": null,
@@ -1580,37 +3228,20 @@
       },
       {
         "kind": "ENUM",
-        "name": "PaymentType",
+        "name": "ProposalType",
         "description": null,
         "fields": null,
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
           {
-            "name": "oneTime",
+            "name": "FundingRequest",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "subscription",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "possibleTypes": null
-      },
-      {
-        "kind": "ENUM",
-        "name": "PaymentSourceType",
-        "description": null,
-        "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "card",
+            "name": "JoinRequest",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
@@ -1620,32 +3251,32 @@
       },
       {
         "kind": "ENUM",
-        "name": "PaymentStatus",
+        "name": "ProposalState",
         "description": null,
         "fields": null,
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
           {
-            "name": "pending",
+            "name": "Countdown",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "confirmed",
+            "name": "Finalizing",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "paid",
+            "name": "Rejected",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "failed",
+            "name": "Accepted",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
@@ -1654,37 +3285,47 @@
         "possibleTypes": null
       },
       {
-        "kind": "ENUM",
-        "name": "PaymentCurrency",
+        "kind": "INPUT_OBJECT",
+        "name": "ProposalWhereUniqueInput",
         "description": null,
         "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
+        "inputFields": [
           {
-            "name": "USD",
+            "name": "id",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "OBJECT",
-        "name": "Payment",
+        "name": "Discussion",
         "description": null,
         "fields": [
           {
             "name": "id",
-            "description": "The ID of the payment",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "UUID",
                 "ofType": null
               }
             },
@@ -1693,14 +3334,14 @@
           },
           {
             "name": "createdAt",
-            "description": "The date at witch the payment was created",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1709,14 +3350,14 @@
           },
           {
             "name": "updatedAt",
-            "description": "The date at witch the payment was last updated",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1724,15 +3365,15 @@
             "deprecationReason": null
           },
           {
-            "name": "type",
-            "description": null,
+            "name": "topic",
+            "description": "What this discussion is about",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "ENUM",
-                "name": "PaymentType",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
@@ -1740,15 +3381,15 @@
             "deprecationReason": null
           },
           {
-            "name": "status",
-            "description": null,
+            "name": "description",
+            "description": "Short description of the topic",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "ENUM",
-                "name": "PaymentStatus",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
@@ -1756,15 +3397,15 @@
             "deprecationReason": null
           },
           {
-            "name": "source",
-            "description": "The source from witch the payment was funded",
+            "name": "latestMessage",
+            "description": "The date at which the last message on the discussion was added",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "PaymentSource",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1772,15 +3413,15 @@
             "deprecationReason": null
           },
           {
-            "name": "amount",
+            "name": "type",
             "description": null,
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "PaymentAmount",
+                "kind": "ENUM",
+                "name": "DiscussionType",
                 "ofType": null
               }
             },
@@ -1788,27 +3429,93 @@
             "deprecationReason": null
           },
           {
-            "name": "fees",
-            "description": "The fees on the payment",
-            "args": [],
+            "name": "messages",
+            "description": null,
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "orderBy",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "DiscussionMessagesOrderByInput",
+                  "ofType": null
+                },
+                "defaultValue": "{createdAt: asc}",
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "OBJECT",
-              "name": "PaymentFees",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "DiscussionMessage",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
           {
-            "name": "circlePaymentId",
-            "description": null,
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "DiscussionMessage",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "UUID",
                 "ofType": null
               }
             },
@@ -1816,15 +3523,15 @@
             "deprecationReason": null
           },
           {
-            "name": "proposalId",
-            "description": null,
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1832,15 +3539,15 @@
             "deprecationReason": null
           },
           {
-            "name": "userId",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1848,133 +3555,120 @@
             "deprecationReason": null
           },
           {
-            "name": "subscriptionId",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "ID",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "user",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "User",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "card",
+            "name": "message",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "Card",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "common",
+            "name": "type",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "Common",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "DiscussionMessageType",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposal",
+            "name": "flag",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "Proposal",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "DiscussionMessageFlag",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "subscription",
+            "name": "reports",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "Subscription",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Report",
+                    "ofType": null
+                  }
+                }
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
         "inputFields": null,
-        "interfaces": [],
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
         "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "OBJECT",
-        "name": "PaymentFees",
+        "name": "DiscussionSubscription",
         "description": null,
         "fields": [
           {
-            "name": "amount",
-            "description": null,
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "currency",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "ENUM",
-              "name": "PaymentCurrency",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "PaymentSource",
-        "description": null,
-        "fields": [
-          {
-            "name": "type",
-            "description": null,
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "ENUM",
-                "name": "PaymentSourceType",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -1982,144 +3676,130 @@
             "deprecationReason": null
           },
           {
-            "name": "id",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "ID",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "PaymentAmount",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "currency",
+            "name": "type",
             "description": null,
             "args": [],
             "type": {
-              "kind": "ENUM",
-              "name": "PaymentCurrency",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "DiscussionSubscriptionType",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "amount",
+            "name": "userId",
             "description": null,
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "Balance",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "available",
+            "name": "discussionId",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "Amount",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "unsettled",
+            "name": "discussion",
             "description": null,
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "Amount",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Discussion",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
         "inputFields": null,
-        "interfaces": [],
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "Amount",
+        "kind": "ENUM",
+        "name": "DiscussionType",
         "description": null,
-        "fields": [
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
           {
-            "name": "amount",
+            "name": "ProposalDiscussion",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "currency",
+            "name": "CommonDiscussion",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "ENUM",
-        "name": "ProposalType",
+        "name": "DiscussionMessageType",
         "description": null,
         "fields": null,
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
           {
-            "name": "fundingRequest",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "join",
+            "name": "Message",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
@@ -2129,32 +3809,26 @@
       },
       {
         "kind": "ENUM",
-        "name": "ProposalState",
+        "name": "DiscussionMessageFlag",
         "description": null,
         "fields": null,
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
           {
-            "name": "passedInsufficientBalance",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "countdown",
+            "name": "Clear",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "passed",
+            "name": "Reported",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "failed",
+            "name": "Hidden",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
@@ -2164,20 +3838,26 @@
       },
       {
         "kind": "ENUM",
-        "name": "ProposalVoteOutcome",
+        "name": "DiscussionSubscriptionType",
         "description": null,
         "fields": null,
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
           {
-            "name": "approved",
+            "name": "AllNotifications",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "OnlyMentions",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "rejected",
+            "name": "NoNotification",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
@@ -2186,90 +3866,155 @@
         "possibleTypes": null
       },
       {
-        "kind": "ENUM",
-        "name": "ProposalPaymentState",
+        "kind": "INPUT_OBJECT",
+        "name": "DiscussionMessagesOrderByInput",
         "description": null,
         "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "notAttempted",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
+        "inputFields": [
           {
-            "name": "notRelevant",
+            "name": "createdAt",
             "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "confirmed",
+            "name": "updatedAt",
             "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "DiscussionSubscriptionOrderByInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "pending",
+            "name": "createdAt",
             "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "failed",
+            "name": "updatedAt",
             "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "ENUM",
-        "name": "ProposalFundingState",
+        "kind": "INPUT_OBJECT",
+        "name": "CreateDiscussionInput",
         "description": null,
         "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
+        "inputFields": [
           {
-            "name": "notRelevant",
-            "description": null,
+            "name": "topic",
+            "description": "The topic of the discussion to be created",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "notAvailable",
-            "description": null,
+            "name": "description",
+            "description": "Short description about the topic",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "available",
-            "description": null,
+            "name": "commonId",
+            "description": "The ID of the common, for which we are creating the discussion",
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "funded",
-            "description": null,
+            "name": "proposalId",
+            "description": "The ID of the proposal, if this is proposal discussion",
+            "type": {
+              "kind": "SCALAR",
+              "name": "ID",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "Proposal",
-        "description": "The proposals type",
-        "fields": [
+        "kind": "INPUT_OBJECT",
+        "name": "CreateDiscussionMessageInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "id",
-            "description": null,
-            "args": [],
+            "name": "discussionId",
+            "description": "The ID of the discussion, for which we are creating the message",
             "type": {
               "kind": "NON_NULL",
               "name": null,
@@ -2279,27 +4024,38 @@
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "createdAt",
-            "description": null,
-            "args": [],
+            "name": "message",
+            "description": "The message itself",
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "CommonMember",
+        "description": null,
+        "fields": [
           {
-            "name": "updatedAt",
+            "name": "id",
             "description": null,
             "args": [],
             "type": {
@@ -2307,7 +4063,7 @@
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "ID",
                 "ofType": null
               }
             },
@@ -2315,7 +4071,7 @@
             "deprecationReason": null
           },
           {
-            "name": "commonId",
+            "name": "userId",
             "description": null,
             "args": [],
             "type": {
@@ -2331,7 +4087,7 @@
             "deprecationReason": null
           },
           {
-            "name": "proposerId",
+            "name": "commonId",
             "description": null,
             "args": [],
             "type": {
@@ -2347,143 +4103,265 @@
             "deprecationReason": null
           },
           {
-            "name": "votesFor",
+            "name": "roles",
             "description": null,
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "ENUM",
+                    "name": "CommonMemberRole",
+                    "ofType": null
+                  }
+                }
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "votesAgainst",
+            "name": "user",
             "description": null,
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
+              "kind": "OBJECT",
+              "name": "User",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "state",
+            "name": "common",
             "description": null,
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "ProposalState",
-                "ofType": null
-              }
+              "kind": "OBJECT",
+              "name": "Common",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "description",
+            "name": "proposals",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "take",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "10",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "skip",
+                "description": null,
+                "type": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                },
+                "defaultValue": "0",
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "ProposalDescription",
-                "ofType": null
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Proposal",
+                    "ofType": null
+                  }
+                }
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CommonMemberOrderByInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "type",
+            "name": "createdAt",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "ENUM",
-                "name": "ProposalType",
+                "name": "SortOrder",
                 "ofType": null
               }
             },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "CommonMemberRole",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "Founder",
+            "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "paymentState",
+            "name": "Moderator",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "NotificationType",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "JoinRequestAccepted",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "ENUM",
-              "name": "ProposalPaymentState",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingState",
+            "name": "JoinRequestRejected",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "ENUM",
-              "name": "ProposalFundingState",
-              "ofType": null
-            },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingRequest",
-            "description": "Details about the funding request. Exists only on funding request proposals",
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "ProposalFunding",
-              "ofType": null
-            },
+            "name": "FundingRequestAccepted",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "FundingRequestRejected",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "NotificationSeenStatus",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "NotSeen",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Seen",
+            "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "join",
-            "description": "Details about the join request. Exists only on join request proposals",
+            "name": "Done",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Notification",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
-              "kind": "OBJECT",
-              "name": "ProposalJoin",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "votes",
-            "description": null,
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "ProposalVote",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -2491,15 +4369,15 @@
             "deprecationReason": null
           },
           {
-            "name": "common",
-            "description": null,
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "Common",
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -2507,108 +4385,79 @@
             "deprecationReason": null
           },
           {
-            "name": "proposer",
-            "description": null,
+            "name": "show",
+            "description": "Whether the notification should be shown in the user notification feed",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "User",
+                "kind": "SCALAR",
+                "name": "Boolean",
                 "ofType": null
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "ProposalDescription",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "title",
+            "name": "type",
             "description": null,
             "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "NotificationType",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "description",
+            "name": "seenStatus",
             "description": null,
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
+                "kind": "ENUM",
+                "name": "NotificationSeenStatus",
                 "ofType": null
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "ProposalFunding",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "amount",
-            "description": null,
+            "name": "userId",
+            "description": "The ID of the linked user",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "UUID",
                 "ofType": null
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "ProposalJoin",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "cardId",
-            "description": null,
+            "name": "user",
+            "description": "The linked user. Expensive operation",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
+                "kind": "OBJECT",
+                "name": "User",
                 "ofType": null
               }
             },
@@ -2616,99 +4465,72 @@
             "deprecationReason": null
           },
           {
-            "name": "funding",
-            "description": null,
+            "name": "commonId",
+            "description": "The ID of the linked common. May be null",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingType",
-            "description": null,
+            "name": "common",
+            "description": "The linked common. Expensive operation that may return null",
             "args": [],
             "type": {
-              "kind": "ENUM",
-              "name": "CommonContributionType",
+              "kind": "OBJECT",
+              "name": "Common",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "ProposalVote",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "voteId",
-            "description": null,
+            "name": "proposalId",
+            "description": "The ID of the linked proposal. May be null",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "voterId",
-            "description": null,
+            "name": "proposal",
+            "description": "The linked proposal. Expensive operation that may return null",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
+              "kind": "OBJECT",
+              "name": "Proposal",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "outcome",
-            "description": null,
+            "name": "discussionId",
+            "description": "The ID of the linked discussion. May be null",
             "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "ProposalVoteOutcome",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "voter",
-            "description": null,
+            "name": "discussion",
+            "description": "The linked discussion. Expensive operation that may return null",
             "args": [],
             "type": {
               "kind": "OBJECT",
-              "name": "User",
+              "name": "Discussion",
               "ofType": null
             },
             "isDeprecated": false,
@@ -2716,157 +4538,159 @@
           }
         ],
         "inputFields": null,
-        "interfaces": [],
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "Intention",
+        "kind": "INPUT_OBJECT",
+        "name": "NotificationWhereInput",
         "description": null,
-        "fields": [
+        "fields": null,
+        "inputFields": [
           {
-            "name": "id",
+            "name": "seenStatus",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "NotificationSeenStatus",
+              "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "createdAt",
+            "name": "type",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Date",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "NotificationType",
+              "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "updatedAt",
+            "name": "userId",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Date",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "ID",
+              "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "type",
+            "name": "commonId",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "IntentionType",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "intention",
+            "name": "proposalId",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "discussionId",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "ENUM",
-        "name": "IntentionType",
+        "kind": "INPUT_OBJECT",
+        "name": "NotificationWhereUniqueInput",
         "description": null,
         "fields": null,
-        "inputFields": null,
-        "interfaces": null,
-        "enumValues": [
-          {
-            "name": "access",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
+        "inputFields": [
           {
-            "name": "request",
+            "name": "id",
             "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
+        "interfaces": null,
+        "enumValues": null,
         "possibleTypes": null
       },
       {
         "kind": "INPUT_OBJECT",
-        "name": "CreateIntentionInput",
+        "name": "NotificationOrderByInput",
         "description": null,
         "fields": null,
         "inputFields": [
           {
-            "name": "type",
+            "name": "createdAt",
             "description": null,
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "IntentionType",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
             },
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "intention",
+            "name": "updatedAt",
             "description": null,
             "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "String",
-                "ofType": null
-              }
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "status",
+            "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "SortOrder",
+              "ofType": null
             },
             "defaultValue": null,
             "isDeprecated": false,
@@ -2877,40 +4701,32 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "SCALAR",
+        "name": "Void",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "ENUM",
-        "name": "SubscriptionStatus",
+        "name": "SortOrder",
         "description": null,
         "fields": null,
         "inputFields": null,
         "interfaces": null,
         "enumValues": [
           {
-            "name": "pending",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "active",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "canceledByUser",
-            "description": null,
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "canceledByPaymentFailure",
+            "name": "asc",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "paymentFailed",
+            "name": "desc",
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
@@ -2920,35 +4736,19 @@
       },
       {
         "kind": "OBJECT",
-        "name": "Subscription",
+        "name": "Link",
         "description": null,
         "fields": [
           {
-            "name": "id",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "ID",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "cardId",
-            "description": null,
+            "name": "title",
+            "description": "The display title of the link",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
@@ -2956,31 +4756,42 @@
             "deprecationReason": null
           },
           {
-            "name": "userId",
-            "description": null,
+            "name": "url",
+            "description": "The actual link part of the link",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INTERFACE",
+        "name": "BaseEntity",
+        "description": null,
+        "fields": [
           {
-            "name": "proposalId",
-            "description": null,
+            "name": "id",
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "UUID",
                 "ofType": null
               }
             },
@@ -2989,14 +4800,14 @@
           },
           {
             "name": "createdAt",
-            "description": null,
+            "description": "The date, at which the item was created",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -3005,40 +4816,71 @@
           },
           {
             "name": "updatedAt",
-            "description": null,
+            "description": "The date, at which the item was last modified",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Date",
+                "name": "DateTime",
                 "ofType": null
               }
             },
             "isDeprecated": false,
             "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": [
+          {
+            "kind": "OBJECT",
+            "name": "UserNotificationToken",
+            "ofType": null
           },
           {
-            "name": "charges",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
+            "kind": "OBJECT",
+            "name": "Role",
+            "ofType": null
           },
           {
-            "name": "amount",
+            "kind": "OBJECT",
+            "name": "Report",
+            "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "Discussion",
+            "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "DiscussionMessage",
+            "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "DiscussionSubscription",
+            "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "Notification",
+            "ofType": null
+          }
+        ]
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "PaginateInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "take",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
@@ -3048,339 +4890,274 @@
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "lastChargedAt",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "dueDate",
+            "name": "skip",
             "description": null,
-            "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "Date",
+              "name": "Int",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "LinkInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "revoked",
-            "description": null,
-            "args": [],
+            "name": "title",
+            "description": "The display title of the link",
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Boolean",
-                "ofType": null
-              }
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "status",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "ENUM",
-                "name": "SubscriptionStatus",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "metadata",
-            "description": null,
-            "args": [],
+            "name": "url",
+            "description": "The actual link part of the link",
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "SubscriptionMetadata",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "SubscriptionMetadata",
-        "description": null,
-        "fields": [
-          {
-            "name": "common",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "SubscriptionMetadataCommon",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "SubscriptionMetadataCommon",
+        "kind": "INPUT_OBJECT",
+        "name": "StringFilter",
         "description": null,
-        "fields": [
+        "fields": null,
+        "inputFields": [
           {
-            "name": "id",
+            "name": "contains",
             "description": null,
-            "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "ID",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "name",
+            "name": "endsWith",
             "description": null,
-            "args": [],
             "type": {
               "kind": "SCALAR",
               "name": "String",
               "ofType": null
             },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "Statistics",
-        "description": null,
-        "fields": [
-          {
-            "name": "newCommons",
-            "description": "Commons, created on that date",
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
-            },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "newJoinRequests",
-            "description": "The amount of proposals with join type, created on that date",
-            "args": [],
+            "name": "equals",
+            "description": null,
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "newFundingRequests",
-            "description": "The amount of proposals with funding type, created on that date",
-            "args": [],
+            "name": "gt",
+            "description": null,
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "newDiscussions",
-            "description": "The amount of discussions, started on that date",
-            "args": [],
+            "name": "gte",
+            "description": null,
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "newDiscussionMessages",
-            "description": "The amount of new discussion messages, send on that date",
-            "args": [],
+            "name": "lt",
+            "description": null,
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "commons",
+            "name": "lte",
             "description": null,
-            "args": [],
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "joinRequests",
+            "name": "startsWith",
             "description": null,
-            "args": [
-              {
-                "name": "onlyOpen",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
-                },
-                "defaultValue": "false",
-                "isDeprecated": false,
-                "deprecationReason": null
-              }
-            ],
             "type": {
               "kind": "SCALAR",
-              "name": "Int",
+              "name": "String",
               "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "fundingRequests",
+            "name": "in",
             "description": null,
-            "args": [
-              {
-                "name": "onlyOpen",
-                "description": null,
-                "type": {
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
                   "kind": "SCALAR",
-                  "name": "Boolean",
+                  "name": "String",
                   "ofType": null
-                },
-                "defaultValue": "false",
-                "isDeprecated": false,
-                "deprecationReason": null
+                }
               }
-            ],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "users",
+            "name": "notIn",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "String",
+                  "ofType": null
+                }
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           }
         ],
-        "inputFields": null,
-        "interfaces": [],
+        "interfaces": null,
         "enumValues": null,
         "possibleTypes": null
       },
       {
-        "kind": "OBJECT",
-        "name": "Common",
-        "description": "The common type",
-        "fields": [
+        "kind": "INPUT_OBJECT",
+        "name": "BillingDetailsInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
           {
-            "name": "id",
-            "description": "The unique identifier of the common",
-            "args": [],
+            "name": "name",
+            "description": null,
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "createdAt",
-            "description": "The date, at which the common was created",
-            "args": [],
+            "name": "city",
+            "description": null,
             "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "updatedAt",
-            "description": "The date, at which the common was last updated",
-            "args": [],
+            "name": "country",
+            "description": null,
             "type": {
-              "kind": "SCALAR",
-              "name": "Date",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "name",
-            "description": "The display name of the common",
-            "args": [],
+            "name": "line1",
+            "description": null,
             "type": {
               "kind": "NON_NULL",
               "name": null,
@@ -3390,120 +5167,183 @@
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "balance",
-            "description": "The currently available funds of the common",
-            "args": [],
+            "name": "postalCode",
+            "description": null,
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "raised",
-            "description": "The total amount of money, raised by the common",
-            "args": [],
+            "name": "line2",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "district",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateRoleInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "name",
+            "description": null,
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "Int",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "metadata",
+            "name": "displayName",
             "description": null,
-            "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "CommonMetadata",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "members",
+            "name": "description",
             "description": null,
-            "args": [],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "CommonMember",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
+            "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposals",
+            "name": "permissions",
             "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Query",
+        "description": null,
+        "fields": [
+          {
+            "name": "user",
+            "description": "Provide ID to fetch specific user or do not pass anything to get the currently authenticated user",
             "args": [
               {
-                "name": "page",
+                "name": "userId",
                 "description": null,
                 "type": {
                   "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "type",
-                "description": null,
-                "type": {
-                  "kind": "ENUM",
-                  "name": "ProposalType",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "state",
-                "description": null,
-                "type": {
-                  "kind": "ENUM",
-                  "name": "ProposalState",
+                  "name": "ID",
                   "ofType": null
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
-              },
+              }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "User",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "generateUserAuthToken",
+            "description": null,
+            "args": [
               {
-                "name": "paymentState",
+                "name": "authId",
                 "description": null,
                 "type": {
-                  "kind": "ENUM",
-                  "name": "ProposalPaymentState",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
@@ -3511,11 +5351,11 @@
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
-                "kind": "OBJECT",
-                "name": "Proposal",
+                "kind": "SCALAR",
+                "name": "String",
                 "ofType": null
               }
             },
@@ -3523,15 +5363,28 @@
             "deprecationReason": null
           },
           {
-            "name": "openJoinRequests",
+            "name": "roles",
             "description": null,
-            "args": [],
+            "args": [
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
             "type": {
-              "kind": "NON_NULL",
+              "kind": "LIST",
               "name": null,
               "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
+                "kind": "OBJECT",
+                "name": "Role",
                 "ofType": null
               }
             },
@@ -3539,45 +5392,47 @@
             "deprecationReason": null
           },
           {
-            "name": "openFundingRequests",
+            "name": "common",
             "description": null,
-            "args": [],
-            "type": {
-              "kind": "NON_NULL",
-              "name": null,
-              "ofType": {
-                "kind": "SCALAR",
-                "name": "Int",
-                "ofType": null
+            "args": [
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CommonWhereUniqueInput",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
               }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "Common",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "Query",
-        "description": null,
-        "fields": [
+          },
           {
-            "name": "user",
+            "name": "proposal",
             "description": null,
             "args": [
               {
-                "name": "id",
+                "name": "where",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "ProposalWhereUniqueInput",
                     "ofType": null
                   }
                 },
@@ -3588,43 +5443,75 @@
             ],
             "type": {
               "kind": "OBJECT",
-              "name": "User",
+              "name": "Proposal",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "users",
+            "name": "discussion",
             "description": null,
             "args": [
               {
-                "name": "page",
+                "name": "id",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
                 },
-                "defaultValue": "1",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
-              },
+              }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "Discussion",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Mutation",
+        "description": null,
+        "fields": [
+          {
+            "name": "createUser",
+            "description": "Creates new user in the system",
+            "args": [
               {
-                "name": "perPage",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateUserInput",
+                    "ofType": null
+                  }
                 },
-                "defaultValue": "10",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "OBJECT",
@@ -3636,28 +5523,32 @@
             "deprecationReason": null
           },
           {
-            "name": "wires",
+            "name": "createUserNotificationToken",
             "description": null,
             "args": [
               {
-                "name": "page",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateUserNotificationTokenInput",
+                    "ofType": null
+                  }
                 },
-                "defaultValue": "1",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "OBJECT",
-                "name": "Wire",
+                "name": "UserNotificationToken",
                 "ofType": null
               }
             },
@@ -3665,11 +5556,11 @@
             "deprecationReason": null
           },
           {
-            "name": "event",
+            "name": "voidUserNotificationToken",
             "description": null,
             "args": [
               {
-                "name": "eventId",
+                "name": "tokenId",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
@@ -3686,60 +5577,77 @@
               }
             ],
             "type": {
-              "kind": "OBJECT",
-              "name": "Event",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "UserNotificationToken",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "events",
+            "name": "createRole",
             "description": null,
             "args": [
               {
-                "name": "last",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": "10",
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "after",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateRoleInput",
+                    "ofType": null
+                  }
                 },
-                "defaultValue": "0",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
-              },
+              }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "Role",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "assignRole",
+            "description": null,
+            "args": [
               {
-                "name": "type",
+                "name": "userId",
                 "description": null,
                 "type": {
-                  "kind": "ENUM",
-                  "name": "EventType",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               },
               {
-                "name": "objectId",
+                "name": "roleId",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "ID",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
@@ -3747,24 +5655,36 @@
               }
             ],
             "type": {
-              "kind": "LIST",
-              "name": null,
-              "ofType": {
-                "kind": "OBJECT",
-                "name": "Event",
-                "ofType": null
-              }
+              "kind": "SCALAR",
+              "name": "Void",
+              "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "common",
+            "name": "unassignRole",
             "description": null,
             "args": [
               {
-                "name": "commonId",
-                "description": "The ID of the common, that you want to retrieve",
+                "name": "userId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "ID",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "roleId",
+                "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
@@ -3780,48 +5700,40 @@
               }
             ],
             "type": {
-              "kind": "OBJECT",
-              "name": "Common",
+              "kind": "SCALAR",
+              "name": "Void",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "commons",
+            "name": "createCard",
             "description": null,
             "args": [
               {
-                "name": "last",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": "10",
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "after",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateCardInput",
+                    "ofType": null
+                  }
                 },
-                "defaultValue": "0",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "OBJECT",
-                "name": "Common",
+                "name": "Card",
                 "ofType": null
               }
             },
@@ -3829,18 +5741,18 @@
             "deprecationReason": null
           },
           {
-            "name": "payout",
+            "name": "createVote",
             "description": null,
             "args": [
               {
-                "name": "id",
+                "name": "input",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateVoteInput",
                     "ofType": null
                   }
                 },
@@ -3850,36 +5762,44 @@
               }
             ],
             "type": {
-              "kind": "OBJECT",
-              "name": "Payout",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Vote",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payouts",
+            "name": "createCommon",
             "description": null,
             "args": [
               {
-                "name": "page",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateCommonInput",
+                    "ofType": null
+                  }
                 },
-                "defaultValue": "1",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "OBJECT",
-                "name": "Payout",
+                "name": "Common",
                 "ofType": null
               }
             },
@@ -3887,18 +5807,18 @@
             "deprecationReason": null
           },
           {
-            "name": "payment",
+            "name": "actOnReport",
             "description": null,
             "args": [
               {
-                "name": "id",
+                "name": "input",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "ActOnReportInput",
                     "ofType": null
                   }
                 },
@@ -3909,35 +5829,27 @@
             ],
             "type": {
               "kind": "OBJECT",
-              "name": "Payment",
+              "name": "Report",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "payments",
+            "name": "reportDiscussionMessage",
             "description": null,
             "args": [
               {
-                "name": "page",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": "1",
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "hanging",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Boolean",
-                  "ofType": null
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "ReportDiscussionMessageInput",
+                    "ofType": null
+                  }
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
@@ -3945,11 +5857,11 @@
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "OBJECT",
-                "name": "Payment",
+                "name": "Report",
                 "ofType": null
               }
             },
@@ -3957,23 +5869,11 @@
             "deprecationReason": null
           },
           {
-            "name": "balance",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "Balance",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "proposal",
+            "name": "finalizeProposal",
             "description": null,
             "args": [
               {
-                "name": "id",
+                "name": "proposalId",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
@@ -3990,84 +5890,40 @@
               }
             ],
             "type": {
-              "kind": "OBJECT",
-              "name": "Proposal",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "proposals",
-            "description": null,
+            "name": "createJoinProposal",
+            "description": "Create new proposal of type JOIN.",
             "args": [
               {
-                "name": "ids",
+                "name": "input",
                 "description": null,
                 "type": {
-                  "kind": "LIST",
+                  "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "String",
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateJoinProposalInput",
                     "ofType": null
                   }
                 },
                 "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
-              },
-              {
-                "name": "page",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": "1",
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "pageItems",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": "10",
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "type",
-                "description": null,
-                "type": {
-                  "kind": "ENUM",
-                  "name": "ProposalType",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "fundingState",
-                "description": null,
-                "type": {
-                  "kind": "ENUM",
-                  "name": "ProposalFundingState",
-                  "ofType": null
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "LIST",
+              "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "OBJECT",
@@ -4079,41 +5935,18 @@
             "deprecationReason": null
           },
           {
-            "name": "statistics",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "OBJECT",
-              "name": "Statistics",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          }
-        ],
-        "inputFields": null,
-        "interfaces": [],
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "OBJECT",
-        "name": "Mutation",
-        "description": null,
-        "fields": [
-          {
-            "name": "whitelistCommon",
+            "name": "createFundingProposal",
             "description": null,
             "args": [
               {
-                "name": "commonId",
+                "name": "input",
                 "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateFundingProposalInput",
                     "ofType": null
                   }
                 },
@@ -4123,26 +5956,30 @@
               }
             ],
             "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Proposal",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "refreshCommonMembers",
-            "description": "Refresh the common members from the events. Returns the new common member count",
+            "name": "createDiscussion",
+            "description": null,
             "args": [
               {
-                "name": "commonId",
-                "description": "The common id to refresh",
+                "name": "input",
+                "description": null,
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "ID",
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateDiscussionInput",
                     "ofType": null
                   }
                 },
@@ -4152,15 +5989,19 @@
               }
             ],
             "type": {
-              "kind": "SCALAR",
-              "name": "Int",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Discussion",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "executePayouts",
+            "name": "createDiscussionMessage",
             "description": null,
             "args": [
               {
@@ -4171,7 +6012,7 @@
                   "name": null,
                   "ofType": {
                     "kind": "INPUT_OBJECT",
-                    "name": "ExecutePayoutInput",
+                    "name": "CreateDiscussionMessageInput",
                     "ofType": null
                   }
                 },
@@ -4181,20 +6022,24 @@
               }
             ],
             "type": {
-              "kind": "OBJECT",
-              "name": "Payout",
-              "ofType": null
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "DiscussionMessage",
+                "ofType": null
+              }
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "approvePayout",
+            "name": "changeDiscussionSubscriptionType",
             "description": null,
             "args": [
               {
-                "name": "payoutId",
-                "description": null,
+                "name": "id",
+                "description": "The ID of the discussion subscription to change",
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
@@ -4209,30 +6054,14 @@
                 "deprecationReason": null
               },
               {
-                "name": "index",
-                "description": null,
-                "type": {
-                  "kind": "NON_NULL",
-                  "name": null,
-                  "ofType": {
-                    "kind": "SCALAR",
-                    "name": "Int",
-                    "ofType": null
-                  }
-                },
-                "defaultValue": null,
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "token",
-                "description": null,
+                "name": "type",
+                "description": "The new subscription type",
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "SCALAR",
-                    "name": "String",
+                    "kind": "ENUM",
+                    "name": "DiscussionSubscriptionType",
                     "ofType": null
                   }
                 },
@@ -4242,20 +6071,31 @@
               }
             ],
             "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
+              "kind": "OBJECT",
+              "name": "DiscussionSubscription",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
-          },
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Subscription",
+        "description": null,
+        "fields": [
           {
-            "name": "updatePaymentData",
+            "name": "onProposalChange",
             "description": null,
             "args": [
               {
-                "name": "id",
-                "description": null,
+                "name": "proposalId",
+                "description": "The ID of the proposal that you wish to subscribe to",
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
@@ -4268,53 +6108,29 @@
                 "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
-              },
-              {
-                "name": "trackId",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "ID",
-                  "ofType": null
-                },
-                "defaultValue": "\"8185aa06-1fe0-44e7-936e-cd262fdc22f9\"",
-                "isDeprecated": false,
-                "deprecationReason": null
               }
             ],
             "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "updatePaymentsCommonId",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "Boolean",
+              "kind": "OBJECT",
+              "name": "Proposal",
               "ofType": null
             },
             "isDeprecated": false,
             "deprecationReason": null
           },
           {
-            "name": "createIntention",
+            "name": "discussionMessageCreated",
             "description": null,
             "args": [
               {
-                "name": "input",
-                "description": null,
+                "name": "discussionId",
+                "description": "The ID of the discussion, for which messages you want to subscribe",
                 "type": {
                   "kind": "NON_NULL",
                   "name": null,
                   "ofType": {
-                    "kind": "INPUT_OBJECT",
-                    "name": "CreateIntentionInput",
+                    "kind": "SCALAR",
+                    "name": "ID",
                     "ofType": null
                   }
                 },
@@ -4325,7 +6141,19 @@
             ],
             "type": {
               "kind": "OBJECT",
-              "name": "Intention",
+              "name": "DiscussionMessage",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "notificationCreated",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "Notification",
               "ofType": null
             },
             "isDeprecated": false,
diff --git a/packages/admin/src/graphql/index.ts b/packages/admin/src/graphql/index.ts
deleted file mode 100644
index 4b3e0e1c8..000000000
--- a/packages/admin/src/graphql/index.ts
+++ /dev/null
@@ -1,2154 +0,0 @@
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-export type Maybe<T> = T | null;
-export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
-export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
-export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
-/** All built-in and custom scalars, mapped to their actual values */
-export type Scalars = {
-  ID: string;
-  String: string;
-  Boolean: boolean;
-  Int: number;
-  Float: number;
-  Date: any;
-};
-
-
-export enum CardNetwork {
-  Visa = 'visa',
-  Mastercard = 'mastercard'
-}
-
-export type Card = {
-  __typename?: 'Card';
-  /** The ID of the payment */
-  id: Scalars['ID'];
-  /** The date at witch the payment was created */
-  createdAt: Scalars['Date'];
-  /** The date at witch the payment was last updated */
-  updatedAt: Scalars['Date'];
-  circleCardId: Scalars['ID'];
-  ownerId: Scalars['ID'];
-  metadata?: Maybe<CardMetadata>;
-  verification?: Maybe<CardVerification>;
-};
-
-export type CardMetadata = {
-  __typename?: 'CardMetadata';
-  digits?: Maybe<Scalars['String']>;
-  network?: Maybe<CardNetwork>;
-  billingDetails?: Maybe<CardBillingDetails>;
-};
-
-export type CardVerification = {
-  __typename?: 'CardVerification';
-  cvv?: Maybe<Scalars['String']>;
-};
-
-export type CardBillingDetails = {
-  __typename?: 'CardBillingDetails';
-  name?: Maybe<Scalars['String']>;
-  city?: Maybe<Scalars['String']>;
-  country?: Maybe<Scalars['String']>;
-  postalCode?: Maybe<Scalars['String']>;
-  district?: Maybe<Scalars['String']>;
-  line1?: Maybe<Scalars['String']>;
-};
-
-export type User = {
-  __typename?: 'User';
-  id: Scalars['ID'];
-  firstName?: Maybe<Scalars['String']>;
-  lastName?: Maybe<Scalars['String']>;
-  email?: Maybe<Scalars['String']>;
-  photoURL?: Maybe<Scalars['String']>;
-  createdAt?: Maybe<Scalars['Date']>;
-  tokens?: Maybe<Array<Maybe<Scalars['String']>>>;
-  permissions?: Maybe<Array<Maybe<Scalars['String']>>>;
-  proposals?: Maybe<Array<Maybe<Proposal>>>;
-  subscriptions?: Maybe<Array<Maybe<Subscription>>>;
-};
-
-
-export type UserProposalsArgs = {
-  page?: Maybe<Scalars['Int']>;
-};
-
-
-export type UserSubscriptionsArgs = {
-  page?: Maybe<Scalars['Int']>;
-  status?: Maybe<SubscriptionStatus>;
-};
-
-export type Wire = {
-  __typename?: 'Wire';
-  /** The local ID of the payout */
-  id: Scalars['ID'];
-  createdAt?: Maybe<Scalars['Date']>;
-  updatedAt?: Maybe<Scalars['Date']>;
-  description?: Maybe<Scalars['String']>;
-  bank?: Maybe<WireBank>;
-  billingDetails?: Maybe<WireBillingDetailsType>;
-};
-
-export type WireBank = {
-  __typename?: 'WireBank';
-  bankName?: Maybe<Scalars['String']>;
-  city?: Maybe<Scalars['String']>;
-  country?: Maybe<Scalars['String']>;
-};
-
-export type WireBillingDetailsType = {
-  __typename?: 'WireBillingDetailsType';
-  city?: Maybe<Scalars['String']>;
-  country?: Maybe<Scalars['String']>;
-  line1?: Maybe<Scalars['String']>;
-  line2?: Maybe<Scalars['String']>;
-  name?: Maybe<Scalars['String']>;
-  postalCode?: Maybe<Scalars['String']>;
-};
-
-export enum EventType {
-  CommonCreated = 'commonCreated',
-  CommonCreationFailed = 'commonCreationFailed',
-  CommonWhitelisted = 'commonWhitelisted',
-  CommonMemberAdded = 'commonMemberAdded',
-  CommonMemberRemoved = 'commonMemberRemoved',
-  CommonUpdated = 'commonUpdated',
-  RequestToJoinCreated = 'requestToJoinCreated',
-  RequestToJoinAccepted = 'requestToJoinAccepted',
-  RequestToJoinRejected = 'requestToJoinRejected',
-  RequestToJoinExecuted = 'requestToJoinExecuted',
-  FundingRequestCreated = 'fundingRequestCreated',
-  FundingRequestRejected = 'fundingRequestRejected',
-  FundingRequestExecuted = 'fundingRequestExecuted',
-  FundingRequestAccepted = 'fundingRequestAccepted',
-  FundingRequestAcceptedInsufficientFunds = 'fundingRequestAcceptedInsufficientFunds',
-  VoteCreated = 'voteCreated',
-  PaymentCreated = 'paymentCreated',
-  PaymentConfirmed = 'paymentConfirmed',
-  PaymentFailed = 'paymentFailed',
-  PaymentPaid = 'paymentPaid',
-  PayoutCreated = 'payoutCreated',
-  PayoutApproved = 'payoutApproved',
-  PayoutExecuted = 'payoutExecuted',
-  PayoutVoided = 'payoutVoided',
-  PayoutCompleted = 'payoutCompleted',
-  PayoutFailed = 'payoutFailed',
-  CardCreated = 'cardCreated',
-  DiscussionCreated = 'discussionCreated',
-  MessageCreated = 'messageCreated',
-  SubscriptionCreated = 'subscriptionCreated',
-  SubscriptionPaymentCreated = 'subscriptionPaymentCreated',
-  SubscriptionPaymentFailed = 'subscriptionPaymentFailed',
-  SubscriptionPaymentConfirmed = 'subscriptionPaymentConfirmed',
-  SubscriptionPaymentStuck = 'subscriptionPaymentStuck',
-  SubscriptionCanceledByUser = 'subscriptionCanceledByUser',
-  SubscriptionCanceledByPaymentFailure = 'subscriptionCanceledByPaymentFailure',
-  MembershipRevoked = 'membershipRevoked',
-  DiscussionMessageReported = 'discussionMessageReported',
-  ProposalReported = 'proposalReported',
-  DiscussionReported = 'discussionReported'
-}
-
-export type Event = {
-  __typename?: 'Event';
-  /** The unique identifier of the event */
-  id: Scalars['ID'];
-  /** The type of the event */
-  type: EventType;
-  /** The date, at which the event was created */
-  createdAt: Scalars['Date'];
-  /** The date, at which the event was last updated */
-  updatedAt: Scalars['Date'];
-  /** The id of the object on which was acted to created the event */
-  objectId?: Maybe<Scalars['ID']>;
-  /** The id of the actor */
-  userId?: Maybe<Scalars['ID']>;
-  user?: Maybe<User>;
-};
-
-export enum CommonContributionType {
-  OneTime = 'oneTime',
-  Monthly = 'monthly'
-}
-
-export type CommonMember = {
-  __typename?: 'CommonMember';
-  /** The user ID of the member */
-  userId: Scalars['ID'];
-  /** The date, at witch the member joined the common */
-  joinedAt?: Maybe<Scalars['Date']>;
-  user?: Maybe<User>;
-};
-
-export type CommonMetadata = {
-  __typename?: 'CommonMetadata';
-  byline: Scalars['String'];
-  description: Scalars['String'];
-  founderId: Scalars['String'];
-  minFeeToJoin: Scalars['Int'];
-  contributionType?: Maybe<CommonContributionType>;
-};
-
-export type Payout = {
-  __typename?: 'Payout';
-  id: Scalars['ID'];
-  createdAt: Scalars['Date'];
-  updatedAt: Scalars['Date'];
-  circlePayoutId?: Maybe<Scalars['String']>;
-  amount: Scalars['Int'];
-  executed?: Maybe<Scalars['Boolean']>;
-  voided?: Maybe<Scalars['Boolean']>;
-  status?: Maybe<PayoutStatus>;
-  security?: Maybe<Array<Maybe<PayoutSecurity>>>;
-  proposalIds?: Maybe<Array<Maybe<Scalars['String']>>>;
-  proposals?: Maybe<Array<Maybe<Proposal>>>;
-};
-
-export type PayoutSecurity = {
-  __typename?: 'PayoutSecurity';
-  id?: Maybe<Scalars['Int']>;
-  redemptionAttempts?: Maybe<Scalars['Int']>;
-  redeemed?: Maybe<Scalars['Boolean']>;
-};
-
-export enum PayoutStatus {
-  Pending = 'pending',
-  Complete = 'complete',
-  Failed = 'failed'
-}
-
-export type ExecutePayoutInput = {
-  /** The ID of the the wire to witch the payout will be made */
-  wireId: Scalars['ID'];
-  /** List of the all proposals IDs that are in this batch */
-  proposalIds: Array<Scalars['ID']>;
-};
-
-export enum PaymentType {
-  OneTime = 'oneTime',
-  Subscription = 'subscription'
-}
-
-export enum PaymentSourceType {
-  Card = 'card'
-}
-
-export enum PaymentStatus {
-  Pending = 'pending',
-  Confirmed = 'confirmed',
-  Paid = 'paid',
-  Failed = 'failed'
-}
-
-export enum PaymentCurrency {
-  Usd = 'USD'
-}
-
-export type Payment = {
-  __typename?: 'Payment';
-  /** The ID of the payment */
-  id: Scalars['ID'];
-  /** The date at witch the payment was created */
-  createdAt: Scalars['Date'];
-  /** The date at witch the payment was last updated */
-  updatedAt: Scalars['Date'];
-  type: PaymentType;
-  status: PaymentStatus;
-  /** The source from witch the payment was funded */
-  source: PaymentSource;
-  amount: PaymentAmount;
-  /** The fees on the payment */
-  fees?: Maybe<PaymentFees>;
-  circlePaymentId: Scalars['ID'];
-  proposalId: Scalars['ID'];
-  userId: Scalars['ID'];
-  subscriptionId?: Maybe<Scalars['ID']>;
-  user?: Maybe<User>;
-  card?: Maybe<Card>;
-  common?: Maybe<Common>;
-  proposal?: Maybe<Proposal>;
-  subscription?: Maybe<Subscription>;
-};
-
-export type PaymentFees = {
-  __typename?: 'PaymentFees';
-  amount?: Maybe<Scalars['Int']>;
-  currency?: Maybe<PaymentCurrency>;
-};
-
-export type PaymentSource = {
-  __typename?: 'PaymentSource';
-  type: PaymentSourceType;
-  id?: Maybe<Scalars['ID']>;
-};
-
-export type PaymentAmount = {
-  __typename?: 'PaymentAmount';
-  currency?: Maybe<PaymentCurrency>;
-  amount?: Maybe<Scalars['Int']>;
-};
-
-export type Balance = {
-  __typename?: 'Balance';
-  available?: Maybe<Amount>;
-  unsettled?: Maybe<Amount>;
-};
-
-export type Amount = {
-  __typename?: 'Amount';
-  amount?: Maybe<Scalars['String']>;
-  currency?: Maybe<Scalars['String']>;
-};
-
-export enum ProposalType {
-  FundingRequest = 'fundingRequest',
-  Join = 'join'
-}
-
-export enum ProposalState {
-  PassedInsufficientBalance = 'passedInsufficientBalance',
-  Countdown = 'countdown',
-  Passed = 'passed',
-  Failed = 'failed'
-}
-
-export enum ProposalVoteOutcome {
-  Approved = 'approved',
-  Rejected = 'rejected'
-}
-
-export enum ProposalPaymentState {
-  NotAttempted = 'notAttempted',
-  NotRelevant = 'notRelevant',
-  Confirmed = 'confirmed',
-  Pending = 'pending',
-  Failed = 'failed'
-}
-
-export enum ProposalFundingState {
-  NotRelevant = 'notRelevant',
-  NotAvailable = 'notAvailable',
-  Available = 'available',
-  Funded = 'funded'
-}
-
-/** The proposals type */
-export type Proposal = {
-  __typename?: 'Proposal';
-  id: Scalars['ID'];
-  createdAt: Scalars['Date'];
-  updatedAt: Scalars['Date'];
-  commonId: Scalars['ID'];
-  proposerId: Scalars['ID'];
-  votesFor: Scalars['Int'];
-  votesAgainst: Scalars['Int'];
-  state: ProposalState;
-  description: ProposalDescription;
-  type: ProposalType;
-  paymentState?: Maybe<ProposalPaymentState>;
-  fundingState?: Maybe<ProposalFundingState>;
-  /** Details about the funding request. Exists only on funding request proposals */
-  fundingRequest?: Maybe<ProposalFunding>;
-  /** Details about the join request. Exists only on join request proposals */
-  join?: Maybe<ProposalJoin>;
-  votes?: Maybe<Array<Maybe<ProposalVote>>>;
-  common: Common;
-  proposer: User;
-};
-
-export type ProposalDescription = {
-  __typename?: 'ProposalDescription';
-  title?: Maybe<Scalars['String']>;
-  description: Scalars['String'];
-};
-
-export type ProposalFunding = {
-  __typename?: 'ProposalFunding';
-  amount: Scalars['Int'];
-};
-
-export type ProposalJoin = {
-  __typename?: 'ProposalJoin';
-  cardId: Scalars['ID'];
-  funding: Scalars['Int'];
-  fundingType?: Maybe<CommonContributionType>;
-};
-
-export type ProposalVote = {
-  __typename?: 'ProposalVote';
-  voteId: Scalars['ID'];
-  voterId: Scalars['ID'];
-  outcome: ProposalVoteOutcome;
-  voter?: Maybe<User>;
-};
-
-export type Intention = {
-  __typename?: 'Intention';
-  id: Scalars['ID'];
-  createdAt: Scalars['Date'];
-  updatedAt: Scalars['Date'];
-  type: IntentionType;
-  intention: Scalars['String'];
-};
-
-export enum IntentionType {
-  Access = 'access',
-  Request = 'request'
-}
-
-export type CreateIntentionInput = {
-  type: IntentionType;
-  intention: Scalars['String'];
-};
-
-export enum SubscriptionStatus {
-  Pending = 'pending',
-  Active = 'active',
-  CanceledByUser = 'canceledByUser',
-  CanceledByPaymentFailure = 'canceledByPaymentFailure',
-  PaymentFailed = 'paymentFailed'
-}
-
-export type Subscription = {
-  __typename?: 'Subscription';
-  id: Scalars['ID'];
-  cardId: Scalars['ID'];
-  userId: Scalars['ID'];
-  proposalId: Scalars['ID'];
-  createdAt: Scalars['Date'];
-  updatedAt: Scalars['Date'];
-  charges: Scalars['Int'];
-  amount: Scalars['Int'];
-  lastChargedAt?: Maybe<Scalars['Date']>;
-  dueDate?: Maybe<Scalars['Date']>;
-  revoked: Scalars['Boolean'];
-  status: SubscriptionStatus;
-  metadata: SubscriptionMetadata;
-};
-
-export type SubscriptionMetadata = {
-  __typename?: 'SubscriptionMetadata';
-  common?: Maybe<SubscriptionMetadataCommon>;
-};
-
-export type SubscriptionMetadataCommon = {
-  __typename?: 'SubscriptionMetadataCommon';
-  id?: Maybe<Scalars['ID']>;
-  name?: Maybe<Scalars['String']>;
-};
-
-export type Statistics = {
-  __typename?: 'Statistics';
-  /** Commons, created on that date */
-  newCommons?: Maybe<Scalars['Int']>;
-  /** The amount of proposals with join type, created on that date */
-  newJoinRequests?: Maybe<Scalars['Int']>;
-  /** The amount of proposals with funding type, created on that date */
-  newFundingRequests?: Maybe<Scalars['Int']>;
-  /** The amount of discussions, started on that date */
-  newDiscussions?: Maybe<Scalars['Int']>;
-  /** The amount of new discussion messages, send on that date */
-  newDiscussionMessages?: Maybe<Scalars['Int']>;
-  commons?: Maybe<Scalars['Int']>;
-  joinRequests?: Maybe<Scalars['Int']>;
-  fundingRequests?: Maybe<Scalars['Int']>;
-  users?: Maybe<Scalars['Int']>;
-};
-
-
-export type StatisticsJoinRequestsArgs = {
-  onlyOpen?: Maybe<Scalars['Boolean']>;
-};
-
-
-export type StatisticsFundingRequestsArgs = {
-  onlyOpen?: Maybe<Scalars['Boolean']>;
-};
-
-/** The common type */
-export type Common = {
-  __typename?: 'Common';
-  /** The unique identifier of the common */
-  id: Scalars['ID'];
-  /** The date, at which the common was created */
-  createdAt?: Maybe<Scalars['Date']>;
-  /** The date, at which the common was last updated */
-  updatedAt?: Maybe<Scalars['Date']>;
-  /** The display name of the common */
-  name: Scalars['String'];
-  /** The currently available funds of the common */
-  balance: Scalars['Int'];
-  /** The total amount of money, raised by the common */
-  raised: Scalars['Int'];
-  metadata: CommonMetadata;
-  members?: Maybe<Array<Maybe<CommonMember>>>;
-  proposals?: Maybe<Array<Maybe<Proposal>>>;
-  openJoinRequests: Scalars['Int'];
-  openFundingRequests: Scalars['Int'];
-};
-
-
-/** The common type */
-export type CommonProposalsArgs = {
-  page?: Maybe<Scalars['Int']>;
-  type?: Maybe<ProposalType>;
-  state?: Maybe<ProposalState>;
-  paymentState?: Maybe<ProposalPaymentState>;
-};
-
-export type Query = {
-  __typename?: 'Query';
-  user?: Maybe<User>;
-  users?: Maybe<Array<Maybe<User>>>;
-  wires?: Maybe<Array<Maybe<Wire>>>;
-  event?: Maybe<Event>;
-  events?: Maybe<Array<Maybe<Event>>>;
-  common?: Maybe<Common>;
-  commons?: Maybe<Array<Maybe<Common>>>;
-  payout?: Maybe<Payout>;
-  payouts?: Maybe<Array<Maybe<Payout>>>;
-  payment?: Maybe<Payment>;
-  payments?: Maybe<Array<Maybe<Payment>>>;
-  balance?: Maybe<Balance>;
-  proposal?: Maybe<Proposal>;
-  proposals?: Maybe<Array<Maybe<Proposal>>>;
-  statistics?: Maybe<Statistics>;
-};
-
-
-export type QueryUserArgs = {
-  id: Scalars['ID'];
-};
-
-
-export type QueryUsersArgs = {
-  page?: Maybe<Scalars['Int']>;
-  perPage?: Maybe<Scalars['Int']>;
-};
-
-
-export type QueryWiresArgs = {
-  page?: Maybe<Scalars['Int']>;
-};
-
-
-export type QueryEventArgs = {
-  eventId: Scalars['ID'];
-};
-
-
-export type QueryEventsArgs = {
-  last?: Maybe<Scalars['Int']>;
-  after?: Maybe<Scalars['Int']>;
-  type?: Maybe<EventType>;
-  objectId?: Maybe<Scalars['ID']>;
-};
-
-
-export type QueryCommonArgs = {
-  commonId: Scalars['ID'];
-};
-
-
-export type QueryCommonsArgs = {
-  last?: Maybe<Scalars['Int']>;
-  after?: Maybe<Scalars['Int']>;
-};
-
-
-export type QueryPayoutArgs = {
-  id: Scalars['ID'];
-};
-
-
-export type QueryPayoutsArgs = {
-  page?: Maybe<Scalars['Int']>;
-};
-
-
-export type QueryPaymentArgs = {
-  id: Scalars['ID'];
-};
-
-
-export type QueryPaymentsArgs = {
-  page?: Maybe<Scalars['Int']>;
-  hanging?: Maybe<Scalars['Boolean']>;
-};
-
-
-export type QueryProposalArgs = {
-  id: Scalars['ID'];
-};
-
-
-export type QueryProposalsArgs = {
-  ids?: Maybe<Array<Maybe<Scalars['String']>>>;
-  page?: Maybe<Scalars['Int']>;
-  pageItems?: Maybe<Scalars['Int']>;
-  type?: Maybe<ProposalType>;
-  fundingState?: Maybe<ProposalFundingState>;
-};
-
-export type Mutation = {
-  __typename?: 'Mutation';
-  whitelistCommon?: Maybe<Scalars['Boolean']>;
-  /** Refresh the common members from the events. Returns the new common member count */
-  refreshCommonMembers?: Maybe<Scalars['Int']>;
-  executePayouts?: Maybe<Payout>;
-  approvePayout?: Maybe<Scalars['Boolean']>;
-  updatePaymentData?: Maybe<Scalars['Boolean']>;
-  updatePaymentsCommonId?: Maybe<Scalars['Boolean']>;
-  createIntention?: Maybe<Intention>;
-};
-
-
-export type MutationWhitelistCommonArgs = {
-  commonId: Scalars['ID'];
-};
-
-
-export type MutationRefreshCommonMembersArgs = {
-  commonId: Scalars['ID'];
-};
-
-
-export type MutationExecutePayoutsArgs = {
-  input: ExecutePayoutInput;
-};
-
-
-export type MutationApprovePayoutArgs = {
-  payoutId: Scalars['ID'];
-  index: Scalars['Int'];
-  token: Scalars['String'];
-};
-
-
-export type MutationUpdatePaymentDataArgs = {
-  id: Scalars['ID'];
-  trackId?: Maybe<Scalars['ID']>;
-};
-
-
-export type MutationCreateIntentionArgs = {
-  input: CreateIntentionInput;
-};
-
-export type WhitelistCommonMutationVariables = Exact<{
-  commonId: Scalars['ID'];
-}>;
-
-
-export type WhitelistCommonMutation = (
-  { __typename?: 'Mutation' }
-  & Pick<Mutation, 'whitelistCommon'>
-);
-
-export type GetLatestEventsQueryVariables = Exact<{
-  last?: Maybe<Scalars['Int']>;
-  after?: Maybe<Scalars['Int']>;
-}>;
-
-
-export type GetLatestEventsQuery = (
-  { __typename?: 'Query' }
-  & { events?: Maybe<Array<Maybe<(
-    { __typename?: 'Event' }
-    & Pick<Event, 'id' | 'createdAt' | 'type'>
-    & { user?: Maybe<(
-      { __typename?: 'User' }
-      & Pick<User, 'id' | 'firstName' | 'lastName' | 'photoURL'>
-    )> }
-  )>>> }
-);
-
-export type GetPaymentsQueryVariables = Exact<{
-  page?: Maybe<Scalars['Int']>;
-}>;
-
-
-export type GetPaymentsQuery = (
-  { __typename?: 'Query' }
-  & { payments?: Maybe<Array<Maybe<(
-    { __typename?: 'Payment' }
-    & Pick<Payment, 'id' | 'type' | 'status'>
-    & { user?: Maybe<(
-      { __typename?: 'User' }
-      & Pick<User, 'id' | 'firstName' | 'lastName' | 'photoURL' | 'email'>
-    )>, amount: (
-      { __typename?: 'PaymentAmount' }
-      & Pick<PaymentAmount, 'amount' | 'currency'>
-    ) }
-  )>>> }
-);
-
-export type GetPaymentDetailsQueryVariables = Exact<{
-  paymentId: Scalars['ID'];
-}>;
-
-
-export type GetPaymentDetailsQuery = (
-  { __typename?: 'Query' }
-  & { payment?: Maybe<(
-    { __typename?: 'Payment' }
-    & Pick<Payment, 'type'>
-    & { common?: Maybe<(
-      { __typename?: 'Common' }
-      & Pick<Common, 'id' | 'name'>
-    )>, amount: (
-      { __typename?: 'PaymentAmount' }
-      & Pick<PaymentAmount, 'amount' | 'currency'>
-    ), fees?: Maybe<(
-      { __typename?: 'PaymentFees' }
-      & Pick<PaymentFees, 'amount' | 'currency'>
-    )>, card?: Maybe<(
-      { __typename?: 'Card' }
-      & Pick<Card, 'id'>
-      & { metadata?: Maybe<(
-        { __typename?: 'CardMetadata' }
-        & Pick<CardMetadata, 'digits' | 'network'>
-      )> }
-    )> }
-  )> }
-);
-
-export type GetUserPermissionsQueryVariables = Exact<{
-  userId: Scalars['ID'];
-}>;
-
-
-export type GetUserPermissionsQuery = (
-  { __typename?: 'Query' }
-  & { user?: Maybe<(
-    { __typename?: 'User' }
-    & Pick<User, 'permissions'>
-  )> }
-);
-
-export type GetCommonDetailsQueryVariables = Exact<{
-  commonId: Scalars['ID'];
-  page: Scalars['Int'];
-}>;
-
-
-export type GetCommonDetailsQuery = (
-  { __typename?: 'Query' }
-  & { common?: Maybe<(
-    { __typename?: 'Common' }
-    & Pick<Common, 'name' | 'createdAt' | 'updatedAt' | 'balance' | 'raised' | 'openFundingRequests' | 'openJoinRequests'>
-    & { metadata: (
-      { __typename?: 'CommonMetadata' }
-      & Pick<CommonMetadata, 'byline' | 'description' | 'founderId' | 'contributionType'>
-    ), members?: Maybe<Array<Maybe<(
-      { __typename?: 'CommonMember' }
-      & Pick<CommonMember, 'userId' | 'joinedAt'>
-      & { user?: Maybe<(
-        { __typename?: 'User' }
-        & Pick<User, 'firstName' | 'lastName'>
-      )> }
-    )>>>, proposals?: Maybe<Array<Maybe<(
-      { __typename?: 'Proposal' }
-      & Pick<Proposal, 'id' | 'type'>
-      & { fundingRequest?: Maybe<(
-        { __typename?: 'ProposalFunding' }
-        & Pick<ProposalFunding, 'amount'>
-      )>, join?: Maybe<(
-        { __typename?: 'ProposalJoin' }
-        & Pick<ProposalJoin, 'fundingType' | 'funding'>
-      )>, description: (
-        { __typename?: 'ProposalDescription' }
-        & Pick<ProposalDescription, 'description'>
-      ) }
-    )>>> }
-  )> }
-);
-
-export type GetCommonsHomescreenDataQueryVariables = Exact<{
-  last?: Maybe<Scalars['Int']>;
-  after?: Maybe<Scalars['Int']>;
-}>;
-
-
-export type GetCommonsHomescreenDataQuery = (
-  { __typename?: 'Query' }
-  & { commons?: Maybe<Array<Maybe<(
-    { __typename?: 'Common' }
-    & Pick<Common, 'id' | 'name' | 'raised' | 'balance' | 'createdAt' | 'updatedAt'>
-    & { members?: Maybe<Array<Maybe<(
-      { __typename?: 'CommonMember' }
-      & Pick<CommonMember, 'userId'>
-    )>>>, metadata: (
-      { __typename?: 'CommonMetadata' }
-      & Pick<CommonMetadata, 'byline' | 'description' | 'contributionType'>
-    ) }
-  )>>> }
-);
-
-export type GetDashboardDataQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetDashboardDataQuery = (
-  { __typename?: 'Query' }
-  & { statistics?: Maybe<(
-    { __typename?: 'Statistics' }
-    & Pick<Statistics, 'newCommons' | 'newJoinRequests' | 'newFundingRequests' | 'newDiscussions' | 'newDiscussionMessages'>
-  )> }
-);
-
-export type StatisticsQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type StatisticsQuery = (
-  { __typename?: 'Query' }
-  & { statistics?: Maybe<(
-    { __typename?: 'Statistics' }
-    & Pick<Statistics, 'users' | 'commons' | 'joinRequests' | 'fundingRequests'>
-  )> }
-);
-
-export type CreateIntentionMutationVariables = Exact<{
-  type: IntentionType;
-  intention: Scalars['String'];
-}>;
-
-
-export type CreateIntentionMutation = (
-  { __typename?: 'Mutation' }
-  & { createIntention?: Maybe<(
-    { __typename?: 'Intention' }
-    & Pick<Intention, 'id'>
-  )> }
-);
-
-export type GetFinancialsDataQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetFinancialsDataQuery = (
-  { __typename?: 'Query' }
-  & { balance?: Maybe<(
-    { __typename?: 'Balance' }
-    & { available?: Maybe<(
-      { __typename?: 'Amount' }
-      & Pick<Amount, 'amount' | 'currency'>
-    )>, unsettled?: Maybe<(
-      { __typename?: 'Amount' }
-      & Pick<Amount, 'amount' | 'currency'>
-    )> }
-  )>, hangingPayments?: Maybe<Array<Maybe<(
-    { __typename?: 'Payment' }
-    & Pick<Payment, 'id' | 'createdAt' | 'updatedAt' | 'status'>
-  )>>> }
-);
-
-export type GetPaymentsHomeScreenDataQueryVariables = Exact<{ [key: string]: never; }>;
-
-
-export type GetPaymentsHomeScreenDataQuery = (
-  { __typename?: 'Query' }
-  & { hangingPayments?: Maybe<Array<Maybe<(
-    { __typename?: 'Payment' }
-    & Pick<Payment, 'id' | 'createdAt' | 'updatedAt' | 'status'>
-  )>>> }
-);
-
-export type UpdatePaymentDataMutationVariables = Exact<{
-  paymentId: Scalars['ID'];
-}>;
-
-
-export type UpdatePaymentDataMutation = (
-  { __typename?: 'Mutation' }
-  & Pick<Mutation, 'updatePaymentData'>
-);
-
-export type GetConfirmPayoutDataQueryVariables = Exact<{
-  payoutId: Scalars['ID'];
-}>;
-
-
-export type GetConfirmPayoutDataQuery = (
-  { __typename?: 'Query' }
-  & { payout?: Maybe<(
-    { __typename?: 'Payout' }
-    & Pick<Payout, 'amount'>
-    & { proposals?: Maybe<Array<Maybe<(
-      { __typename?: 'Proposal' }
-      & Pick<Proposal, 'id'>
-      & { description: (
-        { __typename?: 'ProposalDescription' }
-        & Pick<ProposalDescription, 'title' | 'description'>
-      ), fundingRequest?: Maybe<(
-        { __typename?: 'ProposalFunding' }
-        & Pick<ProposalFunding, 'amount'>
-      )> }
-    )>>> }
-  )> }
-);
-
-export type ApprovePayoutMutationVariables = Exact<{
-  payoutId: Scalars['ID'];
-  token: Scalars['String'];
-  index: Scalars['Int'];
-}>;
-
-
-export type ApprovePayoutMutation = (
-  { __typename?: 'Mutation' }
-  & Pick<Mutation, 'approvePayout'>
-);
-
-export type GetProposalsSelectedForBatchQueryVariables = Exact<{
-  ids: Array<Scalars['String']> | Scalars['String'];
-}>;
-
-
-export type GetProposalsSelectedForBatchQuery = (
-  { __typename?: 'Query' }
-  & { proposals?: Maybe<Array<Maybe<(
-    { __typename?: 'Proposal' }
-    & Pick<Proposal, 'id' | 'state' | 'fundingState'>
-    & { proposer: (
-      { __typename?: 'User' }
-      & Pick<User, 'firstName' | 'lastName'>
-    ), description: (
-      { __typename?: 'ProposalDescription' }
-      & Pick<ProposalDescription, 'title' | 'description'>
-    ), common: (
-      { __typename?: 'Common' }
-      & Pick<Common, 'name'>
-    ), fundingRequest?: Maybe<(
-      { __typename?: 'ProposalFunding' }
-      & Pick<ProposalFunding, 'amount'>
-    )> }
-  )>>>, wires?: Maybe<Array<Maybe<(
-    { __typename?: 'Wire' }
-    & Pick<Wire, 'id' | 'description'>
-    & { billingDetails?: Maybe<(
-      { __typename?: 'WireBillingDetailsType' }
-      & Pick<WireBillingDetailsType, 'city' | 'country' | 'name'>
-    )> }
-  )>>> }
-);
-
-export type ExecutePayoutMutationVariables = Exact<{
-  input: ExecutePayoutInput;
-}>;
-
-
-export type ExecutePayoutMutation = (
-  { __typename?: 'Mutation' }
-  & { executePayouts?: Maybe<(
-    { __typename?: 'Payout' }
-    & Pick<Payout, 'id'>
-  )> }
-);
-
-export type GetPayoutDetailsQueryVariables = Exact<{
-  payoutId: Scalars['ID'];
-}>;
-
-
-export type GetPayoutDetailsQuery = (
-  { __typename?: 'Query' }
-  & { payout?: Maybe<(
-    { __typename?: 'Payout' }
-    & Pick<Payout, 'voided' | 'executed' | 'status'>
-    & { proposals?: Maybe<Array<Maybe<(
-      { __typename?: 'Proposal' }
-      & Pick<Proposal, 'id'>
-      & { fundingRequest?: Maybe<(
-        { __typename?: 'ProposalFunding' }
-        & Pick<ProposalFunding, 'amount'>
-      )>, description: (
-        { __typename?: 'ProposalDescription' }
-        & Pick<ProposalDescription, 'title' | 'description'>
-      ) }
-    )>>>, security?: Maybe<Array<Maybe<(
-      { __typename?: 'PayoutSecurity' }
-      & Pick<PayoutSecurity, 'id' | 'redeemed' | 'redemptionAttempts'>
-    )>>> }
-  )> }
-);
-
-export type GetPayoutsPageDataQueryVariables = Exact<{
-  fundingState?: Maybe<ProposalFundingState>;
-  fundingRequestPage?: Maybe<Scalars['Int']>;
-}>;
-
-
-export type GetPayoutsPageDataQuery = (
-  { __typename?: 'Query' }
-  & { proposals?: Maybe<Array<Maybe<(
-    { __typename?: 'Proposal' }
-    & Pick<Proposal, 'id' | 'commonId' | 'proposerId' | 'type' | 'createdAt' | 'updatedAt' | 'state' | 'fundingState'>
-    & { description: (
-      { __typename?: 'ProposalDescription' }
-      & Pick<ProposalDescription, 'title'>
-    ), fundingRequest?: Maybe<(
-      { __typename?: 'ProposalFunding' }
-      & Pick<ProposalFunding, 'amount'>
-    )> }
-  )>>>, payouts?: Maybe<Array<Maybe<(
-    { __typename?: 'Payout' }
-    & Pick<Payout, 'id' | 'amount' | 'voided' | 'executed' | 'status' | 'proposalIds'>
-  )>>> }
-);
-
-export type GetProposalDetailsQueryVariables = Exact<{
-  proposalId: Scalars['ID'];
-}>;
-
-
-export type GetProposalDetailsQuery = (
-  { __typename?: 'Query' }
-  & { proposal?: Maybe<(
-    { __typename?: 'Proposal' }
-    & Pick<Proposal, 'id' | 'type' | 'createdAt' | 'updatedAt' | 'votesFor' | 'votesAgainst' | 'state' | 'paymentState'>
-    & { join?: Maybe<(
-      { __typename?: 'ProposalJoin' }
-      & Pick<ProposalJoin, 'funding' | 'fundingType'>
-    )>, fundingRequest?: Maybe<(
-      { __typename?: 'ProposalFunding' }
-      & Pick<ProposalFunding, 'amount'>
-    )>, proposer: (
-      { __typename?: 'User' }
-      & Pick<User, 'id' | 'firstName' | 'lastName'>
-    ), common: (
-      { __typename?: 'Common' }
-      & { members?: Maybe<Array<Maybe<(
-        { __typename?: 'CommonMember' }
-        & Pick<CommonMember, 'userId'>
-      )>>> }
-    ), description: (
-      { __typename?: 'ProposalDescription' }
-      & Pick<ProposalDescription, 'description'>
-    ), votes?: Maybe<Array<Maybe<(
-      { __typename?: 'ProposalVote' }
-      & Pick<ProposalVote, 'outcome'>
-      & { voter?: Maybe<(
-        { __typename?: 'User' }
-        & Pick<User, 'id' | 'firstName' | 'lastName'>
-      )> }
-    )>>> }
-  )> }
-);
-
-export type GetProposalsHomescreenQueryVariables = Exact<{
-  fundingPage?: Maybe<Scalars['Int']>;
-  joinPage?: Maybe<Scalars['Int']>;
-}>;
-
-
-export type GetProposalsHomescreenQuery = (
-  { __typename?: 'Query' }
-  & { funding?: Maybe<Array<Maybe<(
-    { __typename?: 'Proposal' }
-    & Pick<Proposal, 'id' | 'commonId' | 'votesFor' | 'votesAgainst'>
-    & { votes?: Maybe<Array<Maybe<(
-      { __typename?: 'ProposalVote' }
-      & Pick<ProposalVote, 'outcome'>
-    )>>>, description: (
-      { __typename?: 'ProposalDescription' }
-      & Pick<ProposalDescription, 'title' | 'description'>
-    ), fundingRequest?: Maybe<(
-      { __typename?: 'ProposalFunding' }
-      & Pick<ProposalFunding, 'amount'>
-    )> }
-  )>>>, join?: Maybe<Array<Maybe<(
-    { __typename?: 'Proposal' }
-    & Pick<Proposal, 'id' | 'commonId'>
-    & { description: (
-      { __typename?: 'ProposalDescription' }
-      & Pick<ProposalDescription, 'title' | 'description'>
-    ), join?: Maybe<(
-      { __typename?: 'ProposalJoin' }
-      & Pick<ProposalJoin, 'funding' | 'fundingType'>
-    )> }
-  )>>> }
-);
-
-export type GetUserDetailsQueryQueryVariables = Exact<{
-  userId: Scalars['ID'];
-}>;
-
-
-export type GetUserDetailsQueryQuery = (
-  { __typename?: 'Query' }
-  & { user?: Maybe<(
-    { __typename?: 'User' }
-    & Pick<User, 'id' | 'firstName' | 'lastName' | 'email' | 'createdAt' | 'photoURL'>
-    & { proposals?: Maybe<Array<Maybe<(
-      { __typename?: 'Proposal' }
-      & Pick<Proposal, 'id' | 'type' | 'state' | 'paymentState'>
-      & { description: (
-        { __typename?: 'ProposalDescription' }
-        & Pick<ProposalDescription, 'title'>
-      ) }
-    )>>>, subscriptions?: Maybe<Array<Maybe<(
-      { __typename?: 'Subscription' }
-      & Pick<Subscription, 'id' | 'amount' | 'status' | 'revoked' | 'createdAt' | 'updatedAt' | 'lastChargedAt' | 'dueDate'>
-      & { metadata: (
-        { __typename?: 'SubscriptionMetadata' }
-        & { common?: Maybe<(
-          { __typename?: 'SubscriptionMetadataCommon' }
-          & Pick<SubscriptionMetadataCommon, 'id' | 'name'>
-        )> }
-      ) }
-    )>>> }
-  )> }
-);
-
-export type GetUsersHomepageDataQueryVariables = Exact<{
-  page?: Maybe<Scalars['Int']>;
-  perPage?: Maybe<Scalars['Int']>;
-}>;
-
-
-export type GetUsersHomepageDataQuery = (
-  { __typename?: 'Query' }
-  & { users?: Maybe<Array<Maybe<(
-    { __typename?: 'User' }
-    & Pick<User, 'id' | 'photoURL' | 'email' | 'firstName' | 'lastName' | 'createdAt'>
-  )>>> }
-);
-
-
-export const WhitelistCommonDocument = gql`
-    mutation whitelistCommon($commonId: ID!) {
-  whitelistCommon(commonId: $commonId)
-}
-    `;
-export type WhitelistCommonMutationFn = Apollo.MutationFunction<WhitelistCommonMutation, WhitelistCommonMutationVariables>;
-
-/**
- * __useWhitelistCommonMutation__
- *
- * To run a mutation, you first call `useWhitelistCommonMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useWhitelistCommonMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [whitelistCommonMutation, { data, loading, error }] = useWhitelistCommonMutation({
- *   variables: {
- *      commonId: // value for 'commonId'
- *   },
- * });
- */
-export function useWhitelistCommonMutation(baseOptions?: Apollo.MutationHookOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>) {
-        return Apollo.useMutation<WhitelistCommonMutation, WhitelistCommonMutationVariables>(WhitelistCommonDocument, baseOptions);
-      }
-export type WhitelistCommonMutationHookResult = ReturnType<typeof useWhitelistCommonMutation>;
-export type WhitelistCommonMutationResult = Apollo.MutationResult<WhitelistCommonMutation>;
-export type WhitelistCommonMutationOptions = Apollo.BaseMutationOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>;
-export const GetLatestEventsDocument = gql`
-    query GetLatestEvents($last: Int = 10, $after: Int = 0) {
-  events(last: $last, after: $after) {
-    id
-    createdAt
-    type
-    user {
-      id
-      firstName
-      lastName
-      photoURL
-    }
-  }
-}
-    `;
-
-/**
- * __useGetLatestEventsQuery__
- *
- * To run a query within a React component, call `useGetLatestEventsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetLatestEventsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetLatestEventsQuery({
- *   variables: {
- *      last: // value for 'last'
- *      after: // value for 'after'
- *   },
- * });
- */
-export function useGetLatestEventsQuery(baseOptions?: Apollo.QueryHookOptions<GetLatestEventsQuery, GetLatestEventsQueryVariables>) {
-        return Apollo.useQuery<GetLatestEventsQuery, GetLatestEventsQueryVariables>(GetLatestEventsDocument, baseOptions);
-      }
-export function useGetLatestEventsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetLatestEventsQuery, GetLatestEventsQueryVariables>) {
-          return Apollo.useLazyQuery<GetLatestEventsQuery, GetLatestEventsQueryVariables>(GetLatestEventsDocument, baseOptions);
-        }
-export type GetLatestEventsQueryHookResult = ReturnType<typeof useGetLatestEventsQuery>;
-export type GetLatestEventsLazyQueryHookResult = ReturnType<typeof useGetLatestEventsLazyQuery>;
-export type GetLatestEventsQueryResult = Apollo.QueryResult<GetLatestEventsQuery, GetLatestEventsQueryVariables>;
-export const GetPaymentsDocument = gql`
-    query GetPayments($page: Int = 1) {
-  payments: payments(page: $page) {
-    id
-    type
-    status
-    user {
-      id
-      firstName
-      lastName
-      photoURL
-      email
-    }
-    amount {
-      amount
-      currency
-    }
-  }
-}
-    `;
-
-/**
- * __useGetPaymentsQuery__
- *
- * To run a query within a React component, call `useGetPaymentsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetPaymentsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetPaymentsQuery({
- *   variables: {
- *      page: // value for 'page'
- *   },
- * });
- */
-export function useGetPaymentsQuery(baseOptions?: Apollo.QueryHookOptions<GetPaymentsQuery, GetPaymentsQueryVariables>) {
-        return Apollo.useQuery<GetPaymentsQuery, GetPaymentsQueryVariables>(GetPaymentsDocument, baseOptions);
-      }
-export function useGetPaymentsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetPaymentsQuery, GetPaymentsQueryVariables>) {
-          return Apollo.useLazyQuery<GetPaymentsQuery, GetPaymentsQueryVariables>(GetPaymentsDocument, baseOptions);
-        }
-export type GetPaymentsQueryHookResult = ReturnType<typeof useGetPaymentsQuery>;
-export type GetPaymentsLazyQueryHookResult = ReturnType<typeof useGetPaymentsLazyQuery>;
-export type GetPaymentsQueryResult = Apollo.QueryResult<GetPaymentsQuery, GetPaymentsQueryVariables>;
-export const GetPaymentDetailsDocument = gql`
-    query GetPaymentDetails($paymentId: ID!) {
-  payment(id: $paymentId) {
-    type
-    common {
-      id
-      name
-    }
-    amount {
-      amount
-      currency
-    }
-    fees {
-      amount
-      currency
-    }
-    card {
-      id
-      metadata {
-        digits
-        network
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useGetPaymentDetailsQuery__
- *
- * To run a query within a React component, call `useGetPaymentDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetPaymentDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetPaymentDetailsQuery({
- *   variables: {
- *      paymentId: // value for 'paymentId'
- *   },
- * });
- */
-export function useGetPaymentDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetPaymentDetailsQuery, GetPaymentDetailsQueryVariables>) {
-        return Apollo.useQuery<GetPaymentDetailsQuery, GetPaymentDetailsQueryVariables>(GetPaymentDetailsDocument, baseOptions);
-      }
-export function useGetPaymentDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetPaymentDetailsQuery, GetPaymentDetailsQueryVariables>) {
-          return Apollo.useLazyQuery<GetPaymentDetailsQuery, GetPaymentDetailsQueryVariables>(GetPaymentDetailsDocument, baseOptions);
-        }
-export type GetPaymentDetailsQueryHookResult = ReturnType<typeof useGetPaymentDetailsQuery>;
-export type GetPaymentDetailsLazyQueryHookResult = ReturnType<typeof useGetPaymentDetailsLazyQuery>;
-export type GetPaymentDetailsQueryResult = Apollo.QueryResult<GetPaymentDetailsQuery, GetPaymentDetailsQueryVariables>;
-export const GetUserPermissionsDocument = gql`
-    query getUserPermissions($userId: ID!) {
-  user(id: $userId) {
-    permissions
-  }
-}
-    `;
-
-/**
- * __useGetUserPermissionsQuery__
- *
- * To run a query within a React component, call `useGetUserPermissionsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetUserPermissionsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetUserPermissionsQuery({
- *   variables: {
- *      userId: // value for 'userId'
- *   },
- * });
- */
-export function useGetUserPermissionsQuery(baseOptions: Apollo.QueryHookOptions<GetUserPermissionsQuery, GetUserPermissionsQueryVariables>) {
-        return Apollo.useQuery<GetUserPermissionsQuery, GetUserPermissionsQueryVariables>(GetUserPermissionsDocument, baseOptions);
-      }
-export function useGetUserPermissionsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUserPermissionsQuery, GetUserPermissionsQueryVariables>) {
-          return Apollo.useLazyQuery<GetUserPermissionsQuery, GetUserPermissionsQueryVariables>(GetUserPermissionsDocument, baseOptions);
-        }
-export type GetUserPermissionsQueryHookResult = ReturnType<typeof useGetUserPermissionsQuery>;
-export type GetUserPermissionsLazyQueryHookResult = ReturnType<typeof useGetUserPermissionsLazyQuery>;
-export type GetUserPermissionsQueryResult = Apollo.QueryResult<GetUserPermissionsQuery, GetUserPermissionsQueryVariables>;
-export const GetCommonDetailsDocument = gql`
-    query getCommonDetails($commonId: ID!, $page: Int!) {
-  common(commonId: $commonId) {
-    name
-    createdAt
-    updatedAt
-    balance
-    raised
-    openFundingRequests
-    openJoinRequests
-    metadata {
-      byline
-      description
-      founderId
-      contributionType
-    }
-    members {
-      userId
-      joinedAt
-      user {
-        firstName
-        lastName
-      }
-    }
-    proposals(page: $page) {
-      id
-      type
-      fundingRequest {
-        amount
-      }
-      join {
-        fundingType
-        funding
-      }
-      description {
-        description
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useGetCommonDetailsQuery__
- *
- * To run a query within a React component, call `useGetCommonDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetCommonDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetCommonDetailsQuery({
- *   variables: {
- *      commonId: // value for 'commonId'
- *      page: // value for 'page'
- *   },
- * });
- */
-export function useGetCommonDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
-        return Apollo.useQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
-      }
-export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
-          return Apollo.useLazyQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
-        }
-export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
-export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
-export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
-export const GetCommonsHomescreenDataDocument = gql`
-    query getCommonsHomescreenData($last: Int, $after: Int) {
-  commons(last: $last, after: $after) {
-    id
-    name
-    raised
-    balance
-    createdAt
-    updatedAt
-    members {
-      userId
-    }
-    metadata {
-      byline
-      description
-      contributionType
-    }
-  }
-}
-    `;
-
-/**
- * __useGetCommonsHomescreenDataQuery__
- *
- * To run a query within a React component, call `useGetCommonsHomescreenDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetCommonsHomescreenDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetCommonsHomescreenDataQuery({
- *   variables: {
- *      last: // value for 'last'
- *      after: // value for 'after'
- *   },
- * });
- */
-export function useGetCommonsHomescreenDataQuery(baseOptions?: Apollo.QueryHookOptions<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>) {
-        return Apollo.useQuery<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>(GetCommonsHomescreenDataDocument, baseOptions);
-      }
-export function useGetCommonsHomescreenDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>(GetCommonsHomescreenDataDocument, baseOptions);
-        }
-export type GetCommonsHomescreenDataQueryHookResult = ReturnType<typeof useGetCommonsHomescreenDataQuery>;
-export type GetCommonsHomescreenDataLazyQueryHookResult = ReturnType<typeof useGetCommonsHomescreenDataLazyQuery>;
-export type GetCommonsHomescreenDataQueryResult = Apollo.QueryResult<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>;
-export const GetDashboardDataDocument = gql`
-    query getDashboardData {
-  statistics {
-    newCommons
-    newJoinRequests
-    newFundingRequests
-    newDiscussions
-    newDiscussionMessages
-  }
-}
-    `;
-
-/**
- * __useGetDashboardDataQuery__
- *
- * To run a query within a React component, call `useGetDashboardDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetDashboardDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetDashboardDataQuery({
- *   variables: {
- *   },
- * });
- */
-export function useGetDashboardDataQuery(baseOptions?: Apollo.QueryHookOptions<GetDashboardDataQuery, GetDashboardDataQueryVariables>) {
-        return Apollo.useQuery<GetDashboardDataQuery, GetDashboardDataQueryVariables>(GetDashboardDataDocument, baseOptions);
-      }
-export function useGetDashboardDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetDashboardDataQuery, GetDashboardDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetDashboardDataQuery, GetDashboardDataQueryVariables>(GetDashboardDataDocument, baseOptions);
-        }
-export type GetDashboardDataQueryHookResult = ReturnType<typeof useGetDashboardDataQuery>;
-export type GetDashboardDataLazyQueryHookResult = ReturnType<typeof useGetDashboardDataLazyQuery>;
-export type GetDashboardDataQueryResult = Apollo.QueryResult<GetDashboardDataQuery, GetDashboardDataQueryVariables>;
-export const StatisticsDocument = gql`
-    query Statistics {
-  statistics {
-    users
-    commons
-    joinRequests
-    fundingRequests
-  }
-}
-    `;
-
-/**
- * __useStatisticsQuery__
- *
- * To run a query within a React component, call `useStatisticsQuery` and pass it any options that fit your needs.
- * When your component renders, `useStatisticsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useStatisticsQuery({
- *   variables: {
- *   },
- * });
- */
-export function useStatisticsQuery(baseOptions?: Apollo.QueryHookOptions<StatisticsQuery, StatisticsQueryVariables>) {
-        return Apollo.useQuery<StatisticsQuery, StatisticsQueryVariables>(StatisticsDocument, baseOptions);
-      }
-export function useStatisticsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<StatisticsQuery, StatisticsQueryVariables>) {
-          return Apollo.useLazyQuery<StatisticsQuery, StatisticsQueryVariables>(StatisticsDocument, baseOptions);
-        }
-export type StatisticsQueryHookResult = ReturnType<typeof useStatisticsQuery>;
-export type StatisticsLazyQueryHookResult = ReturnType<typeof useStatisticsLazyQuery>;
-export type StatisticsQueryResult = Apollo.QueryResult<StatisticsQuery, StatisticsQueryVariables>;
-export const CreateIntentionDocument = gql`
-    mutation createIntention($type: IntentionType!, $intention: String!) {
-  createIntention(input: {type: $type, intention: $intention}) {
-    id
-  }
-}
-    `;
-export type CreateIntentionMutationFn = Apollo.MutationFunction<CreateIntentionMutation, CreateIntentionMutationVariables>;
-
-/**
- * __useCreateIntentionMutation__
- *
- * To run a mutation, you first call `useCreateIntentionMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useCreateIntentionMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [createIntentionMutation, { data, loading, error }] = useCreateIntentionMutation({
- *   variables: {
- *      type: // value for 'type'
- *      intention: // value for 'intention'
- *   },
- * });
- */
-export function useCreateIntentionMutation(baseOptions?: Apollo.MutationHookOptions<CreateIntentionMutation, CreateIntentionMutationVariables>) {
-        return Apollo.useMutation<CreateIntentionMutation, CreateIntentionMutationVariables>(CreateIntentionDocument, baseOptions);
-      }
-export type CreateIntentionMutationHookResult = ReturnType<typeof useCreateIntentionMutation>;
-export type CreateIntentionMutationResult = Apollo.MutationResult<CreateIntentionMutation>;
-export type CreateIntentionMutationOptions = Apollo.BaseMutationOptions<CreateIntentionMutation, CreateIntentionMutationVariables>;
-export const GetFinancialsDataDocument = gql`
-    query GetFinancialsData {
-  balance {
-    available {
-      amount
-      currency
-    }
-    unsettled {
-      amount
-      currency
-    }
-  }
-  hangingPayments: payments(hanging: true) {
-    id
-    createdAt
-    updatedAt
-    status
-  }
-}
-    `;
-
-/**
- * __useGetFinancialsDataQuery__
- *
- * To run a query within a React component, call `useGetFinancialsDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetFinancialsDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetFinancialsDataQuery({
- *   variables: {
- *   },
- * });
- */
-export function useGetFinancialsDataQuery(baseOptions?: Apollo.QueryHookOptions<GetFinancialsDataQuery, GetFinancialsDataQueryVariables>) {
-        return Apollo.useQuery<GetFinancialsDataQuery, GetFinancialsDataQueryVariables>(GetFinancialsDataDocument, baseOptions);
-      }
-export function useGetFinancialsDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetFinancialsDataQuery, GetFinancialsDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetFinancialsDataQuery, GetFinancialsDataQueryVariables>(GetFinancialsDataDocument, baseOptions);
-        }
-export type GetFinancialsDataQueryHookResult = ReturnType<typeof useGetFinancialsDataQuery>;
-export type GetFinancialsDataLazyQueryHookResult = ReturnType<typeof useGetFinancialsDataLazyQuery>;
-export type GetFinancialsDataQueryResult = Apollo.QueryResult<GetFinancialsDataQuery, GetFinancialsDataQueryVariables>;
-export const GetPaymentsHomeScreenDataDocument = gql`
-    query GetPaymentsHomeScreenData {
-  hangingPayments: payments(hanging: true) {
-    id
-    createdAt
-    updatedAt
-    status
-  }
-}
-    `;
-
-/**
- * __useGetPaymentsHomeScreenDataQuery__
- *
- * To run a query within a React component, call `useGetPaymentsHomeScreenDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetPaymentsHomeScreenDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetPaymentsHomeScreenDataQuery({
- *   variables: {
- *   },
- * });
- */
-export function useGetPaymentsHomeScreenDataQuery(baseOptions?: Apollo.QueryHookOptions<GetPaymentsHomeScreenDataQuery, GetPaymentsHomeScreenDataQueryVariables>) {
-        return Apollo.useQuery<GetPaymentsHomeScreenDataQuery, GetPaymentsHomeScreenDataQueryVariables>(GetPaymentsHomeScreenDataDocument, baseOptions);
-      }
-export function useGetPaymentsHomeScreenDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetPaymentsHomeScreenDataQuery, GetPaymentsHomeScreenDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetPaymentsHomeScreenDataQuery, GetPaymentsHomeScreenDataQueryVariables>(GetPaymentsHomeScreenDataDocument, baseOptions);
-        }
-export type GetPaymentsHomeScreenDataQueryHookResult = ReturnType<typeof useGetPaymentsHomeScreenDataQuery>;
-export type GetPaymentsHomeScreenDataLazyQueryHookResult = ReturnType<typeof useGetPaymentsHomeScreenDataLazyQuery>;
-export type GetPaymentsHomeScreenDataQueryResult = Apollo.QueryResult<GetPaymentsHomeScreenDataQuery, GetPaymentsHomeScreenDataQueryVariables>;
-export const UpdatePaymentDataDocument = gql`
-    mutation UpdatePaymentData($paymentId: ID!) {
-  updatePaymentData(id: $paymentId)
-}
-    `;
-export type UpdatePaymentDataMutationFn = Apollo.MutationFunction<UpdatePaymentDataMutation, UpdatePaymentDataMutationVariables>;
-
-/**
- * __useUpdatePaymentDataMutation__
- *
- * To run a mutation, you first call `useUpdatePaymentDataMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useUpdatePaymentDataMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [updatePaymentDataMutation, { data, loading, error }] = useUpdatePaymentDataMutation({
- *   variables: {
- *      paymentId: // value for 'paymentId'
- *   },
- * });
- */
-export function useUpdatePaymentDataMutation(baseOptions?: Apollo.MutationHookOptions<UpdatePaymentDataMutation, UpdatePaymentDataMutationVariables>) {
-        return Apollo.useMutation<UpdatePaymentDataMutation, UpdatePaymentDataMutationVariables>(UpdatePaymentDataDocument, baseOptions);
-      }
-export type UpdatePaymentDataMutationHookResult = ReturnType<typeof useUpdatePaymentDataMutation>;
-export type UpdatePaymentDataMutationResult = Apollo.MutationResult<UpdatePaymentDataMutation>;
-export type UpdatePaymentDataMutationOptions = Apollo.BaseMutationOptions<UpdatePaymentDataMutation, UpdatePaymentDataMutationVariables>;
-export const GetConfirmPayoutDataDocument = gql`
-    query GetConfirmPayoutData($payoutId: ID!) {
-  payout(id: $payoutId) {
-    amount
-    proposals {
-      id
-      description {
-        title
-        description
-      }
-      fundingRequest {
-        amount
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useGetConfirmPayoutDataQuery__
- *
- * To run a query within a React component, call `useGetConfirmPayoutDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetConfirmPayoutDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetConfirmPayoutDataQuery({
- *   variables: {
- *      payoutId: // value for 'payoutId'
- *   },
- * });
- */
-export function useGetConfirmPayoutDataQuery(baseOptions: Apollo.QueryHookOptions<GetConfirmPayoutDataQuery, GetConfirmPayoutDataQueryVariables>) {
-        return Apollo.useQuery<GetConfirmPayoutDataQuery, GetConfirmPayoutDataQueryVariables>(GetConfirmPayoutDataDocument, baseOptions);
-      }
-export function useGetConfirmPayoutDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetConfirmPayoutDataQuery, GetConfirmPayoutDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetConfirmPayoutDataQuery, GetConfirmPayoutDataQueryVariables>(GetConfirmPayoutDataDocument, baseOptions);
-        }
-export type GetConfirmPayoutDataQueryHookResult = ReturnType<typeof useGetConfirmPayoutDataQuery>;
-export type GetConfirmPayoutDataLazyQueryHookResult = ReturnType<typeof useGetConfirmPayoutDataLazyQuery>;
-export type GetConfirmPayoutDataQueryResult = Apollo.QueryResult<GetConfirmPayoutDataQuery, GetConfirmPayoutDataQueryVariables>;
-export const ApprovePayoutDocument = gql`
-    mutation ApprovePayout($payoutId: ID!, $token: String!, $index: Int!) {
-  approvePayout(payoutId: $payoutId, token: $token, index: $index)
-}
-    `;
-export type ApprovePayoutMutationFn = Apollo.MutationFunction<ApprovePayoutMutation, ApprovePayoutMutationVariables>;
-
-/**
- * __useApprovePayoutMutation__
- *
- * To run a mutation, you first call `useApprovePayoutMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useApprovePayoutMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [approvePayoutMutation, { data, loading, error }] = useApprovePayoutMutation({
- *   variables: {
- *      payoutId: // value for 'payoutId'
- *      token: // value for 'token'
- *      index: // value for 'index'
- *   },
- * });
- */
-export function useApprovePayoutMutation(baseOptions?: Apollo.MutationHookOptions<ApprovePayoutMutation, ApprovePayoutMutationVariables>) {
-        return Apollo.useMutation<ApprovePayoutMutation, ApprovePayoutMutationVariables>(ApprovePayoutDocument, baseOptions);
-      }
-export type ApprovePayoutMutationHookResult = ReturnType<typeof useApprovePayoutMutation>;
-export type ApprovePayoutMutationResult = Apollo.MutationResult<ApprovePayoutMutation>;
-export type ApprovePayoutMutationOptions = Apollo.BaseMutationOptions<ApprovePayoutMutation, ApprovePayoutMutationVariables>;
-export const GetProposalsSelectedForBatchDocument = gql`
-    query getProposalsSelectedForBatch($ids: [String!]!) {
-  proposals(ids: $ids) {
-    id
-    state
-    fundingState
-    proposer {
-      firstName
-      lastName
-    }
-    description {
-      title
-      description
-    }
-    common {
-      name
-    }
-    fundingRequest {
-      amount
-    }
-  }
-  wires {
-    id
-    description
-    billingDetails {
-      city
-      country
-      name
-    }
-  }
-}
-    `;
-
-/**
- * __useGetProposalsSelectedForBatchQuery__
- *
- * To run a query within a React component, call `useGetProposalsSelectedForBatchQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetProposalsSelectedForBatchQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetProposalsSelectedForBatchQuery({
- *   variables: {
- *      ids: // value for 'ids'
- *   },
- * });
- */
-export function useGetProposalsSelectedForBatchQuery(baseOptions: Apollo.QueryHookOptions<GetProposalsSelectedForBatchQuery, GetProposalsSelectedForBatchQueryVariables>) {
-        return Apollo.useQuery<GetProposalsSelectedForBatchQuery, GetProposalsSelectedForBatchQueryVariables>(GetProposalsSelectedForBatchDocument, baseOptions);
-      }
-export function useGetProposalsSelectedForBatchLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalsSelectedForBatchQuery, GetProposalsSelectedForBatchQueryVariables>) {
-          return Apollo.useLazyQuery<GetProposalsSelectedForBatchQuery, GetProposalsSelectedForBatchQueryVariables>(GetProposalsSelectedForBatchDocument, baseOptions);
-        }
-export type GetProposalsSelectedForBatchQueryHookResult = ReturnType<typeof useGetProposalsSelectedForBatchQuery>;
-export type GetProposalsSelectedForBatchLazyQueryHookResult = ReturnType<typeof useGetProposalsSelectedForBatchLazyQuery>;
-export type GetProposalsSelectedForBatchQueryResult = Apollo.QueryResult<GetProposalsSelectedForBatchQuery, GetProposalsSelectedForBatchQueryVariables>;
-export const ExecutePayoutDocument = gql`
-    mutation ExecutePayout($input: ExecutePayoutInput!) {
-  executePayouts(input: $input) {
-    id
-  }
-}
-    `;
-export type ExecutePayoutMutationFn = Apollo.MutationFunction<ExecutePayoutMutation, ExecutePayoutMutationVariables>;
-
-/**
- * __useExecutePayoutMutation__
- *
- * To run a mutation, you first call `useExecutePayoutMutation` within a React component and pass it any options that fit your needs.
- * When your component renders, `useExecutePayoutMutation` returns a tuple that includes:
- * - A mutate function that you can call at any time to execute the mutation
- * - An object with fields that represent the current status of the mutation's execution
- *
- * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
- *
- * @example
- * const [executePayoutMutation, { data, loading, error }] = useExecutePayoutMutation({
- *   variables: {
- *      input: // value for 'input'
- *   },
- * });
- */
-export function useExecutePayoutMutation(baseOptions?: Apollo.MutationHookOptions<ExecutePayoutMutation, ExecutePayoutMutationVariables>) {
-        return Apollo.useMutation<ExecutePayoutMutation, ExecutePayoutMutationVariables>(ExecutePayoutDocument, baseOptions);
-      }
-export type ExecutePayoutMutationHookResult = ReturnType<typeof useExecutePayoutMutation>;
-export type ExecutePayoutMutationResult = Apollo.MutationResult<ExecutePayoutMutation>;
-export type ExecutePayoutMutationOptions = Apollo.BaseMutationOptions<ExecutePayoutMutation, ExecutePayoutMutationVariables>;
-export const GetPayoutDetailsDocument = gql`
-    query GetPayoutDetails($payoutId: ID!) {
-  payout(id: $payoutId) {
-    voided
-    executed
-    status
-    proposals {
-      id
-      fundingRequest {
-        amount
-      }
-      description {
-        title
-        description
-      }
-    }
-    security {
-      id
-      redeemed
-      redemptionAttempts
-    }
-  }
-}
-    `;
-
-/**
- * __useGetPayoutDetailsQuery__
- *
- * To run a query within a React component, call `useGetPayoutDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetPayoutDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetPayoutDetailsQuery({
- *   variables: {
- *      payoutId: // value for 'payoutId'
- *   },
- * });
- */
-export function useGetPayoutDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetPayoutDetailsQuery, GetPayoutDetailsQueryVariables>) {
-        return Apollo.useQuery<GetPayoutDetailsQuery, GetPayoutDetailsQueryVariables>(GetPayoutDetailsDocument, baseOptions);
-      }
-export function useGetPayoutDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetPayoutDetailsQuery, GetPayoutDetailsQueryVariables>) {
-          return Apollo.useLazyQuery<GetPayoutDetailsQuery, GetPayoutDetailsQueryVariables>(GetPayoutDetailsDocument, baseOptions);
-        }
-export type GetPayoutDetailsQueryHookResult = ReturnType<typeof useGetPayoutDetailsQuery>;
-export type GetPayoutDetailsLazyQueryHookResult = ReturnType<typeof useGetPayoutDetailsLazyQuery>;
-export type GetPayoutDetailsQueryResult = Apollo.QueryResult<GetPayoutDetailsQuery, GetPayoutDetailsQueryVariables>;
-export const GetPayoutsPageDataDocument = gql`
-    query getPayoutsPageData($fundingState: ProposalFundingState, $fundingRequestPage: Int) {
-  proposals(
-    type: fundingRequest
-    page: $fundingRequestPage
-    fundingState: $fundingState
-  ) {
-    id
-    commonId
-    proposerId
-    type
-    description {
-      title
-    }
-    fundingRequest {
-      amount
-    }
-    createdAt
-    updatedAt
-    state
-    fundingState
-  }
-  payouts {
-    id
-    amount
-    voided
-    executed
-    status
-    proposalIds
-  }
-}
-    `;
-
-/**
- * __useGetPayoutsPageDataQuery__
- *
- * To run a query within a React component, call `useGetPayoutsPageDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetPayoutsPageDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetPayoutsPageDataQuery({
- *   variables: {
- *      fundingState: // value for 'fundingState'
- *      fundingRequestPage: // value for 'fundingRequestPage'
- *   },
- * });
- */
-export function useGetPayoutsPageDataQuery(baseOptions?: Apollo.QueryHookOptions<GetPayoutsPageDataQuery, GetPayoutsPageDataQueryVariables>) {
-        return Apollo.useQuery<GetPayoutsPageDataQuery, GetPayoutsPageDataQueryVariables>(GetPayoutsPageDataDocument, baseOptions);
-      }
-export function useGetPayoutsPageDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetPayoutsPageDataQuery, GetPayoutsPageDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetPayoutsPageDataQuery, GetPayoutsPageDataQueryVariables>(GetPayoutsPageDataDocument, baseOptions);
-        }
-export type GetPayoutsPageDataQueryHookResult = ReturnType<typeof useGetPayoutsPageDataQuery>;
-export type GetPayoutsPageDataLazyQueryHookResult = ReturnType<typeof useGetPayoutsPageDataLazyQuery>;
-export type GetPayoutsPageDataQueryResult = Apollo.QueryResult<GetPayoutsPageDataQuery, GetPayoutsPageDataQueryVariables>;
-export const GetProposalDetailsDocument = gql`
-    query getProposalDetails($proposalId: ID!) {
-  proposal(id: $proposalId) {
-    id
-    join {
-      funding
-      fundingType
-    }
-    fundingRequest {
-      amount
-    }
-    type
-    createdAt
-    updatedAt
-    votesFor
-    votesAgainst
-    state
-    paymentState
-    proposer {
-      id
-      firstName
-      lastName
-    }
-    common {
-      members {
-        userId
-      }
-    }
-    description {
-      description
-    }
-    votes {
-      outcome
-      voter {
-        id
-        firstName
-        lastName
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useGetProposalDetailsQuery__
- *
- * To run a query within a React component, call `useGetProposalDetailsQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetProposalDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetProposalDetailsQuery({
- *   variables: {
- *      proposalId: // value for 'proposalId'
- *   },
- * });
- */
-export function useGetProposalDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
-        return Apollo.useQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
-      }
-export function useGetProposalDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
-          return Apollo.useLazyQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
-        }
-export type GetProposalDetailsQueryHookResult = ReturnType<typeof useGetProposalDetailsQuery>;
-export type GetProposalDetailsLazyQueryHookResult = ReturnType<typeof useGetProposalDetailsLazyQuery>;
-export type GetProposalDetailsQueryResult = Apollo.QueryResult<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>;
-export const GetProposalsHomescreenDocument = gql`
-    query getProposalsHomescreen($fundingPage: Int, $joinPage: Int) {
-  funding: proposals(type: fundingRequest, page: $fundingPage) {
-    id
-    commonId
-    votes {
-      outcome
-    }
-    votesFor
-    votesAgainst
-    description {
-      title
-      description
-    }
-    fundingRequest {
-      amount
-    }
-  }
-  join: proposals(type: join, page: $joinPage) {
-    id
-    commonId
-    description {
-      title
-      description
-    }
-    join {
-      funding
-      fundingType
-    }
-  }
-}
-    `;
-
-/**
- * __useGetProposalsHomescreenQuery__
- *
- * To run a query within a React component, call `useGetProposalsHomescreenQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetProposalsHomescreenQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetProposalsHomescreenQuery({
- *   variables: {
- *      fundingPage: // value for 'fundingPage'
- *      joinPage: // value for 'joinPage'
- *   },
- * });
- */
-export function useGetProposalsHomescreenQuery(baseOptions?: Apollo.QueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
-        return Apollo.useQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
-      }
-export function useGetProposalsHomescreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
-          return Apollo.useLazyQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
-        }
-export type GetProposalsHomescreenQueryHookResult = ReturnType<typeof useGetProposalsHomescreenQuery>;
-export type GetProposalsHomescreenLazyQueryHookResult = ReturnType<typeof useGetProposalsHomescreenLazyQuery>;
-export type GetProposalsHomescreenQueryResult = Apollo.QueryResult<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>;
-export const GetUserDetailsQueryDocument = gql`
-    query getUserDetailsQuery($userId: ID!) {
-  user(id: $userId) {
-    id
-    firstName
-    lastName
-    email
-    createdAt
-    photoURL
-    proposals {
-      id
-      type
-      state
-      paymentState
-      description {
-        title
-      }
-    }
-    subscriptions {
-      id
-      amount
-      metadata {
-        common {
-          id
-          name
-        }
-      }
-      status
-      revoked
-      createdAt
-      updatedAt
-      lastChargedAt
-      dueDate
-    }
-  }
-}
-    `;
-
-/**
- * __useGetUserDetailsQueryQuery__
- *
- * To run a query within a React component, call `useGetUserDetailsQueryQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetUserDetailsQueryQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetUserDetailsQueryQuery({
- *   variables: {
- *      userId: // value for 'userId'
- *   },
- * });
- */
-export function useGetUserDetailsQueryQuery(baseOptions: Apollo.QueryHookOptions<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>) {
-        return Apollo.useQuery<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>(GetUserDetailsQueryDocument, baseOptions);
-      }
-export function useGetUserDetailsQueryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>) {
-          return Apollo.useLazyQuery<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>(GetUserDetailsQueryDocument, baseOptions);
-        }
-export type GetUserDetailsQueryQueryHookResult = ReturnType<typeof useGetUserDetailsQueryQuery>;
-export type GetUserDetailsQueryLazyQueryHookResult = ReturnType<typeof useGetUserDetailsQueryLazyQuery>;
-export type GetUserDetailsQueryQueryResult = Apollo.QueryResult<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>;
-export const GetUsersHomepageDataDocument = gql`
-    query getUsersHomepageData($page: Int = 1, $perPage: Int = 15) {
-  users(page: $page, perPage: $perPage) {
-    id
-    photoURL
-    email
-    firstName
-    lastName
-    createdAt
-  }
-}
-    `;
-
-/**
- * __useGetUsersHomepageDataQuery__
- *
- * To run a query within a React component, call `useGetUsersHomepageDataQuery` and pass it any options that fit your needs.
- * When your component renders, `useGetUsersHomepageDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useGetUsersHomepageDataQuery({
- *   variables: {
- *      page: // value for 'page'
- *      perPage: // value for 'perPage'
- *   },
- * });
- */
-export function useGetUsersHomepageDataQuery(baseOptions?: Apollo.QueryHookOptions<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>) {
-        return Apollo.useQuery<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>(GetUsersHomepageDataDocument, baseOptions);
-      }
-export function useGetUsersHomepageDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>) {
-          return Apollo.useLazyQuery<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>(GetUsersHomepageDataDocument, baseOptions);
-        }
-export type GetUsersHomepageDataQueryHookResult = ReturnType<typeof useGetUsersHomepageDataQuery>;
-export type GetUsersHomepageDataLazyQueryHookResult = ReturnType<typeof useGetUsersHomepageDataLazyQuery>;
-export type GetUsersHomepageDataQueryResult = Apollo.QueryResult<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/graphql/schema.graphql b/packages/admin/src/graphql/schema.graphql
deleted file mode 100644
index 1007624db..000000000
--- a/packages/admin/src/graphql/schema.graphql
+++ /dev/null
@@ -1,416 +0,0 @@
-schema {
-  query: Query
-  mutation: Mutation
-  subscription: Subscription
-}
-scalar Date
-enum CardNetwork {
-  visa
-  mastercard
-}
-type Card {
-  """The ID of the payment"""
-  id: ID!
-  """The date at witch the payment was created"""
-  createdAt: Date!
-  """The date at witch the payment was last updated"""
-  updatedAt: Date!
-  circleCardId: ID!
-  ownerId: ID!
-  metadata: CardMetadata
-  verification: CardVerification
-}
-type CardMetadata {
-  digits: String
-  network: CardNetwork
-  billingDetails: CardBillingDetails
-}
-type CardVerification {
-  cvv: String
-}
-type CardBillingDetails {
-  name: String
-  city: String
-  country: String
-  postalCode: String
-  district: String
-  line1: String
-}
-type User {
-  id: ID!
-  firstName: String
-  lastName: String
-  email: String
-  photoURL: String
-  createdAt: Date
-  tokens: [String]
-  permissions: [String]
-  proposals(page: Int = 1): [Proposal]
-  subscriptions(page: Int = 1, status: SubscriptionStatus): [Subscription]
-}
-type Wire {
-  """The local ID of the payout"""
-  id: ID!
-  createdAt: Date
-  updatedAt: Date
-  description: String
-  bank: WireBank
-  billingDetails: WireBillingDetailsType
-}
-type WireBank {
-  bankName: String
-  city: String
-  country: String
-}
-type WireBillingDetailsType {
-  city: String
-  country: String
-  line1: String
-  line2: String
-  name: String
-  postalCode: String
-}
-enum EventType {
-  commonCreated
-  commonCreationFailed
-  commonWhitelisted
-  commonMemberAdded
-  commonMemberRemoved
-  commonUpdated
-  requestToJoinCreated
-  requestToJoinAccepted
-  requestToJoinRejected
-  requestToJoinExecuted
-  fundingRequestCreated
-  fundingRequestRejected
-  fundingRequestExecuted
-  fundingRequestAccepted
-  fundingRequestAcceptedInsufficientFunds
-  voteCreated
-  paymentCreated
-  paymentConfirmed
-  paymentFailed
-  paymentPaid
-  payoutCreated
-  payoutApproved
-  payoutExecuted
-  payoutVoided
-  payoutCompleted
-  payoutFailed
-  cardCreated
-  discussionCreated
-  messageCreated
-  subscriptionCreated
-  subscriptionPaymentCreated
-  subscriptionPaymentFailed
-  subscriptionPaymentConfirmed
-  subscriptionPaymentStuck
-  subscriptionCanceledByUser
-  subscriptionCanceledByPaymentFailure
-  membershipRevoked
-  discussionMessageReported
-  proposalReported
-  discussionReported
-}
-type Event {
-  """The unique identifier of the event"""
-  id: ID!
-  """The type of the event"""
-  type: EventType!
-  """The date, at which the event was created"""
-  createdAt: Date!
-  """The date, at which the event was last updated"""
-  updatedAt: Date!
-  """The id of the object on which was acted to created the event"""
-  objectId: ID
-  """The id of the actor"""
-  userId: ID
-  user: User
-}
-enum CommonContributionType {
-  oneTime
-  monthly
-}
-type CommonMember {
-  """The user ID of the member"""
-  userId: ID!
-  """The date, at witch the member joined the common"""
-  joinedAt: Date
-  user: User
-}
-type CommonMetadata {
-  byline: String!
-  description: String!
-  founderId: String!
-  minFeeToJoin: Int!
-  contributionType: CommonContributionType
-}
-type Payout {
-  id: ID!
-  createdAt: Date!
-  updatedAt: Date!
-  circlePayoutId: String
-  amount: Int!
-  executed: Boolean
-  voided: Boolean
-  status: PayoutStatus
-  security: [PayoutSecurity]
-  proposalIds: [String]
-  proposals: [Proposal]
-}
-type PayoutSecurity {
-  id: Int
-  redemptionAttempts: Int
-  redeemed: Boolean
-}
-enum PayoutStatus {
-  pending
-  complete
-  failed
-}
-input ExecutePayoutInput {
-  """The ID of the the wire to witch the payout will be made"""
-  wireId: ID!
-  """List of the all proposals IDs that are in this batch"""
-  proposalIds: [ID!]!
-}
-enum PaymentType {
-  oneTime
-  subscription
-}
-enum PaymentSourceType {
-  card
-}
-enum PaymentStatus {
-  pending
-  confirmed
-  paid
-  failed
-}
-enum PaymentCurrency {
-  USD
-}
-type Payment {
-  """The ID of the payment"""
-  id: ID!
-  """The date at witch the payment was created"""
-  createdAt: Date!
-  """The date at witch the payment was last updated"""
-  updatedAt: Date!
-  type: PaymentType!
-  status: PaymentStatus!
-  """The source from witch the payment was funded"""
-  source: PaymentSource!
-  amount: PaymentAmount!
-  """The fees on the payment"""
-  fees: PaymentFees
-  circlePaymentId: ID!
-  proposalId: ID!
-  userId: ID!
-  subscriptionId: ID
-  user: User
-  card: Card
-  common: Common
-  proposal: Proposal
-  subscription: Subscription
-}
-type PaymentFees {
-  amount: Int
-  currency: PaymentCurrency
-}
-type PaymentSource {
-  type: PaymentSourceType!
-  id: ID
-}
-type PaymentAmount {
-  currency: PaymentCurrency
-  amount: Int
-}
-type Balance {
-  available: Amount
-  unsettled: Amount
-}
-type Amount {
-  amount: String
-  currency: String
-}
-enum ProposalType {
-  fundingRequest
-  join
-}
-enum ProposalState {
-  passedInsufficientBalance
-  countdown
-  passed
-  failed
-}
-enum ProposalVoteOutcome {
-  approved
-  rejected
-}
-enum ProposalPaymentState {
-  notAttempted
-  notRelevant
-  confirmed
-  pending
-  failed
-}
-enum ProposalFundingState {
-  notRelevant
-  notAvailable
-  available
-  funded
-}
-"""The proposals type"""
-type Proposal {
-  id: ID!
-  createdAt: Date!
-  updatedAt: Date!
-  commonId: ID!
-  proposerId: ID!
-  votesFor: Int!
-  votesAgainst: Int!
-  state: ProposalState!
-  description: ProposalDescription!
-  type: ProposalType!
-  paymentState: ProposalPaymentState
-  fundingState: ProposalFundingState
-  """Details about the funding request. Exists only on funding request proposals"""
-  fundingRequest: ProposalFunding
-  """Details about the join request. Exists only on join request proposals"""
-  join: ProposalJoin
-  votes: [ProposalVote]
-  common: Common!
-  proposer: User!
-}
-type ProposalDescription {
-  title: String
-  description: String!
-}
-type ProposalFunding {
-  amount: Int!
-}
-type ProposalJoin {
-  cardId: ID!
-  funding: Int!
-  fundingType: CommonContributionType
-}
-type ProposalVote {
-  voteId: ID!
-  voterId: ID!
-  outcome: ProposalVoteOutcome!
-  voter: User
-}
-type Intention {
-  id: ID!
-  createdAt: Date!
-  updatedAt: Date!
-  type: IntentionType!
-  intention: String!
-}
-enum IntentionType {
-  access
-  request
-}
-input CreateIntentionInput {
-  type: IntentionType!
-  intention: String!
-}
-enum SubscriptionStatus {
-  pending
-  active
-  canceledByUser
-  canceledByPaymentFailure
-  paymentFailed
-}
-type Subscription {
-  id: ID!
-  cardId: ID!
-  userId: ID!
-  proposalId: ID!
-  createdAt: Date!
-  updatedAt: Date!
-  charges: Int!
-  amount: Int!
-  lastChargedAt: Date
-  dueDate: Date
-  revoked: Boolean!
-  status: SubscriptionStatus!
-  metadata: SubscriptionMetadata!
-}
-type SubscriptionMetadata {
-  common: SubscriptionMetadataCommon
-}
-type SubscriptionMetadataCommon {
-  id: ID
-  name: String
-}
-type Statistics {
-  """Commons, created on that date"""
-  newCommons: Int
-  """The amount of proposals with join type, created on that date"""
-  newJoinRequests: Int
-  """The amount of proposals with funding type, created on that date"""
-  newFundingRequests: Int
-  """The amount of discussions, started on that date"""
-  newDiscussions: Int
-  """The amount of new discussion messages, send on that date"""
-  newDiscussionMessages: Int
-  commons: Int
-  joinRequests(onlyOpen: Boolean = false): Int
-  fundingRequests(onlyOpen: Boolean = false): Int
-  users: Int
-}
-"""The common type"""
-type Common {
-  """The unique identifier of the common"""
-  id: ID!
-  """The date, at which the common was created"""
-  createdAt: Date
-  """The date, at which the common was last updated"""
-  updatedAt: Date
-  """The display name of the common"""
-  name: String!
-  """The currently available funds of the common"""
-  balance: Int!
-  """The total amount of money, raised by the common"""
-  raised: Int!
-  metadata: CommonMetadata!
-  members: [CommonMember]
-  proposals(page: Int, type: ProposalType, state: ProposalState, paymentState: ProposalPaymentState): [Proposal]
-  openJoinRequests: Int!
-  openFundingRequests: Int!
-}
-type Query {
-  user(id: ID!): User
-  users(page: Int = 1, perPage: Int = 10): [User]
-  wires(page: Int = 1): [Wire]
-  event(eventId: ID!): Event
-  events(last: Int = 10, after: Int = 0, type: EventType, objectId: ID): [Event]
-  common(
-    """The ID of the common, that you want to retrieve"""
-    commonId: ID!
-  ): Common
-  commons(last: Int = 10, after: Int = 0): [Common]
-  payout(id: ID!): Payout
-  payouts(page: Int = 1): [Payout]
-  payment(id: ID!): Payment
-  payments(page: Int = 1, hanging: Boolean): [Payment]
-  balance: Balance
-  proposal(id: ID!): Proposal
-  proposals(ids: [String], page: Int = 1, pageItems: Int = 10, type: ProposalType, fundingState: ProposalFundingState): [Proposal]
-  statistics: Statistics
-}
-type Mutation {
-  whitelistCommon(commonId: ID!): Boolean
-  """Refresh the common members from the events. Returns the new common member count"""
-  refreshCommonMembers(
-    """The common id to refresh"""
-    commonId: ID!
-  ): Int
-  executePayouts(input: ExecutePayoutInput!): Payout
-  approvePayout(payoutId: ID!, index: Int!, token: String!): Boolean
-  updatePaymentData(id: ID!, trackId: ID = "7f4fe0bd-590a-455d-b3cd-fe6045d36066"): Boolean
-  updatePaymentsCommonId: Boolean
-  createIntention(input: CreateIntentionInput!): Intention
-}
\ No newline at end of file
diff --git a/packages/admin/src/helpers/hoc/withPermission.tsx b/packages/admin/src/helpers/hoc/withPermission.tsx
index d2c78800f..bbe613674 100644
--- a/packages/admin/src/helpers/hoc/withPermission.tsx
+++ b/packages/admin/src/helpers/hoc/withPermission.tsx
@@ -1,12 +1,13 @@
-import { HasPermission } from '@components/HasPermission';
 import React from 'react';
+import { HasPermission } from '@components/HasPermission';
 
-interface IWithPermissionOptions {
+interface WithPermissionOptions {
   redirect?: boolean;
 }
 
-export const withPermission = (permission: string, options: IWithPermissionOptions = {})
-  : (component: React.FC<any>) => React.FC<any> => {
+type WithPermissionReturn = (component: React.FC<any>) => React.FC<any>;
+
+export const withPermission = (permission: string, options: WithPermissionOptions = {}): WithPermissionReturn => {
   return (Component) => {
     return () => (
       <HasPermission permission={permission} {...options}>
diff --git a/packages/admin/src/pages/_app.tsx b/packages/admin/src/pages/_app.tsx
index ba3ccf417..125d85f42 100644
--- a/packages/admin/src/pages/_app.tsx
+++ b/packages/admin/src/pages/_app.tsx
@@ -1,41 +1,41 @@
-import 'firebase/auth';
-
 import React from 'react';
-import firebase from 'firebase/app';
 import { AppProps } from 'next/app';
 
-import { FirebaseAuthProvider } from '@react-firebase/auth';
-
+import { IfFirebaseAuthed, IfFirebaseUnAuthed } from '@react-firebase/auth';
 import { CssBaseline, GeistProvider } from '@geist-ui/react';
-import { AuthenticationBasedLayout } from '@components/layout/AuthenticationBasedLayout';
-import { AuthContextProvider } from '@context';
 
-const firebaseConfig = {
-  apiKey: 'AIzaSyClh8UZh-PDyVgwPrHZwURoA4HWuiXUbR8',
-  authDomain: 'common-staging-50741.firebaseapp.com',
-  databaseURL: 'https://common-staging-50741.firebaseio.com',
-  projectId: 'common-staging-50741',
-  storageBucket: 'common-staging-50741.appspot.com',
-  messagingSenderId: '78965953367',
-  appId: '1:78965953367:android:257ae3c68f0101542f6412'
-};
+import { ClientOnly } from '@components/helpers';
+import { UserContextProvider } from '@core/context';
+import { AuthenticatedLayout } from '@components/layout/AuthenticatedLayout';
+import { CommonApolloProvider, AuthenticationProvider } from '@components/providers';
 
-const CommonAdminApp = ({ Component, pageProps }: AppProps): React.ReactElement => {
+
+const CommonAdmin = ({ Component, pageProps }: AppProps): React.ReactElement => {
   return (
     <GeistProvider>
       <CssBaseline/>
 
-      {typeof window !== 'undefined' && (
-        <AuthContextProvider>
-          <FirebaseAuthProvider firebase={firebase} {...firebaseConfig}>
-            <AuthenticationBasedLayout>
-              <Component {...pageProps} />
-            </AuthenticationBasedLayout>
-          </FirebaseAuthProvider>
-        </AuthContextProvider>
-      )}
+      <ClientOnly>
+        <AuthenticationProvider>
+          <CommonApolloProvider>
+            <IfFirebaseAuthed>
+              {() => (
+                <UserContextProvider>
+                  <AuthenticatedLayout>
+                    <Component {...pageProps} />
+                  </AuthenticatedLayout>
+                </UserContextProvider>
+              )}
+            </IfFirebaseAuthed>
+
+            <IfFirebaseUnAuthed>
+              {() => <Component {...pageProps} />}
+            </IfFirebaseUnAuthed>
+          </CommonApolloProvider>
+        </AuthenticationProvider>
+      </ClientOnly>
     </GeistProvider>
   );
 };
 
-export default CommonAdminApp;
+export default CommonAdmin;
diff --git a/packages/admin/src/pages/accounts/login.tsx b/packages/admin/src/pages/accounts/login.tsx
new file mode 100644
index 000000000..715de6dca
--- /dev/null
+++ b/packages/admin/src/pages/accounts/login.tsx
@@ -0,0 +1,138 @@
+import React from 'react';
+import firebase from 'firebase/app';
+
+import { NextPage } from 'next';
+import { useRouter } from 'next/router';
+
+import { AuthEmission } from '@react-firebase/auth/dist/types';
+import { CheckInCircleFill } from '@geist-ui/react-icons';
+import { Button, Description, Grid, Text, Tooltip, useMediaQuery, useTheme, useToasts } from '@geist-ui/react';
+
+
+interface IAuthenticatePageProps {
+  auth: AuthEmission;
+}
+
+const LoginPage: NextPage<IAuthenticatePageProps> = () => {
+  const theme = useTheme();
+  const router = useRouter();
+  const isLarge = useMediaQuery('md', { match: 'up' });
+
+  const [toasts, setToasts] = useToasts();
+
+  const singIn = (provider: firebase.auth.AuthProvider) => {
+    return async () => {
+      try {
+        const signInResult = await firebase.auth()
+          .signInWithPopup(provider);
+
+        setToasts({
+          type: 'success',
+          text: 'Successfully authenticated',
+          delay: 3000
+        });
+
+        router.push('/dashboard');
+      } catch (e) {
+        if (e.code === 'auth/popup-closed-by-user') {
+          setToasts({
+            type: 'error',
+            text: e.message
+          });
+        } else {
+          setToasts({
+            type: 'error',
+            text: 'Something went wrong'
+          });
+
+          console.error(e);
+        }
+      }
+
+    };
+  };
+
+  return (
+    <React.Fragment>
+      <Grid.Container style={{ height: '100vh' }}>
+        <Grid md={12} style={{
+          background: theme.palette.accents_1,
+          display: 'flex',
+          justifyContent: 'flex-end',
+          alignItems: 'center'
+        }}>
+          <div style={{ width: '25vw', marginRight: '5vw' }}>
+            <Text h2>Common Admin</Text>
+
+            <div style={{ display: 'flex', marginTop: 30 }}>
+              <div style={{ marginRight: 10 }}>
+                <CheckInCircleFill color={theme.palette.success}/>
+              </div>
+
+              <Description
+                title="Instant access to statistic"
+                content="See statistics that count in almost real time from the common count to the open proposals and much more"
+              />
+            </div>
+
+            <div style={{ display: 'flex', marginTop: 30 }}>
+              <div style={{ marginRight: 10 }}>
+                <CheckInCircleFill color={theme.palette.success}/>
+              </div>
+
+              <Description
+                title="Users at a glance"
+                content="See all the users, see their commons and proposals, and help them with their payments and subscriptions"
+              />
+            </div>
+
+            <div style={{ display: 'flex', marginTop: 30 }}>
+              <div style={{ marginRight: 10 }}>
+                <CheckInCircleFill color={theme.palette.success}/>
+              </div>
+
+              <Description
+                title="Commons management"
+                content="See all the commons, see their members and proposals, remove common member upon request and more"
+              />
+            </div>
+          </div>
+        </Grid>
+
+        <Grid sm={24} md={12} style={{
+          background: theme.palette.background,
+          display: 'flex',
+          justifyContent: 'flex-start',
+          alignItems: 'center',
+          padding: '5vw'
+        }}>
+          <div style={{ ...(isLarge && { width: '25vw' }) }}>
+            <Text h2>Sign in to continue</Text>
+
+            <div style={{ margin: '10px 0' }}>
+              <Button
+                shadow
+                onClick={singIn(new firebase.auth.GoogleAuthProvider())}
+                style={{ width: '100%', margin: '5px 0' }}
+              >
+                Continue with Google
+              </Button>
+
+              <Tooltip text="Sign in with Apple is yet to be implemented" enterDelay={1000} style={{ width: '100%' }}>
+                <Button style={{ width: '100%', margin: '5px 0', cursor: 'not-allowed' }} shadow type="secondary">
+                  Continue with Apple
+                </Button>
+              </Tooltip>
+            </div>
+
+            <Text>
+              By clicking continue, you agree to our Terms of Service and Privacy Policy.
+            </Text>
+          </div>
+        </Grid>
+      </Grid.Container>
+    </React.Fragment>
+  );
+};
+
+export default LoginPage;
\ No newline at end of file
diff --git a/packages/admin/src/pages/auth/index.tsx b/packages/admin/src/pages/auth/index.tsx
deleted file mode 100644
index 3e7ceff44..000000000
--- a/packages/admin/src/pages/auth/index.tsx
+++ /dev/null
@@ -1,147 +0,0 @@
-import { NextPage } from 'next';
-import React from 'react';
-import { Button, Description, Grid, Text, Tooltip, useMediaQuery, useTheme, useToasts } from '@geist-ui/react';
-import { CheckInCircleFill } from '@geist-ui/react-icons';
-import firebase from 'firebase/app';
-import { AuthEmission } from '@react-firebase/auth/dist/types';
-import { useRouter } from 'next/router';
-
-import { useAuthContext } from '@context';
-
-interface IAuthenticatePageProps {
-  auth: AuthEmission;
-}
-
-const AuthenticationPage: NextPage<IAuthenticatePageProps> = () => {
-  const authContext = useAuthContext();
-
-  const theme = useTheme();
-  const router = useRouter();
-  const isLarge = useMediaQuery('md', { match: 'up' });
-  const [toasts, setToasts] = useToasts();
-
-  // Effects
-  React.useEffect(() => {
-    if(authContext.loaded && authContext.authenticated) {
-      router.push('/dashboard');
-    }
-  }, [authContext.loaded])
-
-  const singIn = (provider: firebase.auth.AuthProvider) => {
-    return async () => {
-      try {
-        const signInResult = await firebase.auth()
-          .signInWithPopup(provider);
-
-        setToasts({
-          type: 'success',
-          text: 'Successfully authenticated',
-          delay: 3000
-        });
-
-        router.push('/dashboard');
-      } catch (e) {
-        if (e.code === 'auth/popup-closed-by-user') {
-          setToasts({
-            type: 'error',
-            text: e.message
-          });
-        } else {
-          setToasts({
-            type: 'error',
-            text: 'Something went wrong'
-          });
-
-          console.error(e);
-        }
-      }
-
-    };
-  };
-
-  return (
-    <React.Fragment>
-      {authContext.loaded && (
-        <Grid.Container style={{ height: '100vh' }}>
-          <Grid md={12} style={{
-            background: theme.palette.accents_1,
-            display: 'flex',
-            justifyContent: 'flex-end',
-            alignItems: 'center'
-          }}>
-            <div style={{ width: '25vw', marginRight: '5vw' }}>
-              <Text h2>Common Admin</Text>
-
-              <div style={{ display: 'flex', marginTop: 30 }}>
-                <div style={{ marginRight: 10 }}>
-                  <CheckInCircleFill color={theme.palette.success}/>
-                </div>
-
-                <Description
-                  title="Instant access to statistic"
-                  content="See statistics that count in almost real time from the common count to the open proposals and much more"
-                />
-              </div>
-
-              <div style={{ display: 'flex', marginTop: 30 }}>
-                <div style={{ marginRight: 10 }}>
-                  <CheckInCircleFill color={theme.palette.success}/>
-                </div>
-
-                <Description
-                  title="Users at a glance"
-                  content="See all the users, see their commons and proposals, and help them with their payments and subscriptions"
-                />
-              </div>
-
-              <div style={{ display: 'flex', marginTop: 30 }}>
-                <div style={{ marginRight: 10 }}>
-                  <CheckInCircleFill color={theme.palette.success}/>
-                </div>
-
-                <Description
-                  title="Commons management"
-                  content="See all the commons, see their members and proposals, remove common member upon request and more"
-                />
-              </div>
-            </div>
-          </Grid>
-
-          <Grid sm={24} md={12} style={{
-            background: theme.palette.background,
-            display: 'flex',
-            justifyContent: 'flex-start',
-            alignItems: 'center',
-            padding: '5vw'
-          }}>
-            <div style={{ ...(isLarge && { width: '25vw' }) }}>
-              <Text h2>Sign in to continue</Text>
-
-              <div style={{ margin: '10px 0' }}>
-                <Button
-                  shadow
-                  onClick={singIn(new firebase.auth.GoogleAuthProvider())}
-                  style={{ width: '100%', margin: '5px 0' }}
-                >
-                  Continue with Google
-                </Button>
-
-                <Tooltip text="Sign in with Apple is yet to be implemented" enterDelay={1000} style={{ width: '100%' }}>
-                  <Button style={{ width: '100%', margin: '5px 0', cursor: 'not-allowed' }} shadow type="secondary">
-                    Continue with Apple
-                  </Button>
-                </Tooltip>
-              </div>
-
-              <Text>
-                By clicking continue, you agree to our Terms of Service and Privacy Policy.
-              </Text>
-            </div>
-          </Grid>
-        </Grid.Container>
-      )}
-    </React.Fragment>
-  );
-};
-
-export default AuthenticationPage;
\ No newline at end of file
diff --git a/packages/admin/src/pages/commons/details/[commonId].tsx b/packages/admin/src/pages/commons/details/[commonId].tsx
index 0421d443e..15d3bf9ba 100644
--- a/packages/admin/src/pages/commons/details/[commonId].tsx
+++ b/packages/admin/src/pages/commons/details/[commonId].tsx
@@ -26,7 +26,7 @@ import {
   Trash2 as Trash
 } from '@geist-ui/react-icons';
 
-import { useGetCommonDetailsQuery, GetCommonDetailsQueryResult } from '@graphql';
+import { useGetCommonDetailsQuery, GetCommonDetailsQueryResult } from '@core/graphql';
 import { Link } from 'components/Link';
 import { CommonSettings } from '@components/CommonSettings';
 
diff --git a/packages/admin/src/pages/commons/index.tsx b/packages/admin/src/pages/commons/index.tsx
index c9d29159e..227469f1c 100644
--- a/packages/admin/src/pages/commons/index.tsx
+++ b/packages/admin/src/pages/commons/index.tsx
@@ -4,10 +4,14 @@ import { NextPage } from 'next';
 import Skeleton from 'react-loading-skeleton';
 import { gql } from '@apollo/client/core';
 import { Spacer, Text, Table, Pagination, Tag, useToasts, Breadcrumbs, Grid, Card } from '@geist-ui/react';
-import { ExternalLink, Edit, Trash2, ChevronRightCircleFill, ChevronLeftCircleFill, Home } from '@geist-ui/react-icons';
+import { ChevronRightCircleFill, ChevronLeftCircleFill, Home } from '@geist-ui/react-icons';
 
 import { Link } from '../../components/Link';
-import { useGetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryResult, useStatisticsQuery } from '@graphql';
+import {
+  useGetCommonsHomescreenDataQuery,
+  GetCommonsHomescreenDataQueryResult,
+  useStatisticsQuery
+} from '@core/graphql';
 import { withPermission } from '../../helpers/hoc/withPermission';
 import { useRouter } from 'next/router';
 import { Centered } from '@components/Centered';
diff --git a/packages/admin/src/pages/dashboard/index.tsx b/packages/admin/src/pages/dashboard/index.tsx
index fb70ce3d3..439971f13 100644
--- a/packages/admin/src/pages/dashboard/index.tsx
+++ b/packages/admin/src/pages/dashboard/index.tsx
@@ -1,46 +1,19 @@
 import React from 'react';
 import { NextPage } from 'next';
-
-import Skeleton from 'react-loading-skeleton';
-import { gql } from '@apollo/client/core';
 import { Breadcrumbs, Card, Grid, Spacer, Text } from '@geist-ui/react';
 
-import { useGetDashboardDataQuery, useStatisticsQuery } from '@graphql';
 import { HasPermission } from '@components/HasPermission';
 import { withPermission } from '../../helpers/hoc/withPermission';
 import { LatestEventsTable } from '@components/tables/LatestEventsTable';
 import { useRouter } from 'next/router';
 import { Link } from '@components/Link';
 
-const GetDashboardDataQuery = gql`
-  query getDashboardData {
-    statistics {
-      newCommons
-      newJoinRequests
-      newFundingRequests
-
-      newDiscussions
-      newDiscussionMessages
-    }
-  }
-`;
-
-const GetStatisticsQuery = gql`
-  query Statistics {
-    statistics {
-      users
-      commons
-      joinRequests
-      fundingRequests
-    }
-  }
-`;
 
 const DashboardHomePage: NextPage = () => {
   const router = useRouter();
 
-  const data = useGetDashboardDataQuery();
-  const statistics = useStatisticsQuery();
+  // const data = useGetDashboardDataQuery();
+  // const statistics = useStatisticsQuery();
 
   const onCardClick = (url: string) => {
     return () => {
@@ -61,7 +34,7 @@ const DashboardHomePage: NextPage = () => {
 
       <Spacer y={2}/>
 
-      {data.data && (
+      {/*{data.data && (*/}
         <React.Fragment>
           <HasPermission permission="admin.dashboard.read.overview">
             <Text h3>Application's overview</Text>
@@ -70,13 +43,13 @@ const DashboardHomePage: NextPage = () => {
               <Grid sm={24} md={8} onClick={onCardClick('/commons')} style={{ cursor: 'pointer' }}>
                 <Card hoverable>
                   <Text h1>
-                    {statistics.data && (
-                      statistics.data.statistics.commons
-                    )}
+                    {/*{statistics.data && (*/}
+                    {/*  statistics.data.statistics.commons*/}
+                    {/*)}*/}
 
-                    {!statistics.data && (
-                      <Skeleton/>
-                    )}
+                    {/*{!statistics.data && (*/}
+                    {/*  <Skeleton/>*/}
+                    {/*)}*/}
                   </Text>
                   <Text p>Total commons created</Text>
                 </Card>
@@ -85,14 +58,14 @@ const DashboardHomePage: NextPage = () => {
               <Grid sm={24} md={8} onClick={onCardClick('/proposals')} style={{ cursor: 'pointer' }}>
                 <Card hoverable>
                   <Text h1>
-                    {statistics.data && (
-                      statistics.data.statistics.joinRequests +
-                      statistics.data.statistics.fundingRequests
-                    )}
-
-                    {!statistics.data && (
-                      <Skeleton/>
-                    )}
+                    {/*{statistics.data && (*/}
+                    {/*  statistics.data.statistics.joinRequests +*/}
+                    {/*  statistics.data.statistics.fundingRequests*/}
+                    {/*)}*/}
+
+                    {/*{!statistics.data && (*/}
+                    {/*  <Skeleton/>*/}
+                    {/*)}*/}
                   </Text>
                   <Text p>Proposals created</Text>
                 </Card>
@@ -101,13 +74,13 @@ const DashboardHomePage: NextPage = () => {
               <Grid sm={24} md={8} onClick={onCardClick('/users')} style={{ cursor: 'pointer' }}>
                 <Card hoverable>
                   <Text h1>
-                    {statistics.data && (
-                      statistics.data.statistics.users
-                    )}
+                    {/*{statistics.data && (*/}
+                    {/*  statistics.data.statistics.users*/}
+                    {/*)}*/}
 
-                    {!statistics.data && (
-                      <Skeleton/>
-                    )}
+                    {/*{!statistics.data && (*/}
+                    {/*  <Skeleton/>*/}
+                    {/*)}*/}
                   </Text>
                   <Text p>User on common</Text>
                 </Card>
@@ -122,7 +95,7 @@ const DashboardHomePage: NextPage = () => {
             />
           </HasPermission>
         </React.Fragment>
-      )}
+      {/*)}*/}
 
     </React.Fragment>
   );
diff --git a/packages/admin/src/pages/error/unauthorized.tsx b/packages/admin/src/pages/error/unauthorized.tsx
index 100d9a484..d924bc558 100644
--- a/packages/admin/src/pages/error/unauthorized.tsx
+++ b/packages/admin/src/pages/error/unauthorized.tsx
@@ -5,7 +5,7 @@ import { useRouter } from 'next/router';
 import firebase from 'firebase/app';
 import React from 'react';
 import { gql } from '@apollo/client';
-import { useCreateIntentionMutation, IntentionType } from '@graphql';
+import { useCreateIntentionMutation, IntentionType } from '@core/graphql';
 
 const CreateIntentionMutation = gql`
   mutation createIntention($type: IntentionType!, $intention: String!) {
diff --git a/packages/admin/src/pages/events/details/[eventId].tsx b/packages/admin/src/pages/events/details/[eventId].tsx
index 202e8a330..e053f8084 100644
--- a/packages/admin/src/pages/events/details/[eventId].tsx
+++ b/packages/admin/src/pages/events/details/[eventId].tsx
@@ -1,6 +1,6 @@
 import { NextPage } from 'next';
 import { withPermission } from '../../../helpers/hoc/withPermission';
-import { useCreateIntentionMutation, IntentionType } from '@graphql';
+import { useCreateIntentionMutation, IntentionType } from '@core/graphql';
 import React from 'react';
 
 export const EventDetailsPage: NextPage = () => {
diff --git a/packages/admin/src/pages/events/index.tsx b/packages/admin/src/pages/events/index.tsx
index 7b57c5599..0eb76aa62 100644
--- a/packages/admin/src/pages/events/index.tsx
+++ b/packages/admin/src/pages/events/index.tsx
@@ -1,6 +1,6 @@
 import { NextPage } from 'next';
 import { withPermission } from '../../helpers/hoc/withPermission';
-import { useCreateIntentionMutation, IntentionType } from '@graphql';
+import { useCreateIntentionMutation, IntentionType } from '@core/graphql';
 import React from 'react';
 
 export const EventsHomePage: NextPage = () => {
diff --git a/packages/admin/src/pages/financials/index.tsx b/packages/admin/src/pages/financials/index.tsx
index 0b92d1e1b..0c3412a66 100644
--- a/packages/admin/src/pages/financials/index.tsx
+++ b/packages/admin/src/pages/financials/index.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { Link } from '@components/Link';
 import { Breadcrumbs, Card, Grid, Note, Spacer, Text } from '@geist-ui/react';
 import { gql } from '@apollo/client';
-import { useGetFinancialsDataQuery } from '@graphql';
+import { useGetFinancialsDataQuery } from '@core/graphql';
 import { Centered } from '@components/Centered';
 import { ExternalLink } from '@geist-ui/react-icons';
 import Skeleton from 'react-loading-skeleton';
diff --git a/packages/admin/src/pages/financials/payments/index.tsx b/packages/admin/src/pages/financials/payments/index.tsx
index 44c91c474..af8feb0c2 100644
--- a/packages/admin/src/pages/financials/payments/index.tsx
+++ b/packages/admin/src/pages/financials/payments/index.tsx
@@ -2,32 +2,13 @@ import React from 'react';
 import { NextPage } from 'next';
 
 import { gql } from '@apollo/client';
-import {
-  Breadcrumbs,
-  Card,
-  Col,
-  Divider,
-  Note,
-  Row,
-  Spacer,
-  Spinner,
-  Tag,
-  Text,
-  User,
-  useTheme,
-  useToasts
-} from '@geist-ui/react';
+import { Breadcrumbs, Card, Note, Spacer, Spinner, Text, useToasts } from '@geist-ui/react';
 
 import { withPermission } from '../../../helpers/hoc/withPermission';
-import {
-  useGetPaymentsHomeScreenDataQuery,
-  useGetPaymentDetailsLazyQuery,
-  useUpdatePaymentDataMutation
-} from '@graphql';
+import { useGetPaymentsHomeScreenDataQuery, useUpdatePaymentDataMutation } from '@core/graphql';
 import { Link } from '@components/Link';
 import { Centered } from '@components/Centered';
-import { ChevronDownCircle, ChevronLeftCircle, ChevronRightCircle, ChevronUpCircle, Zap } from '@geist-ui/react-icons';
-import { useRouter } from 'next/router';
+import { Zap } from '@geist-ui/react-icons';
 import { PaymentsTable } from '@components/tables/PaymentsTable';
 
 const GetPaymentsHomepageData = gql`
diff --git a/packages/admin/src/pages/financials/payouts/confirm.tsx b/packages/admin/src/pages/financials/payouts/confirm.tsx
index db00a8805..0f7ef881e 100644
--- a/packages/admin/src/pages/financials/payouts/confirm.tsx
+++ b/packages/admin/src/pages/financials/payouts/confirm.tsx
@@ -1,9 +1,9 @@
 import { gql } from '@apollo/client';
 import { useRouter } from 'next/router';
-import { useGetConfirmPayoutDataLazyQuery, useApprovePayoutMutation } from '@graphql';
+import { useGetConfirmPayoutDataLazyQuery, useApprovePayoutMutation } from '@core/graphql';
 import React from 'react';
 import { Link } from '@components/Link';
-import { Breadcrumbs, Button, Spacer, Text, useToasts } from '@geist-ui/react';
+import { Breadcrumbs, Button, Text, useToasts } from '@geist-ui/react';
 import Skeleton from 'react-loading-skeleton';
 
 const ConfirmPayoutPageData = gql`
diff --git a/packages/admin/src/pages/financials/payouts/create/batch.tsx b/packages/admin/src/pages/financials/payouts/create/batch.tsx
index 3a745c83a..88e226e1a 100644
--- a/packages/admin/src/pages/financials/payouts/create/batch.tsx
+++ b/packages/admin/src/pages/financials/payouts/create/batch.tsx
@@ -2,7 +2,7 @@ import { gql } from '@apollo/client';
 import { NextPage } from 'next';
 import { useRouter } from 'next/router';
 import { withPermission } from '../../../../helpers/hoc/withPermission';
-import { useGetProposalsSelectedForBatchQuery, Wire, useExecutePayoutMutation } from '@graphql';
+import { useGetProposalsSelectedForBatchQuery, Wire, useExecutePayoutMutation } from '@core/graphql';
 import { Link } from '@components/Link';
 import React from 'react';
 import {
diff --git a/packages/admin/src/pages/financials/payouts/details/[payoutId].tsx b/packages/admin/src/pages/financials/payouts/details/[payoutId].tsx
index d703f9f7d..4a2a0250d 100644
--- a/packages/admin/src/pages/financials/payouts/details/[payoutId].tsx
+++ b/packages/admin/src/pages/financials/payouts/details/[payoutId].tsx
@@ -5,7 +5,7 @@ import React from 'react';
 import { Breadcrumbs, Card, Divider, Grid, Spacer, Text, Tag, useToasts } from '@geist-ui/react';
 import { useRouter } from 'next/router';
 import { gql } from '@apollo/client';
-import { useGetPayoutDetailsQuery } from '@graphql';
+import { useGetPayoutDetailsQuery } from '@core/graphql';
 
 const PayoutDetailsData = gql`
   query GetPayoutDetails($payoutId: ID!) {
diff --git a/packages/admin/src/pages/financials/payouts/index.tsx b/packages/admin/src/pages/financials/payouts/index.tsx
index 8dd19d24e..56d3a7a34 100644
--- a/packages/admin/src/pages/financials/payouts/index.tsx
+++ b/packages/admin/src/pages/financials/payouts/index.tsx
@@ -16,7 +16,7 @@ import {
 import { Link } from '@components/Link';
 import { withPermission } from '../../../helpers/hoc/withPermission';
 import { gql } from '@apollo/client';
-import { useGetPayoutsPageDataQuery, ProposalFundingState, GetPayoutsPageDataQueryResult } from '@graphql';
+import { useGetPayoutsPageDataQuery, ProposalFundingState, GetPayoutsPageDataQueryResult } from '@core/graphql';
 import { HasPermission } from '@components/HasPermission';
 import { useRouter } from 'next/router';
 import { Centered } from '@components/Centered';
diff --git a/packages/admin/src/pages/proposals/details/[proposalId].tsx b/packages/admin/src/pages/proposals/details/[proposalId].tsx
index 8bf197660..92462c03d 100644
--- a/packages/admin/src/pages/proposals/details/[proposalId].tsx
+++ b/packages/admin/src/pages/proposals/details/[proposalId].tsx
@@ -5,7 +5,7 @@ import { NextPage } from 'next';
 import { useRouter } from 'next/router';
 import React from 'react';
 import { Link } from '../../../components/Link';
-import { useGetProposalDetailsQuery, GetProposalDetailsQueryResult } from '@graphql';
+import { useGetProposalDetailsQuery, GetProposalDetailsQueryResult } from '@core/graphql';
 import { Centered } from '../../../components/Centered';
 
 const GetProposalDetails = gql`
diff --git a/packages/admin/src/pages/proposals/index.tsx b/packages/admin/src/pages/proposals/index.tsx
index d209eb2fe..d1584d02a 100644
--- a/packages/admin/src/pages/proposals/index.tsx
+++ b/packages/admin/src/pages/proposals/index.tsx
@@ -7,7 +7,7 @@ import { gql } from '@apollo/client';
 import { Breadcrumbs, Card, Grid, Pagination, Spacer, Table, Text } from '@geist-ui/react';
 
 import { Link } from '@components/Link';
-import { useStatisticsQuery, useGetProposalsHomescreenQuery } from '@graphql';
+import { useStatisticsQuery, useGetProposalsHomescreenQuery } from '@core/graphql';
 import { useRouter } from 'next/router';
 import { ChevronLeftCircleFill, ChevronRightCircleFill } from '@geist-ui/react-icons';
 
diff --git a/packages/admin/src/pages/users/details/[userId].tsx b/packages/admin/src/pages/users/details/[userId].tsx
index 0ecfe6d93..a380b0df5 100644
--- a/packages/admin/src/pages/users/details/[userId].tsx
+++ b/packages/admin/src/pages/users/details/[userId].tsx
@@ -1,7 +1,7 @@
 import { gql } from '@apollo/client';
 import { NextPage } from 'next';
 import { useRouter } from 'next/router';
-import { useGetUserDetailsQueryQuery, GetUserDetailsQueryQueryResult } from '@graphql';
+import { useGetUserDetailsQueryQuery, GetUserDetailsQueryQueryResult } from '@core/graphql';
 import React from 'react';
 import { Link } from '../../../components/Link';
 import { Breadcrumbs, Text, Image, Grid, Card, Spacer, Table, Tag, Tooltip } from '@geist-ui/react';
diff --git a/packages/admin/src/pages/users/index.tsx b/packages/admin/src/pages/users/index.tsx
index f05fb03f4..6bcf96c55 100644
--- a/packages/admin/src/pages/users/index.tsx
+++ b/packages/admin/src/pages/users/index.tsx
@@ -8,13 +8,7 @@ import { Avatar, Breadcrumbs, Card, Grid, Pagination, Spacer, Table, Text } from
 
 import { Link } from '@components/Link';
 import { Centered } from '@components/Centered';
-import {
-  useGetUsersHomepageDataQuery,
-  User,
-  useStatisticsQuery,
-  GetUsersHomepageDataQueryResult,
-  GetUsersHomepageDataQuery
-} from '@graphql';
+import { useGetUsersHomepageDataQuery, User, useStatisticsQuery, GetUsersHomepageDataQuery } from '@core/graphql';
 import Skeleton from 'react-loading-skeleton';
 
 const UsersHomepageData = gql`
diff --git a/packages/admin/tsconfig.json b/packages/admin/tsconfig.json
index 1180da16f..890db4391 100644
--- a/packages/admin/tsconfig.json
+++ b/packages/admin/tsconfig.json
@@ -19,13 +19,30 @@
     "jsx": "preserve",
     "baseUrl": "./src",
     "paths": {
-      "@hoc": ["hoc/index"],
-      "@graphql": ["graphql"],
-      "@context": ["context/index"],
-      "@components": ["components/index"],
-      "@components/*": ["components/*"],
-      "@hooks": ["hooks/index"],
-      "@helpers": ["helpers/index"]
+      "@hoc": [
+        "hoc/index"
+      ],
+      "@graphql": [
+        "graphql"
+      ],
+      "@context": [
+        "context/index"
+      ],
+      "@components": [
+        "components/index"
+      ],
+      "@components/*": [
+        "components/*"
+      ],
+      "@core/*": [
+        "core/*"
+      ],
+      "@hooks": [
+        "hooks/index"
+      ],
+      "@helpers": [
+        "helpers/index"
+      ]
     }
   },
   "include": [
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index bd61f4bc0..0fa4e96c1 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -126,6 +126,7 @@ export interface NexusGenInputs {
     email: string; // String!
     firstName: string; // String!
     lastName: string; // String!
+    photo: string; // String!
   }
   CreateUserNotificationTokenInput: { // input type
     description: string; // String!
@@ -216,23 +217,23 @@ export interface NexusGenInputs {
 }
 
 export interface NexusGenEnums {
-  CommonMemberRole: "Founder" | "Moderator"
-  DiscussionMessageFlag: "Clear" | "Hidden" | "Reported"
-  DiscussionMessageType: "Message"
-  DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
+  CommonMemberRole: 'Founder' | 'Moderator'
+  DiscussionMessageFlag: 'Clear' | 'Hidden' | 'Reported'
+  DiscussionMessageType: 'Message'
+  DiscussionSubscriptionType: 'AllNotifications' | 'NoNotification' | 'OnlyMentions'
   DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
   EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
   FundingType: 'Monthly' | 'OneTime'
-  NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
-  NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
-  ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
-  ProposalType: "FundingRequest" | "JoinRequest"
-  ReportAction: "Dismissed" | "Respected"
-  ReportAuditor: "CommonModerator" | "SystemAdmin"
-  ReportFor: "FalseNews" | "Harassment" | "Hate" | "Nudity" | "Other" | "Spam" | "Violance"
-  ReportStatus: "Active" | "Clossed"
-  SortOrder: "asc" | "desc"
-  UserNotificationTokenState: "Active" | "Expired" | "Voided"
+  NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
+  NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestRejected'
+  ProposalState: 'Accepted' | 'Countdown' | 'Finalizing' | 'Rejected'
+  ProposalType: 'FundingRequest' | 'JoinRequest'
+  ReportAction: 'Dismissed' | 'Respected'
+  ReportAuditor: 'CommonModerator' | 'SystemAdmin'
+  ReportFor: 'FalseNews' | 'Harassment' | 'Hate' | 'Nudity' | 'Other' | 'Spam' | 'Violance'
+  ReportStatus: 'Active' | 'Clossed'
+  SortOrder: 'asc' | 'desc'
+  UserNotificationTokenState: 'Active' | 'Expired' | 'Voided'
   VoteOutcome: "Approve" | "Condemn"
 }
 
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 4699b78b3..3a4122fd7 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -156,6 +156,7 @@ input CreateUserInput {
   email: String!
   firstName: String!
   lastName: String!
+  photo: String!
 }
 
 input CreateUserNotificationTokenInput {

From 51cc4d347fb629650b4a16a2b27b3ea318034f19 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 28 Apr 2021 08:07:54 +0300
Subject: [PATCH 08/29] Make the dashboard work again

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/.env.local                     |   2 +-
 packages/admin/.env.local.example             |   2 +-
 packages/admin/codegen.yml                    |   4 +-
 .../admin/src/components/HasPermission.tsx    |   6 +-
 .../components/tables/LatestEventsTable.tsx   | 114 ++++++++----------
 packages/admin/src/core/graphql/index.ts      |  79 +++++++++++-
 .../admin/src/core/graphql/schema.graphql     |   7 +-
 packages/admin/src/core/graphql/schema.json   |  49 +++++++-
 packages/admin/src/pages/dashboard/index.tsx  |   8 +-
 .../admin/src/pages/error/unauthorized.tsx    |  31 ++---
 packages/admin/src/pages/index.tsx            |   3 +-
 packages/core/prisma/seed.ts                  |  10 +-
 packages/core/src/domain/validation/index.ts  |   2 +
 .../commons/command/createCommonCommand.ts    |   5 +
 .../graphql/src/generated/nexus-typegen.ts    |  11 +-
 packages/graphql/src/generated/schema.graphql |   6 +
 .../Mutations/CreateCommon.mutation.ts        |   3 +
 .../Events/Extensions/EventUser.extension.ts  |  29 +++++
 .../Types/Events/Queries/GetEvents.query.ts   |  20 +++
 .../schema/Types/Events/Types/Event.type.ts   |   4 -
 .../graphql/src/schema/Types/Events/index.ts  |   9 +-
 21 files changed, 283 insertions(+), 121 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Events/Extensions/EventUser.extension.ts
 create mode 100644 packages/graphql/src/schema/Types/Events/Queries/GetEvents.query.ts

diff --git a/packages/admin/.env.local b/packages/admin/.env.local
index 6c3f37f40..c3f297c75 100644
--- a/packages/admin/.env.local
+++ b/packages/admin/.env.local
@@ -3,4 +3,4 @@ NEXT_PUBLIC_Firebase.ProjectId="common-staging-50741"
 NEXT_PUBLIC_Firebase.AuthDomain="common-staging-50741.firebaseapp.com"
 NEXT_PUBLIC_Firebase.DatabaseUrl="https://common-staging-50741.firebaseio.com"
 
-NEXT_PUBLIC_GraphQl.Endpoint=http://locahost:4000/graphql
\ No newline at end of file
+NEXT_PUBLIC_GraphQl.Endpoint=http://localhost:4000/graphql
\ No newline at end of file
diff --git a/packages/admin/.env.local.example b/packages/admin/.env.local.example
index 6c3f37f40..c3f297c75 100644
--- a/packages/admin/.env.local.example
+++ b/packages/admin/.env.local.example
@@ -3,4 +3,4 @@ NEXT_PUBLIC_Firebase.ProjectId="common-staging-50741"
 NEXT_PUBLIC_Firebase.AuthDomain="common-staging-50741.firebaseapp.com"
 NEXT_PUBLIC_Firebase.DatabaseUrl="https://common-staging-50741.firebaseio.com"
 
-NEXT_PUBLIC_GraphQl.Endpoint=http://locahost:4000/graphql
\ No newline at end of file
+NEXT_PUBLIC_GraphQl.Endpoint=http://localhost:4000/graphql
\ No newline at end of file
diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 2ca3a6ac8..c53213971 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -1,6 +1,8 @@
 overwrite: true
 schema: "http://localhost:4000/graphql"
-documents: "src/core/**/*.tsx"
+documents:
+  - "src/core/**/*.tsx"
+  - "src/components/tables/LatestEventsTable.tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/components/HasPermission.tsx b/packages/admin/src/components/HasPermission.tsx
index 9cd69ac14..fb9c0dc4e 100644
--- a/packages/admin/src/components/HasPermission.tsx
+++ b/packages/admin/src/components/HasPermission.tsx
@@ -16,9 +16,13 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
   const hasPermission = (permission: string): boolean => {
     let hasPermission = false;
 
+    console.log(userContext);
+
     if (userContext.loaded) {
       const permissions = userContext.permissions;
 
+      console.log(permissions);
+
       if (permission.includes('*')) {
         hasPermission = permissions.some((userPermission) =>
           matchRuleExpl(userPermission, permission));
@@ -67,7 +71,7 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
   };
 
 
-  return (
+  return hasPermission(permission) && (
     <React.Fragment>
       {children}
     </React.Fragment>
diff --git a/packages/admin/src/components/tables/LatestEventsTable.tsx b/packages/admin/src/components/tables/LatestEventsTable.tsx
index d59372003..9b4e6f29f 100644
--- a/packages/admin/src/components/tables/LatestEventsTable.tsx
+++ b/packages/admin/src/components/tables/LatestEventsTable.tsx
@@ -1,34 +1,31 @@
 import React from 'react';
-import { Table, Text, useToasts } from '@geist-ui/react';
+import { Table, Text, Tag, Avatar } from '@geist-ui/react';
 
 import { HasPermission } from '@components/HasPermission';
-// import { useGetLatestEventsQuery } from '@core/graphql';
-import useSound from 'use-sound';
 import { useRouter } from 'next/router';
+import { gql } from '@apollo/client';
+import { useGetLatestEventsQuery } from '@core/graphql';
 
-// const GetLatestEventsQuery = gql`
-//   query GetLatestEvents($last: Int = 10, $after: Int = 0) {
-//     events(
-//       last: $last,
-//       after: $after
-//     ) {
-//       id
-//
-//       createdAt
-//
-//       type
-//
-//       user {
-//         id
-//
-//         firstName
-//         lastName
-//
-//         photoURL
-//       }
-//     }
-//   }
-// `;
+const GetLatestEventsQuery = gql`
+  query GetLatestEvents($take: Int = 10, $skip: Int = 0) {
+    events(paginate: {
+      take: $take,
+      skip: $skip
+    }) {
+      id
+
+      createdAt
+      type
+
+      user {
+        firstName
+        lastName
+
+        photo
+      }
+    }
+  }
+`;
 
 interface ILatestEventsTableProps {
   pagination?: boolean;
@@ -39,47 +36,34 @@ interface ILatestEventsTableProps {
 export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ pagination, refresh, notify }) => {
   const router = useRouter();
 
-  const [toasts, setToast] = useToasts();
-  const [play] = useSound('assets/sounds/notification.mp3');
+  const { data } = useGetLatestEventsQuery();
 
 
-  // const { data, previousData } = useGetLatestEventsQuery({
-  //   pollInterval: 5 * 1000
-  // });
+  const transformDataForTable = () => {
+    return data.events.map((e) => ({
+      id: e.id,
 
-  React.useEffect(() => {
-    if (notify && !refresh) {
-      console.warn('No notification will be sent when refresh is falsy!');
-    }
-  }, [refresh, notify]);
+      occurredAt: new Date(e.createdAt).toLocaleString(),
 
+      eventType: (
+        <Tag>
+          {e.type}
+        </Tag>
+      ),
 
-  const transformDataForTable = () => {
-    return [];
-    // return data.events.map((e) => ({
-    //   id: e.id,
-    //
-    //   occurredAt: new Date(e.createdAt).toLocaleString(),
-    //
-    //   eventType: (
-    //     <Tag>
-    //       {e.type}
-    //     </Tag>
-    //   ),
-    //
-    //   user: (
-    //     <React.Fragment>
-    //       {e.user ? (
-    //         <React.Fragment>
-    //           <Avatar src={e.user.photoURL} />
-    //           <Text b style={{ marginLeft: 10 }}>
-    //             {e.user.firstName} {e.user.lastName}
-    //           </Text>
-    //         </React.Fragment>
-    //       ) : '-'}
-    //     </React.Fragment>
-    //   )
-    // }));
+      user: (
+        <React.Fragment>
+          {e.user ? (
+            <React.Fragment>
+              <Avatar src={e.user.photo}/>
+              <Text b style={{ marginLeft: 10 }}>
+                {e.user.firstName} {e.user.lastName}
+              </Text>
+            </React.Fragment>
+          ) : '-'}
+        </React.Fragment>
+      )
+    }));
   };
 
   const onRowClick = (data: any): void => {
@@ -91,8 +75,8 @@ export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ paginatio
   };
 
   return (
-    <HasPermission permission="admin.events.read.list">
-      {/*{data && (*/}
+    <HasPermission permission="admin.events.read" redirect={false}>
+      {data && (
         <React.Fragment>
           <Text h3>Latest events</Text>
 
@@ -102,7 +86,7 @@ export const LatestEventsTable: React.FC<ILatestEventsTableProps> = ({ paginatio
             <Table.Column prop="eventType" label="Event Type"/>
           </Table>
         </React.Fragment>
-      {/*)}*/}
+      )}
     </HasPermission>
   );
 };
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index 5561d534d..d9d19fb90 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -179,10 +179,12 @@ export type Event = {
   /** The type of the event in one of the predefined event types */
   type: EventType;
   payload?: Maybe<Scalars['JSON']>;
-  /** The ID of the event creator */
-  userId?: Maybe<Scalars['ID']>;
   /** The ID of the common, for whom the event was created */
   commonId?: Maybe<Scalars['ID']>;
+  /** The ID of the event creator */
+  userId?: Maybe<Scalars['ID']>;
+  /** The event creator */
+  user?: Maybe<User>;
 };
 
 export enum EventType {
@@ -723,6 +725,7 @@ export type Query = {
   user?: Maybe<User>;
   generateUserAuthToken: Scalars['String'];
   roles?: Maybe<Array<Maybe<Role>>>;
+  events?: Maybe<Array<Maybe<Event>>>;
   common?: Maybe<Common>;
   proposal?: Maybe<Proposal>;
   discussion?: Maybe<Discussion>;
@@ -744,6 +747,11 @@ export type QueryRolesArgs = {
 };
 
 
+export type QueryEventsArgs = {
+  paginate?: Maybe<PaginateInput>;
+};
+
+
 export type QueryCommonArgs = {
   where: CommonWhereUniqueInput;
 };
@@ -899,6 +907,28 @@ export type LoadUserContextQuery = (
 }
   );
 
+export type GetLatestEventsQueryVariables = Exact<{
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+}>;
+
+
+export type GetLatestEventsQuery = (
+  { __typename?: 'Query' }
+  & {
+  events?: Maybe<Array<Maybe<(
+    { __typename?: 'Event' }
+    & Pick<Event, 'id' | 'createdAt' | 'type'>
+    & {
+    user?: Maybe<(
+      { __typename?: 'User' }
+      & Pick<User, 'firstName' | 'lastName' | 'photo'>
+      )>
+  }
+    )>>>
+}
+  );
+
 
 export const LoadUserContextDocument = gql`
   query loadUserContext {
@@ -939,4 +969,47 @@ export function useLoadUserContextLazyQuery(baseOptions?: Apollo.LazyQueryHookOp
 
 export type LoadUserContextQueryHookResult = ReturnType<typeof useLoadUserContextQuery>;
 export type LoadUserContextLazyQueryHookResult = ReturnType<typeof useLoadUserContextLazyQuery>;
-export type LoadUserContextQueryResult = Apollo.QueryResult<LoadUserContextQuery, LoadUserContextQueryVariables>;
\ No newline at end of file
+export type LoadUserContextQueryResult = Apollo.QueryResult<LoadUserContextQuery, LoadUserContextQueryVariables>;
+export const GetLatestEventsDocument = gql`
+  query GetLatestEvents($take: Int = 10, $skip: Int = 0) {
+    events(paginate: {take: $take, skip: $skip}) {
+      id
+      createdAt
+      type
+      user {
+        firstName
+        lastName
+        photo
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetLatestEventsQuery__
+ *
+ * To run a query within a React component, call `useGetLatestEventsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetLatestEventsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetLatestEventsQuery({
+ *   variables: {
+ *      take: // value for 'take'
+ *      skip: // value for 'skip'
+ *   },
+ * });
+ */
+export function useGetLatestEventsQuery(baseOptions?: Apollo.QueryHookOptions<GetLatestEventsQuery, GetLatestEventsQueryVariables>) {
+  return Apollo.useQuery<GetLatestEventsQuery, GetLatestEventsQueryVariables>(GetLatestEventsDocument, baseOptions);
+}
+
+export function useGetLatestEventsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetLatestEventsQuery, GetLatestEventsQueryVariables>) {
+  return Apollo.useLazyQuery<GetLatestEventsQuery, GetLatestEventsQueryVariables>(GetLatestEventsDocument, baseOptions);
+}
+
+export type GetLatestEventsQueryHookResult = ReturnType<typeof useGetLatestEventsQuery>;
+export type GetLatestEventsLazyQueryHookResult = ReturnType<typeof useGetLatestEventsLazyQuery>;
+export type GetLatestEventsQueryResult = Apollo.QueryResult<GetLatestEventsQuery, GetLatestEventsQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index bd0a34232..9192d8320 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -120,10 +120,12 @@ type Event {
   """The type of the event in one of the predefined event types"""
   type: EventType!
   payload: JSON
-  """The ID of the event creator"""
-  userId: ID
   """The ID of the common, for whom the event was created"""
   commonId: ID
+  """The ID of the event creator"""
+  userId: ID
+  """The event creator"""
+  user: User
 }
 enum EventType {
   CommonCreated
@@ -544,6 +546,7 @@ type Query {
   user(userId: ID): User
   generateUserAuthToken(authId: String!): String!
   roles(paginate: PaginateInput): [Role]
+  events(paginate: PaginateInput): [Event]
   common(where: CommonWhereUniqueInput!): Common
   proposal(where: ProposalWhereUniqueInput!): Proposal
   discussion(id: ID!): Discussion
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 129ea318d..ac7f99a19 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -1309,8 +1309,8 @@
             "deprecationReason": null
           },
           {
-            "name": "userId",
-            "description": "The ID of the event creator",
+            "name": "commonId",
+            "description": "The ID of the common, for whom the event was created",
             "args": [],
             "type": {
               "kind": "SCALAR",
@@ -1321,8 +1321,8 @@
             "deprecationReason": null
           },
           {
-            "name": "commonId",
-            "description": "The ID of the common, for whom the event was created",
+            "name": "userId",
+            "description": "The ID of the event creator",
             "args": [],
             "type": {
               "kind": "SCALAR",
@@ -1331,6 +1331,18 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "user",
+            "description": "The event creator",
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "User",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -5391,6 +5403,35 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "events",
+            "description": null,
+            "args": [
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Event",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "common",
             "description": null,
diff --git a/packages/admin/src/pages/dashboard/index.tsx b/packages/admin/src/pages/dashboard/index.tsx
index 439971f13..a48eecfc9 100644
--- a/packages/admin/src/pages/dashboard/index.tsx
+++ b/packages/admin/src/pages/dashboard/index.tsx
@@ -89,11 +89,9 @@ const DashboardHomePage: NextPage = () => {
 
             <Spacer y={2}/>
 
-            <LatestEventsTable
-              refresh
-              notify
-            />
           </HasPermission>
+
+          <LatestEventsTable/>
         </React.Fragment>
       {/*)}*/}
 
@@ -101,6 +99,6 @@ const DashboardHomePage: NextPage = () => {
   );
 };
 
-export default withPermission('admin.dashboard.*', {
+export default withPermission('admin.*', {
   redirect: true
 })(DashboardHomePage);
\ No newline at end of file
diff --git a/packages/admin/src/pages/error/unauthorized.tsx b/packages/admin/src/pages/error/unauthorized.tsx
index d924bc558..c0b0e61b3 100644
--- a/packages/admin/src/pages/error/unauthorized.tsx
+++ b/packages/admin/src/pages/error/unauthorized.tsx
@@ -4,39 +4,24 @@ import { Text } from '@geist-ui/react';
 import { useRouter } from 'next/router';
 import firebase from 'firebase/app';
 import React from 'react';
-import { gql } from '@apollo/client';
-import { useCreateIntentionMutation, IntentionType } from '@core/graphql';
-
-const CreateIntentionMutation = gql`
-  mutation createIntention($type: IntentionType!, $intention: String!) {
-    createIntention(
-      input: {
-        type: $type,
-        intention: $intention
-      }
-    ) {
-      id
-    }
-  }
-`;
 
 const UnauthorizedPage: NextPage = () => {
   const router = useRouter();
-  const [createIntention] = useCreateIntentionMutation();
+  // const [createIntention] = useCreateIntentionMutation();
 
   React.useEffect(() => {
     (async () => {
       if (router.query.failedPermission) {
-        const { data } = await createIntention({
-          variables: {
-            type: IntentionType.Access,
-            intention: router.query.failedPermission as string
-          }
-        });
+        // const { data } = await createIntention({
+        //   variables: {
+        //     type: IntentionType.Access,
+        //     intention: router.query.failedPermission as string
+        //   }
+        // });
 
         console.error(
           `The permission you are lacking is [${router.query.failedPermission}].` +
-          `You can request it by asking to look up intention with ID ${data.createIntention.id}`
+          `You can request it by asking to look up intention with ID `
         );
       }
     })();
diff --git a/packages/admin/src/pages/index.tsx b/packages/admin/src/pages/index.tsx
index 716675e8f..6c1583963 100644
--- a/packages/admin/src/pages/index.tsx
+++ b/packages/admin/src/pages/index.tsx
@@ -7,9 +7,8 @@ import { useAuthState } from 'react-firebase-hooks/auth';
 
 const IndexPage: NextPage = () => {
   const router = useRouter();
-  const [user, loading, error] = useAuthState(firebase.auth());
 
-console.log(user, loading, error);
+  const [user, loading, error] = useAuthState(firebase.auth());
 
   React.useEffect(() => {
     if(!loading) {
diff --git a/packages/core/prisma/seed.ts b/packages/core/prisma/seed.ts
index 9dda6dd99..910a3c950 100644
--- a/packages/core/prisma/seed.ts
+++ b/packages/core/prisma/seed.ts
@@ -1,9 +1,5 @@
 import { PrismaClient } from '@prisma/client';
 
-import { importUsers } from './firestore/importers/importUsers';
-import { importCommons } from './firestore/importers/importCommons';
-import { importFundingProposals } from './firestore/importers/importFundingProposals';
-
 export const seeder = new PrismaClient();
 
 async function main() {
@@ -12,9 +8,9 @@ async function main() {
   // await seedNotificationTemplated();
 
   // Import firestore
-  await importUsers();
-  await importCommons();
-  await importFundingProposals();
+  // await importUsers();
+  // await importCommons();
+  // await importFundingProposals();
 
   // See roles
   await seeder.role.upsert({
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index 11ac0df63..6e96cb810 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -19,5 +19,7 @@ export const PermissionValidator = z.enum([
   'admin.roles.assign',
   'admin.roles.unassign',
 
+  'admin.events.read',
+
   'user.permissions.read'
 ]);
\ No newline at end of file
diff --git a/packages/core/src/services/commons/command/createCommonCommand.ts b/packages/core/src/services/commons/command/createCommonCommand.ts
index 3e11cfbc8..c9d785309 100644
--- a/packages/core/src/services/commons/command/createCommonCommand.ts
+++ b/packages/core/src/services/commons/command/createCommonCommand.ts
@@ -13,6 +13,9 @@ const schema = z.object({
     .min(2)
     .max(255),
 
+  image: z.string()
+    .nonempty(),
+
   fundingType: z.enum(Object.keys(FundingType) as [(keyof typeof FundingType)]),
 
   fundingMinimumAmount: z.number()
@@ -31,6 +34,8 @@ export const createCommonCommand = async (command: z.infer<typeof schema>): Prom
     data: {
       name: command.name,
 
+      image: command.image,
+
       fundingType: command.fundingType,
       fundingMinimumAmount: command.fundingMinimumAmount
     }
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 0fa4e96c1..a31b30db7 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -85,8 +85,10 @@ export interface NexusGenInputs {
     keyId: string; // String!
   }
   CreateCommonInput: { // input type
+    description?: string | null; // String
     fundingMinimumAmount: number; // Int!
     fundingType: NexusGenEnums['FundingType']; // FundingType!
+    image: string; // String!
     name: string; // String!
   }
   CreateDiscussionInput: { // input type
@@ -234,7 +236,7 @@ export interface NexusGenEnums {
   ReportStatus: 'Active' | 'Clossed'
   SortOrder: 'asc' | 'desc'
   UserNotificationTokenState: 'Active' | 'Expired' | 'Voided'
-  VoteOutcome: "Approve" | "Condemn"
+  VoteOutcome: 'Approve' | 'Condemn'
 }
 
 export interface NexusGenScalars {
@@ -458,6 +460,7 @@ export interface NexusGenFieldTypes {
     payload: NexusGenScalars['JSON'] | null; // JSON
     type: NexusGenEnums['EventType']; // EventType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    user: NexusGenRootTypes['User'] | null; // User
     userId: string | null; // ID
   }
   FundingProposal: { // field return type
@@ -520,6 +523,7 @@ export interface NexusGenFieldTypes {
   Query: { // field return type
     common: NexusGenRootTypes['Common'] | null; // Common
     discussion: NexusGenRootTypes['Discussion'] | null; // Discussion
+    events: Array<NexusGenRootTypes['Event'] | null> | null; // [Event]
     generateUserAuthToken: string; // String!
     proposal: NexusGenRootTypes['Proposal'] | null; // Proposal
     roles: Array<NexusGenRootTypes['Role'] | null> | null; // [Role]
@@ -652,6 +656,7 @@ export interface NexusGenFieldTypeNames {
     payload: 'JSON'
     type: 'EventType'
     updatedAt: 'DateTime'
+    user: 'User'
     userId: 'ID'
   }
   FundingProposal: { // field return type name
@@ -714,6 +719,7 @@ export interface NexusGenFieldTypeNames {
   Query: { // field return type name
     common: 'Common'
     discussion: 'Discussion'
+    events: 'Event'
     generateUserAuthToken: 'String'
     proposal: 'Proposal'
     roles: 'Role'
@@ -892,6 +898,9 @@ export interface NexusGenArgTypes {
     discussion: { // args
       id: string; // ID!
     }
+    events: { // args
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
+    }
     generateUserAuthToken: { // args
       authId: string; // String!
     }
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 3a4122fd7..18f614b2a 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -99,8 +99,10 @@ input CreateCardInput {
 }
 
 input CreateCommonInput {
+  description: String
   fundingMinimumAmount: Int!
   fundingType: FundingType!
+  image: String!
   name: String!
 }
 
@@ -276,6 +278,9 @@ type Event {
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
 
+  """The event creator"""
+  user: User
+
   """The ID of the event creator"""
   userId: ID
 }
@@ -535,6 +540,7 @@ input ProposalWhereUniqueInput {
 type Query {
   common(where: CommonWhereUniqueInput!): Common
   discussion(id: ID!): Discussion
+  events(paginate: PaginateInput): [Event]
   generateUserAuthToken(authId: String!): String!
   proposal(where: ProposalWhereUniqueInput!): Proposal
   roles(paginate: PaginateInput): [Role]
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts b/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
index 9cf2fb98c..35cad1af7 100644
--- a/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
+++ b/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
@@ -12,6 +12,9 @@ export const CreateCommonInput = inputObjectType({
     t.nonNull.field('fundingType', {
       type: 'FundingType'
     });
+
+    t.nonNull.string('image');
+    t.string('description');
   }
 });
 
diff --git a/packages/graphql/src/schema/Types/Events/Extensions/EventUser.extension.ts b/packages/graphql/src/schema/Types/Events/Extensions/EventUser.extension.ts
new file mode 100644
index 000000000..fce9a61c0
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Events/Extensions/EventUser.extension.ts
@@ -0,0 +1,29 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const EventUserExtension = extendType({
+  type: 'Event',
+  definition(t) {
+    t.id('userId', {
+      description: 'The ID of the event creator'
+    });
+
+    t.field('user', {
+      type: 'User',
+      complexity: 10,
+      description: 'The event creator',
+      resolve: (root) => {
+        if (!root.userId) {
+          return null;
+        }
+
+        return prisma.user
+          .findUnique({
+            where: {
+              id: root.userId
+            }
+          });
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Events/Queries/GetEvents.query.ts b/packages/graphql/src/schema/Types/Events/Queries/GetEvents.query.ts
new file mode 100644
index 000000000..7977a45d2
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Events/Queries/GetEvents.query.ts
@@ -0,0 +1,20 @@
+import { arg, queryField, list } from 'nexus';
+import { prisma, authorizationService } from '@common/core';
+
+export const GetEventsQuery = queryField('events', {
+  type: list('Event'),
+  args: {
+    paginate: arg({
+      type: 'PaginateInput'
+    })
+  },
+  authorize: async (root, args, ctx) =>
+    authorizationService.can(await ctx.getUserId(), 'admin.events.read'),
+  resolve: async (root, args) => {
+    return prisma.event
+      .findMany({
+        skip: args.paginate?.skip || undefined,
+        take: args.paginate?.take || undefined
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Events/Types/Event.type.ts b/packages/graphql/src/schema/Types/Events/Types/Event.type.ts
index 17dea7774..6b873eaa3 100644
--- a/packages/graphql/src/schema/Types/Events/Types/Event.type.ts
+++ b/packages/graphql/src/schema/Types/Events/Types/Event.type.ts
@@ -22,10 +22,6 @@ export const EventType = objectType({
 
     t.json('payload');
 
-    t.id('userId', {
-      description: 'The ID of the event creator'
-    });
-
     t.id('commonId', {
       description: 'The ID of the common, for whom the event was created'
     });
diff --git a/packages/graphql/src/schema/Types/Events/index.ts b/packages/graphql/src/schema/Types/Events/index.ts
index faa05d7d7..9ed02caad 100644
--- a/packages/graphql/src/schema/Types/Events/index.ts
+++ b/packages/graphql/src/schema/Types/Events/index.ts
@@ -2,9 +2,16 @@ import { EventType } from './Types/Event.type';
 import { EventTypeEnum } from './Enums/EventType.enum';
 import { EventOrderByInput } from './Inputs/EventOrderByInput';
 
+import { GetEventsQuery } from './Queries/GetEvents.query';
+import { EventUserExtension } from './Extensions/EventUser.extension';
+
 export const EventTypes = [
   EventType,
   EventTypeEnum,
 
-  EventOrderByInput
+  EventOrderByInput,
+
+  EventUserExtension,
+
+  GetEventsQuery
 ];
\ No newline at end of file

From 2ae6fc98c45ca92210a069a96773438d6bbb1c0f Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 28 Apr 2021 09:04:41 +0300
Subject: [PATCH 09/29] Statistics

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../prisma/models/Statistics/Statistic.prisma | 21 +++++++++
 .../Statistics/enums/StatisticType.prisma     |  7 +++
 packages/core/prisma/schema.prisma            | 30 +++++++++++++
 packages/core/prisma/seed.ts                  | 17 ++++++-
 .../graphql/src/generated/nexus-typegen.ts    | 45 +++++++++++++++++--
 packages/graphql/src/generated/schema.graphql | 28 ++++++++++++
 .../Statistics/Enums/StatisticType.enum.ts    |  7 +++
 .../Inputs/StatisticsWhere.input.ts           | 10 +++++
 .../Statistics/Queries/GetStatistics.query.ts | 16 +++++++
 .../Types/Statistics/Types/Statistic.type.ts  | 13 ++++++
 .../src/schema/Types/Statistics/index.ts      | 14 ++++++
 packages/graphql/src/schema/index.ts          |  2 +
 12 files changed, 205 insertions(+), 5 deletions(-)
 create mode 100644 packages/core/prisma/models/Statistics/Statistic.prisma
 create mode 100644 packages/core/prisma/models/Statistics/enums/StatisticType.prisma
 create mode 100644 packages/graphql/src/schema/Types/Statistics/Enums/StatisticType.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/Statistics/Inputs/StatisticsWhere.input.ts
 create mode 100644 packages/graphql/src/schema/Types/Statistics/Queries/GetStatistics.query.ts
 create mode 100644 packages/graphql/src/schema/Types/Statistics/Types/Statistic.type.ts
 create mode 100644 packages/graphql/src/schema/Types/Statistics/index.ts

diff --git a/packages/core/prisma/models/Statistics/Statistic.prisma b/packages/core/prisma/models/Statistics/Statistic.prisma
new file mode 100644
index 000000000..73c2f7c9f
--- /dev/null
+++ b/packages/core/prisma/models/Statistics/Statistic.prisma
@@ -0,0 +1,21 @@
+model Statistic {
+  id String @id @default(uuid())
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  type StatisticType
+
+  users Int
+
+  commons  Int
+
+  joinProposals     Int
+  fundingProposals Int
+
+  discussions        Int
+  discussionMessages Int
+
+  payments       Int
+  paymentsAmount Int
+}
\ No newline at end of file
diff --git a/packages/core/prisma/models/Statistics/enums/StatisticType.prisma b/packages/core/prisma/models/Statistics/enums/StatisticType.prisma
new file mode 100644
index 000000000..6a4b3ff31
--- /dev/null
+++ b/packages/core/prisma/models/Statistics/enums/StatisticType.prisma
@@ -0,0 +1,7 @@
+enum StatisticType {
+  AllTime
+
+  Hourly
+  Daily
+  Weekly
+}
\ No newline at end of file
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index 49ad95c70..747777349 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -1,3 +1,33 @@
+model Statistic {
+  id String @id @default(uuid())
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  type StatisticType
+
+  users Int
+
+  commons Int
+
+  joinProposals    Int
+  fundingProposals Int
+
+  discussions        Int
+  discussionMessages Int
+
+  payments       Int
+  paymentsAmount Int
+}
+
+enum StatisticType {
+  AllTime
+
+  Hourly
+  Daily
+  Weekly
+}
+
 datasource db {
   provider = "postgresql"
   url      = env("Database.Url")
diff --git a/packages/core/prisma/seed.ts b/packages/core/prisma/seed.ts
index 910a3c950..f1575023b 100644
--- a/packages/core/prisma/seed.ts
+++ b/packages/core/prisma/seed.ts
@@ -1,4 +1,4 @@
-import { PrismaClient } from '@prisma/client';
+import { PrismaClient, StatisticType } from '@prisma/client';
 
 export const seeder = new PrismaClient();
 
@@ -43,6 +43,21 @@ async function main() {
       ]
     }
   });
+
+  await seeder.statistic.create({
+    data: {
+      type: StatisticType.AllTime,
+
+      users: 0,
+      commons: 0,
+      payments: 0,
+      paymentsAmount: 0,
+      discussions: 0,
+      discussionMessages: 0,
+      fundingProposals: 0,
+      joinProposals: 0
+    }
+  });
 }
 
 main()
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index a31b30db7..b242cba15 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -204,6 +204,9 @@ export interface NexusGenInputs {
     for?: NexusGenEnums['ReportFor'] | null; // ReportFor
     status?: NexusGenInputs['ReportStatusFilterInput'] | null; // ReportStatusFilterInput
   }
+  StatisticsWhereInput: { // input type
+    type?: NexusGenEnums['StatisticType'] | null; // StatisticType
+  }
   StringFilter: { // input type
     contains?: string | null; // String
     endsWith?: string | null; // String
@@ -235,6 +238,7 @@ export interface NexusGenEnums {
   ReportFor: 'FalseNews' | 'Harassment' | 'Hate' | 'Nudity' | 'Other' | 'Spam' | 'Violance'
   ReportStatus: 'Active' | 'Clossed'
   SortOrder: 'asc' | 'desc'
+  StatisticType: 'AllTime' | 'Daily' | 'Hourly' | 'Weekly'
   UserNotificationTokenState: 'Active' | 'Expired' | 'Voided'
   VoteOutcome: 'Approve' | 'Condemn'
 }
@@ -360,6 +364,15 @@ export interface NexusGenObjects {
     permissions: string[]; // [String!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
+  Statistic: { // root type
+    commons: number; // Int!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    fundingProposals: number; // Int!
+    id: NexusGenScalars['UUID']; // UUID!
+    joinProposals: number; // Int!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    users: number; // Int!
+  }
   Subscription: {};
   User: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
@@ -388,7 +401,7 @@ export interface NexusGenObjects {
 }
 
 export interface NexusGenInterfaces {
-  BaseEntity: NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['UserNotificationToken'];
+  BaseEntity: NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
 }
 
 export interface NexusGenUnions {
@@ -525,6 +538,7 @@ export interface NexusGenFieldTypes {
     discussion: NexusGenRootTypes['Discussion'] | null; // Discussion
     events: Array<NexusGenRootTypes['Event'] | null> | null; // [Event]
     generateUserAuthToken: string; // String!
+    getStatistics: Array<NexusGenRootTypes['Statistic'] | null> | null; // [Statistic]
     proposal: NexusGenRootTypes['Proposal'] | null; // Proposal
     roles: Array<NexusGenRootTypes['Role'] | null> | null; // [Role]
     user: NexusGenRootTypes['User'] | null; // User
@@ -551,6 +565,15 @@ export interface NexusGenFieldTypes {
     permissions: string[]; // [String!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
+  Statistic: { // field return type
+    commons: number; // Int!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    fundingProposals: number; // Int!
+    id: NexusGenScalars['UUID']; // UUID!
+    joinProposals: number; // Int!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    users: number; // Int!
+  }
   Subscription: { // field return type
     discussionMessageCreated: NexusGenRootTypes['DiscussionMessage'] | null; // DiscussionMessage
     notificationCreated: NexusGenRootTypes['Notification'] | null; // Notification
@@ -721,6 +744,7 @@ export interface NexusGenFieldTypeNames {
     discussion: 'Discussion'
     events: 'Event'
     generateUserAuthToken: 'String'
+    getStatistics: 'Statistic'
     proposal: 'Proposal'
     roles: 'Role'
     user: 'User'
@@ -747,6 +771,15 @@ export interface NexusGenFieldTypeNames {
     permissions: 'String'
     updatedAt: 'DateTime'
   }
+  Statistic: { // field return type name
+    commons: 'Int'
+    createdAt: 'DateTime'
+    fundingProposals: 'Int'
+    id: 'UUID'
+    joinProposals: 'Int'
+    updatedAt: 'DateTime'
+    users: 'Int'
+  }
   Subscription: { // field return type name
     discussionMessageCreated: 'DiscussionMessage'
     notificationCreated: 'Notification'
@@ -904,6 +937,9 @@ export interface NexusGenArgTypes {
     generateUserAuthToken: { // args
       authId: string; // String!
     }
+    getStatistics: { // args
+      where?: NexusGenInputs['StatisticsWhereInput'] | null; // StatisticsWhereInput
+    }
     proposal: { // args
       where: NexusGenInputs['ProposalWhereUniqueInput']; // ProposalWhereUniqueInput!
     }
@@ -948,7 +984,7 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "Notification" | "Report" | "Role" | "UserNotificationToken"
+  BaseEntity: 'Discussion' | 'DiscussionMessage' | 'DiscussionSubscription' | 'Notification' | 'Report' | 'Role' | 'Statistic' | 'UserNotificationToken'
 }
 
 export interface NexusGenTypeInterfaces {
@@ -957,8 +993,9 @@ export interface NexusGenTypeInterfaces {
   DiscussionSubscription: "BaseEntity"
   Notification: "BaseEntity"
   Report: "BaseEntity"
-  Role: "BaseEntity"
-  UserNotificationToken: "BaseEntity"
+  Role: 'BaseEntity'
+  Statistic: 'BaseEntity'
+  UserNotificationToken: 'BaseEntity'
 }
 
 export type NexusGenObjectNames = keyof NexusGenObjects;
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 18f614b2a..42854b2c8 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -542,6 +542,7 @@ type Query {
   discussion(id: ID!): Discussion
   events(paginate: PaginateInput): [Event]
   generateUserAuthToken(authId: String!): String!
+  getStatistics(where: StatisticsWhereInput): [Statistic]
   proposal(where: ProposalWhereUniqueInput!): Proposal
   roles(paginate: PaginateInput): [Role]
 
@@ -639,6 +640,33 @@ enum SortOrder {
   desc
 }
 
+type Statistic implements BaseEntity {
+  commons: Int!
+
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  fundingProposals: Int!
+
+  """The main identifier of the item"""
+  id: UUID!
+  joinProposals: Int!
+
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  users: Int!
+}
+
+enum StatisticType {
+  AllTime
+  Daily
+  Hourly
+  Weekly
+}
+
+input StatisticsWhereInput {
+  type: StatisticType
+}
+
 input StringFilter {
   contains: String
   endsWith: String
diff --git a/packages/graphql/src/schema/Types/Statistics/Enums/StatisticType.enum.ts b/packages/graphql/src/schema/Types/Statistics/Enums/StatisticType.enum.ts
new file mode 100644
index 000000000..0cba038fc
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Statistics/Enums/StatisticType.enum.ts
@@ -0,0 +1,7 @@
+import { enumType } from 'nexus';
+import { StatisticType } from '@prisma/client';
+
+export const StatisticTypeEnum = enumType({
+  name: 'StatisticType',
+  members: StatisticType
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Statistics/Inputs/StatisticsWhere.input.ts b/packages/graphql/src/schema/Types/Statistics/Inputs/StatisticsWhere.input.ts
new file mode 100644
index 000000000..a81b57fa3
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Statistics/Inputs/StatisticsWhere.input.ts
@@ -0,0 +1,10 @@
+import { inputObjectType } from 'nexus';
+
+export const StatisticsWhereInput = inputObjectType({
+  name: 'StatisticsWhereInput',
+  definition(t) {
+    t.field('type', {
+      type: 'StatisticType'
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Statistics/Queries/GetStatistics.query.ts b/packages/graphql/src/schema/Types/Statistics/Queries/GetStatistics.query.ts
new file mode 100644
index 000000000..f6befe5e7
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Statistics/Queries/GetStatistics.query.ts
@@ -0,0 +1,16 @@
+import { queryField, arg, list } from 'nexus';
+import { prisma } from '@common/core';
+
+export const GetStatisticsQuery = queryField('getStatistics', {
+  type: list('Statistic'),
+  args: {
+    where: arg({
+      type: 'StatisticsWhereInput'
+    })
+  },
+  resolve: (root, args) => {
+    return prisma.statistic.findMany({
+      where: args.where as any
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Statistics/Types/Statistic.type.ts b/packages/graphql/src/schema/Types/Statistics/Types/Statistic.type.ts
new file mode 100644
index 000000000..4d87bfe5f
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Statistics/Types/Statistic.type.ts
@@ -0,0 +1,13 @@
+import { objectType } from 'nexus';
+
+export const StatisticType = objectType({
+  name: 'Statistic',
+  definition(t) {
+    t.implements('BaseEntity');
+
+    t.nonNull.int('users');
+    t.nonNull.int('commons');
+    t.nonNull.int('fundingProposals');
+    t.nonNull.int('joinProposals');
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Statistics/index.ts b/packages/graphql/src/schema/Types/Statistics/index.ts
new file mode 100644
index 000000000..0bea7a869
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Statistics/index.ts
@@ -0,0 +1,14 @@
+import { StatisticTypeEnum } from './Enums/StatisticType.enum';
+import { StatisticType } from './Types/Statistic.type';
+import { GetStatisticsQuery } from './Queries/GetStatistics.query';
+import { StatisticsWhereInput } from './Inputs/StatisticsWhere.input';
+
+export const StatisticTypes = [
+  StatisticTypeEnum,
+
+  StatisticType,
+
+  GetStatisticsQuery,
+
+  StatisticsWhereInput
+];
\ No newline at end of file
diff --git a/packages/graphql/src/schema/index.ts b/packages/graphql/src/schema/index.ts
index 9c08a71e3..28724fdfc 100644
--- a/packages/graphql/src/schema/index.ts
+++ b/packages/graphql/src/schema/index.ts
@@ -9,6 +9,7 @@ import { EventTypes } from './Types/Events';
 import { CommonTypes } from './Types/Commons';
 import { ReportTypes } from './Types/Reports';
 import { ProposalTypes } from './Types/Proposals';
+import { StatisticTypes } from './Types/Statistics';
 import { DiscussionTypes } from './Types/Discussion';
 import { CommonMemberTypes } from './Types/CommonMember';
 import { NotificationTypes } from './Types/Notifications';
@@ -38,6 +39,7 @@ const types = [
   CommonTypes,
   ReportTypes,
   ProposalTypes,
+  StatisticTypes,
   DiscussionTypes,
   CommonMemberTypes,
   NotificationTypes,

From 5a5cf0e094b968fa1cf43a5d731fc50867c9dce4 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 28 Apr 2021 09:41:43 +0300
Subject: [PATCH 10/29] Dashboard statistics

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 packages/admin/src/core/graphql/index.ts      |  87 +++++-
 .../admin/src/core/graphql/schema.graphql     |  24 ++
 packages/admin/src/core/graphql/schema.json   | 249 ++++++++++++++++++
 packages/admin/src/pages/dashboard/index.tsx  | 140 +++++-----
 .../migration.sql                             |  20 ++
 .../20210428053225_typo/migration.sql         |  10 +
 7 files changed, 465 insertions(+), 66 deletions(-)
 create mode 100644 packages/core/prisma/migrations/20210428052832_statistics_migration/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210428053225_typo/migration.sql

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index c53213971..2fcf66706 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -3,6 +3,7 @@ schema: "http://localhost:4000/graphql"
 documents:
   - "src/core/**/*.tsx"
   - "src/components/tables/LatestEventsTable.tsx"
+  - "src/pages/dashboard/index.tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index d9d19fb90..af4146682 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -298,6 +298,8 @@ export type CreateCommonInput = {
   name: Scalars['String'];
   fundingMinimumAmount: Scalars['Int'];
   fundingType: FundingType;
+  image: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
 };
 
 export type CommonWhereUniqueInput = {
@@ -463,6 +465,31 @@ export type ProposalWhereUniqueInput = {
   id: Scalars['UUID'];
 };
 
+export enum StatisticType {
+  AllTime = 'AllTime',
+  Hourly = 'Hourly',
+  Daily = 'Daily',
+  Weekly = 'Weekly'
+}
+
+export type Statistic = BaseEntity & {
+  __typename?: 'Statistic';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  users: Scalars['Int'];
+  commons: Scalars['Int'];
+  fundingProposals: Scalars['Int'];
+  joinProposals: Scalars['Int'];
+};
+
+export type StatisticsWhereInput = {
+  type?: Maybe<StatisticType>;
+};
+
 export type Discussion = BaseEntity & {
   __typename?: 'Discussion';
   /** The main identifier of the item */
@@ -728,6 +755,7 @@ export type Query = {
   events?: Maybe<Array<Maybe<Event>>>;
   common?: Maybe<Common>;
   proposal?: Maybe<Proposal>;
+  getStatistics?: Maybe<Array<Maybe<Statistic>>>;
   discussion?: Maybe<Discussion>;
 };
 
@@ -762,6 +790,11 @@ export type QueryProposalArgs = {
 };
 
 
+export type QueryGetStatisticsArgs = {
+  where?: Maybe<StatisticsWhereInput>;
+};
+
+
 export type QueryDiscussionArgs = {
   id: Scalars['ID'];
 };
@@ -929,6 +962,19 @@ export type GetLatestEventsQuery = (
 }
   );
 
+export type GetAllTimeStatistiscQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type GetAllTimeStatistiscQuery = (
+  { __typename?: 'Query' }
+  & {
+  getStatistics?: Maybe<Array<Maybe<(
+    { __typename?: 'Statistic' }
+    & Pick<Statistic, 'users' | 'commons' | 'joinProposals' | 'fundingProposals'>
+    )>>>
+}
+  );
+
 
 export const LoadUserContextDocument = gql`
   query loadUserContext {
@@ -962,11 +1008,9 @@ export const LoadUserContextDocument = gql`
 export function useLoadUserContextQuery(baseOptions?: Apollo.QueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
   return Apollo.useQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
 }
-
 export function useLoadUserContextLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
   return Apollo.useLazyQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
 }
-
 export type LoadUserContextQueryHookResult = ReturnType<typeof useLoadUserContextQuery>;
 export type LoadUserContextLazyQueryHookResult = ReturnType<typeof useLoadUserContextLazyQuery>;
 export type LoadUserContextQueryResult = Apollo.QueryResult<LoadUserContextQuery, LoadUserContextQueryVariables>;
@@ -1012,4 +1056,41 @@ export function useGetLatestEventsLazyQuery(baseOptions?: Apollo.LazyQueryHookOp
 
 export type GetLatestEventsQueryHookResult = ReturnType<typeof useGetLatestEventsQuery>;
 export type GetLatestEventsLazyQueryHookResult = ReturnType<typeof useGetLatestEventsLazyQuery>;
-export type GetLatestEventsQueryResult = Apollo.QueryResult<GetLatestEventsQuery, GetLatestEventsQueryVariables>;
\ No newline at end of file
+export type GetLatestEventsQueryResult = Apollo.QueryResult<GetLatestEventsQuery, GetLatestEventsQueryVariables>;
+export const GetAllTimeStatistiscDocument = gql`
+  query getAllTimeStatistisc {
+    getStatistics(where: {type: AllTime}) {
+      users
+      commons
+      joinProposals
+      fundingProposals
+    }
+  }
+`;
+
+/**
+ * __useGetAllTimeStatistiscQuery__
+ *
+ * To run a query within a React component, call `useGetAllTimeStatistiscQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetAllTimeStatistiscQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetAllTimeStatistiscQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useGetAllTimeStatistiscQuery(baseOptions?: Apollo.QueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
+  return Apollo.useQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
+}
+
+export function useGetAllTimeStatistiscLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
+  return Apollo.useLazyQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
+}
+
+export type GetAllTimeStatistiscQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscQuery>;
+export type GetAllTimeStatistiscLazyQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscLazyQuery>;
+export type GetAllTimeStatistiscQueryResult = Apollo.QueryResult<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 9192d8320..86360d14c 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -201,6 +201,8 @@ input CreateCommonInput {
   name: String!
   fundingMinimumAmount: Int!
   fundingType: FundingType!
+  image: String!
+  description: String
 }
 input CommonWhereUniqueInput {
   id: ID!
@@ -333,6 +335,27 @@ enum ProposalState {
 input ProposalWhereUniqueInput {
   id: UUID!
 }
+enum StatisticType {
+  AllTime
+  Hourly
+  Daily
+  Weekly
+}
+type Statistic implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  users: Int!
+  commons: Int!
+  fundingProposals: Int!
+  joinProposals: Int!
+}
+input StatisticsWhereInput {
+  type: StatisticType
+}
 type Discussion implements BaseEntity {
   """The main identifier of the item"""
   id: UUID!
@@ -549,6 +572,7 @@ type Query {
   events(paginate: PaginateInput): [Event]
   common(where: CommonWhereUniqueInput!): Common
   proposal(where: ProposalWhereUniqueInput!): Proposal
+  getStatistics(where: StatisticsWhereInput): [Statistic]
   discussion(id: ID!): Discussion
 }
 type Mutation {
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index ac7f99a19..1a0456d44 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -2090,6 +2090,34 @@
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "image",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "interfaces": null,
@@ -3323,6 +3351,193 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "StatisticType",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "AllTime",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Hourly",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Daily",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Weekly",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "Statistic",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "users",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "commons",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "fundingProposals",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "joinProposals",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "StatisticsWhereInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "type",
+            "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "StatisticType",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "Discussion",
@@ -4862,6 +5077,11 @@
             "name": "Report",
             "ofType": null
           },
+          {
+            "kind": "OBJECT",
+            "name": "Statistic",
+            "ofType": null
+          },
           {
             "kind": "OBJECT",
             "name": "Discussion",
@@ -5490,6 +5710,35 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "getStatistics",
+            "description": null,
+            "args": [
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "StatisticsWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Statistic",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "discussion",
             "description": null,
diff --git a/packages/admin/src/pages/dashboard/index.tsx b/packages/admin/src/pages/dashboard/index.tsx
index a48eecfc9..498ecb19f 100644
--- a/packages/admin/src/pages/dashboard/index.tsx
+++ b/packages/admin/src/pages/dashboard/index.tsx
@@ -7,13 +7,28 @@ import { withPermission } from '../../helpers/hoc/withPermission';
 import { LatestEventsTable } from '@components/tables/LatestEventsTable';
 import { useRouter } from 'next/router';
 import { Link } from '@components/Link';
-
+import { gql } from '@apollo/client';
+import { useGetAllTimeStatistiscQuery } from '@core/graphql';
+import Skeleton from 'react-loading-skeleton';
+
+
+const GetAllTimeStatistics = gql`
+  query getAllTimeStatistisc {
+    getStatistics(where: {
+      type: AllTime
+    }) {
+      users
+      commons
+      joinProposals
+      fundingProposals
+    }
+  }
+`;
 
 const DashboardHomePage: NextPage = () => {
   const router = useRouter();
 
-  // const data = useGetDashboardDataQuery();
-  // const statistics = useStatisticsQuery();
+  const statistics = useGetAllTimeStatistiscQuery();
 
   const onCardClick = (url: string) => {
     return () => {
@@ -34,66 +49,65 @@ const DashboardHomePage: NextPage = () => {
 
       <Spacer y={2}/>
 
-      {/*{data.data && (*/}
-        <React.Fragment>
-          <HasPermission permission="admin.dashboard.read.overview">
-            <Text h3>Application's overview</Text>
-
-            <Grid.Container gap={2} alignItems="stretch" style={{ display: 'flex' }}>
-              <Grid sm={24} md={8} onClick={onCardClick('/commons')} style={{ cursor: 'pointer' }}>
-                <Card hoverable>
-                  <Text h1>
-                    {/*{statistics.data && (*/}
-                    {/*  statistics.data.statistics.commons*/}
-                    {/*)}*/}
-
-                    {/*{!statistics.data && (*/}
-                    {/*  <Skeleton/>*/}
-                    {/*)}*/}
-                  </Text>
-                  <Text p>Total commons created</Text>
-                </Card>
-              </Grid>
-
-              <Grid sm={24} md={8} onClick={onCardClick('/proposals')} style={{ cursor: 'pointer' }}>
-                <Card hoverable>
-                  <Text h1>
-                    {/*{statistics.data && (*/}
-                    {/*  statistics.data.statistics.joinRequests +*/}
-                    {/*  statistics.data.statistics.fundingRequests*/}
-                    {/*)}*/}
-
-                    {/*{!statistics.data && (*/}
-                    {/*  <Skeleton/>*/}
-                    {/*)}*/}
-                  </Text>
-                  <Text p>Proposals created</Text>
-                </Card>
-              </Grid>
-
-              <Grid sm={24} md={8} onClick={onCardClick('/users')} style={{ cursor: 'pointer' }}>
-                <Card hoverable>
-                  <Text h1>
-                    {/*{statistics.data && (*/}
-                    {/*  statistics.data.statistics.users*/}
-                    {/*)}*/}
-
-                    {/*{!statistics.data && (*/}
-                    {/*  <Skeleton/>*/}
-                    {/*)}*/}
-                  </Text>
-                  <Text p>User on common</Text>
-                </Card>
-              </Grid>
-            </Grid.Container>
-
-            <Spacer y={2}/>
-
-          </HasPermission>
-
-          <LatestEventsTable/>
-        </React.Fragment>
-      {/*)}*/}
+
+      {/* --- Overview --- */}
+      <HasPermission permission="admin.dashboard.read.overview">
+        <Text h3>Application's overview</Text>
+
+        <Grid.Container gap={2} alignItems="stretch" style={{ display: 'flex' }}>
+          <Grid sm={24} md={8} onClick={onCardClick('/commons')} style={{ cursor: 'pointer' }}>
+            <Card hoverable>
+              <Text h1>
+                {statistics.data && (
+                  statistics.data.getStatistics[0].commons
+                )}
+
+                {!statistics.data && (
+                  <Skeleton/>
+                )}
+              </Text>
+              <Text p>Total commons created</Text>
+            </Card>
+          </Grid>
+
+          <Grid sm={24} md={8} onClick={onCardClick('/proposals')} style={{ cursor: 'pointer' }}>
+            <Card hoverable>
+              <Text h1>
+                {statistics.data && (
+                  statistics.data.getStatistics[0].joinProposals +
+                  statistics.data.getStatistics[0].fundingProposals
+                )}
+
+                {!statistics.data && (
+                  <Skeleton/>
+                )}
+              </Text>
+              <Text p>Proposals created</Text>
+            </Card>
+          </Grid>
+
+          <Grid sm={24} md={8} onClick={onCardClick('/users')} style={{ cursor: 'pointer' }}>
+            <Card hoverable>
+              <Text h1>
+                {statistics.data && (
+                  statistics.data.getStatistics[0].users
+                )}
+
+                {!statistics.data && (
+                  <Skeleton/>
+                )}
+              </Text>
+              <Text p>User on common</Text>
+            </Card>
+          </Grid>
+        </Grid.Container>
+
+        <Spacer y={2}/>
+      </HasPermission>
+
+
+      {/* --- Events table --- */}
+      <LatestEventsTable/>
 
     </React.Fragment>
   );
diff --git a/packages/core/prisma/migrations/20210428052832_statistics_migration/migration.sql b/packages/core/prisma/migrations/20210428052832_statistics_migration/migration.sql
new file mode 100644
index 000000000..d3910f730
--- /dev/null
+++ b/packages/core/prisma/migrations/20210428052832_statistics_migration/migration.sql
@@ -0,0 +1,20 @@
+-- CreateEnum
+CREATE TYPE "StatisticType" AS ENUM ('AllTime', 'Hourly', 'Daily', 'Weekly');
+
+-- CreateTable
+CREATE TABLE "Statistic" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "type" "StatisticType" NOT NULL,
+    "users" INTEGER NOT NULL,
+    "commons" INTEGER NOT NULL,
+    "joinProposals" INTEGER NOT NULL,
+    "fundingProposasls" INTEGER NOT NULL,
+    "discussions" INTEGER NOT NULL,
+    "discussionMessages" INTEGER NOT NULL,
+    "payments" INTEGER NOT NULL,
+    "paymentsAmount" INTEGER NOT NULL,
+
+    PRIMARY KEY ("id")
+);
diff --git a/packages/core/prisma/migrations/20210428053225_typo/migration.sql b/packages/core/prisma/migrations/20210428053225_typo/migration.sql
new file mode 100644
index 000000000..ffd254185
--- /dev/null
+++ b/packages/core/prisma/migrations/20210428053225_typo/migration.sql
@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `fundingProposasls` on the `Statistic` table. All the data in the column will be lost.
+  - Added the required column `fundingProposals` to the `Statistic` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- AlterTable
+ALTER TABLE "Statistic" DROP COLUMN "fundingProposasls",
+ADD COLUMN     "fundingProposals" INTEGER NOT NULL;

From 07eb1da13f3cd233761dd3c863bb6add192cb707 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 28 Apr 2021 10:27:12 +0300
Subject: [PATCH 11/29] Common and user statistic counter

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/core/src/index.ts                    |  1 +
 .../events/commands/$createEventCommand.ts    | 11 +---
 packages/core/src/services/index.ts           |  1 +
 .../commands/updateAllTimeStatistics.ts       | 30 ++++++++++
 .../core/src/services/statistics/index.ts     |  5 ++
 .../graphql/src/generated/nexus-typegen.ts    | 55 +++++++++----------
 packages/worker/src/events/onCommonCreated.ts | 17 ++++++
 packages/worker/src/events/onUserCreated.ts   | 15 +++++
 packages/worker/src/index.ts                  |  3 +
 .../worker/src/processors/EventsWorker.ts     |  8 +--
 10 files changed, 102 insertions(+), 44 deletions(-)
 create mode 100644 packages/core/src/services/statistics/commands/updateAllTimeStatistics.ts
 create mode 100644 packages/core/src/services/statistics/index.ts
 create mode 100644 packages/worker/src/events/onCommonCreated.ts
 create mode 100644 packages/worker/src/events/onUserCreated.ts

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index e95b7ad45..934775bf0 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -20,6 +20,7 @@ export { commonService } from './services/commons';
 export { reportService } from './services/reports';
 export { paymentService } from './services/payments';
 export { proposalService } from './services/proposals';
+export { statisticService } from './services/statistics';
 export { discussionService } from './services/discussions';
 export { notificationService } from './services/notifications';
 export { authorizationService } from './services/authorization';
diff --git a/packages/core/src/services/events/commands/$createEventCommand.ts b/packages/core/src/services/events/commands/$createEventCommand.ts
index 17823ea9b..20f570265 100644
--- a/packages/core/src/services/events/commands/$createEventCommand.ts
+++ b/packages/core/src/services/events/commands/$createEventCommand.ts
@@ -2,7 +2,6 @@ import * as z from 'zod';
 
 import { Event, EventType } from '@prisma/client';
 import { prisma } from '@toolkits';
-import { worker } from '@common/queues';
 
 const schema = z.object({
   type: z.enum(Object.keys(EventType) as [(keyof typeof EventType)]),
@@ -35,14 +34,8 @@ const schema = z.object({
  *
  * @param payload - The payload to create the event
  */
-export const $createEventCommand = async (payload: z.infer<typeof schema>): Promise<Event> => {
-  const event = await prisma.event.create({
+export const $createEventCommand = (payload: z.infer<typeof schema>): Promise<Event> => {
+  return prisma.event.create({
     data: payload
   });
-
-  worker.addEventJob('process', {
-    event: event as any
-  });
-
-  return event;
 };
\ No newline at end of file
diff --git a/packages/core/src/services/index.ts b/packages/core/src/services/index.ts
index 9ef0a7fbd..fefdaeb0b 100644
--- a/packages/core/src/services/index.ts
+++ b/packages/core/src/services/index.ts
@@ -6,6 +6,7 @@ export { eventService } from './events';
 export { commonService } from './commons';
 export { reportService } from './reports';
 export { paymentService } from './payments';
+export { statisticService } from './statistics';
 export { discussionService } from './discussions';
 export { notificationService } from './notifications';
 export { joinProposalService, proposalService } from './proposals';
diff --git a/packages/core/src/services/statistics/commands/updateAllTimeStatistics.ts b/packages/core/src/services/statistics/commands/updateAllTimeStatistics.ts
new file mode 100644
index 000000000..ef6160db4
--- /dev/null
+++ b/packages/core/src/services/statistics/commands/updateAllTimeStatistics.ts
@@ -0,0 +1,30 @@
+import * as z from 'zod';
+import { StatisticType } from '@prisma/client';
+
+import { prisma } from '@toolkits';
+
+const intOperation = z.object({
+  increment: z.number()
+    .optional(),
+
+  decrement: z.number()
+    .optional()
+}).optional();
+
+const schema = z.object({
+  commons: intOperation,
+  users: intOperation
+});
+
+export const updateAllTimeStatistics = async (command: z.infer<typeof schema>): Promise<void> => {
+  // Validate the command
+  schema.parse(command);
+
+
+  await prisma.statistic.updateMany({
+    where: {
+      type: StatisticType.AllTime
+    },
+    data: command
+  });
+};
\ No newline at end of file
diff --git a/packages/core/src/services/statistics/index.ts b/packages/core/src/services/statistics/index.ts
new file mode 100644
index 000000000..9bfa60d14
--- /dev/null
+++ b/packages/core/src/services/statistics/index.ts
@@ -0,0 +1,5 @@
+import { updateAllTimeStatistics } from './commands/updateAllTimeStatistics';
+
+export const statisticService = {
+  updateAllTime: updateAllTimeStatistics
+};
\ No newline at end of file
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index b242cba15..22c2dc44c 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,11 +4,10 @@
  */
 
 
-import { IRequestContext } from './../context';
-import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
-import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
-import { core } from 'nexus';
-
+import { IRequestContext } from "./../context"
+import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
+import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
+import { core } from "nexus"
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -222,25 +221,25 @@ export interface NexusGenInputs {
 }
 
 export interface NexusGenEnums {
-  CommonMemberRole: 'Founder' | 'Moderator'
-  DiscussionMessageFlag: 'Clear' | 'Hidden' | 'Reported'
-  DiscussionMessageType: 'Message'
-  DiscussionSubscriptionType: 'AllNotifications' | 'NoNotification' | 'OnlyMentions'
-  DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
-  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
-  FundingType: 'Monthly' | 'OneTime'
-  NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
-  NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestRejected'
-  ProposalState: 'Accepted' | 'Countdown' | 'Finalizing' | 'Rejected'
-  ProposalType: 'FundingRequest' | 'JoinRequest'
-  ReportAction: 'Dismissed' | 'Respected'
-  ReportAuditor: 'CommonModerator' | 'SystemAdmin'
-  ReportFor: 'FalseNews' | 'Harassment' | 'Hate' | 'Nudity' | 'Other' | 'Spam' | 'Violance'
-  ReportStatus: 'Active' | 'Clossed'
-  SortOrder: 'asc' | 'desc'
-  StatisticType: 'AllTime' | 'Daily' | 'Hourly' | 'Weekly'
-  UserNotificationTokenState: 'Active' | 'Expired' | 'Voided'
-  VoteOutcome: 'Approve' | 'Condemn'
+  CommonMemberRole: "Founder" | "Moderator"
+  DiscussionMessageFlag: "Clear" | "Hidden" | "Reported"
+  DiscussionMessageType: "Message"
+  DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
+  DiscussionType: "CommonDiscussion" | "ProposalDiscussion"
+  EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "RoleUpdated" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
+  FundingType: "Monthly" | "OneTime"
+  NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
+  NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
+  ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
+  ProposalType: "FundingRequest" | "JoinRequest"
+  ReportAction: "Dismissed" | "Respected"
+  ReportAuditor: "CommonModerator" | "SystemAdmin"
+  ReportFor: "FalseNews" | "Harassment" | "Hate" | "Nudity" | "Other" | "Spam" | "Violance"
+  ReportStatus: "Active" | "Clossed"
+  SortOrder: "asc" | "desc"
+  StatisticType: "AllTime" | "Daily" | "Hourly" | "Weekly"
+  UserNotificationTokenState: "Active" | "Expired" | "Voided"
+  VoteOutcome: "Approve" | "Condemn"
 }
 
 export interface NexusGenScalars {
@@ -984,7 +983,7 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: 'Discussion' | 'DiscussionMessage' | 'DiscussionSubscription' | 'Notification' | 'Report' | 'Role' | 'Statistic' | 'UserNotificationToken'
+  BaseEntity: "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "Notification" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
 }
 
 export interface NexusGenTypeInterfaces {
@@ -993,9 +992,9 @@ export interface NexusGenTypeInterfaces {
   DiscussionSubscription: "BaseEntity"
   Notification: "BaseEntity"
   Report: "BaseEntity"
-  Role: 'BaseEntity'
-  Statistic: 'BaseEntity'
-  UserNotificationToken: 'BaseEntity'
+  Role: "BaseEntity"
+  Statistic: "BaseEntity"
+  UserNotificationToken: "BaseEntity"
 }
 
 export type NexusGenObjectNames = keyof NexusGenObjects;
diff --git a/packages/worker/src/events/onCommonCreated.ts b/packages/worker/src/events/onCommonCreated.ts
new file mode 100644
index 000000000..e9e6b1a77
--- /dev/null
+++ b/packages/worker/src/events/onCommonCreated.ts
@@ -0,0 +1,17 @@
+import { Event } from '@prisma/client';
+
+import { Queues } from '@common/queues';
+import { statisticService, logger } from '@common/core';
+
+Queues.EventQueue.on('completed', async (job, result: Event) => {
+  if (result.type === 'CommonCreated') {
+    logger.info('Executing `onCommonCreated`');
+
+    // Update the statistics
+    await statisticService.updateAllTime({
+      commons: {
+        increment: 1
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/worker/src/events/onUserCreated.ts b/packages/worker/src/events/onUserCreated.ts
new file mode 100644
index 000000000..3f53be946
--- /dev/null
+++ b/packages/worker/src/events/onUserCreated.ts
@@ -0,0 +1,15 @@
+import { Event } from '@prisma/client';
+
+import { Queues } from '@common/queues';
+import { statisticService } from '@common/core';
+
+Queues.EventQueue.on('completed', async (job, result: Event) => {
+  if (result.type === 'UserCreated') {
+    // Update the statistics
+    await statisticService.updateAllTime({
+      users: {
+        increment: 1
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/worker/src/index.ts b/packages/worker/src/index.ts
index fb8f5a829..465de6ee9 100644
--- a/packages/worker/src/index.ts
+++ b/packages/worker/src/index.ts
@@ -9,6 +9,9 @@ import './processors/PaymentsWorker';
 import './processors/ProposalsWorker';
 import './processors/NotificationsWorker';
 
+import './events/onUserCreated';
+import './events/onCommonCreated';
+
 import { Queues } from '@common/queues';
 
 const app = express();
diff --git a/packages/worker/src/processors/EventsWorker.ts b/packages/worker/src/processors/EventsWorker.ts
index 0878fa6d7..bc37b4f06 100644
--- a/packages/worker/src/processors/EventsWorker.ts
+++ b/packages/worker/src/processors/EventsWorker.ts
@@ -20,11 +20,5 @@ Queues.EventQueue.process('create', async (job, done) => {
     event
   });
 
-  done();
-});
-
-Queues.EventQueue.process('process', async (job, done) => {
-  await eventService.process(job.data.process.event);
-
-  done();
+  done(null, event);
 });
\ No newline at end of file

From c12e2547ffd8e33ce19a3678dc8264c9736e5793 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 28 Apr 2021 11:19:30 +0300
Subject: [PATCH 12/29] Fix admin commons

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 packages/admin/src/core/graphql/index.ts      |  89 ++++++++++-
 .../admin/src/core/graphql/schema.graphql     |  12 ++
 packages/admin/src/core/graphql/schema.json   | 145 ++++++++++++++++++
 packages/admin/src/pages/commons/index.tsx    |  58 +++----
 .../graphql/src/generated/nexus-typegen.ts    |  38 ++++-
 packages/graphql/src/generated/schema.graphql |  16 ++
 .../Types/Commons/Queries/GetCommons.query.ts |  22 ++-
 .../schema/Types/Commons/Types/Common.type.ts |  21 +++
 9 files changed, 361 insertions(+), 41 deletions(-)

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 2fcf66706..9557cad9c 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -4,6 +4,7 @@ documents:
   - "src/core/**/*.tsx"
   - "src/components/tables/LatestEventsTable.tsx"
   - "src/pages/dashboard/index.tsx"
+  - "src/pages/commons/index.tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index af4146682..69fa6e046 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -248,6 +248,17 @@ export type Common = {
   name: Scalars['String'];
   /** The whitelisting state of a common */
   whitelisted: Scalars['Boolean'];
+  /** The current available funds of the common. In cents */
+  balance: Scalars['Int'];
+  /** The total amount of money that the common has raised. In cents */
+  raised: Scalars['Int'];
+  image: Scalars['String'];
+  description?: Maybe<Scalars['String']>;
+  action?: Maybe<Scalars['String']>;
+  byline?: Maybe<Scalars['String']>;
+  fundingType: FundingType;
+  /** The minimum amount that the join request should provide. In cents */
+  fundingMinimumAmount: Scalars['Int'];
   /** List of events, that occurred in a common */
   events: Array<Event>;
   reports: Array<Report>;
@@ -754,6 +765,7 @@ export type Query = {
   roles?: Maybe<Array<Maybe<Role>>>;
   events?: Maybe<Array<Maybe<Event>>>;
   common?: Maybe<Common>;
+  commons?: Maybe<Array<Maybe<Common>>>;
   proposal?: Maybe<Proposal>;
   getStatistics?: Maybe<Array<Maybe<Statistic>>>;
   discussion?: Maybe<Discussion>;
@@ -785,6 +797,11 @@ export type QueryCommonArgs = {
 };
 
 
+export type QueryCommonsArgs = {
+  paginate?: Maybe<PaginateInput>;
+};
+
+
 export type QueryProposalArgs = {
   where: ProposalWhereUniqueInput;
 };
@@ -962,6 +979,28 @@ export type GetLatestEventsQuery = (
 }
   );
 
+export type GetCommonsHomescreenDataQueryVariables = Exact<{
+  take?: Maybe<Scalars['Int']>;
+  skip?: Maybe<Scalars['Int']>;
+}>;
+
+
+export type GetCommonsHomescreenDataQuery = (
+  { __typename?: 'Query' }
+  & {
+  commons?: Maybe<Array<Maybe<(
+    { __typename?: 'Common' }
+    & Pick<Common, 'id' | 'name' | 'raised' | 'balance' | 'createdAt' | 'updatedAt' | 'description' | 'byline' | 'fundingType' | 'fundingMinimumAmount'>
+    & {
+    members: Array<Maybe<(
+      { __typename?: 'CommonMember' }
+      & Pick<CommonMember, 'userId'>
+      )>>
+  }
+    )>>>
+}
+  );
+
 export type GetAllTimeStatistiscQueryVariables = Exact<{ [key: string]: never; }>;
 
 
@@ -1057,6 +1096,54 @@ export function useGetLatestEventsLazyQuery(baseOptions?: Apollo.LazyQueryHookOp
 export type GetLatestEventsQueryHookResult = ReturnType<typeof useGetLatestEventsQuery>;
 export type GetLatestEventsLazyQueryHookResult = ReturnType<typeof useGetLatestEventsLazyQuery>;
 export type GetLatestEventsQueryResult = Apollo.QueryResult<GetLatestEventsQuery, GetLatestEventsQueryVariables>;
+export const GetCommonsHomescreenDataDocument = gql`
+  query getCommonsHomescreenData($take: Int = 10, $skip: Int) {
+    commons(paginate: {take: $take, skip: $skip}) {
+      id
+      name
+      raised
+      balance
+      createdAt
+      updatedAt
+      members {
+        userId
+      }
+      description
+      byline
+      fundingType
+      fundingMinimumAmount
+    }
+  }
+`;
+
+/**
+ * __useGetCommonsHomescreenDataQuery__
+ *
+ * To run a query within a React component, call `useGetCommonsHomescreenDataQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetCommonsHomescreenDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetCommonsHomescreenDataQuery({
+ *   variables: {
+ *      take: // value for 'take'
+ *      skip: // value for 'skip'
+ *   },
+ * });
+ */
+export function useGetCommonsHomescreenDataQuery(baseOptions?: Apollo.QueryHookOptions<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>) {
+  return Apollo.useQuery<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>(GetCommonsHomescreenDataDocument, baseOptions);
+}
+
+export function useGetCommonsHomescreenDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>) {
+  return Apollo.useLazyQuery<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>(GetCommonsHomescreenDataDocument, baseOptions);
+}
+
+export type GetCommonsHomescreenDataQueryHookResult = ReturnType<typeof useGetCommonsHomescreenDataQuery>;
+export type GetCommonsHomescreenDataLazyQueryHookResult = ReturnType<typeof useGetCommonsHomescreenDataLazyQuery>;
+export type GetCommonsHomescreenDataQueryResult = Apollo.QueryResult<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>;
 export const GetAllTimeStatistiscDocument = gql`
   query getAllTimeStatistisc {
     getStatistics(where: {type: AllTime}) {
@@ -1086,11 +1173,9 @@ export const GetAllTimeStatistiscDocument = gql`
 export function useGetAllTimeStatistiscQuery(baseOptions?: Apollo.QueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
   return Apollo.useQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
 }
-
 export function useGetAllTimeStatistiscLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
   return Apollo.useLazyQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
 }
-
 export type GetAllTimeStatistiscQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscQuery>;
 export type GetAllTimeStatistiscLazyQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscLazyQuery>;
 export type GetAllTimeStatistiscQueryResult = Apollo.QueryResult<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 86360d14c..f11343586 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -185,6 +185,17 @@ type Common {
   name: String!
   """The whitelisting state of a common"""
   whitelisted: Boolean!
+  """The current available funds of the common. In cents"""
+  balance: Int!
+  """The total amount of money that the common has raised. In cents"""
+  raised: Int!
+  image: String!
+  description: String
+  action: String
+  byline: String
+  fundingType: FundingType!
+  """The minimum amount that the join request should provide. In cents"""
+  fundingMinimumAmount: Int!
   """List of events, that occurred in a common"""
   events(take: Int = 10, skip: Int = 0, orderBy: EventOrderByInput): [Event!]!
   reports(where: ReportWhereInput = {status: {in: [Active]}}): [Report!]!
@@ -571,6 +582,7 @@ type Query {
   roles(paginate: PaginateInput): [Role]
   events(paginate: PaginateInput): [Event]
   common(where: CommonWhereUniqueInput!): Common
+  commons(paginate: PaginateInput): [Common]
   proposal(where: ProposalWhereUniqueInput!): Proposal
   getStatistics(where: StatisticsWhereInput): [Statistic]
   discussion(id: ID!): Discussion
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 1a0456d44..e884c2b55 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -1733,6 +1733,122 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "balance",
+            "description": "The current available funds of the common. In cents",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "raised",
+            "description": "The total amount of money that the common has raised. In cents",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "image",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "action",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "byline",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "fundingType",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "FundingType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "fundingMinimumAmount",
+            "description": "The minimum amount that the join request should provide. In cents",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "events",
             "description": "List of events, that occurred in a common",
@@ -5681,6 +5797,35 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "commons",
+            "description": null,
+            "args": [
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Common",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "proposal",
             "description": null,
diff --git a/packages/admin/src/pages/commons/index.tsx b/packages/admin/src/pages/commons/index.tsx
index 227469f1c..a676764d0 100644
--- a/packages/admin/src/pages/commons/index.tsx
+++ b/packages/admin/src/pages/commons/index.tsx
@@ -7,22 +7,22 @@ import { Spacer, Text, Table, Pagination, Tag, useToasts, Breadcrumbs, Grid, Car
 import { ChevronRightCircleFill, ChevronLeftCircleFill, Home } from '@geist-ui/react-icons';
 
 import { Link } from '../../components/Link';
-import {
-  useGetCommonsHomescreenDataQuery,
-  GetCommonsHomescreenDataQueryResult,
-  useStatisticsQuery
-} from '@core/graphql';
 import { withPermission } from '../../helpers/hoc/withPermission';
 import { useRouter } from 'next/router';
 import { Centered } from '@components/Centered';
 import { FullWidthLoader } from '@components/FullWidthLoader';
+import {
+  useGetAllTimeStatistiscQuery,
+  useGetCommonsHomescreenDataQuery,
+  GetCommonsHomescreenDataQueryResult
+} from '@core/graphql';
 
 const GetCommonsHomescreenData = gql`
-  query getCommonsHomescreenData($last: Int, $after: Int) {
-    commons(
-      last: $last,
-      after: $after
-    ) {
+  query getCommonsHomescreenData($take: Int = 10, $skip: Int) {
+    commons(paginate: {
+      take: $take,
+      skip: $skip
+    }) {
       id
 
       name
@@ -32,16 +32,16 @@ const GetCommonsHomescreenData = gql`
 
       createdAt
       updatedAt
-      
-      members { 
+
+      members {
         userId
       }
 
-      metadata {
-        byline
-        description
-        contributionType
-      }
+      description
+      byline
+
+      fundingType
+      fundingMinimumAmount
     }
   }
 `;
@@ -53,11 +53,11 @@ const CommonsHomepage: NextPage = () => {
   // Data fetching and custom hooks
   const [toasts, setToast] = useToasts();
   const router = useRouter();
-  const statistics = useStatisticsQuery();
+  const statistics = useGetAllTimeStatistiscQuery();
   const data = useGetCommonsHomescreenDataQuery({
     variables: {
-      last: 10,
-      after: (page - 1) * 10
+      take: 10,
+      skip: (page - 1) * 10
     }
   });
 
@@ -97,7 +97,7 @@ const CommonsHomepage: NextPage = () => {
 
       icon: (
         <Centered>
-          <Home />
+          <Home/>
         </Centered>
       ),
 
@@ -116,7 +116,7 @@ const CommonsHomepage: NextPage = () => {
 
       type: (
         <React.Fragment>
-          {common.metadata.contributionType === 'oneTime' ? (
+          {common.fundingType === 'OneTime' ? (
             <Tag type="success">One Time</Tag>
           ) : (
             <Tag type="secondary">Monthly</Tag>
@@ -129,8 +129,8 @@ const CommonsHomepage: NextPage = () => {
   const onCommonTableRow = (data: { id: string }) => {
     router.push({
       pathname: `/commons/details/${data.id}`
-    })
-  }
+    });
+  };
 
   return (
     <React.Fragment>
@@ -152,7 +152,7 @@ const CommonsHomepage: NextPage = () => {
             <Card hoverable>
               <Text h1>
                 {statistics.data && (
-                  statistics.data.statistics.commons
+                  statistics.data.getStatistics[0].commons
                 )}
 
                 {!statistics.data && (
@@ -188,8 +188,8 @@ const CommonsHomepage: NextPage = () => {
       <Text h3>All commons</Text>
 
       <Table data={transformCommonsArray(data)} onRow={onCommonTableRow}>
-        <Table.Column prop="icon" width={70} />
-        <Table.Column prop="name" label="Display Name" />
+        <Table.Column prop="icon" width={70}/>
+        <Table.Column prop="name" label="Display Name"/>
 
         <Table.Column
           prop="raised"
@@ -216,9 +216,9 @@ const CommonsHomepage: NextPage = () => {
         />
       </Table>
 
-      {statistics.data && statistics.data.statistics.commons > 10 && (
+      {statistics.data && statistics.data.getStatistics[0].commons > 10 && (
         <div style={{ display: 'flex', justifyContent: 'center', marginTop: 20 }}>
-          <Pagination count={Math.ceil(statistics.data.statistics.commons / 10)} onChange={onPageChange}>
+          <Pagination count={Math.ceil(statistics.data.getStatistics[0].commons / 10)} onChange={onPageChange}>
             <Pagination.Next><ChevronRightCircleFill/></Pagination.Next>
             <Pagination.Previous><ChevronLeftCircleFill/></Pagination.Previous>
           </Pagination>
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 22c2dc44c..b5112fa6b 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,10 +4,11 @@
  */
 
 
-import { IRequestContext } from "./../context"
-import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
-import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
-import { core } from "nexus"
+import { IRequestContext } from './../context';
+import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
+import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
+import { core } from 'nexus';
+
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -262,9 +263,17 @@ export interface NexusGenObjects {
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   Common: { // root type
+    action?: string | null; // String
+    balance: number; // Int!
+    byline?: string | null; // String
     createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description?: string | null; // String
+    fundingMinimumAmount: number; // Int!
+    fundingType: NexusGenEnums['FundingType']; // FundingType!
     id: string; // ID!
+    image: string; // String!
     name: string; // String!
+    raised: number; // Int!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
     whitelisted: boolean; // Boolean!
   }
@@ -417,13 +426,21 @@ export interface NexusGenFieldTypes {
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   Common: { // field return type
+    action: string | null; // String
+    balance: number; // Int!
+    byline: string | null; // String
     createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description: string | null; // String
     discussions: NexusGenRootTypes['Discussion'][]; // [Discussion!]!
     events: NexusGenRootTypes['Event'][]; // [Event!]!
+    fundingMinimumAmount: number; // Int!
+    fundingType: NexusGenEnums['FundingType']; // FundingType!
     id: string; // ID!
+    image: string; // String!
     members: Array<NexusGenRootTypes['CommonMember'] | null>; // [CommonMember]!
     name: string; // String!
     proposals: NexusGenRootTypes['Proposal'][]; // [Proposal!]!
+    raised: number; // Int!
     reports: NexusGenRootTypes['Report'][]; // [Report!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
     whitelisted: boolean; // Boolean!
@@ -534,6 +551,7 @@ export interface NexusGenFieldTypes {
   }
   Query: { // field return type
     common: NexusGenRootTypes['Common'] | null; // Common
+    commons: Array<NexusGenRootTypes['Common'] | null> | null; // [Common]
     discussion: NexusGenRootTypes['Discussion'] | null; // Discussion
     events: Array<NexusGenRootTypes['Event'] | null> | null; // [Event]
     generateUserAuthToken: string; // String!
@@ -623,13 +641,21 @@ export interface NexusGenFieldTypeNames {
     updatedAt: 'DateTime'
   }
   Common: { // field return type name
+    action: 'String'
+    balance: 'Int'
+    byline: 'String'
     createdAt: 'DateTime'
+    description: 'String'
     discussions: 'Discussion'
     events: 'Event'
+    fundingMinimumAmount: 'Int'
+    fundingType: 'FundingType'
     id: 'ID'
+    image: 'String'
     members: 'CommonMember'
     name: 'String'
     proposals: 'Proposal'
+    raised: 'Int'
     reports: 'Report'
     updatedAt: 'DateTime'
     whitelisted: 'Boolean'
@@ -740,6 +766,7 @@ export interface NexusGenFieldTypeNames {
   }
   Query: { // field return type name
     common: 'Common'
+    commons: 'Common'
     discussion: 'Discussion'
     events: 'Event'
     generateUserAuthToken: 'String'
@@ -927,6 +954,9 @@ export interface NexusGenArgTypes {
     common: { // args
       where: NexusGenInputs['CommonWhereUniqueInput']; // CommonWhereUniqueInput!
     }
+    commons: { // args
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
+    }
     discussion: { // args
       id: string; // ID!
     }
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 42854b2c8..d4379076a 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -40,20 +40,35 @@ type Card {
 }
 
 type Common {
+  action: String
+
+  """The current available funds of the common. In cents"""
+  balance: Int!
+  byline: String
+
   """The date, at which the item was created"""
   createdAt: DateTime!
+  description: String
   discussions(skip: Int, take: Int): [Discussion!]!
 
   """List of events, that occurred in a common"""
   events(orderBy: EventOrderByInput, skip: Int = 0, take: Int = 10): [Event!]!
 
+  """The minimum amount that the join request should provide. In cents"""
+  fundingMinimumAmount: Int!
+  fundingType: FundingType!
+
   """The main identifier of the item"""
   id: ID!
+  image: String!
   members(orderBy: CommonMemberOrderByInput, skip: Int, take: Int): [CommonMember]!
 
   """The name of the common as provided"""
   name: String!
   proposals(skip: Int = 0, take: Int = 10, where: ProposalWhereInput): [Proposal!]!
+
+  """The total amount of money that the common has raised. In cents"""
+  raised: Int!
   reports(where: ReportWhereInput = {status: {in: [Active]}}): [Report!]!
 
   """The date, at which the item was last modified"""
@@ -539,6 +554,7 @@ input ProposalWhereUniqueInput {
 
 type Query {
   common(where: CommonWhereUniqueInput!): Common
+  commons(paginate: PaginateInput): [Common]
   discussion(id: ID!): Discussion
   events(paginate: PaginateInput): [Event]
   generateUserAuthToken(authId: String!): String!
diff --git a/packages/graphql/src/schema/Types/Commons/Queries/GetCommons.query.ts b/packages/graphql/src/schema/Types/Commons/Queries/GetCommons.query.ts
index 947ee4f71..ae090e978 100644
--- a/packages/graphql/src/schema/Types/Commons/Queries/GetCommons.query.ts
+++ b/packages/graphql/src/schema/Types/Commons/Queries/GetCommons.query.ts
@@ -1,8 +1,18 @@
-import { extendType } from 'nexus';
+import { queryField, list, arg } from 'nexus';
+import { prisma } from '@common/core';
 
-export const GetCommonsQuery = extendType({
-  type: 'Query',
-  definition(t) {
-    // @todo
+export const GetCommonsQuery = queryField('commons', {
+  type: list('Common'),
+  args: {
+    paginate: arg({
+      type: 'PaginateInput'
+    })
+  },
+  resolve: (root, args) => {
+    return prisma.common
+      .findMany({
+        skip: args.paginate?.skip || undefined,
+        take: args.paginate?.take || undefined
+      });
   }
-});
\ No newline at end of file
+});
diff --git a/packages/graphql/src/schema/Types/Commons/Types/Common.type.ts b/packages/graphql/src/schema/Types/Commons/Types/Common.type.ts
index d4774b7f0..b092ddb6b 100644
--- a/packages/graphql/src/schema/Types/Commons/Types/Common.type.ts
+++ b/packages/graphql/src/schema/Types/Commons/Types/Common.type.ts
@@ -22,5 +22,26 @@ export const CommonType = objectType({
     t.nonNull.boolean('whitelisted', {
       description: 'The whitelisting state of a common'
     });
+
+    t.nonNull.int('balance', {
+      description: 'The current available funds of the common. In cents'
+    });
+
+    t.nonNull.int('raised', {
+      description: 'The total amount of money that the common has raised. In cents'
+    });
+
+    t.nonNull.string('image');
+    t.string('description');
+    t.string('action');
+    t.string('byline');
+
+    t.nonNull.field('fundingType', {
+      type: 'FundingType'
+    });
+
+    t.nonNull.int('fundingMinimumAmount', {
+      description: 'The minimum amount that the join request should provide. In cents'
+    });
   }
 });
\ No newline at end of file

From 098cb206b1089acc0bc1510b3ec1c9556bcc3856 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 08:09:16 +0300
Subject: [PATCH 13/29] Proposal join and funding extensions

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .run/Admin.run.xml                            |   12 +
 packages/admin/next.config.js                 |    6 +-
 .../src/pages/commons/details/[commonId].tsx  |   21 +-
 .../graphql/src/generated/nexus-typegen.ts    |   85 +-
 packages/graphql/src/generated/schema.graphql |   53 +-
 .../CommonMember/Types/CommonMember.type.ts   |    2 +-
 .../Extensions/CommonProposals.extension.ts   |   14 +-
 .../Proposals/Enums/FundingState.enum.ts      |    8 +
 .../Proposals/Enums/PaymentState.enum.ts      |    7 +
 .../Extensions/ProposalFunding.extension.ts   |   25 +
 .../Extensions/ProposalJoin.extension.ts      |   25 +
 .../Proposals/Types/FundingProposal.type.ts   |   12 +-
 .../Proposals/Types/JoinProposal.type.ts      |   14 +-
 .../Types/Proposals/Types/Proposal.type.ts    |    3 -
 .../src/schema/Types/Proposals/index.ts       |   18 +-
 yarn.lock                                     | 1034 ++++++++---------
 16 files changed, 706 insertions(+), 633 deletions(-)
 create mode 100644 .run/Admin.run.xml
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Enums/FundingState.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Enums/PaymentState.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Extensions/ProposalFunding.extension.ts
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Extensions/ProposalJoin.extension.ts

diff --git a/.run/Admin.run.xml b/.run/Admin.run.xml
new file mode 100644
index 000000000..14a81ca88
--- /dev/null
+++ b/.run/Admin.run.xml
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+    <configuration default="false" name="Admin" type="js.build_tools.npm">
+        <package-json value="$PROJECT_DIR$/packages/admin/package.json"/>
+        <command value="run"/>
+        <scripts>
+            <script value="dev"/>
+        </scripts>
+        <node-interpreter value="project"/>
+        <envs/>
+        <method v="2"/>
+    </configuration>
+</component>
\ No newline at end of file
diff --git a/packages/admin/next.config.js b/packages/admin/next.config.js
index e69c374ed..55882213e 100644
--- a/packages/admin/next.config.js
+++ b/packages/admin/next.config.js
@@ -1,3 +1,7 @@
 const withImages = require('next-images')
 
-module.exports = withImages()
\ No newline at end of file
+module.exports = withImages({
+  future: {
+    webpack5: true
+  }
+});
\ No newline at end of file
diff --git a/packages/admin/src/pages/commons/details/[commonId].tsx b/packages/admin/src/pages/commons/details/[commonId].tsx
index 15d3bf9ba..28cc6f19b 100644
--- a/packages/admin/src/pages/commons/details/[commonId].tsx
+++ b/packages/admin/src/pages/commons/details/[commonId].tsx
@@ -26,13 +26,14 @@ import {
   Trash2 as Trash
 } from '@geist-ui/react-icons';
 
-import { useGetCommonDetailsQuery, GetCommonDetailsQueryResult } from '@core/graphql';
 import { Link } from 'components/Link';
 import { CommonSettings } from '@components/CommonSettings';
 
 const GetCommonDetailsQuery = gql`
   query getCommonDetails($commonId: ID!, $page: Int!) {
-    common(commonId: $commonId) {
+    common(where: {
+      id: $commonId
+    }) {
       name
 
       createdAt
@@ -41,20 +42,9 @@ const GetCommonDetailsQuery = gql`
       balance
       raised
 
-      openFundingRequests
-      openJoinRequests
-
-      metadata {
-        byline
-        description
-
-        founderId
-        contributionType
-      }
-
       members {
+        createdAt
         userId
-        joinedAt
 
         user {
           firstName
@@ -62,11 +52,12 @@ const GetCommonDetailsQuery = gql`
         }
       }
 
-      proposals(page: $page) {
+      proposals {
         id
 
         type
 
+
         fundingRequest {
           amount
         }
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index b5112fa6b..c0f9740a5 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -227,11 +227,13 @@ export interface NexusGenEnums {
   DiscussionMessageType: "Message"
   DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
   DiscussionType: "CommonDiscussion" | "ProposalDiscussion"
-  EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "RoleUpdated" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
-  FundingType: "Monthly" | "OneTime"
+  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
+  FundingState: 'AwaitingApproval' | 'Completed' | 'Confirmed' | 'Eligible' | 'NotEligible' | 'Pending'
+  FundingType: 'Monthly' | 'OneTime'
   NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
-  NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
-  ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
+  NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestRejected'
+  PaymentState: 'NotAttempted' | 'Pending' | 'Successful' | 'Unsuccessful'
+  ProposalState: 'Accepted' | 'Countdown' | 'Finalizing' | 'Rejected'
   ProposalType: "FundingRequest" | "JoinRequest"
   ReportAction: "Dismissed" | "Respected"
   ReportAuditor: "CommonModerator" | "SystemAdmin"
@@ -279,8 +281,10 @@ export interface NexusGenObjects {
   }
   CommonMember: { // root type
     commonId: string; // ID!
-    id: string; // ID!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    id: NexusGenScalars['UUID']; // UUID!
     roles: NexusGenEnums['CommonMemberRole'][]; // [CommonMemberRole!]!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
     userId: string; // ID!
   }
   Discussion: { // root type
@@ -318,13 +322,18 @@ export interface NexusGenObjects {
     userId?: string | null; // ID
   }
   FundingProposal: { // root type
+    amount: number; // Int!
     createdAt: NexusGenScalars['DateTime']; // DateTime!
-    id: string; // ID!
+    fundingState: NexusGenEnums['FundingState']; // FundingState!
+    id: NexusGenScalars['UUID']; // UUID!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   JoinProposal: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
-    id: string; // ID!
+    funding: number; // Int!
+    fundingType: NexusGenEnums['FundingType']; // FundingType!
+    id: NexusGenScalars['UUID']; // UUID!
+    paymentState: NexusGenEnums['PaymentState']; // PaymentState!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   Link: { // root type
@@ -346,7 +355,9 @@ export interface NexusGenObjects {
   }
   Proposal: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
+    fundingId?: NexusGenScalars['UUID'] | null; // UUID
     id: string; // ID!
+    joinId?: NexusGenScalars['UUID'] | null; // UUID
     state: NexusGenEnums['ProposalState']; // ProposalState!
     type: NexusGenEnums['ProposalType']; // ProposalType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
@@ -409,7 +420,7 @@ export interface NexusGenObjects {
 }
 
 export interface NexusGenInterfaces {
-  BaseEntity: NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
+  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
 }
 
 export interface NexusGenUnions {
@@ -448,9 +459,11 @@ export interface NexusGenFieldTypes {
   CommonMember: { // field return type
     common: NexusGenRootTypes['Common'] | null; // Common
     commonId: string; // ID!
-    id: string; // ID!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    id: NexusGenScalars['UUID']; // UUID!
     proposals: NexusGenRootTypes['Proposal'][]; // [Proposal!]!
     roles: NexusGenEnums['CommonMemberRole'][]; // [CommonMemberRole!]!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
     user: NexusGenRootTypes['User'] | null; // User
     userId: string; // ID!
   }
@@ -493,13 +506,18 @@ export interface NexusGenFieldTypes {
     userId: string | null; // ID
   }
   FundingProposal: { // field return type
+    amount: number; // Int!
     createdAt: NexusGenScalars['DateTime']; // DateTime!
-    id: string; // ID!
+    fundingState: NexusGenEnums['FundingState']; // FundingState!
+    id: NexusGenScalars['UUID']; // UUID!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   JoinProposal: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
-    id: string; // ID!
+    funding: number; // Int!
+    fundingType: NexusGenEnums['FundingType']; // FundingType!
+    id: NexusGenScalars['UUID']; // UUID!
+    paymentState: NexusGenEnums['PaymentState']; // PaymentState!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   Link: { // field return type
@@ -544,7 +562,11 @@ export interface NexusGenFieldTypes {
   Proposal: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     discussions: NexusGenRootTypes['Discussion'][]; // [Discussion!]!
+    funding: NexusGenRootTypes['FundingProposal'] | null; // FundingProposal
+    fundingId: NexusGenScalars['UUID'] | null; // UUID
     id: string; // ID!
+    join: NexusGenRootTypes['JoinProposal'] | null; // JoinProposal
+    joinId: NexusGenScalars['UUID'] | null; // UUID
     state: NexusGenEnums['ProposalState']; // ProposalState!
     type: NexusGenEnums['ProposalType']; // ProposalType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
@@ -663,9 +685,11 @@ export interface NexusGenFieldTypeNames {
   CommonMember: { // field return type name
     common: 'Common'
     commonId: 'ID'
-    id: 'ID'
+    createdAt: 'DateTime'
+    id: 'UUID'
     proposals: 'Proposal'
     roles: 'CommonMemberRole'
+    updatedAt: 'DateTime'
     user: 'User'
     userId: 'ID'
   }
@@ -708,13 +732,18 @@ export interface NexusGenFieldTypeNames {
     userId: 'ID'
   }
   FundingProposal: { // field return type name
+    amount: 'Int'
     createdAt: 'DateTime'
-    id: 'ID'
+    fundingState: 'FundingState'
+    id: 'UUID'
     updatedAt: 'DateTime'
   }
   JoinProposal: { // field return type name
     createdAt: 'DateTime'
-    id: 'ID'
+    funding: 'Int'
+    fundingType: 'FundingType'
+    id: 'UUID'
+    paymentState: 'PaymentState'
     updatedAt: 'DateTime'
   }
   Link: { // field return type name
@@ -759,7 +788,11 @@ export interface NexusGenFieldTypeNames {
   Proposal: { // field return type name
     createdAt: 'DateTime'
     discussions: 'Discussion'
+    funding: 'FundingProposal'
+    fundingId: 'UUID'
     id: 'ID'
+    join: 'JoinProposal'
+    joinId: 'UUID'
     state: 'ProposalState'
     type: 'ProposalType'
     updatedAt: 'DateTime'
@@ -866,8 +899,7 @@ export interface NexusGenArgTypes {
       take?: number | null; // Int
     }
     proposals: { // args
-      skip?: number | null; // Int
-      take: number | null; // Int
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
       where?: NexusGenInputs['ProposalWhereInput'] | null; // ProposalWhereInput
     }
     reports: { // args
@@ -1013,18 +1045,21 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "Notification" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
+  BaseEntity: 'CommonMember' | 'Discussion' | 'DiscussionMessage' | 'DiscussionSubscription' | 'FundingProposal' | 'JoinProposal' | 'Notification' | 'Report' | 'Role' | 'Statistic' | 'UserNotificationToken'
 }
 
 export interface NexusGenTypeInterfaces {
-  Discussion: "BaseEntity"
-  DiscussionMessage: "BaseEntity"
-  DiscussionSubscription: "BaseEntity"
-  Notification: "BaseEntity"
-  Report: "BaseEntity"
-  Role: "BaseEntity"
-  Statistic: "BaseEntity"
-  UserNotificationToken: "BaseEntity"
+  CommonMember: 'BaseEntity'
+  Discussion: 'BaseEntity'
+  DiscussionMessage: 'BaseEntity'
+  DiscussionSubscription: 'BaseEntity'
+  FundingProposal: 'BaseEntity'
+  JoinProposal: 'BaseEntity'
+  Notification: 'BaseEntity'
+  Report: 'BaseEntity'
+  Role: 'BaseEntity'
+  Statistic: 'BaseEntity'
+  UserNotificationToken: 'BaseEntity'
 }
 
 export type NexusGenObjectNames = keyof NexusGenObjects;
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index d4379076a..c7f275983 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -65,7 +65,7 @@ type Common {
 
   """The name of the common as provided"""
   name: String!
-  proposals(skip: Int = 0, take: Int = 10, where: ProposalWhereInput): [Proposal!]!
+  proposals(paginate: PaginateInput, where: ProposalWhereInput): [Proposal!]!
 
   """The total amount of money that the common has raised. In cents"""
   raised: Int!
@@ -78,12 +78,20 @@ type Common {
   whitelisted: Boolean!
 }
 
-type CommonMember {
+type CommonMember implements BaseEntity {
   common: Common
   commonId: ID!
-  id: ID!
+
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+
+  """The main identifier of the item"""
+  id: UUID!
   proposals(skip: Int = 0, take: Int = 10, where: ProposalWhereInput): [Proposal!]!
   roles: [CommonMemberRole!]!
+
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
   user: User
   userId: ID!
 }
@@ -349,17 +357,30 @@ enum EventType {
   VoteCreated
 }
 
-type FundingProposal {
+type FundingProposal implements BaseEntity {
+  """The amount that the proposal has requested in cents"""
+  amount: Int!
+
   """The date, at which the item was created"""
   createdAt: DateTime!
+  fundingState: FundingState!
 
   """The main identifier of the item"""
-  id: ID!
+  id: UUID!
 
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
 }
 
+enum FundingState {
+  AwaitingApproval
+  Completed
+  Confirmed
+  Eligible
+  NotEligible
+  Pending
+}
+
 """The funding type of the common"""
 enum FundingType {
   Monthly
@@ -371,12 +392,19 @@ The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://
 """
 scalar JSON
 
-type JoinProposal {
+type JoinProposal implements BaseEntity {
   """The date, at which the item was created"""
   createdAt: DateTime!
 
+  """
+  The amount that this join proposal will contribute to the common. In cents
+  """
+  funding: Int!
+  fundingType: FundingType!
+
   """The main identifier of the item"""
-  id: ID!
+  id: UUID!
+  paymentState: PaymentState!
 
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
@@ -505,13 +533,24 @@ input PaginateInput {
   take: Int!
 }
 
+enum PaymentState {
+  NotAttempted
+  Pending
+  Successful
+  Unsuccessful
+}
+
 type Proposal {
   """The date, at which the item was created"""
   createdAt: DateTime!
   discussions(skip: Int, take: Int): [Discussion!]!
+  funding: FundingProposal
+  fundingId: UUID
 
   """The main identifier of the item"""
   id: ID!
+  join: JoinProposal
+  joinId: UUID
   state: ProposalState!
   type: ProposalType!
 
diff --git a/packages/graphql/src/schema/Types/CommonMember/Types/CommonMember.type.ts b/packages/graphql/src/schema/Types/CommonMember/Types/CommonMember.type.ts
index e1748ef49..cb6cdf07b 100644
--- a/packages/graphql/src/schema/Types/CommonMember/Types/CommonMember.type.ts
+++ b/packages/graphql/src/schema/Types/CommonMember/Types/CommonMember.type.ts
@@ -3,7 +3,7 @@ import { objectType } from 'nexus';
 export const CommonMemberType = objectType({
   name: 'CommonMember',
   definition(t) {
-    t.nonNull.id('id');
+    t.implements('BaseEntity');
 
     t.nonNull.id('userId');
     t.nonNull.id('commonId');
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonProposals.extension.ts b/packages/graphql/src/schema/Types/Commons/Extensions/CommonProposals.extension.ts
index 546597d6d..43a7ec683 100644
--- a/packages/graphql/src/schema/Types/Commons/Extensions/CommonProposals.extension.ts
+++ b/packages/graphql/src/schema/Types/Commons/Extensions/CommonProposals.extension.ts
@@ -1,4 +1,4 @@
-import { extendType, arg, intArg } from 'nexus';
+import { extendType, arg } from 'nexus';
 import { prisma } from '@common/core';
 
 export const CommonProposalsExtension = extendType({
@@ -7,12 +7,8 @@ export const CommonProposalsExtension = extendType({
     t.nonNull.list.nonNull.field('proposals', {
       type: 'Proposal',
       args: {
-        take: intArg({
-          default: 10
-        }),
-
-        skip: intArg({
-          default: 0
+        paginate: arg({
+          type: 'PaginateInput'
         }),
 
         where: arg({
@@ -27,8 +23,8 @@ export const CommonProposalsExtension = extendType({
             }
           })
           .proposals({
-            take: args.take || undefined,
-            skip: args.skip || undefined,
+            skip: args.paginate?.skip || undefined,
+            take: args.paginate?.take || undefined,
             where: (args.where as any) || undefined
           });
       }
diff --git a/packages/graphql/src/schema/Types/Proposals/Enums/FundingState.enum.ts b/packages/graphql/src/schema/Types/Proposals/Enums/FundingState.enum.ts
new file mode 100644
index 000000000..aebdfc7d3
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Enums/FundingState.enum.ts
@@ -0,0 +1,8 @@
+import { enumType } from 'nexus';
+import { FundingState } from '@prisma/client';
+
+
+export const FundingStateEnum = enumType({
+  name: 'FundingState',
+  members: FundingState
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Enums/PaymentState.enum.ts b/packages/graphql/src/schema/Types/Proposals/Enums/PaymentState.enum.ts
new file mode 100644
index 000000000..ef4ac8d5c
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Enums/PaymentState.enum.ts
@@ -0,0 +1,7 @@
+import { enumType } from 'nexus';
+import { ProposalPaymentState } from '@prisma/client';
+
+export const PaymentStateEnum = enumType({
+  name: 'PaymentState',
+  members: ProposalPaymentState
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalFunding.extension.ts b/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalFunding.extension.ts
new file mode 100644
index 000000000..13aa6563c
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalFunding.extension.ts
@@ -0,0 +1,25 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const ProposalFundingExtension = extendType({
+  type: 'Proposal',
+  definition(t) {
+    t.uuid('fundingId');
+
+    t.field('funding', {
+      type: 'FundingProposal',
+      resolve: (root) => {
+        if (!root.fundingId) {
+          return null;
+        }
+
+        return prisma.fundingProposal
+          .findUnique({
+            where: {
+              id: root.fundingId
+            }
+          });
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalJoin.extension.ts b/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalJoin.extension.ts
new file mode 100644
index 000000000..8488fd9ee
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalJoin.extension.ts
@@ -0,0 +1,25 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const ProposalJoinExtension = extendType({
+  type: 'Proposal',
+  definition(t) {
+    t.uuid('joinId');
+
+    t.field('join', {
+      type: 'JoinProposal',
+      resolve: (root) => {
+        if (!root.joinId) {
+          return null;
+        }
+
+        return prisma.joinProposal
+          .findUnique({
+            where: {
+              id: root.joinId
+            }
+          });
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Types/FundingProposal.type.ts b/packages/graphql/src/schema/Types/Proposals/Types/FundingProposal.type.ts
index c08f87759..52d23276e 100644
--- a/packages/graphql/src/schema/Types/Proposals/Types/FundingProposal.type.ts
+++ b/packages/graphql/src/schema/Types/Proposals/Types/FundingProposal.type.ts
@@ -3,16 +3,14 @@ import { objectType } from 'nexus';
 export const FundingProposalType = objectType({
   name: 'FundingProposal',
   definition(t) {
-    t.nonNull.id('id', {
-      description: 'The main identifier of the item'
-    });
+    t.implements('BaseEntity');
 
-    t.nonNull.date('createdAt', {
-      description: 'The date, at which the item was created'
+    t.nonNull.int('amount', {
+      description: 'The amount that the proposal has requested in cents'
     });
 
-    t.nonNull.date('updatedAt', {
-      description: 'The date, at which the item was last modified'
+    t.nonNull.field('fundingState', {
+      type: 'FundingState'
     });
   }
 });
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Types/JoinProposal.type.ts b/packages/graphql/src/schema/Types/Proposals/Types/JoinProposal.type.ts
index 5dceaba45..f1f73b643 100644
--- a/packages/graphql/src/schema/Types/Proposals/Types/JoinProposal.type.ts
+++ b/packages/graphql/src/schema/Types/Proposals/Types/JoinProposal.type.ts
@@ -3,16 +3,18 @@ import { objectType } from 'nexus';
 export const JoinProposalType = objectType({
   name: 'JoinProposal',
   definition(t) {
-    t.nonNull.id('id', {
-      description: 'The main identifier of the item'
+    t.implements('BaseEntity');
+
+    t.nonNull.int('funding', {
+      description: 'The amount that this join proposal will contribute to the common. In cents'
     });
 
-    t.nonNull.date('createdAt', {
-      description: 'The date, at which the item was created'
+    t.nonNull.field('fundingType', {
+      type: 'FundingType'
     });
 
-    t.nonNull.date('updatedAt', {
-      description: 'The date, at which the item was last modified'
+    t.nonNull.field('paymentState', {
+      type: 'PaymentState'
     });
   }
 });
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts b/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts
index c69283209..679ecfde5 100644
--- a/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts
+++ b/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts
@@ -22,8 +22,5 @@ export const ProposalType = objectType({
     t.nonNull.field('state', {
       type: 'ProposalState'
     });
-
-    // @join
-    // @funding
   }
 });
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/index.ts b/packages/graphql/src/schema/Types/Proposals/index.ts
index 418059d5a..52cec35f0 100644
--- a/packages/graphql/src/schema/Types/Proposals/index.ts
+++ b/packages/graphql/src/schema/Types/Proposals/index.ts
@@ -13,12 +13,16 @@ import { ProposalWhereUniqueInput } from './Inputs/ProposalWhereUnique.input';
 
 import { FinalizeProposalMutation } from './Mutations/FinalizeProposalMutation';
 
-import { ProposalTypeEnum } from './Enums/ProposalType.enum';
 import { ProposalStateEnum } from './Enums/ProposalState.enum';
+import { ProposalTypeEnum } from './Enums/ProposalType.enum';
+import { FundingStateEnum } from './Enums/FundingState.enum';
+import { PaymentStateEnum } from './Enums/PaymentState.enum';
 
 import { GetProposalQuery } from './Queries/GetProposal.query';
 
 import { ProposalDiscussionsExtension } from './Extensions/ProposalDiscussions.extension';
+import { ProposalFundingExtension } from './Extensions/ProposalFunding.extension';
+import { ProposalJoinExtension } from './Extensions/ProposalJoin.extension';
 
 import { ProposalChangeSubscription } from './Subscriptions/ProposalChange.subscription';
 
@@ -30,24 +34,28 @@ export const ProposalTypes = [
 
   ProposalWhereInput,
   CreateJoinProposalInput,
-  CreateFundingProposalInput,
 
+  CreateFundingProposalInput,
   FinalizeProposalMutation,
   CreateJoinProposalMutation,
-  CreateFundingProposalMutation,
 
+  CreateFundingProposalMutation,
   ProposalLinkInput,
   ProposalFileInput,
-  ProposalImageInput,
 
+  ProposalImageInput,
   ProposalTypeEnum,
   ProposalStateEnum,
+  FundingStateEnum,
+  PaymentStateEnum,
 
   GetProposalQuery,
 
   ProposalWhereUniqueInput,
 
   ProposalDiscussionsExtension,
+  ProposalFundingExtension,
+  ProposalJoinExtension,
 
   ProposalChangeSubscription
-];
\ No newline at end of file
+];
diff --git a/yarn.lock b/yarn.lock
index 0f4099211..57ed8ea2b 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,57 +2,6 @@
 # yarn lockfile v1
 
 
-"@ampproject/toolbox-core@2.7.4", "@ampproject/toolbox-core@^2.7.1-alpha.0":
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-core/-/toolbox-core-2.7.4.tgz#8355136f16301458ce942acf6c55952c9a415627"
-  integrity sha512-qpBhcS4urB7IKc+jx2kksN7BuvvwCo7Y3IstapWo+EW+COY5EYAUwb2pil37v3TsaqHKgX//NloFP1SKzGZAnw==
-  dependencies:
-    cross-fetch "3.0.6"
-    lru-cache "6.0.0"
-
-"@ampproject/toolbox-optimizer@2.7.1-alpha.0":
-  version "2.7.1-alpha.0"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-optimizer/-/toolbox-optimizer-2.7.1-alpha.0.tgz#1571dcd02608223ff68f6b7223102a123e381197"
-  integrity sha512-WGPZKVQvHgNYJk1XVJCCmY+NVGTGJtvn0OALDyiegN4FJWOcilQUhCIcjMkZN59u1flz/u+sEKccM5qsROqVyg==
-  dependencies:
-    "@ampproject/toolbox-core" "^2.7.1-alpha.0"
-    "@ampproject/toolbox-runtime-version" "^2.7.1-alpha.0"
-    "@ampproject/toolbox-script-csp" "^2.5.4"
-    "@ampproject/toolbox-validator-rules" "^2.7.1-alpha.0"
-    abort-controller "3.0.0"
-    cross-fetch "3.0.6"
-    cssnano-simple "1.2.1"
-    dom-serializer "1.1.0"
-    domhandler "3.3.0"
-    domutils "2.4.2"
-    htmlparser2 "5.0.1"
-    https-proxy-agent "5.0.0"
-    lru-cache "6.0.0"
-    node-fetch "2.6.1"
-    normalize-html-whitespace "1.0.0"
-    postcss "7.0.32"
-    postcss-safe-parser "4.0.2"
-    terser "5.5.1"
-
-"@ampproject/toolbox-runtime-version@^2.7.1-alpha.0":
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-runtime-version/-/toolbox-runtime-version-2.7.4.tgz#f49da0dab122101ef75ed3caed3a0142487b73e1"
-  integrity sha512-SAdOUOERp42thVNWaBJlnFvFVvnacMVnz5z9LyUZHSnoL1EqrAW5Sz5jv+Ly+gkA8NYsEaUxAdSCBAzE9Uzb4Q==
-  dependencies:
-    "@ampproject/toolbox-core" "2.7.4"
-
-"@ampproject/toolbox-script-csp@^2.5.4":
-  version "2.5.4"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-script-csp/-/toolbox-script-csp-2.5.4.tgz#d8b7b91a678ae8f263cb36d9b74e441b7d633aad"
-  integrity sha512-+knTYetI5nWllRZ9wFcj7mYxelkiiFVRAAW/hl0ad8EnKHMH82tRlk40CapEnUHhp6Er5sCYkumQ8dngs3Q4zQ==
-
-"@ampproject/toolbox-validator-rules@^2.7.1-alpha.0":
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/@ampproject/toolbox-validator-rules/-/toolbox-validator-rules-2.7.4.tgz#a58b5eca723f6c3557ac83b696de0247f5f03ce4"
-  integrity sha512-z3JRcpIZLLdVC9XVe7YTZuB3a/eR9s2SjElYB9AWRdyJyL5Jt7+pGNv4Uwh1uHVoBXsWEVQzNOWSNtrO3mSwZA==
-  dependencies:
-    cross-fetch "3.0.6"
-
 "@apidevtools/json-schema-ref-parser@^9.0.3":
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.7.tgz#64aa7f5b34e43d74ea9e408b90ddfba02050dde3"
@@ -63,21 +12,21 @@
     js-yaml "^3.13.1"
 
 "@apollo/client@^3.3.8":
-  version "3.3.10"
-  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.3.10.tgz#4fbba049e6b92ac47638cb472db9e653462fa514"
-  integrity sha512-OL5y8q5evSbvsqMAHKZJgfgB/MS9PLGF7f0MtHEkGGCDvmcmA81lsjYwk0xpDm/3XdnrYp/duN2tYUu2LnpJmw==
+  version "3.3.15"
+  resolved "https://registry.yarnpkg.com/@apollo/client/-/client-3.3.15.tgz#bdd230894aac4beb8ade2b472a1d3c9ea6152812"
+  integrity sha512-/WQmNvLEZMA0mA3u+FkEPTXKzxZD/KhyO7WlbKcy3zKGrXKza83tAbNMzsitQE7DTcSc3DLEcIu1Z5Rc7PFq0Q==
   dependencies:
     "@graphql-typed-document-node/core" "^3.0.0"
     "@types/zen-observable" "^0.8.0"
-    "@wry/context" "^0.5.2"
-    "@wry/equality" "^0.3.0"
+    "@wry/context" "^0.6.0"
+    "@wry/equality" "^0.4.0"
     fast-json-stable-stringify "^2.0.0"
     graphql-tag "^2.12.0"
     hoist-non-react-statics "^3.3.2"
-    optimism "^0.14.0"
+    optimism "^0.15.0"
     prop-types "^15.7.2"
     symbol-observable "^2.0.0"
-    ts-invariant "^0.6.0"
+    ts-invariant "^0.7.0"
     tslib "^1.10.0"
     zen-observable "^0.8.14"
 
@@ -121,7 +70,7 @@
   dependencies:
     tslib "~2.0.1"
 
-"@babel/code-frame@7.12.11", "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
+"@babel/code-frame@7.12.11", "@babel/code-frame@^7.10.4", "@babel/code-frame@^7.12.11":
   version "7.12.11"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f"
   integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==
@@ -135,7 +84,7 @@
   dependencies:
     "@babel/highlight" "^7.8.3"
 
-"@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
   integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
@@ -342,12 +291,12 @@
   dependencies:
     "@babel/types" "^7.12.7"
 
-"@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
-  integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
+"@babel/helper-module-imports@^7.0.0":
+  version "7.13.12"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
+  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
   dependencies:
-    "@babel/types" "^7.12.13"
+    "@babel/types" "^7.13.12"
 
 "@babel/helper-module-imports@^7.12.1":
   version "7.12.5"
@@ -356,6 +305,13 @@
   dependencies:
     "@babel/types" "^7.12.5"
 
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.8.3":
+  version "7.12.13"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
+  integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
+  dependencies:
+    "@babel/types" "^7.12.13"
+
 "@babel/helper-module-transforms@^7.12.1":
   version "7.12.1"
   resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz#7954fec71f5b32c48e4b303b437c34453fd7247c"
@@ -513,11 +469,11 @@
     "@babel/types" "^7.12.5"
 
 "@babel/highlight@^7.10.4":
-  version "7.10.4"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143"
-  integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==
+  version "7.13.10"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.13.10.tgz#a8b2a66148f5b27d666b15d81774347a731d52d1"
+  integrity sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.10.4"
+    "@babel/helper-validator-identifier" "^7.12.11"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
@@ -1379,13 +1335,20 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4":
+"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.12.1", "@babel/runtime@^7.3.4", "@babel/runtime@^7.4.5", "@babel/runtime@^7.6.3", "@babel/runtime@^7.8.4":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d"
   integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==
   dependencies:
     regenerator-runtime "^0.13.4"
 
+"@babel/runtime@^7.5.5", "@babel/runtime@^7.7.2":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.17.tgz#8966d1fc9593bf848602f0662d6b4d0069e3a7ec"
+  integrity sha512-NCdgJEelPTSh+FEFylhnP1ylq848l1z9t9N0j1Lfbcw0+KXGjsTvUmkxy+voLLXB5SOKMbLLx4jxYliGrYQseA==
+  dependencies:
+    regenerator-runtime "^0.13.4"
+
 "@babel/runtime@^7.8.7":
   version "7.13.6"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.6.tgz#86e0fad6cbb46a680e21c1aa4748717a058d345a"
@@ -1441,7 +1404,7 @@
     globals "^11.1.0"
     lodash "^4.17.19"
 
-"@babel/types@7.12.13", "@babel/types@^7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
+"@babel/types@7.12.13", "@babel/types@^7.12.5", "@babel/types@^7.4.0", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.9.0":
   version "7.12.13"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611"
   integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==
@@ -1468,6 +1431,14 @@
     lodash "^4.17.19"
     to-fast-properties "^2.0.0"
 
+"@babel/types@^7.12.13", "@babel/types@^7.13.12":
+  version "7.13.17"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.17.tgz#48010a115c9fba7588b4437dd68c9469012b38b4"
+  integrity sha512-RawydLgxbOPDlTLJNtoIypwdmAy//uQIzlKt2+iBiJaRlVuI6QLUxVAyWGNfOzp8Yu4L4lLIacoCyTNtpb4wiA==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.12.11"
+    to-fast-properties "^2.0.0"
+
 "@bcoe/v8-coverage@^0.2.3":
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
@@ -2185,9 +2156,9 @@
   integrity sha512-/phre1NwXT0Mrxcq3yb+KksJ16/ykptgxI7+jh5pmDZfxnIMPlBWFBGDK0yw96oi752Wuo24X6+tkWjVe/g5Bg==
 
 "@geist-ui/react@^2.1.0-canary.2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/@geist-ui/react/-/react-2.1.1.tgz#34ab42e24b1925e24b1957f1af7e21de9ab8f464"
-  integrity sha512-vOb2ruasSxwR3KzCAyzbE3w1Zbcvo0adgchy6lWh/M3UN5GFVLGoz1na3+lK/aiJa6eJIM8zpSkWapEGnctmcQ==
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@geist-ui/react/-/react-2.1.5.tgz#26532eb1869a97c60c36a3860cba184bdab59f55"
+  integrity sha512-vHn3yOAyXon88m6UnaU9e16iC5U0hFwYbwlroD05dbx4GbH/f5uRhmQ5QI4nkTvVi3/m0++cLGR2ek9U8WY6hg==
   dependencies:
     styled-jsx "3.3.0"
 
@@ -2372,38 +2343,32 @@
     tslib "~2.0.1"
 
 "@graphql-codegen/introspection@^1.18.1":
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/introspection/-/introspection-1.18.1.tgz#fe3f781b2b60cc69a0cf535a3cfe912c71e32770"
-  integrity sha512-M8kLUYF+YA/oj378RHh7BN5hO2wdplBfL2oyRL9sxjtNY30iYGn7To3TRijDCNoXaak5jLwgwUURZ0BZgX6IJA==
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/introspection/-/introspection-1.18.2.tgz#1b4b5e23cc59c2828a073caccf66c556885d5dd6"
+  integrity sha512-1SuhWu6nbOIOSZdQLNmHHVN8VsTavUQUD6OWjUuR3Bjpw9jfykNYXPpGGQxdCa5hmiWvn2JQU+qtgtERzz4+rg==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.2"
-    tslib "~2.0.1"
+    "@graphql-codegen/plugin-helpers" "^1.18.5"
+    tslib "~2.2.0"
 
-"@graphql-codegen/plugin-helpers@^1.18.2":
-  version "1.18.2"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-1.18.2.tgz#57011076cb8b8f5d04d37d226a5eda300c01be94"
-  integrity sha512-SvX+Ryq2naLcoD6jJNxtzc/moWTgHJ+X0KRfvhGWTa+xtFTS02i+PWOR89YYPcD8+LF6GmyFBjx2FmLCx4JwMg==
+"@graphql-codegen/plugin-helpers@^1.18.2", "@graphql-codegen/plugin-helpers@^1.18.5":
+  version "1.18.5"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-1.18.5.tgz#e1d875cfb6a2f7bf4b4318135f7fee6e1200f3b0"
+  integrity sha512-xY8dWdU4+mm+253esLYcKQIgWZEgI3spKPmMRQ+oAxlrCn9oIcdhhiMqNxa9rHS20xpZtlAjozxHulrqjFLuyA==
   dependencies:
-    "@graphql-tools/utils" "^6"
-    camel-case "4.1.1"
+    "@graphql-tools/utils" "^7.0.0"
     common-tags "1.8.0"
-    constant-case "3.0.3"
     import-from "3.0.0"
     lodash "~4.17.20"
-    lower-case "2.0.1"
-    param-case "3.0.3"
-    pascal-case "3.1.1"
-    tslib "~2.0.1"
-    upper-case "2.0.1"
+    tslib "~2.2.0"
 
 "@graphql-codegen/schema-ast@^1.18.1":
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-1.18.1.tgz#4081741b940944f883eec26f031840283f877210"
-  integrity sha512-uBVPqDZVvV1i1mBTp+DQldBO5AO4PAetZrAJJhQk5gaYxvKlf7YZWRT2WFwRdH1GEdU35tRxUX8XKSkxaKct/w==
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-1.18.2.tgz#e900b201cb8a56a4e7cf50a681935fb5166f4c05"
+  integrity sha512-ZzZa9b+/gU67goNnNi3b7iyZ1gmvsHo2w1s9YlRz+k8baVXSncAI6qT07z77VhS2i0TQUjC5ivfxPyVttY5YTw==
   dependencies:
-    "@graphql-codegen/plugin-helpers" "^1.18.2"
-    "@graphql-tools/utils" "^6"
-    tslib "~2.0.1"
+    "@graphql-codegen/plugin-helpers" "^1.18.5"
+    "@graphql-tools/utils" "^7.0.0"
+    tslib "~2.2.0"
 
 "@graphql-codegen/typescript-operations@1.17.14":
   version "1.17.14"
@@ -2787,9 +2752,9 @@
   integrity sha512-QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ==
 
 "@hapi/boom@9.x.x":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.1.tgz#89e6f0e01637c2a4228da0d113e8157c93677b04"
-  integrity sha512-VNR8eDbBrOxBgbkddRYIe7+8DZ+vSbV6qlmaN2x7eWjsUjy2VmQgChkOKcVZIeupEZYj+I0dqNg430OhwzagjA==
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/@hapi/boom/-/boom-9.1.2.tgz#48bd41d67437164a2d636e3b5bc954f8c8dc5e38"
+  integrity sha512-uJEJtiNHzKw80JpngDGBCGAmWjBtzxDCz17A9NO2zCi8LLBlb5Frpq4pXwyN+2JQMod4pKz5BALwyneCgDg89Q==
   dependencies:
     "@hapi/hoek" "9.x.x"
 
@@ -2804,9 +2769,9 @@
   integrity sha512-yN7kbciD87WzLGc5539Tn0sApjyiGHAJgKvG9W8C7O+6c7qmoQMfVs0W4bX17eqz6C78QJqqFrtgdK5EWf6Qow==
 
 "@hapi/hoek@9.x.x":
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.1.1.tgz#9daf5745156fd84b8e9889a2dc721f0c58e894aa"
-  integrity sha512-CAEbWH7OIur6jEOzaai83jq3FmKmv4PmX1JYfs9IrYcGEVI/lyL1EXJGCj7eFVJ0bg5QR8LMxBlEtA+xKiLpFw==
+  version "9.2.0"
+  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-9.2.0.tgz#f3933a44e365864f4dad5db94158106d511e8131"
+  integrity sha512-sqKVVVOe5ivCaXDWivIJYVSaEgdQK9ul7a4Kity5Iw7u9+wBAPbX1RMSnLLmp7O4Vzj0WOWwMAJsTL00xwaNug==
 
 "@hapi/joi@^15.0.0":
   version "15.1.1"
@@ -3863,20 +3828,20 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@next/env@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@next/env/-/env-10.0.6.tgz#e3c845491a8b0fffda219b5bda84b361b8b2f9c2"
-  integrity sha512-++zgrcSL9SprjWKBbO3YuVj/8CTmxJl+zLErW/Kbr2VCT0u12SrBcMKvD236lEGs5/qUgeBfU3Dvmr6MASWrtA==
+"@next/env@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@next/env/-/env-10.1.3.tgz#29e5d62919b4a7b1859f8d36169848dc3f5ddebe"
+  integrity sha512-q7z7NvmRs66lCQmVJtKjDxVtMTjSwP6ExVzaH46pbTH60MHgzEJ9H4jXrFLTihPmCIvpAv6Ai04jbS8dcg1ZMQ==
 
-"@next/polyfill-module@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-10.0.6.tgz#9d4c651456d90b5bafb3d9a3a93100d309d47746"
-  integrity sha512-Sk3HYFxiI3AyIhw7Nnc5un//duCthAP2XtPb4N1SamymOU2QSb8I1zkcsxVIlZRvftdXikQQgra6Ck2zfJRxpA==
+"@next/polyfill-module@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@next/polyfill-module/-/polyfill-module-10.1.3.tgz#beafe89bc4235d436fa0ed02c9d2a5d311fb0238"
+  integrity sha512-1DtUVcuoBJAn5IrxIZQjUG1KTPkiXMYloykPSkRxawimgvG9dRj2kscU+4KGNSFxHoxW9c68VRCb+7MDz5aGGw==
 
-"@next/react-dev-overlay@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-10.0.6.tgz#9e9828cfd75a62e852a3d1861e605c92d97c4ff4"
-  integrity sha512-KbxpyVT6gr1KZ7JoFDKGNM0hK7CxPkIC14j/gYgR6qSOhxGs3GEIBScJRXfKD7LNPMgVgQtaJlBYlEJ7aQu1xg==
+"@next/react-dev-overlay@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@next/react-dev-overlay/-/react-dev-overlay-10.1.3.tgz#ee1c6033b29be9b383e061bd9705021d131ea445"
+  integrity sha512-vIgUah3bR9+MKzwU1Ni5ONfYM0VdI42i7jZ+Ei1c0wjwkG9anVnDqhSQ3mVg62GP2nt7ExaaFyf9THbsw5KYXg==
   dependencies:
     "@babel/code-frame" "7.12.11"
     anser "1.4.9"
@@ -3890,10 +3855,10 @@
     stacktrace-parser "0.1.10"
     strip-ansi "6.0.0"
 
-"@next/react-refresh-utils@10.0.6":
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-10.0.6.tgz#896a182654d54eec6b6374251d834199efa70081"
-  integrity sha512-4BF+8PyzDcYpumQJ22yBUjVP/CL2KLPM+3K3ZQb61HvmIptB/t+jFnH2ew8S7ORQNu/caVQC6wP5wAfOtpJNsg==
+"@next/react-refresh-utils@10.1.3":
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/@next/react-refresh-utils/-/react-refresh-utils-10.1.3.tgz#65b3e1b9846c02452787fde1d54ad9c54b506dbd"
+  integrity sha512-P4GJZuLKfD/o42JvGZ/xP4Hxg68vd3NeZxOLqIuQKFjjaYgC2IrO+lE5PTwGmRkytjfprJC+9j7Jss/xQAS6QA==
 
 "@nodelib/fs.scandir@2.1.4":
   version "2.1.4"
@@ -4859,11 +4824,12 @@
     csstype "^3.0.2"
 
 "@types/react@^17.0.2":
-  version "17.0.2"
-  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.2.tgz#3de24c4efef902dd9795a49c75f760cbe4f7a5a8"
-  integrity sha512-Xt40xQsrkdvjn1EyWe1Bc0dJLcil/9x2vAuW7ya+PuQip4UYUaXyhzWmAbwRsdMgwOFHpfp7/FFZebDU6Y8VHA==
+  version "17.0.4"
+  resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.4.tgz#a67c6f7a460d2660e950d9ccc1c2f18525c28220"
+  integrity sha512-onz2BqScSFMoTRdJUZUDD/7xrusM8hBA2Fktk2qgaTYPCgPvWnDEgkrOs8hhPUf2jfcIXkJ5yK6VfYormJS3Jw==
   dependencies:
     "@types/prop-types" "*"
+    "@types/scheduler" "*"
     csstype "^3.0.2"
 
 "@types/request-ip@^0.0.35":
@@ -4873,6 +4839,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/scheduler@*":
+  version "0.16.1"
+  resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.1.tgz#18845205e86ff0038517aab7a18a62a6b9f71275"
+  integrity sha512-EaCxbanVeyxDRTQBkdLb3Bvl/HK7PBK6UJjsSixB0iHKoWxE5uu2Q/DgtpOhPIojN0Zl1whvOd7PoHs2P0s5eA==
+
 "@types/serve-static@*":
   version "1.13.9"
   resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.9.tgz#aacf28a85a05ee29a11fb7c3ead935ac56f33e4e"
@@ -4962,11 +4933,6 @@
   dependencies:
     source-map "^0.6.1"
 
-"@types/ungap__global-this@^0.3.1":
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/@types/ungap__global-this/-/ungap__global-this-0.3.1.tgz#18ce9f657da556037a29d50604335614ce703f4c"
-  integrity sha512-+/DsiV4CxXl6ZWefwHZDXSe1Slitz21tom38qPCaG0DYCS1NnDPIQDTKcmQ/tvK/edJUKkmuIDBJbmKDiB0r/g==
-
 "@types/uuid@^8.3.0":
   version "8.3.0"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
@@ -5281,11 +5247,6 @@
     "@typescript-eslint/types" "4.14.2"
     eslint-visitor-keys "^2.0.0"
 
-"@ungap/global-this@^0.4.2":
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/@ungap/global-this/-/global-this-0.4.4.tgz#8a1b2cfcd3e26e079a847daba879308c924dd695"
-  integrity sha512-mHkm6FvepJECMNthFuIgpAEFmPOk71UyXuIxYfjytvFTnSDBIz7jmViO+LfHI/AjrazWije0PnSP3+/NlwzqtA==
-
 "@webassemblyjs/ast@1.8.5":
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
@@ -5454,12 +5415,12 @@
     react-test-renderer "^17.0.0-0"
     semver "^5.7.0"
 
-"@wry/context@^0.5.2":
-  version "0.5.4"
-  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.5.4.tgz#b6c28038872e0a0e1ff14eb40b5bf4cab2ab4e06"
-  integrity sha512-/pktJKHUXDr4D6TJqWgudOPJW2Z+Nb+bqk40jufA3uTkLbnCRKdJPiYDIa/c7mfcPH8Hr6O8zjCERpg5Sq04Zg==
+"@wry/context@^0.6.0":
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/@wry/context/-/context-0.6.0.tgz#f903eceb89d238ef7e8168ed30f4511f92d83e06"
+  integrity sha512-sAgendOXR8dM7stJw3FusRxFHF/ZinU0lffsA2YTyyIOfic86JX02qlPqPVqJNZJPAxFt+2EE8bvq6ZlS0Kf+Q==
   dependencies:
-    tslib "^1.14.1"
+    tslib "^2.1.0"
 
 "@wry/equality@^0.1.2":
   version "0.1.11"
@@ -5468,19 +5429,19 @@
   dependencies:
     tslib "^1.9.3"
 
-"@wry/equality@^0.3.0":
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.3.2.tgz#566a8d05225f1e559fc6589c8b50fa085413c6be"
-  integrity sha512-yi0VRqw+ygqM/WVZUze5meAhe2evOHBFXqK8onNVdNNB+Tyn8/07FZpeDklECBHeT9KN9DY2JpCVGNQY6RCRDg==
+"@wry/equality@^0.4.0":
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.4.0.tgz#474491869a8d0590f4a33fd2a4850a77a0f63408"
+  integrity sha512-DxN/uawWfhRbgYE55zVCPOoe+jvsQ4m7PT1Wlxjyb/LCCLuU1UsucV2BbCxFAX8bjcSueFBbB5Qfj1Zfe8e7Fw==
   dependencies:
-    tslib "^1.14.1"
+    tslib "^2.1.0"
 
-"@wry/trie@^0.2.1":
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.2.2.tgz#99f20f0fcbbcda17006069b155c826cbabfc402f"
-  integrity sha512-OxqBB39x6MfHaa2HpMiRMfhuUnQTddD32Ko020eBeJXq87ivX6xnSSnzKHVbA21p7iqBASz8n/07b6W5wW1BVQ==
+"@wry/trie@^0.3.0":
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/@wry/trie/-/trie-0.3.0.tgz#3245e74988c4e3033299e479a1bf004430752463"
+  integrity sha512-Yw1akIogPhAT6XPYsRHlZZIS0tIGmAl9EYXHi2scf7LPKKqdqmow/Hu4kEqP2cJR3EjaU/9L0ZlAjFf3hFxmug==
   dependencies:
-    tslib "^1.14.1"
+    tslib "^2.1.0"
 
 "@xtuc/ieee754@^1.2.0":
   version "1.2.0"
@@ -5519,7 +5480,7 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-abort-controller@3.0.0, abort-controller@^3.0.0:
+abort-controller@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/abort-controller/-/abort-controller-3.0.0.tgz#eaf54d53b62bae4138e809ca225c8439a6efb392"
   integrity sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==
@@ -5785,7 +5746,7 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@^3.0.3, anymatch@~3.1.1:
+anymatch@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
   integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
@@ -5793,6 +5754,14 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
+anymatch@~3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
 apollo-cache-control@^0.11.6:
   version "0.11.6"
   resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.11.6.tgz#f7bdf924272af47ac474cf3f3f35cfc038cc9485"
@@ -6117,7 +6086,7 @@ array-flatten@1.1.1, array-flatten@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
   integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
 
-array-flatten@3.0.0, array-flatten@^3.0.0:
+array-flatten@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-3.0.0.tgz#6428ca2ee52c7b823192ec600fa3ed2f157cd541"
   integrity sha512-zPMVc3ZYlGLNk4mpK1NzP2wg0ml9t7fUgDsayR5Y5rSzxQilzR9FGu/EH2jQOcKSAeAfWeylyW8juy3OkWRvNA==
@@ -6248,6 +6217,16 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
+assert@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/assert/-/assert-2.0.0.tgz#95fc1c616d48713510680f2eaf2d10dd22e02d32"
+  integrity sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==
+  dependencies:
+    es6-object-assign "^1.1.0"
+    is-nan "^1.2.1"
+    object-is "^1.0.1"
+    util "^0.12.0"
+
 assert@^1.1.1:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.5.0.tgz#55c109aaf6e0aefdb3dc4b71240c70bf574b18eb"
@@ -6358,6 +6337,13 @@ autoprefixer@^9.6.1:
     postcss "^7.0.32"
     postcss-value-parser "^4.1.0"
 
+available-typed-arrays@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/available-typed-arrays/-/available-typed-arrays-1.0.2.tgz#6b098ca9d8039079ee3f77f7b783c4480ba513f5"
+  integrity sha512-XWX3OX8Onv97LMk/ftVyBibpGwY5a8SmuxZPzeOxqmuEqUCOM9ZE+uIaD1VNJ5QnvU2UQusvmKbuM1FR8QWGfQ==
+  dependencies:
+    array-filter "^1.0.0"
+
 aws-sign2@~0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
@@ -6476,9 +6462,9 @@ babel-plugin-dynamic-import-node@^2.3.3:
     object.assign "^4.1.0"
 
 babel-plugin-emotion@^10.0.27:
-  version "10.0.33"
-  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.0.33.tgz#ce1155dcd1783bbb9286051efee53f4e2be63e03"
-  integrity sha512-bxZbTTGz0AJQDHm8k6Rf3RQJ8tX2scsfsRyKVgAbiUPUNIRtlK+7JxP+TAd1kRLABFxe0CFm2VdK4ePkoA9FxQ==
+  version "10.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-emotion/-/babel-plugin-emotion-10.2.2.tgz#a1fe3503cff80abfd0bdda14abd2e8e57a79d17d"
+  integrity sha512-SMSkGoqTbTyUTDeuVuPIWifPdUGkTk1Kf9BWRiXIOIcuyMfsdp2EjeiiFvOzX8NOBvEh/ypKYvUh2rkgAJMCLA==
   dependencies:
     "@babel/helper-module-imports" "^7.0.0"
     "@emotion/hash" "0.8.0"
@@ -6840,9 +6826,9 @@ bindings@^1.5.0:
     file-uri-to-path "1.0.0"
 
 bl@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/bl/-/bl-4.0.3.tgz#12d6287adc29080e22a705e5764b2a9522cdc489"
-  integrity sha512-fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg==
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-4.1.0.tgz#451535264182bec2fbbc83a62ab98cf11d9f7b3a"
+  integrity sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==
   dependencies:
     buffer "^5.5.0"
     inherits "^2.0.4"
@@ -6871,14 +6857,14 @@ bluebird@~3.4.1:
   integrity sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=
 
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9:
-  version "4.11.9"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz#26d556829458f9d1e81fc48952493d0ba3507828"
-  integrity sha512-E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw==
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88"
+  integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==
 
 bn.js@^5.0.0, bn.js@^5.1.1:
-  version "5.1.3"
-  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz#beca005408f642ebebea80b042b4d18d2ac0ee6b"
-  integrity sha512-GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ==
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002"
+  integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw==
 
 body-parser@1.19.0, body-parser@^1.18.3, body-parser@^1.19.0:
   version "1.19.0"
@@ -7050,7 +7036,7 @@ browserify-sign@^4.0.0:
     readable-stream "^3.6.0"
     safe-buffer "^5.2.0"
 
-browserify-zlib@^0.2.0:
+browserify-zlib@0.2.0, browserify-zlib@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f"
   integrity sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==
@@ -7448,11 +7434,16 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, can
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001183.tgz#7a57ba9d6584119bb5f2bc76d3cc47ba9356b3e2"
   integrity sha512-7JkwTEE1hlRKETbCFd8HDZeLiQIUcl8rC6JgNjvHCNaxOeNmQ9V4LvQXRUsKIV2CC73qKxljwVhToaA3kLRqTw==
 
-caniuse-lite@^1.0.30001035, caniuse-lite@^1.0.30001093, caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001179:
+caniuse-lite@^1.0.30001035:
   version "1.0.30001185"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001185.tgz#3482a407d261da04393e2f0d61eefbc53be43b95"
   integrity sha512-Fpi4kVNtNvJ15H0F6vwmXtb3tukv3Zg3qhKkOGUq7KJ1J6b9kf4dnNgtEAFXhRsJo0gNj9W60+wBvn0JcTvdTg==
 
+caniuse-lite@^1.0.30001173, caniuse-lite@^1.0.30001179:
+  version "1.0.30001219"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001219.tgz#5bfa5d0519f41f993618bd318f606a4c4c16156b"
+  integrity sha512-c0yixVG4v9KBc/tQ2rlbB3A/bgBFRvl8h8M4IeUbqCca4gsiCfvtaheUssbnux/Mb66Vjz7x8yYjDgYcNQOhyQ==
+
 capture-exit@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-2.0.0.tgz#fb953bfaebeb781f62898239dabb426d08a509a4"
@@ -7900,7 +7891,7 @@ color-name@^1.0.0, color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.5.2, color-string@^1.5.4:
+color-string@^1.5.2:
   version "1.5.4"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
   integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
@@ -7908,6 +7899,14 @@ color-string@^1.5.2, color-string@^1.5.4:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
+color-string@^1.5.4:
+  version "1.5.5"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014"
+  integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg==
+  dependencies:
+    color-name "^1.0.0"
+    simple-swizzle "^0.2.2"
+
 color@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/color/-/color-3.0.0.tgz#d920b4328d534a3ac8295d68f7bd4ba6c427be9a"
@@ -7916,7 +7915,7 @@ color@3.0.x:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-color@^3.0.0, color@^3.1.3:
+color@^3.0.0:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/color/-/color-3.1.3.tgz#ca67fb4e7b97d611dcde39eceed422067d91596e"
   integrity sha512-xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ==
@@ -7925,9 +7924,9 @@ color@^3.0.0, color@^3.1.3:
     color-string "^1.5.4"
 
 colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94"
+  integrity sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==
 
 colors@^1.2.1:
   version "1.4.0"
@@ -8151,15 +8150,6 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-constant-case@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.3.tgz#ac910a99caf3926ac5112f352e3af599d8c5fc0a"
-  integrity sha512-FXtsSnnrFYpzDmvwDGQW+l8XK3GV1coLyBN0eBz16ZUzGaZcT2ANVCJmLeuw2GQgxKHQIe9e0w2dzkSfaRlUmA==
-  dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
-    upper-case "^2.0.1"
-
 constant-case@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/constant-case/-/constant-case-3.0.4.tgz#3b84a9aeaf4cf31ec45e6bf5de91bdfb0589faf1"
@@ -8169,7 +8159,7 @@ constant-case@^3.0.3:
     tslib "^2.0.3"
     upper-case "^2.0.2"
 
-constants-browserify@^1.0.0:
+constants-browserify@1.0.0, constants-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
@@ -8820,14 +8810,6 @@ cssnano-preset-default@^4.0.7:
     postcss-svgo "^4.0.2"
     postcss-unique-selectors "^4.0.1"
 
-cssnano-preset-simple@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.2.1.tgz#8976013114b1fc4718253d30f21aaed1780fb80e"
-  integrity sha512-B2KahOIFTV6dw5Ioy9jHshTh/vAYNnUB2enyWRgnAEg3oJBjI/035ExpePaMqS2SwpbH7gCgvQqwpMBH6hTJSw==
-  dependencies:
-    caniuse-lite "^1.0.30001093"
-    postcss "^7.0.32"
-
 cssnano-preset-simple@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/cssnano-preset-simple/-/cssnano-preset-simple-1.2.2.tgz#c631bf79ffec7fdfc4069e2f2da3ca67d99d8413"
@@ -8836,14 +8818,6 @@ cssnano-preset-simple@1.2.2:
     caniuse-lite "^1.0.30001179"
     postcss "^7.0.32"
 
-cssnano-simple@1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-1.2.1.tgz#6de5d9dd75774bc8f31767573410a952c7dd8a12"
-  integrity sha512-9vOyjw8Dj/T12kIOnXPZ5VnEIo6F3YMaIn0wqJXmn277R58cWpI3AvtdlCBtohX7VAUNYcyk2d0dKcXXkb5I6Q==
-  dependencies:
-    cssnano-preset-simple "1.2.1"
-    postcss "^7.0.32"
-
 cssnano-simple@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/cssnano-simple/-/cssnano-simple-1.2.2.tgz#72c2c3970e67123c3b4130894a30dc1050267007"
@@ -8916,14 +8890,14 @@ cssstyle@^2.2.0:
     cssom "~0.3.6"
 
 csstype@^2.5.7:
-  version "2.6.14"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.14.tgz#004822a4050345b55ad4dcc00be1d9cf2f4296de"
-  integrity sha512-2mSc+VEpGPblzAxyeR+vZhJKgYg0Og0nnRi7pmRXFYYxSfnOnW8A5wwQb4n4cE2nIOzqKOAzLCaEX6aBmNEv8A==
+  version "2.6.17"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.17.tgz#4cf30eb87e1d1a005d8b6510f95292413f6a1c0e"
+  integrity sha512-u1wmTI1jJGzCJzWndZo8mk4wnPTZd1eOIYTYvuEyOQGfmDl3TrabCCfKnOC86FZwW/9djqTl933UF/cS425i9A==
 
 csstype@^3.0.2:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.6.tgz#865d0b5833d7d8d40f4e5b8a6d76aea3de4725ef"
-  integrity sha512-+ZAmfyWMT7TiIlzdqJgjMb7S4f1beorDbWbsocyK4RaiqA5RTX3K14bnBWmmA9QEM0gRdsjyyrEmcyga8Zsxmw==
+  version "3.0.8"
+  resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.8.tgz#d2266a792729fb227cd216fb572f43728e1ad340"
+  integrity sha512-jXKhWqXPmlUeoQnF/EhTtTl4C9SnrxSH/jZUih3jmO6lBKr99rP3/+FmrMj4EFpOXzMtXHAZkd3x0E6h6Fgflw==
 
 csv-streamify@^3.0.4:
   version "3.0.4"
@@ -9059,7 +9033,7 @@ debounce@^1.2.0:
   resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
   integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
+debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.8, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -9122,20 +9096,6 @@ decompress-response@^3.3.0:
   dependencies:
     mimic-response "^1.0.0"
 
-decompress-response@^4.2.0:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-4.2.1.tgz#414023cc7a302da25ce2ec82d0d5238ccafd8986"
-  integrity sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==
-  dependencies:
-    mimic-response "^2.0.0"
-
-decompress-response@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-6.0.0.tgz#ca387612ddb7e104bd16d85aab00d5ecf09c66fc"
-  integrity sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==
-  dependencies:
-    mimic-response "^3.1.0"
-
 dedent@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c"
@@ -9308,11 +9268,6 @@ detect-indent@^6.0.0:
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.0.0.tgz#0abd0f549f69fc6659a254fe96786186b6f528fd"
   integrity sha512-oSyFlqaTHCItVRGK5RmrmjB+CmaMOW7IaNA/kdxqhoa6d17j/5ce9O9eWXmV/KEdRwqpQA+Vqe8a8Bsybu4YnA==
 
-detect-libc@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -9474,16 +9429,16 @@ dom-serializer@0:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
-dom-serializer@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz#5f7c828f1bfc44887dc2a315ab5c45691d544b58"
-  integrity sha512-ox7bvGXt2n+uLWtCRLybYx60IrOlWL/aCebWJk1T0d4m3y2tzf4U3ij9wBMUb6YJZpz06HCCYuyCDveE2xXmzQ==
+dom-serializer@^1.0.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.1.tgz#d845a1565d7c041a95e5dab62184ab41e3a519be"
+  integrity sha512-Pv2ZluG5ife96udGgEDovOOOA5UELkltfJpnIExPrAk1LTvecolUGn6lIaoLh86d83GiB86CjzciMd9BuRB71Q==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^3.0.0"
+    domhandler "^4.0.0"
     entities "^2.0.0"
 
-dom-serializer@^1.0.1, dom-serializer@~1.2.0:
+dom-serializer@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.2.0.tgz#3433d9136aeb3c627981daa385fc7f32d27c48f1"
   integrity sha512-n6kZFH/KlCrqs/1GHMOd5i2fd/beQHuehKdWvNNffbGHTr/almdhuVvTVFb3V7fglz+nC50fFusu3lY33h12pA==
@@ -9497,6 +9452,11 @@ dom-storage@2.1.0:
   resolved "https://registry.yarnpkg.com/dom-storage/-/dom-storage-2.1.0.tgz#00fb868bc9201357ea243c7bcfd3304c1e34ea39"
   integrity sha512-g6RpyWXzl0RR6OTElHKBl7nwnK87GUyZMYC7JWsB/IA73vpqK2K6LT39x4VepLxlSsWBFrPVLnsSR5Jyty0+2Q==
 
+domain-browser@4.19.0:
+  version "4.19.0"
+  resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-4.19.0.tgz#1093e17c0a17dbd521182fe90d49ac1370054af1"
+  integrity sha512-fRA+BaAWOR/yr/t7T9E9GJztHPeFjj8U35ajyAjCDtAAnTn1Rc1f6W6VGPJrO1tkQv9zWu+JRof7z6oQtiYVFQ==
+
 domain-browser@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
@@ -9507,10 +9467,10 @@ domelementtype@1, domelementtype@^1.3.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
-domelementtype@^2.0.1, domelementtype@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.1.0.tgz#a851c080a6d1c3d94344aed151d99f669edf585e"
-  integrity sha512-LsTgx/L5VpD+Q8lmsXSHW2WpA+eBlZ9HPf3erD1IoPF00/3JKHZ3BknUVA2QGDNu69ZNmyFmCWBSO45XjYKC5w==
+domelementtype@^2.0.1, domelementtype@^2.1.0, domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
 
 domexception@^1.0.1:
   version "1.0.1"
@@ -9526,13 +9486,6 @@ domexception@^2.0.1:
   dependencies:
     webidl-conversions "^5.0.0"
 
-domhandler@3.3.0, domhandler@^3.0.0, domhandler@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz#6db7ea46e4617eb15cf875df68b2b8524ce0037a"
-  integrity sha512-J1C5rIANUbuYK+FuFL98650rihynUOEzRLxW+90bKZRWB6A1X1Tf82GxR1qAWLyfNPRvjqfip3Q5tdYlmAa9lA==
-  dependencies:
-    domelementtype "^2.0.1"
-
 domhandler@^2.3.0:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-2.4.2.tgz#8805097e933d65e85546f726d60f5eb88b44f803"
@@ -9541,20 +9494,11 @@ domhandler@^2.3.0:
     domelementtype "1"
 
 domhandler@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.0.0.tgz#01ea7821de996d85f69029e81fa873c21833098e"
-  integrity sha512-KPTbnGQ1JeEMQyO1iYXoagsI6so/C96HZiFyByU3T6iAzpXn8EGEvct6unm1ZGoed8ByO2oirxgwxBmqKF9haA==
-  dependencies:
-    domelementtype "^2.1.0"
-
-domutils@2.4.2:
-  version "2.4.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz#7ee5be261944e1ad487d9aa0616720010123922b"
-  integrity sha512-NKbgaM8ZJOecTZsIzW5gSuplsX2IWW2mIK7xVr8hTQF2v1CJWTmLZ1HOCh5sH+IzVPAGE5IucooOkvwBRAdowA==
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
   dependencies:
-    dom-serializer "^1.0.1"
-    domelementtype "^2.0.1"
-    domhandler "^3.3.0"
+    domelementtype "^2.2.0"
 
 domutils@^1.5.1, domutils@^1.7.0:
   version "1.7.0"
@@ -9564,7 +9508,7 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-domutils@^2.4.2, domutils@^2.4.3, domutils@^2.4.4:
+domutils@^2.4.3, domutils@^2.4.4:
   version "2.4.4"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.4.4.tgz#282739c4b150d022d34699797369aad8d19bbbd3"
   integrity sha512-jBC0vOsECI4OMdD0GC9mGn7NXPLb+Qt6KW1YDQzeQYRUFKmNG8lh7mO5HiELfr+lLQE7loDVI4QcAxV80HS+RA==
@@ -9573,7 +9517,7 @@ domutils@^2.4.2, domutils@^2.4.3, domutils@^2.4.4:
     domelementtype "^2.0.1"
     domhandler "^4.0.0"
 
-dot-case@^3.0.3, dot-case@^3.0.4:
+dot-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751"
   integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==
@@ -9686,11 +9630,16 @@ ejs@^2.6.1:
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.7.4.tgz#48661287573dcc53e366c7a1ae52c3a120eec9ba"
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
-electron-to-chromium@^1.3.378, electron-to-chromium@^1.3.634:
+electron-to-chromium@^1.3.378:
   version "1.3.654"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.654.tgz#f1b82d59bdeafa65af75794356df54f92b41c4de"
   integrity sha512-Zy2gc/c8KYFg2GkNr7Ruzh5tPEZpFm7EyXqZTFasm1YRDJtpyBRGaOuM0H3t6SuIP53qX4kNmtO9t0WjhBjE9A==
 
+electron-to-chromium@^1.3.634:
+  version "1.3.723"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.723.tgz#52769a75635342a4db29af5f1e40bd3dad02c877"
+  integrity sha512-L+WXyXI7c7+G1V8ANzRsPI5giiimLAUDC6Zs1ojHHPhYXb3k/iTABFmWjivEtsWrRQymjnO66/rO2ZTABGdmWg==
+
 electron-to-chromium@^1.3.649:
   version "1.3.652"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.652.tgz#9465d884d609acffd131ba71096de7bfabd63670"
@@ -9754,7 +9703,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-encoding@^0.1.11:
+encoding@0.1.13, encoding@^0.1.11:
   version "0.1.13"
   resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9"
   integrity sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==
@@ -9958,6 +9907,11 @@ es6-iterator@2.0.3, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
     es5-ext "^0.10.35"
     es6-symbol "^3.1.1"
 
+es6-object-assign@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/es6-object-assign/-/es6-object-assign-1.1.0.tgz#c2c3582656247c39ea107cb1e6652b6f9f24523c"
+  integrity sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=
+
 es6-promise@^4.0.3, es6-promise@^4.0.5:
   version "4.2.8"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.8.tgz#4eb21594c972bc40553d276e510539143db53e0a"
@@ -10471,9 +10425,9 @@ events-listener@^1.1.0:
   integrity sha512-Kd3EgYfODHueq6GzVfs/VUolh2EgJsS8hkO3KpnDrxVjU3eq63eXM2ujXkhPP+OkeUOhL8CxdfZbQXzryb5C4g==
 
 events@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 eventsource@1.0.7, eventsource@^1.0.7:
   version "1.0.7"
@@ -10599,11 +10553,6 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
-expand-template@^2.0.3:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c"
-  integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg==
-
 expect@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/expect/-/expect-24.9.0.tgz#b75165b4817074fa4a157794f46fe9f1ba15b6ca"
@@ -11360,6 +11309,11 @@ for-own@^0.1.3, for-own@^0.1.4:
   dependencies:
     for-in "^1.0.1"
 
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+  integrity sha1-C+4AUBiusmDQo6865ljdATbsG5k=
+
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -11548,11 +11502,16 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@^2.1.2, fsevents@~2.3.1:
+fsevents@^2.1.2:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.1.tgz#b209ab14c61012636c8863507edf7fb68cc54e9f"
   integrity sha512-YR47Eg4hChJGAB1O3yEAOkGO+rlzutoICGqGo9EZ4lKWokzZRSyIW1QmTzqjtw8MJdj9srP869CuWw/hyzSiBw==
 
+fsevents@~2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
+  integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
+
 fstream@^1.0.0, fstream@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.12.tgz#4e8ba8ee2d48be4f7d0de505455548eae5932045"
@@ -11700,6 +11659,13 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
     has "^1.0.3"
     has-symbols "^1.0.1"
 
+get-orientation@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/get-orientation/-/get-orientation-1.1.2.tgz#20507928951814f8a91ded0a0e67b29dfab98947"
+  integrity sha512-/pViTfifW+gBbh/RnlFYHINvELT9Znt+SYyDKAUL6uV6By019AK/s+i9XP4jSwq7lwP38Fd8HVeTxym3+hkwmQ==
+  dependencies:
+    stream-parser "^0.3.1"
+
 get-own-enumerable-property-symbols@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664"
@@ -11821,11 +11787,6 @@ gitconfiglocal@^1.0.0:
   dependencies:
     ini "^1.3.2"
 
-github-from-package@0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/github-from-package/-/github-from-package-0.0.0.tgz#97fb5d96bfde8973313f20e8288ef9a167fa64ce"
-  integrity sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4=
-
 glob-base@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
@@ -11849,13 +11810,20 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0:
+glob-parent@^5.0.0, glob-parent@^5.1.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
   integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
   dependencies:
     is-glob "^4.0.1"
 
+glob-parent@~5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-slash@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/glob-slash/-/glob-slash-1.0.0.tgz#fe52efa433233f74a2fe64c7abb9bc848202ab95"
@@ -12142,11 +12110,16 @@ got@^9.6.0:
     to-readable-stream "^1.0.0"
     url-parse-lax "^3.0.0"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.2, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
 
+graceful-fs@^4.1.2:
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
+  integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
+
 graphcool-styles@0.2.4:
   version "0.2.4"
   resolved "https://registry.yarnpkg.com/graphcool-styles/-/graphcool-styles-0.2.4.tgz#c04aa8a440280e910e4c9cfa1ef97052d1060198"
@@ -12486,11 +12459,11 @@ graphql-tag@^2.11.0, graphql-tag@^2.4.2:
   integrity sha512-VmsD5pJqWJnQZMUeRwrDhfgoyqcfwEkvtpANqcoUG8/tOLkwNgU9mzub/Mc78OJMhHjx7gfAMTxzdG43VGg3bA==
 
 graphql-tag@^2.12.0:
-  version "2.12.1"
-  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.1.tgz#b065ef885e4800e4afd0842811b718a205f4aa58"
-  integrity sha512-LPewEE1vzGkHnCO8zdOGogKsHHBdtpGyihow1UuMwp6RnZa0lAS7NcbvltLOuo4pi5diQCPASAXZkQq44ffixA==
+  version "2.12.3"
+  resolved "https://registry.yarnpkg.com/graphql-tag/-/graphql-tag-2.12.3.tgz#ac47bf9d51c67c68ada8a33fd527143ed15bb647"
+  integrity sha512-5wJMjSvj30yzdciEuk9dPuUBUR56AqDi3xncoYQl1i42pGdSqOJrJsdb/rz5BDoy+qoGvQwABcBeF0xXY3TrKw==
   dependencies:
-    tslib "^1.14.1"
+    tslib "^2.1.0"
 
 graphql-tools@^4.0.0:
   version "4.0.8"
@@ -12912,16 +12885,6 @@ html-webpack-plugin@^2.24.1:
     pretty-error "^2.0.2"
     toposort "^1.0.0"
 
-htmlparser2@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-5.0.1.tgz#7daa6fc3e35d6107ac95a4fc08781f091664f6e7"
-  integrity sha512-vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ==
-  dependencies:
-    domelementtype "^2.0.1"
-    domhandler "^3.3.0"
-    domutils "^2.4.2"
-    entities "^2.0.0"
-
 htmlparser2@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
@@ -13062,19 +13025,11 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-https-browserify@^1.0.0:
+https-browserify@1.0.0, https-browserify@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@5.0.0, https-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
-  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
-  dependencies:
-    agent-base "6"
-    debug "4"
-
 https-proxy-agent@^2.2.3:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.4.tgz#4ee7a737abd92678a293d9b34a1af4d0d08c787b"
@@ -13083,6 +13038,14 @@ https-proxy-agent@^2.2.3:
     agent-base "^4.3.0"
     debug "^3.1.0"
 
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
+  dependencies:
+    agent-base "6"
+    debug "4"
+
 human-signals@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
@@ -13624,10 +13587,10 @@ is-color-stop@^1.0.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.1.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.2.0.tgz#97037ef3d52224d85163f5597b2b63d9afed981a"
-  integrity sha512-XRAfAdyyY5F5cOXn7hYQDqh2Xmii+DEfIcQGxK/uNwMHhIkPWO0g8msXcbzLe+MpGoR951MlqM/2iIlU4vKDdQ==
+is-core-module@^2.1.0, is-core-module@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.3.0.tgz#d341652e3408bca69c4671b79a0954a3d349f887"
+  integrity sha512-xSphU2KG9867tsYdLD4RWQ1VqdFl4HTO9Thf3I/3dLEfr0dbPTWKsuCKrgqMljg4nPE+Gq0VCnzT3gr0CyBmsw==
   dependencies:
     has "^1.0.3"
 
@@ -13739,6 +13702,11 @@ is-generator-fn@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-2.1.0.tgz#7d140adc389aaf3011a8f2a2a4cfa6faadffb118"
   integrity sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==
 
+is-generator-function@^1.0.7:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.0.8.tgz#dfb5c2b120e02b0a8d9d2c6806cd5621aa922f7b"
+  integrity sha512-2Omr/twNtufVZFr1GhxjOMFPAj2sjc/dKaIqBhvo4qciXfJmITGH6ZGd8eZYNHza8t1y0e01AuqRhJwfWp26WQ==
+
 is-glob@4.0.1, is-glob@^4.0.0, is-glob@^4.0.1, is-glob@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
@@ -13768,7 +13736,7 @@ is-installed-globally@^0.3.1:
     global-dirs "^2.0.1"
     is-path-inside "^3.0.1"
 
-is-nan@^1.3.0:
+is-nan@^1.2.1, is-nan@^1.3.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/is-nan/-/is-nan-1.3.2.tgz#043a54adea31748b55b6cd4e09aadafa69bd9e1d"
   integrity sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==
@@ -13981,6 +13949,17 @@ is-text-path@^1.0.1:
   dependencies:
     text-extensions "^1.0.0"
 
+is-typed-array@^1.1.3:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/is-typed-array/-/is-typed-array-1.1.5.tgz#f32e6e096455e329eb7b423862456aa213f0eb4e"
+  integrity sha512-S+GRDgJlR3PyEbsX/Fobd9cqpZBuvUS+8asRqYDMLCb2qMzt1oz5m5oxQCxOgUDxiWsOVNi4yaF+/uvdlHlYug==
+  dependencies:
+    available-typed-arrays "^1.0.2"
+    call-bind "^1.0.2"
+    es-abstract "^1.18.0-next.2"
+    foreach "^2.0.5"
+    has-symbols "^1.0.1"
+
 is-typedarray@^1.0.0, is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
@@ -14930,7 +14909,16 @@ jest-watcher@^26.6.2:
     jest-util "^26.6.2"
     string-length "^4.0.1"
 
-jest-worker@24.9.0, jest-worker@^24.6.0, jest-worker@^24.9.0:
+jest-worker@27.0.0-next.5:
+  version "27.0.0-next.5"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.0-next.5.tgz#5985ee29b12a4e191f4aae4bb73b97971d86ec28"
+  integrity sha512-mk0umAQ5lT+CaOJ+Qp01N6kz48sJG2kr2n1rX0koqKf6FIygQV0qLOdN9SCYID4IVeSigDOcPeGLozdMLYfb5g==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+jest-worker@^24.6.0, jest-worker@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
   integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
@@ -15960,12 +15948,12 @@ lodash.values@^2.4.1:
   dependencies:
     lodash.keys "~2.4.1"
 
-"lodash@>=3.5 <5", lodash@^4, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.10, lodash@~4.17.20:
+"lodash@>=3.5 <5", lodash@^4, lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.20, lodash@^4.17.5, lodash@^4.2.1, lodash@~4.17.10:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
 
-lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0:
+lodash@^4.17.13, lodash@^4.17.19, lodash@^4.17.2, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.2.0, lodash@~4.17.20:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
@@ -16046,13 +16034,6 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
-lower-case@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.1.tgz#39eeb36e396115cc05e29422eaea9e692c9408c7"
-  integrity sha512-LiWgfDLLb1dwbFQZsSglpRj+1ctGnayXz3Uv0/WO8n558JycT5fg6zkNcnW0G68Nn0aEldTFeEfmjCfmqry/rQ==
-  dependencies:
-    tslib "^1.10.0"
-
 lower-case@^1.1.1:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
@@ -16075,13 +16056,6 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lru-cache@6.0.0, lru-cache@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
-  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
-  dependencies:
-    yallist "^4.0.0"
-
 lru-cache@^4.0.1:
   version "4.1.5"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
@@ -16097,6 +16071,13 @@ lru-cache@^5.0.0, lru-cache@^5.1.1:
   dependencies:
     yallist "^3.0.2"
 
+lru-cache@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"
+  integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==
+  dependencies:
+    yallist "^4.0.0"
+
 lru-queue@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/lru-queue/-/lru-queue-0.1.0.tgz#2738bd9f0d3cf4f84490c5736c48699ac632cda3"
@@ -16507,16 +16488,6 @@ mimic-response@^1.0.0, mimic-response@^1.0.1:
   resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
   integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
-mimic-response@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-2.1.0.tgz#d13763d35f613d09ec37ebb30bac0469c0ee8f43"
-  integrity sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==
-
-mimic-response@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-3.1.0.tgz#2d1d59af9c1b129815accc2c46a022a5ce1fa3c9"
-  integrity sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==
-
 min-indent@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
@@ -16579,7 +16550,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5:
+minimist@^1.1.0, minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -16672,11 +16643,6 @@ mixin-object@^2.0.1:
     for-in "^0.1.3"
     is-extendable "^0.1.1"
 
-mkdirp-classic@^0.5.2, mkdirp-classic@^0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
 mkdirp-promise@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/mkdirp-promise/-/mkdirp-promise-5.0.1.tgz#e9b8f68e552c68a9c1713b84883f7a1dd039b8a1"
@@ -16821,9 +16787,9 @@ nan@^2.12.1, nan@^2.13.2, nan@^2.14.2:
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
 nanoid@^3.1.16:
-  version "3.1.20"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.20.tgz#badc263c6b1dcf14b71efaa85f6ab4c1d6cfc788"
-  integrity sha512-a1cQNyczgKbLX9jwbS/+d7W8fX/RfgYR7lVWwWOGIPNgK2m0MWvrGF6/m4kk6U3QcFMnZf3RIhL0v2Jgh/0Uxw==
+  version "3.1.22"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
+  integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
 
 nanomatch@^1.2.9:
   version "1.2.13"
@@ -16842,11 +16808,6 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-napi-build-utils@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-1.0.2.tgz#b1fddc0b2c46e380a0b7a76f984dd47c41a13806"
-  integrity sha512-ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==
-
 nash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/nash/-/nash-3.0.0.tgz#bced3a0cb8434c2ad30d1a0d567cfc0c37128eea"
@@ -16890,9 +16851,9 @@ neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
 
 next-firebase-auth@^0.12.0:
-  version "0.12.0"
-  resolved "https://registry.yarnpkg.com/next-firebase-auth/-/next-firebase-auth-0.12.0.tgz#7b9e1d05f083233bd4abe72a39f4e70cd2e3c5b4"
-  integrity sha512-mSTOcDj1OLvj1w1Mfw7FKOYY+RGlpq81oX4oeoPgTzWSYbvRy1KHVX08YaKvN5t44PmWDle5uPxsOsFvBTEfKQ==
+  version "0.12.2"
+  resolved "https://registry.yarnpkg.com/next-firebase-auth/-/next-firebase-auth-0.12.2.tgz#2dfc435678142db5ea7286d85ee85329a402ed9b"
+  integrity sha512-U+gK4iE9lSHHdAmDzeel9+QA7gGfcBEIwwjHO/xgrvOKCH5QXcZykV8e+MQYvAj/CKpTlJYB/CBjkqD6dUcx/w==
   dependencies:
     cookies "^0.8.0"
 
@@ -16915,49 +16876,60 @@ next-tick@~1.0.0:
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
 next@^10.0.6:
-  version "10.0.6"
-  resolved "https://registry.yarnpkg.com/next/-/next-10.0.6.tgz#1d33723d714c85f282b9bf6ff59dcae40f9252cb"
-  integrity sha512-uM5Yv4Ha9iL6Lbg7Ez36GyJ0YTdRLzXLA9b1REH3rX2Wytw0Ls5qPuFGk4BHSQpQhYx6Z61iA2qPkGl33W4iBg==
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/next/-/next-10.1.3.tgz#e26e8371343a42bc2ba9be5cb253a7d324d03673"
+  integrity sha512-8Jf38F+s0YcXXkJGF5iUxOqSmbHrey0fX5Epc43L0uwDKmN2jK9vhc2ihCwXC1pmu8d2m/8wfTiXRJKGti55yw==
   dependencies:
-    "@ampproject/toolbox-optimizer" "2.7.1-alpha.0"
     "@babel/runtime" "7.12.5"
     "@hapi/accept" "5.0.1"
-    "@next/env" "10.0.6"
-    "@next/polyfill-module" "10.0.6"
-    "@next/react-dev-overlay" "10.0.6"
-    "@next/react-refresh-utils" "10.0.6"
+    "@next/env" "10.1.3"
+    "@next/polyfill-module" "10.1.3"
+    "@next/react-dev-overlay" "10.1.3"
+    "@next/react-refresh-utils" "10.1.3"
     "@opentelemetry/api" "0.14.0"
+    assert "2.0.0"
     ast-types "0.13.2"
+    browserify-zlib "0.2.0"
     browserslist "4.16.1"
     buffer "5.6.0"
     caniuse-lite "^1.0.30001179"
     chalk "2.4.2"
     chokidar "3.5.1"
+    constants-browserify "1.0.0"
     crypto-browserify "3.12.0"
     cssnano-simple "1.2.2"
+    domain-browser "4.19.0"
+    encoding "0.1.13"
     etag "1.8.1"
     find-cache-dir "3.3.1"
-    jest-worker "24.9.0"
+    get-orientation "1.1.2"
+    https-browserify "1.0.0"
+    jest-worker "27.0.0-next.5"
     native-url "0.3.4"
     node-fetch "2.6.1"
     node-html-parser "1.4.9"
     node-libs-browser "^2.2.1"
+    os-browserify "0.3.0"
     p-limit "3.1.0"
     path-browserify "1.0.1"
     pnp-webpack-plugin "1.6.4"
     postcss "8.1.7"
     process "0.11.10"
     prop-types "15.7.2"
+    querystring-es3 "0.2.1"
     raw-body "2.4.1"
     react-is "16.13.1"
     react-refresh "0.8.3"
     stream-browserify "3.0.0"
+    stream-http "3.1.1"
+    string_decoder "1.3.0"
     styled-jsx "3.3.2"
+    timers-browserify "2.0.12"
+    tty-browserify "0.0.1"
     use-subscription "1.5.1"
+    util "0.12.3"
     vm-browserify "1.1.2"
-    watchpack "2.0.0-beta.13"
-  optionalDependencies:
-    sharp "0.26.3"
+    watchpack "2.1.1"
 
 nexus@^1.0.0:
   version "1.0.0"
@@ -16990,7 +16962,7 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-no-case@^3.0.3, no-case@^3.0.4:
+no-case@^3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d"
   integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==
@@ -16998,23 +16970,11 @@ no-case@^3.0.3, no-case@^3.0.4:
     lower-case "^2.0.2"
     tslib "^2.0.3"
 
-node-abi@^2.7.0:
-  version "2.19.3"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-2.19.3.tgz#252f5dcab12dad1b5503b2d27eddd4733930282d"
-  integrity sha512-9xZrlyfvKhWme2EXFKQhZRp1yNWT/uI1luYPr3sFl+H4keYY4xR+1jO7mvTTijIsHf1M+QDe9uWuKeEpLInIlg==
-  dependencies:
-    semver "^5.4.1"
-
 node-addon-api@^1.7.1:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d"
   integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==
 
-node-addon-api@^3.0.2:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.1.0.tgz#98b21931557466c6729e51cb77cd39c965f42239"
-  integrity sha512-flmrDNB06LIl5lywUz7YlNGZH/5p0M7W28k8hzd9Lshtdh1wshD2Y+U4h9LD6KObOy1f+fEVdgprPrEymjM5uw==
-
 node-cleanup@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/node-cleanup/-/node-cleanup-2.1.2.tgz#7ac19abd297e09a7f72a71545d951b517e4dde2c"
@@ -17189,11 +17149,16 @@ node-notifier@^8.0.0:
     uuid "^8.3.0"
     which "^2.0.2"
 
-node-releases@^1.1.52, node-releases@^1.1.69, node-releases@^1.1.70:
+node-releases@^1.1.52, node-releases@^1.1.70:
   version "1.1.70"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.70.tgz#66e0ed0273aa65666d7fe78febe7634875426a08"
   integrity sha512-Slf2s69+2/uAD79pVVQo8uSiC34+g8GWY8UH2Qtqv34ZfhYrxpYpfzs9Js9d6O0mbDmALuxaTlplnBTnSELcrw==
 
+node-releases@^1.1.69:
+  version "1.1.71"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.71.tgz#cb1334b179896b1c89ecfdd4b725fb7bbdfc7dbb"
+  integrity sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==
+
 node-sass@^4.14.1:
   version "4.14.1"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.14.1.tgz#99c87ec2efb7047ed638fb4c9db7f3a42e2217b5"
@@ -17233,11 +17198,6 @@ nodemon@^2.0.4:
     undefsafe "^2.0.3"
     update-notifier "^4.1.0"
 
-noop-logger@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/noop-logger/-/noop-logger-0.1.1.tgz#94a2b1633c4f1317553007d8966fd0e841b6a4c2"
-  integrity sha1-lKKxYzxPExdVMAfYlm/Q6EG2pMI=
-
 "nopt@2 || 3":
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9"
@@ -17267,11 +17227,6 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-html-whitespace@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/normalize-html-whitespace/-/normalize-html-whitespace-1.0.0.tgz#5e3c8e192f1b06c3b9eee4b7e7f28854c7601e34"
-  integrity sha512-9ui7CGtOOlehQu0t/OhhlmDyc71mKVlv+4vF+me4iZLPrNtRL2xoquEdfZxasC/bdQi/Hr3iTrpyRKIG+ocabA==
-
 normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, normalize-package-data@^2.3.5, normalize-package-data@^2.4.0, normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -17397,7 +17352,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.1, npmlog@^4.1.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -17670,13 +17625,13 @@ opn@^5.5.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optimism@^0.14.0:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.14.0.tgz#256fb079a3428585b40a3a8462f907e0abd2fc49"
-  integrity sha512-ygbNt8n4DOCVpkwiLF+IrKKeNHOjtr9aXLWGP9HNJGoblSGsnVbJLstcH6/nE9Xy5ZQtlkSioFQNnthmENW6FQ==
+optimism@^0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/optimism/-/optimism-0.15.0.tgz#c65e694bec7ce439f41e9cb8fc261a72d798125b"
+  integrity sha512-KLKl3Kb7hH++s9ewRcBhmfpXgXF0xQ+JZ3xQFuPjnoT6ib2TDmYyVkKENmGxivsN2G3VRxpXuauCkB4GYOhtPw==
   dependencies:
-    "@wry/context" "^0.5.2"
-    "@wry/trie" "^0.2.1"
+    "@wry/context" "^0.6.0"
+    "@wry/trie" "^0.3.0"
 
 optimist@~0.6.1:
   version "0.6.1"
@@ -17737,7 +17692,7 @@ original@^1.0.0:
   dependencies:
     url-parse "^1.4.3"
 
-os-browserify@^0.3.0:
+os-browserify@0.3.0, os-browserify@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27"
   integrity sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=
@@ -17956,14 +17911,6 @@ param-case@2.1.x:
   dependencies:
     no-case "^2.2.0"
 
-param-case@3.0.3:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.3.tgz#4be41f8399eff621c56eebb829a5e451d9801238"
-  integrity sha512-VWBVyimc1+QrzappRs7waeN2YmoZFCGXWASRYX1/rGHtXqEcrGEIDm+jqIwFa2fRXNgQEwrxaYuIrX0WcAguTA==
-  dependencies:
-    dot-case "^3.0.3"
-    tslib "^1.10.0"
-
 param-case@^3.0.3:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5"
@@ -18091,14 +18038,6 @@ parseurl@^1.3.2, parseurl@~1.3.2, parseurl@~1.3.3:
   resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
   integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
 
-pascal-case@3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.1.tgz#5ac1975133ed619281e88920973d2cd1f279de5f"
-  integrity sha512-XIeHKqIrsquVTQL2crjq3NfJUxmdLasn3TYOU0VBM+UX2a6ztAWBlJQBePLGY7VHW8+2dRadeIPK5+KImwTxQA==
-  dependencies:
-    no-case "^3.0.3"
-    tslib "^1.10.0"
-
 pascal-case@^3.1.1, pascal-case@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb"
@@ -18229,9 +18168,9 @@ pause-stream@0.0.11:
     through "~2.3"
 
 pbkdf2@^3.0.3:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz#cb8724b0fada984596856d1a6ebafd3584654b94"
-  integrity sha512-4Ejy1OPxi9f2tt1rRV7Go7zmfDQ+ZectEQz3VGUQhgq62HtIRPDyG/JtnwIxs6x3uNMwo2V7q1fMvKjb+Tnpqg==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075"
+  integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==
   dependencies:
     create-hash "^1.1.2"
     create-hmac "^1.1.4"
@@ -18244,7 +18183,12 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, picomatch@^2.0.5, picomatch@^2.2.1:
+picomatch@^2.0.4, picomatch@^2.2.1:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.3.tgz#465547f359ccc206d3c48e46a1bcb89bf7ee619d"
+  integrity sha512-KpELjfwcCDUb9PeigTs2mBJzXUPzAuP2oPcA989He8Rte0+YUAjw1JVedDhuTKPkHjSYzMN3npC9luThGYEKdg==
+
+picomatch@^2.0.5:
   version "2.2.2"
   resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.2.2.tgz#21f333e9b6b8eaff02468f5146ea406d345f4dad"
   integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
@@ -18988,13 +18932,6 @@ postcss-safe-parser@4.0.1:
   dependencies:
     postcss "^7.0.0"
 
-postcss-safe-parser@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz#a6d4e48f0f37d9f7c11b2a581bf00f8ba4870b96"
-  integrity sha512-Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==
-  dependencies:
-    postcss "^7.0.26"
-
 postcss-selector-matches@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz#71c8248f917ba2cc93037c9637ee09c64436fcff"
@@ -19095,15 +19032,6 @@ postcss@7.0.21:
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@7.0.32:
-  version "7.0.32"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.32.tgz#4310d6ee347053da3433db2be492883d62cec59d"
-  integrity sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 postcss@8.1.7:
   version "8.1.7"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.1.7.tgz#ff6a82691bd861f3354fd9b17b2332f88171233f"
@@ -19133,7 +19061,7 @@ postcss@^6.0.1:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.26, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
+postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.23, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
   version "7.0.35"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
   integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
@@ -19142,27 +19070,6 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-prebuild-install@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-6.0.0.tgz#669022bcde57c710a869e39c5ca6bf9cd207f316"
-  integrity sha512-h2ZJ1PXHKWZpp1caLw0oX9sagVpL2YTk+ZwInQbQ3QqNd4J03O6MpFNmMTJlkfgPENWqe5kP0WjQLqz5OjLfsw==
-  dependencies:
-    detect-libc "^1.0.3"
-    expand-template "^2.0.3"
-    github-from-package "0.0.0"
-    minimist "^1.2.3"
-    mkdirp-classic "^0.5.3"
-    napi-build-utils "^1.0.1"
-    node-abi "^2.7.0"
-    noop-logger "^0.1.1"
-    npmlog "^4.0.1"
-    pump "^3.0.0"
-    rc "^1.2.7"
-    simple-get "^3.0.3"
-    tar-fs "^2.0.0"
-    tunnel-agent "^0.6.0"
-    which-pm-runs "^1.0.0"
-
 prelude-ls@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
@@ -19552,7 +19459,7 @@ query-string@^6.13.8:
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
-querystring-es3@^0.2.0:
+querystring-es3@0.2.1, querystring-es3@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73"
   integrity sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=
@@ -19651,7 +19558,7 @@ raw-body@2.4.1, raw-body@^2.3.3:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.2.7, rc@^1.2.8:
+rc@^1.2.8:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
   integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
@@ -19749,7 +19656,7 @@ react-dom-factories@^1.0.0:
   resolved "https://registry.yarnpkg.com/react-dom-factories/-/react-dom-factories-1.0.2.tgz#eb7705c4db36fb501b3aa38ff759616aa0ff96e0"
   integrity sha1-63cFxNs2+1AbOqOP91lhaqD/luA=
 
-react-dom@17.0.1, react-dom@^17.0.1:
+react-dom@17.0.1:
   version "17.0.1"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6"
   integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug==
@@ -19778,6 +19685,15 @@ react-dom@^16.13.1, react-dom@^16.2.0:
     prop-types "^15.6.2"
     scheduler "^0.19.1"
 
+react-dom@^17.0.1:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.2.tgz#ecffb6845e3ad8dbfcdc498f0d0a939736502c23"
+  integrity sha512-s4h96KtLDUQlsENhMn1ar8t2bEa+q/YAtj8pPPdIjPDGBDIVNsrD9aXNWqspUe6AzKCIG0C1HZZLqLV7qpOBGA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+    scheduler "^0.20.2"
+
 react-error-overlay@^6.0.7:
   version "6.0.9"
   resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.9.tgz#3c743010c9359608c375ecd6bc76f35d93995b0a"
@@ -19826,9 +19742,9 @@ react-lifecycles-compat@^3.0.0, react-lifecycles-compat@^3.0.4:
   integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==
 
 react-loading-skeleton@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/react-loading-skeleton/-/react-loading-skeleton-2.1.1.tgz#2c075ea9683587c163408c8eec0703047c4203b1"
-  integrity sha512-+fGvgG9ieUw4D5QVgpqJkJ75jhzUdz96GRsA0HjTlR0Mpj9DJUEFc0AKELs7ZkqWVH8/DiroaaufSrOPld1kGA==
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/react-loading-skeleton/-/react-loading-skeleton-2.2.0.tgz#b8ce516f9a2471e90d7d9ead35d61425367e3340"
+  integrity sha512-HH37uj9aobrUJSqFglHqO9KQt5zGQe+Svutv8LIq7Iq6gpJqCwIzJOsEVfkQy7ReirbI2uLhCtKloBGQIDP0BQ==
   dependencies:
     "@emotion/core" "^10.0.22"
 
@@ -20090,7 +20006,7 @@ react@16.13.1:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
-react@17.0.1, react@^17.0.1:
+react@17.0.1:
   version "17.0.1"
   resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127"
   integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w==
@@ -20107,6 +20023,14 @@ react@^16.2.0:
     object-assign "^4.1.1"
     prop-types "^15.6.2"
 
+react@^17.0.1:
+  version "17.0.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-17.0.2.tgz#d0b5cc516d29eb3eee383f75b62864cfb6800037"
+  integrity sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==
+  dependencies:
+    loose-envify "^1.1.0"
+    object-assign "^4.1.1"
+
 read-cmd-shim@^1.0.1:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
@@ -20815,7 +20739,7 @@ resolve@1.15.0:
   dependencies:
     path-parse "^1.0.6"
 
-resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1:
+resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.13.1, resolve@^1.15.1, resolve@^1.17.0, resolve@^1.18.1, resolve@^1.3.2, resolve@^1.8.1:
   version "1.19.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.19.0.tgz#1af5bf630409734a067cae29318aac7fa29a267c"
   integrity sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==
@@ -20823,6 +20747,14 @@ resolve@^1.0.0, resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.
     is-core-module "^2.1.0"
     path-parse "^1.0.6"
 
+resolve@^1.12.0:
+  version "1.20.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
+  integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
+  dependencies:
+    is-core-module "^2.2.0"
+    path-parse "^1.0.6"
+
 responselike@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
@@ -21072,10 +21004,10 @@ scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-scheduler@^0.20.1:
-  version "0.20.1"
-  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c"
-  integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw==
+scheduler@^0.20.1, scheduler@^0.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.2.tgz#4baee39436e34aa93b4874bddcbf0fe8b8b50e91"
+  integrity sha512-2eWfGgAqqWFGqtdMmcL5zCMK1U8KlXv8SQFGglL3CEtd0aDVDWgeF/YoCmvln55m5zSk3J/20hTaSBeSObsQDQ==
   dependencies:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
@@ -21169,13 +21101,20 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-semver@7.x, semver@^7.0.0, semver@^7.2.1, semver@^7.3.2:
+semver@7.x, semver@^7.0.0, semver@^7.2.1:
   version "7.3.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97"
   integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw==
   dependencies:
     lru-cache "^6.0.0"
 
+semver@^7.3.2:
+  version "7.3.5"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
+  integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
+  dependencies:
+    lru-cache "^6.0.0"
+
 semver@~5.3.0:
   version "5.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.3.0.tgz#9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"
@@ -21295,22 +21234,6 @@ shallowequal@^1.0.1, shallowequal@^1.1.0:
   resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-1.1.0.tgz#188d521de95b9087404fd4dcb68b13df0ae4e7f8"
   integrity sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ==
 
-sharp@0.26.3:
-  version "0.26.3"
-  resolved "https://registry.yarnpkg.com/sharp/-/sharp-0.26.3.tgz#9de8577a986b22538e6e12ced1f7e8a53f9728de"
-  integrity sha512-NdEJ9S6AMr8Px0zgtFo1TJjMK/ROMU92MkDtYn2BBrDjIx3YfH9TUyGdzPC+I/L619GeYQc690Vbaxc5FPCCWg==
-  dependencies:
-    array-flatten "^3.0.0"
-    color "^3.1.3"
-    detect-libc "^1.0.3"
-    node-addon-api "^3.0.2"
-    npmlog "^4.1.2"
-    prebuild-install "^6.0.0"
-    semver "^7.3.2"
-    simple-get "^4.0.0"
-    tar-fs "^2.1.1"
-    tunnel-agent "^0.6.0"
-
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -21373,29 +21296,6 @@ signedsource@^1.0.0:
   resolved "https://registry.yarnpkg.com/signedsource/-/signedsource-1.0.0.tgz#1ddace4981798f93bd833973803d80d52e93ad6a"
   integrity sha1-HdrOSYF5j5O9gzlzgD2A1S6TrWo=
 
-simple-concat@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/simple-concat/-/simple-concat-1.0.1.tgz#f46976082ba35c2263f1c8ab5edfe26c41c9552f"
-  integrity sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==
-
-simple-get@^3.0.3:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-3.1.0.tgz#b45be062435e50d159540b576202ceec40b9c6b3"
-  integrity sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==
-  dependencies:
-    decompress-response "^4.2.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
-simple-get@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/simple-get/-/simple-get-4.0.0.tgz#73fa628278d21de83dadd5512d2cc1f4872bd675"
-  integrity sha512-ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ==
-  dependencies:
-    decompress-response "^6.0.0"
-    once "^1.3.1"
-    simple-concat "^1.0.0"
-
 simple-swizzle@^0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
@@ -21600,7 +21500,7 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.12, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12, source-map-support@~0.5.19:
+source-map-support@^0.5.12, source-map-support@^0.5.17, source-map-support@^0.5.6, source-map-support@~0.5.12:
   version "0.5.19"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
   integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
@@ -21623,7 +21523,7 @@ source-map@0.6.1, source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.0, sourc
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-source-map@0.7.3, source-map@^0.7.3, source-map@~0.7.2:
+source-map@0.7.3, source-map@^0.7.3:
   version "0.7.3"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
@@ -21878,6 +21778,16 @@ stream-events@^1.0.1, stream-events@^1.0.4, stream-events@^1.0.5:
   dependencies:
     stubs "^3.0.0"
 
+stream-http@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-3.1.1.tgz#0370a8017cf8d050b9a8554afe608f043eaff564"
+  integrity sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==
+  dependencies:
+    builtin-status-codes "^3.0.0"
+    inherits "^2.0.4"
+    readable-stream "^3.6.0"
+    xtend "^4.0.2"
+
 stream-http@^2.7.2:
   version "2.8.3"
   resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc"
@@ -21889,6 +21799,13 @@ stream-http@^2.7.2:
     to-arraybuffer "^1.0.0"
     xtend "^4.0.0"
 
+stream-parser@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/stream-parser/-/stream-parser-0.3.1.tgz#1618548694420021a1182ff0af1911c129761773"
+  integrity sha1-FhhUhpRCACGhGC/wrxkRwSl2F3M=
+  dependencies:
+    debug "2"
+
 stream-shift@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d"
@@ -22054,7 +21971,7 @@ string.prototype.trimstart@^1.0.4:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-string_decoder@^1.0.0, string_decoder@^1.1.1:
+string_decoder@1.3.0, string_decoder@^1.0.0, string_decoder@^1.1.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e"
   integrity sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==
@@ -22438,6 +22355,13 @@ supports-color@^7.0.0, supports-color@^7.1.0:
   dependencies:
     has-flag "^4.0.0"
 
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
 supports-hyperlinks@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/supports-hyperlinks/-/supports-hyperlinks-1.0.1.tgz#71daedf36cc1060ac5100c351bb3da48c29c0ef7"
@@ -22536,17 +22460,7 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar-fs@^2.0.0, tar-fs@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
-  dependencies:
-    chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
-    pump "^3.0.0"
-    tar-stream "^2.1.4"
-
-tar-stream@^2.1.0, tar-stream@^2.1.4:
+tar-stream@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -22670,15 +22584,6 @@ terser-webpack-plugin@^1.4.3:
     webpack-sources "^1.4.0"
     worker-farm "^1.7.0"
 
-terser@5.5.1:
-  version "5.5.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.5.1.tgz#540caa25139d6f496fdea056e414284886fb2289"
-  integrity sha512-6VGWZNVP2KTUcltUQJ25TtNjx/XgdDsBDKGt8nN0MpydU36LmbPPcMBd2kmtZNNGVVDLg44k7GKeHHj+4zPIBQ==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
-
 terser@^4.1.2, terser@^4.6.12, terser@^4.6.3:
   version "4.8.0"
   resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
@@ -22792,7 +22697,7 @@ time-stamp@^2.0.0:
   resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-2.2.0.tgz#917e0a66905688790ec7bbbde04046259af83f57"
   integrity sha512-zxke8goJQpBeEgD82CXABeMh0LSJcj7CXEd0OHOg45HgcofF7pxNwZm9+RknpxpDhwN4gFpySkApKfFYfRQnUA==
 
-timers-browserify@^2.0.4:
+timers-browserify@2.0.12, timers-browserify@^2.0.4:
   version "2.0.12"
   resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.12.tgz#44a45c11fbf407f34f97bccd1577c652361b00ee"
   integrity sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==
@@ -23024,14 +22929,12 @@ ts-invariant@^0.4.0:
   dependencies:
     tslib "^1.9.3"
 
-ts-invariant@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.6.0.tgz#44066ecfeb7a806ff1c3b0b283408a337a885412"
-  integrity sha512-caoafsfgb8QxdrKzFfjKt627m4i8KTtfAiji0DYJfWI4A/S9ORNNpzYuD9br64kyKFgxn9UNaLLbSupam84mCA==
+ts-invariant@^0.7.0:
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.7.3.tgz#13aae22a4a165393aaf5cecdee45ef4128d358b8"
+  integrity sha512-UWDDeovyUTIMWj+45g5nhnl+8oo+GhxL5leTaHn5c8FkQWfh8v66gccLd2/YzVmV5hoQUjCEjhrXnQqVDJdvKA==
   dependencies:
-    "@types/ungap__global-this" "^0.3.1"
-    "@ungap/global-this" "^0.4.2"
-    tslib "^1.9.3"
+    tslib "^2.1.0"
 
 ts-jest@^26.4.4:
   version "26.4.4"
@@ -23150,17 +23053,17 @@ tscpaths@^0.0.9:
     commander "^2.20.0"
     globby "^9.2.0"
 
-tslib@^1.10.0, tslib@^1.11.1, tslib@^1.14.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
+tslib@^1.10.0, tslib@^1.11.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2, tslib@^2.0.0, tslib@^2.0.3, tslib@~2.1.0:
+tslib@^2, tslib@^2.0.0, tslib@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
   integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
-tslib@^2.1.0, tslib@~2.2.0:
+tslib@^2.0.3, tslib@^2.1.0, tslib@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
   integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
@@ -23192,6 +23095,11 @@ tty-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
   integrity sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=
 
+tty-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811"
+  integrity sha512-C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -23325,12 +23233,7 @@ typescript@^4.0.3, typescript@^4.0.5, typescript@^4.1.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.3.tgz#519d582bd94cba0cf8934c7d8e8467e473f53bb7"
   integrity sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==
 
-typescript@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.1.5.tgz#123a3b214aaff3be32926f0d8f1f6e704eb89a72"
-  integrity sha512-6OSu9PTIzmn9TCDiovULTnET6BgXtDYL4Gg4szY+cGsc3JP1dQL8qvE8kShTRx1NIw4Q9IBHlwODjkjWEtMUyA==
-
-typescript@^4.2.3:
+typescript@^4.1.5, typescript@^4.2.3:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
   integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
@@ -23550,19 +23453,12 @@ update-notifier@^4.1.0, update-notifier@^4.1.1:
     semver-diff "^3.1.1"
     xdg-basedir "^4.0.0"
 
-upper-case@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.1.tgz#6214d05e235dc817822464ccbae85822b3d8665f"
-  integrity sha512-laAsbea9SY5osxrv7S99vH9xAaJKrw5Qpdh4ENRLcaxipjKsiaBwiAsxfa8X5mObKNTQPsupSq0J/VIxsSJe3A==
-  dependencies:
-    tslib "^1.10.0"
-
 upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
   integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=
 
-upper-case@^2.0.1, upper-case@^2.0.2:
+upper-case@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-2.0.2.tgz#d89810823faab1df1549b7d97a76f8662bae6f7a"
   integrity sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==
@@ -23641,9 +23537,9 @@ url@^0.11.0:
     querystring "0.2.0"
 
 use-sound@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/use-sound/-/use-sound-2.0.1.tgz#72e70d4bfdda71a6959e5adab0c7e10ff4080a0a"
-  integrity sha512-wNwnyIOe8QPDQgWRZd3PqVEJ9BpLO+VJX+EpQSb6EvvjblHhnYMD7WIOTQ4hgloC2jC7Az6FhclHilC441De7A==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/use-sound/-/use-sound-2.1.0.tgz#af22bbba4368af3e5795a6d08f31de7466584d84"
+  integrity sha512-K5QchPxJdXOK/SS+EtRQ4XhHACTha9Pyd/azvGjNOA3/ycXgsMwG4sDp4xhtxJavgF7lCasO+M2nk7E8LqpDhQ==
   dependencies:
     howler "^2.1.3"
 
@@ -23707,6 +23603,18 @@ util@0.10.3:
   dependencies:
     inherits "2.0.1"
 
+util@0.12.3, util@^0.12.0:
+  version "0.12.3"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.12.3.tgz#971bb0292d2cc0c892dab7c6a5d37c2bec707888"
+  integrity sha512-I8XkoQwE+fPQEhy9v012V+TSdH2kp9ts29i20TaaDUXsg7x/onePbhFJUExBfv/2ay1ZOp/Vsm3nDlmnFGSAog==
+  dependencies:
+    inherits "^2.0.3"
+    is-arguments "^1.0.4"
+    is-generator-function "^1.0.7"
+    is-typed-array "^1.1.3"
+    safe-buffer "^5.1.2"
+    which-typed-array "^1.1.2"
+
 util@^0.11.0:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
@@ -23863,10 +23771,10 @@ watchpack-chokidar2@^2.0.1:
   dependencies:
     chokidar "^2.1.8"
 
-watchpack@2.0.0-beta.13:
-  version "2.0.0-beta.13"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.0.0-beta.13.tgz#9d9b0c094b8402139333e04eb6194643c8384f55"
-  integrity sha512-ZEFq2mx/k5qgQwgi6NOm+2ImICb8ngAkA/rZ6oyXZ7SgPn3pncf+nfhYTCrs3lmHwOxnPtGLTOuFLfpSMh1VMA==
+watchpack@2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
+  integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -24161,6 +24069,19 @@ which-pm-runs@^1.0.0:
   resolved "https://registry.yarnpkg.com/which-pm-runs/-/which-pm-runs-1.0.0.tgz#670b3afbc552e0b55df6b7780ca74615f23ad1cb"
   integrity sha1-Zws6+8VS4LVd9rd4DKdGFfI60cs=
 
+which-typed-array@^1.1.2:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/which-typed-array/-/which-typed-array-1.1.4.tgz#8fcb7d3ee5adf2d771066fba7cf37e32fe8711ff"
+  integrity sha512-49E0SpUe90cjpoc7BOJwyPHRqSAd12c10Qm2amdEZrJPCY2NDxaW01zHITrem+rnETY3dwrbH3UUrUwagfCYDA==
+  dependencies:
+    available-typed-arrays "^1.0.2"
+    call-bind "^1.0.0"
+    es-abstract "^1.18.0-next.1"
+    foreach "^2.0.5"
+    function-bind "^1.1.1"
+    has-symbols "^1.0.1"
+    is-typed-array "^1.1.3"
+
 which@1, which@^1.2.9, which@^1.3.0, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -24571,7 +24492,7 @@ xss@^1.0.6:
     commander "^2.20.3"
     cssfilter "0.0.10"
 
-xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@^4.0.2, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
@@ -24606,11 +24527,16 @@ yaml-ast-parser@^0.0.43:
   resolved "https://registry.yarnpkg.com/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz#e8a23e6fb4c38076ab92995c5dca33f3d3d7c9bb"
   integrity sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==
 
-yaml@^1.10.0, yaml@^1.7.2:
+yaml@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
   integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
 
+yaml@^1.7.2:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
+
 yargs-parser@20.x, yargs-parser@^20.2.2, yargs-parser@^20.2.3:
   version "20.2.4"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"

From b09c06e4922b117b3b50afba931fd36d0797e37d Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 08:38:41 +0300
Subject: [PATCH 14/29] Common details page

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 .../admin/src/components/CommonSettings.tsx   |  44 +-
 packages/admin/src/core/graphql/index.ts      | 175 ++++++-
 .../admin/src/core/graphql/schema.graphql     |  57 ++-
 packages/admin/src/core/graphql/schema.json   | 477 +++++++++++++++++-
 .../src/pages/commons/details/[commonId].tsx  |  58 ++-
 packages/core/src/domain/validation/index.ts  |   3 +
 .../graphql/src/generated/nexus-typegen.ts    |  63 ++-
 packages/graphql/src/generated/schema.graphql |  14 +
 .../CommonActiveProposals.extension.ts        |  44 ++
 .../graphql/src/schema/Types/Commons/index.ts |   4 +-
 .../Types/Proposals/Types/Proposal.type.ts    |  20 +
 12 files changed, 859 insertions(+), 101 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Commons/Extensions/CommonActiveProposals.extension.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 9557cad9c..425aec77f 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -5,6 +5,7 @@ documents:
   - "src/components/tables/LatestEventsTable.tsx"
   - "src/pages/dashboard/index.tsx"
   - "src/pages/commons/index.tsx"
+  - "src/pages/commons/details/[commonId].tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/components/CommonSettings.tsx b/packages/admin/src/components/CommonSettings.tsx
index 2cdde1cdb..b09e56a2f 100644
--- a/packages/admin/src/components/CommonSettings.tsx
+++ b/packages/admin/src/components/CommonSettings.tsx
@@ -1,45 +1,45 @@
 import React from 'react';
-
-import { gql } from '@apollo/client';
 import { Tooltip, Row, useToasts, Spacer } from '@geist-ui/react';
 import { Settings, Award, RefreshCcw, Edit, Trash2 } from '@geist-ui/react-icons';
 
 import { Centered } from '@components/Centered';
-import { useWhitelistCommonMutation } from '@core/graphql';
+
+// import { useWhitelistCommonMutation } from '@core/graphql';
 
 interface ICommonSettingsProps {
   commonId: string;
 }
 
-const WhitelistCommonMutation = gql`
-  mutation whitelistCommon($commonId: ID!) {
-    whitelistCommon(commonId: $commonId)
-  }
-`;
+//
+// const WhitelistCommonMutation = gql`
+//   mutation whitelistCommon($commonId: ID!) {
+//     whitelistCommon(commonId: $commonId)
+//   }
+// `;
 
 export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId }) => {
   const [, setToast] = useToasts();
 
   // - Networking
-  const [whitelistCommon, { data }] = useWhitelistCommonMutation();
+  // const [whitelistCommon, { data }] = useWhitelistCommonMutation();
 
   // - Actions
   const onCommonWhitelisted = async () => {
-    await whitelistCommon({
-      variables: {
-        commonId
-      }
-    });
+    // await whitelistCommon({
+    //   variables: {
+    //     commonId
+    //   }
+    // });
   };
 
   // - Effects
-  React.useEffect(() => {
-    if (data?.whitelistCommon) {
-      setToast({
-        text: 'Common whitelisted!'
-      });
-    }
-  }, [data]);
+  // React.useEffect(() => {
+  //   if (data?.whitelistCommon) {
+  //     setToast({
+  //       text: 'Common whitelisted!'
+  //     });
+  //   }
+  // }, [data]);
 
   return (
     <Tooltip
@@ -49,7 +49,7 @@ export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId }) =>
         <div style={{ width: '250px', margin: '.7rem 0' }}>
           <Row style={{ cursor: 'pointer' }} onClick={onCommonWhitelisted}>
             <Award/>
-            <Spacer x={.5} />
+            <Spacer x={.5}/>
             Whitelist Common
           </Row>
 
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index 69fa6e046..c65c5257a 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -265,6 +265,9 @@ export type Common = {
   proposals: Array<Proposal>;
   discussions: Array<Discussion>;
   members: Array<Maybe<CommonMember>>;
+  activeProposals: Scalars['Int'];
+  activeFundingProposals: Scalars['Int'];
+  activeJoinProposals: Scalars['Int'];
 };
 
 
@@ -281,8 +284,7 @@ export type CommonReportsArgs = {
 
 
 export type CommonProposalsArgs = {
-  take?: Maybe<Scalars['Int']>;
-  skip?: Maybe<Scalars['Int']>;
+  paginate?: Maybe<PaginateInput>;
   where?: Maybe<ProposalWhereInput>;
 };
 
@@ -395,7 +397,21 @@ export type Proposal = {
   updatedAt: Scalars['DateTime'];
   type: ProposalType;
   state: ProposalState;
+  links?: Maybe<Scalars['JSON']>;
+  files?: Maybe<Scalars['JSON']>;
+  images?: Maybe<Scalars['JSON']>;
+  votesFor: Scalars['Int'];
+  votesAgainst: Scalars['Int'];
+  expiresAt: Scalars['DateTime'];
+  title?: Maybe<Scalars['String']>;
+  description?: Maybe<Scalars['String']>;
+  /** The IP from which the proposal was created */
+  ipAddress?: Maybe<Scalars['String']>;
   discussions: Array<Discussion>;
+  fundingId?: Maybe<Scalars['UUID']>;
+  funding?: Maybe<FundingProposal>;
+  joinId?: Maybe<Scalars['UUID']>;
+  join?: Maybe<JoinProposal>;
 };
 
 
@@ -404,24 +420,31 @@ export type ProposalDiscussionsArgs = {
   skip?: Maybe<Scalars['Int']>;
 };
 
-export type JoinProposal = {
+export type JoinProposal = BaseEntity & {
   __typename?: 'JoinProposal';
   /** The main identifier of the item */
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   /** The date, at which the item was created */
   createdAt: Scalars['DateTime'];
   /** The date, at which the item was last modified */
   updatedAt: Scalars['DateTime'];
+  /** The amount that this join proposal will contribute to the common. In cents */
+  funding: Scalars['Int'];
+  fundingType: FundingType;
+  paymentState: PaymentState;
 };
 
-export type FundingProposal = {
+export type FundingProposal = BaseEntity & {
   __typename?: 'FundingProposal';
   /** The main identifier of the item */
-  id: Scalars['ID'];
+  id: Scalars['UUID'];
   /** The date, at which the item was created */
   createdAt: Scalars['DateTime'];
   /** The date, at which the item was last modified */
   updatedAt: Scalars['DateTime'];
+  /** The amount that the proposal has requested in cents */
+  amount: Scalars['Int'];
+  fundingState: FundingState;
 };
 
 export type ProposalWhereInput = {
@@ -472,6 +495,22 @@ export enum ProposalState {
   Accepted = 'Accepted'
 }
 
+export enum FundingState {
+  NotEligible = 'NotEligible',
+  Eligible = 'Eligible',
+  AwaitingApproval = 'AwaitingApproval',
+  Pending = 'Pending',
+  Completed = 'Completed',
+  Confirmed = 'Confirmed'
+}
+
+export enum PaymentState {
+  NotAttempted = 'NotAttempted',
+  Pending = 'Pending',
+  Successful = 'Successful',
+  Unsuccessful = 'Unsuccessful'
+}
+
 export type ProposalWhereUniqueInput = {
   id: Scalars['UUID'];
 };
@@ -603,9 +642,14 @@ export type CreateDiscussionMessageInput = {
   message: Scalars['String'];
 };
 
-export type CommonMember = {
+export type CommonMember = BaseEntity & {
   __typename?: 'CommonMember';
-  id: Scalars['ID'];
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
   userId: Scalars['ID'];
   commonId: Scalars['ID'];
   roles: Array<CommonMemberRole>;
@@ -957,6 +1001,46 @@ export type LoadUserContextQuery = (
 }
   );
 
+export type GetCommonDetailsQueryVariables = Exact<{
+  commonId: Scalars['ID'];
+  paginate: PaginateInput;
+}>;
+
+
+export type GetCommonDetailsQuery = (
+  { __typename?: 'Query' }
+  & {
+  common?: Maybe<(
+    { __typename?: 'Common' }
+    & Pick<Common, 'name' | 'createdAt' | 'updatedAt' | 'balance' | 'raised' | 'fundingType' | 'activeJoinProposals' | 'activeFundingProposals' | 'byline' | 'action' | 'description' | 'image'>
+    & {
+    members: Array<Maybe<(
+      { __typename?: 'CommonMember' }
+      & Pick<CommonMember, 'createdAt' | 'userId' | 'roles'>
+      & {
+      user?: Maybe<(
+        { __typename?: 'User' }
+        & Pick<User, 'firstName' | 'lastName'>
+        )>
+    }
+      )>>, proposals: Array<(
+      { __typename?: 'Proposal' }
+      & Pick<Proposal, 'id' | 'type' | 'title' | 'description'>
+      & {
+      funding?: Maybe<(
+        { __typename?: 'FundingProposal' }
+        & Pick<FundingProposal, 'amount'>
+        )>, join?: Maybe<(
+        { __typename?: 'JoinProposal' }
+        & Pick<JoinProposal, 'fundingType' | 'funding'>
+        )>
+    }
+      )>
+  }
+    )>
+}
+  );
+
 export type GetLatestEventsQueryVariables = Exact<{
   take?: Maybe<Scalars['Int']>;
   skip?: Maybe<Scalars['Int']>;
@@ -1047,12 +1131,83 @@ export const LoadUserContextDocument = gql`
 export function useLoadUserContextQuery(baseOptions?: Apollo.QueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
   return Apollo.useQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
 }
+
 export function useLoadUserContextLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
   return Apollo.useLazyQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
 }
+
 export type LoadUserContextQueryHookResult = ReturnType<typeof useLoadUserContextQuery>;
 export type LoadUserContextLazyQueryHookResult = ReturnType<typeof useLoadUserContextLazyQuery>;
 export type LoadUserContextQueryResult = Apollo.QueryResult<LoadUserContextQuery, LoadUserContextQueryVariables>;
+export const GetCommonDetailsDocument = gql`
+  query getCommonDetails($commonId: ID!, $paginate: PaginateInput!) {
+    common(where: {id: $commonId}) {
+      name
+      createdAt
+      updatedAt
+      balance
+      raised
+      fundingType
+      activeJoinProposals
+      activeFundingProposals
+      byline
+      action
+      description
+      image
+      members {
+        createdAt
+        userId
+        roles
+        user {
+          firstName
+          lastName
+        }
+      }
+      proposals(paginate: $paginate) {
+        id
+        type
+        title
+        description
+        funding {
+          amount
+        }
+        join {
+          fundingType
+          funding
+        }
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetCommonDetailsQuery__
+ *
+ * To run a query within a React component, call `useGetCommonDetailsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetCommonDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetCommonDetailsQuery({
+ *   variables: {
+ *      commonId: // value for 'commonId'
+ *      paginate: // value for 'paginate'
+ *   },
+ * });
+ */
+export function useGetCommonDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
+  return Apollo.useQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
+}
+
+export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
+  return Apollo.useLazyQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
+}
+
+export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
+export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
+export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
 export const GetLatestEventsDocument = gql`
   query GetLatestEvents($take: Int = 10, $skip: Int = 0) {
     events(paginate: {take: $take, skip: $skip}) {
@@ -1088,11 +1243,9 @@ export const GetLatestEventsDocument = gql`
 export function useGetLatestEventsQuery(baseOptions?: Apollo.QueryHookOptions<GetLatestEventsQuery, GetLatestEventsQueryVariables>) {
   return Apollo.useQuery<GetLatestEventsQuery, GetLatestEventsQueryVariables>(GetLatestEventsDocument, baseOptions);
 }
-
 export function useGetLatestEventsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetLatestEventsQuery, GetLatestEventsQueryVariables>) {
   return Apollo.useLazyQuery<GetLatestEventsQuery, GetLatestEventsQueryVariables>(GetLatestEventsDocument, baseOptions);
 }
-
 export type GetLatestEventsQueryHookResult = ReturnType<typeof useGetLatestEventsQuery>;
 export type GetLatestEventsLazyQueryHookResult = ReturnType<typeof useGetLatestEventsLazyQuery>;
 export type GetLatestEventsQueryResult = Apollo.QueryResult<GetLatestEventsQuery, GetLatestEventsQueryVariables>;
@@ -1136,11 +1289,9 @@ export const GetCommonsHomescreenDataDocument = gql`
 export function useGetCommonsHomescreenDataQuery(baseOptions?: Apollo.QueryHookOptions<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>) {
   return Apollo.useQuery<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>(GetCommonsHomescreenDataDocument, baseOptions);
 }
-
 export function useGetCommonsHomescreenDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>) {
   return Apollo.useLazyQuery<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>(GetCommonsHomescreenDataDocument, baseOptions);
 }
-
 export type GetCommonsHomescreenDataQueryHookResult = ReturnType<typeof useGetCommonsHomescreenDataQuery>;
 export type GetCommonsHomescreenDataLazyQueryHookResult = ReturnType<typeof useGetCommonsHomescreenDataLazyQuery>;
 export type GetCommonsHomescreenDataQueryResult = Apollo.QueryResult<GetCommonsHomescreenDataQuery, GetCommonsHomescreenDataQueryVariables>;
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index f11343586..21fb93963 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -199,9 +199,12 @@ type Common {
   """List of events, that occurred in a common"""
   events(take: Int = 10, skip: Int = 0, orderBy: EventOrderByInput): [Event!]!
   reports(where: ReportWhereInput = {status: {in: [Active]}}): [Report!]!
-  proposals(take: Int = 10, skip: Int = 0, where: ProposalWhereInput): [Proposal!]!
+  proposals(paginate: PaginateInput, where: ProposalWhereInput): [Proposal!]!
   discussions(take: Int, skip: Int): [Discussion!]!
   members(take: Int, skip: Int, orderBy: CommonMemberOrderByInput): [CommonMember]!
+  activeProposals: Int!
+  activeFundingProposals: Int!
+  activeJoinProposals: Int!
 }
 """The funding type of the common"""
 enum FundingType {
@@ -285,23 +288,44 @@ type Proposal {
   updatedAt: DateTime!
   type: ProposalType!
   state: ProposalState!
+  links: JSON
+  files: JSON
+  images: JSON
+  votesFor: Int!
+  votesAgainst: Int!
+  expiresAt: DateTime!
+  title: String
+  description: String
+  """The IP from which the proposal was created"""
+  ipAddress: String
   discussions(take: Int, skip: Int): [Discussion!]!
+  fundingId: UUID
+  funding: FundingProposal
+  joinId: UUID
+  join: JoinProposal
 }
-type JoinProposal {
+type JoinProposal implements BaseEntity {
   """The main identifier of the item"""
-  id: ID!
+  id: UUID!
   """The date, at which the item was created"""
   createdAt: DateTime!
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
+  """The amount that this join proposal will contribute to the common. In cents"""
+  funding: Int!
+  fundingType: FundingType!
+  paymentState: PaymentState!
 }
-type FundingProposal {
+type FundingProposal implements BaseEntity {
   """The main identifier of the item"""
-  id: ID!
+  id: UUID!
   """The date, at which the item was created"""
   createdAt: DateTime!
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
+  """The amount that the proposal has requested in cents"""
+  amount: Int!
+  fundingState: FundingState!
 }
 input ProposalWhereInput {
   type: ProposalType
@@ -343,6 +367,20 @@ enum ProposalState {
   Rejected
   Accepted
 }
+enum FundingState {
+  NotEligible
+  Eligible
+  AwaitingApproval
+  Pending
+  Completed
+  Confirmed
+}
+enum PaymentState {
+  NotAttempted
+  Pending
+  Successful
+  Unsuccessful
+}
 input ProposalWhereUniqueInput {
   id: UUID!
 }
@@ -448,8 +486,13 @@ input CreateDiscussionMessageInput {
   """The message itself"""
   message: String!
 }
-type CommonMember {
-  id: ID!
+type CommonMember implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
   userId: ID!
   commonId: ID!
   roles: [CommonMemberRole!]!
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index e884c2b55..647138b14 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -1952,26 +1952,14 @@
             "description": null,
             "args": [
               {
-                "name": "take",
-                "description": null,
-                "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
-                  "ofType": null
-                },
-                "defaultValue": "10",
-                "isDeprecated": false,
-                "deprecationReason": null
-              },
-              {
-                "name": "skip",
+                "name": "paginate",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "Int",
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
                   "ofType": null
                 },
-                "defaultValue": "0",
+                "defaultValue": null,
                 "isDeprecated": false,
                 "deprecationReason": null
               },
@@ -2113,6 +2101,54 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "activeProposals",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "activeFundingProposals",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "activeJoinProposals",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -2843,6 +2879,126 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "links",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "JSON",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "files",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "JSON",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "images",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "JSON",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "votesFor",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "votesAgainst",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "expiresAt",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "title",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "ipAddress",
+            "description": "The IP from which the proposal was created",
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "discussions",
             "description": null,
@@ -2891,6 +3047,54 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "fundingId",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "funding",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "FundingProposal",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "joinId",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "join",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "OBJECT",
+              "name": "JoinProposal",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -2912,7 +3116,7 @@
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "UUID",
                 "ofType": null
               }
             },
@@ -2950,10 +3154,64 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "funding",
+            "description": "The amount that this join proposal will contribute to the common. In cents",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "fundingType",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "FundingType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "paymentState",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "PaymentState",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
-        "interfaces": [],
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
         "enumValues": null,
         "possibleTypes": null
       },
@@ -2971,7 +3229,7 @@
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "UUID",
                 "ofType": null
               }
             },
@@ -3009,10 +3267,48 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "amount",
+            "description": "The amount that the proposal has requested in cents",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "fundingState",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "FundingState",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
-        "interfaces": [],
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
         "enumValues": null,
         "possibleTypes": null
       },
@@ -3440,6 +3736,88 @@
         ],
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "FundingState",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "NotEligible",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Eligible",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "AwaitingApproval",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Pending",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Completed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Confirmed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "PaymentState",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "NotAttempted",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Pending",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Successful",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Unsuccessful",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "ProposalWhereUniqueInput",
@@ -4399,14 +4777,46 @@
         "fields": [
           {
             "name": "id",
-            "description": null,
+            "description": "The main identifier of the item",
             "args": [],
             "type": {
               "kind": "NON_NULL",
               "name": null,
               "ofType": {
                 "kind": "SCALAR",
-                "name": "ID",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
                 "ofType": null
               }
             },
@@ -4556,7 +4966,13 @@
           }
         ],
         "inputFields": null,
-        "interfaces": [],
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
         "enumValues": null,
         "possibleTypes": null
       },
@@ -5193,6 +5609,16 @@
             "name": "Report",
             "ofType": null
           },
+          {
+            "kind": "OBJECT",
+            "name": "JoinProposal",
+            "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "FundingProposal",
+            "ofType": null
+          },
           {
             "kind": "OBJECT",
             "name": "Statistic",
@@ -5213,6 +5639,11 @@
             "name": "DiscussionSubscription",
             "ofType": null
           },
+          {
+            "kind": "OBJECT",
+            "name": "CommonMember",
+            "ofType": null
+          },
           {
             "kind": "OBJECT",
             "name": "Notification",
diff --git a/packages/admin/src/pages/commons/details/[commonId].tsx b/packages/admin/src/pages/commons/details/[commonId].tsx
index 28cc6f19b..f399399a9 100644
--- a/packages/admin/src/pages/commons/details/[commonId].tsx
+++ b/packages/admin/src/pages/commons/details/[commonId].tsx
@@ -28,9 +28,10 @@ import {
 
 import { Link } from 'components/Link';
 import { CommonSettings } from '@components/CommonSettings';
+import { useGetCommonDetailsQuery, GetCommonDetailsQueryResult } from '@core/graphql';
 
 const GetCommonDetailsQuery = gql`
-  query getCommonDetails($commonId: ID!, $page: Int!) {
+  query getCommonDetails($commonId: ID!, $paginate: PaginateInput!) {
     common(where: {
       id: $commonId
     }) {
@@ -42,23 +43,37 @@ const GetCommonDetailsQuery = gql`
       balance
       raised
 
+      fundingType
+
+      activeJoinProposals
+      activeFundingProposals
+
+      byline
+      action
+      description
+
+      image
+
       members {
         createdAt
         userId
 
+        roles
+
         user {
           firstName
           lastName
         }
       }
 
-      proposals {
+      proposals(paginate: $paginate) {
         id
 
         type
+        title
+        description
 
-
-        fundingRequest {
+        funding {
           amount
         }
 
@@ -66,10 +81,6 @@ const GetCommonDetailsQuery = gql`
           fundingType
           funding
         }
-
-        description {
-          description
-        }
       }
     }
   }
@@ -84,10 +95,15 @@ const CommonDetailsPage: NextPage = () => {
   const router = useRouter();
   const clipboard = useClipboard();
   const [_, setToast] = useToasts();
+
+  // Data fetching
   const data = useGetCommonDetailsQuery({
     variables: {
       commonId: router.query.commonId as string || '',
-      page: proposalsPage
+      paginate: {
+        take: 10,
+        skip: 10 * (proposalsPage - 1)
+      }
     }
   });
 
@@ -109,17 +125,17 @@ const CommonDetailsPage: NextPage = () => {
           </Tooltip>
         </div>
       ),
-      joinedAt: member.joinedAt
-        ? new Date(member.joinedAt).toLocaleDateString()
+      joinedAt: member.createdAt
+        ? new Date(member.createdAt).toLocaleDateString()
         : 'No data available',
       name: `${member.user.firstName} ${member.user.lastName[0]}.`,
       roles: (
         <React.Fragment>
-          {member.userId === common.metadata.founderId && (
+          {member.roles.map(r => (
             <Tag>
-              Founder
+              {r}
             </Tag>
-          )}
+          ))}
         </React.Fragment>
       ),
 
@@ -151,7 +167,7 @@ const CommonDetailsPage: NextPage = () => {
 
       description: proposal.description,
 
-      type: proposal.type === 'fundingRequest' ? (
+      type: proposal.type === 'FundingRequest' ? (
         <Tag type="success">Funding Request</Tag>
       ) : (
         <Tag type="warning">Join Request</Tag>
@@ -205,7 +221,7 @@ const CommonDetailsPage: NextPage = () => {
 
             <Spacer x={1}/>
 
-            <Tag>{data.data.common.metadata.contributionType}</Tag>
+            <Tag>{data.data.common.fundingType}</Tag>
 
             <div style={{ marginLeft: 'auto', cursor: 'pointer' }}>
               {router.query.commonId && (
@@ -239,7 +255,7 @@ const CommonDetailsPage: NextPage = () => {
               <Grid sm={24} md={8}>
                 <Card hoverable>
                   <Text h1>
-                    {data.data.common.openJoinRequests}
+                    {data.data.common.activeJoinProposals}
                   </Text>
                   <Text p>Open join request</Text>
                 </Card>
@@ -248,7 +264,7 @@ const CommonDetailsPage: NextPage = () => {
               <Grid sm={24} md={8}>
                 <Card hoverable>
                   <Text h1>
-                    {data.data.common.openFundingRequests}
+                    {data.data.common.activeFundingProposals}
                   </Text>
                   <Text p>Open funding request</Text>
                 </Card>
@@ -264,9 +280,9 @@ const CommonDetailsPage: NextPage = () => {
             <Table data={[
               { item: 'Created At', value: new Date(data.data.common.createdAt).toLocaleString() },
               { item: 'Updated At', value: new Date(data.data.common.updatedAt).toLocaleString() },
-              { item: 'Byline', value: data.data.common.metadata.byline },
-              { item: 'Description', value: data.data.common.metadata.description },
-              { item: 'Founder', value: data.data.common.metadata.founderId }
+              { item: 'Byline', value: data.data.common.byline },
+              { item: 'Action', value: data.data.common.action },
+              { item: 'Description', value: data.data.common.description }
             ]}>
               <Table.Column prop="item" label="Property" width={200}/>
               <Table.Column prop="value" label="Value"/>
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index 6e96cb810..84809ed60 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -21,5 +21,8 @@ export const PermissionValidator = z.enum([
 
   'admin.events.read',
 
+  'admin.proposals.read',
+  'admin.proposals.read.ipAddress',
+
   'user.permissions.read'
 ]);
\ No newline at end of file
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index c0f9740a5..aedc83ab5 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -222,27 +222,27 @@ export interface NexusGenInputs {
 }
 
 export interface NexusGenEnums {
-  CommonMemberRole: "Founder" | "Moderator"
-  DiscussionMessageFlag: "Clear" | "Hidden" | "Reported"
-  DiscussionMessageType: "Message"
-  DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
-  DiscussionType: "CommonDiscussion" | "ProposalDiscussion"
+  CommonMemberRole: 'Founder' | 'Moderator'
+  DiscussionMessageFlag: 'Clear' | 'Hidden' | 'Reported'
+  DiscussionMessageType: 'Message'
+  DiscussionSubscriptionType: 'AllNotifications' | 'NoNotification' | 'OnlyMentions'
+  DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
   EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
   FundingState: 'AwaitingApproval' | 'Completed' | 'Confirmed' | 'Eligible' | 'NotEligible' | 'Pending'
   FundingType: 'Monthly' | 'OneTime'
-  NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
+  NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
   NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestRejected'
   PaymentState: 'NotAttempted' | 'Pending' | 'Successful' | 'Unsuccessful'
   ProposalState: 'Accepted' | 'Countdown' | 'Finalizing' | 'Rejected'
-  ProposalType: "FundingRequest" | "JoinRequest"
-  ReportAction: "Dismissed" | "Respected"
-  ReportAuditor: "CommonModerator" | "SystemAdmin"
-  ReportFor: "FalseNews" | "Harassment" | "Hate" | "Nudity" | "Other" | "Spam" | "Violance"
-  ReportStatus: "Active" | "Clossed"
-  SortOrder: "asc" | "desc"
-  StatisticType: "AllTime" | "Daily" | "Hourly" | "Weekly"
-  UserNotificationTokenState: "Active" | "Expired" | "Voided"
-  VoteOutcome: "Approve" | "Condemn"
+  ProposalType: 'FundingRequest' | 'JoinRequest'
+  ReportAction: 'Dismissed' | 'Respected'
+  ReportAuditor: 'CommonModerator' | 'SystemAdmin'
+  ReportFor: 'FalseNews' | 'Harassment' | 'Hate' | 'Nudity' | 'Other' | 'Spam' | 'Violance'
+  ReportStatus: 'Active' | 'Clossed'
+  SortOrder: 'asc' | 'desc'
+  StatisticType: 'AllTime' | 'Daily' | 'Hourly' | 'Weekly'
+  UserNotificationTokenState: 'Active' | 'Expired' | 'Voided'
+  VoteOutcome: 'Approve' | 'Condemn'
 }
 
 export interface NexusGenScalars {
@@ -355,12 +355,21 @@ export interface NexusGenObjects {
   }
   Proposal: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description?: string | null; // String
+    expiresAt: NexusGenScalars['DateTime']; // DateTime!
+    files?: NexusGenScalars['JSON'] | null; // JSON
     fundingId?: NexusGenScalars['UUID'] | null; // UUID
     id: string; // ID!
+    images?: NexusGenScalars['JSON'] | null; // JSON
+    ipAddress?: string | null; // String
     joinId?: NexusGenScalars['UUID'] | null; // UUID
+    links?: NexusGenScalars['JSON'] | null; // JSON
     state: NexusGenEnums['ProposalState']; // ProposalState!
+    title?: string | null; // String
     type: NexusGenEnums['ProposalType']; // ProposalType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    votesAgainst: number; // Int!
+    votesFor: number; // Int!
   }
   Query: {};
   Report: { // root type
@@ -438,6 +447,9 @@ export interface NexusGenFieldTypes {
   }
   Common: { // field return type
     action: string | null; // String
+    activeFundingProposals: number; // Int!
+    activeJoinProposals: number; // Int!
+    activeProposals: number; // Int!
     balance: number; // Int!
     byline: string | null; // String
     createdAt: NexusGenScalars['DateTime']; // DateTime!
@@ -561,15 +573,24 @@ export interface NexusGenFieldTypes {
   }
   Proposal: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description: string | null; // String
     discussions: NexusGenRootTypes['Discussion'][]; // [Discussion!]!
+    expiresAt: NexusGenScalars['DateTime']; // DateTime!
+    files: NexusGenScalars['JSON'] | null; // JSON
     funding: NexusGenRootTypes['FundingProposal'] | null; // FundingProposal
     fundingId: NexusGenScalars['UUID'] | null; // UUID
     id: string; // ID!
+    images: NexusGenScalars['JSON'] | null; // JSON
+    ipAddress: string | null; // String
     join: NexusGenRootTypes['JoinProposal'] | null; // JoinProposal
     joinId: NexusGenScalars['UUID'] | null; // UUID
+    links: NexusGenScalars['JSON'] | null; // JSON
     state: NexusGenEnums['ProposalState']; // ProposalState!
+    title: string | null; // String
     type: NexusGenEnums['ProposalType']; // ProposalType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    votesAgainst: number; // Int!
+    votesFor: number; // Int!
   }
   Query: { // field return type
     common: NexusGenRootTypes['Common'] | null; // Common
@@ -664,6 +685,9 @@ export interface NexusGenFieldTypeNames {
   }
   Common: { // field return type name
     action: 'String'
+    activeFundingProposals: 'Int'
+    activeJoinProposals: 'Int'
+    activeProposals: 'Int'
     balance: 'Int'
     byline: 'String'
     createdAt: 'DateTime'
@@ -787,15 +811,24 @@ export interface NexusGenFieldTypeNames {
   }
   Proposal: { // field return type name
     createdAt: 'DateTime'
+    description: 'String'
     discussions: 'Discussion'
+    expiresAt: 'DateTime'
+    files: 'JSON'
     funding: 'FundingProposal'
     fundingId: 'UUID'
     id: 'ID'
+    images: 'JSON'
+    ipAddress: 'String'
     join: 'JoinProposal'
     joinId: 'UUID'
+    links: 'JSON'
     state: 'ProposalState'
+    title: 'String'
     type: 'ProposalType'
     updatedAt: 'DateTime'
+    votesAgainst: 'Int'
+    votesFor: 'Int'
   }
   Query: { // field return type name
     common: 'Common'
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index c7f275983..0c7e648e3 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -41,6 +41,9 @@ type Card {
 
 type Common {
   action: String
+  activeFundingProposals: Int!
+  activeJoinProposals: Int!
+  activeProposals: Int!
 
   """The current available funds of the common. In cents"""
   balance: Int!
@@ -543,19 +546,30 @@ enum PaymentState {
 type Proposal {
   """The date, at which the item was created"""
   createdAt: DateTime!
+  description: String
   discussions(skip: Int, take: Int): [Discussion!]!
+  expiresAt: DateTime!
+  files: JSON
   funding: FundingProposal
   fundingId: UUID
 
   """The main identifier of the item"""
   id: ID!
+  images: JSON
+
+  """The IP from which the proposal was created"""
+  ipAddress: String
   join: JoinProposal
   joinId: UUID
+  links: JSON
   state: ProposalState!
+  title: String
   type: ProposalType!
 
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
+  votesAgainst: Int!
+  votesFor: Int!
 }
 
 input ProposalFileInput {
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonActiveProposals.extension.ts b/packages/graphql/src/schema/Types/Commons/Extensions/CommonActiveProposals.extension.ts
new file mode 100644
index 000000000..c20d326f2
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Commons/Extensions/CommonActiveProposals.extension.ts
@@ -0,0 +1,44 @@
+import { extendType } from 'nexus';
+import { ProposalType } from '@prisma/client';
+
+import { prisma } from '@common/core';
+
+export const CommonActiveProposalsExtension = extendType({
+  type: 'Common',
+  definition(t) {
+    t.nonNull.int('activeProposals', {
+      resolve: (root) => {
+        return prisma.proposal
+          .count({
+            where: {
+              commonId: root.id
+            }
+          });
+      }
+    });
+
+    t.nonNull.int('activeFundingProposals', {
+      resolve: (root) => {
+        return prisma.proposal
+          .count({
+            where: {
+              commonId: root.id,
+              type: ProposalType.FundingRequest
+            }
+          });
+      }
+    });
+
+    t.nonNull.int('activeJoinProposals', {
+      resolve: (root) => {
+        return prisma.proposal
+          .count({
+            where: {
+              commonId: root.id,
+              type: ProposalType.JoinRequest
+            }
+          });
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Commons/index.ts b/packages/graphql/src/schema/Types/Commons/index.ts
index 4ef3ddfe0..2155e325f 100644
--- a/packages/graphql/src/schema/Types/Commons/index.ts
+++ b/packages/graphql/src/schema/Types/Commons/index.ts
@@ -9,6 +9,7 @@ import { CommonReportsExtension } from './Extensions/CommonReports.extension';
 import { CommonProposalsExtension } from './Extensions/CommonProposals.extension';
 import { CommonDiscussionsExtension } from './Extensions/CommonDiscussions.extension';
 import { CommonCommonMemberExtension } from './Extensions/CommonCommonMember.extension';
+import { CommonActiveProposalsExtension } from './Extensions/CommonActiveProposals.extension';
 
 import { CommonType } from './Types/Common.type';
 import { CommonWhereUniqueInput } from './Inputs/CommonWhereUnique.input';
@@ -30,5 +31,6 @@ export const CommonTypes = [
   CommonReportsExtension,
   CommonProposalsExtension,
   CommonDiscussionsExtension,
-  CommonCommonMemberExtension
+  CommonCommonMemberExtension,
+  CommonActiveProposalsExtension
 ];
diff --git a/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts b/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts
index 679ecfde5..dbb259167 100644
--- a/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts
+++ b/packages/graphql/src/schema/Types/Proposals/Types/Proposal.type.ts
@@ -1,4 +1,5 @@
 import { objectType } from 'nexus';
+import { authorizationService } from '@common/core';
 
 export const ProposalType = objectType({
   name: 'Proposal',
@@ -22,5 +23,24 @@ export const ProposalType = objectType({
     t.nonNull.field('state', {
       type: 'ProposalState'
     });
+
+    t.json('links');
+    t.json('files');
+    t.json('images');
+
+    t.nonNull.int('votesFor');
+    t.nonNull.int('votesAgainst');
+
+    t.nonNull.date('expiresAt');
+
+    t.string('title');
+    t.string('description');
+
+    t.string('ipAddress', {
+      authorize: async (root, args, ctx) => {
+        return authorizationService.can(await ctx.getUserId(), 'admin.proposals.read.ipAddress');
+      },
+      description: 'The IP from which the proposal was created'
+    });
   }
 });
\ No newline at end of file

From eeaa2478779828221d4e132e9dc65aba4a63a111 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 09:26:14 +0300
Subject: [PATCH 15/29] Common whitelisting

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |  1 +
 .../admin/src/components/CommonSettings.tsx   | 78 +++++++++++--------
 packages/admin/src/core/graphql/index.ts      | 52 ++++++++++++-
 .../admin/src/core/graphql/schema.graphql     |  1 +
 packages/admin/src/core/graphql/schema.json   | 29 +++++++
 .../src/pages/commons/details/[commonId].tsx  | 24 +++++-
 .../models/events/enums/EventType.prisma      |  1 +
 packages/core/prisma/schema.prisma            |  1 +
 packages/core/src/domain/validation/index.ts  |  3 +
 .../commons/command/whitelistCommonCommand.ts | 32 ++++++++
 packages/core/src/services/commons/index.ts   |  2 +
 .../graphql/src/generated/nexus-typegen.ts    |  7 +-
 packages/graphql/src/generated/schema.graphql |  2 +
 .../Mutations/WhitelistCommon.mutation.ts     | 15 ++++
 .../graphql/src/schema/Types/Commons/index.ts |  3 +
 15 files changed, 210 insertions(+), 41 deletions(-)
 create mode 100644 packages/core/src/services/commons/command/whitelistCommonCommand.ts
 create mode 100644 packages/graphql/src/schema/Types/Commons/Mutations/WhitelistCommon.mutation.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 425aec77f..1b094d4e9 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -3,6 +3,7 @@ schema: "http://localhost:4000/graphql"
 documents:
   - "src/core/**/*.tsx"
   - "src/components/tables/LatestEventsTable.tsx"
+  - "src/components/CommonSettings.tsx"
   - "src/pages/dashboard/index.tsx"
   - "src/pages/commons/index.tsx"
   - "src/pages/commons/details/[commonId].tsx"
diff --git a/packages/admin/src/components/CommonSettings.tsx b/packages/admin/src/components/CommonSettings.tsx
index b09e56a2f..9854b0dbb 100644
--- a/packages/admin/src/components/CommonSettings.tsx
+++ b/packages/admin/src/components/CommonSettings.tsx
@@ -3,43 +3,49 @@ import { Tooltip, Row, useToasts, Spacer } from '@geist-ui/react';
 import { Settings, Award, RefreshCcw, Edit, Trash2 } from '@geist-ui/react-icons';
 
 import { Centered } from '@components/Centered';
+import { gql } from '@apollo/client';
 
-// import { useWhitelistCommonMutation } from '@core/graphql';
+import { useWhitelistCommonMutation } from '@core/graphql';
 
 interface ICommonSettingsProps {
   commonId: string;
+  whitelisted: boolean;
+  refetch: () => any;
 }
 
-//
-// const WhitelistCommonMutation = gql`
-//   mutation whitelistCommon($commonId: ID!) {
-//     whitelistCommon(commonId: $commonId)
-//   }
-// `;
+const WhitelistCommonMutation = gql`
+  mutation whitelistCommon($commonId: String!) {
+    whitelistCommon(commonId: $commonId)
+  }
+`;
 
-export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId }) => {
+export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId, whitelisted, refetch }) => {
   const [, setToast] = useToasts();
 
   // - Networking
-  // const [whitelistCommon, { data }] = useWhitelistCommonMutation();
+  const [whitelistCommon, { data }] = useWhitelistCommonMutation();
 
   // - Actions
-  const onCommonWhitelisted = async () => {
-    // await whitelistCommon({
-    //   variables: {
-    //     commonId
-    //   }
-    // });
+  const onWhitelistCommon = async () => {
+    await whitelistCommon({
+      variables: {
+        commonId
+      }
+    });
+
+    if (typeof refetch === 'function') {
+      refetch();
+    }
   };
 
   // - Effects
-  // React.useEffect(() => {
-  //   if (data?.whitelistCommon) {
-  //     setToast({
-  //       text: 'Common whitelisted!'
-  //     });
-  //   }
-  // }, [data]);
+  React.useEffect(() => {
+    if (data?.whitelistCommon) {
+      setToast({
+        text: 'Common whitelisted!'
+      });
+    }
+  }, [data]);
 
   return (
     <Tooltip
@@ -47,33 +53,37 @@ export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId }) =>
       trigger="click"
       text={(
         <div style={{ width: '250px', margin: '.7rem 0' }}>
-          <Row style={{ cursor: 'pointer' }} onClick={onCommonWhitelisted}>
-            <Award/>
-            <Spacer x={.5}/>
-            Whitelist Common
-          </Row>
+          {!whitelisted && (
+            <React.Fragment>
+              <Row style={{ cursor: 'pointer' }} onClick={onWhitelistCommon}>
+                <Award/>
+                <Spacer x={.5}/>
+                Whitelist Common
+              </Row>
 
-          <Spacer y={.7} />
+              <Spacer y={1}/>
+            </React.Fragment>
+          )}
 
           <Row style={{ cursor: 'pointer' }}>
             <RefreshCcw/>
-            <Spacer x={.5} />
+            <Spacer x={.5}/>
             Refresh Common Members
           </Row>
 
-          <Spacer y={.7} />
+          <Spacer y={1}/>
 
           <Row style={{ cursor: 'pointer' }}>
             <Edit/>
-            <Spacer x={.5} />
+            <Spacer x={.5}/>
             Edit Common Details
           </Row>
 
-          <Spacer y={.7} />
+          <Spacer y={1}/>
 
           <Row style={{ cursor: 'pointer', color: 'red' }}>
-            <Trash2 />
-            <Spacer x={.5} />
+            <Trash2/>
+            <Spacer x={.5}/>
             Delete Common
           </Row>
         </div>
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index c65c5257a..2da0f6b0f 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -872,6 +872,7 @@ export type Mutation = {
   createCard: Card;
   createVote: Vote;
   createCommon: Common;
+  whitelistCommon?: Maybe<Scalars['Boolean']>;
   actOnReport?: Maybe<Report>;
   reportDiscussionMessage: Report;
   finalizeProposal: Scalars['Boolean'];
@@ -931,6 +932,11 @@ export type MutationCreateCommonArgs = {
 };
 
 
+export type MutationWhitelistCommonArgs = {
+  commonId: Scalars['String'];
+};
+
+
 export type MutationActOnReportArgs = {
   input: ActOnReportInput;
 };
@@ -1012,7 +1018,7 @@ export type GetCommonDetailsQuery = (
   & {
   common?: Maybe<(
     { __typename?: 'Common' }
-    & Pick<Common, 'name' | 'createdAt' | 'updatedAt' | 'balance' | 'raised' | 'fundingType' | 'activeJoinProposals' | 'activeFundingProposals' | 'byline' | 'action' | 'description' | 'image'>
+    & Pick<Common, 'name' | 'createdAt' | 'updatedAt' | 'balance' | 'raised' | 'fundingType' | 'activeJoinProposals' | 'activeFundingProposals' | 'byline' | 'action' | 'description' | 'image' | 'whitelisted'>
     & {
     members: Array<Maybe<(
       { __typename?: 'CommonMember' }
@@ -1041,6 +1047,16 @@ export type GetCommonDetailsQuery = (
 }
   );
 
+export type WhitelistCommonMutationVariables = Exact<{
+  commonId: Scalars['String'];
+}>;
+
+
+export type WhitelistCommonMutation = (
+  { __typename?: 'Mutation' }
+  & Pick<Mutation, 'whitelistCommon'>
+  );
+
 export type GetLatestEventsQueryVariables = Exact<{
   take?: Maybe<Scalars['Int']>;
   skip?: Maybe<Scalars['Int']>;
@@ -1131,11 +1147,9 @@ export const LoadUserContextDocument = gql`
 export function useLoadUserContextQuery(baseOptions?: Apollo.QueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
   return Apollo.useQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
 }
-
 export function useLoadUserContextLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<LoadUserContextQuery, LoadUserContextQueryVariables>) {
   return Apollo.useLazyQuery<LoadUserContextQuery, LoadUserContextQueryVariables>(LoadUserContextDocument, baseOptions);
 }
-
 export type LoadUserContextQueryHookResult = ReturnType<typeof useLoadUserContextQuery>;
 export type LoadUserContextLazyQueryHookResult = ReturnType<typeof useLoadUserContextLazyQuery>;
 export type LoadUserContextQueryResult = Apollo.QueryResult<LoadUserContextQuery, LoadUserContextQueryVariables>;
@@ -1154,6 +1168,7 @@ export const GetCommonDetailsDocument = gql`
       action
       description
       image
+      whitelisted
       members {
         createdAt
         userId
@@ -1208,6 +1223,37 @@ export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookO
 export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
 export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
 export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
+export const WhitelistCommonDocument = gql`
+  mutation whitelistCommon($commonId: String!) {
+    whitelistCommon(commonId: $commonId)
+  }
+`;
+export type WhitelistCommonMutationFn = Apollo.MutationFunction<WhitelistCommonMutation, WhitelistCommonMutationVariables>;
+
+/**
+ * __useWhitelistCommonMutation__
+ *
+ * To run a mutation, you first call `useWhitelistCommonMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useWhitelistCommonMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [whitelistCommonMutation, { data, loading, error }] = useWhitelistCommonMutation({
+ *   variables: {
+ *      commonId: // value for 'commonId'
+ *   },
+ * });
+ */
+export function useWhitelistCommonMutation(baseOptions?: Apollo.MutationHookOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>) {
+  return Apollo.useMutation<WhitelistCommonMutation, WhitelistCommonMutationVariables>(WhitelistCommonDocument, baseOptions);
+}
+
+export type WhitelistCommonMutationHookResult = ReturnType<typeof useWhitelistCommonMutation>;
+export type WhitelistCommonMutationResult = Apollo.MutationResult<WhitelistCommonMutation>;
+export type WhitelistCommonMutationOptions = Apollo.BaseMutationOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>;
 export const GetLatestEventsDocument = gql`
   query GetLatestEvents($take: Int = 10, $skip: Int = 0) {
     events(paginate: {take: $take, skip: $skip}) {
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 21fb93963..960b026a9 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -641,6 +641,7 @@ type Mutation {
   createCard(input: CreateCardInput!): Card!
   createVote(input: CreateVoteInput!): Vote!
   createCommon(input: CreateCommonInput!): Common!
+  whitelistCommon(commonId: String!): Boolean
   actOnReport(input: ActOnReportInput!): Report
   reportDiscussionMessage(input: ReportDiscussionMessageInput!): Report!
   finalizeProposal(proposalId: ID!): Boolean!
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 647138b14..003aec876 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -6672,6 +6672,35 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "whitelistCommon",
+            "description": null,
+            "args": [
+              {
+                "name": "commonId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "SCALAR",
+              "name": "Boolean",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "actOnReport",
             "description": null,
diff --git a/packages/admin/src/pages/commons/details/[commonId].tsx b/packages/admin/src/pages/commons/details/[commonId].tsx
index f399399a9..f9de9bfaf 100644
--- a/packages/admin/src/pages/commons/details/[commonId].tsx
+++ b/packages/admin/src/pages/commons/details/[commonId].tsx
@@ -23,7 +23,8 @@ import {
   ExternalLink,
   User,
   Copy,
-  Trash2 as Trash
+  Trash2 as Trash,
+  CheckCircle
 } from '@geist-ui/react-icons';
 
 import { Link } from 'components/Link';
@@ -54,6 +55,8 @@ const GetCommonDetailsQuery = gql`
 
       image
 
+      whitelisted
+
       members {
         createdAt
         userId
@@ -219,13 +222,28 @@ const CommonDetailsPage: NextPage = () => {
               {data.data.common.name}'s details
             </Text>
 
+            {data.data.common.whitelisted && (
+              <React.Fragment>
+
+                <Tooltip text="The common is whitelisted">
+                  <CheckCircle color="F5A623" strokeWidth={3} size={26}/>
+
+                  <Spacer y={2}/>
+                </Tooltip>
+              </React.Fragment>
+            )}
+
             <Spacer x={1}/>
 
-            <Tag>{data.data.common.fundingType}</Tag>
+            <Tag type="warning">{data.data.common.fundingType}</Tag>
 
             <div style={{ marginLeft: 'auto', cursor: 'pointer' }}>
               {router.query.commonId && (
-                <CommonSettings commonId={router.query.commonId as string}/>
+                <CommonSettings
+                  commonId={router.query.commonId as string}
+                  whitelisted={data.data.common.whitelisted}
+                  refetch={data.refetch}
+                />
               )}
             </div>
           </div>
diff --git a/packages/core/prisma/models/events/enums/EventType.prisma b/packages/core/prisma/models/events/enums/EventType.prisma
index 8c580de8b..5b485cfda 100644
--- a/packages/core/prisma/models/events/enums/EventType.prisma
+++ b/packages/core/prisma/models/events/enums/EventType.prisma
@@ -1,5 +1,6 @@
 enum EventType {
   CommonCreated
+  CommonWhitelisted
 
   CommonMemberCreated
   CommonMemberRoleAdded
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index 747777349..80f716f90 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -427,6 +427,7 @@ model UserNotificationToken {
 
 enum EventType {
   CommonCreated
+  CommonWhitelisted
 
   CommonMemberCreated
   CommonMemberRoleAdded
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index 84809ed60..1df392938 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -24,5 +24,8 @@ export const PermissionValidator = z.enum([
   'admin.proposals.read',
   'admin.proposals.read.ipAddress',
 
+  'admin.commons.update',
+  'admin.commons.whitelist',
+
   'user.permissions.read'
 ]);
\ No newline at end of file
diff --git a/packages/core/src/services/commons/command/whitelistCommonCommand.ts b/packages/core/src/services/commons/command/whitelistCommonCommand.ts
new file mode 100644
index 000000000..494f47824
--- /dev/null
+++ b/packages/core/src/services/commons/command/whitelistCommonCommand.ts
@@ -0,0 +1,32 @@
+import { EventType } from '@prisma/client';
+
+import { prisma } from '@toolkits';
+import { eventService } from '@services';
+
+/**
+ * Whitelists the passed common. No authorization checks are being done here!
+ *
+ * @param commonId - The ID of the common to whitelist
+ *
+ * @returns - Whether the operation was successful
+ */
+export const whitelistCommonCommand = async (commonId: string): Promise<boolean> => {
+  await prisma.common
+    .update({
+      where: {
+        id: commonId
+      },
+      data: {
+        whitelisted: {
+          set: true
+        }
+      }
+    });
+
+  eventService.create({
+    type: EventType.CommonWhitelisted,
+    commonId
+  });
+
+  return true;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/commons/index.ts b/packages/core/src/services/commons/index.ts
index 957956dd5..6799c9f99 100644
--- a/packages/core/src/services/commons/index.ts
+++ b/packages/core/src/services/commons/index.ts
@@ -3,9 +3,11 @@ import { createCommonMemberCommand } from './command/createCommonMemberCommand';
 import { addCommonMemberRoleCommand } from './command/addCommonMemberRoleCommand';
 
 import { getCommonMemberIdQuery } from './queries/getCommonMemberIdQuery';
+import { whitelistCommonCommand } from './command/whitelistCommonCommand';
 
 export const commonService = {
   create: createCommonCommand,
+  whitelist: whitelistCommonCommand,
   createMember: createCommonMemberCommand,
 
   addCommonMemberRole: addCommonMemberRoleCommand,
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index aedc83ab5..c7832306d 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -227,7 +227,7 @@ export interface NexusGenEnums {
   DiscussionMessageType: 'Message'
   DiscussionSubscriptionType: 'AllNotifications' | 'NoNotification' | 'OnlyMentions'
   DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
-  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
+  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'CommonWhitelisted' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
   FundingState: 'AwaitingApproval' | 'Completed' | 'Confirmed' | 'Eligible' | 'NotEligible' | 'Pending'
   FundingType: 'Monthly' | 'OneTime'
   NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
@@ -554,6 +554,7 @@ export interface NexusGenFieldTypes {
     reportDiscussionMessage: NexusGenRootTypes['Report']; // Report!
     unassignRole: NexusGenScalars['Void'] | null; // Void
     voidUserNotificationToken: NexusGenRootTypes['UserNotificationToken']; // UserNotificationToken!
+    whitelistCommon: boolean | null; // Boolean
   }
   Notification: { // field return type
     common: NexusGenRootTypes['Common'] | null; // Common
@@ -792,6 +793,7 @@ export interface NexusGenFieldTypeNames {
     reportDiscussionMessage: 'Report'
     unassignRole: 'Void'
     voidUserNotificationToken: 'UserNotificationToken'
+    whitelistCommon: 'Boolean'
   }
   Notification: { // field return type name
     common: 'Common'
@@ -1008,6 +1010,9 @@ export interface NexusGenArgTypes {
     voidUserNotificationToken: { // args
       tokenId: string; // ID!
     }
+    whitelistCommon: { // args
+      commonId: string; // String!
+    }
   }
   Proposal: {
     discussions: { // args
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 0c7e648e3..6a90c59e1 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -325,6 +325,7 @@ enum EventType {
   CommonMemberCreated
   CommonMemberRoleAdded
   CommonMemberRoleRemoved
+  CommonWhitelisted
   DiscussionCreated
   DiscussionMessageCreated
   DiscussionSubscriptionCreated
@@ -457,6 +458,7 @@ type Mutation {
   reportDiscussionMessage(input: ReportDiscussionMessageInput!): Report!
   unassignRole(roleId: ID!, userId: ID!): Void
   voidUserNotificationToken(tokenId: ID!): UserNotificationToken!
+  whitelistCommon(commonId: String!): Boolean
 }
 
 type Notification implements BaseEntity {
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/WhitelistCommon.mutation.ts b/packages/graphql/src/schema/Types/Commons/Mutations/WhitelistCommon.mutation.ts
new file mode 100644
index 000000000..593d337e0
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Commons/Mutations/WhitelistCommon.mutation.ts
@@ -0,0 +1,15 @@
+import { mutationField, stringArg, nonNull } from 'nexus';
+import { authorizationService, commonService } from '@common/core';
+
+export const WhitelistCommonMutation = mutationField('whitelistCommon', {
+  type: 'Boolean',
+  args: {
+    commonId: nonNull(stringArg())
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.commons.whitelist');
+  },
+  resolve: (root, args) => {
+    return commonService.whitelist(args.commonId);
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Commons/index.ts b/packages/graphql/src/schema/Types/Commons/index.ts
index 2155e325f..6fd33886c 100644
--- a/packages/graphql/src/schema/Types/Commons/index.ts
+++ b/packages/graphql/src/schema/Types/Commons/index.ts
@@ -1,4 +1,6 @@
 import { FundingTypeEnum } from './Enums/FundingTypeEnum';
+
+import { WhitelistCommonMutation } from './Mutations/WhitelistCommon.mutation';
 import { CreateCommonInput, CreateCommonMutation } from './Mutations/CreateCommon.mutation';
 
 import { GetCommonQuery } from './Queries/GetCommon.query';
@@ -24,6 +26,7 @@ export const CommonTypes = [
 
   CreateCommonInput,
   CreateCommonMutation,
+  WhitelistCommonMutation,
 
   CommonWhereUniqueInput,
 

From e21785c2189cb5ef7cbe241e6ce3d2d675875636 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 09:56:56 +0300
Subject: [PATCH 16/29] Common delisting

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/public/style.css               |   3 +
 .../admin/src/components/CommonSettings.tsx   | 124 ++++++++++++------
 packages/admin/src/components/Hoverable.tsx   |  27 ++++
 packages/admin/src/core/graphql/index.ts      |  51 ++++++-
 .../admin/src/core/graphql/schema.graphql     |   3 +
 packages/admin/src/core/graphql/schema.json   |  41 ++++++
 packages/admin/src/pages/_app.tsx             |   2 +
 .../migration.sql                             |   2 +
 .../models/events/enums/EventType.prisma      |   1 +
 packages/core/prisma/schema.prisma            |   1 +
 packages/core/src/domain/validation/index.ts  |   1 +
 .../commons/command/delistCommonCommand.ts    |  32 +++++
 packages/core/src/services/commons/index.ts   |   6 +-
 .../graphql/src/generated/nexus-typegen.ts    |   7 +-
 packages/graphql/src/generated/schema.graphql |   2 +
 .../Mutations/DelistCommon.mutation.ts        |  15 +++
 .../graphql/src/schema/Types/Commons/index.ts |   2 +
 17 files changed, 274 insertions(+), 46 deletions(-)
 create mode 100644 packages/admin/public/style.css
 create mode 100644 packages/admin/src/components/Hoverable.tsx
 create mode 100644 packages/core/prisma/migrations/20210429062315_common_whitelisted_event/migration.sql
 create mode 100644 packages/core/src/services/commons/command/delistCommonCommand.ts
 create mode 100644 packages/graphql/src/schema/Types/Commons/Mutations/DelistCommon.mutation.ts

diff --git a/packages/admin/public/style.css b/packages/admin/public/style.css
new file mode 100644
index 000000000..2b0f65e39
--- /dev/null
+++ b/packages/admin/public/style.css
@@ -0,0 +1,3 @@
+* {
+    user-select: none;
+}
\ No newline at end of file
diff --git a/packages/admin/src/components/CommonSettings.tsx b/packages/admin/src/components/CommonSettings.tsx
index 9854b0dbb..ea862f8f4 100644
--- a/packages/admin/src/components/CommonSettings.tsx
+++ b/packages/admin/src/components/CommonSettings.tsx
@@ -1,11 +1,11 @@
 import React from 'react';
 import { Tooltip, Row, useToasts, Spacer } from '@geist-ui/react';
-import { Settings, Award, RefreshCcw, Edit, Trash2 } from '@geist-ui/react-icons';
-
-import { Centered } from '@components/Centered';
+import { Award, RefreshCcw, Edit, Trash2, Slash, Settings } from '@geist-ui/react-icons';
 import { gql } from '@apollo/client';
 
-import { useWhitelistCommonMutation } from '@core/graphql';
+import { useWhitelistCommonMutation, useDelistCommonMutation } from '@core/graphql';
+import { Hoverable } from '@components/Hoverable';
+import { Centered } from '@components/Centered';
 
 interface ICommonSettingsProps {
   commonId: string;
@@ -19,11 +19,18 @@ const WhitelistCommonMutation = gql`
   }
 `;
 
+const DelistCommonMutation = gql`
+  mutation delistCommon($commonId: String!) {
+    delistCommon(commonId: $commonId)
+  }
+`;
+
 export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId, whitelisted, refetch }) => {
   const [, setToast] = useToasts();
 
   // - Networking
-  const [whitelistCommon, { data }] = useWhitelistCommonMutation();
+  const [whitelistCommon, { data: whitelistResult }] = useWhitelistCommonMutation();
+  const [delistCommon, { data: delistResult }] = useDelistCommonMutation();
 
   // - Actions
   const onWhitelistCommon = async () => {
@@ -38,54 +45,89 @@ export const CommonSettings: React.FC<ICommonSettingsProps> = ({ commonId, white
     }
   };
 
+  const onCommonDelist = async () => {
+    await delistCommon({
+      variables: {
+        commonId
+      }
+    });
+
+    if (typeof refetch === 'function') {
+      refetch();
+    }
+  };
+
   // - Effects
   React.useEffect(() => {
-    if (data?.whitelistCommon) {
+    if (whitelistResult?.whitelistCommon) {
       setToast({
         text: 'Common whitelisted!'
       });
     }
-  }, [data]);
+  }, [whitelistResult]);
+
+  React.useEffect(() => {
+    if (delistResult?.delistCommon) {
+      setToast({
+        text: 'Common delisted!'
+      });
+    }
+  }, [delistResult]);
 
   return (
     <Tooltip
       placement="bottomEnd"
       trigger="click"
       text={(
-        <div style={{ width: '250px', margin: '.7rem 0' }}>
-          {!whitelisted && (
-            <React.Fragment>
-              <Row style={{ cursor: 'pointer' }} onClick={onWhitelistCommon}>
-                <Award/>
-                <Spacer x={.5}/>
-                Whitelist Common
-              </Row>
-
-              <Spacer y={1}/>
-            </React.Fragment>
-          )}
-
-          <Row style={{ cursor: 'pointer' }}>
-            <RefreshCcw/>
-            <Spacer x={.5}/>
-            Refresh Common Members
-          </Row>
-
-          <Spacer y={1}/>
-
-          <Row style={{ cursor: 'pointer' }}>
-            <Edit/>
-            <Spacer x={.5}/>
-            Edit Common Details
-          </Row>
-
-          <Spacer y={1}/>
-
-          <Row style={{ cursor: 'pointer', color: 'red' }}>
-            <Trash2/>
-            <Spacer x={.5}/>
-            Delete Common
-          </Row>
+        <div style={{ width: '270px', margin: '.3em -0.7em' }}>
+          <React.Fragment>
+            <Hoverable>
+              {whitelisted
+                ? (
+                  <Row style={{ cursor: 'pointer' }} onClick={onCommonDelist}>
+                    <Slash/>
+                    <Spacer x={.5}/>
+                    Delist Common
+                  </Row>
+                ) : (
+                  <Row style={{ cursor: 'pointer' }} onClick={onWhitelistCommon}>
+                    <Award/>
+                    <Spacer x={.5}/>
+                    Whitelist Common
+                  </Row>
+                )}
+            </Hoverable>
+
+            <Spacer y={.5}/>
+          </React.Fragment>
+
+          <Hoverable>
+            <Row style={{ cursor: 'pointer' }}>
+              <RefreshCcw/>
+              <Spacer x={.5}/>
+              Refresh Common Members
+            </Row>
+          </Hoverable>
+
+          <Spacer y={.5}/>
+
+          <Hoverable>
+            <Row style={{ cursor: 'pointer' }}>
+              <Edit/>
+              <Spacer x={.5}/>
+              Edit Common Details
+            </Row>
+          </Hoverable>
+
+          <Spacer y={.5}/>
+
+          <Hoverable>
+            <Row style={{ cursor: 'pointer', color: 'red' }}>
+              <Trash2/>
+              <Spacer x={.5}/>
+              Delete Common
+            </Row>
+          </Hoverable>
         </div>
       )}
     >
diff --git a/packages/admin/src/components/Hoverable.tsx b/packages/admin/src/components/Hoverable.tsx
new file mode 100644
index 000000000..9c9fe2d9f
--- /dev/null
+++ b/packages/admin/src/components/Hoverable.tsx
@@ -0,0 +1,27 @@
+import React, { useState } from 'react';
+import { useTheme } from '@geist-ui/react';
+
+export const Hoverable: React.FC<React.PropsWithChildren<any>> = ({ children }) => {
+  // Hooks
+  const { palette } = useTheme();
+
+  // State
+  const [h, setH] = useState<boolean>(false);
+
+  return (
+    <div
+      onMouseEnter={() => setH(true)}
+      onMouseLeave={() => setH(false)}
+      style={{
+        backgroundColor: h
+          ? palette.accents_1
+          : palette.background,
+
+        borderRadius: 8,
+        padding: 8
+      }}
+    >
+      {children}
+    </div>
+  );
+};
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index 2da0f6b0f..d3f15df3b 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -189,6 +189,8 @@ export type Event = {
 
 export enum EventType {
   CommonCreated = 'CommonCreated',
+  CommonDelisted = 'CommonDelisted',
+  CommonWhitelisted = 'CommonWhitelisted',
   CommonMemberCreated = 'CommonMemberCreated',
   CommonMemberRoleAdded = 'CommonMemberRoleAdded',
   CommonMemberRoleRemoved = 'CommonMemberRoleRemoved',
@@ -872,6 +874,7 @@ export type Mutation = {
   createCard: Card;
   createVote: Vote;
   createCommon: Common;
+  delistCommon?: Maybe<Scalars['Boolean']>;
   whitelistCommon?: Maybe<Scalars['Boolean']>;
   actOnReport?: Maybe<Report>;
   reportDiscussionMessage: Report;
@@ -932,6 +935,11 @@ export type MutationCreateCommonArgs = {
 };
 
 
+export type MutationDelistCommonArgs = {
+  commonId: Scalars['String'];
+};
+
+
 export type MutationWhitelistCommonArgs = {
   commonId: Scalars['String'];
 };
@@ -1057,6 +1065,16 @@ export type WhitelistCommonMutation = (
   & Pick<Mutation, 'whitelistCommon'>
   );
 
+export type DelistCommonMutationVariables = Exact<{
+  commonId: Scalars['String'];
+}>;
+
+
+export type DelistCommonMutation = (
+  { __typename?: 'Mutation' }
+  & Pick<Mutation, 'delistCommon'>
+  );
+
 export type GetLatestEventsQueryVariables = Exact<{
   take?: Maybe<Scalars['Int']>;
   skip?: Maybe<Scalars['Int']>;
@@ -1215,11 +1233,9 @@ export const GetCommonDetailsDocument = gql`
 export function useGetCommonDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
-
 export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
-
 export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
 export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
 export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
@@ -1254,6 +1270,37 @@ export function useWhitelistCommonMutation(baseOptions?: Apollo.MutationHookOpti
 export type WhitelistCommonMutationHookResult = ReturnType<typeof useWhitelistCommonMutation>;
 export type WhitelistCommonMutationResult = Apollo.MutationResult<WhitelistCommonMutation>;
 export type WhitelistCommonMutationOptions = Apollo.BaseMutationOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>;
+export const DelistCommonDocument = gql`
+  mutation delistCommon($commonId: String!) {
+    delistCommon(commonId: $commonId)
+  }
+`;
+export type DelistCommonMutationFn = Apollo.MutationFunction<DelistCommonMutation, DelistCommonMutationVariables>;
+
+/**
+ * __useDelistCommonMutation__
+ *
+ * To run a mutation, you first call `useDelistCommonMutation` within a React component and pass it any options that fit your needs.
+ * When your component renders, `useDelistCommonMutation` returns a tuple that includes:
+ * - A mutate function that you can call at any time to execute the mutation
+ * - An object with fields that represent the current status of the mutation's execution
+ *
+ * @param baseOptions options that will be passed into the mutation, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options-2;
+ *
+ * @example
+ * const [delistCommonMutation, { data, loading, error }] = useDelistCommonMutation({
+ *   variables: {
+ *      commonId: // value for 'commonId'
+ *   },
+ * });
+ */
+export function useDelistCommonMutation(baseOptions?: Apollo.MutationHookOptions<DelistCommonMutation, DelistCommonMutationVariables>) {
+  return Apollo.useMutation<DelistCommonMutation, DelistCommonMutationVariables>(DelistCommonDocument, baseOptions);
+}
+
+export type DelistCommonMutationHookResult = ReturnType<typeof useDelistCommonMutation>;
+export type DelistCommonMutationResult = Apollo.MutationResult<DelistCommonMutation>;
+export type DelistCommonMutationOptions = Apollo.BaseMutationOptions<DelistCommonMutation, DelistCommonMutationVariables>;
 export const GetLatestEventsDocument = gql`
   query GetLatestEvents($take: Int = 10, $skip: Int = 0) {
     events(paginate: {take: $take, skip: $skip}) {
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 960b026a9..53ed821f5 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -129,6 +129,8 @@ type Event {
 }
 enum EventType {
   CommonCreated
+  CommonDelisted
+  CommonWhitelisted
   CommonMemberCreated
   CommonMemberRoleAdded
   CommonMemberRoleRemoved
@@ -641,6 +643,7 @@ type Mutation {
   createCard(input: CreateCardInput!): Card!
   createVote(input: CreateVoteInput!): Vote!
   createCommon(input: CreateCommonInput!): Common!
+  delistCommon(commonId: String!): Boolean
   whitelistCommon(commonId: String!): Boolean
   actOnReport(input: ActOnReportInput!): Report
   reportDiscussionMessage(input: ReportDiscussionMessageInput!): Report!
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 003aec876..18ee04029 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -1364,6 +1364,18 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "CommonDelisted",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CommonWhitelisted",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "CommonMemberCreated",
             "description": null,
@@ -6672,6 +6684,35 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "delistCommon",
+            "description": null,
+            "args": [
+              {
+                "name": "commonId",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "SCALAR",
+                    "name": "String",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "SCALAR",
+              "name": "Boolean",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "whitelistCommon",
             "description": null,
diff --git a/packages/admin/src/pages/_app.tsx b/packages/admin/src/pages/_app.tsx
index 125d85f42..dc606cd46 100644
--- a/packages/admin/src/pages/_app.tsx
+++ b/packages/admin/src/pages/_app.tsx
@@ -9,6 +9,8 @@ import { UserContextProvider } from '@core/context';
 import { AuthenticatedLayout } from '@components/layout/AuthenticatedLayout';
 import { CommonApolloProvider, AuthenticationProvider } from '@components/providers';
 
+import './../../public/style.css';
+
 
 const CommonAdmin = ({ Component, pageProps }: AppProps): React.ReactElement => {
   return (
diff --git a/packages/core/prisma/migrations/20210429062315_common_whitelisted_event/migration.sql b/packages/core/prisma/migrations/20210429062315_common_whitelisted_event/migration.sql
new file mode 100644
index 000000000..8bb46c959
--- /dev/null
+++ b/packages/core/prisma/migrations/20210429062315_common_whitelisted_event/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "EventType" ADD VALUE 'CommonWhitelisted';
diff --git a/packages/core/prisma/models/events/enums/EventType.prisma b/packages/core/prisma/models/events/enums/EventType.prisma
index 5b485cfda..0cc8dd551 100644
--- a/packages/core/prisma/models/events/enums/EventType.prisma
+++ b/packages/core/prisma/models/events/enums/EventType.prisma
@@ -1,5 +1,6 @@
 enum EventType {
   CommonCreated
+  CommonDelisted
   CommonWhitelisted
 
   CommonMemberCreated
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index 80f716f90..f2cfae148 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -427,6 +427,7 @@ model UserNotificationToken {
 
 enum EventType {
   CommonCreated
+  CommonDelisted
   CommonWhitelisted
 
   CommonMemberCreated
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index 1df392938..4ed7f758b 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -25,6 +25,7 @@ export const PermissionValidator = z.enum([
   'admin.proposals.read.ipAddress',
 
   'admin.commons.update',
+  'admin.commons.delist',
   'admin.commons.whitelist',
 
   'user.permissions.read'
diff --git a/packages/core/src/services/commons/command/delistCommonCommand.ts b/packages/core/src/services/commons/command/delistCommonCommand.ts
new file mode 100644
index 000000000..ce5ce80bc
--- /dev/null
+++ b/packages/core/src/services/commons/command/delistCommonCommand.ts
@@ -0,0 +1,32 @@
+import { EventType } from '@prisma/client';
+
+import { prisma } from '@toolkits';
+import { eventService } from '@services';
+
+/**
+ * Delist the passed common. No authorization checks are being done here!
+ *
+ * @param commonId - The ID of the common to delist
+ *
+ * @returns - Whether the operation was successful
+ */
+export const delistCommonCommand = async (commonId: string): Promise<boolean> => {
+  await prisma.common
+    .update({
+      where: {
+        id: commonId
+      },
+      data: {
+        whitelisted: {
+          set: false
+        }
+      }
+    });
+
+  eventService.create({
+    type: EventType.CommonDelisted,
+    commonId
+  });
+
+  return true;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/commons/index.ts b/packages/core/src/services/commons/index.ts
index 6799c9f99..d4c84a027 100644
--- a/packages/core/src/services/commons/index.ts
+++ b/packages/core/src/services/commons/index.ts
@@ -1,12 +1,14 @@
 import { createCommonCommand } from './command/createCommonCommand';
+import { delistCommonCommand } from './command/delistCommonCommand';
+import { whitelistCommonCommand } from './command/whitelistCommonCommand';
 import { createCommonMemberCommand } from './command/createCommonMemberCommand';
-import { addCommonMemberRoleCommand } from './command/addCommonMemberRoleCommand';
 
+import { addCommonMemberRoleCommand } from './command/addCommonMemberRoleCommand';
 import { getCommonMemberIdQuery } from './queries/getCommonMemberIdQuery';
-import { whitelistCommonCommand } from './command/whitelistCommonCommand';
 
 export const commonService = {
   create: createCommonCommand,
+  delist: delistCommonCommand,
   whitelist: whitelistCommonCommand,
   createMember: createCommonMemberCommand,
 
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index c7832306d..957520455 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -227,7 +227,7 @@ export interface NexusGenEnums {
   DiscussionMessageType: 'Message'
   DiscussionSubscriptionType: 'AllNotifications' | 'NoNotification' | 'OnlyMentions'
   DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
-  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'CommonWhitelisted' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
+  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonDelisted' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'CommonWhitelisted' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
   FundingState: 'AwaitingApproval' | 'Completed' | 'Confirmed' | 'Eligible' | 'NotEligible' | 'Pending'
   FundingType: 'Monthly' | 'OneTime'
   NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
@@ -550,6 +550,7 @@ export interface NexusGenFieldTypes {
     createUser: NexusGenRootTypes['User']; // User!
     createUserNotificationToken: NexusGenRootTypes['UserNotificationToken']; // UserNotificationToken!
     createVote: NexusGenRootTypes['Vote']; // Vote!
+    delistCommon: boolean | null; // Boolean
     finalizeProposal: boolean; // Boolean!
     reportDiscussionMessage: NexusGenRootTypes['Report']; // Report!
     unassignRole: NexusGenScalars['Void'] | null; // Void
@@ -789,6 +790,7 @@ export interface NexusGenFieldTypeNames {
     createUser: 'User'
     createUserNotificationToken: 'UserNotificationToken'
     createVote: 'Vote'
+    delistCommon: 'Boolean'
     finalizeProposal: 'Boolean'
     reportDiscussionMessage: 'Report'
     unassignRole: 'Void'
@@ -997,6 +999,9 @@ export interface NexusGenArgTypes {
     createVote: { // args
       input: NexusGenInputs['CreateVoteInput']; // CreateVoteInput!
     }
+    delistCommon: { // args
+      commonId: string; // String!
+    }
     finalizeProposal: { // args
       proposalId: string; // ID!
     }
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 6a90c59e1..4cbfb47d9 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -322,6 +322,7 @@ enum EventType {
   CardCvvVerificationFailed
   CardCvvVerificationPassed
   CommonCreated
+  CommonDelisted
   CommonMemberCreated
   CommonMemberRoleAdded
   CommonMemberRoleRemoved
@@ -454,6 +455,7 @@ type Mutation {
   createUser(input: CreateUserInput!): User!
   createUserNotificationToken(input: CreateUserNotificationTokenInput!): UserNotificationToken!
   createVote(input: CreateVoteInput!): Vote!
+  delistCommon(commonId: String!): Boolean
   finalizeProposal(proposalId: ID!): Boolean!
   reportDiscussionMessage(input: ReportDiscussionMessageInput!): Report!
   unassignRole(roleId: ID!, userId: ID!): Void
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/DelistCommon.mutation.ts b/packages/graphql/src/schema/Types/Commons/Mutations/DelistCommon.mutation.ts
new file mode 100644
index 000000000..35def5164
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Commons/Mutations/DelistCommon.mutation.ts
@@ -0,0 +1,15 @@
+import { mutationField, stringArg, nonNull } from 'nexus';
+import { authorizationService, commonService } from '@common/core';
+
+export const DelistCommonMutation = mutationField('delistCommon', {
+  type: 'Boolean',
+  args: {
+    commonId: nonNull(stringArg())
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.commons.delist');
+  },
+  resolve: (root, args) => {
+    return commonService.delist(args.commonId);
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Commons/index.ts b/packages/graphql/src/schema/Types/Commons/index.ts
index 6fd33886c..0fe56d151 100644
--- a/packages/graphql/src/schema/Types/Commons/index.ts
+++ b/packages/graphql/src/schema/Types/Commons/index.ts
@@ -1,5 +1,6 @@
 import { FundingTypeEnum } from './Enums/FundingTypeEnum';
 
+import { DelistCommonMutation } from './Mutations/DelistCommon.mutation';
 import { WhitelistCommonMutation } from './Mutations/WhitelistCommon.mutation';
 import { CreateCommonInput, CreateCommonMutation } from './Mutations/CreateCommon.mutation';
 
@@ -26,6 +27,7 @@ export const CommonTypes = [
 
   CreateCommonInput,
   CreateCommonMutation,
+  DelistCommonMutation,
   WhitelistCommonMutation,
 
   CommonWhereUniqueInput,

From e52057234d427da863bbfbfe737589bcc50321e2 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 10:22:48 +0300
Subject: [PATCH 17/29] Fix jump redirection problems

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../admin/src/components/HasPermission.tsx    |  4 +-
 .../components/layout/AuthenticatedLayout.tsx |  3 +
 .../providers/AuthenticationProvider.tsx      | 76 +++++++++++--------
 .../admin/src/core/context/UserContext.tsx    | 15 +++-
 packages/admin/src/pages/index.tsx            | 14 ----
 .../migration.sql                             |  2 +
 6 files changed, 60 insertions(+), 54 deletions(-)
 create mode 100644 packages/core/prisma/migrations/20210429064256_common_delisted_event/migration.sql

diff --git a/packages/admin/src/components/HasPermission.tsx b/packages/admin/src/components/HasPermission.tsx
index fb9c0dc4e..12d0848c5 100644
--- a/packages/admin/src/components/HasPermission.tsx
+++ b/packages/admin/src/components/HasPermission.tsx
@@ -16,8 +16,6 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
   const hasPermission = (permission: string): boolean => {
     let hasPermission = false;
 
-    console.log(userContext);
-
     if (userContext.loaded) {
       const permissions = userContext.permissions;
 
@@ -33,7 +31,7 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
 
     console.debug(`Permission check for [${permission}]: ${hasPermission}`);
 
-    if (!hasPermission && redirect) {
+    if (!hasPermission && userContext.loaded && redirect) {
       router
         .push({
           pathname: '/error/unauthorized',
diff --git a/packages/admin/src/components/layout/AuthenticatedLayout.tsx b/packages/admin/src/components/layout/AuthenticatedLayout.tsx
index e44cf9ba4..a02d0f9c0 100644
--- a/packages/admin/src/components/layout/AuthenticatedLayout.tsx
+++ b/packages/admin/src/components/layout/AuthenticatedLayout.tsx
@@ -2,8 +2,11 @@ import React from 'react';
 import { Page, Spacer } from '@geist-ui/react';
 
 import { Header } from '@components/Header';
+import { useUserContext } from '@core/context';
 
 export const AuthenticatedLayout: React.FC<React.PropsWithChildren<any>> = ({ children, ...rest }) => {
+  const userContext = useUserContext();
+
   return (
     <Page>
       <Header/>
diff --git a/packages/admin/src/components/providers/AuthenticationProvider.tsx b/packages/admin/src/components/providers/AuthenticationProvider.tsx
index 54907fb9a..aef2f6e01 100644
--- a/packages/admin/src/components/providers/AuthenticationProvider.tsx
+++ b/packages/admin/src/components/providers/AuthenticationProvider.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'next/router';
 import { FirebaseAuthProvider, IfFirebaseUnAuthed, IfFirebaseAuthed } from '@react-firebase/auth';
 
 import { Paths } from '@core/constants';
+import { useAuthState } from 'react-firebase-hooks/auth';
 
 const config = {
   apiKey: process.env['NEXT_PUBLIC_Firebase.ApiKey'],
@@ -15,45 +16,54 @@ const config = {
 };
 
 export const AuthenticationProvider: React.FC<React.PropsWithChildren<any>> = ({ children }) => {
-  const router = useRouter();
-
   return (
     <React.Fragment>
       <FirebaseAuthProvider firebase={firebase} {...config}>
         {children}
 
-        <IfFirebaseUnAuthed>
-          {() => {
-            // If the user is not authenticated and is not on the login
-            // page redirect it to that page
-            if (router.pathname !== Paths.auth.login) {
-              router.push(Paths.auth.login)
-                .then(() => {
-                  console.log(
-                    'Redirected unauthenticated user ' +
-                    'to the login page'
-                  );
-                });
-            }
-          }}
-        </IfFirebaseUnAuthed>
-
-        <IfFirebaseAuthed>
-          {() => {
-            // If the user is authenticated and is on the login page
-            // redirect it to the homepage
-            if (router.pathname === Paths.auth.login) {
-              router.push(Paths.dashboard)
-                .then(() => {
-                  console.log(
-                    'Redirected authenticated user away ' +
-                    'from the login page'
-                  );
-                });
-            }
-          }}
-        </IfFirebaseAuthed>
+        <AuthenticationRedirection/>
       </FirebaseAuthProvider>
     </React.Fragment>
   );
+};
+
+const AuthenticationRedirection = () => {
+  const router = useRouter();
+  const [user, loading, error] = useAuthState(firebase.auth());
+
+  return (
+    <React.Fragment>
+      <IfFirebaseUnAuthed>
+        {() => {
+          // If the user is not authenticated and is not on the login
+          // page redirect it to that page
+          if (router.pathname !== Paths.auth.login && !loading) {
+            router.push(Paths.auth.login)
+              .then(() => {
+                console.log(
+                  'Redirected unauthenticated user ' +
+                  'to the login page', loading, user, error
+                );
+              });
+          }
+        }}
+      </IfFirebaseUnAuthed>
+
+      <IfFirebaseAuthed>
+        {() => {
+          // If the user is authenticated and is on the login page
+          // redirect it to the homepage
+          if (router.pathname === Paths.auth.login) {
+            router.push(Paths.dashboard)
+              .then(() => {
+                console.log(
+                  'Redirected authenticated user away ' +
+                  'from the login page'
+                );
+              });
+          }
+        }}
+      </IfFirebaseAuthed>
+    </React.Fragment>
+  );
 };
\ No newline at end of file
diff --git a/packages/admin/src/core/context/UserContext.tsx b/packages/admin/src/core/context/UserContext.tsx
index ed5ca2a96..8156dc254 100644
--- a/packages/admin/src/core/context/UserContext.tsx
+++ b/packages/admin/src/core/context/UserContext.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { gql } from '@apollo/client';
 
 import { useLoadUserContextQuery } from '@core/graphql';
+import { Loading } from '@geist-ui/react';
 
 interface UserContext {
   loaded: boolean;
@@ -56,20 +57,26 @@ export const UserContextProvider: React.FC<React.PropsWithChildren<any>> = ({ ch
 
   // Effects
   React.useEffect(() => {
-    console.log(data);
-
-    if (data) {
+    if (data?.user) {
       setContext({
         loaded: true,
         ...data.user
       });
+
+      console.log('Data loaded');
     }
   }, [data]);
 
   // Render
   return (
     <UserContext.Provider value={context}>
-      {children}
+      {context.loaded ? (
+        <React.Fragment>
+          {children}
+        </React.Fragment>
+      ) : (
+        <Loading/>
+      )}
     </UserContext.Provider>
   );
 };
\ No newline at end of file
diff --git a/packages/admin/src/pages/index.tsx b/packages/admin/src/pages/index.tsx
index 6c1583963..0af169731 100644
--- a/packages/admin/src/pages/index.tsx
+++ b/packages/admin/src/pages/index.tsx
@@ -1,25 +1,11 @@
 import { NextPage } from 'next';
 import { useRouter } from 'next/router';
 import React from 'react';
-import firebase from 'firebase/app';
-import { useAuthState } from 'react-firebase-hooks/auth';
 
 
 const IndexPage: NextPage = () => {
   const router = useRouter();
 
-  const [user, loading, error] = useAuthState(firebase.auth());
-
-  React.useEffect(() => {
-    if(!loading) {
-      if (user) {
-        router.push('/dashboard');
-      } else {
-        router.push('/auth');
-      }
-    }
-  }, [loading]);
-
   return (<div/>);
 };
 
diff --git a/packages/core/prisma/migrations/20210429064256_common_delisted_event/migration.sql b/packages/core/prisma/migrations/20210429064256_common_delisted_event/migration.sql
new file mode 100644
index 000000000..a011eef96
--- /dev/null
+++ b/packages/core/prisma/migrations/20210429064256_common_delisted_event/migration.sql
@@ -0,0 +1,2 @@
+-- AlterEnum
+ALTER TYPE "EventType" ADD VALUE 'CommonDelisted';

From 87380b98c65ed989c044591d9a18c1b174344dbc Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 10:56:09 +0300
Subject: [PATCH 18/29] Common creation fixes, get proposals query

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../admin/src/components/HasPermission.tsx    |  2 -
 .../admin/src/core/context/UserContext.tsx    |  2 +-
 .../src/pages/commons/details/[commonId].tsx  |  4 +-
 .../commons/command/createCommonCommand.ts    |  9 ++
 .../graphql/src/generated/nexus-typegen.ts    | 87 +++++++++++--------
 packages/graphql/src/generated/schema.graphql |  7 ++
 .../Mutations/CreateCommon.mutation.ts        |  3 +
 .../Proposals/Inputs/ProposalWhere.input.ts   |  8 ++
 .../Proposals/Queries/GetProposals.query.ts   | 23 +++++
 .../src/schema/Types/Proposals/index.ts       |  2 +
 10 files changed, 104 insertions(+), 43 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts

diff --git a/packages/admin/src/components/HasPermission.tsx b/packages/admin/src/components/HasPermission.tsx
index 12d0848c5..fd94800a0 100644
--- a/packages/admin/src/components/HasPermission.tsx
+++ b/packages/admin/src/components/HasPermission.tsx
@@ -19,8 +19,6 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
     if (userContext.loaded) {
       const permissions = userContext.permissions;
 
-      console.log(permissions);
-
       if (permission.includes('*')) {
         hasPermission = permissions.some((userPermission) =>
           matchRuleExpl(userPermission, permission));
diff --git a/packages/admin/src/core/context/UserContext.tsx b/packages/admin/src/core/context/UserContext.tsx
index 8156dc254..6f23b5dbe 100644
--- a/packages/admin/src/core/context/UserContext.tsx
+++ b/packages/admin/src/core/context/UserContext.tsx
@@ -63,7 +63,7 @@ export const UserContextProvider: React.FC<React.PropsWithChildren<any>> = ({ ch
         ...data.user
       });
 
-      console.log('Data loaded');
+      console.log('User data and permissions loaded!');
     }
   }, [data]);
 
diff --git a/packages/admin/src/pages/commons/details/[commonId].tsx b/packages/admin/src/pages/commons/details/[commonId].tsx
index f9de9bfaf..f30a5f781 100644
--- a/packages/admin/src/pages/commons/details/[commonId].tsx
+++ b/packages/admin/src/pages/commons/details/[commonId].tsx
@@ -134,8 +134,8 @@ const CommonDetailsPage: NextPage = () => {
       name: `${member.user.firstName} ${member.user.lastName[0]}.`,
       roles: (
         <React.Fragment>
-          {member.roles.map(r => (
-            <Tag>
+          {member.roles.map((r, i) => (
+            <Tag key={i}>
               {r}
             </Tag>
           ))}
diff --git a/packages/core/src/services/commons/command/createCommonCommand.ts b/packages/core/src/services/commons/command/createCommonCommand.ts
index c9d785309..fef5c6f11 100644
--- a/packages/core/src/services/commons/command/createCommonCommand.ts
+++ b/packages/core/src/services/commons/command/createCommonCommand.ts
@@ -16,6 +16,15 @@ const schema = z.object({
   image: z.string()
     .nonempty(),
 
+  description: z.string()
+    .nonempty(),
+
+  action: z.string()
+    .optional(),
+
+  byline: z.string()
+    .optional(),
+
   fundingType: z.enum(Object.keys(FundingType) as [(keyof typeof FundingType)]),
 
   fundingMinimumAmount: z.number()
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 957520455..d0aec0d26 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,11 +4,10 @@
  */
 
 
-import { IRequestContext } from './../context';
-import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
-import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
-import { core } from 'nexus';
-
+import { IRequestContext } from "./../context"
+import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
+import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
+import { core } from "nexus"
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -85,6 +84,8 @@ export interface NexusGenInputs {
     keyId: string; // String!
   }
   CreateCommonInput: { // input type
+    action?: string | null; // String
+    byline?: string | null; // String
     description?: string | null; // String
     fundingMinimumAmount: number; // Int!
     fundingType: NexusGenEnums['FundingType']; // FundingType!
@@ -186,7 +187,11 @@ export interface NexusGenInputs {
     url: string; // String!
   }
   ProposalWhereInput: { // input type
+    commonId?: NexusGenScalars['UUID'] | null; // UUID
+    commonMemberId?: NexusGenScalars['UUID'] | null; // UUID
+    state?: NexusGenEnums['ProposalState'] | null; // ProposalState
     type?: NexusGenEnums['ProposalType'] | null; // ProposalType
+    userId?: string | null; // ID
   }
   ProposalWhereUniqueInput: { // input type
     id: NexusGenScalars['UUID']; // UUID!
@@ -222,27 +227,27 @@ export interface NexusGenInputs {
 }
 
 export interface NexusGenEnums {
-  CommonMemberRole: 'Founder' | 'Moderator'
-  DiscussionMessageFlag: 'Clear' | 'Hidden' | 'Reported'
-  DiscussionMessageType: 'Message'
-  DiscussionSubscriptionType: 'AllNotifications' | 'NoNotification' | 'OnlyMentions'
-  DiscussionType: 'CommonDiscussion' | 'ProposalDiscussion'
-  EventType: 'CardCreated' | 'CardCvvVerificationFailed' | 'CardCvvVerificationPassed' | 'CommonCreated' | 'CommonDelisted' | 'CommonMemberCreated' | 'CommonMemberRoleAdded' | 'CommonMemberRoleRemoved' | 'CommonWhitelisted' | 'DiscussionCreated' | 'DiscussionMessageCreated' | 'DiscussionSubscriptionCreated' | 'DiscussionSubscriptionTypeChanged' | 'FundingRequestAccepted' | 'FundingRequestCreated' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestCreated' | 'JoinRequestRejected' | 'NotificationTemplateCreated' | 'NotificationTemplateUpdated' | 'PaymentCreated' | 'PaymentFailed' | 'PaymentSucceeded' | 'ProposalExpired' | 'ProposalMajorityReached' | 'ReportCreated' | 'ReportDismissed' | 'ReportRespected' | 'RoleCreated' | 'RoleDeleted' | 'RolePermissionAdded' | 'RolePermissionRemoved' | 'RoleUpdated' | 'UserAddedToRole' | 'UserCreated' | 'UserNotificationTokenCreated' | 'UserNotificationTokenExpired' | 'UserNotificationTokenRefreshed' | 'UserNotificationTokenVoided' | 'UserRemovedFromRole' | 'VoteCreated'
-  FundingState: 'AwaitingApproval' | 'Completed' | 'Confirmed' | 'Eligible' | 'NotEligible' | 'Pending'
-  FundingType: 'Monthly' | 'OneTime'
-  NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
-  NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'JoinRequestAccepted' | 'JoinRequestRejected'
-  PaymentState: 'NotAttempted' | 'Pending' | 'Successful' | 'Unsuccessful'
-  ProposalState: 'Accepted' | 'Countdown' | 'Finalizing' | 'Rejected'
-  ProposalType: 'FundingRequest' | 'JoinRequest'
-  ReportAction: 'Dismissed' | 'Respected'
-  ReportAuditor: 'CommonModerator' | 'SystemAdmin'
-  ReportFor: 'FalseNews' | 'Harassment' | 'Hate' | 'Nudity' | 'Other' | 'Spam' | 'Violance'
-  ReportStatus: 'Active' | 'Clossed'
-  SortOrder: 'asc' | 'desc'
-  StatisticType: 'AllTime' | 'Daily' | 'Hourly' | 'Weekly'
-  UserNotificationTokenState: 'Active' | 'Expired' | 'Voided'
-  VoteOutcome: 'Approve' | 'Condemn'
+  CommonMemberRole: "Founder" | "Moderator"
+  DiscussionMessageFlag: "Clear" | "Hidden" | "Reported"
+  DiscussionMessageType: "Message"
+  DiscussionSubscriptionType: "AllNotifications" | "NoNotification" | "OnlyMentions"
+  DiscussionType: "CommonDiscussion" | "ProposalDiscussion"
+  EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonDelisted" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "CommonWhitelisted" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "RoleUpdated" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
+  FundingState: "AwaitingApproval" | "Completed" | "Confirmed" | "Eligible" | "NotEligible" | "Pending"
+  FundingType: "Monthly" | "OneTime"
+  NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
+  NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
+  PaymentState: "NotAttempted" | "Pending" | "Successful" | "Unsuccessful"
+  ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
+  ProposalType: "FundingRequest" | "JoinRequest"
+  ReportAction: "Dismissed" | "Respected"
+  ReportAuditor: "CommonModerator" | "SystemAdmin"
+  ReportFor: "FalseNews" | "Harassment" | "Hate" | "Nudity" | "Other" | "Spam" | "Violance"
+  ReportStatus: "Active" | "Clossed"
+  SortOrder: "asc" | "desc"
+  StatisticType: "AllTime" | "Daily" | "Hourly" | "Weekly"
+  UserNotificationTokenState: "Active" | "Expired" | "Voided"
+  VoteOutcome: "Approve" | "Condemn"
 }
 
 export interface NexusGenScalars {
@@ -602,6 +607,7 @@ export interface NexusGenFieldTypes {
     generateUserAuthToken: string; // String!
     getStatistics: Array<NexusGenRootTypes['Statistic'] | null> | null; // [Statistic]
     proposal: NexusGenRootTypes['Proposal'] | null; // Proposal
+    proposals: Array<NexusGenRootTypes['Proposal'] | null> | null; // [Proposal]
     roles: Array<NexusGenRootTypes['Role'] | null> | null; // [Role]
     user: NexusGenRootTypes['User'] | null; // User
   }
@@ -842,6 +848,7 @@ export interface NexusGenFieldTypeNames {
     generateUserAuthToken: 'String'
     getStatistics: 'Statistic'
     proposal: 'Proposal'
+    proposals: 'Proposal'
     roles: 'Role'
     user: 'User'
   }
@@ -1047,6 +1054,10 @@ export interface NexusGenArgTypes {
     proposal: { // args
       where: NexusGenInputs['ProposalWhereUniqueInput']; // ProposalWhereUniqueInput!
     }
+    proposals: { // args
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
+      where?: NexusGenInputs['ProposalWhereInput'] | null; // ProposalWhereInput
+    }
     roles: { // args
       paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
     }
@@ -1088,21 +1099,21 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: 'CommonMember' | 'Discussion' | 'DiscussionMessage' | 'DiscussionSubscription' | 'FundingProposal' | 'JoinProposal' | 'Notification' | 'Report' | 'Role' | 'Statistic' | 'UserNotificationToken'
+  BaseEntity: "CommonMember" | "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "FundingProposal" | "JoinProposal" | "Notification" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
 }
 
 export interface NexusGenTypeInterfaces {
-  CommonMember: 'BaseEntity'
-  Discussion: 'BaseEntity'
-  DiscussionMessage: 'BaseEntity'
-  DiscussionSubscription: 'BaseEntity'
-  FundingProposal: 'BaseEntity'
-  JoinProposal: 'BaseEntity'
-  Notification: 'BaseEntity'
-  Report: 'BaseEntity'
-  Role: 'BaseEntity'
-  Statistic: 'BaseEntity'
-  UserNotificationToken: 'BaseEntity'
+  CommonMember: "BaseEntity"
+  Discussion: "BaseEntity"
+  DiscussionMessage: "BaseEntity"
+  DiscussionSubscription: "BaseEntity"
+  FundingProposal: "BaseEntity"
+  JoinProposal: "BaseEntity"
+  Notification: "BaseEntity"
+  Report: "BaseEntity"
+  Role: "BaseEntity"
+  Statistic: "BaseEntity"
+  UserNotificationToken: "BaseEntity"
 }
 
 export type NexusGenObjectNames = keyof NexusGenObjects;
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 4cbfb47d9..fbdce86d9 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -125,6 +125,8 @@ input CreateCardInput {
 }
 
 input CreateCommonInput {
+  action: String
+  byline: String
   description: String
   fundingMinimumAmount: Int!
   fundingType: FundingType!
@@ -602,7 +604,11 @@ enum ProposalType {
 }
 
 input ProposalWhereInput {
+  commonId: UUID
+  commonMemberId: UUID
+  state: ProposalState
   type: ProposalType
+  userId: ID
 }
 
 input ProposalWhereUniqueInput {
@@ -617,6 +623,7 @@ type Query {
   generateUserAuthToken(authId: String!): String!
   getStatistics(where: StatisticsWhereInput): [Statistic]
   proposal(where: ProposalWhereUniqueInput!): Proposal
+  proposals(paginate: PaginateInput, where: ProposalWhereInput): [Proposal]
   roles(paginate: PaginateInput): [Role]
 
   """
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts b/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
index 35cad1af7..cbe0a4152 100644
--- a/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
+++ b/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
@@ -14,6 +14,9 @@ export const CreateCommonInput = inputObjectType({
     });
 
     t.nonNull.string('image');
+    t.nonNull.string('description');
+    t.string('action');
+    t.string('byline');
     t.string('description');
   }
 });
diff --git a/packages/graphql/src/schema/Types/Proposals/Inputs/ProposalWhere.input.ts b/packages/graphql/src/schema/Types/Proposals/Inputs/ProposalWhere.input.ts
index 2db5a89d7..1d383a0f9 100644
--- a/packages/graphql/src/schema/Types/Proposals/Inputs/ProposalWhere.input.ts
+++ b/packages/graphql/src/schema/Types/Proposals/Inputs/ProposalWhere.input.ts
@@ -6,5 +6,13 @@ export const ProposalWhereInput = inputObjectType({
     t.field('type', {
       type: 'ProposalType'
     });
+
+    t.field('state', {
+      type: 'ProposalState'
+    });
+
+    t.uuid('commonId');
+    t.uuid('commonMemberId');
+    t.id('userId');
   }
 });
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts b/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts
new file mode 100644
index 000000000..3a9dfc535
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts
@@ -0,0 +1,23 @@
+import { queryField, list, arg } from 'nexus';
+import { prisma } from '@common/core';
+
+export const GetProposalsQuery = queryField('proposals', {
+  type: list('Proposal'),
+  args: {
+    where: arg({
+      type: 'ProposalWhereInput'
+    }),
+    paginate: arg({
+      type: 'PaginateInput'
+    })
+  },
+  resolve: (root, args) => {
+    return prisma.proposal
+      .findMany({
+        where: {
+          ...args.where,
+          ...args.paginate
+        }
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/index.ts b/packages/graphql/src/schema/Types/Proposals/index.ts
index 52cec35f0..d4136686f 100644
--- a/packages/graphql/src/schema/Types/Proposals/index.ts
+++ b/packages/graphql/src/schema/Types/Proposals/index.ts
@@ -25,6 +25,7 @@ import { ProposalFundingExtension } from './Extensions/ProposalFunding.extension
 import { ProposalJoinExtension } from './Extensions/ProposalJoin.extension';
 
 import { ProposalChangeSubscription } from './Subscriptions/ProposalChange.subscription';
+import { GetProposalsQuery } from './Queries/GetProposals.query';
 
 export const ProposalTypes = [
   ProposalType,
@@ -50,6 +51,7 @@ export const ProposalTypes = [
   PaymentStateEnum,
 
   GetProposalQuery,
+  GetProposalsQuery,
 
   ProposalWhereUniqueInput,
 

From 0f05da41f2f5240394fc1eb4d4ff13a0637bb520 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Thu, 29 Apr 2021 11:52:17 +0300
Subject: [PATCH 19/29] Fix proposals page

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 packages/admin/src/core/graphql/index.ts      | 106 ++++++++++++-
 .../admin/src/core/graphql/schema.graphql     |   9 ++
 packages/admin/src/core/graphql/schema.json   | 145 ++++++++++++++++++
 packages/admin/src/pages/proposals/index.tsx  |  62 +++++---
 .../graphql/src/generated/nexus-typegen.ts    |  14 +-
 packages/graphql/src/generated/schema.graphql |   3 +
 .../Extensions/ProposalCommon.extension.ts    |  22 +++
 .../Proposals/Queries/GetProposals.query.ts   |   6 +-
 .../src/schema/Types/Proposals/index.ts       |   2 +
 10 files changed, 334 insertions(+), 36 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Extensions/ProposalCommon.extension.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 1b094d4e9..6114be49e 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -6,6 +6,7 @@ documents:
   - "src/components/CommonSettings.tsx"
   - "src/pages/dashboard/index.tsx"
   - "src/pages/commons/index.tsx"
+  - "src/pages/proposals/index.tsx"
   - "src/pages/commons/details/[commonId].tsx"
 generates:
   ./src/core/graphql/index.ts:
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index d3f15df3b..af04accdb 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -315,6 +315,8 @@ export type CreateCommonInput = {
   fundingType: FundingType;
   image: Scalars['String'];
   description?: Maybe<Scalars['String']>;
+  action?: Maybe<Scalars['String']>;
+  byline?: Maybe<Scalars['String']>;
 };
 
 export type CommonWhereUniqueInput = {
@@ -412,6 +414,8 @@ export type Proposal = {
   discussions: Array<Discussion>;
   fundingId?: Maybe<Scalars['UUID']>;
   funding?: Maybe<FundingProposal>;
+  commonId: Scalars['UUID'];
+  common: Common;
   joinId?: Maybe<Scalars['UUID']>;
   join?: Maybe<JoinProposal>;
 };
@@ -451,6 +455,10 @@ export type FundingProposal = BaseEntity & {
 
 export type ProposalWhereInput = {
   type?: Maybe<ProposalType>;
+  state?: Maybe<ProposalState>;
+  commonId?: Maybe<Scalars['UUID']>;
+  commonMemberId?: Maybe<Scalars['UUID']>;
+  userId?: Maybe<Scalars['ID']>;
 };
 
 export type CreateJoinProposalInput = {
@@ -813,6 +821,7 @@ export type Query = {
   common?: Maybe<Common>;
   commons?: Maybe<Array<Maybe<Common>>>;
   proposal?: Maybe<Proposal>;
+  proposals?: Maybe<Array<Maybe<Proposal>>>;
   getStatistics?: Maybe<Array<Maybe<Statistic>>>;
   discussion?: Maybe<Discussion>;
 };
@@ -853,6 +862,12 @@ export type QueryProposalArgs = {
 };
 
 
+export type QueryProposalsArgs = {
+  where?: Maybe<ProposalWhereInput>;
+  paginate?: Maybe<PaginateInput>;
+};
+
+
 export type QueryGetStatisticsArgs = {
   where?: Maybe<StatisticsWhereInput>;
 };
@@ -1132,6 +1147,37 @@ export type GetAllTimeStatistiscQuery = (
 }
   );
 
+export type GetProposalsHomescreenQueryVariables = Exact<{
+  fundingPaginate: PaginateInput;
+  joinPaginate: PaginateInput;
+}>;
+
+
+export type GetProposalsHomescreenQuery = (
+  { __typename?: 'Query' }
+  & {
+  funding?: Maybe<Array<Maybe<(
+    { __typename?: 'Proposal' }
+    & Pick<Proposal, 'id' | 'commonId' | 'votesFor' | 'votesAgainst' | 'title' | 'description'>
+    & {
+    funding?: Maybe<(
+      { __typename?: 'FundingProposal' }
+      & Pick<FundingProposal, 'amount'>
+      )>
+  }
+    )>>>, join?: Maybe<Array<Maybe<(
+    { __typename?: 'Proposal' }
+    & Pick<Proposal, 'id' | 'commonId' | 'title' | 'description'>
+    & {
+    join?: Maybe<(
+      { __typename?: 'JoinProposal' }
+      & Pick<JoinProposal, 'funding' | 'fundingType'>
+      )>
+  }
+    )>>>
+}
+  );
+
 
 export const LoadUserContextDocument = gql`
   query loadUserContext {
@@ -1266,7 +1312,6 @@ export type WhitelistCommonMutationFn = Apollo.MutationFunction<WhitelistCommonM
 export function useWhitelistCommonMutation(baseOptions?: Apollo.MutationHookOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>) {
   return Apollo.useMutation<WhitelistCommonMutation, WhitelistCommonMutationVariables>(WhitelistCommonDocument, baseOptions);
 }
-
 export type WhitelistCommonMutationHookResult = ReturnType<typeof useWhitelistCommonMutation>;
 export type WhitelistCommonMutationResult = Apollo.MutationResult<WhitelistCommonMutation>;
 export type WhitelistCommonMutationOptions = Apollo.BaseMutationOptions<WhitelistCommonMutation, WhitelistCommonMutationVariables>;
@@ -1297,7 +1342,6 @@ export type DelistCommonMutationFn = Apollo.MutationFunction<DelistCommonMutatio
 export function useDelistCommonMutation(baseOptions?: Apollo.MutationHookOptions<DelistCommonMutation, DelistCommonMutationVariables>) {
   return Apollo.useMutation<DelistCommonMutation, DelistCommonMutationVariables>(DelistCommonDocument, baseOptions);
 }
-
 export type DelistCommonMutationHookResult = ReturnType<typeof useDelistCommonMutation>;
 export type DelistCommonMutationResult = Apollo.MutationResult<DelistCommonMutation>;
 export type DelistCommonMutationOptions = Apollo.BaseMutationOptions<DelistCommonMutation, DelistCommonMutationVariables>;
@@ -1417,9 +1461,65 @@ export const GetAllTimeStatistiscDocument = gql`
 export function useGetAllTimeStatistiscQuery(baseOptions?: Apollo.QueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
   return Apollo.useQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
 }
+
 export function useGetAllTimeStatistiscLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
   return Apollo.useLazyQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
 }
+
 export type GetAllTimeStatistiscQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscQuery>;
 export type GetAllTimeStatistiscLazyQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscLazyQuery>;
-export type GetAllTimeStatistiscQueryResult = Apollo.QueryResult<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>;
\ No newline at end of file
+export type GetAllTimeStatistiscQueryResult = Apollo.QueryResult<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>;
+export const GetProposalsHomescreenDocument = gql`
+  query getProposalsHomescreen($fundingPaginate: PaginateInput!, $joinPaginate: PaginateInput!) {
+    funding: proposals(where: {type: FundingRequest}, paginate: $fundingPaginate) {
+      id
+      commonId
+      votesFor
+      votesAgainst
+      title
+      description
+      funding {
+        amount
+      }
+    }
+    join: proposals(where: {type: JoinRequest}, paginate: $joinPaginate) {
+      id
+      commonId
+      title
+      description
+      join {
+        funding
+        fundingType
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetProposalsHomescreenQuery__
+ *
+ * To run a query within a React component, call `useGetProposalsHomescreenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetProposalsHomescreenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetProposalsHomescreenQuery({
+ *   variables: {
+ *      fundingPaginate: // value for 'fundingPaginate'
+ *      joinPaginate: // value for 'joinPaginate'
+ *   },
+ * });
+ */
+export function useGetProposalsHomescreenQuery(baseOptions: Apollo.QueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
+  return Apollo.useQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
+}
+
+export function useGetProposalsHomescreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
+  return Apollo.useLazyQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
+}
+
+export type GetProposalsHomescreenQueryHookResult = ReturnType<typeof useGetProposalsHomescreenQuery>;
+export type GetProposalsHomescreenLazyQueryHookResult = ReturnType<typeof useGetProposalsHomescreenLazyQuery>;
+export type GetProposalsHomescreenQueryResult = Apollo.QueryResult<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 53ed821f5..5f4f6f648 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -219,6 +219,8 @@ input CreateCommonInput {
   fundingType: FundingType!
   image: String!
   description: String
+  action: String
+  byline: String
 }
 input CommonWhereUniqueInput {
   id: ID!
@@ -303,6 +305,8 @@ type Proposal {
   discussions(take: Int, skip: Int): [Discussion!]!
   fundingId: UUID
   funding: FundingProposal
+  commonId: UUID!
+  common: Common!
   joinId: UUID
   join: JoinProposal
 }
@@ -331,6 +335,10 @@ type FundingProposal implements BaseEntity {
 }
 input ProposalWhereInput {
   type: ProposalType
+  state: ProposalState
+  commonId: UUID
+  commonMemberId: UUID
+  userId: ID
 }
 input CreateJoinProposalInput {
   title: String!
@@ -629,6 +637,7 @@ type Query {
   common(where: CommonWhereUniqueInput!): Common
   commons(paginate: PaginateInput): [Common]
   proposal(where: ProposalWhereUniqueInput!): Proposal
+  proposals(where: ProposalWhereInput, paginate: PaginateInput): [Proposal]
   getStatistics(where: StatisticsWhereInput): [Statistic]
   discussion(id: ID!): Discussion
 }
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 18ee04029..92b3198c4 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -2282,6 +2282,30 @@
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "action",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "byline",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "interfaces": null,
@@ -3084,6 +3108,38 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "commonId",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "common",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Common",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "joinId",
             "description": null,
@@ -3341,6 +3397,54 @@
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "state",
+            "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "ProposalState",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "commonId",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "commonMemberId",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "userId",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "ID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "interfaces": null,
@@ -6298,6 +6402,47 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "proposals",
+            "description": null,
+            "args": [
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "ProposalWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Proposal",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "getStatistics",
             "description": null,
diff --git a/packages/admin/src/pages/proposals/index.tsx b/packages/admin/src/pages/proposals/index.tsx
index d1584d02a..93c765125 100644
--- a/packages/admin/src/pages/proposals/index.tsx
+++ b/packages/admin/src/pages/proposals/index.tsx
@@ -7,40 +7,45 @@ import { gql } from '@apollo/client';
 import { Breadcrumbs, Card, Grid, Pagination, Spacer, Table, Text } from '@geist-ui/react';
 
 import { Link } from '@components/Link';
-import { useStatisticsQuery, useGetProposalsHomescreenQuery } from '@core/graphql';
 import { useRouter } from 'next/router';
 import { ChevronLeftCircleFill, ChevronRightCircleFill } from '@geist-ui/react-icons';
+import { useGetProposalsHomescreenQuery, useGetAllTimeStatistiscQuery } from '@core/graphql';
 
 const ProposalsHomepageData = gql`
-  query getProposalsHomescreen($fundingPage: Int, $joinPage: Int) {
-    funding: proposals(type: fundingRequest, page: $fundingPage) {
+  query getProposalsHomescreen($fundingPaginate: PaginateInput!, $joinPaginate: PaginateInput!) {
+    funding: proposals(
+      where: {
+        type: FundingRequest
+      }
+      paginate: $fundingPaginate
+    ) {
       id
 
       commonId
 
-      votes { outcome }
       votesFor
       votesAgainst
 
-      description {
-        title
-        description
-      }
+      title
+      description
 
-      fundingRequest {
+      funding {
         amount
       }
     }
 
-    join: proposals(type: join, page: $joinPage) {
+    join: proposals(
+      where: {
+        type: JoinRequest
+      }
+      paginate: $joinPaginate
+    ) {
       id
 
       commonId
 
-      description {
-        title
-        description
-      }
+      title
+      description
 
       join {
         funding
@@ -59,11 +64,17 @@ const ProposalsHomepage: NextPage = () => {
 
   const router = useRouter();
 
-  const { data: statistics } = useStatisticsQuery();
+  const { data: statistics } = useGetAllTimeStatistiscQuery();
   const { data } = useGetProposalsHomescreenQuery({
     variables: {
-      joinPage,
-      fundingPage
+      joinPaginate: {
+        take: 10,
+        skip: 10 * (joinPage - 1)
+      },
+      fundingPaginate: {
+        take: 10,
+        skip: 10 * (fundingPage - 1)
+      }
     }
   });
 
@@ -117,7 +128,7 @@ const ProposalsHomepage: NextPage = () => {
               <Card hoverable>
                 <Text h1>
                   {statistics && (
-                    statistics.statistics.fundingRequests
+                    statistics.getStatistics[0].fundingProposals
                   )}
 
                   {!statistics && (
@@ -132,7 +143,7 @@ const ProposalsHomepage: NextPage = () => {
               <Card hoverable>
                 <Text h1>
                   {statistics && (
-                    statistics.statistics.joinRequests
+                    statistics.getStatistics[0].joinProposals
                   )}
 
                   {!statistics && (
@@ -147,8 +158,8 @@ const ProposalsHomepage: NextPage = () => {
               <Card hoverable>
                 <Text h1>
                   {statistics && (
-                    statistics.statistics.joinRequests +
-                    statistics.statistics.fundingRequests
+                    statistics.getStatistics[0].joinProposals +
+                    statistics.getStatistics[0].fundingProposals
                   )}
 
                   {!statistics && (
@@ -173,9 +184,9 @@ const ProposalsHomepage: NextPage = () => {
               <Table.Column prop="id"/>
             </Table>
 
-            {statistics && statistics.statistics.fundingRequests > 10 && (
+            {statistics && statistics.getStatistics[0].fundingProposals > 10 && (
               <div style={{ display: 'flex', justifyContent: 'center', marginTop: 20 }}>
-                <Pagination count={Math.ceil(statistics.statistics.fundingRequests / 10)}
+                <Pagination count={Math.ceil(statistics.getStatistics[0].fundingProposals / 10)}
                             onChange={onFundingPageChange}>
                   <Pagination.Next>
                     <ChevronRightCircleFill/>
@@ -198,9 +209,10 @@ const ProposalsHomepage: NextPage = () => {
               <Table.Column prop="id"/>
             </Table>
 
-            {statistics && statistics.statistics.joinRequests > 10 && (
+            {statistics && statistics.getStatistics[0].joinProposals > 10 && (
               <div style={{ display: 'flex', justifyContent: 'center', marginTop: 20 }}>
-                <Pagination count={Math.ceil(statistics.statistics.joinRequests / 10)} onChange={onJoinPageChange}>
+                <Pagination count={Math.ceil(statistics.getStatistics[0].joinProposals / 10)}
+                            onChange={onJoinPageChange}>
                   <Pagination.Next>
                     <ChevronRightCircleFill/>
                   </Pagination.Next>
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index d0aec0d26..4d8e62c8f 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,10 +4,11 @@
  */
 
 
-import { IRequestContext } from "./../context"
-import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
-import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
-import { core } from "nexus"
+import { IRequestContext } from './../context';
+import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
+import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
+import { core } from 'nexus';
+
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -359,6 +360,7 @@ export interface NexusGenObjects {
     userId: NexusGenScalars['UUID']; // UUID!
   }
   Proposal: { // root type
+    commonId: NexusGenScalars['UUID']; // UUID!
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     description?: string | null; // String
     expiresAt: NexusGenScalars['DateTime']; // DateTime!
@@ -579,6 +581,8 @@ export interface NexusGenFieldTypes {
     userId: NexusGenScalars['UUID']; // UUID!
   }
   Proposal: { // field return type
+    common: NexusGenRootTypes['Common']; // Common!
+    commonId: NexusGenScalars['UUID']; // UUID!
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     description: string | null; // String
     discussions: NexusGenRootTypes['Discussion'][]; // [Discussion!]!
@@ -820,6 +824,8 @@ export interface NexusGenFieldTypeNames {
     userId: 'UUID'
   }
   Proposal: { // field return type name
+    common: 'Common'
+    commonId: 'UUID'
     createdAt: 'DateTime'
     description: 'String'
     discussions: 'Discussion'
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index fbdce86d9..4d107ac9e 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -550,6 +550,9 @@ enum PaymentState {
 }
 
 type Proposal {
+  common: Common!
+  commonId: UUID!
+
   """The date, at which the item was created"""
   createdAt: DateTime!
   description: String
diff --git a/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalCommon.extension.ts b/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalCommon.extension.ts
new file mode 100644
index 000000000..d9cb3c9ed
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Extensions/ProposalCommon.extension.ts
@@ -0,0 +1,22 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const ProposalCommonExtension = extendType({
+  type: 'Proposal',
+  definition(t) {
+    t.nonNull.uuid('commonId');
+
+    t.nonNull.field('common', {
+      type: 'Common',
+      resolve: (root) => {
+        return prisma.proposal
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .common();
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts b/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts
index 3a9dfc535..cc727a281 100644
--- a/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts
+++ b/packages/graphql/src/schema/Types/Proposals/Queries/GetProposals.query.ts
@@ -14,10 +14,8 @@ export const GetProposalsQuery = queryField('proposals', {
   resolve: (root, args) => {
     return prisma.proposal
       .findMany({
-        where: {
-          ...args.where,
-          ...args.paginate
-        }
+        where: args.where as any,
+        ...args.paginate
       });
   }
 });
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/index.ts b/packages/graphql/src/schema/Types/Proposals/index.ts
index d4136686f..0e9fe4423 100644
--- a/packages/graphql/src/schema/Types/Proposals/index.ts
+++ b/packages/graphql/src/schema/Types/Proposals/index.ts
@@ -22,6 +22,7 @@ import { GetProposalQuery } from './Queries/GetProposal.query';
 
 import { ProposalDiscussionsExtension } from './Extensions/ProposalDiscussions.extension';
 import { ProposalFundingExtension } from './Extensions/ProposalFunding.extension';
+import { ProposalCommonExtension } from './Extensions/ProposalCommon.extension';
 import { ProposalJoinExtension } from './Extensions/ProposalJoin.extension';
 
 import { ProposalChangeSubscription } from './Subscriptions/ProposalChange.subscription';
@@ -57,6 +58,7 @@ export const ProposalTypes = [
 
   ProposalDiscussionsExtension,
   ProposalFundingExtension,
+  ProposalCommonExtension,
   ProposalJoinExtension,
 
   ProposalChangeSubscription

From 8cb4d72b03b9c671b5f47ae9ebced564d8495d11 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 5 May 2021 08:51:18 +0300
Subject: [PATCH 20/29] Fix proposal details page

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 packages/admin/src/core/graphql/index.ts      | 115 +++++++++++++++++-
 .../admin/src/core/graphql/schema.graphql     |   7 ++
 packages/admin/src/core/graphql/schema.json   |  88 ++++++++++++++
 .../pages/proposals/details/[proposalId].tsx  | 112 +++++++++--------
 packages/admin/src/pages/proposals/index.tsx  |   2 +-
 .../graphql/src/generated/nexus-typegen.ts    |  12 ++
 packages/graphql/src/generated/schema.graphql |   9 ++
 .../Enums/ProposalProposer.extension.ts       |  41 +++++++
 .../Enums/ProposalVotes.extension.ts          |  20 +++
 .../src/schema/Types/Proposals/index.ts       |   4 +
 11 files changed, 355 insertions(+), 56 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Enums/ProposalProposer.extension.ts
 create mode 100644 packages/graphql/src/schema/Types/Proposals/Enums/ProposalVotes.extension.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 6114be49e..870a499fb 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -8,6 +8,7 @@ documents:
   - "src/pages/commons/index.tsx"
   - "src/pages/proposals/index.tsx"
   - "src/pages/commons/details/[commonId].tsx"
+  - "src/pages/proposals/details/[proposalId].tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index af04accdb..14c8a2398 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -412,10 +412,17 @@ export type Proposal = {
   /** The IP from which the proposal was created */
   ipAddress?: Maybe<Scalars['String']>;
   discussions: Array<Discussion>;
+  /** The ID of the user who created the proposal */
+  userId: Scalars['ID'];
+  /** The ID of the membership of the user who created the proposal */
+  commonMemberId: Scalars['UUID'];
+  user: User;
+  member: CommonMember;
   fundingId?: Maybe<Scalars['UUID']>;
   funding?: Maybe<FundingProposal>;
   commonId: Scalars['UUID'];
   common: Common;
+  votes: Array<Vote>;
   joinId?: Maybe<Scalars['UUID']>;
   join?: Maybe<JoinProposal>;
 };
@@ -1070,6 +1077,44 @@ export type GetCommonDetailsQuery = (
 }
   );
 
+export type GetProposalDetailsQueryVariables = Exact<{
+  where: ProposalWhereUniqueInput;
+}>;
+
+
+export type GetProposalDetailsQuery = (
+  { __typename?: 'Query' }
+  & {
+  proposal?: Maybe<(
+    { __typename?: 'Proposal' }
+    & Pick<Proposal, 'id' | 'type' | 'createdAt' | 'updatedAt' | 'votesFor' | 'votesAgainst' | 'state' | 'description'>
+    & {
+    join?: Maybe<(
+      { __typename?: 'JoinProposal' }
+      & Pick<JoinProposal, 'funding' | 'fundingType' | 'paymentState'>
+      )>, funding?: Maybe<(
+      { __typename?: 'FundingProposal' }
+      & Pick<FundingProposal, 'amount' | 'fundingState'>
+      )>, user: (
+      { __typename?: 'User' }
+      & Pick<User, 'id' | 'firstName' | 'lastName'>
+      ), common: (
+      { __typename?: 'Common' }
+      & {
+      members: Array<Maybe<(
+        { __typename?: 'CommonMember' }
+        & Pick<CommonMember, 'userId'>
+        )>>
+    }
+      ), votes: Array<(
+      { __typename?: 'Vote' }
+      & Pick<Vote, 'id'>
+      )>
+  }
+    )>
+}
+  );
+
 export type WhitelistCommonMutationVariables = Exact<{
   commonId: Scalars['String'];
 }>;
@@ -1279,12 +1324,78 @@ export const GetCommonDetailsDocument = gql`
 export function useGetCommonDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
+
 export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
+
 export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
 export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
 export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
+export const GetProposalDetailsDocument = gql`
+  query getProposalDetails($where: ProposalWhereUniqueInput!) {
+    proposal(where: $where) {
+      id
+      join {
+        funding
+        fundingType
+        paymentState
+      }
+      funding {
+        amount
+        fundingState
+      }
+      type
+      createdAt
+      updatedAt
+      votesFor
+      votesAgainst
+      state
+      user {
+        id
+        firstName
+        lastName
+      }
+      common {
+        members {
+          userId
+        }
+      }
+      description
+      votes {
+        id
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetProposalDetailsQuery__
+ *
+ * To run a query within a React component, call `useGetProposalDetailsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetProposalDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetProposalDetailsQuery({
+ *   variables: {
+ *      where: // value for 'where'
+ *   },
+ * });
+ */
+export function useGetProposalDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
+  return Apollo.useQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
+}
+
+export function useGetProposalDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
+  return Apollo.useLazyQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
+}
+
+export type GetProposalDetailsQueryHookResult = ReturnType<typeof useGetProposalDetailsQuery>;
+export type GetProposalDetailsLazyQueryHookResult = ReturnType<typeof useGetProposalDetailsLazyQuery>;
+export type GetProposalDetailsQueryResult = Apollo.QueryResult<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>;
 export const WhitelistCommonDocument = gql`
   mutation whitelistCommon($commonId: String!) {
     whitelistCommon(commonId: $commonId)
@@ -1461,11 +1572,9 @@ export const GetAllTimeStatistiscDocument = gql`
 export function useGetAllTimeStatistiscQuery(baseOptions?: Apollo.QueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
   return Apollo.useQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
 }
-
 export function useGetAllTimeStatistiscLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>) {
   return Apollo.useLazyQuery<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>(GetAllTimeStatistiscDocument, baseOptions);
 }
-
 export type GetAllTimeStatistiscQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscQuery>;
 export type GetAllTimeStatistiscLazyQueryHookResult = ReturnType<typeof useGetAllTimeStatistiscLazyQuery>;
 export type GetAllTimeStatistiscQueryResult = Apollo.QueryResult<GetAllTimeStatistiscQuery, GetAllTimeStatistiscQueryVariables>;
@@ -1515,11 +1624,9 @@ export const GetProposalsHomescreenDocument = gql`
 export function useGetProposalsHomescreenQuery(baseOptions: Apollo.QueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
   return Apollo.useQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
 }
-
 export function useGetProposalsHomescreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
   return Apollo.useLazyQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
 }
-
 export type GetProposalsHomescreenQueryHookResult = ReturnType<typeof useGetProposalsHomescreenQuery>;
 export type GetProposalsHomescreenLazyQueryHookResult = ReturnType<typeof useGetProposalsHomescreenLazyQuery>;
 export type GetProposalsHomescreenQueryResult = Apollo.QueryResult<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 5f4f6f648..66818145d 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -303,10 +303,17 @@ type Proposal {
   """The IP from which the proposal was created"""
   ipAddress: String
   discussions(take: Int, skip: Int): [Discussion!]!
+  """The ID of the user who created the proposal"""
+  userId: ID!
+  """The ID of the membership of the user who created the proposal"""
+  commonMemberId: UUID!
+  user: User!
+  member: CommonMember!
   fundingId: UUID
   funding: FundingProposal
   commonId: UUID!
   common: Common!
+  votes: [Vote!]!
   joinId: UUID
   join: JoinProposal
 }
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 92b3198c4..a0b75a77a 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -3084,6 +3084,70 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "userId",
+            "description": "The ID of the user who created the proposal",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "commonMemberId",
+            "description": "The ID of the membership of the user who created the proposal",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "user",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "User",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "member",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "CommonMember",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "fundingId",
             "description": null,
@@ -3140,6 +3204,30 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "votes",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "Vote",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "joinId",
             "description": null,
diff --git a/packages/admin/src/pages/proposals/details/[proposalId].tsx b/packages/admin/src/pages/proposals/details/[proposalId].tsx
index 92462c03d..e80fdc9af 100644
--- a/packages/admin/src/pages/proposals/details/[proposalId].tsx
+++ b/packages/admin/src/pages/proposals/details/[proposalId].tsx
@@ -1,29 +1,33 @@
-import { gql } from '@apollo/client';
-import { Breadcrumbs, Card, Grid, Spacer, Table, Tag, Text, useTheme } from '@geist-ui/react';
-import { CheckInCircle, DollarSign, Trello as Vote, Type, User, XCircle } from '@geist-ui/react-icons';
+import React from 'react';
 import { NextPage } from 'next';
 import { useRouter } from 'next/router';
-import React from 'react';
-import { Link } from '../../../components/Link';
+
+import { gql } from '@apollo/client';
+import { Breadcrumbs, Card, Grid, Spacer, Table, Tag, Text, useTheme } from '@geist-ui/react';
+import { DollarSign, Trello as Vote, Type, User } from '@geist-ui/react-icons';
+
+import { Link } from '@components/Link';
+import { Centered } from '@components/Centered';
 import { useGetProposalDetailsQuery, GetProposalDetailsQueryResult } from '@core/graphql';
-import { Centered } from '../../../components/Centered';
 
 const GetProposalDetails = gql`
-  query getProposalDetails($proposalId: ID!) {
-    proposal(id: $proposalId) {
+  query getProposalDetails($where: ProposalWhereUniqueInput!) {
+    proposal(where: $where) {
       id
 
       join {
         funding
         fundingType
+        paymentState
       }
-      
-      fundingRequest {
+
+      funding {
         amount
+        fundingState
       }
-      
+
       type
-      
+
       createdAt
       updatedAt
 
@@ -31,11 +35,10 @@ const GetProposalDetails = gql`
       votesAgainst
 
       state
-      paymentState
-      
-      proposer {
+
+      user {
         id
-        
+
         firstName
         lastName
       }
@@ -45,20 +48,22 @@ const GetProposalDetails = gql`
           userId
         }
       }
-      
-      description {
-        description
-      }
 
-      votes {
-        outcome
-        voter {
-          id
+      description
 
-          firstName
-          lastName
-        }
+      votes {
+        id
       }
+
+      #      votes {
+      #        outcome
+      #        voter {
+      #          id
+      #
+      #          firstName
+      #          lastName
+      #        }
+      #      }
     }
   }
 `;
@@ -70,16 +75,18 @@ const ProposalDetailsPage: NextPage = () => {
 
   const data = useGetProposalDetailsQuery({
     variables: {
-      proposalId: router.query.proposalId as string
+      where: {
+        id: router.query.proposalId as string
+      }
     }
   });
 
   const transformProposalForDetailsTable = (data) => {
     const { proposal } = data.data;
-    const { proposer } = proposal;
+    const { user: proposer } = proposal;
 
     return [{
-      icon: <Centered content={<User />} />,
+      icon: <Centered content={<User/>}/>,
       item: 'Proposer',
       value: (
         <Link to={`/users/details/${proposer.id}`}>
@@ -87,11 +94,11 @@ const ProposalDetailsPage: NextPage = () => {
         </Link>
       )
     }, {
-      icon: <Centered content={<Type />} />,
+      icon: <Centered content={<Type/>}/>,
       item: 'Proposal Type',
       value: proposal.type
     }, ...(proposal.type === 'fundingRequest' ? [{
-      icon: <Centered content={<DollarSign />} />,
+      icon: <Centered content={<DollarSign/>}/>,
       item: 'Requested amount',
       value: (
         <React.Fragment>
@@ -99,14 +106,14 @@ const ProposalDetailsPage: NextPage = () => {
         </React.Fragment>
       )
     }] : []), ...(proposal.type === 'join' ? [{
-      icon: <Centered content={<DollarSign />} />,
+      icon: <Centered content={<DollarSign/>}/>,
       item: 'Proposed amount',
       value: (
         <React.Fragment>
           {proposal.join.funding.toLocaleString('en-US', { style: 'currency', currency: 'USD' })}
         </React.Fragment>
       )
-    }] : [])]
+    }] : [])];
   };
 
   const transformDataForVotesTable = (data: GetProposalDetailsQueryResult) => {
@@ -119,21 +126,24 @@ const ProposalDetailsPage: NextPage = () => {
         ),
 
         voter: (
-          <Link to={`/users/details/${vote.voter.id}`}>
-            {vote.voter.firstName} {vote.voter.lastName}
-          </Link>
+          // <Link to={`/users/details/${vote.voter.id}`}>
+          //   {vote.voter.firstName} {vote.voter.lastName}
+          // </Link>
+
+          <p>-</p>
         ),
 
         outcome: (
-          <div style={{ width: '100%', display: 'flex', justifyContent: 'center' }}>
-            {vote.outcome === 'rejected' && (
-              <XCircle color={theme.palette.error}/>
-            )}
-
-            {vote.outcome === 'approved' && (
-              <CheckInCircle color={theme.palette.success}/>
-            )}
-          </div>
+          // <div style={{ width: '100%', display: 'flex', justifyContent: 'center' }}>
+          //   {vote.outcome === 'rejected' && (
+          //     <XCircle color={theme.palette.error}/>
+          //   )}
+          //
+          //   {vote.outcome === 'approved' && (
+          //     <CheckInCircle color={theme.palette.success}/>
+          //   )}
+          // </div>
+          <p>-</p>
         )
       };
     });
@@ -147,12 +157,12 @@ const ProposalDetailsPage: NextPage = () => {
           <React.Fragment>
             <div style={{ display: 'flex', alignItems: 'center' }}>
               <Text h1>
-                {data.data.proposal.description.description}'s details
+                {data.data.proposal.description}'s details
               </Text>
 
               <Spacer x={1}/>
 
-              <Tag type={data.data.proposal.state === 'passed' ? 'success' : 'error'}>
+              <Tag type={data.data.proposal.state === 'Accepted' ? 'success' : 'error'}>
                 {data.data.proposal.state}
               </Tag>
             </div>
@@ -161,7 +171,7 @@ const ProposalDetailsPage: NextPage = () => {
               <Breadcrumbs.Item>
                 <Link to="/proposals">Proposals</Link>
               </Breadcrumbs.Item>
-              <Breadcrumbs.Item>{data.data.proposal.description.description}</Breadcrumbs.Item>
+              <Breadcrumbs.Item>{data.data.proposal.description}</Breadcrumbs.Item>
             </Breadcrumbs>
 
             <Spacer y={3}/>
@@ -186,7 +196,7 @@ const ProposalDetailsPage: NextPage = () => {
                   <Text h1>
                     {data.data.proposal.votesAgainst}
                   </Text>
-                  <Text p>Votes agains</Text>
+                  <Text p>Votes against</Text>
                 </Card>
               </Grid>
 
@@ -208,7 +218,7 @@ const ProposalDetailsPage: NextPage = () => {
             <Text h3>Proposal Details</Text>
 
             <Table data={transformProposalForDetailsTable(data)}>
-              <Table.Column prop="icon" width={70} label="" />
+              <Table.Column prop="icon" width={70} label=""/>
               <Table.Column prop="item" label="Property" width={200}/>
               <Table.Column prop="value" label="Value"/>
             </Table>
diff --git a/packages/admin/src/pages/proposals/index.tsx b/packages/admin/src/pages/proposals/index.tsx
index 93c765125..83e6e683f 100644
--- a/packages/admin/src/pages/proposals/index.tsx
+++ b/packages/admin/src/pages/proposals/index.tsx
@@ -187,7 +187,7 @@ const ProposalsHomepage: NextPage = () => {
             {statistics && statistics.getStatistics[0].fundingProposals > 10 && (
               <div style={{ display: 'flex', justifyContent: 'center', marginTop: 20 }}>
                 <Pagination count={Math.ceil(statistics.getStatistics[0].fundingProposals / 10)}
-                            onChange={onFundingPageChange}>
+                            onChange={onFundingPageChange} w>
                   <Pagination.Next>
                     <ChevronRightCircleFill/>
                   </Pagination.Next>
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 4d8e62c8f..77a26fd77 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -361,6 +361,7 @@ export interface NexusGenObjects {
   }
   Proposal: { // root type
     commonId: NexusGenScalars['UUID']; // UUID!
+    commonMemberId: NexusGenScalars['UUID']; // UUID!
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     description?: string | null; // String
     expiresAt: NexusGenScalars['DateTime']; // DateTime!
@@ -375,6 +376,7 @@ export interface NexusGenObjects {
     title?: string | null; // String
     type: NexusGenEnums['ProposalType']; // ProposalType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    userId: string; // ID!
     votesAgainst: number; // Int!
     votesFor: number; // Int!
   }
@@ -583,6 +585,7 @@ export interface NexusGenFieldTypes {
   Proposal: { // field return type
     common: NexusGenRootTypes['Common']; // Common!
     commonId: NexusGenScalars['UUID']; // UUID!
+    commonMemberId: NexusGenScalars['UUID']; // UUID!
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     description: string | null; // String
     discussions: NexusGenRootTypes['Discussion'][]; // [Discussion!]!
@@ -596,10 +599,14 @@ export interface NexusGenFieldTypes {
     join: NexusGenRootTypes['JoinProposal'] | null; // JoinProposal
     joinId: NexusGenScalars['UUID'] | null; // UUID
     links: NexusGenScalars['JSON'] | null; // JSON
+    member: NexusGenRootTypes['CommonMember']; // CommonMember!
     state: NexusGenEnums['ProposalState']; // ProposalState!
     title: string | null; // String
     type: NexusGenEnums['ProposalType']; // ProposalType!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    user: NexusGenRootTypes['User']; // User!
+    userId: string; // ID!
+    votes: NexusGenRootTypes['Vote'][]; // [Vote!]!
     votesAgainst: number; // Int!
     votesFor: number; // Int!
   }
@@ -826,6 +833,7 @@ export interface NexusGenFieldTypeNames {
   Proposal: { // field return type name
     common: 'Common'
     commonId: 'UUID'
+    commonMemberId: 'UUID'
     createdAt: 'DateTime'
     description: 'String'
     discussions: 'Discussion'
@@ -839,10 +847,14 @@ export interface NexusGenFieldTypeNames {
     join: 'JoinProposal'
     joinId: 'UUID'
     links: 'JSON'
+    member: 'CommonMember'
     state: 'ProposalState'
     title: 'String'
     type: 'ProposalType'
     updatedAt: 'DateTime'
+    user: 'User'
+    userId: 'ID'
+    votes: 'Vote'
     votesAgainst: 'Int'
     votesFor: 'Int'
   }
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 4d107ac9e..e13157563 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -553,6 +553,9 @@ type Proposal {
   common: Common!
   commonId: UUID!
 
+  """The ID of the membership of the user who created the proposal"""
+  commonMemberId: UUID!
+
   """The date, at which the item was created"""
   createdAt: DateTime!
   description: String
@@ -571,12 +574,18 @@ type Proposal {
   join: JoinProposal
   joinId: UUID
   links: JSON
+  member: CommonMember!
   state: ProposalState!
   title: String
   type: ProposalType!
 
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
+  user: User!
+
+  """The ID of the user who created the proposal"""
+  userId: ID!
+  votes: [Vote!]!
   votesAgainst: Int!
   votesFor: Int!
 }
diff --git a/packages/graphql/src/schema/Types/Proposals/Enums/ProposalProposer.extension.ts b/packages/graphql/src/schema/Types/Proposals/Enums/ProposalProposer.extension.ts
new file mode 100644
index 000000000..e9e10837c
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Enums/ProposalProposer.extension.ts
@@ -0,0 +1,41 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const ProposalProposerExtension = extendType({
+  type: 'Proposal',
+  definition(t) {
+    t.nonNull.id('userId', {
+      description: 'The ID of the user who created the proposal'
+    });
+
+    t.nonNull.uuid('commonMemberId', {
+      description: 'The ID of the membership of the user who created the proposal'
+    });
+
+    t.nonNull.field('user', {
+      type: 'User',
+      resolve: async (root) => {
+        return (await prisma.proposal
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .user())!;
+      }
+    });
+
+    t.nonNull.field('member', {
+      type: 'CommonMember',
+      resolve: async (root) => {
+        return (await prisma.proposal
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .commonMember())!;
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/Enums/ProposalVotes.extension.ts b/packages/graphql/src/schema/Types/Proposals/Enums/ProposalVotes.extension.ts
new file mode 100644
index 000000000..ede83c1c4
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Proposals/Enums/ProposalVotes.extension.ts
@@ -0,0 +1,20 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const ProposalVotesExtension = extendType({
+  type: 'Proposal',
+  definition(t) {
+    t.nonNull.list.nonNull.field('votes', {
+      type: 'Vote',
+      resolve: (root) => {
+        return prisma.proposal
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .votes();
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Proposals/index.ts b/packages/graphql/src/schema/Types/Proposals/index.ts
index 0e9fe4423..09f0d9bd1 100644
--- a/packages/graphql/src/schema/Types/Proposals/index.ts
+++ b/packages/graphql/src/schema/Types/Proposals/index.ts
@@ -27,6 +27,8 @@ import { ProposalJoinExtension } from './Extensions/ProposalJoin.extension';
 
 import { ProposalChangeSubscription } from './Subscriptions/ProposalChange.subscription';
 import { GetProposalsQuery } from './Queries/GetProposals.query';
+import { ProposalProposerExtension } from './Enums/ProposalProposer.extension';
+import { ProposalVotesExtension } from './Enums/ProposalVotes.extension';
 
 export const ProposalTypes = [
   ProposalType,
@@ -57,8 +59,10 @@ export const ProposalTypes = [
   ProposalWhereUniqueInput,
 
   ProposalDiscussionsExtension,
+  ProposalProposerExtension,
   ProposalFundingExtension,
   ProposalCommonExtension,
+  ProposalVotesExtension,
   ProposalJoinExtension,
 
   ProposalChangeSubscription

From 1af6145343b600215ca5f0d277e70e6f10e7ce55 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 5 May 2021 08:59:35 +0300
Subject: [PATCH 21/29] Proposal votes

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/src/core/graphql/index.ts      | 28 +++++++++--
 .../admin/src/core/graphql/schema.graphql     |  3 ++
 packages/admin/src/core/graphql/schema.json   | 48 ++++++++++++++++++
 .../pages/proposals/details/[proposalId].tsx  | 50 +++++++++----------
 .../graphql/src/generated/nexus-typegen.ts    |  7 +++
 packages/graphql/src/generated/schema.graphql |  3 ++
 .../Votes/Extensions/VoteVoter.extension.ts   | 27 ++++++++++
 .../src/schema/Types/Votes/Types/Vote.type.ts |  4 ++
 .../graphql/src/schema/Types/Votes/index.ts   |  5 +-
 9 files changed, 143 insertions(+), 32 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Votes/Extensions/VoteVoter.extension.ts

diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index 14c8a2398..96e9db436 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -155,6 +155,9 @@ export type Vote = {
   createdAt: Scalars['DateTime'];
   /** The date, at which the item was last modified */
   updatedAt: Scalars['DateTime'];
+  outcome: VoteOutcome;
+  voterId: Scalars['ID'];
+  voter: CommonMember;
 };
 
 export enum VoteOutcome {
@@ -1108,7 +1111,18 @@ export type GetProposalDetailsQuery = (
     }
       ), votes: Array<(
       { __typename?: 'Vote' }
-      & Pick<Vote, 'id'>
+      & Pick<Vote, 'id' | 'outcome'>
+      & {
+      voter: (
+        { __typename?: 'CommonMember' }
+        & {
+        user?: Maybe<(
+          { __typename?: 'User' }
+          & Pick<User, 'id' | 'firstName' | 'lastName'>
+          )>
+      }
+        )
+    }
       )>
   }
     )>
@@ -1324,11 +1338,9 @@ export const GetCommonDetailsDocument = gql`
 export function useGetCommonDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
-
 export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
-
 export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
 export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
 export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
@@ -1364,6 +1376,14 @@ export const GetProposalDetailsDocument = gql`
       description
       votes {
         id
+        outcome
+        voter {
+          user {
+            id
+            firstName
+            lastName
+          }
+        }
       }
     }
   }
@@ -1388,11 +1408,9 @@ export const GetProposalDetailsDocument = gql`
 export function useGetProposalDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
   return Apollo.useQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
 }
-
 export function useGetProposalDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
 }
-
 export type GetProposalDetailsQueryHookResult = ReturnType<typeof useGetProposalDetailsQuery>;
 export type GetProposalDetailsLazyQueryHookResult = ReturnType<typeof useGetProposalDetailsLazyQuery>;
 export type GetProposalDetailsQueryResult = Apollo.QueryResult<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>;
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 66818145d..d0010cd39 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -100,6 +100,9 @@ type Vote {
   createdAt: DateTime!
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
+  outcome: VoteOutcome!
+  voterId: ID!
+  voter: CommonMember!
 }
 enum VoteOutcome {
   Approve
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index a0b75a77a..e865cf284 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -1154,6 +1154,54 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "outcome",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "VoteOutcome",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "voterId",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "voter",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "CommonMember",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
diff --git a/packages/admin/src/pages/proposals/details/[proposalId].tsx b/packages/admin/src/pages/proposals/details/[proposalId].tsx
index e80fdc9af..385faaabc 100644
--- a/packages/admin/src/pages/proposals/details/[proposalId].tsx
+++ b/packages/admin/src/pages/proposals/details/[proposalId].tsx
@@ -4,7 +4,7 @@ import { useRouter } from 'next/router';
 
 import { gql } from '@apollo/client';
 import { Breadcrumbs, Card, Grid, Spacer, Table, Tag, Text, useTheme } from '@geist-ui/react';
-import { DollarSign, Trello as Vote, Type, User } from '@geist-ui/react-icons';
+import { DollarSign, Trello as Vote, Type, User, CheckInCircle, XCircle } from '@geist-ui/react-icons';
 
 import { Link } from '@components/Link';
 import { Centered } from '@components/Centered';
@@ -53,17 +53,18 @@ const GetProposalDetails = gql`
 
       votes {
         id
-      }
 
-      #      votes {
-      #        outcome
-      #        voter {
-      #          id
-      #
-      #          firstName
-      #          lastName
-      #        }
-      #      }
+        outcome
+
+        voter {
+          user {
+            id
+
+            firstName
+            lastName
+          }
+        }
+      }
     }
   }
 `;
@@ -126,24 +127,21 @@ const ProposalDetailsPage: NextPage = () => {
         ),
 
         voter: (
-          // <Link to={`/users/details/${vote.voter.id}`}>
-          //   {vote.voter.firstName} {vote.voter.lastName}
-          // </Link>
-
-          <p>-</p>
+          <Link to={`/users/details/${vote.voter.user.id}`}>
+            {vote.voter.user.firstName} {vote.voter.user.lastName}
+          </Link>
         ),
 
         outcome: (
-          // <div style={{ width: '100%', display: 'flex', justifyContent: 'center' }}>
-          //   {vote.outcome === 'rejected' && (
-          //     <XCircle color={theme.palette.error}/>
-          //   )}
-          //
-          //   {vote.outcome === 'approved' && (
-          //     <CheckInCircle color={theme.palette.success}/>
-          //   )}
-          // </div>
-          <p>-</p>
+          <div style={{ width: '100%', display: 'flex', justifyContent: 'center' }}>
+            {vote.outcome === 'Condemn' && (
+              <XCircle color={theme.palette.error}/>
+            )}
+
+            {vote.outcome === 'Approve' && (
+              <CheckInCircle color={theme.palette.success}/>
+            )}
+          </div>
         )
       };
     });
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 77a26fd77..49fe85ef5 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -433,6 +433,7 @@ export interface NexusGenObjects {
   Vote: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     id: string; // ID!
+    outcome: NexusGenEnums['VoteOutcome']; // VoteOutcome!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
 }
@@ -687,7 +688,10 @@ export interface NexusGenFieldTypes {
   Vote: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     id: string; // ID!
+    outcome: NexusGenEnums['VoteOutcome']; // VoteOutcome!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    voter: NexusGenRootTypes['CommonMember']; // CommonMember!
+    voterId: string; // ID!
   }
   BaseEntity: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
@@ -935,7 +939,10 @@ export interface NexusGenFieldTypeNames {
   Vote: { // field return type name
     createdAt: 'DateTime'
     id: 'ID'
+    outcome: 'VoteOutcome'
     updatedAt: 'DateTime'
+    voter: 'CommonMember'
+    voterId: 'ID'
   }
   BaseEntity: { // field return type name
     createdAt: 'DateTime'
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index e13157563..f03cc6bcf 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -858,9 +858,12 @@ type Vote {
 
   """The main identifier of the item"""
   id: ID!
+  outcome: VoteOutcome!
 
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
+  voter: CommonMember!
+  voterId: ID!
 }
 
 enum VoteOutcome {
diff --git a/packages/graphql/src/schema/Types/Votes/Extensions/VoteVoter.extension.ts b/packages/graphql/src/schema/Types/Votes/Extensions/VoteVoter.extension.ts
new file mode 100644
index 000000000..4b712b9f4
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Votes/Extensions/VoteVoter.extension.ts
@@ -0,0 +1,27 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+import { Vote } from '@prisma/client';
+
+export const VoteVoterExtension = extendType({
+  type: 'Vote',
+  definition(t) {
+    t.nonNull.id('voterId', {
+      resolve: (root) => {
+        return (root as Vote).commonMemberId;
+      }
+    });
+
+    t.nonNull.field('voter', {
+      type: 'CommonMember',
+      resolve: async (root) => {
+        return (await prisma.vote
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .commonMember())!;
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Votes/Types/Vote.type.ts b/packages/graphql/src/schema/Types/Votes/Types/Vote.type.ts
index 02855cd48..b541d7686 100644
--- a/packages/graphql/src/schema/Types/Votes/Types/Vote.type.ts
+++ b/packages/graphql/src/schema/Types/Votes/Types/Vote.type.ts
@@ -14,5 +14,9 @@ export const VoteType = objectType({
     t.nonNull.date('updatedAt', {
       description: 'The date, at which the item was last modified'
     });
+
+    t.nonNull.field('outcome', {
+      type: 'VoteOutcome'
+    });
   }
 });
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Votes/index.ts b/packages/graphql/src/schema/Types/Votes/index.ts
index 17d644912..2e8e0b3ac 100644
--- a/packages/graphql/src/schema/Types/Votes/index.ts
+++ b/packages/graphql/src/schema/Types/Votes/index.ts
@@ -3,6 +3,7 @@ import { VoteType } from './Types/Vote.type';
 import { VoteOutcomeEnum } from './Enums/VoteOutcome.enum';
 
 import { CreateVoteInput, CreateVoteMutation } from './Mutations/CreateVote.mutation';
+import { VoteVoterExtension } from './Extensions/VoteVoter.extension';
 
 export const VoteTypes = [
   VoteType,
@@ -10,5 +11,7 @@ export const VoteTypes = [
   VoteOutcomeEnum,
 
   CreateVoteInput,
-  CreateVoteMutation
+  CreateVoteMutation,
+
+  VoteVoterExtension
 ];
\ No newline at end of file

From 1183594a3d23cc5c89cd14b5e9c48bfdcb3063db Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 5 May 2021 09:51:15 +0300
Subject: [PATCH 22/29] Fix user details page

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 packages/admin/src/core/graphql/index.ts      | 140 +++++++-
 .../admin/src/core/graphql/schema.graphql     |  34 +-
 packages/admin/src/core/graphql/schema.json   | 315 +++++++++++++++++-
 .../src/pages/users/details/[userId].tsx      |  83 ++---
 .../models/subscriptions/Subscription.prisma  |   1 -
 .../graphql/src/generated/nexus-typegen.ts    |  58 +++-
 packages/graphql/src/generated/schema.graphql |  41 ++-
 .../Enums/FundingTypeEnum.ts                  |   0
 .../CommonActiveProposals.extension.ts        |   0
 .../CommonCommonMember.extension.ts           |   0
 .../Extensions/CommonDiscussions.extension.ts |   0
 .../Extensions/CommonEvents.extension.ts      |   0
 .../Extensions/CommonProposals.extension.ts   |   0
 .../Extensions/CommonReports.extension.ts     |   0
 .../Inputs/CommonWhereUnique.input.ts         |   0
 .../Mutations/CreateCommon.mutation.ts        |   0
 .../Mutations/DelistCommon.mutation.ts        |   0
 .../Mutations/WhitelistCommon.mutation.ts     |   0
 .../Queries/GetCommon.query.ts                |   0
 .../Queries/GetCommons.query.ts               |   0
 .../{Commons => Common}/Types/Common.type.ts  |   0
 .../schema/Types/{Commons => Common}/index.ts |   0
 .../Enums/SubscriptionPaymentStatus.enum.ts   |   7 +
 .../Enums/SubscriptionStatus.enum.ts          |   7 +
 .../SubscriptionCommon.extension.ts           |  20 ++
 .../Types/CommonSubscription.type.ts          |  23 ++
 .../schema/Types/CommonSubscriptions/index.ts |  13 +
 .../Extensions/UserSubscriptions.extension.ts |  20 ++
 .../Users/Inputs/UserWhereUnique.input.ts     |   8 +
 .../Types/Users/Queries/GetUser.query.ts      |   8 +-
 .../graphql/src/schema/Types/Users/index.ts   |   5 +
 packages/graphql/src/schema/index.ts          |   6 +-
 33 files changed, 731 insertions(+), 59 deletions(-)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Enums/FundingTypeEnum.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Extensions/CommonActiveProposals.extension.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Extensions/CommonCommonMember.extension.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Extensions/CommonDiscussions.extension.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Extensions/CommonEvents.extension.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Extensions/CommonProposals.extension.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Extensions/CommonReports.extension.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Inputs/CommonWhereUnique.input.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Mutations/CreateCommon.mutation.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Mutations/DelistCommon.mutation.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Mutations/WhitelistCommon.mutation.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Queries/GetCommon.query.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Queries/GetCommons.query.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/Types/Common.type.ts (100%)
 rename packages/graphql/src/schema/Types/{Commons => Common}/index.ts (100%)
 create mode 100644 packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionPaymentStatus.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionStatus.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/CommonSubscriptions/Extensions/SubscriptionCommon.extension.ts
 create mode 100644 packages/graphql/src/schema/Types/CommonSubscriptions/Types/CommonSubscription.type.ts
 create mode 100644 packages/graphql/src/schema/Types/CommonSubscriptions/index.ts
 create mode 100644 packages/graphql/src/schema/Types/Users/Extensions/UserSubscriptions.extension.ts
 create mode 100644 packages/graphql/src/schema/Types/Users/Inputs/UserWhereUnique.input.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 870a499fb..ae569c1d7 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -9,6 +9,7 @@ documents:
   - "src/pages/proposals/index.tsx"
   - "src/pages/commons/details/[commonId].tsx"
   - "src/pages/proposals/details/[proposalId].tsx"
+  - "src/pages/users/details/[userId].tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index 96e9db436..2e16e3e73 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -46,6 +46,7 @@ export type User = {
   /** List of events, that occurred and are related to this user */
   events: Array<Event>;
   proposals: Array<Proposal>;
+  subscriptions: Array<CommonSubscription>;
   notifications: Array<Notification>;
   notificationTokens: Array<UserNotificationToken>;
   discussionSubscriptions: Array<DiscussionSubscription>;
@@ -95,6 +96,10 @@ export type UserNotificationToken = BaseEntity & {
   lastVerified: Scalars['DateTime'];
 };
 
+export type UserWhereUniqueInput = {
+  userId: Scalars['ID'];
+};
+
 export type CreateUserInput = {
   firstName: Scalars['String'];
   lastName: Scalars['String'];
@@ -756,6 +761,38 @@ export type NotificationOrderByInput = {
   status?: Maybe<SortOrder>;
 };
 
+export type CommonSubscription = BaseEntity & {
+  __typename?: 'CommonSubscription';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  paymentStatus: SubscriptionPaymentStatus;
+  status: SubscriptionStatus;
+  dueDate: Scalars['DateTime'];
+  chargedAt: Scalars['DateTime'];
+  voided: Scalars['Boolean'];
+  amount: Scalars['Int'];
+  common: Common;
+};
+
+export enum SubscriptionPaymentStatus {
+  AwaitingInitialPayment = 'AwaitingInitialPayment',
+  Pending = 'Pending',
+  Successful = 'Successful',
+  Unsuccessful = 'Unsuccessful'
+}
+
+export enum SubscriptionStatus {
+  Pending = 'Pending',
+  Active = 'Active',
+  PaymentFailed = 'PaymentFailed',
+  CanceledByUser = 'CanceledByUser',
+  CanceledByPaymentFailure = 'CanceledByPaymentFailure'
+}
+
 
 export enum SortOrder {
   Asc = 'asc',
@@ -838,7 +875,7 @@ export type Query = {
 
 
 export type QueryUserArgs = {
-  userId?: Maybe<Scalars['ID']>;
+  where?: Maybe<UserWhereUniqueInput>;
 };
 
 
@@ -1129,6 +1166,42 @@ export type GetProposalDetailsQuery = (
 }
   );
 
+export type GetUserDetailsQueryQueryVariables = Exact<{
+  where: UserWhereUniqueInput;
+}>;
+
+
+export type GetUserDetailsQueryQuery = (
+  { __typename?: 'Query' }
+  & {
+  user?: Maybe<(
+    { __typename?: 'User' }
+    & Pick<User, 'id' | 'firstName' | 'lastName' | 'email' | 'createdAt' | 'photo'>
+    & {
+    proposals: Array<(
+      { __typename?: 'Proposal' }
+      & Pick<Proposal, 'id' | 'type' | 'state' | 'title'>
+      & {
+      join?: Maybe<(
+        { __typename?: 'JoinProposal' }
+        & Pick<JoinProposal, 'paymentState'>
+        )>
+    }
+      )>, subscriptions: Array<(
+      { __typename?: 'CommonSubscription' }
+      & Pick<CommonSubscription, 'id' | 'amount' | 'status' | 'voided' | 'createdAt' | 'updatedAt' | 'chargedAt' | 'dueDate'>
+      & {
+      common: (
+        { __typename?: 'Common' }
+        & Pick<Common, 'id' | 'name'>
+        )
+    }
+      )>
+  }
+    )>
+}
+  );
+
 export type WhitelistCommonMutationVariables = Exact<{
   commonId: Scalars['String'];
 }>;
@@ -1408,12 +1481,77 @@ export const GetProposalDetailsDocument = gql`
 export function useGetProposalDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
   return Apollo.useQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
 }
+
 export function useGetProposalDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
 }
+
 export type GetProposalDetailsQueryHookResult = ReturnType<typeof useGetProposalDetailsQuery>;
 export type GetProposalDetailsLazyQueryHookResult = ReturnType<typeof useGetProposalDetailsLazyQuery>;
 export type GetProposalDetailsQueryResult = Apollo.QueryResult<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>;
+export const GetUserDetailsQueryDocument = gql`
+  query getUserDetailsQuery($where: UserWhereUniqueInput!) {
+    user(where: $where) {
+      id
+      firstName
+      lastName
+      email
+      createdAt
+      photo
+      proposals {
+        id
+        type
+        state
+        join {
+          paymentState
+        }
+        title
+      }
+      subscriptions {
+        id
+        amount
+        common {
+          id
+          name
+        }
+        status
+        voided
+        createdAt
+        updatedAt
+        chargedAt
+        dueDate
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetUserDetailsQueryQuery__
+ *
+ * To run a query within a React component, call `useGetUserDetailsQueryQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUserDetailsQueryQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetUserDetailsQueryQuery({
+ *   variables: {
+ *      where: // value for 'where'
+ *   },
+ * });
+ */
+export function useGetUserDetailsQueryQuery(baseOptions: Apollo.QueryHookOptions<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>) {
+  return Apollo.useQuery<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>(GetUserDetailsQueryDocument, baseOptions);
+}
+
+export function useGetUserDetailsQueryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>) {
+  return Apollo.useLazyQuery<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>(GetUserDetailsQueryDocument, baseOptions);
+}
+
+export type GetUserDetailsQueryQueryHookResult = ReturnType<typeof useGetUserDetailsQueryQuery>;
+export type GetUserDetailsQueryLazyQueryHookResult = ReturnType<typeof useGetUserDetailsQueryLazyQuery>;
+export type GetUserDetailsQueryQueryResult = Apollo.QueryResult<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>;
 export const WhitelistCommonDocument = gql`
   mutation whitelistCommon($commonId: String!) {
     whitelistCommon(commonId: $commonId)
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index d0010cd39..682da00d0 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -32,6 +32,7 @@ type User {
   """List of events, that occurred and are related to this user"""
   events(take: Int = 10, skip: Int = 0, orderBy: EventOrderByInput): [Event!]!
   proposals(take: Int = 10, skip: Int = 0, where: ProposalWhereInput): [Proposal!]!
+  subscriptions: [CommonSubscription!]!
   notifications(orderBy: NotificationOrderByInput = {createdAt: desc}, cursor: NotificationWhereUniqueInput, take: Int = 10, skip: Int): [Notification!]!
   notificationTokens: [UserNotificationToken!]!
   discussionSubscriptions(take: Int = 10, skip: Int = 0, orderBy: DiscussionSubscriptionOrderByInput): [DiscussionSubscription!]!
@@ -49,6 +50,9 @@ type UserNotificationToken implements BaseEntity {
   lastUsed: DateTime!
   lastVerified: DateTime!
 }
+input UserWhereUniqueInput {
+  userId: ID!
+}
 input CreateUserInput {
   firstName: String!
   lastName: String!
@@ -582,6 +586,34 @@ input NotificationOrderByInput {
   updatedAt: SortOrder
   status: SortOrder
 }
+type CommonSubscription implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  paymentStatus: SubscriptionPaymentStatus!
+  status: SubscriptionStatus!
+  dueDate: DateTime!
+  chargedAt: DateTime!
+  voided: Boolean!
+  amount: Int!
+  common: Common!
+}
+enum SubscriptionPaymentStatus {
+  AwaitingInitialPayment
+  Pending
+  Successful
+  Unsuccessful
+}
+enum SubscriptionStatus {
+  Pending
+  Active
+  PaymentFailed
+  CanceledByUser
+  CanceledByPaymentFailure
+}
 scalar Void
 enum SortOrder {
   asc
@@ -640,7 +672,7 @@ input CreateRoleInput {
 }
 type Query {
   """Provide ID to fetch specific user or do not pass anything to get the currently authenticated user"""
-  user(userId: ID): User
+  user(where: UserWhereUniqueInput): User
   generateUserAuthToken(authId: String!): String!
   roles(paginate: PaginateInput): [Role]
   events(paginate: PaginateInput): [Event]
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index e865cf284..6e8a9a277 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -329,6 +329,30 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "subscriptions",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "LIST",
+                "name": null,
+                "ofType": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "OBJECT",
+                    "name": "CommonSubscription",
+                    "ofType": null
+                  }
+                }
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "notifications",
             "description": null,
@@ -668,6 +692,33 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "UserWhereUniqueInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "userId",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "ID",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "CreateUserInput",
@@ -5712,6 +5763,259 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "CommonSubscription",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "paymentStatus",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "SubscriptionPaymentStatus",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "status",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "SubscriptionStatus",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "dueDate",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "chargedAt",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "voided",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "amount",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Int",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "common",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Common",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "SubscriptionPaymentStatus",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "AwaitingInitialPayment",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Pending",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Successful",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Unsuccessful",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "SubscriptionStatus",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "Pending",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "Active",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "PaymentFailed",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CanceledByUser",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "CanceledByPaymentFailure",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "SCALAR",
         "name": "Void",
@@ -5900,6 +6204,11 @@
             "kind": "OBJECT",
             "name": "Notification",
             "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "CommonSubscription",
+            "ofType": null
           }
         ]
       },
@@ -6340,11 +6649,11 @@
             "description": "Provide ID to fetch specific user or do not pass anything to get the currently authenticated user",
             "args": [
               {
-                "name": "userId",
+                "name": "where",
                 "description": null,
                 "type": {
-                  "kind": "SCALAR",
-                  "name": "ID",
+                  "kind": "INPUT_OBJECT",
+                  "name": "UserWhereUniqueInput",
                   "ofType": null
                 },
                 "defaultValue": null,
diff --git a/packages/admin/src/pages/users/details/[userId].tsx b/packages/admin/src/pages/users/details/[userId].tsx
index a380b0df5..07e74e980 100644
--- a/packages/admin/src/pages/users/details/[userId].tsx
+++ b/packages/admin/src/pages/users/details/[userId].tsx
@@ -1,16 +1,18 @@
-import { gql } from '@apollo/client';
+import React from 'react';
 import { NextPage } from 'next';
 import { useRouter } from 'next/router';
-import { useGetUserDetailsQueryQuery, GetUserDetailsQueryQueryResult } from '@core/graphql';
-import React from 'react';
-import { Link } from '../../../components/Link';
+import DefaultErrorPage from 'next/error';
+
+import { gql } from '@apollo/client';
 import { Breadcrumbs, Text, Image, Grid, Card, Spacer, Table, Tag, Tooltip } from '@geist-ui/react';
 import { XCircle as Cancel, Function, Clock, CheckCircle, ExternalLink } from '@geist-ui/react-icons';
 
+import { useGetUserDetailsQueryQuery, GetUserDetailsQueryQueryResult } from '@core/graphql';
+import { Link } from '@components/Link';
 
 const UserDetailsDataQuery = gql`
-  query getUserDetailsQuery($userId: ID!) {
-    user(id: $userId) {
+  query getUserDetailsQuery($where: UserWhereUniqueInput!) {
+    user(where: $where) {
       id
 
       firstName
@@ -20,20 +22,20 @@ const UserDetailsDataQuery = gql`
 
       createdAt
 
-      photoURL
+      photo
 
       proposals {
         id
 
         type
-        
-        state
-        paymentState
 
-        description {
-          title
+        state
 
+        join {
+          paymentState
         }
+
+        title
       }
 
       subscriptions {
@@ -41,20 +43,18 @@ const UserDetailsDataQuery = gql`
 
         amount
 
-        metadata {
-          common {
-            id
-            name
-          }
+        common {
+          id
+          name
         }
 
         status
-        revoked
+        voided
 
         createdAt
         updatedAt
 
-        lastChargedAt
+        chargedAt
         dueDate
       }
     }
@@ -65,7 +65,9 @@ const UserDetailsPage: NextPage = () => {
   const router = useRouter();
   const data = useGetUserDetailsQueryQuery({
     variables: {
-      userId: router.query.userId as string
+      where: {
+        userId: router.query.userId as string
+      }
     }
   });
 
@@ -74,8 +76,8 @@ const UserDetailsPage: NextPage = () => {
     return data.data
       ? data.data.user.subscriptions
         .filter((subscription) =>
-          subscription.status === 'active' ||
-          subscription.status === 'paymentFailed').length
+          subscription.status === 'Active' ||
+          subscription.status === 'PaymentFailed').length
       : 'Loading';
   };
 
@@ -83,7 +85,7 @@ const UserDetailsPage: NextPage = () => {
     return data.data
       ? data.data.user.subscriptions
         .filter((subscription) =>
-          subscription.status === 'paymentFailed').length
+          subscription.status === 'PaymentFailed').length
       : 'Loading';
   };
 
@@ -91,7 +93,7 @@ const UserDetailsPage: NextPage = () => {
     const subscriptions = data.data.user.subscriptions;
 
     return subscriptions.map((subscription) => {
-      const { common } = subscription.metadata;
+      const { common } = subscription;
 
       return {
         status: (
@@ -107,7 +109,7 @@ const UserDetailsPage: NextPage = () => {
 
         actions: (
           <div style={{ width: '100%', display: 'flex', justifyContent: 'space-around' }}>
-            {(subscription.status === 'active' || subscription.status === 'paymentFailed') && (
+            {(subscription.status === 'Active' || subscription.status === 'PaymentFailed') && (
               <Tooltip text="Cancel user's subscription">
                 <Cancel/>
               </Tooltip>
@@ -141,7 +143,7 @@ const UserDetailsPage: NextPage = () => {
           </div>
         ),
 
-        type: proposal.type === 'fundingRequest' ? (
+        type: proposal.type === 'FundingRequest' ? (
           <Tag type="success">Funding Request</Tag>
         ) : (
           <Tag type="warning">Join Request</Tag>
@@ -151,29 +153,29 @@ const UserDetailsPage: NextPage = () => {
 
         paymentStatus: (
           <div style={{ width: '100%', display: 'flex', justifyContent: 'center' }}>
-            {(proposal.paymentState === 'notAttempted' || proposal.paymentState === 'notRelevant') && (
+            {(proposal.join?.paymentState === 'NotAttempted' || proposal.type === 'FundingRequest') && (
               <Tooltip text="The payment is either not relevant for this proposal or was not attempted">
                 <div style={{ cursor: 'default' }}>
-                  {"-"}
+                  {'-'}
                 </div>
               </Tooltip>
             )}
 
-            {proposal.paymentState === 'pending' && (
+            {proposal.join?.paymentState === 'Pending' && (
               <Tooltip text="The payment on this proposal is still pending">
-                <Clock />
+                <Clock/>
               </Tooltip>
             )}
 
-            {proposal.paymentState === 'failed' && (
+            {proposal.join?.paymentState === 'Unsuccessful' && (
               <Tooltip text="The payment on this proposal is failed">
-                <Cancel />
+                <Cancel/>
               </Tooltip>
             )}
 
-            {proposal.paymentState === 'confirmed' && (
+            {proposal.join?.paymentState === 'Successful' && (
               <Tooltip text="The payment on this proposal was successful">
-                <CheckCircle />
+                <CheckCircle/>
               </Tooltip>
             )}
           </div>
@@ -192,7 +194,10 @@ const UserDetailsPage: NextPage = () => {
 
   return (
     <React.Fragment>
-      {data.data && (
+      {(data.data && data.data.user === null) && (
+        <DefaultErrorPage statusCode={404} title="The requested user was not found"/>
+      )}
+      {(data.data && data.data.user !== null) && (
         <React.Fragment>
           <React.Fragment>
             <div style={{ width: '100%', display: 'flex', alignItems: 'center', justifyContent: 'space-between' }}>
@@ -202,7 +207,7 @@ const UserDetailsPage: NextPage = () => {
 
               <div>
                 <Image
-                  src={data.data.user.photoURL}
+                  src={data.data.user.photo}
                   width={100}
                   height={100}
                   style={{
@@ -339,10 +344,10 @@ const UserDetailsPage: NextPage = () => {
 
             <Table data={transformProposalsForTable(data)}>
               <Table.Column prop="icon" label="" width={70}/>
-              <Table.Column prop="type" label="Type" />
+              <Table.Column prop="type" label="Type"/>
 
-              <Table.Column prop="status" label="Status" />
-              <Table.Column prop="paymentStatus" label="Payment Status" width={130} />
+              <Table.Column prop="status" label="Status"/>
+              <Table.Column prop="paymentStatus" label="Payment Status" width={130}/>
 
               <Table.Column prop="actions">
                 <div style={{ width: '100%', display: 'flex', justifyContent: 'center' }}>
diff --git a/packages/core/prisma/models/subscriptions/Subscription.prisma b/packages/core/prisma/models/subscriptions/Subscription.prisma
index 65b95b14e..fc25f5021 100644
--- a/packages/core/prisma/models/subscriptions/Subscription.prisma
+++ b/packages/core/prisma/models/subscriptions/Subscription.prisma
@@ -7,7 +7,6 @@ model Subscription {
   card Card          @relation(fields: [cardId], references: [id])
   join JoinProposal?
 
-
   user   User   @relation(fields: [userId], references: [id])
   common Common @relation(fields: [commonId], references: [id])
 
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 49fe85ef5..349c54560 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,11 +4,10 @@
  */
 
 
-import { IRequestContext } from './../context';
-import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
-import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
-import { core } from 'nexus';
-
+import { IRequestContext } from "./../context"
+import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
+import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
+import { core } from "nexus"
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -225,6 +224,9 @@ export interface NexusGenInputs {
     notIn?: string[] | null; // [String!]
     startsWith?: string | null; // String
   }
+  UserWhereUniqueInput: { // input type
+    userId: string; // ID!
+  }
 }
 
 export interface NexusGenEnums {
@@ -247,6 +249,8 @@ export interface NexusGenEnums {
   ReportStatus: "Active" | "Clossed"
   SortOrder: "asc" | "desc"
   StatisticType: "AllTime" | "Daily" | "Hourly" | "Weekly"
+  SubscriptionPaymentStatus: "AwaitingInitialPayment" | "Pending" | "Successful" | "Unsuccessful"
+  SubscriptionStatus: "Active" | "CanceledByPaymentFailure" | "CanceledByUser" | "PaymentFailed" | "Pending"
   UserNotificationTokenState: "Active" | "Expired" | "Voided"
   VoteOutcome: "Approve" | "Condemn"
 }
@@ -293,6 +297,17 @@ export interface NexusGenObjects {
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
     userId: string; // ID!
   }
+  CommonSubscription: { // root type
+    amount: number; // Int!
+    chargedAt: NexusGenScalars['DateTime']; // DateTime!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    dueDate: NexusGenScalars['DateTime']; // DateTime!
+    id: NexusGenScalars['UUID']; // UUID!
+    paymentStatus: NexusGenEnums['SubscriptionPaymentStatus']; // SubscriptionPaymentStatus!
+    status: NexusGenEnums['SubscriptionStatus']; // SubscriptionStatus!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    voided: boolean; // Boolean!
+  }
   Discussion: { // root type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     description: string; // String!
@@ -439,7 +454,7 @@ export interface NexusGenObjects {
 }
 
 export interface NexusGenInterfaces {
-  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
+  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['CommonSubscription'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
 }
 
 export interface NexusGenUnions {
@@ -489,6 +504,18 @@ export interface NexusGenFieldTypes {
     user: NexusGenRootTypes['User'] | null; // User
     userId: string; // ID!
   }
+  CommonSubscription: { // field return type
+    amount: number; // Int!
+    chargedAt: NexusGenScalars['DateTime']; // DateTime!
+    common: NexusGenRootTypes['Common']; // Common!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    dueDate: NexusGenScalars['DateTime']; // DateTime!
+    id: NexusGenScalars['UUID']; // UUID!
+    paymentStatus: NexusGenEnums['SubscriptionPaymentStatus']; // SubscriptionPaymentStatus!
+    status: NexusGenEnums['SubscriptionStatus']; // SubscriptionStatus!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+    voided: boolean; // Boolean!
+  }
   Discussion: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
     description: string; // String!
@@ -673,6 +700,7 @@ export interface NexusGenFieldTypes {
     permissions: string[]; // [String!]!
     photo: string; // String!
     proposals: NexusGenRootTypes['Proposal'][]; // [Proposal!]!
+    subscriptions: NexusGenRootTypes['CommonSubscription'][]; // [CommonSubscription!]!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
   UserNotificationToken: { // field return type
@@ -740,6 +768,18 @@ export interface NexusGenFieldTypeNames {
     user: 'User'
     userId: 'ID'
   }
+  CommonSubscription: { // field return type name
+    amount: 'Int'
+    chargedAt: 'DateTime'
+    common: 'Common'
+    createdAt: 'DateTime'
+    dueDate: 'DateTime'
+    id: 'UUID'
+    paymentStatus: 'SubscriptionPaymentStatus'
+    status: 'SubscriptionStatus'
+    updatedAt: 'DateTime'
+    voided: 'Boolean'
+  }
   Discussion: { // field return type name
     createdAt: 'DateTime'
     description: 'String'
@@ -924,6 +964,7 @@ export interface NexusGenFieldTypeNames {
     permissions: 'String'
     photo: 'String'
     proposals: 'Proposal'
+    subscriptions: 'CommonSubscription'
     updatedAt: 'DateTime'
   }
   UserNotificationToken: { // field return type name
@@ -1087,7 +1128,7 @@ export interface NexusGenArgTypes {
       paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
     }
     user: { // args
-      userId?: string | null; // ID
+      where?: NexusGenInputs['UserWhereUniqueInput'] | null; // UserWhereUniqueInput
     }
   }
   Subscription: {
@@ -1124,11 +1165,12 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: "CommonMember" | "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "FundingProposal" | "JoinProposal" | "Notification" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
+  BaseEntity: "CommonMember" | "CommonSubscription" | "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "FundingProposal" | "JoinProposal" | "Notification" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
 }
 
 export interface NexusGenTypeInterfaces {
   CommonMember: "BaseEntity"
+  CommonSubscription: "BaseEntity"
   Discussion: "BaseEntity"
   DiscussionMessage: "BaseEntity"
   DiscussionSubscription: "BaseEntity"
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index f03cc6bcf..01d36847f 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -108,6 +108,25 @@ enum CommonMemberRole {
   Moderator
 }
 
+type CommonSubscription implements BaseEntity {
+  amount: Int!
+  chargedAt: DateTime!
+  common: Common!
+
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  dueDate: DateTime!
+
+  """The main identifier of the item"""
+  id: UUID!
+  paymentStatus: SubscriptionPaymentStatus!
+  status: SubscriptionStatus!
+
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  voided: Boolean!
+}
+
 input CommonWhereUniqueInput {
   id: ID!
 }
@@ -641,7 +660,7 @@ type Query {
   """
   Provide ID to fetch specific user or do not pass anything to get the currently authenticated user
   """
-  user(userId: ID): User
+  user(where: UserWhereUniqueInput): User
 }
 
 type Report implements BaseEntity {
@@ -784,6 +803,21 @@ type Subscription {
   ): Proposal
 }
 
+enum SubscriptionPaymentStatus {
+  AwaitingInitialPayment
+  Pending
+  Successful
+  Unsuccessful
+}
+
+enum SubscriptionStatus {
+  Active
+  CanceledByPaymentFailure
+  CanceledByUser
+  PaymentFailed
+  Pending
+}
+
 """
 A field whose value conforms to the standard URL format as specified in RFC3986: https://www.ietf.org/rfc/rfc3986.txt.
 """
@@ -823,6 +857,7 @@ type User {
   permissions: [String!]!
   photo: String!
   proposals(skip: Int = 0, take: Int = 10, where: ProposalWhereInput): [Proposal!]!
+  subscriptions: [CommonSubscription!]!
 
   """The date, at which the item was last modified"""
   updatedAt: DateTime!
@@ -850,6 +885,10 @@ enum UserNotificationTokenState {
   Voided
 }
 
+input UserWhereUniqueInput {
+  userId: ID!
+}
+
 scalar Void
 
 type Vote {
diff --git a/packages/graphql/src/schema/Types/Commons/Enums/FundingTypeEnum.ts b/packages/graphql/src/schema/Types/Common/Enums/FundingTypeEnum.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Enums/FundingTypeEnum.ts
rename to packages/graphql/src/schema/Types/Common/Enums/FundingTypeEnum.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonActiveProposals.extension.ts b/packages/graphql/src/schema/Types/Common/Extensions/CommonActiveProposals.extension.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Extensions/CommonActiveProposals.extension.ts
rename to packages/graphql/src/schema/Types/Common/Extensions/CommonActiveProposals.extension.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonCommonMember.extension.ts b/packages/graphql/src/schema/Types/Common/Extensions/CommonCommonMember.extension.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Extensions/CommonCommonMember.extension.ts
rename to packages/graphql/src/schema/Types/Common/Extensions/CommonCommonMember.extension.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonDiscussions.extension.ts b/packages/graphql/src/schema/Types/Common/Extensions/CommonDiscussions.extension.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Extensions/CommonDiscussions.extension.ts
rename to packages/graphql/src/schema/Types/Common/Extensions/CommonDiscussions.extension.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonEvents.extension.ts b/packages/graphql/src/schema/Types/Common/Extensions/CommonEvents.extension.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Extensions/CommonEvents.extension.ts
rename to packages/graphql/src/schema/Types/Common/Extensions/CommonEvents.extension.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonProposals.extension.ts b/packages/graphql/src/schema/Types/Common/Extensions/CommonProposals.extension.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Extensions/CommonProposals.extension.ts
rename to packages/graphql/src/schema/Types/Common/Extensions/CommonProposals.extension.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Extensions/CommonReports.extension.ts b/packages/graphql/src/schema/Types/Common/Extensions/CommonReports.extension.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Extensions/CommonReports.extension.ts
rename to packages/graphql/src/schema/Types/Common/Extensions/CommonReports.extension.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Inputs/CommonWhereUnique.input.ts b/packages/graphql/src/schema/Types/Common/Inputs/CommonWhereUnique.input.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Inputs/CommonWhereUnique.input.ts
rename to packages/graphql/src/schema/Types/Common/Inputs/CommonWhereUnique.input.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts b/packages/graphql/src/schema/Types/Common/Mutations/CreateCommon.mutation.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Mutations/CreateCommon.mutation.ts
rename to packages/graphql/src/schema/Types/Common/Mutations/CreateCommon.mutation.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/DelistCommon.mutation.ts b/packages/graphql/src/schema/Types/Common/Mutations/DelistCommon.mutation.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Mutations/DelistCommon.mutation.ts
rename to packages/graphql/src/schema/Types/Common/Mutations/DelistCommon.mutation.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Mutations/WhitelistCommon.mutation.ts b/packages/graphql/src/schema/Types/Common/Mutations/WhitelistCommon.mutation.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Mutations/WhitelistCommon.mutation.ts
rename to packages/graphql/src/schema/Types/Common/Mutations/WhitelistCommon.mutation.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Queries/GetCommon.query.ts b/packages/graphql/src/schema/Types/Common/Queries/GetCommon.query.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Queries/GetCommon.query.ts
rename to packages/graphql/src/schema/Types/Common/Queries/GetCommon.query.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Queries/GetCommons.query.ts b/packages/graphql/src/schema/Types/Common/Queries/GetCommons.query.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Queries/GetCommons.query.ts
rename to packages/graphql/src/schema/Types/Common/Queries/GetCommons.query.ts
diff --git a/packages/graphql/src/schema/Types/Commons/Types/Common.type.ts b/packages/graphql/src/schema/Types/Common/Types/Common.type.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/Types/Common.type.ts
rename to packages/graphql/src/schema/Types/Common/Types/Common.type.ts
diff --git a/packages/graphql/src/schema/Types/Commons/index.ts b/packages/graphql/src/schema/Types/Common/index.ts
similarity index 100%
rename from packages/graphql/src/schema/Types/Commons/index.ts
rename to packages/graphql/src/schema/Types/Common/index.ts
diff --git a/packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionPaymentStatus.enum.ts b/packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionPaymentStatus.enum.ts
new file mode 100644
index 000000000..a69b774b5
--- /dev/null
+++ b/packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionPaymentStatus.enum.ts
@@ -0,0 +1,7 @@
+import { SubscriptionPaymentStatus } from '@prisma/client';
+import { enumType } from 'nexus';
+
+export const SubscriptionPaymentStatusEnum = enumType({
+  name: 'SubscriptionPaymentStatus',
+  members: SubscriptionPaymentStatus
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionStatus.enum.ts b/packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionStatus.enum.ts
new file mode 100644
index 000000000..43f1f6a98
--- /dev/null
+++ b/packages/graphql/src/schema/Types/CommonSubscriptions/Enums/SubscriptionStatus.enum.ts
@@ -0,0 +1,7 @@
+import { SubscriptionStatus } from '@prisma/client';
+import { enumType } from 'nexus';
+
+export const SubscriptionStatusEnum = enumType({
+  name: 'SubscriptionStatus',
+  members: SubscriptionStatus
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/CommonSubscriptions/Extensions/SubscriptionCommon.extension.ts b/packages/graphql/src/schema/Types/CommonSubscriptions/Extensions/SubscriptionCommon.extension.ts
new file mode 100644
index 000000000..fe6b02ef3
--- /dev/null
+++ b/packages/graphql/src/schema/Types/CommonSubscriptions/Extensions/SubscriptionCommon.extension.ts
@@ -0,0 +1,20 @@
+import { extendType } from 'nexus';
+import { prisma } from '@common/core';
+
+export const SubscriptionCommonExtension = extendType({
+  type: 'CommonSubscription',
+  definition(t) {
+    t.nonNull.field('common', {
+      type: 'Common',
+      resolve: async (root) => {
+        return (await prisma.subscription
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .common())!;
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/CommonSubscriptions/Types/CommonSubscription.type.ts b/packages/graphql/src/schema/Types/CommonSubscriptions/Types/CommonSubscription.type.ts
new file mode 100644
index 000000000..556dd9616
--- /dev/null
+++ b/packages/graphql/src/schema/Types/CommonSubscriptions/Types/CommonSubscription.type.ts
@@ -0,0 +1,23 @@
+import { objectType } from 'nexus';
+
+export const CommonSubscriptionType = objectType({
+  name: 'CommonSubscription',
+  definition(t) {
+    t.implements('BaseEntity');
+
+    t.nonNull.field('paymentStatus', {
+      type: 'SubscriptionPaymentStatus'
+    });
+
+    t.nonNull.field('status', {
+      type: 'SubscriptionStatus'
+    });
+
+    t.nonNull.date('dueDate');
+    t.nonNull.date('chargedAt');
+
+    t.nonNull.boolean('voided');
+
+    t.nonNull.int('amount');
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/CommonSubscriptions/index.ts b/packages/graphql/src/schema/Types/CommonSubscriptions/index.ts
new file mode 100644
index 000000000..801fb42f5
--- /dev/null
+++ b/packages/graphql/src/schema/Types/CommonSubscriptions/index.ts
@@ -0,0 +1,13 @@
+import { CommonSubscriptionType } from './Types/CommonSubscription.type';
+import { SubscriptionPaymentStatusEnum } from './Enums/SubscriptionPaymentStatus.enum';
+import { SubscriptionStatusEnum } from './Enums/SubscriptionStatus.enum';
+import { SubscriptionCommonExtension } from './Extensions/SubscriptionCommon.extension';
+
+export const CommonSubscriptionTypes = [
+  CommonSubscriptionType,
+
+  SubscriptionPaymentStatusEnum,
+  SubscriptionStatusEnum,
+
+  SubscriptionCommonExtension
+];
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/Extensions/UserSubscriptions.extension.ts b/packages/graphql/src/schema/Types/Users/Extensions/UserSubscriptions.extension.ts
new file mode 100644
index 000000000..00e23eaa1
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Users/Extensions/UserSubscriptions.extension.ts
@@ -0,0 +1,20 @@
+import { prisma } from '@common/core';
+import { extendType } from 'nexus';
+
+export const UserSubscriptionsExtension = extendType({
+  type: 'User',
+  definition: t => {
+    t.nonNull.list.nonNull.field('subscriptions', {
+      type: 'CommonSubscription',
+      resolve: async (root) => {
+        return (await prisma.user
+          .findUnique({
+            where: {
+              id: root.id
+            }
+          })
+          .subscriptions())!;
+      }
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/Inputs/UserWhereUnique.input.ts b/packages/graphql/src/schema/Types/Users/Inputs/UserWhereUnique.input.ts
new file mode 100644
index 000000000..5f75f941e
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Users/Inputs/UserWhereUnique.input.ts
@@ -0,0 +1,8 @@
+import { inputObjectType } from 'nexus';
+
+export const UserWhereUniqueInput = inputObjectType({
+  name: 'UserWhereUniqueInput',
+  definition(t) {
+    t.nonNull.id('userId');
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/Queries/GetUser.query.ts b/packages/graphql/src/schema/Types/Users/Queries/GetUser.query.ts
index e49325395..8b0a4db65 100644
--- a/packages/graphql/src/schema/Types/Users/Queries/GetUser.query.ts
+++ b/packages/graphql/src/schema/Types/Users/Queries/GetUser.query.ts
@@ -1,4 +1,4 @@
-import { extendType, idArg } from 'nexus';
+import { extendType, arg } from 'nexus';
 import { prisma } from '@common/core';
 
 export const GetUserQuery = extendType({
@@ -8,10 +8,12 @@ export const GetUserQuery = extendType({
       type: 'User',
       description: 'Provide ID to fetch specific user or do not pass anything to get the currently authenticated user',
       args: {
-        userId: idArg()
+        where: arg({
+          type: 'UserWhereUniqueInput'
+        })
       },
       resolve: async (root, args, ctx) => {
-        const userId = args.userId || (await ctx.getUserId());
+        const userId = args?.where?.userId || (await ctx.getUserId());
 
         return prisma.user.findUnique({
           where: {
diff --git a/packages/graphql/src/schema/Types/Users/index.ts b/packages/graphql/src/schema/Types/Users/index.ts
index 4c2a371c3..6aa6bc409 100644
--- a/packages/graphql/src/schema/Types/Users/index.ts
+++ b/packages/graphql/src/schema/Types/Users/index.ts
@@ -20,6 +20,8 @@ import {
 } from './Mutations/CreateUserNotificationToken.mutation';
 import { CreateUserInput, CreateUserMutation } from './Mutations/CreateUser.mutation';
 import { VoidUserNotificationTokenMutation } from './Mutations/VoidUserNotificationToken.mutation';
+import { UserWhereUniqueInput } from './Inputs/UserWhereUnique.input';
+import { UserSubscriptionsExtension } from './Extensions/UserSubscriptions.extension';
 
 export const UserTypes = [
   UserType,
@@ -27,6 +29,8 @@ export const UserTypes = [
 
   GetUserQuery,
 
+  UserWhereUniqueInput,
+
   CreateUserInput,
   CreateUserMutation,
 
@@ -39,6 +43,7 @@ export const UserTypes = [
 
   UserEventsExtension,
   UserProposalsExtension,
+  UserSubscriptionsExtension,
   UserNotificationsExtension,
   UserNotificationTokensExtension,
   UserDiscussionSubscriptionsExtension,
diff --git a/packages/graphql/src/schema/index.ts b/packages/graphql/src/schema/index.ts
index 28724fdfc..7113d4112 100644
--- a/packages/graphql/src/schema/index.ts
+++ b/packages/graphql/src/schema/index.ts
@@ -6,13 +6,14 @@ import { CardTypes } from './Types/Cards';
 import { VoteTypes } from './Types/Votes';
 import { RoleTypes } from './Types/Roles';
 import { EventTypes } from './Types/Events';
-import { CommonTypes } from './Types/Commons';
+import { CommonTypes } from './Types/Common';
 import { ReportTypes } from './Types/Reports';
 import { ProposalTypes } from './Types/Proposals';
 import { StatisticTypes } from './Types/Statistics';
 import { DiscussionTypes } from './Types/Discussion';
 import { CommonMemberTypes } from './Types/CommonMember';
 import { NotificationTypes } from './Types/Notifications';
+import { CommonSubscriptionTypes } from './Types/CommonSubscriptions';
 
 import { UrlScalar } from './Shared/Scalars/Url.scalar';
 import { VoidScalar } from './Shared/Scalars/Void.scalar';
@@ -43,6 +44,7 @@ const types = [
   DiscussionTypes,
   CommonMemberTypes,
   NotificationTypes,
+  CommonSubscriptionTypes,
 
   // Scalars
   UrlScalar,
@@ -81,4 +83,4 @@ export const schema = makeSchema({
     queryComplexityPlugin(),
     fieldAuthorizePlugin()
   ]
-});
\ No newline at end of file
+});

From a4b3cffcb1ecef8b0efefff21c8033f122fb59d4 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Wed, 5 May 2021 10:27:02 +0300
Subject: [PATCH 23/29] Fix user list page

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |  1 +
 packages/admin/src/core/graphql/index.ts      | 78 ++++++++++++++--
 .../admin/src/core/graphql/schema.graphql     |  6 ++
 packages/admin/src/core/graphql/schema.json   | 88 +++++++++++++++++++
 packages/admin/src/pages/users/index.tsx      | 30 ++++---
 .../graphql/src/generated/nexus-typegen.ts    | 11 +++
 packages/graphql/src/generated/schema.graphql |  7 ++
 .../Types/Users/Inputs/UserWhere.input.ts     | 18 ++++
 .../Types/Users/Queries/GetUsers.query.ts     | 20 +++++
 .../graphql/src/schema/Types/Users/index.ts   |  4 +
 10 files changed, 248 insertions(+), 15 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Users/Inputs/UserWhere.input.ts
 create mode 100644 packages/graphql/src/schema/Types/Users/Queries/GetUsers.query.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index ae569c1d7..7b57f35eb 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -7,6 +7,7 @@ documents:
   - "src/pages/dashboard/index.tsx"
   - "src/pages/commons/index.tsx"
   - "src/pages/proposals/index.tsx"
+  - "src/pages/users/index.tsx"
   - "src/pages/commons/details/[commonId].tsx"
   - "src/pages/proposals/details/[proposalId].tsx"
   - "src/pages/users/details/[userId].tsx"
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index 2e16e3e73..b797c3d26 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -100,6 +100,12 @@ export type UserWhereUniqueInput = {
   userId: Scalars['ID'];
 };
 
+export type UserWhereInput = {
+  firstName?: Maybe<StringFilter>;
+  lastName?: Maybe<StringFilter>;
+  email?: Maybe<StringFilter>;
+};
+
 export type CreateUserInput = {
   firstName: Scalars['String'];
   lastName: Scalars['String'];
@@ -862,6 +868,7 @@ export type Query = {
   __typename?: 'Query';
   /** Provide ID to fetch specific user or do not pass anything to get the currently authenticated user */
   user?: Maybe<User>;
+  users?: Maybe<Array<Maybe<User>>>;
   generateUserAuthToken: Scalars['String'];
   roles?: Maybe<Array<Maybe<Role>>>;
   events?: Maybe<Array<Maybe<Event>>>;
@@ -879,6 +886,12 @@ export type QueryUserArgs = {
 };
 
 
+export type QueryUsersArgs = {
+  where?: Maybe<UserWhereInput>;
+  paginate?: Maybe<PaginateInput>;
+};
+
+
 export type QueryGenerateUserAuthTokenArgs = {
   authId: Scalars['String'];
 };
@@ -1310,6 +1323,22 @@ export type GetProposalsHomescreenQuery = (
 }
   );
 
+export type GetUsersHomepageDataQueryVariables = Exact<{
+  paginate: PaginateInput;
+  where?: Maybe<UserWhereInput>;
+}>;
+
+
+export type GetUsersHomepageDataQuery = (
+  { __typename?: 'Query' }
+  & {
+  users?: Maybe<Array<Maybe<(
+    { __typename?: 'User' }
+    & Pick<User, 'id' | 'photo' | 'email' | 'firstName' | 'lastName' | 'createdAt'>
+    )>>>
+}
+  );
+
 
 export const LoadUserContextDocument = gql`
   query loadUserContext {
@@ -1481,11 +1510,9 @@ export const GetProposalDetailsDocument = gql`
 export function useGetProposalDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
   return Apollo.useQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
 }
-
 export function useGetProposalDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>(GetProposalDetailsDocument, baseOptions);
 }
-
 export type GetProposalDetailsQueryHookResult = ReturnType<typeof useGetProposalDetailsQuery>;
 export type GetProposalDetailsLazyQueryHookResult = ReturnType<typeof useGetProposalDetailsLazyQuery>;
 export type GetProposalDetailsQueryResult = Apollo.QueryResult<GetProposalDetailsQuery, GetProposalDetailsQueryVariables>;
@@ -1544,11 +1571,9 @@ export const GetUserDetailsQueryDocument = gql`
 export function useGetUserDetailsQueryQuery(baseOptions: Apollo.QueryHookOptions<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>) {
   return Apollo.useQuery<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>(GetUserDetailsQueryDocument, baseOptions);
 }
-
 export function useGetUserDetailsQueryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>) {
   return Apollo.useLazyQuery<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>(GetUserDetailsQueryDocument, baseOptions);
 }
-
 export type GetUserDetailsQueryQueryHookResult = ReturnType<typeof useGetUserDetailsQueryQuery>;
 export type GetUserDetailsQueryLazyQueryHookResult = ReturnType<typeof useGetUserDetailsQueryLazyQuery>;
 export type GetUserDetailsQueryQueryResult = Apollo.QueryResult<GetUserDetailsQueryQuery, GetUserDetailsQueryQueryVariables>;
@@ -1780,9 +1805,52 @@ export const GetProposalsHomescreenDocument = gql`
 export function useGetProposalsHomescreenQuery(baseOptions: Apollo.QueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
   return Apollo.useQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
 }
+
 export function useGetProposalsHomescreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
   return Apollo.useLazyQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
 }
+
 export type GetProposalsHomescreenQueryHookResult = ReturnType<typeof useGetProposalsHomescreenQuery>;
 export type GetProposalsHomescreenLazyQueryHookResult = ReturnType<typeof useGetProposalsHomescreenLazyQuery>;
-export type GetProposalsHomescreenQueryResult = Apollo.QueryResult<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>;
\ No newline at end of file
+export type GetProposalsHomescreenQueryResult = Apollo.QueryResult<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>;
+export const GetUsersHomepageDataDocument = gql`
+  query getUsersHomepageData($paginate: PaginateInput!, $where: UserWhereInput) {
+    users(paginate: $paginate, where: $where) {
+      id
+      photo
+      email
+      firstName
+      lastName
+      createdAt
+    }
+  }
+`;
+
+/**
+ * __useGetUsersHomepageDataQuery__
+ *
+ * To run a query within a React component, call `useGetUsersHomepageDataQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetUsersHomepageDataQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetUsersHomepageDataQuery({
+ *   variables: {
+ *      paginate: // value for 'paginate'
+ *      where: // value for 'where'
+ *   },
+ * });
+ */
+export function useGetUsersHomepageDataQuery(baseOptions: Apollo.QueryHookOptions<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>) {
+  return Apollo.useQuery<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>(GetUsersHomepageDataDocument, baseOptions);
+}
+
+export function useGetUsersHomepageDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>) {
+  return Apollo.useLazyQuery<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>(GetUsersHomepageDataDocument, baseOptions);
+}
+
+export type GetUsersHomepageDataQueryHookResult = ReturnType<typeof useGetUsersHomepageDataQuery>;
+export type GetUsersHomepageDataLazyQueryHookResult = ReturnType<typeof useGetUsersHomepageDataLazyQuery>;
+export type GetUsersHomepageDataQueryResult = Apollo.QueryResult<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 682da00d0..734aa171b 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -53,6 +53,11 @@ type UserNotificationToken implements BaseEntity {
 input UserWhereUniqueInput {
   userId: ID!
 }
+input UserWhereInput {
+  firstName: StringFilter
+  lastName: StringFilter
+  email: StringFilter
+}
 input CreateUserInput {
   firstName: String!
   lastName: String!
@@ -673,6 +678,7 @@ input CreateRoleInput {
 type Query {
   """Provide ID to fetch specific user or do not pass anything to get the currently authenticated user"""
   user(where: UserWhereUniqueInput): User
+  users(where: UserWhereInput, paginate: PaginateInput): [User]
   generateUserAuthToken(authId: String!): String!
   roles(paginate: PaginateInput): [Role]
   events(paginate: PaginateInput): [Event]
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 6e8a9a277..468d5a46e 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -719,6 +719,53 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "UserWhereInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "firstName",
+            "description": null,
+            "type": {
+              "kind": "INPUT_OBJECT",
+              "name": "StringFilter",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "lastName",
+            "description": null,
+            "type": {
+              "kind": "INPUT_OBJECT",
+              "name": "StringFilter",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "email",
+            "description": null,
+            "type": {
+              "kind": "INPUT_OBJECT",
+              "name": "StringFilter",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "CreateUserInput",
@@ -6669,6 +6716,47 @@
             "isDeprecated": false,
             "deprecationReason": null
           },
+          {
+            "name": "users",
+            "description": null,
+            "args": [
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "UserWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "User",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
           {
             "name": "generateUserAuthToken",
             "description": null,
diff --git a/packages/admin/src/pages/users/index.tsx b/packages/admin/src/pages/users/index.tsx
index 6bcf96c55..5e87653f1 100644
--- a/packages/admin/src/pages/users/index.tsx
+++ b/packages/admin/src/pages/users/index.tsx
@@ -8,15 +8,23 @@ import { Avatar, Breadcrumbs, Card, Grid, Pagination, Spacer, Table, Text } from
 
 import { Link } from '@components/Link';
 import { Centered } from '@components/Centered';
-import { useGetUsersHomepageDataQuery, User, useStatisticsQuery, GetUsersHomepageDataQuery } from '@core/graphql';
+import {
+  useGetUsersHomepageDataQuery,
+  User,
+  useGetAllTimeStatistiscQuery,
+  GetUsersHomepageDataQuery
+} from '@core/graphql';
 import Skeleton from 'react-loading-skeleton';
 
 const UsersHomepageData = gql`
-  query getUsersHomepageData($page: Int = 1, $perPage: Int = 15) {
-    users(page: $page, perPage: $perPage) {
+  query getUsersHomepageData($paginate: PaginateInput!, $where: UserWhereInput) {
+    users(
+      paginate: $paginate,
+      where: $where
+    ) {
       id
 
-      photoURL
+      photo
       email
 
       firstName
@@ -34,11 +42,13 @@ const UsersHomepage: NextPage = () => {
   const [page, setPage] = React.useState<number>(1);
   const [perPage, setPerPage] = React.useState<number>(10);
 
-  const statistics = useStatisticsQuery();
+  const statistics = useGetAllTimeStatistiscQuery();
   const { data, loading } = useGetUsersHomepageDataQuery({
     variables: {
-      page,
-      perPage
+      paginate: {
+        skip: (page - 1) * perPage,
+        take: perPage
+      }
     }
   });
 
@@ -80,7 +90,7 @@ const UsersHomepage: NextPage = () => {
       avatar: (
         <Centered>
           <div style={{ cursor: 'pointer' }}>
-            <Avatar src={user.photoURL}/>
+            <Avatar src={user.photo}/>
           </div>
         </Centered>
       ),
@@ -127,7 +137,7 @@ const UsersHomepage: NextPage = () => {
                 <Card hoverable>
                   <Text h1>
                     {statistics.data && (
-                      statistics.data.statistics.users
+                      statistics.data.getStatistics[0].users
                     )}
 
                     {!statistics.data && (
@@ -177,7 +187,7 @@ const UsersHomepage: NextPage = () => {
             <Centered>
               <div style={{ margin: '20px 0' }}>
                 <Pagination
-                  count={Math.ceil(statistics.data.statistics.users / 10)}
+                  count={Math.ceil(statistics.data.getStatistics[0].users / 10)}
                   onChange={onPageChange}
                 >
                   <Pagination.Next>
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 349c54560..54d4800ed 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -224,6 +224,11 @@ export interface NexusGenInputs {
     notIn?: string[] | null; // [String!]
     startsWith?: string | null; // String
   }
+  UserWhereInput: { // input type
+    email?: NexusGenInputs['StringFilter'] | null; // StringFilter
+    firstName?: NexusGenInputs['StringFilter'] | null; // StringFilter
+    lastName?: NexusGenInputs['StringFilter'] | null; // StringFilter
+  }
   UserWhereUniqueInput: { // input type
     userId: string; // ID!
   }
@@ -649,6 +654,7 @@ export interface NexusGenFieldTypes {
     proposals: Array<NexusGenRootTypes['Proposal'] | null> | null; // [Proposal]
     roles: Array<NexusGenRootTypes['Role'] | null> | null; // [Role]
     user: NexusGenRootTypes['User'] | null; // User
+    users: Array<NexusGenRootTypes['User'] | null> | null; // [User]
   }
   Report: { // field return type
     createdAt: NexusGenScalars['DateTime']; // DateTime!
@@ -913,6 +919,7 @@ export interface NexusGenFieldTypeNames {
     proposals: 'Proposal'
     roles: 'Role'
     user: 'User'
+    users: 'User'
   }
   Report: { // field return type name
     createdAt: 'DateTime'
@@ -1130,6 +1137,10 @@ export interface NexusGenArgTypes {
     user: { // args
       where?: NexusGenInputs['UserWhereUniqueInput'] | null; // UserWhereUniqueInput
     }
+    users: { // args
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
+      where?: NexusGenInputs['UserWhereInput'] | null; // UserWhereInput
+    }
   }
   Subscription: {
     discussionMessageCreated: { // args
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 01d36847f..514316f25 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -661,6 +661,7 @@ type Query {
   Provide ID to fetch specific user or do not pass anything to get the currently authenticated user
   """
   user(where: UserWhereUniqueInput): User
+  users(paginate: PaginateInput, where: UserWhereInput): [User]
 }
 
 type Report implements BaseEntity {
@@ -885,6 +886,12 @@ enum UserNotificationTokenState {
   Voided
 }
 
+input UserWhereInput {
+  email: StringFilter
+  firstName: StringFilter
+  lastName: StringFilter
+}
+
 input UserWhereUniqueInput {
   userId: ID!
 }
diff --git a/packages/graphql/src/schema/Types/Users/Inputs/UserWhere.input.ts b/packages/graphql/src/schema/Types/Users/Inputs/UserWhere.input.ts
new file mode 100644
index 000000000..6fca3ec6a
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Users/Inputs/UserWhere.input.ts
@@ -0,0 +1,18 @@
+import { inputObjectType } from 'nexus';
+
+export const UserWhereInput = inputObjectType({
+  name: 'UserWhereInput',
+  definition(t) {
+    t.field('firstName', {
+      type: 'StringFilter'
+    });
+
+    t.field('lastName', {
+      type: 'StringFilter'
+    });
+
+    t.field('email', {
+      type: 'StringFilter'
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/Queries/GetUsers.query.ts b/packages/graphql/src/schema/Types/Users/Queries/GetUsers.query.ts
new file mode 100644
index 000000000..a6005a6f1
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Users/Queries/GetUsers.query.ts
@@ -0,0 +1,20 @@
+import { queryField, list, arg } from 'nexus';
+import { prisma } from '@common/core';
+
+export const GetUsersQuery = queryField('users', {
+  type: list('User'),
+  args: {
+    where: arg({
+      type: 'UserWhereInput'
+    }),
+    paginate: arg({
+      type: 'PaginateInput'
+    })
+  },
+  resolve: (root, args) => {
+    return prisma.user
+      .findMany({
+        where: args
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Users/index.ts b/packages/graphql/src/schema/Types/Users/index.ts
index 6aa6bc409..ad0be156f 100644
--- a/packages/graphql/src/schema/Types/Users/index.ts
+++ b/packages/graphql/src/schema/Types/Users/index.ts
@@ -22,14 +22,18 @@ import { CreateUserInput, CreateUserMutation } from './Mutations/CreateUser.muta
 import { VoidUserNotificationTokenMutation } from './Mutations/VoidUserNotificationToken.mutation';
 import { UserWhereUniqueInput } from './Inputs/UserWhereUnique.input';
 import { UserSubscriptionsExtension } from './Extensions/UserSubscriptions.extension';
+import { UserWhereInput } from './Inputs/UserWhere.input';
+import { GetUsersQuery } from './Queries/GetUsers.query';
 
 export const UserTypes = [
   UserType,
   UserNotificationTokenType,
 
   GetUserQuery,
+  GetUsersQuery,
 
   UserWhereUniqueInput,
+  UserWhereInput,
 
   CreateUserInput,
   CreateUserMutation,

From 9fb6eeff60497e1b7ef39e8b1ae812f47b51ff2d Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Fri, 7 May 2021 07:57:21 +0300
Subject: [PATCH 24/29] Save current progress

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../components/modals/SearchEverywhere.tsx    | 78 +++++++++++++++++++
 packages/admin/src/pages/dashboard/index.tsx  |  6 +-
 packages/admin/src/pages/index.tsx            |  5 ++
 3 files changed, 86 insertions(+), 3 deletions(-)
 create mode 100644 packages/admin/src/components/modals/SearchEverywhere.tsx

diff --git a/packages/admin/src/components/modals/SearchEverywhere.tsx b/packages/admin/src/components/modals/SearchEverywhere.tsx
new file mode 100644
index 000000000..531887593
--- /dev/null
+++ b/packages/admin/src/components/modals/SearchEverywhere.tsx
@@ -0,0 +1,78 @@
+import React from 'react';
+import { Text, Keyboard, Modal, Spacer, useTheme } from '@geist-ui/react';
+
+export const SearchEverywhere = () => {
+  const { palette } = useTheme();
+
+  const [open, setOpen] = React.useState<boolean>();
+
+  React.useEffect(() => {
+    const handleKeyboardEvent = (event: KeyboardEvent) => {
+      if ((event.metaKey || event.ctrlKey) && event.code === 'KeyK') {
+        event.preventDefault();
+
+        onOpen();
+      } else if (event.key === 'Escape') {
+        event.preventDefault();
+
+        onClose();
+      }
+    };
+
+    window.addEventListener('keydown', handleKeyboardEvent);
+
+    return () => {
+      window.removeEventListener('keydown', handleKeyboardEvent);
+    };
+  }, []);
+
+
+  const onOpen = () => {
+    setOpen(true);
+  };
+
+  const onClose = () => {
+    setOpen(false);
+  };
+
+  return (
+    <React.Fragment>
+      <Modal open={open} onClose={onClose}>
+        <Modal.Content
+          style={{
+            padding: '0 2rem'
+          }}
+        >
+          <Text h1>Search</Text>
+
+          <p>Full search is coming soon.</p>
+        </Modal.Content>
+      </Modal>
+
+      <div
+        onClick={onOpen}
+        style={{
+          border: `solid 1px ${palette.border}`,
+          display: 'flex',
+          alignItems: 'center',
+          height: '40px',
+          borderRadius: '5px',
+          cursor: 'pointer'
+        }}
+      >
+        <Text
+          style={{
+            margin: '0 10px',
+            color: palette.accents_4
+          }}
+        >Search</Text>
+
+        <Spacer x={7}/>
+
+        <div style={{ margin: '0 3px' }}>
+          <Keyboard command>K</Keyboard>
+        </div>
+      </div>
+    </React.Fragment>
+  );
+};
\ No newline at end of file
diff --git a/packages/admin/src/pages/dashboard/index.tsx b/packages/admin/src/pages/dashboard/index.tsx
index 498ecb19f..f13843fe6 100644
--- a/packages/admin/src/pages/dashboard/index.tsx
+++ b/packages/admin/src/pages/dashboard/index.tsx
@@ -55,7 +55,7 @@ const DashboardHomePage: NextPage = () => {
         <Text h3>Application's overview</Text>
 
         <Grid.Container gap={2} alignItems="stretch" style={{ display: 'flex' }}>
-          <Grid sm={24} md={8} onClick={onCardClick('/commons')} style={{ cursor: 'pointer' }}>
+          <Grid xs={24} md={8} onClick={onCardClick('/commons')} style={{ cursor: 'pointer' }}>
             <Card hoverable>
               <Text h1>
                 {statistics.data && (
@@ -70,7 +70,7 @@ const DashboardHomePage: NextPage = () => {
             </Card>
           </Grid>
 
-          <Grid sm={24} md={8} onClick={onCardClick('/proposals')} style={{ cursor: 'pointer' }}>
+          <Grid xs={24} md={8} onClick={onCardClick('/proposals')} style={{ cursor: 'pointer' }}>
             <Card hoverable>
               <Text h1>
                 {statistics.data && (
@@ -86,7 +86,7 @@ const DashboardHomePage: NextPage = () => {
             </Card>
           </Grid>
 
-          <Grid sm={24} md={8} onClick={onCardClick('/users')} style={{ cursor: 'pointer' }}>
+          <Grid xs={24} md={8} onClick={onCardClick('/users')} style={{ cursor: 'pointer' }}>
             <Card hoverable>
               <Text h1>
                 {statistics.data && (
diff --git a/packages/admin/src/pages/index.tsx b/packages/admin/src/pages/index.tsx
index 0af169731..4eb2fbacc 100644
--- a/packages/admin/src/pages/index.tsx
+++ b/packages/admin/src/pages/index.tsx
@@ -6,6 +6,11 @@ import React from 'react';
 const IndexPage: NextPage = () => {
   const router = useRouter();
 
+  React.useEffect(() => {
+    router.push('/dashboard')
+      .then(() => console.log('Redirected to dashboard'));
+  }, []);
+
   return (<div/>);
 };
 

From 170ff8bc44d75994f4cfc56b61dcc89e10e2d79f Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Fri, 7 May 2021 08:41:02 +0300
Subject: [PATCH 25/29] Event notification dynamic link

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/src/components/Header.tsx      |  52 ++++---
 .../NotificationEventSettings.prisma          |  17 +++
 .../enums/NotificationType.prisma             |   2 +
 .../Statistic.prisma                          |   0
 .../enums/StatisticType.prisma                |   0
 packages/core/prisma/schema.prisma            |  21 ++-
 .../createEventNotificationCommand.ts         | 135 ++++++++++++++++--
 7 files changed, 190 insertions(+), 37 deletions(-)
 create mode 100644 packages/core/prisma/models/notifications/NotificationEventSettings.prisma
 rename packages/core/prisma/models/{Statistics => statistics}/Statistic.prisma (100%)
 rename packages/core/prisma/models/{Statistics => statistics}/enums/StatisticType.prisma (100%)

diff --git a/packages/admin/src/components/Header.tsx b/packages/admin/src/components/Header.tsx
index c99a99ff6..626e4a80c 100644
--- a/packages/admin/src/components/Header.tsx
+++ b/packages/admin/src/components/Header.tsx
@@ -5,6 +5,7 @@ import { useRouter } from 'next/router';
 import { Avatar, Divider, Link, Page, Tabs, Tooltip, Text } from '@geist-ui/react';
 import { HasPermission } from '@components/HasPermission';
 import { useUserContext } from '@core/context';
+import { SearchEverywhere } from '@components/modals/SearchEverywhere';
 
 export const Header: React.FC = () => {
   const userContext = useUserContext();
@@ -39,35 +40,40 @@ export const Header: React.FC = () => {
         style={{
           width: '100%',
           display: 'flex',
-          justifyContent: 'flex-end',
+          justifyContent: 'space-between',
           alignItems: 'center',
-          marginTop: '2.5vh'
+          marginTop: '2.5vh',
+          marginBottom: '1.5vh'
         }}
       >
-        <Text p style={{ margin: 0 }}>{userContext.displayName}</Text>
-        <Tooltip
-          trigger="click"
-          placement="bottomEnd"
-          text={(
-            <div style={{ minWidth: '10vw' }}>
-              {/*<b onClick={commitIntention('admin.theme.toggle')}>Theme </b> <br/>*/}
-              {/*<b onClick={commitIntention('admin.notification.toggle')}>Notifications </b>*/}
+        <SearchEverywhere/>
 
-              <Divider y={0.5}/>
+        <div style={{ display: 'flex' }}>
+          <Text p style={{ margin: 0 }}>{userContext.displayName}</Text>
+          <Tooltip
+            trigger="click"
+            placement="bottomEnd"
+            text={(
+              <div style={{ minWidth: '10vw' }}>
+                {/*<b onClick={commitIntention('admin.theme.toggle')}>Theme </b> <br/>*/}
+                {/*<b onClick={commitIntention('admin.notification.toggle')}>Notifications </b>*/}
 
-              <Link onClick={onSignOut}>
-                <b>Sign Out</b>
-              </Link>
+                <Divider y={0.5}/>
+
+                <Link onClick={onSignOut}>
+                  <b>Sign Out</b>
+                </Link>
+              </div>
+            )}
+            style={{
+              marginLeft: 10
+            }}
+          >
+            <div style={{ cursor: 'pointer' }}>
+              <Avatar src={userContext.photo}/>
             </div>
-          )}
-          style={{
-            marginLeft: 10
-          }}
-        >
-          <div style={{ cursor: 'pointer' }}>
-            <Avatar src={userContext.photo}/>
-          </div>
-        </Tooltip>
+          </Tooltip>
+        </div>
       </div>
 
       <HasPermission permission="admin.*">
diff --git a/packages/core/prisma/models/notifications/NotificationEventSettings.prisma b/packages/core/prisma/models/notifications/NotificationEventSettings.prisma
new file mode 100644
index 000000000..3d5df94c5
--- /dev/null
+++ b/packages/core/prisma/models/notifications/NotificationEventSettings.prisma
@@ -0,0 +1,17 @@
+model NotificationEventSettings {
+  id String @id @default(uuid())
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  sendNotificationType NotificationType
+
+  onEvent EventType @unique
+
+  sendToEveryone Boolean @default(false)
+  sendToCommon   Boolean @default(false)
+  sendToUser     Boolean @default(false)
+
+  description String
+  active      Boolean @default(true)
+}
\ No newline at end of file
diff --git a/packages/core/prisma/models/notifications/enums/NotificationType.prisma b/packages/core/prisma/models/notifications/enums/NotificationType.prisma
index 7587e75a0..94b4137ca 100644
--- a/packages/core/prisma/models/notifications/enums/NotificationType.prisma
+++ b/packages/core/prisma/models/notifications/enums/NotificationType.prisma
@@ -4,4 +4,6 @@ enum NotificationType {
 
   FundingRequestAccepted
   FundingRequestRejected
+
+  General
 }
\ No newline at end of file
diff --git a/packages/core/prisma/models/Statistics/Statistic.prisma b/packages/core/prisma/models/statistics/Statistic.prisma
similarity index 100%
rename from packages/core/prisma/models/Statistics/Statistic.prisma
rename to packages/core/prisma/models/statistics/Statistic.prisma
diff --git a/packages/core/prisma/models/Statistics/enums/StatisticType.prisma b/packages/core/prisma/models/statistics/enums/StatisticType.prisma
similarity index 100%
rename from packages/core/prisma/models/Statistics/enums/StatisticType.prisma
rename to packages/core/prisma/models/statistics/enums/StatisticType.prisma
diff --git a/packages/core/prisma/schema.prisma b/packages/core/prisma/schema.prisma
index f2cfae148..67fd14959 100644
--- a/packages/core/prisma/schema.prisma
+++ b/packages/core/prisma/schema.prisma
@@ -235,7 +235,6 @@ model Subscription {
   card Card          @relation(fields: [cardId], references: [id])
   join JoinProposal?
 
-
   user   User   @relation(fields: [userId], references: [id])
   common Common @relation(fields: [commonId], references: [id])
 
@@ -507,6 +506,24 @@ model Event {
   user       User?       @relation(fields: [userId], references: [id])
 }
 
+model NotificationEventSettings {
+  id String @id @default(uuid())
+
+  createdAt DateTime @default(now())
+  updatedAt DateTime @updatedAt
+
+  sendNotificationType NotificationType
+
+  onEvent EventType @unique
+
+  sendToEveryone Boolean @default(false)
+  sendToCommon   Boolean @default(false)
+  sendToUser     Boolean @default(false)
+
+  description String
+  active      Boolean @default(true)
+}
+
 model NotificationSystemSettings {
   id String @id @default(uuid())
 
@@ -550,6 +567,8 @@ enum NotificationType {
 
   FundingRequestAccepted
   FundingRequestRejected
+
+  General
 }
 
 enum NotificationSeenStatus {
diff --git a/packages/core/src/services/events/commands/createEventNotificationCommand.ts b/packages/core/src/services/events/commands/createEventNotificationCommand.ts
index a2d878480..5aaca6482 100644
--- a/packages/core/src/services/events/commands/createEventNotificationCommand.ts
+++ b/packages/core/src/services/events/commands/createEventNotificationCommand.ts
@@ -1,23 +1,132 @@
-import { Event, EventType } from '@prisma/client';
+import { Event } from '@prisma/client';
+
+import { prisma } from '@toolkits';
 import { notificationService } from '@services';
+import { logger } from '@logger';
 
 export const createEventNotificationCommand = async (event: Event): Promise<void> => {
-  switch (event.type) {
-    case EventType.FundingRequestAccepted:
-    case EventType.FundingRequestRejected:
-    case EventType.JoinRequestAccepted:
-    case EventType.JoinRequestRejected:
-      await notificationService.create({
-        type: event.type,
-        userId: event.userId!,
+  // switch (event.type) {
+  //   case EventType.FundingRequestAccepted:
+  //   case EventType.FundingRequestRejected:
+  //   case EventType.JoinRequestAccepted:
+  //   case EventType.JoinRequestRejected:
+  //     await notificationService.create({
+  //       type: event.type,
+  //       userId: event.userId!,
+  //       connect: {
+  //         discussionId: event.discussionId || undefined,
+  //         proposalId: event.proposalId || undefined,
+  //         commonId: event.commonId || undefined
+  //       }
+  //     });
+  //
+  //   // New discussion -> All common members
+  //   // New discussion message -> All discussion subscribers
+  // }
+
+  // Find the event notification settings
+  const settings = await prisma.notificationEventSettings.findUnique({
+    where: {
+      onEvent: event.type
+    }
+  });
+
+  if (!settings || !settings.active) {
+    logger.info('Skipping notification creation for event');
+
+    return;
+  }
+
+  let userIds: string[] = [];
+
+  // Foreach of the notification settings find the required users
+  if (settings.sendToEveryone) {
+    const users = await prisma.user.findMany({
+      select: {
+        id: true
+      }
+    });
+
+    // Extract only the IDs
+    userIds = users.map(u => u.id);
+  }
+
+  if (settings.sendToCommon) {
+    if (event.commonId) {
+      const users = await prisma.user.findMany({
+        where: {
+          memberships: {
+            some: {
+              commonId: event.commonId
+            }
+          }
+        },
+        select: {
+          id: true
+        }
+      });
+
+      // Merge the user IDs
+      userIds = Array.from(
+        new Set([
+          ...userIds,
+          ...users.map(u => u.id)
+        ])
+      );
+    } else {
+      logger.error(
+        'Cannot create notifications on event for all common members ' +
+        'because the event does not have linked common', {
+          event,
+          settings
+        });
+    }
+  }
+
+  if (settings.sendToUser) {
+    if (event.userId) {
+      const user = await prisma.user.findUnique({
+        where: {
+          id: event.userId
+        }
+      });
+
+      if (user) {
+        // Add the user to the array
+        userIds = Array.from(
+          new Set([
+            ...userIds,
+            user.id
+          ])
+        );
+      }
+    } else {
+      logger.error(
+        'Cannot create notifications on event for user ' +
+        'because the event is not linked to user', {
+          event,
+          settings
+        });
+    }
+  }
+
+
+  // Create the notification for each of the required users
+  const notificationCreationPromises: Promise<any>[] = [];
+
+  for (const userId of userIds) {
+    notificationCreationPromises.push(
+      notificationService.create({
+        type: settings.sendNotificationType,
+        userId: userId,
         connect: {
           discussionId: event.discussionId || undefined,
           proposalId: event.proposalId || undefined,
           commonId: event.commonId || undefined
         }
-      });
-
-    // New discussion -> All common members
-    // New discussion message -> All discussion subscribers
+      })
+    );
   }
+
+  await Promise.all(notificationCreationPromises);
 };
\ No newline at end of file

From 019ad3cc6421dcdb3730d65603b3ec3d1dd4f32c Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Fri, 7 May 2021 08:48:52 +0300
Subject: [PATCH 26/29] Create command for creating event notification link

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 .../migration.sql                             | 18 ++++++++++
 .../migration.sql                             |  3 ++
 .../migration.sql                             | 10 ++++++
 .../migrations/20210507053528_/migration.sql  |  8 +++++
 .../createNotificationEventSettings.ts        | 33 +++++++++++++++++++
 .../core/src/services/notifications/index.ts  |  5 +++
 6 files changed, 77 insertions(+)
 create mode 100644 packages/core/prisma/migrations/20210507050350_event_notification_sender/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210507050819_notification_type_customization/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210507053222_drop_some_fields/migration.sql
 create mode 100644 packages/core/prisma/migrations/20210507053528_/migration.sql
 create mode 100644 packages/core/src/services/notifications/command/createNotificationEventSettings.ts

diff --git a/packages/core/prisma/migrations/20210507050350_event_notification_sender/migration.sql b/packages/core/prisma/migrations/20210507050350_event_notification_sender/migration.sql
new file mode 100644
index 000000000..0101aca70
--- /dev/null
+++ b/packages/core/prisma/migrations/20210507050350_event_notification_sender/migration.sql
@@ -0,0 +1,18 @@
+-- AlterEnum
+ALTER TYPE "NotificationType" ADD VALUE 'General';
+
+-- CreateTable
+CREATE TABLE "NotificationEventSettings" (
+    "id" TEXT NOT NULL,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "sendNotificationType" "NotificationType" NOT NULL,
+    "onEvent" "EventType" NOT NULL,
+    "sendToEveryone" BOOLEAN NOT NULL DEFAULT false,
+    "sendToCommon" BOOLEAN NOT NULL DEFAULT false,
+    "sendToUser" BOOLEAN NOT NULL DEFAULT false,
+    "description" TEXT NOT NULL,
+    "active" BOOLEAN NOT NULL DEFAULT true,
+
+    PRIMARY KEY ("id")
+);
diff --git a/packages/core/prisma/migrations/20210507050819_notification_type_customization/migration.sql b/packages/core/prisma/migrations/20210507050819_notification_type_customization/migration.sql
new file mode 100644
index 000000000..f1aea6201
--- /dev/null
+++ b/packages/core/prisma/migrations/20210507050819_notification_type_customization/migration.sql
@@ -0,0 +1,3 @@
+-- AlterTable
+ALTER TABLE "NotificationEventSettings" ADD COLUMN     "sendEmail" BOOLEAN NOT NULL DEFAULT false,
+ADD COLUMN     "sendNotification" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/core/prisma/migrations/20210507053222_drop_some_fields/migration.sql b/packages/core/prisma/migrations/20210507053222_drop_some_fields/migration.sql
new file mode 100644
index 000000000..51f2b7e5d
--- /dev/null
+++ b/packages/core/prisma/migrations/20210507053222_drop_some_fields/migration.sql
@@ -0,0 +1,10 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `sendEmail` on the `NotificationEventSettings` table. All the data in the column will be lost.
+  - You are about to drop the column `sendNotification` on the `NotificationEventSettings` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "NotificationEventSettings" DROP COLUMN "sendEmail",
+DROP COLUMN "sendNotification";
diff --git a/packages/core/prisma/migrations/20210507053528_/migration.sql b/packages/core/prisma/migrations/20210507053528_/migration.sql
new file mode 100644
index 000000000..40dfbf85b
--- /dev/null
+++ b/packages/core/prisma/migrations/20210507053528_/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[onEvent]` on the table `NotificationEventSettings` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- CreateIndex
+CREATE UNIQUE INDEX "NotificationEventSettings.onEvent_unique" ON "NotificationEventSettings"("onEvent");
diff --git a/packages/core/src/services/notifications/command/createNotificationEventSettings.ts b/packages/core/src/services/notifications/command/createNotificationEventSettings.ts
new file mode 100644
index 000000000..983c25da4
--- /dev/null
+++ b/packages/core/src/services/notifications/command/createNotificationEventSettings.ts
@@ -0,0 +1,33 @@
+import * as z from 'zod';
+import { NotificationType, EventType, NotificationEventSettings } from '@prisma/client';
+import { logger } from '@logger';
+import { prisma } from '@toolkits';
+
+const schema = z.object({
+  sendNotificationType: z.enum(
+    Object.keys(NotificationType) as [(keyof typeof NotificationType)]
+  ),
+
+  onEvent: z.enum(
+    Object.keys(EventType) as [(keyof typeof EventType)]
+  ),
+
+  description: z.string()
+    .min(10),
+
+  sendToEveryone: z.boolean(),
+  sendToCommon: z.boolean(),
+  sendToUser: z.boolean()
+});
+
+export const createNotificationEventSettings = async (payload: z.infer<typeof schema>): Promise<NotificationEventSettings> => {
+  logger.info('Creating new notification event settings');
+
+  const settings = await prisma.notificationEventSettings.create({
+    data: payload
+  });
+
+  logger.info(`Successfully created new notification settings with ID: (${settings.id})`);
+
+  return settings;
+};
\ No newline at end of file
diff --git a/packages/core/src/services/notifications/index.ts b/packages/core/src/services/notifications/index.ts
index 3b2bcd7cb..238036850 100644
--- a/packages/core/src/services/notifications/index.ts
+++ b/packages/core/src/services/notifications/index.ts
@@ -2,6 +2,7 @@ import { createNotificationCommand } from './command/createNotificationCommand';
 import { processNotificationCommand } from './command/processNotificationCommand';
 
 import { createNotificationTemplateCommand } from './command/createNotificationTemplateCommand';
+import { createNotificationEventSettings } from './command/createNotificationEventSettings';
 
 export const notificationService = {
   create: createNotificationCommand,
@@ -9,5 +10,9 @@ export const notificationService = {
 
   template: {
     create: createNotificationTemplateCommand
+  },
+
+  settings: {
+    createEventSettings: createNotificationEventSettings
   }
 };
\ No newline at end of file

From 67911cf76aed6595db72b1e7f964544ff528006d Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Fri, 7 May 2021 09:15:01 +0300
Subject: [PATCH 27/29] Create graphql infrastructure for creating event
 notification link

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/core/src/domain/validation/index.ts  | 12 +++
 .../graphql/src/generated/nexus-typegen.ts    | 73 ++++++++++++++++---
 packages/graphql/src/generated/schema.graphql | 30 ++++++++
 ...reateNotificationEventSettings.mutation.ts | 38 ++++++++++
 .../Types/NotificationEventSettings.type.ts   | 24 ++++++
 .../src/schema/Types/Notifications/index.ts   |  7 +-
 6 files changed, 172 insertions(+), 12 deletions(-)
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Mutations/CreateNotificationEventSettings.mutation.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Types/NotificationEventSettings.type.ts

diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index 4ed7f758b..f5a9d8403 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -28,5 +28,17 @@ export const PermissionValidator = z.enum([
   'admin.commons.delist',
   'admin.commons.whitelist',
 
+  'admin.notification.setting.event.create',
+  'admin.notification.setting.event.update',
+  'admin.notification.setting.event.delete',
+
+  'admin.notification.setting.create',
+  'admin.notification.setting.update',
+  'admin.notification.setting.delete',
+
+  'admin.notification.setting.template.create',
+  'admin.notification.setting.template.update',
+  'admin.notification.setting.template.delete',
+
   'user.permissions.read'
 ]);
\ No newline at end of file
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 54d4800ed..70970e0c8 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,10 +4,11 @@
  */
 
 
-import { IRequestContext } from "./../context"
-import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
-import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
-import { core } from "nexus"
+import { IRequestContext } from './../context';
+import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
+import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
+import { core } from 'nexus';
+
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -119,6 +120,14 @@ export interface NexusGenInputs {
     links?: NexusGenInputs['LinkInput'][] | null; // [LinkInput!]
     title: string; // String!
   }
+  CreateNotificationEventSettingsInput: { // input type
+    description: string; // String!
+    onEvent: NexusGenEnums['EventType']; // EventType!
+    sendNotificationType: NexusGenEnums['NotificationType']; // NotificationType!
+    sendToCommon: boolean; // Boolean!
+    sendToEveryone: boolean; // Boolean!
+    sendToUser: boolean; // Boolean!
+  }
   CreateRoleInput: { // input type
     description: string; // String!
     displayName: string; // String!
@@ -243,9 +252,9 @@ export interface NexusGenEnums {
   EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonDelisted" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "CommonWhitelisted" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "RoleUpdated" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
   FundingState: "AwaitingApproval" | "Completed" | "Confirmed" | "Eligible" | "NotEligible" | "Pending"
   FundingType: "Monthly" | "OneTime"
-  NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
-  NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestRejected"
-  PaymentState: "NotAttempted" | "Pending" | "Successful" | "Unsuccessful"
+  NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
+  NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'General' | 'JoinRequestAccepted' | 'JoinRequestRejected'
+  PaymentState: 'NotAttempted' | 'Pending' | 'Successful' | 'Unsuccessful'
   ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
   ProposalType: "FundingRequest" | "JoinRequest"
   ReportAction: "Dismissed" | "Respected"
@@ -379,6 +388,18 @@ export interface NexusGenObjects {
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
     userId: NexusGenScalars['UUID']; // UUID!
   }
+  NotificationEventSettings: { // root type
+    active: boolean; // Boolean!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description: string; // String!
+    id: NexusGenScalars['UUID']; // UUID!
+    onEvent: NexusGenEnums['EventType']; // EventType!
+    sendNotificationType: NexusGenEnums['NotificationType']; // NotificationType!
+    sendToCommon: boolean; // Boolean!
+    sendToEveryone: boolean; // Boolean!
+    sendToUser: boolean; // Boolean!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+  }
   Proposal: { // root type
     commonId: NexusGenScalars['UUID']; // UUID!
     commonMemberId: NexusGenScalars['UUID']; // UUID!
@@ -459,7 +480,7 @@ export interface NexusGenObjects {
 }
 
 export interface NexusGenInterfaces {
-  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['CommonSubscription'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
+  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['CommonSubscription'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['NotificationEventSettings'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
 }
 
 export interface NexusGenUnions {
@@ -588,6 +609,7 @@ export interface NexusGenFieldTypes {
     createDiscussionMessage: NexusGenRootTypes['DiscussionMessage']; // DiscussionMessage!
     createFundingProposal: NexusGenRootTypes['Proposal']; // Proposal!
     createJoinProposal: NexusGenRootTypes['Proposal']; // Proposal!
+    createNotificationEventSettings: NexusGenRootTypes['NotificationEventSettings'] | null; // NotificationEventSettings
     createRole: NexusGenRootTypes['Role'] | null; // Role
     createUser: NexusGenRootTypes['User']; // User!
     createUserNotificationToken: NexusGenRootTypes['UserNotificationToken']; // UserNotificationToken!
@@ -615,6 +637,18 @@ export interface NexusGenFieldTypes {
     user: NexusGenRootTypes['User']; // User!
     userId: NexusGenScalars['UUID']; // UUID!
   }
+  NotificationEventSettings: { // field return type
+    active: boolean; // Boolean!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    description: string; // String!
+    id: NexusGenScalars['UUID']; // UUID!
+    onEvent: NexusGenEnums['EventType']; // EventType!
+    sendNotificationType: NexusGenEnums['NotificationType']; // NotificationType!
+    sendToCommon: boolean; // Boolean!
+    sendToEveryone: boolean; // Boolean!
+    sendToUser: boolean; // Boolean!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+  }
   Proposal: { // field return type
     common: NexusGenRootTypes['Common']; // Common!
     commonId: NexusGenScalars['UUID']; // UUID!
@@ -853,6 +887,7 @@ export interface NexusGenFieldTypeNames {
     createDiscussionMessage: 'DiscussionMessage'
     createFundingProposal: 'Proposal'
     createJoinProposal: 'Proposal'
+    createNotificationEventSettings: 'NotificationEventSettings'
     createRole: 'Role'
     createUser: 'User'
     createUserNotificationToken: 'UserNotificationToken'
@@ -880,6 +915,18 @@ export interface NexusGenFieldTypeNames {
     user: 'User'
     userId: 'UUID'
   }
+  NotificationEventSettings: { // field return type name
+    active: 'Boolean'
+    createdAt: 'DateTime'
+    description: 'String'
+    id: 'UUID'
+    onEvent: 'EventType'
+    sendNotificationType: 'NotificationType'
+    sendToCommon: 'Boolean'
+    sendToEveryone: 'Boolean'
+    sendToUser: 'Boolean'
+    updatedAt: 'DateTime'
+  }
   Proposal: { // field return type name
     common: 'Common'
     commonId: 'UUID'
@@ -1067,6 +1114,9 @@ export interface NexusGenArgTypes {
     createJoinProposal: { // args
       input: NexusGenInputs['CreateJoinProposalInput']; // CreateJoinProposalInput!
     }
+    createNotificationEventSettings: { // args
+      input: NexusGenInputs['CreateNotificationEventSettingsInput']; // CreateNotificationEventSettingsInput!
+    }
     createRole: { // args
       input: NexusGenInputs['CreateRoleInput']; // CreateRoleInput!
     }
@@ -1176,7 +1226,7 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: "CommonMember" | "CommonSubscription" | "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "FundingProposal" | "JoinProposal" | "Notification" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
+  BaseEntity: 'CommonMember' | 'CommonSubscription' | 'Discussion' | 'DiscussionMessage' | 'DiscussionSubscription' | 'FundingProposal' | 'JoinProposal' | 'Notification' | 'NotificationEventSettings' | 'Report' | 'Role' | 'Statistic' | 'UserNotificationToken'
 }
 
 export interface NexusGenTypeInterfaces {
@@ -1187,8 +1237,9 @@ export interface NexusGenTypeInterfaces {
   DiscussionSubscription: "BaseEntity"
   FundingProposal: "BaseEntity"
   JoinProposal: "BaseEntity"
-  Notification: "BaseEntity"
-  Report: "BaseEntity"
+  Notification: 'BaseEntity'
+  NotificationEventSettings: 'BaseEntity'
+  Report: 'BaseEntity'
   Role: "BaseEntity"
   Statistic: "BaseEntity"
   UserNotificationToken: "BaseEntity"
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index 514316f25..e944b13a8 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -194,6 +194,15 @@ input CreateJoinProposalInput {
   title: String!
 }
 
+input CreateNotificationEventSettingsInput {
+  description: String!
+  onEvent: EventType!
+  sendNotificationType: NotificationType!
+  sendToCommon: Boolean!
+  sendToEveryone: Boolean!
+  sendToUser: Boolean!
+}
+
 input CreateRoleInput {
   description: String!
   displayName: String!
@@ -470,6 +479,7 @@ type Mutation {
 
   """Create new proposal of type JOIN."""
   createJoinProposal(input: CreateJoinProposalInput!): Proposal!
+  createNotificationEventSettings(input: CreateNotificationEventSettingsInput!): NotificationEventSettings
   createRole(input: CreateRoleInput!): Role
 
   """Creates new user in the system"""
@@ -524,6 +534,25 @@ type Notification implements BaseEntity {
   userId: UUID!
 }
 
+type NotificationEventSettings implements BaseEntity {
+  active: Boolean!
+
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  description: String!
+
+  """The main identifier of the item"""
+  id: UUID!
+  onEvent: EventType!
+  sendNotificationType: NotificationType!
+  sendToCommon: Boolean!
+  sendToEveryone: Boolean!
+  sendToUser: Boolean!
+
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+
 input NotificationOrderByInput {
   createdAt: SortOrder
   status: SortOrder
@@ -539,6 +568,7 @@ enum NotificationSeenStatus {
 enum NotificationType {
   FundingRequestAccepted
   FundingRequestRejected
+  General
   JoinRequestAccepted
   JoinRequestRejected
 }
diff --git a/packages/graphql/src/schema/Types/Notifications/Mutations/CreateNotificationEventSettings.mutation.ts b/packages/graphql/src/schema/Types/Notifications/Mutations/CreateNotificationEventSettings.mutation.ts
new file mode 100644
index 000000000..425801413
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Mutations/CreateNotificationEventSettings.mutation.ts
@@ -0,0 +1,38 @@
+import { mutationField, inputObjectType, arg, nonNull } from 'nexus';
+import { authorizationService, notificationService } from '@common/core';
+
+const CreateNotificationEventSettingsInput = inputObjectType({
+  name: 'CreateNotificationEventSettingsInput',
+  definition(t) {
+    t.nonNull.boolean('sendToEveryone');
+    t.nonNull.boolean('sendToCommon');
+    t.nonNull.boolean('sendToUser');
+
+    t.nonNull.string('description');
+
+    t.nonNull.field('sendNotificationType', {
+      type: 'NotificationType'
+    });
+
+    t.nonNull.field('onEvent', {
+      type: 'EventType'
+    });
+  }
+});
+
+export const CreateNotificationEventSettingsMutation = mutationField('createNotificationEventSettings', {
+  type: 'NotificationEventSettings',
+  args: {
+    input: nonNull(
+      arg({
+        type: CreateNotificationEventSettingsInput
+      })
+    )
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.notification.setting.event.create');
+  },
+  resolve: (root, args) => {
+    return notificationService.settings.createEventSettings(args.input);
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Types/NotificationEventSettings.type.ts b/packages/graphql/src/schema/Types/Notifications/Types/NotificationEventSettings.type.ts
new file mode 100644
index 000000000..a74ba0b92
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Types/NotificationEventSettings.type.ts
@@ -0,0 +1,24 @@
+import { objectType } from 'nexus';
+
+export const NotificationEventSettingsType = objectType({
+  name: 'NotificationEventSettings',
+  definition(t) {
+    t.implements('BaseEntity');
+
+    t.nonNull.boolean('active');
+
+    t.nonNull.boolean('sendToEveryone');
+    t.nonNull.boolean('sendToCommon');
+    t.nonNull.boolean('sendToUser');
+
+    t.nonNull.string('description');
+
+    t.nonNull.field('sendNotificationType', {
+      type: 'NotificationType'
+    });
+
+    t.nonNull.field('onEvent', {
+      type: 'EventType'
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/index.ts b/packages/graphql/src/schema/Types/Notifications/index.ts
index 92757cf50..7d8065a14 100644
--- a/packages/graphql/src/schema/Types/Notifications/index.ts
+++ b/packages/graphql/src/schema/Types/Notifications/index.ts
@@ -2,6 +2,7 @@ import { NotificationTypeEnum } from './Enums/NotificationType.enum';
 import { NotificationSeenStatusEnum } from './Enums/NotificationSeenStatus.enum';
 
 import { NotificationType } from './Types/Notification.type';
+import { NotificationEventSettingsType } from './Types/NotificationEventSettings.type';
 
 import { NotificationUserExtension } from './Extensions/NotificationUser.extension';
 import { NotificationCommonExtension } from './Extensions/NotificationCommon.extension';
@@ -14,12 +15,14 @@ import { NotificationWhereUniqueInput } from './Inputs/NotificationWhereUnique.i
 import { NotificationOrderByInput } from './Inputs/NotificationOrderBy.input';
 
 import { NotificationCreatedSubscription } from './Subscriptions/NotificationCreated.subscription';
+import { CreateNotificationEventSettingsMutation } from './Mutations/CreateNotificationEventSettings.mutation';
 
 export const NotificationTypes = [
   NotificationTypeEnum,
   NotificationSeenStatusEnum,
 
   NotificationType,
+  NotificationEventSettingsType,
 
   NotificationUserExtension,
   NotificationCommonExtension,
@@ -31,5 +34,7 @@ export const NotificationTypes = [
 
   NotificationOrderByInput,
 
-  NotificationCreatedSubscription
+  NotificationCreatedSubscription,
+
+  CreateNotificationEventSettingsMutation
 ];
\ No newline at end of file

From 6873bb744a2effebbd611ecc5e9bef75fa29c477 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Fri, 7 May 2021 09:34:17 +0300
Subject: [PATCH 28/29] Fix the event processing

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/queues/src/jobs/EventsQueue.ts        |  6 ------
 packages/worker/src/processors/EventsWorker.ts | 12 ++++++++++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/queues/src/jobs/EventsQueue.ts b/packages/queues/src/jobs/EventsQueue.ts
index e943f518d..2ebe698ec 100644
--- a/packages/queues/src/jobs/EventsQueue.ts
+++ b/packages/queues/src/jobs/EventsQueue.ts
@@ -38,11 +38,5 @@ export const addEventJob = (job: EventsQueueJob, payload: IEventsQueueJob['creat
     EventQueue.add(job, {
       create: payload
     });
-  } else if (job === 'process') {
-    logger.silly('New process event job was added');
-
-    EventQueue.add(job, {
-      process: payload
-    });
   }
 };
diff --git a/packages/worker/src/processors/EventsWorker.ts b/packages/worker/src/processors/EventsWorker.ts
index bc37b4f06..c74a3551e 100644
--- a/packages/worker/src/processors/EventsWorker.ts
+++ b/packages/worker/src/processors/EventsWorker.ts
@@ -13,9 +13,17 @@ Queues.EventQueue.process('create', async (job, done) => {
   // @todo Create log about the processing result
   logger.debug('Starting create event job', { job });
 
-  const event = eventService.$create(job.data.create);
+  const event = await eventService.$create(job.data.create);
 
-  logger.debug('Successfully created event', {
+  logger.debug('Successfully created event. Starting processing', {
+    job,
+    event
+  });
+
+  // Process the event
+  await eventService.process(event);
+
+  logger.debug('Successfully processed event.', {
     job,
     event
   });

From fe925316c327ff10a05de6d3b65bb53d4b46e3c1 Mon Sep 17 00:00:00 2001
From: Alexander Ivanov <alexander2001ivanov@gmail.com>
Date: Fri, 7 May 2021 12:09:17 +0300
Subject: [PATCH 29/29] WIP

Signed-off-by: Alexander Ivanov <alexander2001ivanov@gmail.com>
---
 packages/admin/codegen.yml                    |   1 +
 .../admin/src/components/HasPermission.tsx    |   2 +
 packages/admin/src/components/Header.tsx      |   4 +
 packages/admin/src/core/graphql/index.ts      | 163 +++-
 .../admin/src/core/graphql/schema.graphql     |  63 ++
 packages/admin/src/core/graphql/schema.json   | 782 +++++++++++++++++-
 .../admin/src/pages/notifications/index.tsx   | 124 +++
 .../pages/notifications/templates/index.tsx   |  33 +
 packages/core/src/domain/validation/index.ts  |   5 +
 .../graphql/src/generated/nexus-typegen.ts    |  91 +-
 packages/graphql/src/generated/schema.graphql |  46 ++
 .../Enums/NotificationLanguage.enum.ts        |   7 +
 .../Enums/NotificationTemplateType.enum.ts    |   7 +
 .../Inputs/NotificationTemplateWhere.input.ts |  18 +
 .../GetNotificationEventSettings.query.ts     |  26 +
 .../Queries/GetNotificationTemplates.query.ts |  26 +
 .../Queries/GetNotifications.query.ts         |  28 +
 .../Types/NotificationTemplate.type.ts        |  29 +
 .../src/schema/Types/Notifications/index.ts   |  19 +-
 19 files changed, 1437 insertions(+), 37 deletions(-)
 create mode 100644 packages/admin/src/pages/notifications/index.tsx
 create mode 100644 packages/admin/src/pages/notifications/templates/index.tsx
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Enums/NotificationLanguage.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Enums/NotificationTemplateType.enum.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Inputs/NotificationTemplateWhere.input.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationEventSettings.query.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationTemplates.query.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Queries/GetNotifications.query.ts
 create mode 100644 packages/graphql/src/schema/Types/Notifications/Types/NotificationTemplate.type.ts

diff --git a/packages/admin/codegen.yml b/packages/admin/codegen.yml
index 7b57f35eb..953110bc4 100644
--- a/packages/admin/codegen.yml
+++ b/packages/admin/codegen.yml
@@ -11,6 +11,7 @@ documents:
   - "src/pages/commons/details/[commonId].tsx"
   - "src/pages/proposals/details/[proposalId].tsx"
   - "src/pages/users/details/[userId].tsx"
+  - "src/pages/notifications/**/*.tsx"
 generates:
   ./src/core/graphql/index.ts:
     plugins:
diff --git a/packages/admin/src/components/HasPermission.tsx b/packages/admin/src/components/HasPermission.tsx
index fd94800a0..12d0848c5 100644
--- a/packages/admin/src/components/HasPermission.tsx
+++ b/packages/admin/src/components/HasPermission.tsx
@@ -19,6 +19,8 @@ export const HasPermission: React.FC<PropsWithChildren<IHasPermissionProps>> = (
     if (userContext.loaded) {
       const permissions = userContext.permissions;
 
+      console.log(permissions);
+
       if (permission.includes('*')) {
         hasPermission = permissions.some((userPermission) =>
           matchRuleExpl(userPermission, permission));
diff --git a/packages/admin/src/components/Header.tsx b/packages/admin/src/components/Header.tsx
index 626e4a80c..add801be5 100644
--- a/packages/admin/src/components/Header.tsx
+++ b/packages/admin/src/components/Header.tsx
@@ -84,6 +84,10 @@ export const Header: React.FC = () => {
           <Tabs.Item value="users" label="Users"/>
           <Tabs.Item value="financials" label="Financials"/>
           <Tabs.Item value="events" label="Events"/>
+
+          <HasPermission permission="admin.notification.*">
+            <Tabs.Item value="notifications" label="Notifications"/>
+          </HasPermission>
           {/*<Tabs.Item value="development/playground" label="Playground"/>*/}
         </Tabs>
       </HasPermission>
diff --git a/packages/admin/src/core/graphql/index.ts b/packages/admin/src/core/graphql/index.ts
index b797c3d26..88eeaabb9 100644
--- a/packages/admin/src/core/graphql/index.ts
+++ b/packages/admin/src/core/graphql/index.ts
@@ -709,7 +709,8 @@ export enum NotificationType {
   JoinRequestAccepted = 'JoinRequestAccepted',
   JoinRequestRejected = 'JoinRequestRejected',
   FundingRequestAccepted = 'FundingRequestAccepted',
-  FundingRequestRejected = 'FundingRequestRejected'
+  FundingRequestRejected = 'FundingRequestRejected',
+  General = 'General'
 }
 
 export enum NotificationSeenStatus {
@@ -718,6 +719,20 @@ export enum NotificationSeenStatus {
   Done = 'Done'
 }
 
+export enum NotificationLanguage {
+  En = 'EN',
+  Ru = 'RU',
+  Bg = 'BG',
+  He = 'HE',
+  Jp = 'JP',
+  Ko = 'KO'
+}
+
+export enum NotificationTemplateType {
+  PushNotification = 'PushNotification',
+  EmailNotification = 'EmailNotification'
+}
+
 export type Notification = BaseEntity & {
   __typename?: 'Notification';
   /** The main identifier of the item */
@@ -748,6 +763,42 @@ export type Notification = BaseEntity & {
   discussion?: Maybe<Discussion>;
 };
 
+export type NotificationTemplate = BaseEntity & {
+  __typename?: 'NotificationTemplate';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  forType: NotificationType;
+  templateType: NotificationTemplateType;
+  language: NotificationLanguage;
+  subject: Scalars['String'];
+  content: Scalars['String'];
+  from?: Maybe<Scalars['String']>;
+  fromName?: Maybe<Scalars['String']>;
+  bcc?: Maybe<Scalars['String']>;
+  bccName?: Maybe<Scalars['String']>;
+};
+
+export type NotificationEventSettings = BaseEntity & {
+  __typename?: 'NotificationEventSettings';
+  /** The main identifier of the item */
+  id: Scalars['UUID'];
+  /** The date, at which the item was created */
+  createdAt: Scalars['DateTime'];
+  /** The date, at which the item was last modified */
+  updatedAt: Scalars['DateTime'];
+  active: Scalars['Boolean'];
+  sendToEveryone: Scalars['Boolean'];
+  sendToCommon: Scalars['Boolean'];
+  sendToUser: Scalars['Boolean'];
+  description: Scalars['String'];
+  sendNotificationType: NotificationType;
+  onEvent: EventType;
+};
+
 export type NotificationWhereInput = {
   seenStatus?: Maybe<NotificationSeenStatus>;
   type?: Maybe<NotificationType>;
@@ -761,6 +812,12 @@ export type NotificationWhereUniqueInput = {
   id?: Maybe<Scalars['UUID']>;
 };
 
+export type NotificationTemplateWhereInput = {
+  language?: Maybe<NotificationLanguage>;
+  forType?: Maybe<NotificationType>;
+  type?: Maybe<NotificationTemplateType>;
+};
+
 export type NotificationOrderByInput = {
   createdAt?: Maybe<SortOrder>;
   updatedAt?: Maybe<SortOrder>;
@@ -864,6 +921,15 @@ export type CreateRoleInput = {
   permissions: Array<Scalars['String']>;
 };
 
+export type CreateNotificationEventSettingsInput = {
+  sendToEveryone: Scalars['Boolean'];
+  sendToCommon: Scalars['Boolean'];
+  sendToUser: Scalars['Boolean'];
+  description: Scalars['String'];
+  sendNotificationType: NotificationType;
+  onEvent: EventType;
+};
+
 export type Query = {
   __typename?: 'Query';
   /** Provide ID to fetch specific user or do not pass anything to get the currently authenticated user */
@@ -878,6 +944,10 @@ export type Query = {
   proposals?: Maybe<Array<Maybe<Proposal>>>;
   getStatistics?: Maybe<Array<Maybe<Statistic>>>;
   discussion?: Maybe<Discussion>;
+  notificationEventSettings?: Maybe<Array<Maybe<NotificationEventSettings>>>;
+  notificationTemplates?: Maybe<Array<Maybe<NotificationTemplate>>>;
+  /** List of all notifications, readable only by the admin */
+  notifications?: Maybe<Array<Maybe<Notification>>>;
 };
 
 
@@ -937,6 +1007,22 @@ export type QueryDiscussionArgs = {
   id: Scalars['ID'];
 };
 
+
+export type QueryNotificationEventSettingsArgs = {
+  paginate: PaginateInput;
+};
+
+
+export type QueryNotificationTemplatesArgs = {
+  where?: Maybe<NotificationTemplateWhereInput>;
+  paginate?: Maybe<PaginateInput>;
+};
+
+
+export type QueryNotificationsArgs = {
+  paginate: PaginateInput;
+};
+
 export type Mutation = {
   __typename?: 'Mutation';
   /** Creates new user in the system */
@@ -960,6 +1046,7 @@ export type Mutation = {
   createDiscussion: Discussion;
   createDiscussionMessage: DiscussionMessage;
   changeDiscussionSubscriptionType?: Maybe<DiscussionSubscription>;
+  createNotificationEventSettings?: Maybe<NotificationEventSettings>;
 };
 
 
@@ -1060,6 +1147,11 @@ export type MutationChangeDiscussionSubscriptionTypeArgs = {
   type: DiscussionSubscriptionType;
 };
 
+
+export type MutationCreateNotificationEventSettingsArgs = {
+  input: CreateNotificationEventSettingsInput;
+};
+
 export type Subscription = {
   __typename?: 'Subscription';
   onProposalChange?: Maybe<Proposal>;
@@ -1130,6 +1222,27 @@ export type GetCommonDetailsQuery = (
 }
   );
 
+export type GetAllUsersNotificationsQueryVariables = Exact<{
+  paginate: PaginateInput;
+}>;
+
+
+export type GetAllUsersNotificationsQuery = (
+  { __typename?: 'Query' }
+  & {
+  notifications?: Maybe<Array<Maybe<(
+    { __typename?: 'Notification' }
+    & Pick<Notification, 'id' | 'type' | 'createdAt' | 'seenStatus'>
+    & {
+    user: (
+      { __typename?: 'User' }
+      & Pick<User, 'photo' | 'displayName'>
+      )
+  }
+    )>>>
+}
+  );
+
 export type GetProposalDetailsQueryVariables = Exact<{
   where: ProposalWhereUniqueInput;
 }>;
@@ -1440,12 +1553,56 @@ export const GetCommonDetailsDocument = gql`
 export function useGetCommonDetailsQuery(baseOptions: Apollo.QueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
+
 export function useGetCommonDetailsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>) {
   return Apollo.useLazyQuery<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>(GetCommonDetailsDocument, baseOptions);
 }
+
 export type GetCommonDetailsQueryHookResult = ReturnType<typeof useGetCommonDetailsQuery>;
 export type GetCommonDetailsLazyQueryHookResult = ReturnType<typeof useGetCommonDetailsLazyQuery>;
 export type GetCommonDetailsQueryResult = Apollo.QueryResult<GetCommonDetailsQuery, GetCommonDetailsQueryVariables>;
+export const GetAllUsersNotificationsDocument = gql`
+  query getAllUsersNotifications($paginate: PaginateInput!) {
+    notifications(paginate: $paginate) {
+      id
+      type
+      createdAt
+      seenStatus
+      user {
+        photo
+        displayName
+      }
+    }
+  }
+`;
+
+/**
+ * __useGetAllUsersNotificationsQuery__
+ *
+ * To run a query within a React component, call `useGetAllUsersNotificationsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetAllUsersNotificationsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetAllUsersNotificationsQuery({
+ *   variables: {
+ *      paginate: // value for 'paginate'
+ *   },
+ * });
+ */
+export function useGetAllUsersNotificationsQuery(baseOptions: Apollo.QueryHookOptions<GetAllUsersNotificationsQuery, GetAllUsersNotificationsQueryVariables>) {
+  return Apollo.useQuery<GetAllUsersNotificationsQuery, GetAllUsersNotificationsQueryVariables>(GetAllUsersNotificationsDocument, baseOptions);
+}
+
+export function useGetAllUsersNotificationsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetAllUsersNotificationsQuery, GetAllUsersNotificationsQueryVariables>) {
+  return Apollo.useLazyQuery<GetAllUsersNotificationsQuery, GetAllUsersNotificationsQueryVariables>(GetAllUsersNotificationsDocument, baseOptions);
+}
+
+export type GetAllUsersNotificationsQueryHookResult = ReturnType<typeof useGetAllUsersNotificationsQuery>;
+export type GetAllUsersNotificationsLazyQueryHookResult = ReturnType<typeof useGetAllUsersNotificationsLazyQuery>;
+export type GetAllUsersNotificationsQueryResult = Apollo.QueryResult<GetAllUsersNotificationsQuery, GetAllUsersNotificationsQueryVariables>;
 export const GetProposalDetailsDocument = gql`
   query getProposalDetails($where: ProposalWhereUniqueInput!) {
     proposal(where: $where) {
@@ -1805,11 +1962,9 @@ export const GetProposalsHomescreenDocument = gql`
 export function useGetProposalsHomescreenQuery(baseOptions: Apollo.QueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
   return Apollo.useQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
 }
-
 export function useGetProposalsHomescreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>) {
   return Apollo.useLazyQuery<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>(GetProposalsHomescreenDocument, baseOptions);
 }
-
 export type GetProposalsHomescreenQueryHookResult = ReturnType<typeof useGetProposalsHomescreenQuery>;
 export type GetProposalsHomescreenLazyQueryHookResult = ReturnType<typeof useGetProposalsHomescreenLazyQuery>;
 export type GetProposalsHomescreenQueryResult = Apollo.QueryResult<GetProposalsHomescreenQuery, GetProposalsHomescreenQueryVariables>;
@@ -1846,11 +2001,9 @@ export const GetUsersHomepageDataDocument = gql`
 export function useGetUsersHomepageDataQuery(baseOptions: Apollo.QueryHookOptions<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>) {
   return Apollo.useQuery<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>(GetUsersHomepageDataDocument, baseOptions);
 }
-
 export function useGetUsersHomepageDataLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>) {
   return Apollo.useLazyQuery<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>(GetUsersHomepageDataDocument, baseOptions);
 }
-
 export type GetUsersHomepageDataQueryHookResult = ReturnType<typeof useGetUsersHomepageDataQuery>;
 export type GetUsersHomepageDataLazyQueryHookResult = ReturnType<typeof useGetUsersHomepageDataLazyQuery>;
 export type GetUsersHomepageDataQueryResult = Apollo.QueryResult<GetUsersHomepageDataQuery, GetUsersHomepageDataQueryVariables>;
\ No newline at end of file
diff --git a/packages/admin/src/core/graphql/schema.graphql b/packages/admin/src/core/graphql/schema.graphql
index 734aa171b..2916a44a2 100644
--- a/packages/admin/src/core/graphql/schema.graphql
+++ b/packages/admin/src/core/graphql/schema.graphql
@@ -541,12 +541,25 @@ enum NotificationType {
   JoinRequestRejected
   FundingRequestAccepted
   FundingRequestRejected
+  General
 }
 enum NotificationSeenStatus {
   NotSeen
   Seen
   Done
 }
+enum NotificationLanguage {
+  EN
+  RU
+  BG
+  HE
+  JP
+  KO
+}
+enum NotificationTemplateType {
+  PushNotification
+  EmailNotification
+}
 type Notification implements BaseEntity {
   """The main identifier of the item"""
   id: UUID!
@@ -575,6 +588,38 @@ type Notification implements BaseEntity {
   """The linked discussion. Expensive operation that may return null"""
   discussion: Discussion
 }
+type NotificationTemplate implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  forType: NotificationType!
+  templateType: NotificationTemplateType!
+  language: NotificationLanguage!
+  subject: String!
+  content: String!
+  from: String
+  fromName: String
+  bcc: String
+  bccName: String
+}
+type NotificationEventSettings implements BaseEntity {
+  """The main identifier of the item"""
+  id: UUID!
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+  active: Boolean!
+  sendToEveryone: Boolean!
+  sendToCommon: Boolean!
+  sendToUser: Boolean!
+  description: String!
+  sendNotificationType: NotificationType!
+  onEvent: EventType!
+}
 input NotificationWhereInput {
   seenStatus: NotificationSeenStatus
   type: NotificationType
@@ -586,6 +631,11 @@ input NotificationWhereInput {
 input NotificationWhereUniqueInput {
   id: UUID
 }
+input NotificationTemplateWhereInput {
+  language: NotificationLanguage
+  forType: NotificationType
+  type: NotificationTemplateType
+}
 input NotificationOrderByInput {
   createdAt: SortOrder
   updatedAt: SortOrder
@@ -675,6 +725,14 @@ input CreateRoleInput {
   description: String!
   permissions: [String!]!
 }
+input CreateNotificationEventSettingsInput {
+  sendToEveryone: Boolean!
+  sendToCommon: Boolean!
+  sendToUser: Boolean!
+  description: String!
+  sendNotificationType: NotificationType!
+  onEvent: EventType!
+}
 type Query {
   """Provide ID to fetch specific user or do not pass anything to get the currently authenticated user"""
   user(where: UserWhereUniqueInput): User
@@ -688,6 +746,10 @@ type Query {
   proposals(where: ProposalWhereInput, paginate: PaginateInput): [Proposal]
   getStatistics(where: StatisticsWhereInput): [Statistic]
   discussion(id: ID!): Discussion
+  notificationEventSettings(paginate: PaginateInput!): [NotificationEventSettings]
+  notificationTemplates(where: NotificationTemplateWhereInput, paginate: PaginateInput): [NotificationTemplate]
+  """List of all notifications, readable only by the admin"""
+  notifications(paginate: PaginateInput!): [Notification]
 }
 type Mutation {
   """Creates new user in the system"""
@@ -716,6 +778,7 @@ type Mutation {
     """The new subscription type"""
     type: DiscussionSubscriptionType!
   ): DiscussionSubscription
+  createNotificationEventSettings(input: CreateNotificationEventSettingsInput!): NotificationEventSettings
 }
 type Subscription {
   onProposalChange(
diff --git a/packages/admin/src/core/graphql/schema.json b/packages/admin/src/core/graphql/schema.json
index 468d5a46e..51174886b 100644
--- a/packages/admin/src/core/graphql/schema.json
+++ b/packages/admin/src/core/graphql/schema.json
@@ -5407,6 +5407,12 @@
             "description": null,
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "General",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "possibleTypes": null
@@ -5440,6 +5446,76 @@
         ],
         "possibleTypes": null
       },
+      {
+        "kind": "ENUM",
+        "name": "NotificationLanguage",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "EN",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "RU",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "BG",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "HE",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "JP",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "KO",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
+      {
+        "kind": "ENUM",
+        "name": "NotificationTemplateType",
+        "description": null,
+        "fields": null,
+        "inputFields": null,
+        "interfaces": null,
+        "enumValues": [
+          {
+            "name": "PushNotification",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "EmailNotification",
+            "description": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "Notification",
@@ -5657,6 +5733,376 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "OBJECT",
+        "name": "NotificationTemplate",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "forType",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "NotificationType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "templateType",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "NotificationTemplateType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "language",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "NotificationLanguage",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "subject",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "content",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "from",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "fromName",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "bcc",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "bccName",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "SCALAR",
+              "name": "String",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "OBJECT",
+        "name": "NotificationEventSettings",
+        "description": null,
+        "fields": [
+          {
+            "name": "id",
+            "description": "The main identifier of the item",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "UUID",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "createdAt",
+            "description": "The date, at which the item was created",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "updatedAt",
+            "description": "The date, at which the item was last modified",
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "DateTime",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "active",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendToEveryone",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendToCommon",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendToUser",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendNotificationType",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "NotificationType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "onEvent",
+            "description": null,
+            "args": [],
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "EventType",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "inputFields": null,
+        "interfaces": [
+          {
+            "kind": "INTERFACE",
+            "name": "BaseEntity",
+            "ofType": null
+          }
+        ],
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "INPUT_OBJECT",
         "name": "NotificationWhereInput",
@@ -5724,34 +6170,81 @@
             "deprecationReason": null
           },
           {
-            "name": "discussionId",
+            "name": "discussionId",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "NotificationWhereUniqueInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "id",
+            "description": null,
+            "type": {
+              "kind": "SCALAR",
+              "name": "UUID",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "NotificationTemplateWhereInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "language",
+            "description": null,
+            "type": {
+              "kind": "ENUM",
+              "name": "NotificationLanguage",
+              "ofType": null
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "forType",
             "description": null,
             "type": {
-              "kind": "SCALAR",
-              "name": "UUID",
+              "kind": "ENUM",
+              "name": "NotificationType",
               "ofType": null
             },
             "defaultValue": null,
             "isDeprecated": false,
             "deprecationReason": null
-          }
-        ],
-        "interfaces": null,
-        "enumValues": null,
-        "possibleTypes": null
-      },
-      {
-        "kind": "INPUT_OBJECT",
-        "name": "NotificationWhereUniqueInput",
-        "description": null,
-        "fields": null,
-        "inputFields": [
+          },
           {
-            "name": "id",
+            "name": "type",
             "description": null,
             "type": {
-              "kind": "SCALAR",
-              "name": "UUID",
+              "kind": "ENUM",
+              "name": "NotificationTemplateType",
               "ofType": null
             },
             "defaultValue": null,
@@ -6252,6 +6745,16 @@
             "name": "Notification",
             "ofType": null
           },
+          {
+            "kind": "OBJECT",
+            "name": "NotificationTemplate",
+            "ofType": null
+          },
+          {
+            "kind": "OBJECT",
+            "name": "NotificationEventSettings",
+            "ofType": null
+          },
           {
             "kind": "OBJECT",
             "name": "CommonSubscription",
@@ -6686,6 +7189,113 @@
         "enumValues": null,
         "possibleTypes": null
       },
+      {
+        "kind": "INPUT_OBJECT",
+        "name": "CreateNotificationEventSettingsInput",
+        "description": null,
+        "fields": null,
+        "inputFields": [
+          {
+            "name": "sendToEveryone",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendToCommon",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendToUser",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "Boolean",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "description",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "SCALAR",
+                "name": "String",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "sendNotificationType",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "NotificationType",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "onEvent",
+            "description": null,
+            "type": {
+              "kind": "NON_NULL",
+              "name": null,
+              "ofType": {
+                "kind": "ENUM",
+                "name": "EventType",
+                "ofType": null
+              }
+            },
+            "defaultValue": null,
+            "isDeprecated": false,
+            "deprecationReason": null
+          }
+        ],
+        "interfaces": null,
+        "enumValues": null,
+        "possibleTypes": null
+      },
       {
         "kind": "OBJECT",
         "name": "Query",
@@ -7033,6 +7643,113 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "notificationEventSettings",
+            "description": null,
+            "args": [
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "PaginateInput",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "NotificationEventSettings",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "notificationTemplates",
+            "description": null,
+            "args": [
+              {
+                "name": "where",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "NotificationTemplateWhereInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              },
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "INPUT_OBJECT",
+                  "name": "PaginateInput",
+                  "ofType": null
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "NotificationTemplate",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
+          },
+          {
+            "name": "notifications",
+            "description": "List of all notifications, readable only by the admin",
+            "args": [
+              {
+                "name": "paginate",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "PaginateInput",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "LIST",
+              "name": null,
+              "ofType": {
+                "kind": "OBJECT",
+                "name": "Notification",
+                "ofType": null
+              }
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
@@ -7691,6 +8408,35 @@
             },
             "isDeprecated": false,
             "deprecationReason": null
+          },
+          {
+            "name": "createNotificationEventSettings",
+            "description": null,
+            "args": [
+              {
+                "name": "input",
+                "description": null,
+                "type": {
+                  "kind": "NON_NULL",
+                  "name": null,
+                  "ofType": {
+                    "kind": "INPUT_OBJECT",
+                    "name": "CreateNotificationEventSettingsInput",
+                    "ofType": null
+                  }
+                },
+                "defaultValue": null,
+                "isDeprecated": false,
+                "deprecationReason": null
+              }
+            ],
+            "type": {
+              "kind": "OBJECT",
+              "name": "NotificationEventSettings",
+              "ofType": null
+            },
+            "isDeprecated": false,
+            "deprecationReason": null
           }
         ],
         "inputFields": null,
diff --git a/packages/admin/src/pages/notifications/index.tsx b/packages/admin/src/pages/notifications/index.tsx
new file mode 100644
index 000000000..3c74ceb28
--- /dev/null
+++ b/packages/admin/src/pages/notifications/index.tsx
@@ -0,0 +1,124 @@
+import React from 'react';
+import { NextPage } from 'next';
+
+import lodash from 'lodash';
+import { gql } from '@apollo/client';
+import { Text, Breadcrumbs, Loading } from '@geist-ui/react';
+
+import { Link } from '@components/Link';
+import { useGetAllUsersNotificationsQuery, NotificationType } from '@core/graphql';
+import { Calendar, CheckInCircle, XCircle } from '@geist-ui/react-icons';
+import { HasPermission } from '@components/HasPermission';
+
+const NotificationPageQuery = gql`
+  query getAllUsersNotifications($paginate: PaginateInput!) {
+    notifications(paginate: $paginate) {
+      id
+      type
+
+      createdAt
+
+      seenStatus
+
+      user {
+        photo
+        displayName
+      }
+    }
+  }
+`;
+
+const NotificationsPage: NextPage = () => {
+  const { data, loading } = useGetAllUsersNotificationsQuery({
+    variables: {
+      paginate: {
+        take: 20
+      }
+    }
+  });
+
+  const getNotificationIcon = (notificationType: NotificationType) => {
+    switch (notificationType) {
+      case NotificationType.JoinRequestAccepted:
+      case NotificationType.FundingRequestAccepted:
+        return <CheckInCircle color="green"/>;
+
+      case NotificationType.FundingRequestRejected:
+      case NotificationType.JoinRequestRejected:
+        return <XCircle color="red"/>;
+
+      case NotificationType.General:
+        return <Calendar/>;
+
+      default:
+        return <Calendar/>;
+    }
+  };
+
+  return (
+    <React.Fragment>
+      <Text h1>Notifications</Text>
+      <Breadcrumbs>
+        <Breadcrumbs.Item>Home</Breadcrumbs.Item>
+        <Breadcrumbs.Item>
+          <Link to="/notifications">Notifications</Link>
+        </Breadcrumbs.Item>
+      </Breadcrumbs>
+
+      {/* Notifications list  */}
+      <HasPermission permission="admin.features.preview">
+        <React.Fragment>
+          {loading && (
+            <Loading/>
+          )}
+
+          {data && (
+            <React.Fragment>
+              {data.notifications.map((n) => (
+                <React.Fragment key={n.id}>
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItems: 'center'
+                    }}
+                  >
+                    <div
+                      style={{
+                        borderRadius: '1000px',
+                        width: '35px',
+                        height: '35px',
+                        display: 'flex',
+                        justifyContent: 'center',
+                        alignItems: 'center',
+                        border: `solid 2px`,
+                        marginRight: 10
+                      }}
+                    >
+                      {getNotificationIcon(n.type)}
+                    </div>
+
+                    <Text>
+                      {lodash.startCase(n.type)}
+                    </Text>
+                  </div>
+                </React.Fragment>
+              ))}
+
+              {data.notifications.map((n) => (
+                <React.Fragment key={n.id}>
+                  {/*<User*/}
+                  {/*  src={n.user.photo}*/}
+                  {/*  name={n.user.displayName}*/}
+                  {/*/>*/}
+                </React.Fragment>
+              ))}
+            </React.Fragment>
+          )}
+        </React.Fragment>
+      </HasPermission>
+
+    </React.Fragment>
+  );
+};
+
+export default NotificationsPage;
\ No newline at end of file
diff --git a/packages/admin/src/pages/notifications/templates/index.tsx b/packages/admin/src/pages/notifications/templates/index.tsx
new file mode 100644
index 000000000..01a4504eb
--- /dev/null
+++ b/packages/admin/src/pages/notifications/templates/index.tsx
@@ -0,0 +1,33 @@
+import React from 'react';
+import { NextPage } from 'next';
+
+import { Text, Breadcrumbs } from '@geist-ui/react';
+
+import { Link } from '@components/Link';
+import { gql } from '@apollo/client';
+
+const NotificationTemplates = gql`
+
+`;
+
+const NotificationTemplatesPage: NextPage = () => {
+  return (
+    <React.Fragment>
+      <Text h1>Notifications</Text>
+      <Breadcrumbs>
+        <Breadcrumbs.Item>Home</Breadcrumbs.Item>
+        <Breadcrumbs.Item>
+          <Link to="/notifications">Notifications</Link>
+        </Breadcrumbs.Item>
+
+        <Breadcrumbs.Item>
+          <Link to="/notifications">Notification Templates</Link>
+        </Breadcrumbs.Item>
+      </Breadcrumbs>
+
+
+    </React.Fragment>
+  );
+};
+
+export default NotificationTemplatesPage;
\ No newline at end of file
diff --git a/packages/core/src/domain/validation/index.ts b/packages/core/src/domain/validation/index.ts
index f5a9d8403..ccea4032c 100644
--- a/packages/core/src/domain/validation/index.ts
+++ b/packages/core/src/domain/validation/index.ts
@@ -28,15 +28,20 @@ export const PermissionValidator = z.enum([
   'admin.commons.delist',
   'admin.commons.whitelist',
 
+  'admin.notification.read',
+
   'admin.notification.setting.event.create',
+  'admin.notification.setting.event.read',
   'admin.notification.setting.event.update',
   'admin.notification.setting.event.delete',
 
   'admin.notification.setting.create',
+  'admin.notification.setting.read',
   'admin.notification.setting.update',
   'admin.notification.setting.delete',
 
   'admin.notification.setting.template.create',
+  'admin.notification.setting.template.read',
   'admin.notification.setting.template.update',
   'admin.notification.setting.template.delete',
 
diff --git a/packages/graphql/src/generated/nexus-typegen.ts b/packages/graphql/src/generated/nexus-typegen.ts
index 70970e0c8..232209944 100644
--- a/packages/graphql/src/generated/nexus-typegen.ts
+++ b/packages/graphql/src/generated/nexus-typegen.ts
@@ -4,11 +4,10 @@
  */
 
 
-import { IRequestContext } from './../context';
-import { QueryComplexity } from 'nexus/dist/plugins/queryComplexityPlugin';
-import { FieldAuthorizeResolver } from 'nexus/dist/plugins/fieldAuthorizePlugin';
-import { core } from 'nexus';
-
+import { IRequestContext } from "./../context"
+import { QueryComplexity } from "nexus/dist/plugins/queryComplexityPlugin"
+import { FieldAuthorizeResolver } from "nexus/dist/plugins/fieldAuthorizePlugin"
+import { core } from "nexus"
 declare global {
   interface NexusGenCustomInputMethods<TypeName extends string> {
     /**
@@ -170,6 +169,11 @@ export interface NexusGenInputs {
     status?: NexusGenEnums['SortOrder'] | null; // SortOrder
     updatedAt?: NexusGenEnums['SortOrder'] | null; // SortOrder
   }
+  NotificationTemplateWhereInput: { // input type
+    forType?: NexusGenEnums['NotificationType'] | null; // NotificationType
+    language?: NexusGenEnums['NotificationLanguage'] | null; // NotificationLanguage
+    type?: NexusGenEnums['NotificationTemplateType'] | null; // NotificationTemplateType
+  }
   NotificationWhereInput: { // input type
     commonId?: NexusGenScalars['UUID'] | null; // UUID
     discussionId?: NexusGenScalars['UUID'] | null; // UUID
@@ -252,9 +256,11 @@ export interface NexusGenEnums {
   EventType: "CardCreated" | "CardCvvVerificationFailed" | "CardCvvVerificationPassed" | "CommonCreated" | "CommonDelisted" | "CommonMemberCreated" | "CommonMemberRoleAdded" | "CommonMemberRoleRemoved" | "CommonWhitelisted" | "DiscussionCreated" | "DiscussionMessageCreated" | "DiscussionSubscriptionCreated" | "DiscussionSubscriptionTypeChanged" | "FundingRequestAccepted" | "FundingRequestCreated" | "FundingRequestRejected" | "JoinRequestAccepted" | "JoinRequestCreated" | "JoinRequestRejected" | "NotificationTemplateCreated" | "NotificationTemplateUpdated" | "PaymentCreated" | "PaymentFailed" | "PaymentSucceeded" | "ProposalExpired" | "ProposalMajorityReached" | "ReportCreated" | "ReportDismissed" | "ReportRespected" | "RoleCreated" | "RoleDeleted" | "RolePermissionAdded" | "RolePermissionRemoved" | "RoleUpdated" | "UserAddedToRole" | "UserCreated" | "UserNotificationTokenCreated" | "UserNotificationTokenExpired" | "UserNotificationTokenRefreshed" | "UserNotificationTokenVoided" | "UserRemovedFromRole" | "VoteCreated"
   FundingState: "AwaitingApproval" | "Completed" | "Confirmed" | "Eligible" | "NotEligible" | "Pending"
   FundingType: "Monthly" | "OneTime"
-  NotificationSeenStatus: 'Done' | 'NotSeen' | 'Seen'
-  NotificationType: 'FundingRequestAccepted' | 'FundingRequestRejected' | 'General' | 'JoinRequestAccepted' | 'JoinRequestRejected'
-  PaymentState: 'NotAttempted' | 'Pending' | 'Successful' | 'Unsuccessful'
+  NotificationLanguage: "BG" | "EN" | "HE" | "JP" | "KO" | "RU"
+  NotificationSeenStatus: "Done" | "NotSeen" | "Seen"
+  NotificationTemplateType: "EmailNotification" | "PushNotification"
+  NotificationType: "FundingRequestAccepted" | "FundingRequestRejected" | "General" | "JoinRequestAccepted" | "JoinRequestRejected"
+  PaymentState: "NotAttempted" | "Pending" | "Successful" | "Unsuccessful"
   ProposalState: "Accepted" | "Countdown" | "Finalizing" | "Rejected"
   ProposalType: "FundingRequest" | "JoinRequest"
   ReportAction: "Dismissed" | "Respected"
@@ -400,6 +406,20 @@ export interface NexusGenObjects {
     sendToUser: boolean; // Boolean!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
+  NotificationTemplate: { // root type
+    bcc?: string | null; // String
+    bccName?: string | null; // String
+    content: string; // String!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    forType: NexusGenEnums['NotificationType']; // NotificationType!
+    from?: string | null; // String
+    fromName?: string | null; // String
+    id: NexusGenScalars['UUID']; // UUID!
+    language: NexusGenEnums['NotificationLanguage']; // NotificationLanguage!
+    subject: string; // String!
+    templateType: NexusGenEnums['NotificationTemplateType']; // NotificationTemplateType!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+  }
   Proposal: { // root type
     commonId: NexusGenScalars['UUID']; // UUID!
     commonMemberId: NexusGenScalars['UUID']; // UUID!
@@ -480,7 +500,7 @@ export interface NexusGenObjects {
 }
 
 export interface NexusGenInterfaces {
-  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['CommonSubscription'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['NotificationEventSettings'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
+  BaseEntity: NexusGenRootTypes['CommonMember'] | NexusGenRootTypes['CommonSubscription'] | NexusGenRootTypes['Discussion'] | NexusGenRootTypes['DiscussionMessage'] | NexusGenRootTypes['DiscussionSubscription'] | NexusGenRootTypes['FundingProposal'] | NexusGenRootTypes['JoinProposal'] | NexusGenRootTypes['Notification'] | NexusGenRootTypes['NotificationEventSettings'] | NexusGenRootTypes['NotificationTemplate'] | NexusGenRootTypes['Report'] | NexusGenRootTypes['Role'] | NexusGenRootTypes['Statistic'] | NexusGenRootTypes['UserNotificationToken'];
 }
 
 export interface NexusGenUnions {
@@ -649,6 +669,20 @@ export interface NexusGenFieldTypes {
     sendToUser: boolean; // Boolean!
     updatedAt: NexusGenScalars['DateTime']; // DateTime!
   }
+  NotificationTemplate: { // field return type
+    bcc: string | null; // String
+    bccName: string | null; // String
+    content: string; // String!
+    createdAt: NexusGenScalars['DateTime']; // DateTime!
+    forType: NexusGenEnums['NotificationType']; // NotificationType!
+    from: string | null; // String
+    fromName: string | null; // String
+    id: NexusGenScalars['UUID']; // UUID!
+    language: NexusGenEnums['NotificationLanguage']; // NotificationLanguage!
+    subject: string; // String!
+    templateType: NexusGenEnums['NotificationTemplateType']; // NotificationTemplateType!
+    updatedAt: NexusGenScalars['DateTime']; // DateTime!
+  }
   Proposal: { // field return type
     common: NexusGenRootTypes['Common']; // Common!
     commonId: NexusGenScalars['UUID']; // UUID!
@@ -684,6 +718,9 @@ export interface NexusGenFieldTypes {
     events: Array<NexusGenRootTypes['Event'] | null> | null; // [Event]
     generateUserAuthToken: string; // String!
     getStatistics: Array<NexusGenRootTypes['Statistic'] | null> | null; // [Statistic]
+    notificationEventSettings: Array<NexusGenRootTypes['NotificationEventSettings'] | null> | null; // [NotificationEventSettings]
+    notificationTemplates: Array<NexusGenRootTypes['NotificationTemplate'] | null> | null; // [NotificationTemplate]
+    notifications: Array<NexusGenRootTypes['Notification'] | null> | null; // [Notification]
     proposal: NexusGenRootTypes['Proposal'] | null; // Proposal
     proposals: Array<NexusGenRootTypes['Proposal'] | null> | null; // [Proposal]
     roles: Array<NexusGenRootTypes['Role'] | null> | null; // [Role]
@@ -927,6 +964,20 @@ export interface NexusGenFieldTypeNames {
     sendToUser: 'Boolean'
     updatedAt: 'DateTime'
   }
+  NotificationTemplate: { // field return type name
+    bcc: 'String'
+    bccName: 'String'
+    content: 'String'
+    createdAt: 'DateTime'
+    forType: 'NotificationType'
+    from: 'String'
+    fromName: 'String'
+    id: 'UUID'
+    language: 'NotificationLanguage'
+    subject: 'String'
+    templateType: 'NotificationTemplateType'
+    updatedAt: 'DateTime'
+  }
   Proposal: { // field return type name
     common: 'Common'
     commonId: 'UUID'
@@ -962,6 +1013,9 @@ export interface NexusGenFieldTypeNames {
     events: 'Event'
     generateUserAuthToken: 'String'
     getStatistics: 'Statistic'
+    notificationEventSettings: 'NotificationEventSettings'
+    notificationTemplates: 'NotificationTemplate'
+    notifications: 'Notification'
     proposal: 'Proposal'
     proposals: 'Proposal'
     roles: 'Role'
@@ -1174,6 +1228,16 @@ export interface NexusGenArgTypes {
     getStatistics: { // args
       where?: NexusGenInputs['StatisticsWhereInput'] | null; // StatisticsWhereInput
     }
+    notificationEventSettings: { // args
+      paginate: NexusGenInputs['PaginateInput']; // PaginateInput!
+    }
+    notificationTemplates: { // args
+      paginate?: NexusGenInputs['PaginateInput'] | null; // PaginateInput
+      where?: NexusGenInputs['NotificationTemplateWhereInput'] | null; // NotificationTemplateWhereInput
+    }
+    notifications: { // args
+      paginate: NexusGenInputs['PaginateInput']; // PaginateInput!
+    }
     proposal: { // args
       where: NexusGenInputs['ProposalWhereUniqueInput']; // ProposalWhereUniqueInput!
     }
@@ -1226,7 +1290,7 @@ export interface NexusGenArgTypes {
 }
 
 export interface NexusGenAbstractTypeMembers {
-  BaseEntity: 'CommonMember' | 'CommonSubscription' | 'Discussion' | 'DiscussionMessage' | 'DiscussionSubscription' | 'FundingProposal' | 'JoinProposal' | 'Notification' | 'NotificationEventSettings' | 'Report' | 'Role' | 'Statistic' | 'UserNotificationToken'
+  BaseEntity: "CommonMember" | "CommonSubscription" | "Discussion" | "DiscussionMessage" | "DiscussionSubscription" | "FundingProposal" | "JoinProposal" | "Notification" | "NotificationEventSettings" | "NotificationTemplate" | "Report" | "Role" | "Statistic" | "UserNotificationToken"
 }
 
 export interface NexusGenTypeInterfaces {
@@ -1237,9 +1301,10 @@ export interface NexusGenTypeInterfaces {
   DiscussionSubscription: "BaseEntity"
   FundingProposal: "BaseEntity"
   JoinProposal: "BaseEntity"
-  Notification: 'BaseEntity'
-  NotificationEventSettings: 'BaseEntity'
-  Report: 'BaseEntity'
+  Notification: "BaseEntity"
+  NotificationEventSettings: "BaseEntity"
+  NotificationTemplate: "BaseEntity"
+  Report: "BaseEntity"
   Role: "BaseEntity"
   Statistic: "BaseEntity"
   UserNotificationToken: "BaseEntity"
diff --git a/packages/graphql/src/generated/schema.graphql b/packages/graphql/src/generated/schema.graphql
index e944b13a8..323e389fa 100644
--- a/packages/graphql/src/generated/schema.graphql
+++ b/packages/graphql/src/generated/schema.graphql
@@ -553,6 +553,15 @@ type NotificationEventSettings implements BaseEntity {
   updatedAt: DateTime!
 }
 
+enum NotificationLanguage {
+  BG
+  EN
+  HE
+  JP
+  KO
+  RU
+}
+
 input NotificationOrderByInput {
   createdAt: SortOrder
   status: SortOrder
@@ -565,6 +574,38 @@ enum NotificationSeenStatus {
   Seen
 }
 
+type NotificationTemplate implements BaseEntity {
+  bcc: String
+  bccName: String
+  content: String!
+
+  """The date, at which the item was created"""
+  createdAt: DateTime!
+  forType: NotificationType!
+  from: String
+  fromName: String
+
+  """The main identifier of the item"""
+  id: UUID!
+  language: NotificationLanguage!
+  subject: String!
+  templateType: NotificationTemplateType!
+
+  """The date, at which the item was last modified"""
+  updatedAt: DateTime!
+}
+
+enum NotificationTemplateType {
+  EmailNotification
+  PushNotification
+}
+
+input NotificationTemplateWhereInput {
+  forType: NotificationType
+  language: NotificationLanguage
+  type: NotificationTemplateType
+}
+
 enum NotificationType {
   FundingRequestAccepted
   FundingRequestRejected
@@ -683,6 +724,11 @@ type Query {
   events(paginate: PaginateInput): [Event]
   generateUserAuthToken(authId: String!): String!
   getStatistics(where: StatisticsWhereInput): [Statistic]
+  notificationEventSettings(paginate: PaginateInput!): [NotificationEventSettings]
+  notificationTemplates(paginate: PaginateInput, where: NotificationTemplateWhereInput): [NotificationTemplate]
+
+  """List of all notifications, readable only by the admin"""
+  notifications(paginate: PaginateInput!): [Notification]
   proposal(where: ProposalWhereUniqueInput!): Proposal
   proposals(paginate: PaginateInput, where: ProposalWhereInput): [Proposal]
   roles(paginate: PaginateInput): [Role]
diff --git a/packages/graphql/src/schema/Types/Notifications/Enums/NotificationLanguage.enum.ts b/packages/graphql/src/schema/Types/Notifications/Enums/NotificationLanguage.enum.ts
new file mode 100644
index 000000000..9e0774ff3
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Enums/NotificationLanguage.enum.ts
@@ -0,0 +1,7 @@
+import { enumType } from 'nexus';
+import { NotificationLanguage } from '@prisma/client';
+
+export const NotificationLanguageEnum = enumType({
+  name: 'NotificationLanguage',
+  members: NotificationLanguage
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Enums/NotificationTemplateType.enum.ts b/packages/graphql/src/schema/Types/Notifications/Enums/NotificationTemplateType.enum.ts
new file mode 100644
index 000000000..aaef4a7d3
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Enums/NotificationTemplateType.enum.ts
@@ -0,0 +1,7 @@
+import { enumType } from 'nexus';
+import { NotificationTemplateType } from '@prisma/client';
+
+export const NotificationTemplateTypeEnum = enumType({
+  name: 'NotificationTemplateType',
+  members: NotificationTemplateType
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Inputs/NotificationTemplateWhere.input.ts b/packages/graphql/src/schema/Types/Notifications/Inputs/NotificationTemplateWhere.input.ts
new file mode 100644
index 000000000..c012e7924
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Inputs/NotificationTemplateWhere.input.ts
@@ -0,0 +1,18 @@
+import { inputObjectType } from 'nexus';
+
+export const NotificationTemplateWhereInput = inputObjectType({
+  name: 'NotificationTemplateWhereInput',
+  definition(t) {
+    t.field('language', {
+      type: 'NotificationLanguage'
+    });
+
+    t.field('forType', {
+      type: 'NotificationType'
+    });
+
+    t.field('type', {
+      type: 'NotificationTemplateType'
+    });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationEventSettings.query.ts b/packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationEventSettings.query.ts
new file mode 100644
index 000000000..6fcbc25c2
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationEventSettings.query.ts
@@ -0,0 +1,26 @@
+import { queryField, list, arg, nonNull } from 'nexus';
+import { authorizationService, prisma } from '@common/core';
+
+export const GetNotificationEventSettingsQuery = queryField('notificationEventSettings', {
+  type: list('NotificationEventSettings'),
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.notification.setting.event.read');
+  },
+  args: {
+    paginate: nonNull(
+      arg({
+        type: 'PaginateInput'
+      })
+    )
+  },
+  resolve: (root, args) => {
+    return prisma.notificationEventSettings
+      .findMany({
+        orderBy: {
+          createdAt: 'desc'
+        },
+        skip: args.paginate?.skip || undefined,
+        take: args.paginate?.take || undefined
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationTemplates.query.ts b/packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationTemplates.query.ts
new file mode 100644
index 000000000..265c37cd0
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Queries/GetNotificationTemplates.query.ts
@@ -0,0 +1,26 @@
+import { queryField, list } from 'nexus';
+import { authorizationService, prisma } from '@common/core';
+
+export const GetNotificationTemplatesQuery = queryField('notificationTemplates', {
+  type: list('NotificationTemplate'),
+  args: {
+    where: 'NotificationTemplateWhereInput',
+    paginate: 'PaginateInput'
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.notification.setting.template.read');
+  },
+  resolve: (root, args) => {
+    return prisma.notificationTemplate
+      .findMany({
+        orderBy: {
+          forType: 'asc'
+        },
+
+        skip: args.paginate?.skip || undefined,
+        take: args.paginate?.take || undefined,
+
+        where: (args.where as any) || undefined
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Queries/GetNotifications.query.ts b/packages/graphql/src/schema/Types/Notifications/Queries/GetNotifications.query.ts
new file mode 100644
index 000000000..40592b48d
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Queries/GetNotifications.query.ts
@@ -0,0 +1,28 @@
+import { queryField, list, nonNull, arg } from 'nexus';
+import { authorizationService, prisma } from '@common/core';
+
+export const GetNotificationsQuery = queryField('notifications', {
+  type: list('Notification'),
+  description: 'List of all notifications, readable only by the admin',
+  args: {
+    paginate: nonNull(
+      arg({
+        type: 'PaginateInput'
+      })
+    )
+  },
+  authorize: async (root, args, ctx) => {
+    return authorizationService.can(await ctx.getUserId(), 'admin.notification.read');
+  },
+  resolve: (root, args) => {
+    return prisma.notification
+      .findMany({
+        orderBy: {
+          createdAt: 'desc'
+        },
+
+        skip: args.paginate?.skip || undefined,
+        take: args.paginate?.take || undefined
+      });
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/Types/NotificationTemplate.type.ts b/packages/graphql/src/schema/Types/Notifications/Types/NotificationTemplate.type.ts
new file mode 100644
index 000000000..6a72db3ea
--- /dev/null
+++ b/packages/graphql/src/schema/Types/Notifications/Types/NotificationTemplate.type.ts
@@ -0,0 +1,29 @@
+import { objectType } from 'nexus';
+
+export const NotificationTemplateType = objectType({
+  name: 'NotificationTemplate',
+  definition(t) {
+    t.implements('BaseEntity');
+
+    t.nonNull.field('forType', {
+      type: 'NotificationType'
+    });
+
+    t.nonNull.field('templateType', {
+      type: 'NotificationTemplateType'
+    });
+
+    t.nonNull.field('language', {
+      type: 'NotificationLanguage'
+    });
+
+    t.nonNull.string('subject');
+    t.nonNull.string('content');
+
+    t.string('from');
+    t.string('fromName');
+
+    t.string('bcc');
+    t.string('bccName');
+  }
+});
\ No newline at end of file
diff --git a/packages/graphql/src/schema/Types/Notifications/index.ts b/packages/graphql/src/schema/Types/Notifications/index.ts
index 7d8065a14..1baede1eb 100644
--- a/packages/graphql/src/schema/Types/Notifications/index.ts
+++ b/packages/graphql/src/schema/Types/Notifications/index.ts
@@ -15,13 +15,25 @@ import { NotificationWhereUniqueInput } from './Inputs/NotificationWhereUnique.i
 import { NotificationOrderByInput } from './Inputs/NotificationOrderBy.input';
 
 import { NotificationCreatedSubscription } from './Subscriptions/NotificationCreated.subscription';
+
 import { CreateNotificationEventSettingsMutation } from './Mutations/CreateNotificationEventSettings.mutation';
 
+import { GetNotificationEventSettingsQuery } from './Queries/GetNotificationEventSettings.query';
+import { GetNotificationsQuery } from './Queries/GetNotifications.query';
+import { NotificationLanguageEnum } from './Enums/NotificationLanguage.enum';
+import { NotificationTemplateType } from './Types/NotificationTemplate.type';
+import { NotificationTemplateTypeEnum } from './Enums/NotificationTemplateType.enum';
+import { NotificationTemplateWhereInput } from './Inputs/NotificationTemplateWhere.input';
+import { GetNotificationTemplatesQuery } from './Queries/GetNotificationTemplates.query';
+
 export const NotificationTypes = [
   NotificationTypeEnum,
   NotificationSeenStatusEnum,
+  NotificationLanguageEnum,
+  NotificationTemplateTypeEnum,
 
   NotificationType,
+  NotificationTemplateType,
   NotificationEventSettingsType,
 
   NotificationUserExtension,
@@ -31,10 +43,15 @@ export const NotificationTypes = [
 
   NotificationWhereInput,
   NotificationWhereUniqueInput,
+  NotificationTemplateWhereInput,
 
   NotificationOrderByInput,
 
   NotificationCreatedSubscription,
 
-  CreateNotificationEventSettingsMutation
+  CreateNotificationEventSettingsMutation,
+
+  GetNotificationEventSettingsQuery,
+  GetNotificationTemplatesQuery,
+  GetNotificationsQuery
 ];
\ No newline at end of file