Skip to content

Commit

Permalink
Merge branch 'develop' into userLoginRequiresRefreshToFetchData#1498
Browse files Browse the repository at this point in the history
  • Loading branch information
kanhaiya04 authored Feb 18, 2024
2 parents d43d6a6 + 7055b34 commit 3746f7e
Show file tree
Hide file tree
Showing 347 changed files with 4,467 additions and 18,930 deletions.
1 change: 1 addition & 0 deletions .github/workflows/authorized-changes-detection.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ on:
paths:
- '.github/**'
- 'env.example'
- '.node-version'
- '.husky/**'
- 'scripts/**'
- 'package.json'
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/pull-request-target.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ jobs:
### Reviewers
Do not assign reviewers. Our Queue Monitors will review your PR and assign them.
When your PR has been assigned reviewers contact them to get your code reviewed and approved via:
1. comments in this PR or
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,12 @@ jobs:

- name: Run linting check
if: steps.changed-files.outputs.only_changed != 'true'
run: npm run lint:check
run: npm run lint:check

- name: Check for localStorage Usage
run: |
chmod +x scripts/githooks/check-localstorage-usage.js
node scripts/githooks/check-localstorage-usage.js --scan-entire-repo
- name: Compare translation files
run: |
Expand All @@ -58,11 +63,12 @@ jobs:
Check-Changed-Files:
name: File count, sensitive files and branch check
runs-on: ubuntu-latest
needs: Code-Quality-Checks
# needs: Code-Quality-Checks
steps:
- name: Checkout code
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Set up Python
uses: actions/setup-python@v2
Expand Down
32 changes: 28 additions & 4 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,16 @@ jobs:

Generate-Documentation:
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/automated-docs'
if: github.ref == 'refs/heads/develop'
steps:
- name: Checkout the Repository
uses: actions/checkout@v3
# with:
# ref: develop

# - name: Pull latest changes from develop
# run: git pull origin develop

- name: Node.js Version
uses: actions/setup-node@v4
with:
Expand Down Expand Up @@ -133,7 +138,7 @@ jobs:
git config --global user.email "${{env.email}}"
git add .
git commit -m "Update documentation"
git push
git push origin develop:automated-docs --force
echo -e "🚀${Green} Hurrah! doc updated${NoColor}"
- name: Create Documentation Artifact
Expand All @@ -142,14 +147,33 @@ jobs:
name: documentation-admin
path: talawa-admin-docs

Copy-docs-to-talawa-docs:
Empty-Commit:
name: Create Empty Commit
runs-on: ubuntu-latest
if: github.ref == 'refs/heads/develop'
needs: Generate-Documentation
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
persist-credentials: false
token: ${{ secrets.TALAWA_DOCS_SYNC }}
- name: Empty Commit
run: |
git config --global user.name "${{github.actor}}"
git config --global user.email "${{env.email}}"
git config --global url.https://${{ secrets.TALAWA_DOCS_SYNC }}@github.com/.insteadOf https://github.com/
git commit --allow-empty -m "Trigger Documentation Workflow"
git push origin develop:automated-docs --force
Copy-docs-to-talawa-docs:
if: github.ref == 'refs/heads/automated-docs'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: dmnemec/[email protected]
env:
API_TOKEN_GITHUB: ${{ secrets.TALAWA_DOCS_SYNC }}
API_TOKEN_GITHUB: ${{secrets.TALAWA_DOCS_SYNC}}
with:
source_file: 'talawa-admin-docs/'
destination_repo: 'PalisadoesFoundation/talawa-docs'
Expand Down
3 changes: 2 additions & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
{
"**/*.{ts,tsx,yml}": "eslint --fix",
"**/*.{ts,tsx,json,scss,css,yml}": "prettier --write"
"**/*.{ts,tsx,json,scss,css,yml}": "prettier --write",
"**/*.{ts,tsx}": "node scripts/githooks/check-localstorage-usage.js"
}
1 change: 1 addition & 0 deletions .node-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v20.10.0
2 changes: 1 addition & 1 deletion CODE_STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ code style should not be changed and must be followed.

- GraphQL

- Jest & Enzyme for testing
- Jest & React Testing Library for testing

## Component Structure

Expand Down
5 changes: 5 additions & 0 deletions INSTALLATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ This will setup the repository and the code files locally for you. For more deta

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.

_**NOTE**_

1. The repository has a `.node-version` file to help ensure you use the supported version of `node.js`. Do not edit this file.
1. We strongly recommend that you configure your node version manager of choice to automatically read `.node-version` files

## Setting up Typescript

As `talawa-admin` and `talawa-api` repositories are written using [Typescript](https://www.typescriptlang.org/), you will need to install typescript on your machine.
Expand Down
Loading

0 comments on commit 3746f7e

Please sign in to comment.