Skip to content

Commit

Permalink
Merge branch 'MCSManager:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
luckydog6132 authored Apr 19, 2024
2 parents 6698268 + 375dc88 commit 7a0a197
Show file tree
Hide file tree
Showing 393 changed files with 75,009 additions and 5,560 deletions.
14 changes: 0 additions & 14 deletions .eslintrc.js

This file was deleted.

16 changes: 0 additions & 16 deletions .github/ISSUE_TEMPLATE/-bug-report-.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/-feature-request--.md

This file was deleted.

10 changes: 0 additions & 10 deletions .github/ISSUE_TEMPLATE/-question-.md

This file was deleted.

48 changes: 48 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: Bug Report
description: Create a report to help us improve
title: "[Bug Report] "
labels: "Bug Report"
body:
- type: input
id: Platform
attributes:
label: Platform
description: Please enter the platform on which you encountered the bug.
placeholder: e.g. Windows 11, Ubuntu 14.04
validations:
required: true
- type: input
id: panel-version
attributes:
label: Panel Version
description: MCSManager Panel Version
placeholder: e.g. 10.1.0
validations:
required: true
- type: input
id: daemon-version
attributes:
label: Daemon Version (Optional)
description: MCSManager Daemon Version
placeholder: e.g. 4.3.0
validations:
required: false
- type: input
id: recurrence-probability
attributes:
label: Recurrence Probability
description: Recurrence Probability
placeholder: 1%~100%
validations:
required: true
- type: textarea
id: bug-description
attributes:
label: Bug Description
description: Please describe the problem you met in as much detail as possible. Besides, please describe how to trigger this problem again.
placeholder: |
1. Click a button named ...
2. ...
3. ...
validations:
required: true
11 changes: 11 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
blank_issues_enabled: false
contact_links:
- name: English | Discord Channel
url: https://discord.gg/BNpYMVX7Cd
about: The official Discord channel of MCSManager!
- name: 中文用户 | QQ Group
url: http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=6ryJRaHMaAM9aSeSdRWn6qm9gQ3lI8vu&authKey=BMZ5gA9Rqw%2B5714yAW1ZxiWnFbkk2KRKgBF%2BMiIaOw0VVsSR7tsP10cFwhmDdlgU&noverify=0&group_code=198646856
about: The official QQ Group of MCSManager!
- name: 中文用户 | Telegram Group
url: https://t.me/MCSManager_dev
about: The official Telegram Group of MCSManager!
22 changes: 22 additions & 0 deletions .github/ISSUE_TEMPLATE/feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Feature Request
description: A new feature for MCSManager
title: "[Feature] "
labels: "Feature Request"
body:
- type: markdown
attributes:
value: Please make sure that no duplicated issues has already been delivered.
- type: textarea
id: description
attributes:
label: Description
description: Please describe in detail the new functionality you would like to add.
validations:
required: true
- type: textarea
id: reason
attributes:
label: Reason
description: Please describe why you want to add the feature into MCSManager.
validations:
required: true
1 change: 1 addition & 0 deletions .github/github.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Binary file added .github/panel-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/panel-instances.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
61 changes: 30 additions & 31 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [ "master" ]
branches: ["next"]
pull_request:
# The branches below must be a subset of the branches above
branches: [ "master" ]
branches: ["next"]
schedule:
- cron: '34 21 * * 6'
- cron: "37 18 * * 2"

jobs:
analyze:
Expand All @@ -32,41 +32,40 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript", "typescript"]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3
- name: Checkout repository
uses: actions/checkout@v3

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.


# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
# Details on CodeQL's query packs refer to : https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.
# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun

# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh
# If the Autobuild fails above, remove it and uncomment the following three lines.
# modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance.

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
# - run: |
# echo "Run, Build Application using script"
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
20 changes: 0 additions & 20 deletions .github/workflows/dependency-review.yml

This file was deleted.

30 changes: 0 additions & 30 deletions .github/workflows/node.js.yml

This file was deleted.

31 changes: 31 additions & 0 deletions .github/workflows/webpack.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: NodeJS with Webpack

on:
push:
branches: ["master"]
pull_request:
branches: ["master"]

jobs:
build:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x, 18.x, 20.x]

steps:
- uses: actions/checkout@v3

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Run Build Script
run: |
chmod a+x ./install-dependents.sh
chmod a+x ./build.sh
./install-dependents.sh
./build.sh
15 changes: 8 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
test.txt
*.bat

src/public
panel/public/
*.code-workspace
vscode/
.vscode/
Daemon/
data/
dist/
out/
public/
lib/
production/
.DS_Store
production-code/
test.js
.idea/

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
Expand All @@ -28,6 +27,7 @@ pids
*.pid
*.seed
*.pid.lock
mcsmanager_packages.json

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov
Expand Down Expand Up @@ -121,4 +121,5 @@ workspace.code-workspace
src/public/1.png

# IntelliJ Idea project files
/.idea/*
/.idea/*
*/.idea/*
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
registry=https://registry.npmjs.org
Loading

0 comments on commit 7a0a197

Please sign in to comment.