Skip to content

Commit

Permalink
Merge branch 'KelvinTegelaar:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
GlennHolcomb authored Nov 21, 2023
2 parents a099902 + 54cb8e9 commit 5d77bec
Show file tree
Hide file tree
Showing 251 changed files with 11,399 additions and 26,979 deletions.
43 changes: 43 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
module.exports = {
env: {
browser: true,
es6: true,
node: true,
},
parserOptions: {
ecmaVersion: 'latest',
sourceType: 'module',
ecmaFeatures: {
jsx: true,
},
},
settings: {
react: {
version: 'detect',
},
'import/resolver': {
// added for `import {component} from 'src/component' style imports`
'eslint-import-resolver-custom-alias': {
alias: {
src: './src',
},
extensions: ['.js', '.jsx', '.json'],
},
},
},
extends: [
'eslint:recommended',
'plugin:import/recommended',
'plugin:react/recommended',
'plugin:react/jsx-runtime',
'plugin:react-hooks/recommended',
'plugin:prettier/recommended',
],
plugins: ['react-hooks', 'import'],
rules: {
'no-unused-vars': 'off',
'react/prop-types': 'warn',
// this rule is annoying on strings with quotes in them
'react/no-unescaped-entities': 'off',
},
}
17 changes: 0 additions & 17 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ body:
- Please search the existing feature request to see if there has been a similar issue filed.
- If a feature has been filed before, but not followed up by a contributor, you can develop the feature yourself by checking the development documentation [here](https://cipp.app/docs/dev/).
- If a feature has been filed before, but not followed up by a contributor, you can develop the feature yourself by checking the development documentation [here](https://docs.cipp.app/dev-documentation/cipp-dev-guide/setting-up-for-local-development).
- Repeat feature requests are allowed if the previous request has been closed for more than 30 days
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Check_for_Version_Update.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
---
name: Check for Version Update
on: # yamllint disable-line rule:truthy
on:
pull_request:
branches: [master, main]
workflow_dispatch:
jobs:
build:
if: github.repository_owner == 'KelvinTegelaar'
name: 'Check for Version Update'
runs-on: ubuntu-latest
steps:
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/Close_Stale_Issues_and_PRs.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
---
name: 'Close stale issues and PRs'
on: # yamllint disable-line rule:truthy
on:
schedule:
- cron: '30 1 * * *'
jobs:
stale:
if: github.repository_owner == 'KelvinTegelaar'
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v4
with:
stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://cipp.app/GettingStarted/Contributions/ . Please notify the team if you are working on this yourself.'
stale-issue-message: 'This issue is stale because it has been open 10 days with no activity. We will close this issue soon. If you want this feature implemented you can contribute it. See: https://docs.cipp.app/dev-documentation/contributing-to-the-code . Please notify the team if you are working on this yourself.'
close-issue-message: 'This issue was closed because it has been stalled for 14 days with no activity.'
stale-issue-label: 'no-activity'
exempt-issue-labels: 'planned'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/CodeQL_Analyser.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---
name: 'CodeQL'
on: # yamllint disable-line rule:truthy
on:
pull_request:
branches: [master, main, dev, react]
schedule:
- cron: '26 17 * * 0'
jobs:
analyze:
if: github.repository_owner == 'KelvinTegelaar'
name: Analyze
runs-on: ubuntu-latest
permissions:
Expand Down
19 changes: 5 additions & 14 deletions .github/workflows/Comment_on_Issues.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: Add Comment
on: # yamllint disable-line rule:truthy
on:
issues:
types:
- labeled
jobs:
add-comment_bug:
if: github.event.label.name == 'unconfirmed-by-user'
if: github.repository_owner == 'KelvinTegelaar' && github.event.label.name == 'unconfirmed-by-user'
runs-on: ubuntu-latest
permissions:
issues: write
Expand All @@ -17,23 +17,14 @@ jobs:
issue-number: ${{ github.event.issue.number }}
body: |
Thank you for creating a bug. Please make sure your bug is indeed a unique case by checking current and past issues, and reading the complete documentation at https://docs.cipp.app/
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug.".
If your bug is a known documentation issue, it will be closed without notice by a contributor. To confirm that this is not a bug found in the documentation, please copy and paste the following comment: "I confirm that I have checked the documentation thoroughly and believe this to be an actual bug."
Without confirming, your report will be closed in 24 hours. If you'd like this bug to be assigned to you, please comment "I would like to work on this please!".
add-comment_fr:
if: github.event.label.name == 'enhancement'
if: github.repository_owner == 'KelvinTegelaar' && github.event.label.name == 'enhancement'
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Add Comment
uses: peter-evans/create-or-update-comment@a35cf36e5301d70b76f316e867e7788a55a31dae
with:
issue-number: ${{ github.event.issue.number }}
body: |
Thank you for creating a feature request!
Your current priority is set to "No Priority". No Priority Feature requests automatically get closed in two days if a contributor does not accept the FR.
If you are a sponsor you can request an upgrade of priority. To upgrade the priority type "I would like to upgrade the priority".
If you want this feature to be integrated you can always do this yourself by checking out our contributions guide at https://cipp.app/docs/dev/. Contributors to the CIPP project reserve the right to close feature requests at will.
If you'd like this feature request to be assigned to you, please comment "I would like to work on this please!".
uses: peter-evans/create-or-update
6 changes: 3 additions & 3 deletions .github/workflows/Label_Issues.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
name: Label Issues
on: # yamllint disable-line rule:truthy
on:
issues:
types:
- opened
jobs:
label_issues_bugs:
if: contains(github.event.issue.title,'Bug')
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Bug')
runs-on: ubuntu-latest
permissions:
issues: write
Expand All @@ -17,7 +17,7 @@ jobs:
add-labels: 'unconfirmed-by-user'
repo-token: ${{ secrets.GITHUB_TOKEN }}
label_issues_frs:
if: contains(github.event.issue.title,'Feature')
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Feature')
runs-on: ubuntu-latest
permissions:
issues: write
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/Node_Project_Check.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: NodeJS Project Check
on: # yamllint disable-line rule:truthy
on:
pull_request:
branches:
- main
Expand All @@ -10,6 +10,7 @@ concurrency:
cancel-in-progress: false
jobs:
install-build:
if: github.repository_owner == 'KelvinTegelaar'
name: NPM Install and Build
runs-on: ubuntu-latest
strategy:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/label_sponsor_requests.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
name: Label Issues
on: # yamllint disable-line rule:truthy
on:
issues:
types:
- opened
jobs:
label_issues_bugs:
if: contains(github.event.issue.title,'Bug')
if: github.repository_owner == 'KelvinTegelaar' && contains(github.event.issue.title, 'Bug')
runs-on: ubuntu-latest
permissions:
issues: write
steps:
- name: Sponsor Labels
uses: JasonEtco/[email protected]
with:
label: 'Sponsor Request'
label: 'Sponsor Request'
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
37 changes: 37 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<!DOCTYPE html>
<!--
* CoreUI Free React.js Admin Template
* @version v4.0.0
* @link https://coreui.io/react/
* Copyright (c) 2021 creativeLabs Łukasz Holeczek
* License MIT
-->
<html lang="en">
<head>
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
<meta
name="description"
content="The CyberDrain Improved Partner Portal is a portal to help manage administration for Microsoft Partners."
/>
<meta name="author" content="CIPP Contributors" />
<title>CIPP</title>
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
-->
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png" />
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png" />
<link rel="manifest" href="/manifest.json" />
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#f77f00" />
<meta name="msapplication-TileColor" content="#da532c" />
<meta name="theme-color" content="#ffffff" />
</head>
<body>
<noscript> You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<script type="module" src="/src/index.jsx"></script>
</body>
</html>
15 changes: 0 additions & 15 deletions jest.config.js

This file was deleted.

2 changes: 1 addition & 1 deletion jsconfig.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"compilerOptions": {
"module": "commonjs",
"module": "ES2022",
"baseUrl": "."
},
"include": ["./src"],
Expand Down
Loading

0 comments on commit 5d77bec

Please sign in to comment.