Skip to content

Commit

Permalink
Merge branch 'EddieHubCommunity:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
foss2cyber authored Nov 4, 2023
2 parents e5b0765 + d56e68c commit 0bf2358
Show file tree
Hide file tree
Showing 619 changed files with 15,091 additions and 10,557 deletions.
9 changes: 7 additions & 2 deletions .env.docker
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
LINKFREE_MONGO_CONNECTION_STRING="mongodb://mongodb:27017/linkfree"
BIODROP_MONGO_CONNECTION_STRING="mongodb://mongodb:27017/biodrop"
NEXT_PUBLIC_BASE_URL="http://localhost:3000"
NODE_ENV="development"

GITHUB_ID=""
GITHUB_SECRET=""
NEXTAUTH_SECRET=""

LINKFREE_API_SECRET="development"
BIODROP_API_SECRET="development"
GITHUB_API_TOKEN=""
RANDOM_USERS="eddiejaoude,SaraJaoude"
ADMIN_USERS="eddiejaoude,SaraJaoude"

STRIPE_SECRET_KEY=""
STRIPE_PREMIUM_PRICING_ID=""
STRIPE_WEBHOOK_SECRET=""
NEXT_PUBLIC_PREMIUM_SUPPORT_URL=""
9 changes: 7 additions & 2 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
LINKFREE_MONGO_CONNECTION_STRING="mongodb://localhost:27017/linkfree"
BIODROP_MONGO_CONNECTION_STRING="mongodb://localhost:27017/biodrop"
NEXT_PUBLIC_BASE_URL="http://localhost:3000"
NODE_ENV="development"

Expand All @@ -7,7 +7,12 @@ GITHUB_SECRET=""
NEXTAUTH_SECRET="123456"
NEXTAUTH_URL="http://localhost:3000"

LINKFREE_API_SECRET="development"
BIODROP_API_SECRET="development"
GITHUB_API_TOKEN=""
RANDOM_USERS="eddiejaoude,sarajaoude"
ADMIN_USERS="eddiejaoude,SaraJaoude,_test-admin-user"

