Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

17 content op home page zien #25

Open
wants to merge 61 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
f165bdc
Basis
Apr 17, 2023
9745f67
Styles+
Apr 17, 2023
095ad44
post teamcanvas
Sascha-davidson Apr 17, 2023
a8f975c
post teamcanvas changes
Sascha-davidson Apr 17, 2023
025fcef
teamcanvas png nu goed
Sascha-davidson Apr 17, 2023
f7f9e0d
Delete Teamcanvas_Tekengebied 1.png
Sascha-davidson Apr 17, 2023
e357a76
Delete Teamcanvas.png
Sascha-davidson Apr 17, 2023
b4fe9b0
Delete Teamcanvas.pdf
Sascha-davidson Apr 17, 2023
c804dca
goede teamcanvas - spelfouten
Sascha-davidson Apr 17, 2023
4de0e1b
Merge branch 'main' of https://github.com/luukbrauckmann/sprint-10-le…
Sascha-davidson Apr 17, 2023
f285e05
toevoegen pdf en png
Sascha-davidson Apr 17, 2023
a3756e9
Node engine+
Apr 17, 2023
2103281
Port vanuit env
Apr 17, 2023
d5d1060
Fallback voor port
Apr 17, 2023
c572742
Update README.md
Apr 19, 2023
789a5e2
Update README.md
Apr 19, 2023
7fbe21a
Update README.md
Apr 19, 2023
91e3dae
js-enabled toegevoegd
Apr 19, 2023
e0a2d3a
Icons in webfonts en svgs toegevoegd
Apr 19, 2023
eeda656
Update README.md
Apr 21, 2023
4232a33
begin van project + nav bar + nav bar feature detect
Sascha-davidson Apr 24, 2023
3a5acfa
responsive nav
Sascha-davidson Apr 24, 2023
ade89b8
responsive nav tussen face (tablet)
Sascha-davidson Apr 24, 2023
8002532
some small schanges voor responsive
Sascha-davidson Apr 24, 2023
885c828
bigger logo klick
Sascha-davidson Apr 24, 2023
0fc850b
2 van de drie roetes gemaakt
Sascha-davidson Apr 25, 2023
626f69e
nev waarde verbetering
Sascha-davidson Apr 25, 2023
c5afa40
smoothe responsive animation
Sascha-davidson Apr 26, 2023
211ff74
Update gitignore
Apr 26, 2023
423aa1d
Layout voor styleguide
Apr 28, 2023
a6a72c3
Create styling
May 8, 2023
a2ceea8
Merge pull request #13 from luukbrauckmann/sprint_10-task-26666887
May 8, 2023
0da6822
Herstel base
May 8, 2023
89eb2ad
Fontawesome SSR
May 8, 2023
3667db4
Styles property toegevoegd aan de routes
May 8, 2023
3c3cb21
Style bestanden opgesplitst
May 8, 2023
4cfef90
reset menu styling
May 8, 2023
f061e34
Filters kunnen meegegevegen worden aan data-access
May 8, 2023
98586cf
Get weggehaald
May 8, 2023
e5428f8
Revise start.css
May 8, 2023
5c2d540
Styleguide class weggehaald
May 8, 2023
690ae2c
Start pagina gevuld met photo
May 8, 2023
2d04135
Update header.ejs
Sascha-davidson May 9, 2023
1a03365
Icons styleguide fix
May 9, 2023
6ac6cab
Vertical align button label
May 9, 2023
c6d04bf
Icons styling fix
May 9, 2023
5358468
start header
May 10, 2023
2c7d451
Header met curve en style fixes
May 10, 2023
8a4152b
Create footer en style fixes
May 10, 2023
e38c6c4
Header style fix
May 10, 2023
e421c10
Styleguide link naar footer
May 10, 2023
36aba26
Button icon fix in styleguide
May 10, 2023
ba7f8e5
fix the nav
Sascha-davidson May 10, 2023
ac97159
header box shadow fix
May 10, 2023
fe94236
Menu link kleur en text decoration fix
May 10, 2023
b673b91
Footer gevuld
May 10, 2023
d3c4cea
Merge branch 'main' into 16-rebuild-repair-start-page
May 10, 2023
88373fc
Merge pull request #19 from luukbrauckmann/16-rebuild-repair-start-page
May 10, 2023
c0641f0
Merge styling fixes
May 10, 2023
fd81ffb
Menu styling fix
May 10, 2023
4000c84
content geplaatst van start
Sascha-davidson May 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
node_modules
.env
.DS_Store
59 changes: 37 additions & 22 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,33 +1,48 @@
> _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)
<h1>
<img src="https://user-images.githubusercontent.com/47314813/223076346-b8c52030-686b-4541-9746-5b5ade5d98db.png" style="height: 1em;">
<span> Toolgankelijk</span>
</h1>

