Skip to content

Commit

Permalink
Merge branch 'checkin-checkoout' of https://github.com/git-init-priya…
Browse files Browse the repository at this point in the history
…nshu/talawa-api-clone into checkin-checkoout
  • Loading branch information
git-init-priyanshu committed Mar 30, 2024
2 parents 9b78e83 + eb40d3b commit 6d88093
Show file tree
Hide file tree
Showing 20 changed files with 1,005 additions and 424 deletions.
18 changes: 17 additions & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"lint-staged": "lint-staged",
"format:fix": "prettier --write \"**/*.{ts,tsx,json,scss,css}\"",
"format:check": "prettier --check \"**/*.{ts,tsx,json,scss,css}\"",
"prepare": "husky init",
"prepare": "husky",
"generate:graphql-markdown": "graphql-markdown http://localhost:4000/graphql > docs/Schema.md",
"generate:graphql-schema": "get-graphql-schema http://localhost:4000/graphql --json > docs/schema.json",
"generate:ssl-private-key": "openssl genrsa -out ./key.pem",
Expand Down Expand Up @@ -103,6 +103,7 @@
"@graphql-codegen/typescript": "^4.0.6",
"@graphql-codegen/typescript-resolvers": "^4.0.6",
"@graphql-eslint/eslint-plugin": "^3.20.1",
"@parcel/watcher": "^2.4.1",
"@types/bcryptjs": "^2.4.6",
"@types/cls-hooked": "^4.3.8",
"@types/copy-paste": "^1.1.30",
Expand Down Expand Up @@ -133,7 +134,7 @@
"graphql-markdown": "^7.0.0",
"husky": "^9.0.11",
"lint-staged": "^15.2.2",
"prettier": "3.2.5",
"prettier": "^3.2.5",
"rimraf": "^5.0.5",
"tsx": "^4.7.0",
"typescript": "^5.4.2",
Expand Down
60 changes: 58 additions & 2 deletions schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,13 @@ input CreateActionItemInput {
preCompletionNotes: String
}

union CreateAdminError = OrganizationMemberNotFoundError | OrganizationNotFoundError | UserNotAuthorizedError | UserNotFoundError

type CreateAdminPayload {
user: AppUserProfile
userErrors: [CreateAdminError!]!
}

input CreateAdvertisementInput {
endDate: Date!
mediaFile: String!
Expand Down Expand Up @@ -301,6 +308,22 @@ input CreateAgendaSectionInput {
sequence: Int!
}

union CreateCommentError = PostNotFoundError

type CreateCommentPayload {
comment: Comment
userErrors: [CreateCommentError!]!
}

union CreateDirectChatError = OrganizationNotFoundError | UserNotFoundError

union CreateMemberError = MemberNotFoundError | OrganizationNotFoundError | UserNotAuthorizedAdminError | UserNotAuthorizedError | UserNotFoundError

type CreateMemberPayload {
organization: Organization
userErrors: [CreateMemberError!]!
}

input CreateUserTagInput {
name: String!
organizationId: ID!
Expand Down Expand Up @@ -933,6 +956,10 @@ type MaximumValueError implements FieldError {
path: [String!]!
}

type MemberNotFoundError implements Error {
message: String!
}

type MembershipRequest {
_id: ID!
organization: Organization!
Expand Down Expand Up @@ -1008,7 +1035,7 @@ type Mutation {
checkOut(data: CheckInCheckOutInput!): CheckOut!
createActionItem(actionItemCategoryId: ID!, data: CreateActionItemInput!): ActionItem!
createActionItemCategory(name: String!, organizationId: ID!): ActionItemCategory!
createAdmin(data: UserAndOrganizationInput!): AppUserProfile!
createAdmin(data: UserAndOrganizationInput!): CreateAdminPayload!
createAdvertisement(input: CreateAdvertisementInput!): CreateAdvertisementPayload
createAgendaCategory(input: CreateAgendaCategoryInput!): AgendaCategory!
createAgendaItem(input: CreateAgendaItemInput!): AgendaItem!
Expand All @@ -1022,7 +1049,7 @@ type Mutation {
createFundraisingCampaign(data: FundCampaignInput!): FundraisingCampaign!
createFundraisingCampaignPledge(data: FundCampaignPledgeInput!): FundraisingCampaignPledge!
createGroupChat(data: createGroupChatInput!): GroupChat!
createMember(input: UserAndOrganizationInput!): Organization!
createMember(input: UserAndOrganizationInput!): CreateMemberPayload!
createMessageChat(data: MessageChatInput!): MessageChat!
createOrganization(data: OrganizationInput, file: String): Organization!
createPlugin(pluginCreatedBy: String!, pluginDesc: String!, pluginName: String!, uninstalledOrgs: [ID!]): Plugin!
Expand Down Expand Up @@ -1173,6 +1200,14 @@ input OrganizationInput {
visibleInSearch: Boolean
}

type OrganizationMemberNotFoundError implements Error {
message: String!
}

type OrganizationNotFoundError implements Error {
message: String!
}

enum OrganizationOrderByInput {
apiUrl_ASC
apiUrl_DESC
Expand Down Expand Up @@ -1302,6 +1337,10 @@ input PostInput {
videoUrl: URL
}

type PostNotFoundError implements Error {
message: String!
}

enum PostOrderByInput {
commentCount_ASC
commentCount_DESC
Expand Down Expand Up @@ -1730,6 +1769,18 @@ input UserInput {
password: String!
}

type UserNotAuthorizedAdminError implements Error {
message: String!
}

type UserNotAuthorizedError implements Error {
message: String!
}

type UserNotFoundError implements Error {
message: String!
}

enum UserOrderByInput {
email_ASC
email_DESC
Expand Down Expand Up @@ -1870,6 +1921,11 @@ input createChatInput {
userIds: [ID!]!
}

type createDirectChatPayload {
directChat: DirectChat
userErrors: [CreateDirectChatError!]!
}

input createGroupChatInput {
organizationId: ID!
title: String!
Expand Down
1 change: 0 additions & 1 deletion src/env.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import z from "zod";

export const envSchema = z.object({
NODE_ENV: z
.string()
Expand Down
Loading

0 comments on commit 6d88093

Please sign in to comment.