Skip to content

Commit

Permalink
Reformat md, json, html and js files with Prettier (part of #932)
Browse files Browse the repository at this point in the history
  • Loading branch information
Prettier authored and mrkvon committed Feb 13, 2020
1 parent edf1cc8 commit a611448
Show file tree
Hide file tree
Showing 531 changed files with 91,002 additions and 83,033 deletions.
20 changes: 10 additions & 10 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ In the interest of fostering an open and welcoming environment, we as contributo

Examples of behavior that contributes to creating a positive environment include:

* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
- Using welcoming and inclusive language
- Being respectful of differing viewpoints and experiences
- Gracefully accepting constructive criticism
- Focusing on what is best for the community
- Showing empathy towards other community members

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery and unwelcome sexual attention or advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a professional setting
- The use of sexualized language or imagery and unwelcome sexual attention or advances
- Trolling, insulting/derogatory comments, and personal or political attacks
- Public or private harassment
- Publishing others' private information, such as a physical or electronic address, without explicit permission
- Other conduct which could reasonably be considered inappropriate in a professional setting

## Our Responsibilities

Expand Down
27 changes: 13 additions & 14 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@

Refer to the [Ubuntu Code of Conduct](http://www.ubuntu.com/about/about-ubuntu/conduct) for guidance on how to contribute, particularly the following points:

* Be considerate
* Be respectful
* Take responsibility for our words and our actions
* Be collaborative
* Value decisiveness, clarity and consensus
* Ask for help when unsure
* Step down considerately
- Be considerate
- Be respectful
- Take responsibility for our words and our actions
- Be collaborative
- Value decisiveness, clarity and consensus
- Ask for help when unsure
- Step down considerately

Our code of conduct might be described as follows.

* Be pragmatic.
* Be nice to people.
* Show respect for those who do the work.
* When in doubt, defer to those with more experience, who have contributed for longer, and support their decisions.
* [We believe](https://www.trustroots.org/about) in beauty, simplicity and transparency.
* We emphasize community.
- Be pragmatic.
- Be nice to people.
- Show respect for those who do the work.
- When in doubt, defer to those with more experience, who have contributed for longer, and support their decisions.
- [We believe](https://www.trustroots.org/about) in beauty, simplicity and transparency.
- We emphasize community.

## Not a discussion forum

Expand All @@ -34,4 +34,3 @@ We value getting things done attitude. Arguments about minor issues shouldn't ge
## Real life interaction

We highly value real life interaction. Both within the network as well as among technical contributors. If possible, try to meet up with other Trustroots contributors in real life. You can connect your Trustroots profile to your GitHub account to facilitate such connections.

1 change: 1 addition & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
## License

(The MIT License)

Permission is hereby granted, free of charge, to any person obtaining
Expand Down
12 changes: 6 additions & 6 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ Please send any issue that you feel affects the
security of Trustroots to **hello@trustroots.org** or [via our contact form](https://www.trustroots.org/contact).

If we do not respond promptly, please send us a quick
message *without details* to one of the following:
message _without details_ to one of the following:

* An issue at [GitHub](https://github.com/Trustroots/trustroots/issues)
* Message [@trustroots](https://twitter.com/trustroots) on Twitter.
* Give us a heads up on IRC in [#trustroots](https://webchat.freenode.net/?channels=trustroots) on Freenode.
- An issue at [GitHub](https://github.com/Trustroots/trustroots/issues)
- Message [@trustroots](https://twitter.com/trustroots) on Twitter.
- Give us a heads up on IRC in [#trustroots](https://webchat.freenode.net/?channels=trustroots) on Freenode.

## Bug Bounties

Expand All @@ -19,8 +19,8 @@ We are [a non-profit](https://www.trustroots.org/foundation), open source, volun

## History

* December 24, 2019 [Check for user id before modifying offer ](https://github.com/Trustroots/trustroots/pull/1011), kudos [Kenny Flannery](https://github.com/kenflannery)
- December 24, 2019 [Check for user id before modifying offer ](https://github.com/Trustroots/trustroots/pull/1011), kudos [Kenny Flannery](https://github.com/kenflannery)

## See also

* https://www.trustroots.org/.well-known/security.txt
- https://www.trustroots.org/.well-known/security.txt
13 changes: 8 additions & 5 deletions babel.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,14 @@ const isDevelopment = process.env.NODE_ENV === 'development';

module.exports = {
presets: [
['@babel/preset-env', {
corejs: 2,
modules: 'commonjs',
useBuiltIns: 'usage',
}],
[
'@babel/preset-env',
{
corejs: 2,
modules: 'commonjs',
useBuiltIns: 'usage',
},
],
['@babel/preset-react'],
],
plugins: compact([
Expand Down
5 changes: 1 addition & 4 deletions bin/README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


# bin

db-drop.js - probably drops the database
Expand All @@ -8,12 +6,11 @@ ensure-uploads-dir-exists.js - ?
install-deps.js - ?

only for NDA signed folks:

- dumpfetch.sh - fetches the production database to your local machine
- dumpimport.sh - puts the most recently fetched prod db onto your local mongo
- privacy.mongo - removes some private data and sets a standard password



## admin

Some admin related code, some of this can disappear once we have more
Expand Down
4 changes: 2 additions & 2 deletions bin/db-drop.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ if (process.env.NODE_ENV === 'production') {
// Use mongoose configuration
const mongooseService = require('../config/lib/mongoose.js');

mongooseService.connect(function (db) {
mongooseService.dropDatabase(db, function () {
mongooseService.connect(function(db) {
mongooseService.dropDatabase(db, function() {
mongooseService.disconnect();
});
});
Loading

0 comments on commit a611448

Please sign in to comment.