From 5cbea874b8e3bbc908abdd282dbdafec7810b4af Mon Sep 17 00:00:00 2001 From: Youssra Elmortai <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 17 Apr 2023 11:52:41 +0200 Subject: [PATCH 01/53] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 74859d8e..090af424 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ > _Fork_ deze leertaak en ga aan de slag. Onderstaande outline ga je gedurende deze taak in jouw eigen GitHub omgeving uitwerken. De instructie vind je in: [docs/INSTRUCTIONS.md](docs/INSTRUCTIONS.md) -# Titel +# Visual Thinking in het HBO ## Inhoudsopgave From 0ae11616df124d3332c7d470f7a7034384edf371 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 19 Apr 2023 11:03:34 +0200 Subject: [PATCH 02/53] copy --- .gitignore | 7 + .prettierignore | 1 + index.js | 129 ++++++++ package-lock.json | 759 ++++++++++++++++++++++++++++++++++++++++++++++ package.json | 30 ++ 5 files changed, 926 insertions(+) create mode 100644 .gitignore create mode 100644 .prettierignore create mode 100644 index.js create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..af5c7297 --- /dev/null +++ b/.gitignore @@ -0,0 +1,7 @@ +.DS_Store +logs +*.logs +npm-debug.log* +node_modules +.npm +.env \ No newline at end of file diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 00000000..dc42c6ac --- /dev/null +++ b/.prettierignore @@ -0,0 +1 @@ +views/ \ No newline at end of file diff --git a/index.js b/index.js new file mode 100644 index 00000000..b9b7d4fc --- /dev/null +++ b/index.js @@ -0,0 +1,129 @@ +// Importeer express uit de node_modules map +import { render } from "ejs"; +import express, { response } from "express"; + +// Maak een nieuwe express app aan +const app = express(); + +// get info form api + +const url = "https://api.visualthinking.fdnd.nl/api/v1"; + +// Stel ejs in als template engine en geef de 'views' map door +app.set("view engine", "ejs"); +app.set("views", "./views"); + +// Stel afhandeling van formulieren inzx +app.use(express.json()); +app.use(express.urlencoded({ extended: true })); + +// Gebruik de map 'public' voor statische resources +app.use(express.static("public")); + +// Maak een route voor de index + +// homepagina +app.get("/", (request, response) => { + response.render("index"); +}); + +// profile + +app.get("/profile", (request, response) => { + response.render("profile"); +}); + +// overzichtspagina +app.get("/overzichtspagina", (request, response) => { + console.log(request.query.methods); + const methodsUrl = url + "/methods?first=100"; + + fetchJson(methodsUrl).then((data) => { + response.render("overzichtspagina", data); + }); +}); + +// detailpagina + +app.get("/detailpagina/:slug", (request, response) => { + // console.log(request.query.methods); + let detailPageUrl = url + "/method/" + request.params.slug; + let commentsPageUrl = url + "/comments/?id=" + request.query.id; + console.log(commentsPageUrl); + const id = request.query.id; + + fetchJson(detailPageUrl).then((data) => { + fetchJson(commentsPageUrl).then((data2) => { + console.log(commentsPageUrl, data2); + const combinedData = { + method: data.method, + comments: data2.comments, + }; + console.log(combinedData); + response.render("detailpagina", combinedData); + }); + }); +}); + +// post detailpagina + +app.post("/detailpagina/:slug", (request, response) => { + const baseurl = "https://api.visualthinking.fdnd.nl/api/v1/"; + const url = `${baseurl}comments`; + const commentUrl = `${baseurl}comments` + "?id=" + request.query.id; + + console.log("verstuurd:"); + console.log(request.body); + + postJson(url, request.body).then((data) => { + let newComment = { ...request.body }; + console.log("ontvangen:"); + console.log(data); + if (data.success) { + response.redirect( + "/detailpagina/" + request.params.slug + "?methodPosted=true" + ); + } else { + response.redirect( + "/detailpagina/" + request.params.slug + "?methodPosted=false" + ); + // const errormessage = `${data.message}: Werkt niet:(`; + // const newdata = { error: errormessage, values: newComment }; + + // response.render("detailpagina/" + request.params.slug, newdata); + } + }); +}); + +// Stel het poortnummer in waar express op gaat luisteren +app.set("port", process.env.PORT || 8000); + +// Start express op, haal het ingestelde poortnummer op +app.listen(app.get("port"), function () { + // Toon een bericht in de console en geef het poortnummer door + console.log(`Application started on http://localhost:${app.get("port")}`); +}); + +/** + * Wraps the fetch api and returns the response body parsed through json + * @param {*} url the api endpoint to address + * @returns the json response from the api endpoint + */ + +async function fetchJson(url) { + return await fetch(url) + .then((response) => response.json()) + .catch((error) => error); +} + +// post json + +export async function postJson(url, body) { + return await fetch(url, { + method: "post", + body: JSON.stringify(body), + headers: { "Content-Type": "application/json" }, + }) + .then((response) => response.json()) + .catch((error) => error); +} diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 00000000..64e1235d --- /dev/null +++ b/package-lock.json @@ -0,0 +1,759 @@ +{ + "name": "server-side-rendering", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "server-side-rendering", + "version": "1.0.0", + "license": "GPL-3.0", + "dependencies": { + "dotenv": "^16.0.3", + "ejs": "^3.1.8", + "express": "^4.18.2" + } + }, + "node_modules/accepts": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", + "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", + "dependencies": { + "mime-types": "~2.1.34", + "negotiator": "0.6.3" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/array-flatten": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", + "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==" + }, + "node_modules/async": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.4.tgz", + "integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ==" + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + }, + "node_modules/body-parser": { + "version": "1.20.1", + "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz", + "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==", + "dependencies": { + "bytes": "3.1.2", + "content-type": "~1.0.4", + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.11.0", + "raw-body": "2.5.1", + "type-is": "~1.6.18", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/bytes": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", + "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/call-bind": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", + "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dependencies": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + }, + "node_modules/content-disposition": { + "version": "0.5.4", + "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", + "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", + "dependencies": { + "safe-buffer": "5.2.1" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/content-type": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", + "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz", + "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/cookie-signature": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", + "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==" + }, + "node_modules/debug": { + "version": "2.6.9", + "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", + "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", + "dependencies": { + "ms": "2.0.0" + } + }, + "node_modules/depd": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", + "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/destroy": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", + "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", + "engines": { + "node": ">= 0.8", + "npm": "1.2.8000 || >= 1.4.16" + } + }, + "node_modules/dotenv": { + "version": "16.0.3", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz", + "integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==", + "engines": { + "node": ">=12" + } + }, + "node_modules/ee-first": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", + "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==" + }, + "node_modules/ejs": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.8.tgz", + "integrity": "sha512-/sXZeMlhS0ArkfX2Aw780gJzXSMPnKjtspYZv+f3NiKLlubezAHDU5+9xz6gd3/NhG3txQCo6xlglmTS+oTGEQ==", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/encodeurl": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", + "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/escape-html": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", + "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==" + }, + "node_modules/etag": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", + "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/express": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz", + "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==", + "dependencies": { + "accepts": "~1.3.8", + "array-flatten": "1.1.1", + "body-parser": "1.20.1", + "content-disposition": "0.5.4", + "content-type": "~1.0.4", + "cookie": "0.5.0", + "cookie-signature": "1.0.6", + "debug": "2.6.9", + "depd": "2.0.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "finalhandler": "1.2.0", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "merge-descriptors": "1.0.1", + "methods": "~1.1.2", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "path-to-regexp": "0.1.7", + "proxy-addr": "~2.0.7", + "qs": "6.11.0", + "range-parser": "~1.2.1", + "safe-buffer": "5.2.1", + "send": "0.18.0", + "serve-static": "1.15.0", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "type-is": "~1.6.18", + "utils-merge": "1.0.1", + "vary": "~1.1.2" + }, + "engines": { + "node": ">= 0.10.0" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/finalhandler": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz", + "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==", + "dependencies": { + "debug": "2.6.9", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "on-finished": "2.4.1", + "parseurl": "~1.3.3", + "statuses": "2.0.1", + "unpipe": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/forwarded": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", + "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/fresh": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", + "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "node_modules/get-intrinsic": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", + "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "dependencies": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.3" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dependencies": { + "function-bind": "^1.1.1" + }, + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-symbols": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/http-errors": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", + "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", + "dependencies": { + "depd": "2.0.0", + "inherits": "2.0.4", + "setprototypeof": "1.2.0", + "statuses": "2.0.1", + "toidentifier": "1.0.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/iconv-lite": { + "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + }, + "node_modules/ipaddr.js": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", + "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/jake": { + "version": "10.8.5", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.5.tgz", + "integrity": "sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.1", + "minimatch": "^3.0.4" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/media-typer": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", + "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/merge-descriptors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", + "integrity": "sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==" + }, + "node_modules/methods": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", + "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", + "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "bin": { + "mime": "cli.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==" + }, + "node_modules/negotiator": { + "version": "0.6.3", + "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", + "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/object-inspect": { + "version": "1.12.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", + "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/on-finished": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", + "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "dependencies": { + "ee-first": "1.1.1" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/parseurl": { + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", + "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/path-to-regexp": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", + "integrity": "sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==" + }, + "node_modules/proxy-addr": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", + "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "dependencies": { + "forwarded": "0.2.0", + "ipaddr.js": "1.9.1" + }, + "engines": { + "node": ">= 0.10" + } + }, + "node_modules/qs": { + "version": "6.11.0", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz", + "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==", + "dependencies": { + "side-channel": "^1.0.4" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/range-parser": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", + "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/raw-body": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz", + "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==", + "dependencies": { + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ] + }, + "node_modules/safer-buffer": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" + }, + "node_modules/send": { + "version": "0.18.0", + "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz", + "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==", + "dependencies": { + "debug": "2.6.9", + "depd": "2.0.0", + "destroy": "1.2.0", + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "etag": "~1.8.1", + "fresh": "0.5.2", + "http-errors": "2.0.0", + "mime": "1.6.0", + "ms": "2.1.3", + "on-finished": "2.4.1", + "range-parser": "~1.2.1", + "statuses": "2.0.1" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/send/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" + }, + "node_modules/serve-static": { + "version": "1.15.0", + "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz", + "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==", + "dependencies": { + "encodeurl": "~1.0.2", + "escape-html": "~1.0.3", + "parseurl": "~1.3.3", + "send": "0.18.0" + }, + "engines": { + "node": ">= 0.8.0" + } + }, + "node_modules/setprototypeof": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==" + }, + "node_modules/side-channel": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", + "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", + "dependencies": { + "call-bind": "^1.0.0", + "get-intrinsic": "^1.0.2", + "object-inspect": "^1.9.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/statuses": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", + "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "engines": { + "node": ">=0.6" + } + }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "dependencies": { + "media-typer": "0.3.0", + "mime-types": "~2.1.24" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/utils-merge": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", + "engines": { + "node": ">= 0.4.0" + } + }, + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", + "engines": { + "node": ">= 0.8" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 00000000..23482be1 --- /dev/null +++ b/package.json @@ -0,0 +1,30 @@ +{ + "name": "server-side-rendering", + "version": "1.0.0", + "description": "Ontwerp en ontwikkel een server-side website voor een opdrachtgever.", + "main": "app.js", + "type": "module", + "directories": { + "doc": "docs" + }, + "scripts": { + "start": "node index.js", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "keywords": [ + "node", + "express", + "ejs" + ], + "author": "J.P. Sturkenboom ", + "license": "GPL-3.0", + "bugs": { + "url": "https://github.com/fdnd-task/server-side-rendering/issues" + }, + "homepage": "https://github.com/fdnd-task/server-side-rendering#readme", + "dependencies": { + "dotenv": "^16.0.3", + "ejs": "^3.1.8", + "express": "^4.18.2" + } +} From 1f316ecb6765a8cf400731ba1f1d519d5c3080a0 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 19 Apr 2023 11:09:03 +0200 Subject: [PATCH 03/53] ejs erin gezet --- index.js | 71 ++----------------------------------------------- views/foot.ejs | 0 views/head.ejs | 0 views/index.ejs | 7 +++++ 4 files changed, 9 insertions(+), 69 deletions(-) create mode 100644 views/foot.ejs create mode 100644 views/head.ejs create mode 100644 views/index.ejs diff --git a/index.js b/index.js index b9b7d4fc..edfd50bb 100644 --- a/index.js +++ b/index.js @@ -22,79 +22,12 @@ app.use(express.static("public")); // Maak een route voor de index -// homepagina +// index renderen + app.get("/", (request, response) => { response.render("index"); }); -// profile - -app.get("/profile", (request, response) => { - response.render("profile"); -}); - -// overzichtspagina -app.get("/overzichtspagina", (request, response) => { - console.log(request.query.methods); - const methodsUrl = url + "/methods?first=100"; - - fetchJson(methodsUrl).then((data) => { - response.render("overzichtspagina", data); - }); -}); - -// detailpagina - -app.get("/detailpagina/:slug", (request, response) => { - // console.log(request.query.methods); - let detailPageUrl = url + "/method/" + request.params.slug; - let commentsPageUrl = url + "/comments/?id=" + request.query.id; - console.log(commentsPageUrl); - const id = request.query.id; - - fetchJson(detailPageUrl).then((data) => { - fetchJson(commentsPageUrl).then((data2) => { - console.log(commentsPageUrl, data2); - const combinedData = { - method: data.method, - comments: data2.comments, - }; - console.log(combinedData); - response.render("detailpagina", combinedData); - }); - }); -}); - -// post detailpagina - -app.post("/detailpagina/:slug", (request, response) => { - const baseurl = "https://api.visualthinking.fdnd.nl/api/v1/"; - const url = `${baseurl}comments`; - const commentUrl = `${baseurl}comments` + "?id=" + request.query.id; - - console.log("verstuurd:"); - console.log(request.body); - - postJson(url, request.body).then((data) => { - let newComment = { ...request.body }; - console.log("ontvangen:"); - console.log(data); - if (data.success) { - response.redirect( - "/detailpagina/" + request.params.slug + "?methodPosted=true" - ); - } else { - response.redirect( - "/detailpagina/" + request.params.slug + "?methodPosted=false" - ); - // const errormessage = `${data.message}: Werkt niet:(`; - // const newdata = { error: errormessage, values: newComment }; - - // response.render("detailpagina/" + request.params.slug, newdata); - } - }); -}); - // Stel het poortnummer in waar express op gaat luisteren app.set("port", process.env.PORT || 8000); diff --git a/views/foot.ejs b/views/foot.ejs new file mode 100644 index 00000000..e69de29b diff --git a/views/head.ejs b/views/head.ejs new file mode 100644 index 00000000..e69de29b diff --git a/views/index.ejs b/views/index.ejs new file mode 100644 index 00000000..29d8ced9 --- /dev/null +++ b/views/index.ejs @@ -0,0 +1,7 @@ +<%- include('./head') %> + + + + + +<%- include('./foot') %> \ No newline at end of file From dfea65113166dd80073c0474e114c19c5df7b409 Mon Sep 17 00:00:00 2001 From: Tobias Vrolijk Date: Wed, 19 Apr 2023 11:55:26 +0200 Subject: [PATCH 04/53] update CSS gekoppeld, icon toegevoegd --- public/account1.svg | 4 ++++ public/logo1.svg | 20 ++++++++++++++++++++ public/style.css | 0 views/head.ejs | 17 +++++++++++++++++ 4 files changed, 41 insertions(+) create mode 100644 public/account1.svg create mode 100644 public/logo1.svg create mode 100644 public/style.css diff --git a/public/account1.svg b/public/account1.svg new file mode 100644 index 00000000..6b58d322 --- /dev/null +++ b/public/account1.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/public/logo1.svg b/public/logo1.svg new file mode 100644 index 00000000..ce450f85 --- /dev/null +++ b/public/logo1.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/public/style.css b/public/style.css new file mode 100644 index 00000000..e69de29b diff --git a/views/head.ejs b/views/head.ejs index e69de29b..298d01cc 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -0,0 +1,17 @@ + + + + + + + + + Visual Thinking + + + + + + + + \ No newline at end of file From 7d84fa45e59706358bd258e922151a25316c0789 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:22:33 +0200 Subject: [PATCH 05/53] Update style.css --- public/style.css | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/public/style.css b/public/style.css index e69de29b..f31fcd30 100644 --- a/public/style.css +++ b/public/style.css @@ -0,0 +1,56 @@ +:root { + /* primaire kleuren */ + /* donkerblauw */ + --text-color: #090940; + --text-color-var01: #3a3a66; + --text-color-var02: #6b6b8c; + --text-color-var03: #9d9db3; + --text-color-var04: #ceced9; + + /* tekstvlakken of stroken */ + /*lichtblauw */ + --text-stroke-color: #67c5d1; + --text-stroke-color-var01: #85d1da; + --text-stroke-color-var02: #a4dce3; + --text-stroke-color-var03: #c2e8ed; + --text-stroke-color-var04: #e1f3f6; + + /* rood */ + --text-stroke-color-var05: #f96c4f; + --text-stroke-color-var06: #fa8972; + --text-stroke-color-var07: #fba795; + --text-stroke-color-var08: #fdc4b9; + --text-stroke-color-var09: #fee2dc; + + /* interactieve elementen */ + /* geel */ + --interactive-el-color: #feb51e; + --interactive-el-color-var01: #fec44b; + --interactive-el-color-var02: #fed378; + --interactive-el-color-var03: #ffe1a5; + --interactive-el-color-var04: #fff0d2; + + /* secundaire kleuren */ + --sec-colors-01: #af1301; + --sec-colors-02: #fbc5b4, ; + --sec-colors-03: #169861, ; + --sec-colors-04: #63c09f, ; + --sec-colors-05: #4fbbc2, ; + --sec-colors-06: #31439c, ; + --sec-colors-07: #8b3a00, ; + --sec-colors-08: #fe6f07; + + + /* grey tones */ + --grey-colors: #625c51; + --grey-colors-01: #c0beb9; + --grey-colors-02: #e0dedc; + --grey-colors-03: #f9f8f8; + + --background-color: white; + + /* fonts */ + --rigid: rigid-square, sans-serif; + --broodtekst: "yrsa", "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif; + +} \ No newline at end of file From b77515de357fec41011baa594ca9c9b6823456e8 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:44:28 +0200 Subject: [PATCH 06/53] pages --- index.js | 10 ++++++++++ views/detailpage.ejs | 7 +++++++ views/overviewpage.ejs | 7 +++++++ 3 files changed, 24 insertions(+) create mode 100644 views/detailpage.ejs create mode 100644 views/overviewpage.ejs diff --git a/index.js b/index.js index edfd50bb..a5156f5c 100644 --- a/index.js +++ b/index.js @@ -28,6 +28,16 @@ app.get("/", (request, response) => { response.render("index"); }); +// overviewpage renderen +app.get("/overviewpage", (request, response) => { + console.log(request.query.methods); + const methodsUrl = url + "/methods?first=100"; + + fetchJson(methodsUrl).then((data) => { + response.render("overviewpage", data); + }); +}); + // Stel het poortnummer in waar express op gaat luisteren app.set("port", process.env.PORT || 8000); diff --git a/views/detailpage.ejs b/views/detailpage.ejs new file mode 100644 index 00000000..29d8ced9 --- /dev/null +++ b/views/detailpage.ejs @@ -0,0 +1,7 @@ +<%- include('./head') %> + + + + + +<%- include('./foot') %> \ No newline at end of file diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs new file mode 100644 index 00000000..29d8ced9 --- /dev/null +++ b/views/overviewpage.ejs @@ -0,0 +1,7 @@ +<%- include('./head') %> + + + + + +<%- include('./foot') %> \ No newline at end of file From 3455842ff7c282df36d31cd5b66f67f49cef82ba Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 11:52:20 +0200 Subject: [PATCH 07/53] server side heb de server side beetje gefixt en alvast ejs files gemaakt waar we in kunnen werken --- index.js | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ views/index.ejs | 2 +- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/index.js b/index.js index a5156f5c..76146e70 100644 --- a/index.js +++ b/index.js @@ -38,6 +38,54 @@ app.get("/overviewpage", (request, response) => { }); }); +// detailpage renderen + +app.get("/detailpage/:slug", (request, response) => { + // console.log(request.query.methods); + let detailPageUrl = url + "/method/" + request.params.slug; + let commentsPageUrl = url + "/comments/?id=" + request.query.id; + console.log(commentsPageUrl); + const id = request.query.id; + + fetchJson(detailPageUrl).then((data) => { + fetchJson(commentsPageUrl).then((data2) => { + console.log(commentsPageUrl, data2); + const combinedData = { + method: data.method, + comments: data2.comments, + }; + console.log(combinedData); + response.render("detailpage", combinedData); + }); + }); +}); + +// detailpage post + +app.post("/detailpagina/:slug", (request, response) => { + const baseurl = "https://api.visualthinking.fdnd.nl/api/v1/"; + const url = `${baseurl}comments`; + const commentUrl = `${baseurl}comments` + "?id=" + request.query.id; + + console.log("verstuurd:"); + console.log(request.body); + + postJson(url, request.body).then((data) => { + let newComment = { ...request.body }; + console.log("ontvangen:"); + console.log(data); + if (data.success) { + response.redirect( + "/detailpage/" + request.params.slug + "?methodPosted=true" + ); + } else { + response.redirect( + "/detailpage/" + request.params.slug + "?methodPosted=false" + ); + } + }); +}); + // Stel het poortnummer in waar express op gaat luisteren app.set("port", process.env.PORT || 8000); diff --git a/views/index.ejs b/views/index.ejs index 29d8ced9..97947b7f 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,7 +1,7 @@ <%- include('./head') %> - +naar overzichtspagina <%- include('./foot') %> \ No newline at end of file From 3de6fbb20db1b2c78f8bb82862dbed2415aef3d0 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:15:13 +0200 Subject: [PATCH 08/53] index.ejs link gefixt ik had verkeerd gelinkt de link werkt nu wel --- views/index.ejs | 2 +- views/overviewpage.ejs | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/views/index.ejs b/views/index.ejs index 97947b7f..642b8028 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,7 +1,7 @@ <%- include('./head') %> -naar overzichtspagina +naar overzichtspagina <%- include('./foot') %> \ No newline at end of file diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 29d8ced9..93590097 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,5 +1,27 @@ <%- include('./head') %> +
+ +
+ + <% methods.forEach(method=> { %> + + <% }) %> + +
+ +
+ + From 0a6b9c4a3b8c7d5bc10fca41569d33a2223fff2f Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:46:31 +0200 Subject: [PATCH 09/53] style link gefixt de style link was niet correct --- public/style.css | 38 ++++++++++++++++++++++++++++++++++++++ views/head.ejs | 3 +-- 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/public/style.css b/public/style.css index f31fcd30..231a714a 100644 --- a/public/style.css +++ b/public/style.css @@ -53,4 +53,42 @@ --rigid: rigid-square, sans-serif; --broodtekst: "yrsa", "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif; +} + + + + + +/* overviewpage styling */ + + +.method-container { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 1em; +} + +.method-card { + height: 20em; + width: auto; + border: solid var(--grey-colors-01); +} + +.method-card:hover { + border: solid var(--interactive-el-color-var02); +} + +.method-card a { + color: var(--text-color); + text-decoration: none; +} + +.method-card h2 { + margin-left: 0.5em; +} + +.method-img { + height: 15em; + width: auto; } \ No newline at end of file diff --git a/views/head.ejs b/views/head.ejs index 298d01cc..cbce5784 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -4,8 +4,7 @@ - - + Visual Thinking From 1c0604c4d1b7392b6f0b898aa0bb5a1b56da3bd8 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 18:48:35 +0200 Subject: [PATCH 10/53] Create placeholder.png --- public/placeholder.png | Bin 0 -> 20672 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/placeholder.png diff --git a/public/placeholder.png b/public/placeholder.png new file mode 100644 index 0000000000000000000000000000000000000000..f853810480cade7be155ab52a4ce0e2014ce079b GIT binary patch literal 20672 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 literal 0 HcmV?d00001 From df7deff45737eeab870794f2007c3943359f54c8 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Fri, 21 Apr 2023 19:40:26 +0200 Subject: [PATCH 11/53] method kaarten erin --- public/style.css | 15 ++++----------- views/overviewpage.ejs | 3 +-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/public/style.css b/public/style.css index 231a714a..9a7b7745 100644 --- a/public/style.css +++ b/public/style.css @@ -66,17 +66,13 @@ display: flex; flex-direction: row; flex-wrap: wrap; - gap: 1em; + gap: 2em 1em; } .method-card { - height: 20em; - width: auto; - border: solid var(--grey-colors-01); -} - -.method-card:hover { - border: solid var(--interactive-el-color-var02); + display: flex; + flex-direction: column; + height: 15em; } .method-card a { @@ -84,9 +80,6 @@ text-decoration: none; } -.method-card h2 { - margin-left: 0.5em; -} .method-img { height: 15em; diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 93590097..a6e12975 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -8,11 +8,10 @@ <% }) %> From 17cf82dbc6e59820f94f4d1e8b6f4ba545c3beed Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Sat, 22 Apr 2023 00:32:44 +0200 Subject: [PATCH 12/53] Update style.css --- public/style.css | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/style.css b/public/style.css index 9a7b7745..9b86b881 100644 --- a/public/style.css +++ b/public/style.css @@ -73,6 +73,7 @@ display: flex; flex-direction: column; height: 15em; + width: 50%; } .method-card a { @@ -83,5 +84,5 @@ .method-img { height: 15em; - width: auto; + width:fit-content; } \ No newline at end of file From 46ed924b797602ee509af82510d5bf92e2faf5f3 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Sun, 23 Apr 2023 16:42:06 +0200 Subject: [PATCH 13/53] responsieve cards bewegen mee met scherm groote --- public/style.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/style.css b/public/style.css index 9b86b881..810b2f9e 100644 --- a/public/style.css +++ b/public/style.css @@ -73,7 +73,7 @@ display: flex; flex-direction: column; height: 15em; - width: 50%; + width: auto; } .method-card a { From 3031044a0b0b9fa768a5bb55275a2c39d71e67f6 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Sun, 23 Apr 2023 16:54:33 +0200 Subject: [PATCH 14/53] icons in assets --- public/Communiceren-en-presenteren-icon.png | Bin 0 -> 1948 bytes public/Creatief-denken-icon.png | Bin 0 -> 1974 bytes public/Leren-over-anderen-icon.png | Bin 0 -> 1657 bytes public/Leren-over-jezelf-en-reflecteren-icon.png | Bin 0 -> 1823 bytes public/onderzoeken-en-begrijpen-icon.png | Bin 0 -> 1901 bytes public/organiseren-en-plannen-icon.png | Bin 0 -> 1378 bytes 6 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/Communiceren-en-presenteren-icon.png create mode 100644 public/Creatief-denken-icon.png create mode 100644 public/Leren-over-anderen-icon.png create mode 100644 public/Leren-over-jezelf-en-reflecteren-icon.png create mode 100644 public/onderzoeken-en-begrijpen-icon.png create mode 100644 public/organiseren-en-plannen-icon.png diff --git a/public/Communiceren-en-presenteren-icon.png b/public/Communiceren-en-presenteren-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..a355f8962b319e36beeed11e9253e5a4204f588d GIT binary patch literal 1948 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 literal 0 HcmV?d00001 From ac8bda4d6c8bbebe93c78f78748d68a272ae5fd0 Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 24 Apr 2023 11:11:21 +0200 Subject: [PATCH 15/53] Refactored comments Comments refactored in t engels voor consistentie --- index.js | 70 ++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 48 insertions(+), 22 deletions(-) diff --git a/index.js b/index.js index 76146e70..06625df3 100644 --- a/index.js +++ b/index.js @@ -1,84 +1,110 @@ -// Importeer express uit de node_modules map +// Import necesssary express and ejs modules import { render } from "ejs"; import express, { response } from "express"; -// Maak een nieuwe express app aan +// Create a new express instance const app = express(); -// get info form api - +// Assign URL of API to variable const url = "https://api.visualthinking.fdnd.nl/api/v1"; -// Stel ejs in als template engine en geef de 'views' map door +// Make EJS the selected view engine for our express app, and assign the views directory app.set("view engine", "ejs"); app.set("views", "./views"); -// Stel afhandeling van formulieren inzx +// Let express know we want to use JSON and URL-encoded request bodies app.use(express.json()); app.use(express.urlencoded({ extended: true })); -// Gebruik de map 'public' voor statische resources +// Use map "public" to serve static files app.use(express.static("public")); -// Maak een route voor de index - -// index renderen +// --- Rendering the index page: --- app.get("/", (request, response) => { response.render("index"); }); -// overviewpage renderen +// --- Rendering the overview page: --- +// Define an HTTP GET route for the path '/overviewpage' app.get("/overviewpage", (request, response) => { + // Log the value of the 'methods' parameter from the request's query string console.log(request.query.methods); + + // Define the URL to fetch the data from const methodsUrl = url + "/methods?first=100"; + // Use the fetchJson function to retrieve data from the specified URL + // Once the data is retrieved, render the 'overviewpage' view with the data fetchJson(methodsUrl).then((data) => { response.render("overviewpage", data); }); }); -// detailpage renderen - +// --- Rendering the detail page: --- +// Define an HTTP GET route for the path '/detailpage/:slug', where ':slug' is a URL parameter app.get("/detailpage/:slug", (request, response) => { - // console.log(request.query.methods); + // Construct the URL to fetch the detail page data from based on the URL parameter ':slug' let detailPageUrl = url + "/method/" + request.params.slug; + // Construct the URL to fetch the comments page data from based on the query parameter 'id' let commentsPageUrl = url + "/comments/?id=" + request.query.id; - console.log(commentsPageUrl); + + // Log the constructed URL for the comments page + // console.log(commentsPageUrl); + const id = request.query.id; + // Use the fetchJson function to retrieve the data for the detail page fetchJson(detailPageUrl).then((data) => { + // Use the fetchJson function to retrieve the data for the comments page fetchJson(commentsPageUrl).then((data2) => { - console.log(commentsPageUrl, data2); + + // Combine the data from both responses into a single object const combinedData = { - method: data.method, - comments: data2.comments, + method: data.method, // Data from the detail page + comments: data2.comments, // Data from the comments page }; - console.log(combinedData); + + // Log the combined data + // console.log(combinedData); + + // Render the 'detailpage' view with the combined data response.render("detailpage", combinedData); }); }); }); -// detailpage post - -app.post("/detailpagina/:slug", (request, response) => { +// --- Handling post requests for the comments: --- +// Define an HTTP POST route for the path '/detailpagina/:slug', where ':slug' is a URL parameter +app.post("/detailpage/:slug", (request, response) => { + // Define the URLS we will use to post the comment data to const baseurl = "https://api.visualthinking.fdnd.nl/api/v1/"; const url = `${baseurl}comments`; + // Construct the URL to fetch the comments page data from based on the query parameter 'id' const commentUrl = `${baseurl}comments` + "?id=" + request.query.id; + // Log the request body (the data submitted by the user) console.log("verstuurd:"); console.log(request.body); + // Use the postJson function to post the comment data to the specified URL postJson(url, request.body).then((data) => { + + // Create a copy of the request body let newComment = { ...request.body }; + + // Log the response data from the API console.log("ontvangen:"); console.log(data); + + // Check if the comment was successfully posted if (data.success) { + // If the comment was successfully posted, redirect to the detail page with a success message response.redirect( "/detailpage/" + request.params.slug + "?methodPosted=true" ); } else { + // If the comment was not successfully posted, redirect to the detail page with an error message response.redirect( "/detailpage/" + request.params.slug + "?methodPosted=false" ); From 00fc067cc7a7f21b825d1708506c7f5eabf7a3ec Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:38:29 +0200 Subject: [PATCH 16/53] styling plus variable gefixt --- public/style.css | 46 +++++++++++++++++++++++++++++++++++------- views/overviewpage.ejs | 4 +++- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/public/style.css b/public/style.css index 810b2f9e..8bc3ccf4 100644 --- a/public/style.css +++ b/public/style.css @@ -32,12 +32,12 @@ /* secundaire kleuren */ --sec-colors-01: #af1301; - --sec-colors-02: #fbc5b4, ; - --sec-colors-03: #169861, ; - --sec-colors-04: #63c09f, ; - --sec-colors-05: #4fbbc2, ; - --sec-colors-06: #31439c, ; - --sec-colors-07: #8b3a00, ; + --sec-colors-02: #fbc5b4; + --sec-colors-03: #169861; + --sec-colors-04: #63c09f; + --sec-colors-05: #4fbbc2; + --sec-colors-06: #31439c; + --sec-colors-07: #8b3a00; --sec-colors-08: #fe6f07; @@ -74,6 +74,11 @@ flex-direction: column; height: 15em; width: auto; + border-left: 11px solid #FEB51E; + filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); + border-radius: 6px; + + } .method-card a { @@ -85,4 +90,31 @@ .method-img { height: 15em; width:fit-content; -} \ No newline at end of file + border-radius: 6px; +} + +/* categories colors */ + +.Leren-over-jezelf-en-reflecteren{ + border-left-color:#85d1da; +} + +.Leren-over-anderen{ + border-left-color:#4fbbc2; +} + +.Creatief-denken{ + border-left-color: #f96c4f; +} + +.Organiseren-en-plannen{ + border-left-color:#63c09f; +} + +.Communcieren-en-presenteren{ + border-left-color: #af1301; +} + +.Onderzoeken-en-begrijpen{ + border-left-color:#3a3a66; +} diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index a6e12975..594cd94f 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,11 +1,13 @@ <%- include('./head') %>
+ +
<% methods.forEach(method=> { %> -
+
"> <% if (method.template?.url) { %> <%= method.title %> From 12cb16b19038d25935cc3544466f2eed30bd314d Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:53:29 +0200 Subject: [PATCH 17/53] extra styling en missende head elementen --- public/style.css | 14 ++++++++++++-- views/foot.ejs | 2 ++ views/head.ejs | 3 ++- views/overviewpage.ejs | 6 ++++-- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/public/style.css b/public/style.css index 8bc3ccf4..1f6c1d7b 100644 --- a/public/style.css +++ b/public/style.css @@ -58,15 +58,25 @@ - /* overviewpage styling */ +.filter-container{ + margin-top: 2em; + margin-bottom: 2em; +} + +.stripe{ + background-color:#9d9db3; + height: 0.1em; + width: 80vw; +} + .method-container { display: flex; flex-direction: row; flex-wrap: wrap; - gap: 2em 1em; + gap: 3em 2em; } .method-card { diff --git a/views/foot.ejs b/views/foot.ejs index e69de29b..691287b6 100644 --- a/views/foot.ejs +++ b/views/foot.ejs @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/views/head.ejs b/views/head.ejs index cbce5784..34f7778d 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -13,4 +13,5 @@ - \ No newline at end of file + + \ No newline at end of file diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 594cd94f..288b9243 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,9 +1,11 @@ <%- include('./head') %>
+
+
+
+ - -
<% methods.forEach(method=> { %> From 4dd64fda93201ae56f2aa40b67ebf5c4530b06de Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 12:34:00 +0200 Subject: [PATCH 18/53] Update head.ejs --- views/head.ejs | 1 - 1 file changed, 1 deletion(-) diff --git a/views/head.ejs b/views/head.ejs index 34f7778d..66f88738 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -11,7 +11,6 @@ - \ No newline at end of file From e69e1ce897bb68d2a502861c50852491c65d60bd Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 12:38:39 +0200 Subject: [PATCH 19/53] var in gezet de border colors zijn nu variabelen --- public/style.css | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/public/style.css b/public/style.css index 1f6c1d7b..2d08a02c 100644 --- a/public/style.css +++ b/public/style.css @@ -87,8 +87,6 @@ border-left: 11px solid #FEB51E; filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); border-radius: 6px; - - } .method-card a { @@ -99,32 +97,32 @@ .method-img { height: 15em; - width:fit-content; + width:20em; border-radius: 6px; } /* categories colors */ .Leren-over-jezelf-en-reflecteren{ - border-left-color:#85d1da; + border-left-color:var(--text-stroke-color); } .Leren-over-anderen{ - border-left-color:#4fbbc2; + border-left-color:var(--sec-colors-04); } .Creatief-denken{ - border-left-color: #f96c4f; + border-left-color:var(--text-stroke-color-var05); } .Organiseren-en-plannen{ - border-left-color:#63c09f; + border-left-color:var(--sec-colors-03); } .Communcieren-en-presenteren{ - border-left-color: #af1301; + border-left-color:var(--sec-colors-08); } .Onderzoeken-en-begrijpen{ - border-left-color:#3a3a66; + border-left-color:var(--text-stroke-color-var07); } From efc0f7d23cc692cef6b3ac38e228ada0039cd7c3 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 12:39:48 +0200 Subject: [PATCH 20/53] Update style.css --- public/style.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/style.css b/public/style.css index 2d08a02c..5c17f61a 100644 --- a/public/style.css +++ b/public/style.css @@ -66,7 +66,7 @@ } .stripe{ - background-color:#9d9db3; + background-color:var(--text-color-var03); height: 0.1em; width: 80vw; } @@ -84,7 +84,7 @@ flex-direction: column; height: 15em; width: auto; - border-left: 11px solid #FEB51E; + border-left: 11px solid (--interactive-el-color); filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); border-radius: 6px; } From 5ef016997eddb55e7bd205bda1788c7ed3c678e9 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 12:45:26 +0200 Subject: [PATCH 21/53] foutje gefixt --- public/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/style.css b/public/style.css index 5c17f61a..65f7af05 100644 --- a/public/style.css +++ b/public/style.css @@ -84,7 +84,7 @@ flex-direction: column; height: 15em; width: auto; - border-left: 11px solid (--interactive-el-color); + border-left:var(--interactive-el-color) 11px solid; filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); border-radius: 6px; } @@ -104,7 +104,7 @@ /* categories colors */ .Leren-over-jezelf-en-reflecteren{ - border-left-color:var(--text-stroke-color); + border-left-color:var(--text-stroke-color-var01); } .Leren-over-anderen{ @@ -124,5 +124,5 @@ } .Onderzoeken-en-begrijpen{ - border-left-color:var(--text-stroke-color-var07); + border-left-color: var(--text-stroke-color-var07); } From 5e560b0cbcb8ded22fb55c0c7887b8fb61e6bd5a Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 24 Apr 2023 13:11:29 +0200 Subject: [PATCH 22/53] categories erin gezet --- public/style.css | 3 ++- views/overviewpage.ejs | 12 ++++++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/public/style.css b/public/style.css index 65f7af05..eba4e61e 100644 --- a/public/style.css +++ b/public/style.css @@ -65,10 +65,11 @@ margin-bottom: 2em; } -.stripe{ +.main-border{ background-color:var(--text-color-var03); height: 0.1em; width: 80vw; + margin-bottom: 2em; } diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 288b9243..fd9871c0 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -2,7 +2,15 @@
-
+
+ +
+
+ <% methods.forEach(categorie=> { %> + + <% }) %> + +
@@ -12,7 +20,7 @@
"> <% if (method.template?.url) { %> - <%= method.title %> + <%= method.title %> <% } else { %> Placeholder <% } %> From 6266c747a3e53cdd6f10472ae9aee1dd638675e8 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:00:36 +0200 Subject: [PATCH 23/53] method title erin gezet --- public/arrows-left.png | Bin 0 -> 1403 bytes public/arrows-right.png | Bin 0 -> 333 bytes public/style.css | 14 +++++++++++++- views/head.ejs | 1 - views/overviewpage.ejs | 1 + 5 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 public/arrows-left.png create mode 100644 public/arrows-right.png diff --git a/public/arrows-left.png b/public/arrows-left.png new file mode 100644 index 0000000000000000000000000000000000000000..67ebf6156da60d356626cff6d9ab856624e38102 GIT binary patch literal 1403 zcmV->1%&#EP)da|4%@;s(&sVLCeC1TiOolvE@o72yP!E>z?OC?%a~66d}AVa6=P zHkS0wYS)pT^?NVaB%{sjcy@L^tH1n z2({ndPQ>>Fwde64@%Up3h>?HXpku{#2?uA08uxnij$bCIJqP_Ik8e?X2|Ot3Vq*MN6fARz#6A0T5IBO0NTgk4iExW^S2ZYg= zRf1+cXV~%OB|Vkv2;-q9>+>+n-{4PnpY$6~f*Nmak<=#D#-pjl9<@G5R+?4cjJX8e zWTP#?*d0g~Cd(NP4zyeyR(eI$*wx~ca9(M$-X|;3tk1$^{h-cEP&OX!6*XCJr&B7` z4z(%Mnc2p(t!#%LaN+)p7)ycoXopVtx?{xn-aUK78_x^E+o1uE|54gN^1$T%(8;uv zK%|e0yaX#F0+umF2C&C0?+I%gy+ z;mLBL->s4k*LEO2I=qb-IUT-TR~_DN+vC_e9Lh+c(c$?(8TrSVMu+DCXQa^R@N86p z6nvJTazc|R|is@i7CG-C<34kL>)+>+ocgjT7p6ybvV4)EIQNZ@MXL* zQfPGeBHn=%8XbN^sX$gxhu@kAC>2QOOjI4t|v;DO|UB`BJw z7AEc*6sxe6z^58}UQt$K&mYt*X@Uom9T{ot-DA!vVk<3^$3stWhROKs&ojbFozx5) zNGZNrN8E0YB4b~NX}mK9R0%P8Z?mFY>|iJQCpXdBf?3qu4o@Mb~~^|?b-MJ z`6LJyNOv>BqV~>_6t%B<$p|D76U!5QsklUSKQMO5kj{ZhmW&{QblGB2dv;_`S-YZ^ z41Uo(S;2C3c5h*U(t-5Z=}u4aKStv5C5RTaUq{Jsci0!lp^}u@>56c*Ye+aL-BQUY z709wXT@fB72s zt*bdM!hJ}p4TcIzhF2hcnq!{mJJfhhB}1d{3zNVrkagD6-EK1Q)zf*X16haWIFC+; zK9K?*A3DYCkdmr3$FcP^XX7DatIEht*VB0@9(``~bRKXZ8$F#56v(>kX*r}K1zCDJ z4=9jzYmS%3AM%Ul!G&YxUHch@fvjV5Jdd_ya2N1|Jje}Xl@FW1@uQZEd5SW!vWHDY z#4Z`jm;y&eq;O=NhfPJqE*by*KFW6lW)t*u9xDUc=xIGBW8m60$37*4dtOLS=V4Yj zQj5c;Rm3hCd6*TB3<)Qt3h8MN8T+Qp2D9+HshlIXcG$E`Y#CdGS(hVK)YB9YGv`R7 zr%N!qLw@&e@|Xi7N3$p3b%#nvhWz!*eIaP|w5%l5cW*tN$8Y$Q9|MxmH+BF3002ov JPDHLkV1n0@kyHQx literal 0 HcmV?d00001 diff --git a/public/arrows-right.png b/public/arrows-right.png new file mode 100644 index 0000000000000000000000000000000000000000..d6adc33dd37d1cc5b5bae9eb9f159b414abf6094 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^(m*W1!3HF`9ol{aDb50q$YLN*7=#%aX3dcR3NjW4 zxjQkeJ16rJ$YDu$^mSxl*x1kgCy^D%f8^=n7*fIbcIrXiLk2vq(P{}SZcxO0gTbtc zS7M>^7onqtdIud>blnNK{q&Oa{3&va#Fzi_yS!{>XK@}s!|r-n!S{b9ojpvdTx`yj zx+L{%&!3oh;kNvmb1Ig79Y2y>t7h3p%1oSNtNSWqqTcyvnTblj6ImM4y)v^4U9xVr z3%mXsS3j3^P6 - \ No newline at end of file diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index fd9871c0..5def4aa4 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -24,6 +24,7 @@ <% } else { %> Placeholder <% } %> +
<%= method.title %>pijltjes naar rechts
<% }) %> From 3cc19f285d459574296df80cc647eb8bbe7cc6d9 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:11:36 +0200 Subject: [PATCH 24/53] Update style.css --- public/style.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/public/style.css b/public/style.css index 343aa4aa..c2e1f534 100644 --- a/public/style.css +++ b/public/style.css @@ -114,6 +114,8 @@ height: 1em; width: auto; } + + /* categories colors */ .Leren-over-jezelf-en-reflecteren{ From ac0af04ab27dba27a4fe35998e0a748f2feead70 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:19:07 +0200 Subject: [PATCH 25/53] main class geven --- public/style.css | 15 ++++----------- views/overviewpage.ejs | 13 +------------ 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/public/style.css b/public/style.css index c2e1f534..6cb693f0 100644 --- a/public/style.css +++ b/public/style.css @@ -60,23 +60,16 @@ /* overviewpage styling */ -.filter-container{ - margin-top: 2em; - margin-bottom: 2em; -} - -.main-border{ - background-color:var(--text-color-var03); - height: 0.1em; - width: 80vw; - margin-bottom: 2em; +.overviewpage-main{ + display: flex; + justify-content: center; } - .method-container { display: flex; flex-direction: row; flex-wrap: wrap; + justify-content: center; gap: 5em 4em; } diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 5def4aa4..4f8d00b2 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,17 +1,6 @@ <%- include('./head') %> -
-
-
- -
-
- <% methods.forEach(categorie=> { %> - - <% }) %> - -
-
+
From 71c66e6f9c448fdf520bf32d7c71de81f7cca27c Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:26:44 +0200 Subject: [PATCH 26/53] drop shadow en flex gefixt dankje cyd --- public/style.css | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/public/style.css b/public/style.css index 6cb693f0..8a2dd8da 100644 --- a/public/style.css +++ b/public/style.css @@ -71,15 +71,15 @@ flex-wrap: wrap; justify-content: center; gap: 5em 4em; + } .method-card { display: flex; flex-direction: column; height: 15em; - width: auto; + width: 20em; border-left:var(--interactive-el-color) 11px solid; - filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); border-radius: 6px; } @@ -91,8 +91,10 @@ .method-img { height: 15em; - width:20em; + width: 100%; border-radius: 6px; + -webkit-box-shadow: 12px 9px 11px -6px rgba(0, 0, 0, 0.37); + box-shadow: 12px 9px 11px -6px rgba(0, 0, 0, 0.37); } .method-name{ From c906d502d12fb076488559ed7feab604ea6b3976 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 10:51:52 +0200 Subject: [PATCH 27/53] js bestand aangemaakt --- public/client-side.js | 0 public/style.css | 16 ++++++++++++++++ views/head.ejs | 2 +- views/overviewpage.ejs | 4 ++++ 4 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 public/client-side.js diff --git a/public/client-side.js b/public/client-side.js new file mode 100644 index 00000000..e69de29b diff --git a/public/style.css b/public/style.css index 8a2dd8da..81c1c993 100644 --- a/public/style.css +++ b/public/style.css @@ -62,6 +62,7 @@ .overviewpage-main{ display: flex; + flex-direction: column; justify-content: center; } @@ -110,6 +111,21 @@ width: auto; } +.load-more{ + display: flex; + justify-content: center; + margin-top: 4em; +} + +.load-more-button{ + font-family: var(--rigid); + font-weight: bold; + border: none; + background-color: var(--interactive-el-color); + height: 3em; + width: auto; +} + /* categories colors */ diff --git a/views/head.ejs b/views/head.ejs index d0d0d159..948d8828 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 4f8d00b2..ccbfdc18 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -20,6 +20,10 @@
+
+ +
+
From 0af31589d295786cb9308c6a38bac204127a1731 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:33:47 +0200 Subject: [PATCH 28/53] overviewpage head aangemaakt --- public/client-side.js | 1 + public/style.css | 6 ++++++ views/head-overviewpage.ejs | 20 ++++++++++++++++++++ views/head.ejs | 1 + views/overviewpage.ejs | 3 +-- 5 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 views/head-overviewpage.ejs diff --git a/public/client-side.js b/public/client-side.js index e69de29b..304109ad 100644 --- a/public/client-side.js +++ b/public/client-side.js @@ -0,0 +1 @@ +// laad meer knop diff --git a/public/style.css b/public/style.css index 81c1c993..06a5063f 100644 --- a/public/style.css +++ b/public/style.css @@ -60,12 +60,18 @@ /* overviewpage styling */ +.overviewpage-header{ + margin-left: 10%; + margin-bottom: 2em; +} + .overviewpage-main{ display: flex; flex-direction: column; justify-content: center; } + .method-container { display: flex; flex-direction: row; diff --git a/views/head-overviewpage.ejs b/views/head-overviewpage.ejs new file mode 100644 index 00000000..57ef5cd5 --- /dev/null +++ b/views/head-overviewpage.ejs @@ -0,0 +1,20 @@ + + + + + + + + Visual Thinking + + + + + + + + +
+ Visual Thinking in Het HBO + +
\ No newline at end of file diff --git a/views/head.ejs b/views/head.ejs index 948d8828..86517733 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -6,6 +6,7 @@ Visual Thinking + diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index ccbfdc18..298f285e 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,8 +1,7 @@ -<%- include('./head') %> +<%- include('./head-overviewpage') %>
-
<% methods.forEach(method=> { %> From 0c90e1c936922a78c63159af0bb842ace701473f Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:59:03 +0200 Subject: [PATCH 29/53] styling head en form --- public/style.css | 6 ++++++ views/head-overviewpage.ejs | 16 +++++++++++++--- views/overviewpage.ejs | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/public/style.css b/public/style.css index 06a5063f..06ffe282 100644 --- a/public/style.css +++ b/public/style.css @@ -65,6 +65,12 @@ margin-bottom: 2em; } +.overviewpage-header h1{ + font-size: 30px; + font-family: var(--rigid); + color: var(--text-color); +} + .overviewpage-main{ display: flex; flex-direction: column; diff --git a/views/head-overviewpage.ejs b/views/head-overviewpage.ejs index 57ef5cd5..5f1f4d3b 100644 --- a/views/head-overviewpage.ejs +++ b/views/head-overviewpage.ejs @@ -14,7 +14,17 @@ +
- Visual Thinking in Het HBO - -
\ No newline at end of file + Visual Thinking in Het HBO +

Tekenmethodes

+ +
+
+
+ + +
+
+
+ diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 298f285e..5deb2b0d 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -12,7 +12,7 @@ <% } else { %> Placeholder <% } %> -
<%= method.title %>pijltjes naar rechts
+
<%= method.title %>pijltjes naar rechts
<% }) %> From 4c7f7873b14341aa993e0d40d7c1d8ae37338200 Mon Sep 17 00:00:00 2001 From: Tobias Vrolijk Date: Tue, 25 Apr 2023 12:00:32 +0200 Subject: [PATCH 30/53] update --- public/arrow-back.png | Bin 0 -> 333 bytes public/style.css | 74 ++++++++++++++++++++++++++++++++++++++++-- views/detailpage.ejs | 44 +++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 public/arrow-back.png diff --git a/public/arrow-back.png b/public/arrow-back.png new file mode 100644 index 0000000000000000000000000000000000000000..d6adc33dd37d1cc5b5bae9eb9f159b414abf6094 GIT binary patch literal 333 zcmeAS@N?(olHy`uVBq!ia0vp^(m*W1!3HF`9ol{aDb50q$YLN*7=#%aX3dcR3NjW4 zxjQkeJ16rJ$YDu$^mSxl*x1kgCy^D%f8^=n7*fIbcIrXiLk2vq(P{}SZcxO0gTbtc zS7M>^7onqtdIud>blnNK{q&Oa{3&va#Fzi_yS!{>XK@}s!|r-n!S{b9ojpvdTx`yj zx+L{%&!3oh;kNvmb1Ig79Y2y>t7h3p%1oSNtNSWqqTcyvnTblj6ImM4y)v^4U9xVr z3%mXsS3j3^P6 + +
+ back arrow +

Tekenmethodes

+
+ +
+ Beschrijving + Stappenplan + Categorieën + Voorbeelden +
+
+

<%- method.title %>

+
+ <%- method.description.html %> +
+

Stappenplan

+
+
    + <% method.steps.forEach(step => { %> +
  1. +

    <%- step.title %>

    +
    + <%- step.description.html %> +
    +
    2. + <% }) %> +
+ +
+
+
    + <% method.categories.forEach(category => { %> +
  • <%- category.title %> +
    • + + <% }) %> +
+
+
+ +
+
<%- include('./foot') %> \ No newline at end of file From 544969a2ee9212d5fc1c02bd566877957f683f20 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:46:19 +0200 Subject: [PATCH 31/53] Update head-overviewpage.ejs --- views/head-overviewpage.ejs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/views/head-overviewpage.ejs b/views/head-overviewpage.ejs index 5f1f4d3b..d2ce85ab 100644 --- a/views/head-overviewpage.ejs +++ b/views/head-overviewpage.ejs @@ -17,14 +17,4 @@
Visual Thinking in Het HBO -

Tekenmethodes

- -
-
-
- - -
-
-
From a0bf280523d2e26332df973ff7ec987ab0ee287a Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 26 Apr 2023 10:47:30 +0200 Subject: [PATCH 32/53] Update overviewpage.ejs --- views/overviewpage.ejs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 5deb2b0d..ee94cdd1 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,5 +1,14 @@ <%- include('./head-overviewpage') %> +
+
+
+ + +
+
+
+
From 4b383fc0a132d663d52eb6bb409404ba5c79b882 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 26 Apr 2023 11:48:13 +0200 Subject: [PATCH 33/53] filter container en searchbar --- public/style.css | 11 +++++++---- views/overviewpage.ejs | 10 ++++++++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/public/style.css b/public/style.css index 06ffe282..6e8ceaf2 100644 --- a/public/style.css +++ b/public/style.css @@ -65,10 +65,13 @@ margin-bottom: 2em; } -.overviewpage-header h1{ - font-size: 30px; - font-family: var(--rigid); - color: var(--text-color); +.header-methodes h1{ + color: var(--text-color); + font-family: var(--rigid); +} + +.filter-search-container{ + margin-bottom: 2em; } .overviewpage-main{ diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index ee94cdd1..3e9cf061 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,5 +1,9 @@ <%- include('./head-overviewpage') %> +
+

Tekenmethodes

+
+
@@ -7,8 +11,14 @@
+
+ <% methods.forEach(categorie=> { %> +

<%= method.categories[0].title %>

+ <% }) %> +
+
From 574ba13e438d089ab117f0cc7b13c90d132e06e1 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 26 Apr 2023 12:01:18 +0200 Subject: [PATCH 34/53] Update overviewpage.ejs --- views/overviewpage.ejs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 3e9cf061..64cc8d1b 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -2,7 +2,6 @@

Tekenmethodes

-
@@ -12,11 +11,9 @@
- <% methods.forEach(categorie=> { %> -

<%= method.categories[0].title %>

- <% }) %>
+
From 524754346c35fdae8428ab18f831c760eb7dfee1 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 26 Apr 2023 12:20:02 +0200 Subject: [PATCH 35/53] Create pen-potlood.png --- public/pen-potlood.png | Bin 0 -> 27527 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 public/pen-potlood.png diff --git a/public/pen-potlood.png b/public/pen-potlood.png new file mode 100644 index 0000000000000000000000000000000000000000..ee7d7720b277099b3482509649ef411bb9cab337 GIT binary patch literal 27527 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 Date: Wed, 26 Apr 2023 12:49:57 +0200 Subject: [PATCH 36/53] methode toevoegen tekst --- public/style.css | 24 ++++++++++++++++++++++++ views/overviewpage.ejs | 6 ++++++ 2 files changed, 30 insertions(+) diff --git a/public/style.css b/public/style.css index 6e8ceaf2..a441c340 100644 --- a/public/style.css +++ b/public/style.css @@ -139,8 +139,32 @@ background-color: var(--interactive-el-color); height: 3em; width: auto; + margin-bottom: 2em; +} + + +.add-method-text{ + display: flex; + flex-direction: row; + justify-content: center; } +.add-method-text h2{ + font-size: 17px; + color: var(--text-color); + font-family: var(--broodtekst); + width: fit-content; +} + +.add-method-text img{ + position: relative; + top: -2.8em; + margin-left: 0.5em; + height: auto; + width: 4em; +} + + /* categories colors */ diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 64cc8d1b..587a5baf 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -39,6 +39,12 @@
+ +
+

Wil je zelf een tekenmethode toevoegen aan onze verzameling?

+ pen en potlood illustratie +
+
From cc2fa0045871c944b3cc726c7e60d9ace8cc805e Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 2 May 2023 19:06:57 +0200 Subject: [PATCH 37/53] update index.ejs bezig om layout goed te krijgen --- public/scripts/index.js | 4 ++ public/style.css | 100 ++++++++++++++++++++++++++++++++++++++-- views/head.ejs | 16 ++++++- views/index.ejs | 73 ++++++++++++++++++++++++++++- 4 files changed, 187 insertions(+), 6 deletions(-) create mode 100644 public/scripts/index.js diff --git a/public/scripts/index.js b/public/scripts/index.js new file mode 100644 index 00000000..c2ae8bd6 --- /dev/null +++ b/public/scripts/index.js @@ -0,0 +1,4 @@ +window.onload = () => { + const body = document.querySelector("body"); + body.classList.toggle("index"); +}; \ No newline at end of file diff --git a/public/style.css b/public/style.css index 1f6c1d7b..2ff8013f 100644 --- a/public/style.css +++ b/public/style.css @@ -53,10 +53,106 @@ --rigid: rigid-square, sans-serif; --broodtekst: "yrsa", "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif; + /* index variables */ + --hexagon-radius: 1rem; + --hexagon-width: 16rem; + +} + + + + +/* index styling */ + +body.index { + background: white; +} + +main.index { + /* dit ziet er ingewikkeld uit, maar dit is de layout nodig voor een hexagon patroon */ + display: grid; + grid-template-columns: repeat(7, 1fr); + grid-template-rows: repeat(7, 16rem); + grid-template-areas: 'a a a a a a .' + '. b b b b b b' + 'c c c c c c .' + '. d d d d d d' + 'e e e e e e .' + '. f f f f f f' + 'g g g g g g .'; +} + +section.line-1 { + width: calc(100% + var(--hexagon-width)); + display: inline-flex; + flex-direction: row; + /* justify-content: space-evenly; */ + align-items: center; + grid-area: a; +} + +section.line-2 { + grid-area: b; } +.container { + width: calc(var(--hexagon-width) * 2.5); + background: yellow; +} + +.hexagon-dark { + display: block; + margin-left: calc(-2 * var(--hexagon-radius)); + margin-right: calc(-2 * var(--hexagon-radius)); + width: calc(var(--hexagon-width) + var(--hexagon-radius)); + height: calc(var(--hexagon-width) + var(--hexagon-radius)); + background: var(--interactive-el-color-var01); + -webkit-clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); + clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); + z-index: 1; +} +.hexagon-light { + display: block; + margin-left: calc(-1 * (var(--hexagon-radius))); + margin-right: calc(-1 * (var(--hexagon-radius))); + width: var(--hexagon-width); + height: var(--hexagon-width); + background: var(--interactive-el-color-var03); + -webkit-clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); + clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); + z-index: 0; +} +.hexagon-half-dark { + display: block; + margin-left: -2rem; + margin-right: -2rem; + width: var(--hexagon-width); + height: var(--hexagon-width); + background: var(--interactive-el-color-var02); + -webkit-clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 50% 50%, 5% 25%); + clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 50% 50%, 5% 25%); + z-index: 0; +} + +.label-card { + background: var(--background-color); +} + +.content-card { + display: flex; + flex-direction: column; + background: var(--interactive-el-color-var04); +} + +.content-card>h3 { + display: block; + text-align: center; + width: 100%; + height: 2rem; + font-size: 1.5rem; +} /* overviewpage styling */ @@ -85,10 +181,8 @@ height: 15em; width: auto; border-left: 11px solid #FEB51E; - filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); + filter: drop-shadow(0px 4px 4px rgba(0, 0, 0, 0.25)); border-radius: 6px; - - } .method-card a { diff --git a/views/head.ejs b/views/head.ejs index 34f7778d..494a6315 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -14,4 +14,18 @@ - \ No newline at end of file + + + <% if (container) { %> +
+ <% } %> + +
+ +
+ + Over + Blog + +
+
\ No newline at end of file diff --git a/views/index.ejs b/views/index.ejs index 642b8028..1189da09 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,7 +1,76 @@ -<%- include('./head') %> +<%- include('./head', {container:true}) %> +
+
+
+
+
+
+
-naar overzichtspagina + +
+ +naar overzichtspagina + <%- include('./foot') %> \ No newline at end of file From 03837abb620a841ef418fd8e8fd5e31758bbf839 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 2 May 2023 20:30:58 +0200 Subject: [PATCH 38/53] progress on index.ejs de basis voor de layout is er. moet het nog verder uitwerken --- public/style.css | 142 ++++++++++++++++++++++++++++------------- views/detailpage.ejs | 2 +- views/head.ejs | 4 +- views/index.ejs | 28 +++++--- views/overviewpage.ejs | 3 +- 5 files changed, 120 insertions(+), 59 deletions(-) diff --git a/public/style.css b/public/style.css index 2ff8013f..d628dc7e 100644 --- a/public/style.css +++ b/public/style.css @@ -54,8 +54,14 @@ --broodtekst: "yrsa", "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif; /* index variables */ - --hexagon-radius: 1rem; + --hexagon-radius: 3rem; --hexagon-width: 16rem; + --hexagon-height: 18rem; + --hexagon-padding: 1rem; + + --card-border-width: 0.3rem; + + --line-gap: -3rem; } @@ -65,85 +71,129 @@ /* index styling */ body.index { - background: white; + background-color: white; } main.index { /* dit ziet er ingewikkeld uit, maar dit is de layout nodig voor een hexagon patroon */ - display: grid; - grid-template-columns: repeat(7, 1fr); - grid-template-rows: repeat(7, 16rem); - grid-template-areas: 'a a a a a a .' - '. b b b b b b' - 'c c c c c c .' - '. d d d d d d' - 'e e e e e e .' - '. f f f f f f' - 'g g g g g g .'; + display: flex; + flex-direction: column; + gap: var(--line-gap); } -section.line-1 { - width: calc(100% + var(--hexagon-width)); - display: inline-flex; - flex-direction: row; - /* justify-content: space-evenly; */ - align-items: center; - grid-area: a; +.container { + margin-left: auto; + margin-right: auto; + width: calc(var(--hexagon-width) * 3.5); + background-color: var(--interactive-el-color-var03); } -section.line-2 { - grid-area: b; +section.line-1 { + width: calc(var(--hexagon-width) * 3.5); + height: var(--hexagon-height); + display: grid; + grid-template-columns: repeat(3, 1fr) 0.5fr; + grid-template-rows: 1fr; + grid-column-gap: 0px; + grid-row-gap: 0px; } -.container { - width: calc(var(--hexagon-width) * 2.5); - background: yellow; +section.line-2 { + width: calc(var(--hexagon-width) * 3.5); + height: var(--hexagon-height); + display: grid; + grid-template-columns: repeat(3, 1fr) 0.5fr; + grid-template-rows: 1fr; + grid-column-gap: 0px; + grid-row-gap: 0px; + margin-top: calc(var(--line-gap)); } .hexagon-dark { display: block; - margin-left: calc(-2 * var(--hexagon-radius)); - margin-right: calc(-2 * var(--hexagon-radius)); + margin-left: calc(-0.5 * var(--hexagon-radius)); + margin-right: calc(-0.5 * var(--hexagon-radius)); + margin-top: calc(-0.5 * var(--hexagon-radius)); + margin-bottom: calc(-0.5 * var(--hexagon-radius)); width: calc(var(--hexagon-width) + var(--hexagon-radius)); - height: calc(var(--hexagon-width) + var(--hexagon-radius)); - background: var(--interactive-el-color-var01); - -webkit-clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); - clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); + height: calc(var(--hexagon-height) + var(--hexagon-radius)); + background-color: var(--interactive-el-color-var01); + -webkit-clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); + clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); z-index: 1; } .hexagon-light { display: block; - margin-left: calc(-1 * (var(--hexagon-radius))); - margin-right: calc(-1 * (var(--hexagon-radius))); + margin: 0; width: var(--hexagon-width); - height: var(--hexagon-width); - background: var(--interactive-el-color-var03); - -webkit-clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); - clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 5% 75%, 5% 25%); + height: var(--hexagon-height); + background-color: var(--interactive-el-color-var03); + -webkit-clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); + clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); z-index: 0; } -.hexagon-half-dark { +.hexagon-half-left { display: block; - margin-left: -2rem; - margin-right: -2rem; - width: var(--hexagon-width); - height: var(--hexagon-width); - background: var(--interactive-el-color-var02); - -webkit-clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 50% 50%, 5% 25%); - clip-path: polygon(50% 0%, 95% 25%, 95% 75%, 50% 100%, 50% 50%, 5% 25%); + -webkit-clip-path: polygon(100% 0, 100% 100%, 0% 75%, 0% 25%); + clip-path: polygon(100% 0, 100% 100%, 0% 75%, 0% 25%); +} + +.hexagon-half-right { + display: block; + -webkit-clip-path: polygon(0 0, 100% 25%, 100% 75%, 0 100%); + clip-path: polygon(0 0, 100% 25%, 100% 75%, 0 100%); +} + +.hexagon-half-dark-left { + width: calc(0.5 * (var(--hexagon-width) + var(--hexagon-radius))); + height: calc(var(--hexagon-height) + var(--hexagon-radius)); + margin-left: calc(-0.5 * var(--hexagon-radius)); + margin-top: calc(-0.5 * var(--hexagon-radius)); + margin-bottom: calc(-0.5 * var(--hexagon-radius)); + background-color: var(--interactive-el-color-var01); + z-index: 1; +} + +.hexagon-half-light-right { + width: calc(0.5 * var(--hexagon-width)); + height: var(--hexagon-height); + margin: 0; + background-color: var(--interactive-el-color-var03); z-index: 0; } .label-card { - background: var(--background-color); + margin: auto; + left: calc(50% - (width / 2)); + top: calc(50% - (height / 2)); + background-color: var(--background-color); + width: calc(var(--hexagon-width) - var()); +} + +.card-border { + margin: calc((var(--hexagon-padding) * 2) - var(--card-border-width)) auto; + padding-left: var(--card-border-width); + padding-top: var(--card-border-width); + width: calc(var(--card-border-width) + (var(--hexagon-width) - var(--hexagon-padding))); + height: calc(var(--card-border-width) + (var(--hexagon-height) - var(--hexagon-padding))); + -webkit-clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); + clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); + background-color: black; } .content-card { + left: calc(50% - (width / 2)); + top: calc(50% - (height / 2)); + width: calc(var(--hexagon-width) - var(--hexagon-padding)); + height: calc(var(--hexagon-height) - var(--hexagon-padding)); display: flex; flex-direction: column; - background: var(--interactive-el-color-var04); + -webkit-clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); + clip-path: polygon(50% 0%, 100% 25%, 100% 75%, 50% 100%, 0% 75%, 0% 25%); + background-color: var(--interactive-el-color-var04); + border-radius: 5px; } .content-card>h3 { diff --git a/views/detailpage.ejs b/views/detailpage.ejs index 29d8ced9..97cdcfbc 100644 --- a/views/detailpage.ejs +++ b/views/detailpage.ejs @@ -1,4 +1,4 @@ -<%- include('./head') %> +<%- include('./head', {container:false}) %> diff --git a/views/head.ejs b/views/head.ejs index 494a6315..29f40686 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -16,8 +16,10 @@ - <% if (container) { %> + <% try { if (container) { %>
+ <% } } catch (error) { %> + <% return %> <% } %>
diff --git a/views/index.ejs b/views/index.ejs index 1189da09..0bd9b6d8 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -5,22 +5,30 @@
-
+
- +<%- include('./head', {container:false}) %>
From 81febfca6eb3bbfa7d942c5d7b53d558ef09ed7e Mon Sep 17 00:00:00 2001 From: Youssra Elmortai <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 8 May 2023 09:32:57 +0200 Subject: [PATCH 39/53] Update README.md --- README.md | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/README.md b/README.md index 090af424..c9ecf9df 100644 --- a/README.md +++ b/README.md @@ -23,9 +23,31 @@ ## Kenmerken +### tools 🍔 +- figma +- goodnotes +- visuel studio code +- polyplane + +### gebruikte technieken 🍟 +- ejs +- javascript +- node.js +- express +- css + + ## Installatie +1. Om in de repository te werken en aanpassingen te maken moet je node.js downloaden versie: . +2. Clone of download deze respository. +3. Open hem in je `code-editor`. +4. open de `terminal` en type `npm install`. +5. Daarna door gerbruik van `npm start` krijg je een localhost link waar je de code live +6. gebruik `gitignore` voor de modules zodat het niet allemaal op github komt te staan. +7. Live zetten van je project kan met behulp van cyclic. + ## Bronnen ## Licentie From e16cf18f0f015013cc9daf8cd04780922d1e1aa3 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Mon, 8 May 2023 10:48:08 +0200 Subject: [PATCH 40/53] footer erin gezet --- public/style.css | 18 ++++++++++++++++++ views/overviewpage.ejs | 6 ++++-- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/public/style.css b/public/style.css index a441c340..4b227844 100644 --- a/public/style.css +++ b/public/style.css @@ -68,10 +68,12 @@ .header-methodes h1{ color: var(--text-color); font-family: var(--rigid); + margin-left: 2em; } .filter-search-container{ margin-bottom: 2em; + margin-left: 5em; } .overviewpage-main{ @@ -164,6 +166,22 @@ width: 4em; } +footer { + display: flex; + flex-direction: row; + gap: 1em; + background-color: var(--text-color-var01); + color: var(--text-color-var04); + margin-top: 4em; +} + +footer h3{ + margin-left: 1em; + font-family: var(--broodtekst); + font-size: 16px; +} + + /* categories colors */ diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 587a5baf..6e20f74e 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -49,7 +49,9 @@ - - +
+

