processing · catarak · Sep 26, 2018 · May 18, 2018 · May 18, 2018 · May 18, 2018
diff --git a/.env.example b/.env.example
@@ -10,6 +10,13 @@ GITHUB_ID=<your-github-client-id>
 GITHUB_SECRET=<your-github-client-secret>
 GOOGLE_ID=<your-google-client-id> (use google+ api)
 GOOGLE_SECRET=<your-google-client-secret> (use google+ api)
+MAILGUN_DOMAIN=<your-mailgun-domain>
 MAILGUN_KEY=<your-mailgun-api-key>
-EXAMPLE_USER_EMAIL=<your-email-id>
-EXAMPLE_USER_PASSWORD=<your-password>
+EMAIL_SENDER=<transactional-email-sender>
+EMAIL_VERIFY_SECRET_TOKEN=whatever_you_want_this_to_be_it_only_matters_for_production
+S3_BUCKET_URL_BASE=<alt-for-s3-url>
+[email protected]
+EXAMPLE_USER_PASSWORD=hellop5js
+GG_EXAMPLES_USERNAME=generative-design
+GG_EXAMPLES_PASS=generativedesign
+[email protected]
diff --git a/.eslintignore b/.eslintignore
@@ -1,2 +1,2 @@
-webpack.config.js
+webpack/*
 index.js
diff --git a/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md → .github/CODE_OF_CONDUCT.md
diff --git a/contributing.md → .github/CONTRIBUTING.md b/contributing.md → .github/CONTRIBUTING.md
@@ -1,53 +1,24 @@
-# Contributing to the p5.js web editor 
+# Contributing to the p5.js Web Editor 
 
-Hello! We welcome community contributions to the p5.js web editor. Contributing takes many forms and doesn't have to be **writing code**, it can be **documenting bugs**, **proposing new features**, and **updating documentation**. We would also like to Thank you for choosing to contribute p5.js web editor, any way possible. You are awesome! :blush:
-
-This **web editor** for **p5.js**, a JavaScript library with the goal of making coding accessible to **artists**, **designers**, **educators**, and **beginners**, is an environment to make p5.js sketches without needing to download any software or do any configuration, which makes it a great place to start learning how to code and start learning p5.js.
+Hello! We welcome community contributions to the p5.js Web Editor. Contributing takes many forms and doesn't have to be **writing code**, it can be **report bugs**, **proposing new features**, **creating UI/UX designs**, and **updating documentation**. 
 
 Here are links to all the sections in this document:
 
 <!-- If you change any of the headings in this document, remember to update the table of contents. -->
 
 - [Code of Conduct](#code-of-conduct)
-- [Technologies Used](#technologies-used)
-- [Development Installation](#development-installation)
-- [New Design](#new-design)
 - [How Can I Contribute ?](#how-can-i-contribute?)
   - [First Timers](#first-timers)
   - [Want something more challenging](#want-something-more-challenging)
   - [Feature Enhancement](#feature-enhancement)
 - [Creating a Pull request](#creating-a-pull-request)
   - - [Tips](#tips)
 
-# Code of Conduct
+## Code of Conduct
 
 Please follow the guidelines mentioned at [CODE OF CONDUCT.md](https://github.com/processing/p5.js-web-editor/blob/master/CODE_OF_CONDUCT.md#p5js-code-of-conduct).
 
-# Technologies Used
-
- > **MERN stack - MongoDB, Express, React/Redux, and Node**. 
-
- - For a reference to the **file structure format** I am using, please look at the [Mern Starter](https://github.com/Hashnode/mern-starter).
-
- - This project **does not use CSS Modules, but uses Sass**. [BEM guidelines and naming conventions](http://getbem.com/) are followed. 
-
- - For repeatitive and common styles, write OOSCSS (Object-Oriented SCSS) with placeholders and mixins. For organizing styles, follow the 7-1 Pattern for Sass.
-
- - We're using [ES6](http://es6-features.org/) and transpiling to ES5 using [Babel](https://babeljs.io/). 
-
- - For reference to the JavaScript style guide, see the [Airbnb Style Guide](https://github.com/airbnb/javascript), [React ESLint Plugin](https://github.com/yannickcr/eslint-plugin-react).
-
- - The ESLint configuration is based on a few popular React/Redux boilerplates. Open to suggestions on this. If in development, **you're getting annoyed with ESLint**, you can **remove** it from `webpack.config.dev.js` in the JavaScript loader, or disable any line from eslint by commenting at the end of the line `// eslint-disable-line`.
-
-# Development Installation
-
-To get started on a patch, first read the instruction from [README.md](https://github.com/processing/p5.js-web-editor#development-installation).
-
-# New Design
-
-Design proposed and theme changes are present at: [Zeplin](https://scene.zeplin.io/project/55f746c54a02e1e50e0632c3).
-
-# How Can I Contribute?
+## How Can I Contribute?
 
 ### First Timers
 For first-time contributors or those who want to start with a small task: [check out our list of good first bugs](https://github.com/processing/p5.js-web-editor/labels/good%20first%20issue). First read the github discussion on that issue and find out if there's currently a person working on that or not. If no one is working on it or if there has was one claimed to but has not been active for a while, ask if it is up for grabs. It's okay to not know how to fix an issue and feel free to ask questions about to approach the problem! We are all just here to learn and make something awesome. Someone from the community would help you out and these are great issues for learning about the web editor, its file structure and its development process.
@@ -59,31 +30,14 @@ If you're already familiar with the project or would like take on something a li
 If you want to work on building new things, please take a look at [type: feature](https://github.com/processing/p5.js-web-editor/labels/type%3Afeature).
 
 If you'd like to work on a bug, please comment on it to let the maintainers know.
-If someone else has already commented and taken up that bug, please refrain from working on it and submitting
-a PR without asking the maintainers as it leads to unnecessary duplication of effort.
+If someone else has already commented and taken up that bug, please refrain from working on it and submitting a PR without asking the maintainers as it leads to unnecessary duplication of effort.
 
 ### Contribution guides
 
 * [https://guides.github.com/activities/hello-world/](https://guides.github.com/activities/hello-world/)
 * [https://guides.github.com/activities/forking/](https://guides.github.com/activities/forking/)
 
-# Creating a pull request
-
-Set up a new remote that points to the original project so that you can update your local repository once any changes have made to remote.
-
-	$ git remote add upstream https://github.com/processing/p5.js-web-editor
-
- and also before you submit a [pull request](https://help.github.com/articles/creating-a-pull-request/), please remember to fetch the changes using:
-
-	$ git fetch upstream
-
-When you create a pull request for a new fix or feature, be sure to mention the issue number for what you're working on. The best way to do it is to mention the issue like this at the top of your description:
-
-    Fixes #333
-
-The issue number in this case is "333." The word *Fixes* is magical; GitHub will automatically close the issue when your pull request is merged.
-
-# Writing commit messages
+## Writing commit messages
 
 Good commit messages serve at least three important purposes:
 

diff --git a/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
diff --git a/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md → .github/PULL_REQUEST_TEMPLATE.md
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 .DS_Store
 .env
+.env.production
 .vscode/
 node_modules/
 npm-debug.log

diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,39 @@
+sudo: required
 language: node_js
 node_js:
- - "8.11.1"
+ - "8.11.1"
+
+cache:
+  directories:
+    - "$HOME/google-cloud-sdk/"
+
+services:
+  - docker
+
+before_install:
+  - docker-compose -f docker-compose-development.yml up -d
+  - docker ps -a
+
+install: true
+
+script:
+  - docker-compose exec -T app npm run test --verbose
+
+before_deploy:
+  - docker-compose stop
+  - if [ ! -d "$HOME/google-cloud-sdk/bin" ]; then rm -rf $HOME/google-cloud-sdk; export CLOUDSDK_CORE_DISABLE_PROMPTS=1; curl https://sdk.cloud.google.com | bash >/dev/null; fi
+  - source /home/travis/google-cloud-sdk/path.bash.inc
+  - gcloud --quiet version
+  - gcloud --quiet components update
+  - gcloud --quiet components update kubectl
+
+deploy:
+  - provider: script
+    script: ./deploy.sh
+    skip_cleanup: true
+    on:
+      branch: master
+
+env:
+  global:
+    - APP_IMAGE_NAME=p5jswebeditor_app
diff --git a/Dockerfile b/Dockerfile
@@ -1,20 +1,29 @@
-FROM node:8.9.0
-
-ENV APP_HOME=/opt/node/app \
-    TERM=xterm
-
-# Copy in the project files and set as working directory
-ADD . $APP_HOME
+FROM node:8.11.1 as base
+ENV APP_HOME=/usr/src/app \
+  TERM=xterm
+RUN mkdir -p $APP_HOME
 WORKDIR $APP_HOME
+EXPOSE 8000
 
-# Install node modules
+FROM base as development
+ENV NODE_ENV development
+COPY package.json package-lock.json ./
 RUN npm install
-
-# Rebuild node-sass just to be safe
 RUN npm rebuild node-sass
+COPY .babelrc index.js nodemon.json ./
+COPY ./webpack ./webpack
+COPY client ./client
+COPY server ./server
+CMD ["npm", "start"]
 
-# For development, mark the directory as a mount override point
-VOLUME $APP_HOME
+FROM development as build
+ENV NODE_ENV production
+RUN npm run build
 
-# Expose default server port
-EXPOSE 8000
+FROM base as production
+ENV NODE_ENV=production
+COPY package.json package-lock.json index.js ./
+RUN npm install --production
+RUN npm rebuild node-sass
+COPY --from=build $APP_HOME/dist ./dist
+CMD ["npm", "run", "start:prod"]