Skip to content

feat: Add support for p5.js version check #580

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

Closed
wants to merge 2 commits into from
Closed

feat: Add support for p5.js version check #580

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
5384d5b
server: add, integrate p5 version check api
dhruvdutt Feb 28, 2018
adba986
client: add p5 version check during init
dhruvdutt Feb 28, 2018
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
2 changes: 2 additions & 0 deletions client/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,5 @@ export const HIDE_HELP_MODAL = 'HIDE_HELP_MODAL';
export const HIDE_RUNTIME_ERROR_WARNING = 'HIDE_RUNTIME_ERROR_WARNING';
export const SHOW_RUNTIME_ERROR_WARNING = 'SHOW_RUNTIME_ERROR_WARNING';
export const SET_ASSETS = 'SET_ASSETS';

export const SET_P5_VERSION = 'SET_P5_VERSION';
21 changes: 15 additions & 6 deletions client/modules/IDE/reducers/files.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@ function draw() {
background(220);
}`;

const defaultHTML =
`<!DOCTYPE html>
const defaultHTML = (version = '0.5.0') => `<!DOCTYPE html>
<html>
<head>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.0/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.0/addons/p5.dom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.0/addons/p5.sound.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/${version}/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/${version}/addons/p5.dom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/${version}/addons/p5.sound.min.js"></script>
<link rel="stylesheet" type="text/css" href="style.css">
<meta charset="utf-8" />

Expand Down Expand Up @@ -58,7 +57,7 @@ const initialState = () => {
},
{
name: 'index.html',
content: defaultHTML,
content: defaultHTML(),
id: b,
_id: b,
fileType: 'file',
Expand Down Expand Up @@ -227,6 +226,16 @@ const files = (state, action) => {
}
return file;
});
case ActionTypes.SET_P5_VERSION:
return state.map((file) => {
if (file.name === 'index.html') {
return {
...file,
content: defaultHTML(action.data.version)
};
}
return file;
});
default:
return state;
}
Expand Down
29 changes: 19 additions & 10 deletions client/modules/User/actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,17 +68,26 @@ export function validateAndLoginUser(previousPath, formProps, dispatch) {

export function getUser() {
return (dispatch) => {
let userResponse;
axios.get(`${ROOT_URL}/session`, { withCredentials: true })
.then((response) => {
dispatch({
type: ActionTypes.AUTH_USER,
user: response.data
});
dispatch({
type: ActionTypes.SET_PREFERENCES,
preferences: response.data.preferences
});
})
.then((response) => {
userResponse = response;
return axios.get(`${ROOT_URL}/p5version`);
})
.then(({ data }) => {
dispatch({
type: ActionTypes.AUTH_USER,
user: userResponse.data
});
dispatch({
type: ActionTypes.SET_PREFERENCES,
preferences: userResponse.data.preferences
});
dispatch({
type: ActionTypes.SET_P5_VERSION,
data,
});
})
.catch((response) => {
dispatch(authError(response.data.error));
});
Expand Down
1 change: 1 addition & 0 deletions server/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
const config = {
mongoURL: process.env.MONGO_URL || 'mongodb://localhost:27017/p5js-web-editor',
port: process.env.PORT || 8000,
p5versionURL: 'https://p5js.org/download/version.json',
};

export default config;
8 changes: 8 additions & 0 deletions server/controllers/meta.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import rp from 'request-promise';

import config from '../config';

export function getP5Version(req, res) { // eslint-disable-line
rp({ uri: config.p5versionURL, json: true })
.then(response => res.json(response));
}
93 changes: 51 additions & 42 deletions server/examples.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,18 @@ import mongoose from 'mongoose';
import objectID from 'bson-objectid';
import shortid from 'shortid';
import eachSeries from 'async/eachSeries';

import config from './config';
import User from './models/user';
import Project from './models/project';

const defaultHTML =
const defaultHTML = version =>
`<!DOCTYPE html>
<html>
<head>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.0/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.0/addons/p5.dom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/0.6.0/addons/p5.sound.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/${version}/p5.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/${version}/addons/p5.dom.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/p5.js/${version}/addons/p5.sound.min.js"></script>
<link rel="stylesheet" type="text/css" href="style.css">
<meta charset="utf-8" />
</head>
Expand Down Expand Up @@ -189,44 +191,51 @@ function createProjectsInP5user(projectsInAllCategories) {
_id: shortid.generate()
});
} else {
newProject = new Project({
name: project.projectName,
user: user._id,
files: [
{
name: 'root',
id: r,
_id: r,
children: [a, b, c],
fileType: 'folder'
},
{
name: 'sketch.js',
content: project.sketchContent,
id: a,
_id: a,
isSelectedFile: true,
fileType: 'file',
children: []
},
{
name: 'index.html',
content: defaultHTML,
id: b,
_id: b,
fileType: 'file',
children: []
},
{
name: 'style.css',
content: defaultCSS,
id: c,
_id: c,
fileType: 'file',
children: []
}
],
_id: shortid.generate()
const p5versionOptions = {
uri: config.p5versionURL,
json: true
};

rp(p5versionOptions).then((response) => {
newProject = new Project({
name: project.projectName,
user: user._id,
files: [
{
name: 'root',
id: r,
_id: r,
children: [a, b, c],
fileType: 'folder'
},
{
name: 'sketch.js',
content: project.sketchContent,
id: a,
_id: a,
isSelectedFile: true,
fileType: 'file',
children: []
},
{
name: 'index.html',
content: defaultHTML(response.version),
id: b,
_id: b,
fileType: 'file',
children: []
},
{
name: 'style.css',
content: defaultCSS,
id: c,
_id: c,
fileType: 'file',
children: []
}
],
_id: shortid.generate()
});
});
}

Expand Down
3 changes: 3 additions & 0 deletions server/routes/aws.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,11 @@ import isAuthenticated from '../utils/isAuthenticated';
const router = new Router();

router.post('/S3/sign', isAuthenticated, AWSController.signS3);

router.post('/S3/copy', isAuthenticated, AWSController.copyObjectInS3);

router.delete('/S3/:object_key', isAuthenticated, AWSController.deleteObjectFromS3);

router.get('/S3/:username/objects', AWSController.listObjectsInS3ForUser);

export default router;
1 change: 1 addition & 0 deletions server/routes/embed.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as EmbedController from '../controllers/embed.controller';
const router = new Router();

router.get('/embed/:project_id', EmbedController.serveProject);

router.get('/full/:project_id', EmbedController.serveProject);

export default router;
1 change: 1 addition & 0 deletions server/routes/file.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import isAuthenticated from '../utils/isAuthenticated';
const router = new Router();

router.post('/projects/:project_id/files', isAuthenticated, FileController.createFile);

router.delete('/projects/:project_id/files/:file_id', isAuthenticated, FileController.deleteFile);

export default router;
8 changes: 8 additions & 0 deletions server/routes/meta.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { Router } from 'express';
import { getP5Version } from '../controllers/meta.controller';

const router = new Router();

router.get('/p5version', getP5Version);

export default router;
1 change: 1 addition & 0 deletions server/routes/server.routes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Router } from 'express';

import { renderIndex } from '../views/index';
import { get404Sketch } from '../views/404Page';
import { userExists } from '../controllers/user.controller';
Expand Down
2 changes: 2 additions & 0 deletions server/server.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import config from '../webpack.config.dev';

// Import all required modules
import serverConfig from './config';
import meta from './routes/meta.routes';
import users from './routes/user.routes';
import sessions from './routes/session.routes';
import projects from './routes/project.routes';
Expand Down Expand Up @@ -80,6 +81,7 @@ app.use(session({

app.use(passport.initialize());
app.use(passport.session());
app.use('/api', requestsOfTypeJSON(), meta);
app.use('/api', requestsOfTypeJSON(), users);
app.use('/api', requestsOfTypeJSON(), sessions);
app.use('/api', requestsOfTypeJSON(), projects);
Expand Down