Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/remove private org #1641

Closed
Closed
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
03d1451
updated node version
AVtheking Dec 25, 2023
a396178
Merge branch 'develop' into fix/upgrade_to_Node_20(LTS)
AVtheking Dec 25, 2023
6d1769e
deleted video file
AVtheking Dec 26, 2023
570dbd3
fix falling test
AVtheking Dec 27, 2023
2aa975a
removed private org
AVtheking Jan 6, 2024
35203e0
fix redis port
AVtheking Jan 6, 2024
35a84e3
fix failing test case
AVtheking Jan 6, 2024
d3e6ea3
Revert "restored countline.py functionality to our github action flow…
palisadoes Dec 25, 2023
c8f9557
Remove unused packages from package.json (#1551)
Community-Programmer Dec 25, 2023
f269687
Update CONTRIBUTING.md
palisadoes Dec 27, 2023
97b8ac5
restored countline.py functionality to our github action flow (#1573)
AdityaRaimec22 Dec 27, 2023
fdbff9a
feat: Updated the LAST_RESORT_SUPERADMIN_EMAIL logic during setup (#1…
Doraemon012 Dec 28, 2023
68c57c6
Added script to generate table of content (#1587)
Veer0x1 Dec 28, 2023
2a1dced
Revert "Added script to generate table of content (#1587)" (#1592)
palisadoes Dec 28, 2023
a10ba34
table of content script (#1600)
Veer0x1 Dec 30, 2023
4801fff
Update INSTALLATION.md
palisadoes Dec 31, 2023
3e7674d
chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)
dependabot[bot] Jan 1, 2024
0a6f484
chore(deps): bump eslint-plugin-import from 2.28.1 to 2.29.1 (#1615)
dependabot[bot] Jan 1, 2024
3af01de
chore(deps): bump nodemailer and @types/nodemailer (#1613)
dependabot[bot] Jan 1, 2024
6ff4013
chore(deps): bump @types/bcryptjs from 2.4.5 to 2.4.6 (#1612)
dependabot[bot] Jan 1, 2024
c8500cc
updated express-rate-limit package (#1621)
Veer0x1 Jan 2, 2024
1a06b42
fix: Removed depricated xss-clean package (#1536)
akhilender-bongirwar Jan 3, 2024
9f6415f
Standardized the assets (#1630)
Veer0x1 Jan 4, 2024
8266774
Fixes access to image from the frontend (#1631)
wingman47 Jan 5, 2024
10b9b9b
updated node version
AVtheking Dec 25, 2023
ee6b98a
fix falling test
AVtheking Dec 27, 2023
1dc90a4
fix
AVtheking Jan 6, 2024
fc3e019
Merge branch 'develop' into feat/remove_private_org
AVtheking Jan 6, 2024
76fb6bb
Added script to generate table of content (#1587)
Veer0x1 Dec 28, 2023
34feaaf
fix: Removed depricated xss-clean package (#1536)
akhilender-bongirwar Jan 3, 2024
70ea814
Added script to generate table of content (#1587)
Veer0x1 Dec 28, 2023
1014611
table of content script (#1600)
Veer0x1 Dec 30, 2023
aee1c1d
Update INSTALLATION.md
palisadoes Dec 31, 2023
c9c3bea
chore(deps): bump @types/i18n from 0.13.8 to 0.13.10 (#1616)
dependabot[bot] Jan 1, 2024
c83bf20
fix: Removed depricated xss-clean package (#1536)
akhilender-bongirwar Jan 3, 2024
93235ba
updated node version
AVtheking Dec 25, 2023
1deea6d
removed comments
AVtheking Jan 6, 2024
e454acc
fix
AVtheking Jan 6, 2024
320486e
fix
AVtheking Jan 6, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,12 @@ npm run lint:fix

npm run gen:schema

# Generate table of contents for markdown files in root directory
npm run update:toc
# Check if any markdown files have been changed
if git diff --cached --name-only | grep -E '\.md$'
then
# Generate table of contents for markdown files in root directory
npm run generate:toc
fi

# Add the changes made to the stage
git add .
8 changes: 4 additions & 4 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
- [Scope](#scope)
- [Enforcement](#enforcement)
- [Enforcement Guidelines](#enforcement-guidelines)
- [1. Correction](#1-correction)
- [2. Warning](#2-warning)
- [3. Temporary Ban](#3-temporary-ban)
- [4. Permanent Ban](#4-permanent-ban)
* [1. Correction](#1-correction)
* [2. Warning](#2-warning)
* [3. Temporary Ban](#3-temporary-ban)
* [4. Permanent Ban](#4-permanent-ban)
- [Attribution](#attribution)

<!-- tocstop -->
Expand Down
39 changes: 19 additions & 20 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,26 +10,26 @@ If you are new to contributing to open source, please read the Open Source Guide

- [Code of Conduct](#code-of-conduct)
- [Ways to Contribute](#ways-to-contribute)
- [Our Development Process](#our-development-process)
- [Issues](#issues)
- [Pull Requests](#pull-requests)
- [Branching Strategy](#branching-strategy)
- [Conflict Resolution](#conflict-resolution)
- [Contributing Code](#contributing-code)
* [Our Development Process](#our-development-process)
+ [Issues](#issues)
+ [Pull Requests](#pull-requests)
+ [Branching Strategy](#branching-strategy)
+ [Conflict Resolution](#conflict-resolution)
* [Contributing Code](#contributing-code)
- [Upgrading Code](#upgrading-code)
- [Setting up Upstream and Origin](#setting-up-upstream-and-origin)
- [Creating a Pull Request - Process Overview](#creating-a-pull-request---process-overview)
+ [Setting up Upstream and Origin](#setting-up-upstream-and-origin)
+ [Creating a Pull Request - Process Overview](#creating-a-pull-request---process-overview)
- [Type checking and code quality](#type-checking-and-code-quality)
- [Type checking code files](#type-checking-code-files)
- [Linting code files](#linting-code-files)
- [Formatting code files](#formatting-code-files)
- [Generating Table of Contents](#generating-table-of-contents)
- [Automation using husky](#automation-using-husky)
- [Pre-Commit hook](#pre-commit-hook)
- [Post-Merge hook](#post-merge-hook)
- [GraphQL Voyager](#graphql-voyager)
- [GraphQL Markdown](#graphql-markdown)
- [Running Queries with talawa-api](#running-queries-with-talawa-api)
* [Type checking code files](#type-checking-code-files)
* [Linting code files](#linting-code-files)
* [Formatting code files](#formatting-code-files)
* [Generating Table of Contents](#generating-table-of-contents)
* [Automation using husky](#automation-using-husky)
+ [Pre-Commit hook](#pre-commit-hook)
+ [Post-Merge hook](#post-merge-hook)
* [GraphQL Voyager](#graphql-voyager)
* [GraphQL Markdown](#graphql-markdown)
* [Running Queries with talawa-api](#running-queries-with-talawa-api)
- [Internships](#internships)
- [Community](#community)

Expand Down Expand Up @@ -243,7 +243,7 @@ To fix formatting issues in code use this command:-
### Generating Table of Contents
To generate table of contents for markdown files use this command:-
```bash
npm run update:toc
npm run generate:toc
```
And if you want to generate table of content for specific file you can use the `markdown-toc` package directly as shown:-
```bash
Expand All @@ -253,7 +253,6 @@ Remember to replace `README.md` with the name of the file you want to generate t
</br>
For more information on how to use `markdown-toc` package, visit [this link](https://www.npmjs.com/package/markdown-toc).


### Automation using husky

<br/>
Expand Down
93 changes: 49 additions & 44 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,64 @@ This document provides instructions on how to set up and start a running instanc

- [Prerequisites](#prerequisites)
- [Install node.js](#install-nodejs)

- [Install npm](#install-npm)
- [Install TypeScript](#install-typescript)
- [Install git](#install-git)
- [Setting up this repository](#setting-up-this-repository)
- [Install the Required Packages](#install-the-required-packages)
- [Installation Using Docker](#installation-using-docker)
- [Installation without Docker](#installation-without-docker)
- [Install MongoDB](#install-mongodb)
- [Setting up the mongoDB database](#setting-up-the-mongodb-database)
- [Install Redis](#install-redis)
- [Performance Benefits](#performance-benefits)
- [Setting Up Redis](#setting-up-redis)
* [Install MongoDB](#install-mongodb)
+ [Setting up the mongoDB database](#setting-up-the-mongodb-database)
* [Install Redis](#install-redis)
+ [Performance Benefits](#performance-benefits)
+ [Setting Up Redis](#setting-up-redis)
- [Configuration](#configuration)
- [Automated Configuration of `.env`](#automated-configuration-of-env)
- [Manual Configuration of `.env`](#manual-configuration-of-env)
- [The Environment Variables in `.env`](#the-environment-variables-in-env)
- [Changing the Development Environment in the .env file](#changing-the-development-environment-in-the-env-file)
- [Generating Token Secrets](#generating-token-secrets)
- [Setting up ACCESS_TOKEN_SECRET in the .env file](#setting-up-access_token_secret-in-the-env-file)
- [Linux](#linux)
- [Windows](#windows)
- [Setting up REFRESH_TOKEN_SECRET in the .env file](#setting-up-refresh_token_secret-in-the-env-file)
- [Configuring MongoDB in the .env file](#configuring-mongodb-in-the-env-file)
- [Using the CLI to get the MONGODB_URL Connection String](#using-the-cli-to-get-the-mongodb_url-connection-string)
- [Using Microsoft Windows to get the MONGODB_URL Connection String](#using-microsoft-windows-to-get-the-mongodb_url-connection-string)
- [Configuring Redis in .env file](#configuring-redis-in-env-file)
- [For Local Setup (Linux and WSL)](#for-local-setup-linux-and-wsl)
- [For Remote Setup (Redis Cloud)](#for-remote-setup-redis-cloud)
- [Setting up .env LAST_RESORT_SUPERADMIN_EMAIL parameter in the .env file](#setting-up-env-last_resort_superadmin_email-parameter-in-the-env-file)
- [Configuring Google ReCAPTCHA in the .env file](#configuring-google-recaptcha-in-the-env-file)
- [Setting up the RECAPTCHA_SECRET_KEY](#setting-up-the-recaptcha_secret_key)
- [Setting up .env MAIL_USERNAME and MAIL_PASSWORD ReCAPTCHA Parameters](#setting-up-env-mail_username-and-mail_password-recaptcha-parameters)
- [Setting up SMTP Email Variables in the .env File](#setting-up-smtp-email-variables-in-the-env-file)
- [Setting up Logger configurations _(optional)_](#setting-up-logger-configurations-_optional_)
- [Setting up COLORIZE_LOGS in .env file](#setting-up-colorize_logs-in-env-file)
- [Setting up LOG_LEVEL in .env file](#setting-up-log_level-in-env-file)
- [The .env Configuration File](#the-env-configuration-file)
- [Changing the environment of talawa-api](#changing-the-environment-of-talawa-api)
- [Generating Token Secrets](#generating-token-secrets)
- [Setting up ACCESS_TOKEN_SECRET in .env file](#setting-up-access_token_secret-in-env-file)
- [Linux](#linux)
- [Windows](#windows)
+ [Setting up REFRESH_TOKEN_SECRET in .env file](#setting-up-refresh_token_secret-in-env-file)
* [Configuring MongoDB](#configuring-mongodb)
+ [Setting up the MONGODB_URL in .env file](#setting-up-the-mongodb_url-in-env-file)
+ [Using the CLI to get the MONGODB_URL Connection String](#using-the-cli-to-get-the-mongodb_url-connection-string)
+ [Using Microsoft Windows to get the MONGODB_URL Connection String](#using-microsoft-windows-to-get-the-mongodb_url-connection-string)
* [Configuring Redis](#configuring-redis)
+ [For Local Setup (Linux and WSL)](#for-local-setup-linux-and-wsl)
+ [For Remote Setup (Redis Cloud)](#for-remote-setup-redis-cloud)
* [Setting up .env LAST_RESORT_SUPERADMIN_EMAIL parameter](#setting-up-env-last_resort_superadmin_email-parameter)
* [Configuring Google ReCAPTCHA](#configuring-google-recaptcha)
+ [Setting up RECAPTCHA_SECRET_KEY in .env file](#setting-up-recaptcha_secret_key-in-env-file)
+ [Setting up .env MAIL_USERNAME and MAIL_PASSWORD ReCAPTCHA Parameters](#setting-up-env-mail_username-and-mail_password-recaptcha-parameters)
+ [Setting up .env SMTP Variables](#setting-up-env-smtp-variables)
* [Setting up Logger configurations _(optional)_](#setting-up-logger-configurations-_optional_)
+ [Setting up COLORIZE_LOGS in .env file](#setting-up-colorize_logs-in-env-file)
+ [Setting up LOG_LEVEL in .env file](#setting-up-log_level-in-env-file)
- [Importing Sample Database](#importing-sample-database)
- [Syntax:](#syntax)
- [Examples:](#examples)
- [Sample Data Overview:](#sample-data-overview)
- [User Accounts and Organizations:](#user-accounts-and-organizations)
- [Posts](#posts)
- [Events](#events)
* [Syntax:](#syntax)
* [Examples:](#examples)
* [Sample Data Overview:](#sample-data-overview)
+ [User Accounts and Organizations:](#user-accounts-and-organizations)
+ [Posts](#posts)
+ [Events](#events)
- [Running Talawa-API](#running-talawa-api)
- [How to Access the Talawa-API URL](#how-to-access-the-talawa-api-url)
- [For Talawa-API Developers](#for-talawa-api-developers)
- [For Mobile App Developers](#for-mobile-app-developers)
- [On Android Virtual Device](#on-android-virtual-device)
- [On a Real Mobile Device](#on-a-real-mobile-device)
- [For Talawa-Admin Developers](#for-talawa-admin-developers)
* [For Talawa-API Developers](#for-talawa-api-developers)
* [For Mobile App Developers](#for-mobile-app-developers)
+ [On Android Virtual Device](#on-android-virtual-device)
+ [On a Real Mobile Device](#on-a-real-mobile-device)
* [For Talawa-Admin Developers](#for-talawa-admin-developers)
- [Accessing MongoDB](#accessing-mongodb)
- [Managing MongoDB using the MongoDB Compass GUI](#managing-mongodb-using-the-mongodb-compass-gui)
- [Managing MongoDB using the VSCode extension](#managing-mongodb-using-the-vscode-extension)
* [Managing MongoDB using the MongoDB Compass GUI](#managing-mongodb-using-the-mongodb-compass-gui)
* [Managing MongoDB using the VSCode extension](#managing-mongodb-using-the-vscode-extension)
- [Manually Adding The First Super Admin User](#manually-adding-the-first-super-admin-user)
- [Using MongoDB Compass](#using-mongodb-compass)
- [Using Mongo Shell](#using-mongo-shell)
* [Using MongoDB Compass](#using-mongodb-compass)
* [Using Mongo Shell](#using-mongo-shell)
- [Other](#other)
- [Changing default talawa-api port](#changing-default-talawa-api-port)
* [Changing default talawa-api port](#changing-default-talawa-api-port)
- [Testing](#testing)

<!-- tocstop -->
Expand All @@ -78,6 +78,7 @@ You will need to have copies of your code on your local system. Here's how to do

Best way to install and manage `node.js` is making use of node version managers. Two most popular node version managers right now are [fnm](https://github.com/Schniz/fnm) and [nvm](https://github.com/nvm-sh/nvm). We'd recommend `fnm` because it's written in `rust` and is much faster than `nvm`. Install whichever one you want and follow their guide to set up `node.js` on your system ensure the installation of Node.js version 20 LTS.


## Install npm

npm is a package manager for Node.js and is installed with Node.js. npm is used to install, share, and distribute code as well as to manage dependencies in your projects. To check if you have npm installed you can run this command in your terminal:
Expand All @@ -97,6 +98,7 @@ npm install -g typescript
```
This command installs TypeScript globally on your system so that it can be accessed from any project.


## Install git

Follow the setup guide for `git` on official [git docs](https://git-scm.com/downloads). Basic `git` knowledge is required for open source contribution so make sure you're comfortable with it. [Here's](https://youtu.be/apGV9Kg7ics) a good tutorial to get started with `git` and `github`.
Expand Down Expand Up @@ -268,6 +270,7 @@ It can be done manually as well and here's how to do it.

**NOTE:** Use the steps below if you decided not to use the automated configuration approach.


With a fresh installation, you will not see a `.env` file present. To manually create one, you will need to copy the contents of the `.env.sample` file provided to `.env`.

Use this command to do this
Expand Down Expand Up @@ -528,8 +531,10 @@ If the parameter value is set to `true`, you should be able to see colorized log

![Colorized logs in console](public/markdown/images/colorize-logs.jpg)


#### Setting up LOG_LEVEL in .env file


There are different logging levels that can be configured by setting this parameter. The severity order of levels are displayed numerically ascending from most important to least important.


Expand Down
8 changes: 4 additions & 4 deletions ISSUE_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ ___
<!-- toc -->

- [Issue Management](#issue-management)
- [New Issues](#new-issues)
- [Existing Issues](#existing-issues)
- [Feature Request Issues](#feature-request-issues)
- [Monitoring the Creation of New Issues](#monitoring-the-creation-of-new-issues)
* [New Issues](#new-issues)
* [Existing Issues](#existing-issues)
* [Feature Request Issues](#feature-request-issues)
* [Monitoring the Creation of New Issues](#monitoring-the-creation-of-new-issues)
- [General Guidelines](#general-guidelines)

<!-- tocstop -->
Expand Down
8 changes: 4 additions & 4 deletions PR_GUIDELINES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
<!-- toc -->

- [Pull Request Guidelines](#pull-request-guidelines)
- [Pull Requests and Issues](#pull-requests-and-issues)
- [Testing](#testing)
- [Pull Request Processing](#pull-request-processing)
- [Only submit PRs against our `develop` branch, not the default `main` branch](#only-submit-prs-against-our-develop-branch-not-the-default-main-branch)
* [Pull Requests and Issues](#pull-requests-and-issues)
* [Testing](#testing)
* [Pull Request Processing](#pull-request-processing)
+ [Only submit PRs against our `develop` branch, not the default `main` branch](#only-submit-prs-against-our-develop-branch-not-the-default-main-branch)

<!-- tocstop -->

Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
## Table of Contents


<!-- toc -->

- [Talawa API](#talawa-api)
- [Talawa Components](#talawa-components)
- [Documentation](#documentation)
- [Installation](#installation)
- [Image Upload](#image-upload)
* [Talawa Components](#talawa-components)
* [Documentation](#documentation)
* [Installation](#installation)
* [Image Upload](#image-upload)

<!-- tocstop -->

Expand Down
Binary file added images/dQXbuQ-Juimage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions package-lock.json

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

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"import:sample-data": "ts-node ./src/utilities/loadSampleData.ts",
"import:sample-data:prod": "node ./build/utilities/loadSampleData.js",
"gen:schema": "graphql-inspector introspect ./src/typeDefs/**/**/*.ts --write ./schema.graphql ",
"update:toc": "node scripts/githooks/update-toc.js"
"generate:toc": "node src/scripts/githooks/generate-toc"
},
"repository": {
"type": "git",
Expand Down Expand Up @@ -105,9 +105,9 @@
"@types/cors": "^2.8.17",
"@types/express": "^4.17.17",
"@types/express-rate-limit": "^5.1.3",
"@types/graphql-depth-limit": "^1.1.6",
"@types/i18n": "^0.13.10",
"@types/jsonwebtoken": "^9.0.5",
"@types/graphql-depth-limit": "^1.1.3",
"@types/i18n": "^0.13.3",
"@types/jsonwebtoken": "^8.5.8",
"@types/lodash": "^4.14.202",
"@types/mongoose-paginate-v2": "^1.6.5",
"@types/morgan": "^1.9.3",
Expand Down
10 changes: 0 additions & 10 deletions schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -572,14 +572,12 @@ type Organization {
customFields: [OrganizationCustomField!]!
description: String!
image: String
isPublic: Boolean!
location: String
members: [User]
membershipRequests: [MembershipRequest]
name: String!
pinnedPosts: [Post]
userTags(after: String, before: String, first: PositiveInt, last: PositiveInt): UserTagsConnection
visibleInSearch: Boolean!
}

type OrganizationCustomField {
Expand All @@ -595,20 +593,16 @@ type OrganizationInfoNode {
creator: User!
description: String!
image: String
isPublic: Boolean!
name: String!
visibleInSearch: Boolean!
}

input OrganizationInput {
apiUrl: URL
attendees: String
description: String!
image: String
isPublic: Boolean!
location: String
name: String!
visibleInSearch: Boolean!
}

enum OrganizationOrderByInput {
Expand Down Expand Up @@ -643,14 +637,12 @@ input OrganizationWhereInput {
id_not: ID
id_not_in: [ID!]
id_starts_with: ID
isPublic: Boolean
name: String
name_contains: String
name_in: [String!]
name_not: String
name_not_in: [String!]
name_starts_with: String
visibleInSearch: Boolean
}

type OtpData {
Expand Down Expand Up @@ -937,10 +929,8 @@ input UpdateEventProjectInput {

input UpdateOrganizationInput {
description: String
isPublic: Boolean
location: String
name: String
visibleInSearch: Boolean
}

input UpdateTaskInput {
Expand Down
12 changes: 7 additions & 5 deletions src/app.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import cors from "cors";
import express from "express";

import mongoSanitize from "express-mongo-sanitize";
import { express as voyagerMiddleware } from "graphql-voyager/middleware";
import { rateLimit } from "express-rate-limit";

import helmet from "helmet";
import mongoSanitize from "express-mongo-sanitize";
import cors from "cors";
import requestLogger from "morgan";
import i18n from "i18n";
import requestLogger from "morgan";
import path from "path";
import { appConfig } from "./config";
import { requestContext, requestTracing, stream } from "./libraries";
import { express as voyagerMiddleware } from "graphql-voyager/middleware";
import path from "path";
//@ts-ignore
import graphqlUploadExpress from "graphql-upload/graphqlUploadExpress.mjs";

Expand Down
Loading
Loading