r/p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull requests Releases 1 Wiki Activity

Remove EXAMPLE_USERNAME as a settable option as per discussion on Issue #646 (#651)

Browse source
This commit is contained in:
Jared Donovan 2018-06-19 07:30:05 +10:00 committed by Cassie Tarakajian
parent 9958619fc4
commit c814826c4a
3 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.env.example
View file

@ -11,6 +11,5 @@ GITHUB_SECRET=<your-github-client-secret>
GOOGLE_ID=<your-google-client-id> (use google+ api) GOOGLE_ID=<your-google-client-id> (use google+ api)
GOOGLE_SECRET=<your-google-client-secret> (use google+ api) GOOGLE_SECRET=<your-google-client-secret> (use google+ api)
MAILGUN_KEY=<your-mailgun-api-key> MAILGUN_KEY=<your-mailgun-api-key>
EXAMPLE_USERNAME=<your-name>
EXAMPLE_USER_EMAIL=<your-email-id> EXAMPLE_USER_EMAIL=<your-email-id>
EXAMPLE_USER_PASSWORD=<your-password> EXAMPLE_USER_PASSWORD=<your-password>

10
README.md
View file

@ -26,9 +26,8 @@ This project is currently in development! It will be announced when there is a (
GOOGLE_ID=<your-google-client-id> (use google+ api) GOOGLE_ID=<your-google-client-id> (use google+ api)
GOOGLE_SECRET=<your-google-client-secret> (use google+ api) GOOGLE_SECRET=<your-google-client-secret> (use google+ api)
MAILGUN_KEY=<your-mailgun-api-key> MAILGUN_KEY=<your-mailgun-api-key>
EXAMPLE_USERNAME=<your-name> EXAMPLE_USER_EMAIL=<email-id-for-p5-example-user>
EXAMPLE_USER_EMAIL=<your-email-id> EXAMPLE_USER_PASSWORD=<password-for-p5-example-user>
EXAMPLE_USER_PASSWORD=<your-password>
``` ```
If you don't care about being able to upload media files to S3 or Login with Github or Google, you can drop in the file exactly how it is. Or, if you don't want to do that, just ask me to send you mine. Refer to [this gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) for creating an S3 bucket for testing, or if you don't want to do that, I can add you to one of my S3 buckets. If you don't care about being able to upload media files to S3 or Login with Github or Google, you can drop in the file exactly how it is. Or, if you don't want to do that, just ask me to send you mine. Refer to [this gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) for creating an S3 bucket for testing, or if you don't want to do that, I can add you to one of my S3 buckets.
@ -93,9 +92,8 @@ If you don't have the full server environment running, you can launch a one-off
MAILGUN_KEY=<mailgun-api-key> MAILGUN_KEY=<mailgun-api-key>
MAILGUN_DOMAIN=<mailgun-domain> MAILGUN_DOMAIN=<mailgun-domain>
EMAIL_VERIFY_SECRET_TOKEN=whatever_you_want_this_to_be_it_only_matters_for_production EMAIL_VERIFY_SECRET_TOKEN=whatever_you_want_this_to_be_it_only_matters_for_production
EXAMPLE_USERNAME=<your-name> EXAMPLE_USER_EMAIL=<email-id-for-p5-example-user>
EXAMPLE_USER_EMAIL=<your-email-id> EXAMPLE_USER_PASSWORD=<password-for-p5-example-user>
EXAMPLE_USER_PASSWORD=<your-password>
``` ```
For production, you will need to have real Github and Amazon credentials. Refer to [this gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) for creating an S3 bucket for testing. For production, you will need to have real Github and Amazon credentials. Refer to [this gist](https://gist.github.com/catarak/70c9301f0fd1ac2d6b58de03f61997e3) for creating an S3 bucket for testing.

6
server/examples.js
View file

@ -137,7 +137,7 @@ function createProjectsInP5user(projectsInAllCategories) {
}; };
rp(options).then((res) => { rp(options).then((res) => {
User.findOne({ username: process.env.EXAMPLE_USERNAME }, (err, user) => { User.findOne({ username: 'p5' }, (err, user) => {
if (err) throw err; if (err) throw err;
eachSeries(projectsInAllCategories, (projectsInOneCategory, categoryCallback) => { eachSeries(projectsInAllCategories, (projectsInOneCategory, categoryCallback) => {
@ -289,13 +289,13 @@ function createProjectsInP5user(projectsInAllCategories) {
} }
function getp5User() { function getp5User() {
User.findOne({ username: process.env.EXAMPLE_USERNAME }, (err, user) => { User.findOne({ username: 'p5' }, (err, user) => {
if (err) throw err; if (err) throw err;
let p5User = user; let p5User = user;
if (!p5User) { if (!p5User) {
p5User = new User({ p5User = new User({
username: process.env.EXAMPLE_USERNAME, username: 'p5',
email: process.env.EXAMPLE_USER_EMAIL, email: process.env.EXAMPLE_USER_EMAIL,
password: process.env.EXAMPLE_USER_PASSWORD password: process.env.EXAMPLE_USER_PASSWORD
}); });