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
mpotane authored Dec 14, 2023
2 parents e4a5995 + 2c6006d commit a48a288
Show file tree
Hide file tree
Showing 686 changed files with 21,246 additions and 11,578 deletions.
5 changes: 5 additions & 0 deletions .env.docker
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ 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: 9 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,12 @@ 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=""

VERCEL_PROJECT_ID=""
VERCEL_TEAM_ID=""
VERCEL_AUTH_TOKEN=""
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
62 changes: 57 additions & 5 deletions .github/ISSUE_TEMPLATE/bug.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,55 @@
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
id: steps
attributes:
label: Steps to Reproduce
description: To help us recreate the bug, provide a numbered list of the exact steps taken to trigger the buggy behavior.
value: |
If you know the steps, follow the below format and provide steps to reproduce
For example:
1. Go to <replace your> page.
1. On top right side, close to the <Account> menu
1. Some menu are not working properly.
1. Continue...
If you don't know exact steps, include any relevant details like:
- What page you were on...
- What you were trying to do...
- What went wrong...
validations:
required: true
- type: textarea
Expand All @@ -17,15 +59,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 "yes" to above, please explain how you would technically implement this
description: 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)
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.

38 changes: 31 additions & 7 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 BioDrop? Please suggest!
description: Have a new idea/feature for BioDrop? Let us know...
title: "[FEATURE] <description>"
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 "yes" to above, please explain how you would technically implement this
description: 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.

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 a48a288

Please sign in to comment.