# Titel
<!-- Geef je project een titel en schrijf in één zin wat het is -->
Foto van de voorpagina
***

## Inhoudsopgave
<h2 id="inhoud">📦 Inhoud</h2>

* [Beschrijving](#beschrijving)
* [Gebruik](#gebruik)
* [Kenmerken](#kenmerken)
* [Installatie](#installatie)
* [Bronnen](#bronnen)
* [Licentie](#licentie)
1. Beschrijving
2. Gebruik
3. Kenmerken
4. Bronnen
5. Licenties

## Beschrijving
<!-- Bij Beschrijving staat kort beschreven wat voor project het is en wat je hebt gemaakt -->
<!-- Voeg een mooie poster visual toe 📸 -->
<!-- Voeg een link toe naar Github Pages 🌐-->
<h2 id="beschrijving">ℹ️ Beschrijving</h2>

## Gebruik
<!-- Bij Gebruik staat de user story, hoe het werkt en wat je er mee kan. -->
Toolgankelijk is een tool waar de partners van Vervoerregio Amsterdram kunnen zien aan welke toegankelijkheids principes hun website en/of pagina's voldoen. Parnters kunnen pagina's aan hun website toevoegen die ze kunnen controleren aan welke principes ze voldoen.

## Kenmerken
<!-- Bij Kenmerken staat welke technieken zijn gebruikt en hoe. Wat is de HTML structuur? Wat zijn de belangrijkste dingen in CSS? Wat is er met JS gedaan en hoe? Misschien heb je iets met NodeJS gedaan, of heb je een framwork of library gebruikt? -->
<h2 id="gebruik">🖥️ Gebruik</h2>

## Installatie
<!-- Bij Instalatie staat hoe een andere developer aan jouw repo kan werken -->
***

## Bronnen
<h2 id="kenmerken">✨ Kenmerken</h2>

## Licentie
De website wordt server side gerendered door middel van NodeJS, ExpressJS & EJS. Het is gebouwd in HTML, CSS & JS. Data wordt geleverd door de API van FDND die voor vervoerregio-amsterdam is gemaakt.

<h2 id="installatie">📥 Installatie</h2>

Zorg dat je NodeJS geïnstalleerd hebt. Clone deze repository. Open een terminal. Zorg dat je in het juiste pad zit van dit project. Voer de commando `npm install` uit. Wanneer deze klaar is kun je de applicatie starten door de commando `npm run dev` uit te voeren. De applicatie wordt gehost op http://localhost:3000/

<h2 id="bronnen">🌍 Bronnen</h2>

- [Instructies](docs/INSTRUCTIONS.md)
- [NodeJS](https://nodejs.org/)
- [ExpressJS](https://expressjs.com/)
- [EJS](https://ejs.co/)
- [API Documentatie](https://api.vervoerregio-amsterdam.fdnd.nl/)
- [nodemon](https://nodemon.io/)
- [Mobile menu inspiratie](https://www.youtube.com/watch?v=7YZe5XE5lls&t=551s)
- [Control Flow](https://github.com/luukbrauckmann/sprint-9-leertaak/wiki/Control-Flow)
- [Pen menu](https://codepen.io/luuk-brauckmann/pen/jOvdbeq)
- [Pen folder card](https://codepen.io/luuk-brauckmann/pen/eYLQOQB)

<h2 id="licenties">🪪 Licenties</h2>

This project is licensed under the terms of the [MIT license](./LICENSE).
2,421 changes: 2,421 additions & 0 deletions docs/Teamcanvas.ai

Large diffs are not rendered by default.

Binary file modified docs/Teamcanvas.pdf
Binary file not shown.
Binary file added docs/Teamcanvas_Tekengebied 1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions helpers/fontawesome.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { library, dom, icon } from '@fortawesome/fontawesome-svg-core';
import { fas } from '@fortawesome/free-solid-svg-icons';

export const fontawesome = (server) => {
library.add(fas)
server.locals.fas = () => dom.css()
server.locals.icon = (iconName) => icon({ prefix: 'fas', iconName }).html
}
7 changes: 7 additions & 0 deletions helpers/highlight.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import hljs from 'highlight.js/lib/core';
import xml from 'highlight.js/lib/languages/xml';

export const highlightjs = (server) => {
hljs.registerLanguage('xml', xml)
server.locals.highlight = (code) => hljs.highlight(code, { language: 'xml' }).value
}
43 changes: 43 additions & 0 deletions index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import { fontawesome } from './helpers/fontawesome.js'
import { highlightjs } from './helpers/highlight.js'

import express from 'express'
import compression from 'compression'
import helmet from 'helmet'

import startPage from './routes/start.js'
import newChecklist from './routes/new-checklist.js'
import partners from './routes/partners.js'
import styleguide from './routes/styleguide.js'
import notFoundPage from './routes/not-found.js'

const { env } = process
const server = express()

const port = env.PORT || 3000

server.set('view engine', 'ejs')
server.set('views', 'views')
server.set('trust proxy', true)

server.use(compression())
server.use(helmet())
server.use(express.static('public'))
server.use(express.json())
server.use(express.urlencoded({ extended: true }))

fontawesome(server)
highlightjs(server)

/* Routes */
server.get('/', startPage)
server.get('/new-checklist', newChecklist)
server.get('/partners', partners)
server.get('/styleguide', styleguide)
server.get('/styleguide/**', styleguide)
server.get('**', notFoundPage)

server.listen(port, () => {
console.log(`App is served on port http://localhost:${port}/`)
})

81 changes: 81 additions & 0 deletions lib/data-access.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import dotenv from "dotenv"
dotenv.config()

const { env } = process

/**
* Data getten
* @param {string} endpoint De endpoint van de data die je wilt getten
* @param {*} query extra parameters om eventueel te filteren
* @returns Promise met de data
*/
export const get = async (endpoint, query) => {
const queryParams = new URLSearchParams(query).toString()
const url = `${env._API_URL}/${endpoint}?${queryParams}`

console.log(query);

const options = {
method: "GET"
}

return await fetch(url, options)
.then((response) => response.json())
.catch((error) => error)
}

/**
* Data toevoegen aan de database
* @param {string} endpoint De endpoint van de data die je wilt posten
* @param {*} data De data die je wilt toevoegen aan de database
* @returns Promise met de data
*/
export const create = async (endpoint, data) => {
const url = `${env._API_URL}/${endpoint}`

const options = {
method: "POST",
body: JSON.stringify(data)
}

return await fetch(url, options)
.then((response) => response.json())
.catch((error) => error)
}

/**
* Data updaten in de database
* @param {string} endpoint De endpoint van de data die je wilt patchen
* @param {*} data De data die je wilt updaten in de database
* @returns Priomise met de data
*/
export const update = async (endpoint, data) => {
const url = `${env._API_URL}/${endpoint}`

const options = {
method: "PATCH",
body: JSON.stringify(data)
}

return await fetch(url, options)
.then((response) => response.json())
.catch((error) => error)
}

/**
*
* @param {string} endpoint De endpoint van de data die je wilt deleten
* @param {*} id De identifier van de data die je wilt deleten
* @returns Promise met de data
*/
export const remove = async (endpoint, id) => {
const url = `${env._API_URL}/${endpoint}`

const options = {
method: "DELETE"
}

return await fetch(url, options)
.then((response) => response.json())
.catch((error) => error)
}
Loading