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

[#1123] Changes position and text of "All Organizations" button #1203

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
23 changes: 23 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# 👋 Welcome, we're glad you're setting up an installation of Talawa-admin. Copy this
# file to .env or set the variables in your local environment manually.


# Run Talawa-api locally in your system, and put its url into the same.

REACT_APP_TALAWA_URL=

# Do you want to setup and use "I'm not a robot" Checkbox (Google Recaptcha)?
# If no, leave blank, else write yes
# Example: REACT_APP_USE_RECAPTCHA=yes

REACT_APP_USE_RECAPTCHA=

# If you are using Google Recaptcha, i.e., REACT_APP_USE_RECAPTCHA=yes, read the following steps
# Get the google recaptcha site key from google recaptcha admin or https://www.google.com/recaptcha/admin/create
# from here for reCAPTCHA v2 and "I'm not a robot" Checkbox, and paste the key here.
# Note: In domains, fill localhost

REACT_APP_RECAPTCHA_SITE_KEY=

# has to be inserted in the env file to use plugins and other websocket based features.
REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Contains the PDF file of the Tag as JSON string, thus does not need to be linted
src/components/CheckIn/tagTemplate.ts
78 changes: 73 additions & 5 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"env": {
"browser": true,
"node": true,
"es6": true
},

Expand All @@ -26,12 +27,76 @@
},

