Skip to content

Feature/config clean up #21

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.

Sign up for GitHub

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

Merged
donaldp merged 2 commits into from
Feb 20, 2025
Merged

Feature/config clean up #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8924e74
chore: remove unused imports
donaldp Feb 20, 2025
f029d3a
chore: update pr template
donaldp Feb 20, 2025
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
1 change: 1 addition & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected)
- [ ] This change requires a documentation update
- [ ] Maintenance task (non-breaking & no new features)

## Checklist:

Expand Down
16 changes: 7 additions & 9 deletions formidable/config.imba
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { helpers } from '@formidablejs/framework'

export default {
# --------------------------------------------------------------------------
# Default Mailer
Expand All @@ -20,11 +18,11 @@ export default {
mailers: {
smtp: {
transport: 'smtp'
host: helpers.env 'MAIL_HOST', 'smtp.mailgun.org'
port: helpers.env 'MAIL_PORT', 587
secure: helpers.env 'MAIL_SECURE', true
username: helpers.env 'MAIL_USERNAME'
password: helpers.env 'MAIL_PASSWORD'
host: env 'MAIL_HOST', 'smtp.mailgun.org'
port: env 'MAIL_PORT', 587
secure: env 'MAIL_SECURE', true
username: env 'MAIL_USERNAME'
password: env 'MAIL_PASSWORD'
}

sendmail: {
Expand All @@ -41,7 +39,7 @@ export default {
# The email address that will be used in the "From" field of all emails.

from: {
address: helpers.env 'MAIL_FROM_ADDRESS', 'hello@example.com'
name: helpers.env 'MAIL_FROM_NAME', 'Example'
address: env 'MAIL_FROM_ADDRESS', 'hello@example.com'
name: env 'MAIL_FROM_NAME', 'Example'
}
}
18 changes: 8 additions & 10 deletions formidable/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { helpers } from '@formidablejs/framework';

export default {
/**
* --------------------------------------------------------------------------
Expand All @@ -24,11 +22,11 @@ export default {
mailers: {
smtp: {
transport: 'smtp',
host: helpers.env('MAIL_HOST', 'smtp.mailgun.org'),
port: helpers.env('MAIL_PORT', 587),
secure: helpers.env('MAIL_SECURE', true),
username: helpers.env('MAIL_USERNAME'),
password: helpers.env('MAIL_PASSWORD')
host: env('MAIL_HOST', 'smtp.mailgun.org'),
port: env('MAIL_PORT', 587),
secure: env('MAIL_SECURE', true),
username: env('MAIL_USERNAME'),
password: env('MAIL_PASSWORD')
},

sendmail: {
Expand All @@ -47,7 +45,7 @@ export default {
*/

from: {
address: helpers.env('MAIL_FROM_ADDRESS', 'hello@example.com'),
name: helpers.env('MAIL_FROM_NAME', 'Example')
address: env('MAIL_FROM_ADDRESS', 'hello@example.com'),
name: env('MAIL_FROM_NAME', 'Example')
}
}
}