Visual Thinking in het HBO

+

© Charley Muhren, 2023

+
<%- include('./foot') %> \ No newline at end of file From de6c6fb10610c780ae321cc0ade10ae109c4e437 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Tue, 9 May 2023 10:16:06 +0200 Subject: [PATCH 41/53] style plus form update --- public/style.css | 39 +++++++++++++++++++++++++++++++++++++++ views/overviewpage.ejs | 6 ++++++ 2 files changed, 45 insertions(+) diff --git a/public/style.css b/public/style.css index 4b227844..0856ef15 100644 --- a/public/style.css +++ b/public/style.css @@ -76,6 +76,45 @@ margin-left: 5em; } +.filter-search-container input { + border: none; + font-size: 20px; +} + +.search-button{ + border: none; + background-color: white; +} + +.search-button i{ + font-size: 22px; +} + +.search-button i:hover{ + color: var(--interactive-el-color); +} + + + +.categories-container{ + display: flex; + flex-direction: row; + flex-wrap: wrap; + margin-top: 1em; + margin-left: -2em; +} + +.categories-container ul{ + list-style: none; +} + + +.categories-container img{ + height: auto; + width: 100%; +} + + .overviewpage-main{ display: flex; flex-direction: column; diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 6e20f74e..b5f3d1df 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -11,6 +11,12 @@
+
  • ..
+
  • ..
+
  • ..
+
  • ..
+
  • ..
+
  • ..
From dab142c57af409187d27972c3f0d3723465e6f83 Mon Sep 17 00:00:00 2001 From: Tobias Vrolijk Date: Wed, 10 May 2023 10:10:09 +0200 Subject: [PATCH 42/53] update --- index.js | 10 ++++++++++ public/style.css | 16 ++++++++++++++++ views/detailpage.ejs | 20 +++++++++++--------- views/head.ejs | 6 +++++- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/index.js b/index.js index 06625df3..9db30746 100644 --- a/index.js +++ b/index.js @@ -144,3 +144,13 @@ export async function postJson(url, body) { .then((response) => response.json()) .catch((error) => error); } + + +// lees meer functie detailpagina + +let stappenplan = document.querySelector("stappen"); +stappenplan.addEventListener("click", toonStappenplan); + +function toonStappenplan(){ + const +} \ No newline at end of file diff --git a/public/style.css b/public/style.css index 58882eb1..59c3da85 100644 --- a/public/style.css +++ b/public/style.css @@ -54,7 +54,13 @@ --broodtekst: "yrsa", "Trebuchet MS", "Lucida Sans Unicode", "Lucida Grande", "Lucida Sans", Arial, sans-serif; } +html{ + scroll-behavior: smooth; +} +body{ + margin: 0; +} /* overviewpage styling */ @@ -212,6 +218,11 @@ font-size: 1.5em; } +.main-detailpage img{ + width: 15em; + height: auto; +} + .main-detailpage h1{ color: var(--text-color);; } @@ -225,6 +236,11 @@ color: var(--text-color);; } +.beschrijving{ + display: flex; + flex-direction: column; +} + blockquote{ font-weight: bolder; } diff --git a/views/detailpage.ejs b/views/detailpage.ejs index aef7b5b8..959f2f86 100644 --- a/views/detailpage.ejs +++ b/views/detailpage.ejs @@ -1,7 +1,7 @@ <%- include('./head') %> - +
back arrow

Tekenmethodes

@@ -18,9 +18,12 @@

<%- method.title %>

-
- <%- method.description.html %> +
+ <%- method.description.html %> + Method Template
+ +

Stappenplan

    @@ -35,14 +38,13 @@
+
-
    - <% method.categories.forEach(category => { %> -
  • <%- category.title %> -
    • - - <% }) %> + <% method.categories.forEach(category => { %> +
      + <%- category.title %>
    + <% }) %>
diff --git a/views/head.ejs b/views/head.ejs index 86517733..157d3d4e 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -13,4 +13,8 @@ - \ No newline at end of file + + +
+ Visual Thinking in Het HBO +
\ No newline at end of file From 629b2490a3f7b5e9f408dbb677dad106087b7692 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 10:33:33 +0200 Subject: [PATCH 43/53] fixed styling head --- public/client-side.js | 3 ++- public/style.css | 16 ++++++++++++++++ views/head-overviewpage.ejs | 4 ++++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/public/client-side.js b/public/client-side.js index 304109ad..d38f9624 100644 --- a/public/client-side.js +++ b/public/client-side.js @@ -1 +1,2 @@ -// laad meer knop +// filter +// van rick gestolen >o< diff --git a/public/style.css b/public/style.css index 0856ef15..67119122 100644 --- a/public/style.css +++ b/public/style.css @@ -61,10 +61,26 @@ /* overviewpage styling */ .overviewpage-header{ + display: flex; + flex-direction: row; + justify-content: space-between; margin-left: 10%; margin-bottom: 2em; } +.links{ + margin-right: 3em; +} + +.overviewpage-header a{ + color: var(--text-color); + font-family: var(--rigid); + font-weight: bold; + font-size: 20px; + margin-left: 1em; + text-decoration: none; +} + .header-methodes h1{ color: var(--text-color); font-family: var(--rigid); diff --git a/views/head-overviewpage.ejs b/views/head-overviewpage.ejs index d2ce85ab..e3a3457c 100644 --- a/views/head-overviewpage.ejs +++ b/views/head-overviewpage.ejs @@ -17,4 +17,8 @@
Visual Thinking in Het HBO +
+ blog + naar profiel +
From 091eaf7c0f4cc499682ede3f47fba8dfe756e82e Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 11:04:16 +0200 Subject: [PATCH 44/53] styling update --- public/client-side.js | 1 - public/style.css | 15 +++++++++++---- views/overviewpage.ejs | 7 +++++-- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/public/client-side.js b/public/client-side.js index d38f9624..b6a1e84d 100644 --- a/public/client-side.js +++ b/public/client-side.js @@ -1,2 +1 @@ // filter -// van rick gestolen >o< diff --git a/public/style.css b/public/style.css index 67119122..e25d84c4 100644 --- a/public/style.css +++ b/public/style.css @@ -68,10 +68,6 @@ margin-bottom: 2em; } -.links{ - margin-right: 3em; -} - .overviewpage-header a{ color: var(--text-color); font-family: var(--rigid); @@ -81,6 +77,13 @@ text-decoration: none; } +.links { + margin-right: 3em; +} + + + + .header-methodes h1{ color: var(--text-color); font-family: var(--rigid); @@ -110,6 +113,10 @@ color: var(--interactive-el-color); } +hr{ + width: 90%; + margin-left: -0.3em; +} .categories-container{ diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index b5f3d1df..12e647d5 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -5,11 +5,14 @@
-
+ +
- + +
+
  • ..
  • ..
From e1af3f4854a773fd4db077422f3300abec60c8eb Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 11:12:42 +0200 Subject: [PATCH 45/53] Update style.css --- public/style.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/public/style.css b/public/style.css index e25d84c4..275c5c3c 100644 --- a/public/style.css +++ b/public/style.css @@ -77,13 +77,15 @@ text-decoration: none; } +.overviewpage-header a:hover{ + color: var(--interactive-el-color); +} + .links { margin-right: 3em; } - - .header-methodes h1{ color: var(--text-color); font-family: var(--rigid); From c4345ce5f1a6d35421ab2554e75cfd694d578bbe Mon Sep 17 00:00:00 2001 From: Robin1224 <81151231+Robin1224@users.noreply.github.com> Date: Wed, 10 May 2023 11:23:57 +0200 Subject: [PATCH 46/53] Small fix from merge --- views/overviewpage.ejs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 92a60a4a..b974d81c 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,5 +1,4 @@ - -<%- include('./head', {container:false}) %> +<%- include('./head-overviewpage' %>
From f24c2b328da0b60d105c57bbe93a6a910be7c4b6 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 11:30:25 +0200 Subject: [PATCH 47/53] fix in overviewpage --- views/index.ejs | 4 +++- views/overviewpage.ejs | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/views/index.ejs b/views/index.ejs index 0bd9b6d8..a250b194 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -76,9 +76,11 @@
--> + naar overzichtspagina
-naar overzichtspagina + + <%- include('./foot') %> \ No newline at end of file diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index b974d81c..d27ec853 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -1,4 +1,4 @@ -<%- include('./head-overviewpage' %> +<%- include('./head-overviewpage') %>
From 1c84e487637a7c5637f84a240c36d356dacef0ff Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 11:57:51 +0200 Subject: [PATCH 48/53] merge conflict --- index.js | 18 +++++++----------- public/scripts/index.js | 2 +- views/head.ejs | 6 ++++++ 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/index.js b/index.js index 9db30746..023adf06 100644 --- a/index.js +++ b/index.js @@ -19,7 +19,6 @@ app.use(express.urlencoded({ extended: true })); // Use map "public" to serve static files app.use(express.static("public")); - // --- Rendering the index page: --- app.get("/", (request, response) => { response.render("index"); @@ -58,11 +57,10 @@ app.get("/detailpage/:slug", (request, response) => { fetchJson(detailPageUrl).then((data) => { // Use the fetchJson function to retrieve the data for the comments page fetchJson(commentsPageUrl).then((data2) => { - // Combine the data from both responses into a single object const combinedData = { - method: data.method, // Data from the detail page - comments: data2.comments, // Data from the comments page + method: data.method, // Data from the detail page + comments: data2.comments, // Data from the comments page }; // Log the combined data @@ -89,7 +87,6 @@ app.post("/detailpage/:slug", (request, response) => { // Use the postJson function to post the comment data to the specified URL postJson(url, request.body).then((data) => { - // Create a copy of the request body let newComment = { ...request.body }; @@ -145,12 +142,11 @@ export async function postJson(url, body) { .catch((error) => error); } - // lees meer functie detailpagina -let stappenplan = document.querySelector("stappen"); -stappenplan.addEventListener("click", toonStappenplan); +// let stappenplan = document.querySelector("stappen"); +// stappenplan.addEventListener("click", toonStappenplan); -function toonStappenplan(){ - const -} \ No newline at end of file +// function toonStappenplan(){ +// const +// } diff --git a/public/scripts/index.js b/public/scripts/index.js index c2ae8bd6..a35c4692 100644 --- a/public/scripts/index.js +++ b/public/scripts/index.js @@ -1,4 +1,4 @@ window.onload = () => { const body = document.querySelector("body"); body.classList.toggle("index"); -}; \ No newline at end of file +}; diff --git a/views/head.ejs b/views/head.ejs index e2bbddbd..71379672 100644 --- a/views/head.ejs +++ b/views/head.ejs @@ -19,6 +19,12 @@ Visual Thinking in Het HBO
+ <% try { if (container) { %> +
+ <% } } catch (error) { %> + <% return %> + <% } %> +
From acd683d6c0b92bc0d52bd487e71e3026ded51424 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 12:23:49 +0200 Subject: [PATCH 49/53] yeaaaahhh it worksss --- public/client-side.js | 20 ++++++++++++++++++++ public/style.css | 12 +++++------- views/overviewpage.ejs | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/public/client-side.js b/public/client-side.js index b6a1e84d..c59c9e33 100644 --- a/public/client-side.js +++ b/public/client-side.js @@ -1 +1,21 @@ // filter + +const searchBar = document.getElementById("site-search"); +const searchResults = document.querySelectorAll(".method-card"); + +searchBar.addEventListener("keyup", search); + +function search() { + const searchValue = this.value.toLowerCase(); + console.log("hiii"); + + if (this.value === "") { + searchResults.forEach((method) => { + method.hidden = false; + }); + } else { + searchResults.forEach((method) => { + method.hidden = !method.textContent.toLowerCase().includes(searchValue); + }); + } +} diff --git a/public/style.css b/public/style.css index 275c5c3c..11e114ab 100644 --- a/public/style.css +++ b/public/style.css @@ -157,20 +157,19 @@ hr{ } .method-card { - display: flex; - flex-direction: column; - height: 15em; - width: 20em; - border-left:var(--interactive-el-color) 11px solid; + border-left: var(--interactive-el-color) 11px solid; border-radius: 6px; } .method-card a { + display: flex; + flex-direction: column; + height: 15em; + width: 20em; color: var(--text-color); text-decoration: none; } - .method-img { height: 15em; width: 100%; @@ -208,7 +207,6 @@ hr{ margin-bottom: 2em; } - .add-method-text{ display: flex; flex-direction: row; diff --git a/views/overviewpage.ejs b/views/overviewpage.ejs index 12e647d5..b26afc9a 100644 --- a/views/overviewpage.ejs +++ b/views/overviewpage.ejs @@ -8,7 +8,7 @@
- +
From fa74e6d26bd149c80270eca90d2d34d683694758 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 12:53:56 +0200 Subject: [PATCH 50/53] footer styling --- public/style.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/style.css b/public/style.css index 11e114ab..aa966a95 100644 --- a/public/style.css +++ b/public/style.css @@ -186,6 +186,7 @@ hr{ font-weight: bold; } + .arrow{ height: 1em; width: auto; @@ -229,6 +230,7 @@ hr{ } footer { + height: 5em; display: flex; flex-direction: row; gap: 1em; @@ -237,6 +239,8 @@ footer { margin-top: 4em; } + + footer h3{ margin-left: 1em; font-family: var(--broodtekst); From b81c1448d313cb38fcf9689d2048e11ba777339e Mon Sep 17 00:00:00 2001 From: Tobias Vrolijk Date: Wed, 10 May 2023 12:54:48 +0200 Subject: [PATCH 51/53] update --- index.js | 17 ++---------- public/client-side.js | 9 +++++++ public/pijl-hexagon-naar-beneden.svg | 6 +++++ public/style.css | 40 ++++++++++++++++++++++++++++ views/detailpage.ejs | 16 ++++++----- 5 files changed, 66 insertions(+), 22 deletions(-) create mode 100644 public/pijl-hexagon-naar-beneden.svg diff --git a/index.js b/index.js index 9db30746..c233f32f 100644 --- a/index.js +++ b/index.js @@ -19,7 +19,6 @@ app.use(express.urlencoded({ extended: true })); // Use map "public" to serve static files app.use(express.static("public")); - // --- Rendering the index page: --- app.get("/", (request, response) => { response.render("index"); @@ -58,11 +57,10 @@ app.get("/detailpage/:slug", (request, response) => { fetchJson(detailPageUrl).then((data) => { // Use the fetchJson function to retrieve the data for the comments page fetchJson(commentsPageUrl).then((data2) => { - // Combine the data from both responses into a single object const combinedData = { - method: data.method, // Data from the detail page - comments: data2.comments, // Data from the comments page + method: data.method, // Data from the detail page + comments: data2.comments, // Data from the comments page }; // Log the combined data @@ -89,7 +87,6 @@ app.post("/detailpage/:slug", (request, response) => { // Use the postJson function to post the comment data to the specified URL postJson(url, request.body).then((data) => { - // Create a copy of the request body let newComment = { ...request.body }; @@ -144,13 +141,3 @@ export async function postJson(url, body) { .then((response) => response.json()) .catch((error) => error); } - - -// lees meer functie detailpagina - -let stappenplan = document.querySelector("stappen"); -stappenplan.addEventListener("click", toonStappenplan); - -function toonStappenplan(){ - const -} \ No newline at end of file diff --git a/public/client-side.js b/public/client-side.js index 304109ad..2d0aa07f 100644 --- a/public/client-side.js +++ b/public/client-side.js @@ -1 +1,10 @@ // laad meer knop + +// lees meer functie detailpagina +// Dit stuk zoekt de togglebutton en zorgt ervoor dat hij de functie eronder activeerd wanneer erop geklikt wordt +let stappenplan = document.getElementById("stappenplanbutton"); +stappenplan.addEventListener("click", toonStappenplan); +// Dit deel toggled de class "toon" waarop display none staat +function toonStappenplan() { + document.getElementById("stappen").classList.toggle("toon"); +} diff --git a/public/pijl-hexagon-naar-beneden.svg b/public/pijl-hexagon-naar-beneden.svg new file mode 100644 index 00000000..404f81eb --- /dev/null +++ b/public/pijl-hexagon-naar-beneden.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/public/style.css b/public/style.css index 59c3da85..efccd73b 100644 --- a/public/style.css +++ b/public/style.css @@ -236,6 +236,45 @@ body{ color: var(--text-color);; } +.stappen{ + display: none; +} + +.stappen.toon{ + display: block; +} + +.buttondeel{ + display: flex; + justify-content: center; + +} + +#stappenplanbutton{ + font: var(--rigid); + border-radius: 30px; + background-color: white; + border: 0px; + transition: 1s; +} + +#stappenplanbutton:hover{ + cursor: pointer; +} + +#stappenplanbutton img{ + width: 3em; + height: 3em; +} + +#stappenplanbutton img:hover{ + width: 3.5em; + height: 3.5em; + transform: translateY(-0.5em); + transition: 1s; + +} + .beschrijving{ display: flex; flex-direction: column; @@ -244,6 +283,7 @@ body{ blockquote{ font-weight: bolder; } + ol{ list-style-type: none; } diff --git a/views/detailpage.ejs b/views/detailpage.ejs index 959f2f86..69600639 100644 --- a/views/detailpage.ejs +++ b/views/detailpage.ejs @@ -10,7 +10,7 @@
Beschrijving - Stappenplan + Stappenplan Categorieën Voorbeelden
@@ -22,10 +22,13 @@ <%- method.description.html %> Method Template
- - -

Stappenplan

-
+
+ +
+
    <% method.steps.forEach(step => { %>
  1. @@ -37,8 +40,7 @@ <% }) %>
-
- +
<% method.categories.forEach(category => { %>
    From 00386e27927f81138298305cc6206abc8f90b462 Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 16:13:54 +0200 Subject: [PATCH 52/53] Update style.css --- public/style.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/public/style.css b/public/style.css index aa966a95..ed2410dd 100644 --- a/public/style.css +++ b/public/style.css @@ -159,13 +159,13 @@ hr{ .method-card { border-left: var(--interactive-el-color) 11px solid; border-radius: 6px; + height: 15em; + width: 20em; } .method-card a { display: flex; flex-direction: column; - height: 15em; - width: 20em; color: var(--text-color); text-decoration: none; } @@ -179,6 +179,7 @@ hr{ } .method-name{ + margin-top: 0.5em; display: flex; justify-content: space-between; font-family: var(--rigid); From a4a0c3dd7d926b91832edddcb3db988ac36a9cad Mon Sep 17 00:00:00 2001 From: youssra <112857270+zombie0youssra@users.noreply.github.com> Date: Wed, 10 May 2023 16:59:36 +0200 Subject: [PATCH 53/53] Update client-side.js --- public/client-side.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/client-side.js b/public/client-side.js index 642f8f74..cb6995f6 100644 --- a/public/client-side.js +++ b/public/client-side.js @@ -1,4 +1,3 @@ - // laad meer knop // lees meer functie detailpagina @@ -8,7 +7,8 @@ stappenplan.addEventListener("click", toonStappenplan); // Dit deel toggled de class "toon" waarop display none staat function toonStappenplan() { document.getElementById("stappen").classList.toggle("toon"); - +} + // filter const searchBar = document.getElementById("site-search");