// Specify the ESLint plugins tobe used
"plugins": ["react", "@typescript-eslint", "react-hooks", "jest"],
"plugins": ["react", "@typescript-eslint", "jest"],
"rules": {
"react/destructuring-assignment": ["warn", "always"],
"react/no-multi-comp": ["error", { "ignoreStateless": false }],
"react/jsx-filename-extension": ["error", { "extensions": [".tsx"] }],
"react/destructuring-assignment": ["off"],
"@typescript-eslint/no-explicit-any": ["off"],
"@typescript-eslint/explicit-module-boundary-types": ["off"],
"react/no-multi-comp": [
"error",
{
"ignoreStateless": false
}
],
"react/jsx-filename-extension": [
"error",
{
"extensions": [".tsx"]
}
],
"@typescript-eslint/ban-types": "error",
"@typescript-eslint/no-duplicate-enum-values": "error",
"@typescript-eslint/array-type": "error",
"@typescript-eslint/consistent-type-assertions": "error",
"@typescript-eslint/consistent-type-imports": "error",
"@typescript-eslint/explicit-function-return-type": [
2,
{
"allowExpressions": true,
"allowTypedFunctionExpressions": true
}
],
"@typescript-eslint/naming-convention": [
"error",
// Interfaces must begin with Interface or TestInterface followed by a PascalCase name
{
"selector": "interface",
"format": ["PascalCase"],
"prefix": ["Interface", "TestInterface"]
},
// Type Aliases must be in PascalCase
{
"selector": ["typeAlias", "typeLike", "enum"],
"format": ["PascalCase"]
},
{
"selector": "typeParameter",
"format": ["PascalCase"],
"prefix": ["T"]
},
{
"selector": "variable",
"format": ["camelCase", "UPPER_CASE"],
"leadingUnderscore": "allow"
},
{
"selector": "parameter",
"format": ["camelCase"],
"leadingUnderscore": "allow"
},
{
"selector": "function",
"format": ["camelCase"]
},
{
"selector": "memberLike",
"modifiers": ["private"],
"format": ["camelCase"],
"leadingUnderscore": "require"
},

{ "selector": "variable", "modifiers": ["exported"], "format": null }
],
// Ensures that components are always written in PascalCase
"react/jsx-pascal-case": [
"error",
Expand All @@ -42,6 +107,9 @@
"react/jsx-equals-spacing": ["warn", "never"],
"react/no-this-in-sfc": "error",

// All tests must need not have an assertion
"jest/expect-expect": 0,

// Ensures that components are always indented by 2 spaces
"react/jsx-indent": ["warn", 2],
"react/jsx-tag-spacing": [
Expand All @@ -56,7 +124,7 @@
// Enforce Strictly functional components
"react/no-unstable-nested-components": ["error", { "allowAsProps": true }],
"react/function-component-definition": [
"error",
0,
{ "namedComponents": "function-declaration" }
]
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Bug report
name: Bug Report
about: Create a report to help us improve.
title: Bug report
labels: Bug
assignees: ""
title: Bug Report
labels: bug
assignees: ''

---

**Describe the bug**
Expand All @@ -27,3 +28,7 @@ A clear and concise description of how the code performed w.r.t expectations.
If applicable, add screenshots to help explain your problem.

**Additional details**
Add any other context or screenshots about the feature request here.

**Potential internship candidates**
Please read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
---
name: Feature request
name: Feature Request
about: Suggest an idea for this project
title: Feature request
labels: Feature
assignees: ""
title: Feature Request
labels: feature request
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
Expand All @@ -20,3 +21,6 @@ A clear and concise description of approach to be followed.

**Additional context**
Add any other context or screenshots about the feature request here.

**Potential internship candidates**
Please read this if you are planning to apply for a Palisadoes Foundation internship https://github.com/PalisadoesFoundation/talawa/issues/359
35 changes: 34 additions & 1 deletion .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,40 @@
<!-- Thanks for submitting a pull request! Please provide enough information so that others can review your pull request. -->
<!--
This section can be deleted after reading.
We employ the following branching strategy to simplify the development process and to ensure that only stable code is pushed to the `master` branch:
- `develop`: For unstable code: New features and bug fixes.
- `master`: Where the stable production ready code lies. Only security related bugs.
NOTE!!!
ONLY SUBMIT PRS AGAINST OUR `DEVELOP` BRANCH. THE DEFAULT IS `MAIN`, SO YOU WILL HAVE TO MODIFY THIS BEFORE SUBMITTING YOUR PR FOR REVIEW. PRS MADE AGAINST `MAIN` WILL BE CLOSED.
-->

<!--
Thanks for submitting a pull request! Please provide enough information so that others can review your pull request.
-->

**What kind of change does this PR introduce?**

<!-- E.g. a bugfix, feature, refactoring, etc… -->

**Issue Number:**

Fixes #<!--Add related issue number here.-->

**Did you add tests for your changes?**

<!--Yes or No. Note: Add unit tests or automation tests for your code.-->

**Snapshots/Videos:**

<!--Add snapshots or videos wherever possible.-->

**If relevant, did you update the documentation?**

<!--Add link to Talawa-Docs.-->

**Summary**

<!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? -->
Expand All @@ -18,3 +45,9 @@
<!-- If this PR introduces a breaking change, please describe the impact and a migration path for existing applications. -->

**Other information**

<!--Add extra information about this PR here-->

**Have you read the [contributing guide](https://github.com/PalisadoesFoundation/talawa-admin/blob/master/CONTRIBUTING.md)?**

<!--Yes or No-->
47 changes: 47 additions & 0 deletions .github/workflows/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# Talawa GitHub Workflows Guidelines

Follow these guidelines when contributing to this directory.

## General

Any changes to files in this directory are flagged when pull requests are run. Make changes only on the advice of a contributor.

## YAML Workflow Files

The YAML files in this directory have very specific roles depending on the type of workflow.

Whenever possible you must ensure that:
1. The file roles below are maintained
1. The sequence of the jobs in the workflows are maintained using [GitHub Action dependencies](https://docs.github.com/en/actions/learn-github-actions/managing-complex-workflows).

### File Roles
Follow these guidelines when creating new YAML defined GitHub actions. This is done to make troubleshooting easier.

1. `Issue` Workflows:
1. Place all actions related to issues in the `issues.yml` file.
1. `Pull Request` workflows to be run by:
1. Workflows to run **First Time** repo contributors:
1. Place all actions related to to this in the `pull-request-target.yml` file.
1. Workflows to be run by **ALL** repo contributors:
1. Place all actions related to pull requests in the `pull-request.yml` file.
1. `Push` workflows:
1. Place all actions related to pushes in the `push.yml` file.

#### File Role Exceptions

There are some exceptions to these rules in which jobs can be placed in dedicated separate files:
1. Jobs that require unique `cron:` schedules
1. Jobs that require unique `paths:` statements that operate only when files in a specific path are updated.
1. Jobs only work correctly if they have a dedicated file (eg. `CodeQL`)

## Scripts

Follow these guidelines when creating or modifying scripts in this directory.

1. All scripts in this directory must be written in python3 for consistency.
1. The python3 scripts must follow the following coding standards. Run these commands against your scripts before submitting PRs that modify or create python3 scripts in this directory.
1. Pycodestyle
1. Pydocstyle
1. Pylint
1. Flake8
1. All scripts must run a main() function.
34 changes: 34 additions & 0 deletions .github/workflows/authorized-changes-detection.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
##############################################################################
##############################################################################
#
# NOTE!
#
# Please read the README.md file in this directory that defines what should
# be placed in this file
#
##############################################################################
##############################################################################

name: Checking workflow files
on:
pull_request:
paths:
- '.github/**'
- 'env.example'
- '.husky/**'
- 'package.json'
- 'tsconfig.json'
- '.gitignore'
- '.eslintrc.json'
- '.eslintignore '
- 'vite.config.ts'
- 'CODEOWNERS'
- 'LICENSE'

jobs:
Checking-for-unauthorized-file-changes:
name: Checking for unauthorized file changes
runs-on: ubuntu-latest
steps:
- name: Unauthorized file modification in PR
run: exit 1
13 changes: 0 additions & 13 deletions .github/workflows/ci.yml

This file was deleted.

67 changes: 0 additions & 67 deletions .github/workflows/codeql-analysis.yml

This file was deleted.

Loading