STRIPE_SECRET_KEY=""
STRIPE_PREMIUM_PRICING_ID=""
STRIPE_WEBHOOK_SECRET=""
NEXT_PUBLIC_PREMIUM_SUPPORT_URL=""
4 changes: 1 addition & 3 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": [
"react"
],
"plugins": ["react"],
"settings": {
"react": {
"version": "detect"
Expand Down
40 changes: 35 additions & 5 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,33 @@
name: 🐛 Bug
description: Report an issue to help improve the project.
title: "[BUG] <description>"
labels: ["🛠 goal: fix","🚦 status: awaiting triage"]
labels: ["🛠 goal: fix", "🚦 status: awaiting triage"]
body:
- type: checkboxes
id: duplicates
attributes:
label: Has this bug been raised before?
description: Increase the chances of your issue being accepted by making sure it has not been raised before.
options:
- label: I have checked "open" AND "closed" issues and this is not a duplicate
required: true
- type: input
attributes:
label: Where did you find this bug?
description: Local dev environment or production on biodrop.io
validations:
required: true
- type: input
attributes:
label: Version of BioDrop (for example "v1.2.3")
description: Can be found in the lower right corner of the web interface in the footer.
validations:
required: true
- type: textarea
id: description
attributes:
label: Description
description: A brief description of the question or issue, also include what you tried and what didn't work
description: A clear description of the bug you have found. Please include relevant information and resources (for example the steps to reproduce the bug)
validations:
required: true
- type: textarea
Expand All @@ -17,15 +37,25 @@ body:
description: Please add screenshots if applicable
validations:
required: false
- type: dropdown
id: assignee
attributes:
label: Do you want to work on this issue?
multiple: false
options:
- "No"
- "Yes"
default: 0
validations:
required: false
- type: textarea
id: extrainfo
attributes:
label: Additional information
description: Is there anything else we should know about this bug?
label: If you want to work on this issue...
description: Please explain how you would technically resolve this feature (for example the code changes you would make)
validations:
required: false
- type: markdown
attributes:
value: |
You can also join our Discord community [here](http://discord.eddiehub.org)
Feel free to check out other cool repositories of the EddieHub Community [here](https://github.com/EddieHubCommunity)
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
blank_issues_enabled: false
contact_links:
- name: Question?
url: http://discord.eddiehub.org
about: Feel free to ask your question on our Discord channel.
url: https://www.biodrop.io/docs/faqs
about: If your question is not covered by the FAQs, please ask your question in our GitHub Discussions.
31 changes: 0 additions & 31 deletions .github/ISSUE_TEMPLATE/docs.yml

This file was deleted.

40 changes: 32 additions & 8 deletions .github/ISSUE_TEMPLATE/feature_request.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,55 @@
name: 💡 General Feature Request
description: Have a new idea/feature for LinkFree? Please suggest!
description: Have a new idea/feature for BioDrop? Let us know...
title: "[FEATURE] <description>"
labels: ["⭐ goal: addition","🚦 status: awaiting triage"]
labels: ["⭐ goal: addition", "🚦 status: awaiting triage"]
body:
- type: checkboxes
id: duplicates
attributes:
label: Is this a unique feature?
description: Increase the chances of your issue being accepted by making sure it has not been raised before.
options:
- label: I have checked "open" AND "closed" issues and this is not a duplicate
required: true
- type: textarea
attributes:
label: Is your feature request related to a problem/unavailable functionality? Please describe.
description: A clear and concise description of what the problem is (for example "I'm always frustrated when [...]").
validations:
required: true
- type: textarea
id: description
attributes:
label: Description
description: A brief description of the enhancement you propose, also include what you tried and what worked.
label: Proposed Solution
description: A clear description of the enhancement you propose. Please include relevant information and resources (for example another project's implementation of this feature).
validations:
required: true
- type: textarea
id: screenshots
attributes:
label: Screenshots
description: Please add screenshots if applicable
description: Please add screenshots of the before and/or after the proposed changes.
validations:
required: false
- type: dropdown
id: assignee
attributes:
label: Do you want to work on this issue?
multiple: false
options:
- "No"
- "Yes"
default: 0
validations:
required: false
- type: textarea
id: extrainfo
attributes:
label: Additional information
description: Is there anything else we should know about this idea?
label: If you want to work on this issue...
description: Please explain how you would technically implement this feature (for example reference any existing code)
validations:
required: false
- type: markdown
attributes:
value: |
You can also join our Discord community [here](http://discord.eddiehub.org)
Feel free to check out other cool repositories of the EddieHub Community [here](https://github.com/EddieHubCommunity)
27 changes: 0 additions & 27 deletions .github/ISSUE_TEMPLATE/other.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/testimonial.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: 🏆 Testimonial
title: New Testimonial
description: Make a testimonial for the LinkFree user
description: Make a testimonial for the BioDrop user
labels: ["testimonial"]
body:
- type: input
Expand Down
4 changes: 2 additions & 2 deletions .github/config/issue-lock-unlock.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
"🚦 status: awaiting triage":
issues:
comment: >
To reduce notifications, issues are locked until they are https://github.com/EddieHubCommunity/LinkFree/labels/%F0%9F%8F%81%20status%3A%20ready%20for%20dev and to be assigned. You can learn more in our contributing guide https://github.com/EddieHubCommunity/LinkFree/blob/main/CONTRIBUTING.md
To reduce notifications, issues are locked until they are https://github.com/EddieHubCommunity/BioDrop/labels/%F0%9F%8F%81%20status%3A%20ready%20for%20dev and to be assigned. You can learn more in our contributing guide https://github.com/EddieHubCommunity/BioDrop/blob/main/CONTRIBUTING.md
lock: true

"🏁 status: ready for dev":
issues:
comment: >
The issue has been unlocked and is now ready for dev. If you would like to work on this issue, you can comment to have it assigned to you. You can learn more in our contributing guide https://github.com/EddieHubCommunity/LinkFree/blob/main/CONTRIBUTING.md
The issue has been unlocked and is now ready for dev. If you would like to work on this issue, you can comment to have it assigned to you. You can learn more in our contributing guide https://github.com/EddieHubCommunity/BioDrop/blob/main/CONTRIBUTING.md
unlock: true
25 changes: 14 additions & 11 deletions .github/config/labeler.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,23 @@
'✍ chore: profile':
- 'data/**'
"✍ chore: profile":
- "data/**"

"invalid":
- "data/**"

tests:
- 'tests/**'
- "tests/**"

storybook:
- 'stories/**'
- "stories/**"

dependencies:
- 'package.*'
- "package.*"

'CI/CD':
- '.github/**'
"CI/CD":
- ".github/**"

'📖 docs':
- 'pages/docs/**'
"📖 docs":
- "pages/docs/**"

'models':
- 'models/**'
"models":
- "models/**"
2 changes: 1 addition & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ updates:
# set commit message to work with Angular conventional commit style
commit-message:
prefix: "fix(deps)"
prefix-development: "chore(deps)"
prefix-development: "chore(deps)"
78 changes: 42 additions & 36 deletions .github/scripts/check-filenames.js
Original file line number Diff line number Diff line change
@@ -1,36 +1,42 @@
let fileNames = process.env.FILENAMES.split(' ');
const baseFileNames = process.env.BASE_FILENAMES.split(' ');
const user = process.env.USERNAME;
let exitCode = 0;

// Remove files not changed in this PR from list
if (baseFileNames.length > 0) {
fileNames = fileNames.filter(file => !baseFileNames.includes(file));
}

if (fileNames.length > 0) {
fileNames.forEach(file => {
const splitFile = file.split('/');
const userPart = splitFile[1];
// Files not in data directory produce a warning
if(splitFile[0] !== 'data') {
console.log(`::warning ::${file} included in Pull Request with profile changes but not in data directory.`);
return;
}
if (!file.endsWith('.json')){
exitCode = 1;
console.log(`::error ::Filename ${file} does not end with '.json'`);
return;
}
if ((userPart !== user ) && (userPart !== `${user}.json`)){
// Allow for testimonials
if((splitFile.length == 4) && (splitFile[2] === 'testimonials') && (splitFile[3] === `${user}.json`)) {
return;
}
exitCode = 1;
console.log(`::error ::Filename ${file} does not match user ${user}`);
}
});
}

process.exit(exitCode);
let fileNames = process.env.FILENAMES.split(" ");
const baseFileNames = process.env.BASE_FILENAMES.split(" ");
const user = process.env.USERNAME;
let exitCode = 0;

// Remove files not changed in this PR from list
if (baseFileNames.length > 0) {
fileNames = fileNames.filter((file) => !baseFileNames.includes(file));
}

if (fileNames.length > 0) {
fileNames.forEach((file) => {
const splitFile = file.split("/");
const userPart = splitFile[1];
// Files not in data directory produce a warning
if (splitFile[0] !== "data") {
console.log(
`::warning ::${file} included in Pull Request with profile changes but not in data directory.`,
);
return;
}
if (!file.endsWith(".json")) {
exitCode = 1;
console.log(`::error ::Filename ${file} does not end with '.json'`);
return;
}
if (userPart !== user && userPart !== `${user}.json`) {
// Allow for testimonials
if (
splitFile.length == 4 &&
splitFile[2] === "testimonials" &&
splitFile[3] === `${user}.json`
) {
return;
}
exitCode = 1;
console.log(`::error ::Filename ${file} does not match user ${user}`);
}
});
}

process.exit(exitCode);
Loading

0 comments on commit 0bf2358

Please sign in to comment.