Skip to content

Commit d799140

Browse files
committed
updated rawgit to githack
2 parents 9c5cc20 + 41391c2 commit d799140

File tree

105 files changed

+2578
-1370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+2578
-1370
lines changed

.env.example

+9-2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ GITHUB_ID=<your-github-client-id>
1010
GITHUB_SECRET=<your-github-client-secret>
1111
GOOGLE_ID=<your-google-client-id> (use google+ api)
1212
GOOGLE_SECRET=<your-google-client-secret> (use google+ api)
13+
MAILGUN_DOMAIN=<your-mailgun-domain>
1314
MAILGUN_KEY=<your-mailgun-api-key>
14-
EXAMPLE_USER_EMAIL=<your-email-id>
15-
EXAMPLE_USER_PASSWORD=<your-password>
15+
EMAIL_SENDER=<transactional-email-sender>
16+
EMAIL_VERIFY_SECRET_TOKEN=whatever_you_want_this_to_be_it_only_matters_for_production
17+
S3_BUCKET_URL_BASE=<alt-for-s3-url>
18+
EXAMPLE_USER_EMAIL=[email protected]
19+
EXAMPLE_USER_PASSWORD=hellop5js
20+
GG_EXAMPLES_USERNAME=generative-design
21+
GG_EXAMPLES_PASS=generativedesign
22+
GG_EXAMPLES_EMAIL=[email protected]

.eslintignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
webpack.config.js
1+
webpack/*
22
index.js
File renamed without changes.

contributing.md renamed to .github/CONTRIBUTING.md

+7-53
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,24 @@
1-
# Contributing to the p5.js web editor
1+
# Contributing to the p5.js Web Editor
22

3-
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:
4-
5-
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.
3+
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**.
64

75
Here are links to all the sections in this document:
86

97
<!-- If you change any of the headings in this document, remember to update the table of contents. -->
108

119
- [Code of Conduct](#code-of-conduct)
12-
- [Technologies Used](#technologies-used)
13-
- [Development Installation](#development-installation)
14-
- [New Design](#new-design)
1510
- [How Can I Contribute ?](#how-can-i-contribute?)
1611
- [First Timers](#first-timers)
1712
- [Want something more challenging](#want-something-more-challenging)
1813
- [Feature Enhancement](#feature-enhancement)
1914
- [Creating a Pull request](#creating-a-pull-request)
2015
- - [Tips](#tips)
2116

22-
# Code of Conduct
23-
24-
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).
25-
26-
# Technologies Used
27-
28-
> **MERN stack - MongoDB, Express, React/Redux, and Node**.
29-
30-
- For a reference to the **file structure format** I am using, please look at the [Mern Starter](https://github.com/Hashnode/mern-starter).
31-
32-
- This project **does not use CSS Modules, but uses Sass**. [BEM guidelines and naming conventions](http://getbem.com/) are followed.
33-
34-
- For repeatitive and common styles, write OOSCSS (Object-Oriented SCSS) with placeholders and mixins. For organizing styles, follow the 7-1 Pattern for Sass.
35-
36-
- We're using [ES6](http://es6-features.org/) and transpiling to ES5 using [Babel](https://babeljs.io/).
37-
38-
- 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).
39-
40-
- 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`.
41-
42-
# Development Installation
17+
## Code of Conduct
4318

44-
To get started on a patch, first read the instruction from [README.md](https://github.com/processing/p5.js-web-editor#development-installation).
19+
Please follow the guidelines mentioned at [CODE OF CONDUCT.md](https://github.com/processing/p5.js-web-editor/blob/master/.github/CODE_OF_CONDUCT.md).
4520

46-
# New Design
47-
48-
Design proposed and theme changes are present at: [Zeplin](https://scene.zeplin.io/project/55f746c54a02e1e50e0632c3).
49-
50-
# How Can I Contribute?
21+
## How Can I Contribute?
5122

5223
### First Timers
5324
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
5930
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).
6031

6132
If you'd like to work on a bug, please comment on it to let the maintainers know.
62-
If someone else has already commented and taken up that bug, please refrain from working on it and submitting
63-
a PR without asking the maintainers as it leads to unnecessary duplication of effort.
33+
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.
6434

6535
### Contribution guides
6636

6737
* [https://guides.github.com/activities/hello-world/](https://guides.github.com/activities/hello-world/)
6838
* [https://guides.github.com/activities/forking/](https://guides.github.com/activities/forking/)
6939

70-
# Creating a pull request
71-
72-
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.
73-
74-
$ git remote add upstream https://github.com/processing/p5.js-web-editor
75-
76-
and also before you submit a [pull request](https://help.github.com/articles/creating-a-pull-request/), please remember to fetch the changes using:
77-
78-
$ git fetch upstream
79-
80-
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:
81-
82-
Fixes #333
83-
84-
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.
85-
86-
# Writing commit messages
40+
## Writing commit messages
8741

8842
Good commit messages serve at least three important purposes:
8943

File renamed without changes.
File renamed without changes.

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
.env
3+
.env.production
34
.vscode/
45
node_modules/
56
npm-debug.log

.travis.yml

+37-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
sudo: required
12
language: node_js
23
node_js:
3-
- "8.11.1"
4+
- "8.11.1"
5+
6+
cache:
7+
directories:
8+
- "$HOME/google-cloud-sdk/"
9+
10+
services:
11+
- docker
12+
13+
before_install:
14+
- docker-compose -f docker-compose-development.yml up -d
15+
- docker ps -a
16+
17+
install: true
18+
19+
script:
20+
- docker-compose exec -T app npm run test --verbose
21+
22+
before_deploy:
23+
- docker-compose stop
24+
- 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
25+
- source /home/travis/google-cloud-sdk/path.bash.inc
26+
- gcloud --quiet version
27+
- gcloud --quiet components update
28+
- gcloud --quiet components update kubectl
29+
30+
deploy:
31+
- provider: script
32+
script: ./deploy.sh
33+
skip_cleanup: true
34+
on:
35+
branch: master
36+
37+
env:
38+
global:
39+
- APP_IMAGE_NAME=p5jswebeditor_app

Dockerfile

+23-14
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
FROM node:8.9.0
2-
3-
ENV APP_HOME=/opt/node/app \
4-
TERM=xterm
5-
6-
# Copy in the project files and set as working directory
7-
ADD . $APP_HOME
1+
FROM node:8.11.1 as base
2+
ENV APP_HOME=/usr/src/app \
3+
TERM=xterm
4+
RUN mkdir -p $APP_HOME
85
WORKDIR $APP_HOME
6+
EXPOSE 8000
97

10-
# Install node modules
8+
FROM base as development
9+
ENV NODE_ENV development
10+
COPY package.json package-lock.json ./
1111
RUN npm install
12-
13-
# Rebuild node-sass just to be safe
1412
RUN npm rebuild node-sass
13+
COPY .babelrc index.js nodemon.json ./
14+
COPY ./webpack ./webpack
15+
COPY client ./client
16+
COPY server ./server
17+
CMD ["npm", "start"]
1518

16-
# For development, mark the directory as a mount override point
17-
VOLUME $APP_HOME
19+
FROM development as build
20+
ENV NODE_ENV production
21+
RUN npm run build
1822

19-
# Expose default server port
20-
EXPOSE 8000
23+
FROM base as production
24+
ENV NODE_ENV=production
25+
COPY package.json package-lock.json index.js ./
26+
RUN npm install --production
27+
RUN npm rebuild node-sass
28+
COPY --from=build $APP_HOME/dist ./dist
29+
CMD ["npm", "run", "start:prod"]

0 commit comments

Comments
 (0)