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

updated calender to not accomodate future dates #2848

Closed
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
65a766e
Updated branching strategy
DangaRanga May 23, 2021
0a6d4d6
Removed duplicate entry
DangaRanga May 23, 2021
e16a3ad
Updated contributing.md
DangaRanga May 23, 2021
653345e
Added extra markdown styling to contribute.md
DangaRanga May 23, 2021
13180c2
Merge pull request #54 from DangaRanga/master
DangaRanga May 23, 2021
07f4465
Bump dns-packet from 1.3.1 to 1.3.4
dependabot[bot] May 30, 2021
f9d7eae
Merge pull request #60 from PalisadoesFoundation/dependabot/npm_and_y…
palisadoes May 30, 2021
1a57176
Update pull_request_template.md
palisadoes May 30, 2021
c4580fa
disabled CodeQL cron jobs and push actions (#72)
akshatgarg12 Jun 6, 2021
f71bc11
Merge Develop into Main (#1099)
noman2002 Nov 30, 2023
1fd4105
[#1123] Changes position and text of "All Organizations" button (#1124)
adi790uu Dec 10, 2023
9ff2924
Revert "[#1123] Changes position and text of "All Organizations" butt…
noman2002 Dec 12, 2023
a320d35
Added Base branch check to main (#1515)
palisadoes Jan 29, 2024
42633e2
Pre-GSoC 2024 - Stable (#1934)
palisadoes Apr 27, 2024
f6c6f03
Update README.md
palisadoes Apr 27, 2024
423b990
Merge develop - 20240504 (#1956)
palisadoes May 4, 2024
7befb35
Merge develop - 20240504 (#1957)
palisadoes May 4, 2024
a4d2a07
Bump follow-redirects from 1.15.5 to 1.15.6 (#1960)
dependabot[bot] May 5, 2024
9b5d158
Bump tar from 6.1.15 to 6.2.1 (#1959)
dependabot[bot] May 5, 2024
389ac01
Bump tj-actions/changed-files from 40 to 41 in /.github/workflows (#1…
dependabot[bot] May 5, 2024
d3d681f
Bump express from 4.18.2 to 4.19.2 (#1962)
dependabot[bot] May 5, 2024
7091c76
Bump ejs from 3.1.9 to 3.1.10 (#1963)
dependabot[bot] May 5, 2024
bf9852d
coderabbit yaml file (#1991)
pranshugupta54 May 19, 2024
f661cc9
Updating the main branch to the latest develop code (#2020)
palisadoes Jun 2, 2024
5010350
Latest Develop 20240724 (#2127)
palisadoes Jul 27, 2024
b991d54
Update README.md
palisadoes Aug 11, 2024
f358420
Update CONTRIBUTING.md
palisadoes Aug 11, 2024
15c8753
Update CONTRIBUTING.md
palisadoes Aug 11, 2024
30c1d18
Merge with Develop 20240924 (#2306)
palisadoes Sep 29, 2024
6fbba6e
Bump tj-actions/changed-files from 40 to 41 in /.github/workflows (#2…
dependabot[bot] Sep 29, 2024
e828b78
Bump rollup from 4.21.3 to 4.22.5 (#2308)
dependabot[bot] Sep 29, 2024
d01b5d2
Merge with Develop 2024-1-14 (#2432)
palisadoes Nov 14, 2024
1fe19c1
Update dependabot.yaml
palisadoes Nov 16, 2024
d2a4d73
Update pull-request-target.yml
palisadoes Nov 25, 2024
3d1f1f0
Update pull-request-target.yml
palisadoes Nov 25, 2024
d5c7e2d
updated calender to not accomodate future daes
arpit-chakraborty Dec 25, 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
Prev Previous commit
Next Next commit
Merge with Develop 2024-1-14 (#2432)
* 20241114065242 Deleted all files in the main branch in anticipation of merging develop into main cleanly

* 20241114065332 Merge develop into main
  • Loading branch information
palisadoes authored Nov 14, 2024
commit d01b5d2be65375c9f2522e2841745341eb509f16
4 changes: 2 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -24,8 +24,8 @@ REACT_APP_USE_RECAPTCHA=
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
REACT_APP_BACKEND_WEBSOCKET_URL=ws://localhost:4000/graphql/

# If you want to logs Compiletime and Runtime error , warning and info write YES or if u want to
# keep the console clean leave it blank
ALLOW_LOGS=
ALLOW_LOGS=
4 changes: 3 additions & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -60,7 +60,9 @@
"@typescript-eslint/no-non-null-asserted-optional-chain": "error",
"@typescript-eslint/no-non-null-assertion": "error",
"@typescript-eslint/no-var-requires": "error",
"@typescript-eslint/ban-types": "error",
"@typescript-eslint/no-unsafe-function-type": "error",
"@typescript-eslint/no-wrapper-object-types": "error",
"@typescript-eslint/no-empty-object-type": "error",
"@typescript-eslint/no-duplicate-enum-values": "error",
"@typescript-eslint/array-type": "error",
"@typescript-eslint/consistent-type-assertions": "error",
4 changes: 2 additions & 2 deletions .github/dependabot.yaml
Original file line number Diff line number Diff line change
@@ -7,12 +7,12 @@ updates:
directory: "/"
# Schedule automated updates to run weekly
schedule:
interval: "weekly"
interval: "monthly"
# Labels to apply to Dependabot PRs
labels:
- "dependencies"
# Specify the target branch for PRs
target-branch: "develop"
# Customize commit message prefix
commit-message:
prefix: "chore(deps):"
prefix: "chore(deps):"
8 changes: 8 additions & 0 deletions .github/workflows/auto-label.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"labelsSynonyms": {
"dependencies": ["dependabot", "dependency", "dependencies"],
"security": ["security"],
"ui/ux": ["layout", "screen", "design", "figma"]
},
"defaultLabels": ["unapproved"],
}
3 changes: 2 additions & 1 deletion .github/workflows/codeql-codescan.yml
Original file line number Diff line number Diff line change
@@ -20,7 +20,8 @@ on:
- '**'
jobs:
CodeQL:
name: Analyse code with codeQL on push
if: ${{ github.actor != 'dependabot[bot]' }}
name: Analyse Code With CodeQL
runs-on: ubuntu-latest
strategy:
fail-fast: false
14 changes: 9 additions & 5 deletions .github/workflows/eslint_disable_check.py
Original file line number Diff line number Diff line change
@@ -36,9 +36,15 @@ def has_eslint_disable(file_path):
Returns:
bool: True if eslint-disable statement is found, False otherwise.
"""
with open(file_path, 'r') as file:
content = file.read()
return re.search(r'//\s*eslint-disable', content)
eslint_disable_pattern = re.compile(r'//\s*eslint-disable(?:-next-line|-line)?', re.IGNORECASE)

try:
with open(file_path, 'r', encoding='utf-8') as file:
content = file.read()
return bool(eslint_disable_pattern.search(content))
except Exception as e:
print(f"Error reading file {file_path}: {e}")
return False

def check_eslint(directory):
"""
@@ -72,7 +78,6 @@ def arg_parser_resolver():

Returns:
result: Parsed argument object

"""
parser = argparse.ArgumentParser()
parser.add_argument(
@@ -98,7 +103,6 @@ def main():
Raises:
SystemExit: If an error occurs during execution.
"""

args = arg_parser_resolver()

if not os.path.exists(args.directory):
39 changes: 35 additions & 4 deletions .github/workflows/issue.yml
Original file line number Diff line number Diff line change
@@ -18,12 +18,43 @@ jobs:
name: Adding Issue Label
runs-on: ubuntu-latest
steps:
- uses: Renato66/[email protected]
- uses: actions/checkout@v4
with:
sparse-checkout: |
.github/workflows/auto-label.json5
sparse-checkout-cone-mode: false
- uses: Renato66/auto-label@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
ignore-comments: true
default-labels: '["unapproved"]'

- uses: actions/github-script@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
script: |
const { owner, repo } = context.repo;
const issue_number = context.issue.number;
const apiParams = {
owner,
repo,
issue_number
};
const labels = await github.rest.issues.listLabelsOnIssue(apiParams);
if(labels.data.reduce((a, c)=>a||["dependencies"].includes(c.name), false))
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ["good first issue", "security"]
});
else if(labels.data.reduce((a, c)=>a||["security", "ui/ux"].includes(c.name), false))
await github.rest.issues.addLabels({
owner: context.repo.owner,
repo: context.repo.repo,
issue_number: context.issue.number,
labels: ["good first issue"]
});


Issue-Greeting:
name: Greeting Message to User
runs-on: ubuntu-latest
35 changes: 25 additions & 10 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -38,15 +38,18 @@ jobs:
- name: Count number of lines
run: |
chmod +x ./.github/workflows/countline.py
./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx
./.github/workflows/countline.py --lines 600 --exclude_files src/screens/LoginPage/LoginPage.tsx src/GraphQl/Queries/Queries.ts src/screens/OrgList/OrgList.tsx src/GraphQl/Mutations/mutations.ts src/components/EventListCard/EventListCardModals.tsx src/components/TagActions/TagActionsMocks.ts src/utils/interfaces.ts src/screens/MemberDetail/MemberDetail.tsx

- name: Get changed TypeScript files
id: changed-files
uses: tj-actions/changed-files@v41

uses: tj-actions/changed-files@v40
- name: Check formatting
if: steps.changed-files.outputs.only_changed != 'true'
run: npm run format:check

- name: Run formatting if check fails
if: failure()
run: npm run format

- name: Check for type errors
if: steps.changed-files.outputs.only_changed != 'true'
@@ -56,7 +59,7 @@ jobs:
if: steps.changed-files.outputs.only_changed != 'true'
env:
CHANGED_FILES: ${{ steps.changed_files.outputs.all_changed_files }}
run: npx eslint ${CHANGED_FILES}
run: npx eslint ${CHANGED_FILES} && python .github/workflows/eslint_disable_check.py

- name: Check for TSDoc comments
run: npm run check-tsdoc # Run the TSDoc check script
@@ -79,23 +82,25 @@ jobs:
echo "Error: Source and Target Branches are the same. Please ensure they are different."
exit 1

Check-Unauthorized-Changes:
name: Checks if no unauthorized files are changed
Check-Sensitive-Files:
if: ${{ github.actor != 'dependabot[bot]' && !contains(github.event.pull_request.labels.*.name, 'ignore-sensitive-files-pr') }}
name: Checks if sensitive files have been changed without authorization
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Get Changed Unauthorized files
id: changed-unauth-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v40
with:
files: |
.github/**
env.example
.node-version
.husky/**
scripts/**
schema.graphql
package.json
tsconfig.json
.gitignore
@@ -110,6 +115,14 @@ jobs:
LICENSE
setup.ts
.coderabbit.yaml
CODE_OF_CONDUCT.md
CODE_STYLE.md
CONTRIBUTING.md
DOCUMENTATION.md
INSTALLATION.md
ISSUE_GUIDELINES.md
PR_GUIDELINES.md
README.md

- name: List all changed unauthorized files
if: steps.changed-unauth-files.outputs.any_changed == 'true' || steps.changed-unauth-files.outputs.any_deleted == 'true'
@@ -122,6 +135,7 @@ jobs:
exit 1

Count-Changed-Files:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Checks if number of files changed is acceptable
runs-on: ubuntu-latest
steps:
@@ -130,7 +144,7 @@ jobs:

- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v40

- name: Echo number of changed files
env:
@@ -183,7 +197,7 @@ jobs:

- name: Get changed TypeScript files
id: changed-files
uses: tj-actions/changed-files@v41
uses: tj-actions/changed-files@v40

- name: Run tests
if: steps.changed-files.outputs.only_changed != 'true'
@@ -212,6 +226,7 @@ jobs:
min_coverage: 95.0

Graphql-Inspector:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Runs Introspection on the GitHub talawa-api repo on the schema.graphql file
runs-on: ubuntu-latest
steps:
@@ -239,6 +254,7 @@ jobs:
run: graphql-inspector validate './src/GraphQl/**/*.ts' './talawa-api/schema.graphql'

Check-Target-Branch:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Check Target Branch
runs-on: ubuntu-latest
steps:
@@ -247,4 +263,3 @@ jobs:
run: |
echo "Error: Pull request target branch must be 'develop'. Please refer PR_GUIDELINES.md"
exit 1

2 changes: 2 additions & 0 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -21,6 +21,8 @@ env:

jobs:
Code-Coverage:
if: ${{ github.actor != 'dependabot[bot]' }}
name: Test and Calculate Code Coverage
runs-on: ubuntu-latest
strategy:
matrix:
Original file line number Diff line number Diff line change
@@ -12,7 +12,6 @@
3) Pycodestyle
4) Flake8
"""

import os
import argparse
import re
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

# npm run format:fix
npm run format:fix
# npm run lint:fix
npm run lint-staged
npm run typecheck
Loading