From 6f2095eededcc494ecd11fa4821bb06e6e0fd790 Mon Sep 17 00:00:00 2001 From: Ruben van de Ven Date: Tue, 27 Oct 2020 21:45:41 +0100 Subject: [PATCH] Add dp image, consisten punctuation in default files, and overview of all users under '/users' --- README.ruben.md | 25 ++++++++++------- client/modules/IDE/reducers/files.js | 4 +-- dist/static/assets/images.json | 3 ++- dist/static/assets/images/dp.png | Bin 0 -> 14091 bytes doc/cheatsheet.md | 28 +++++--------------- server/domain-objects/createDefaultFiles.js | 4 +-- server/server.js | 20 ++++++++++++++ 7 files changed, 49 insertions(+), 35 deletions(-) create mode 100644 dist/static/assets/images/dp.png diff --git a/README.ruben.md b/README.ruben.md index f8ea419a..82d61f92 100644 --- a/README.ruben.md +++ b/README.ruben.md @@ -1,14 +1,8 @@ -Gebruik s3cmd om bucket in te stellen. -## Make bucket: -s3cmd mb s3://digitalplayground-p5 +# Usage + +There is a hidden link to have an overview of all users registered on the server: `/users`. -## Set the CORS rules -s3cmd -c .s3cfg setcors CORS.xml s3://digitalplayground-p5 -## Delete the CORS rules -s3cmd -c .s3cfg delcors s3://digitalplayground-p5 -## Get bucket info including CORS rules -s3cmd -c .s3cfg info s3://digitalplayground-p5 # Development @@ -22,3 +16,16 @@ s3cmd -c .s3cfg info s3://digitalplayground-p5 * `npm run build:server` * `npm run build:client` * `service p5.js-web-editor start` + + +Gebruik s3cmd om bucket in te stellen. + +## Make bucket: +s3cmd mb s3://digitalplayground-p5 + +## Set the CORS rules +s3cmd -c .s3cfg setcors CORS.xml s3://digitalplayground-p5 +## Delete the CORS rules +s3cmd -c .s3cfg delcors s3://digitalplayground-p5 +## Get bucket info including CORS rules +s3cmd -c .s3cfg info s3://digitalplayground-p5 diff --git a/client/modules/IDE/reducers/files.js b/client/modules/IDE/reducers/files.js index 06d6d382..79cfdfbf 100644 --- a/client/modules/IDE/reducers/files.js +++ b/client/modules/IDE/reducers/files.js @@ -4,8 +4,8 @@ import * as ActionTypes from '../../../constants'; const defaultSketch = `// liveUpdate function drawMask(detection) { - stroke('red'); - strokeWeight(2); + stroke('red') + strokeWeight(2) rect(detection.x, detection.y, detection.width, detection.height) }`; diff --git a/dist/static/assets/images.json b/dist/static/assets/images.json index 236cc321..792a7f02 100644 --- a/dist/static/assets/images.json +++ b/dist/static/assets/images.json @@ -20,5 +20,6 @@ "mustache2": "/assets/images/mustache2.png", "mustache3": "/assets/images/mustache3.png", "mustache4": "/assets/images/mustache4.png", - "mustache5": "/assets/images/mustache5.png" + "mustache5": "/assets/images/mustache5.png", + "dp": "/assets/images/dp.png" } \ No newline at end of file diff --git a/dist/static/assets/images/dp.png b/dist/static/assets/images/dp.png new file mode 100644 index 0000000000000000000000000000000000000000..dd07105f6de9e92d25df12513a23bfb886d98e40 GIT binary patch literal 14091 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 literal 0 HcmV?d00001 diff --git a/doc/cheatsheet.md b/doc/cheatsheet.md index 3acef61d..72423f0f 100644 --- a/doc/cheatsheet.md +++ b/doc/cheatsheet.md @@ -31,39 +31,31 @@ detection.height detection.angle : Hoeveel het gezicht gedraaid is (oftewel de 'roll'). - - - - ## Tekenen -drawPoints(punten) +drawPoints(\[punt1, punt2, ...]) : Teken punten -strokePoints(punten) +strokePoints(\[punt1, punt2, ...]) : Teken lijnen tussen een set punten +strokePoints(\[punt1, punt2, ...], OPEN) +: Teken lijnen tussen een set punten, maar de eindpunten worden _niet_ met elkaar verbonden. + rect(x, y, breedte, hoogte) : teken een rechthoek. _x_ en _y_ bepalen de linker bovenhoek. circle(cx, cy, radius) : Teken een cirkel. _cx_ en _cy_ bepalen het midden. Radius is de straal. - - image(naam, x, y, breedte, hoogte) : Toon een ingeladen afbeelding. _x_ en _y_ bepalen waar de linker bovenhoek wordt geplaatst. : Zie hieronder voor alle beschikbare afbeeldingen -getBoundingBox(punten) +let box = getBoundingBox(punten) : Bepaald het rechthoek waarbinnen de punten vallen. - - +: Te gebruiken als `box.x`, `box.y`, `box.width`, `box.height`. ## Opmaak @@ -95,12 +87,6 @@ https://genekogan.com/code/p5js-transformations/ - - - - - ## Afbeeldingen Deze afbeeldingen kun je gebruiken met `image()`. diff --git a/server/domain-objects/createDefaultFiles.js b/server/domain-objects/createDefaultFiles.js index 8ae58128..4ff32a13 100644 --- a/server/domain-objects/createDefaultFiles.js +++ b/server/domain-objects/createDefaultFiles.js @@ -1,8 +1,8 @@ const defaultSketch = `// liveUpdate function drawMask(detection) { - stroke('red'); - strokeWeight(2); + stroke('red') + strokeWeight(2) rect(detection.x, detection.y, detection.width, detection.height) } `; diff --git a/server/server.js b/server/server.js index 4cca3cbf..2ff9d0aa 100644 --- a/server/server.js +++ b/server/server.js @@ -28,6 +28,8 @@ import embedRoutes from './routes/embed.routes'; import assetRoutes from './routes/asset.routes'; import { requestsOfTypeJSON } from './utils/requestsOfType'; +import User from './models/user'; + import { renderIndex } from './views/index'; import { get404Sketch } from './views/404Page'; @@ -48,6 +50,8 @@ if (process.env.BASIC_USERNAME && process.env.BASIC_PASSWORD) { const allowedCorsOrigins = [ /p5js\.org$/, + /digitalplayground\.nl$/, + /rubenvandeven\.com$/ ]; // to allow client-only development @@ -185,6 +189,22 @@ app.use('/api', (error, req, res, next) => { }); +// overview of users: +app.get('/users', (req, res) => { + // let results = []; + User.find({}).sort({ createdAt: -1 }).exec() + .then((users) => { + const usernames = users.map((user) => user.username); + let names = "
    "; + usernames.forEach((username) => names += `
  • ${username}
  • `); + names += "
"; + res.send(names); + }); + // User.find() + // res.send({'testing': true}); +}); + + // Handle missing routes. app.get('*', (req, res) => { res.status(404);