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

generate #2

Open
wants to merge 131 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
131 commits
Select commit Hold shift + click to select a range
afe2988
Update README.md
RainbowJM Apr 11, 2023
9ea60b0
delete git stuff
Apr 11, 2023
178d09c
init commit
Apr 11, 2023
7aa64a0
init ejs
Apr 11, 2023
f2babdb
remove node_modules
Apr 11, 2023
d183130
added git ignore
Apr 11, 2023
6abfa08
Merge pull request #1 from RainbowJM/main
K3A101 Apr 11, 2023
c2fc6c1
template done
Apr 11, 2023
40f8731
Merge pull request #2 from RainbowJM/main
K3A101 Apr 11, 2023
5151e13
added header and script
Apr 11, 2023
158fbe5
head done and mini fix
Apr 11, 2023
2a96727
Merge pull request #3 from RainbowJM/jevona
RainbowJM Apr 11, 2023
613ce90
Merge pull request #4 from RainbowJM/main
K3A101 Apr 11, 2023
57fd0f8
css structure and fonts added
K3A101 Apr 11, 2023
cea5f92
Merge pull request #5 from RainbowJM/keisha
RainbowJM Apr 11, 2023
64119b2
Merge pull request #6 from RainbowJM/main
RainbowJM Apr 11, 2023
222cd6f
sketches for readme
K3A101 Apr 11, 2023
55f17a2
readme update
K3A101 Apr 11, 2023
66a58bc
updated package-lock.json
K3A101 Apr 11, 2023
621dd2e
header added
K3A101 Apr 11, 2023
7cc1b09
routing for the poems page
K3A101 Apr 11, 2023
18f1843
poems page setup
K3A101 Apr 11, 2023
cc0f816
header css styling
K3A101 Apr 11, 2023
89b4e0d
css styling
K3A101 Apr 12, 2023
2dc20e9
working on the index
Apr 12, 2023
52e34ad
API setup
K3A101 Apr 12, 2023
095d072
manifest.json commented
K3A101 Apr 12, 2023
91ae981
template engine
K3A101 Apr 12, 2023
30b691d
package update
K3A101 Apr 12, 2023
5994eda
Delete package-lock.json
RainbowJM Apr 12, 2023
a072762
Merge pull request #7 from RainbowJM/keisha
RainbowJM Apr 12, 2023
eced1d4
Merge branch 'main' into jevona
Apr 12, 2023
06d0135
package
Apr 12, 2023
1fd9171
readme
Apr 12, 2023
0a772a9
start page important part done
Apr 12, 2023
f25cc4a
Merge branch 'main' into hilal
Apr 12, 2023
1092b66
new collabrator
Apr 12, 2023
87a2945
started with the offline page
Apr 12, 2023
285e960
css wolks
K3A101 Apr 12, 2023
e8487a5
offline done
Apr 12, 2023
a729b27
typo fixed
Apr 12, 2023
e4eca01
loading
Apr 12, 2023
91ea2a0
Merge branch 'main' into hilal
Apr 12, 2023
8d803af
css
Apr 12, 2023
ca4f454
generate poems
Apr 12, 2023
c0c4757
Merge pull request #9 from RainbowJM/hilal
RainbowJM Apr 12, 2023
532fd2a
Merge branch 'main' into jevona
Apr 12, 2023
8944303
update readme
Apr 12, 2023
137ad33
url update
Apr 12, 2023
762dd93
remove not needed stuff
Apr 12, 2023
f760ee3
refactor
Apr 12, 2023
b8b2aca
new style
Apr 12, 2023
b839e27
new collabarator
Apr 12, 2023
a9578ed
update readme
Apr 12, 2023
d0c80ed
api ready
Apr 12, 2023
a46d774
Merge pull request #10 from RainbowJM/jevona
RainbowJM Apr 12, 2023
270753b
generate styling
Apr 12, 2023
b77afac
css
Apr 12, 2023
2da7d0e
start knop vernadert naar home
K3A101 Apr 12, 2023
0b9fbff
clouds animation done
K3A101 Apr 12, 2023
05d7dde
error bij mijn ejs
laibaaac Apr 13, 2023
45015d7
Update README.md
laibaaac Apr 13, 2023
1c948a2
Update README.md
laibaaac Apr 13, 2023
8d2ed21
Merge branch 'main' into keisha
RainbowJM Apr 13, 2023
0457e3b
Merge pull request #13 from RainbowJM/keisha
RainbowJM Apr 13, 2023
e4d402c
Merge branch 'main' into hilal
RainbowJM Apr 13, 2023
ce6f341
Merge pull request #12 from RainbowJM/hilal
RainbowJM Apr 13, 2023
e17d7d2
adjust size
Apr 13, 2023
1ceb187
fonts changed
K3A101 Apr 13, 2023
56fa635
loading page added
K3A101 Apr 13, 2023
0cbedf4
url naar de loading page
K3A101 Apr 13, 2023
4ba9fe2
loading page styling
K3A101 Apr 13, 2023
b95a277
Merge branch 'main' into keisha
K3A101 Apr 13, 2023
bda4eb1
generate page
Apr 13, 2023
21a9554
background decoration
Apr 13, 2023
6d8ab75
url changed
K3A101 Apr 13, 2023
6629b7c
loading page styling
K3A101 Apr 13, 2023
36a4fcd
klaar
laibaaac Apr 13, 2023
abc7506
poems page
K3A101 Apr 13, 2023
507dd38
Merge pull request #15 from RainbowJM/hilal
RainbowJM Apr 13, 2023
96ad624
label voor preview
laibaaac Apr 13, 2023
0411c90
Merge branch 'main' into keisha
RainbowJM Apr 13, 2023
cf87b6a
Merge pull request #17 from RainbowJM/keisha
RainbowJM Apr 13, 2023
c8197a0
readme en styles
Apr 13, 2023
cd193e9
Merge branch 'main' into hilal
RainbowJM Apr 13, 2023
d9e56cd
Merge pull request #19 from RainbowJM/hilal
RainbowJM Apr 13, 2023
b33cc67
mini fix
Apr 13, 2023
810ba12
readme
Apr 13, 2023
3253526
Hilal styling
K3A101 Apr 13, 2023
3b3ca4a
Merge branch 'main' into keisha
RainbowJM Apr 13, 2023
56fc2b4
Merge pull request #20 from RainbowJM/keisha
RainbowJM Apr 13, 2023
3287be9
Merge branch 'main' into Laiba
laibaaac Apr 13, 2023
d443d59
UEGHBWJNKADLS
laibaaac Apr 13, 2023
d4e67d6
Merge pull request #21 from RainbowJM/Laiba
RainbowJM Apr 13, 2023
c0faf86
readme
Apr 13, 2023
2ebc845
Merge branch 'main' into test
Apr 13, 2023
f849d26
spaties
Apr 13, 2023
7f18016
styling fixed
Apr 13, 2023
8b2a578
random
Apr 13, 2023
3c1d125
fixed header
Apr 13, 2023
d076419
inbraak
laibaaac Apr 13, 2023
ea8f7b2
transition from the loading page to the poems page
K3A101 Apr 13, 2023
1c2af2c
script tag added
K3A101 Apr 13, 2023
75df75a
poems page css styling and html structure
K3A101 Apr 13, 2023
65f8271
font size fixed
K3A101 Apr 13, 2023
51bdc24
changes
Apr 13, 2023
43ca811
Merge pull request #23 from RainbowJM/keisha
RainbowJM Apr 13, 2023
6c57b9c
more words
Apr 13, 2023
a48fc9f
keyboard die niet werkt
Apr 13, 2023
68d5c28
Merge branch 'main' into Tapan
Apr 13, 2023
e9fc076
script
Apr 13, 2023
ff35c33
Merge branch 'main' into test
Apr 14, 2023
6e3de90
Merge pull request #25 from RainbowJM/test
RainbowJM Apr 14, 2023
2e068a9
Merge branch 'main' into Tapan
Apr 14, 2023
37f5446
Merge pull request #26 from RainbowJM/Tapan
RainbowJM Apr 14, 2023
9211fcb
mini fix
Apr 14, 2023
959661e
Merge pull request #27 from RainbowJM/jevona
RainbowJM Apr 14, 2023
fd86eb7
keyboard gone
Apr 14, 2023
c22e0fd
new text
Apr 14, 2023
48ac295
Merge branch 'main' into Tapan
Apr 14, 2023
d98c48f
Merge pull request #29 from RainbowJM/Tapan
RainbowJM Apr 14, 2023
82d87b7
readme
Apr 14, 2023
2c2e3aa
more rm
Apr 14, 2023
4fa63c3
rm
Apr 14, 2023
9a8baf6
Merge pull request #31 from RainbowJM/Tapan
RainbowJM Apr 14, 2023
15ae426
readme
Apr 14, 2023
14c7a44
url path changed
K3A101 Apr 14, 2023
fb5d122
Merge pull request #32 from RainbowJM/Tapan
RainbowJM Apr 14, 2023
5ad8e99
Merge branch 'main' into keisha
K3A101 Apr 14, 2023
1e7b445
Merge pull request #33 from RainbowJM/keisha
RainbowJM Apr 14, 2023
e4168bc
service worker
Apr 14, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
168 changes: 128 additions & 40 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,68 +1,156 @@
# Project 2 @cmda-minor-web 2022 - 2023
# 👋🏼 Dicho di Hubentut ~ Youth poetry
![logo](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/PW2%20-%20Hackaton%20trans.png)

## Responsible IT Hackathon

In een week bouwt iedere student aan de hand van een user story een eigen prototype. Technieken geleerd bij [Browser Technologies](https://github.com/cmda-minor-web/browser-technologies-2223) en [Progressive Web Apps](https://github.com/cmda-minor-web/progressive-web-apps-2223) worden toegepast bij het bouwen van de de prototypes.
## 👁️ Demo Link! 👁️
[dicho-hackaton-production.up.railway.app/](dicho-hackaton-production.up.railway.app/)

### Kickoff
---

Op dinsdag heeft Yuri Westplat een kick-off gegeven over de mogelijke opdrachten waar je deze week uit kan kiezen. Het thema van deze week draait om AI toegankelijk maken voor gebruikers door middel van interfaces.
## 💻 Projectweek 3: Hackathon 💻
Teammates:
- 👩🏾 Jevona Magdalena
- 👩🏾 Keïsha Alexander
- 👩🏻 Hilal Tapan
- 👩🏽 Laiba Choudhry

## Opdrachtomschrijvingen
---

Voor deze week zijn er twee mogelijke opdrachten:
## 📇 Concept 📇
During the projectweek we are given a choice between 2 projects, we have decided to go with the project Prompts engineering with poems. For this assignment we will have to fetch an api where you can generate poems based on themes and types. The user has a few types to choose from and fir the theme they can write anything they want.

### Opdracht 1: Prompt-engineering (oranje)
---

Voor deze opdracht is je target een 75" scherm met touch. Als je specifiek front-end maakt voor dit soort schermen gebeuren er allemaal rare dingen. Tijdens Browser Technologies heb je leren werken met obscure apparaten. Je gaat de hele week prototypen hiermee om een interface te maken waar gebruikers "prompts" kunnen invoeren.
## 📖 Job story 📖
When I am in a museum I would like to be able to generate poems based on themes.

### Opdracht 2: AI muziekinstrument (blauw)
---

Een front-end voor een muziekinstrumenten die op basis van data muziekvisualisaties genereren. Je wil de gebruiker de kans geven om het eindresultaat aan te passen. "Dingen" als DALL-E en Midjourney hebben een vrij lineare output, namelijk een input en een output. Tijdens dit project wil een gebruiker met meerdere momenten van input de output "sturen" als het ware.
## 💻 Intallation guide 💻
### Install nvm
1. To install the server you need node and express. You can do that with nvm. Nvm is package installer where you can install different packages. With this code you can install the latest versions of npm and node in your terminal:
```
nvm install 19.8.1
```

## Weekplanning
### Clone repo
2. Clone this repository by running:
```
git clone https://github.com/RainbowJM/dicho-hackaton.git
```

| Dag | Tijd | Wat |
|---|---|--|
| Maandag 10/04 | Hele dag | Tweede paasdag |
| Dinsdag 11/04 | 9:30 | Kickoff w/ Yuri Westplat |
| | 11:00 - 16:00 uur | Werken aan de opdracht |
| Woensdag 12/04 | 9:30 - 16:00 uur | Standups met coaches |
| Donderdag 13/04 | 9:30 - 16:00 uur | Werken aan de opdracht|
| Vrijdag 14/04 | 12:00 uur | Presentaties |
### NPM install
3. Install the dependencies by running:
```
npm install
```

### Start server
Run the following code to start the server:
```
node app.js
```

### Werkwijze
Full-time week werken aan (technisch) bewijzen van een concept-idee. Vrijdag is de pitch! Student laat zien dat hij/zij de vakken [Browser Technologies](https://github.com/cmda-minor-web/browser-technologies-2223) en [Progressive Web Apps](https://github.com/cmda-minor-web/progressive-web-apps-2223) begrijpt en beheerst.
---

Op maandag, woensdag en vrijdag zijn er coaches aanwezig voor coaching en feedback. Maandag is de kickoff, woensdag zijn er standups om de status door te spreken. Waar ben je mee bezig? Loop je ergens vast of heb je hulp nodig? Waar sta je? Vrijdag is de beoordeling.
## 🛠️ Features combined 🛠️
- Can generate poems
- Can put own input
- Works on 73 inch screen
- Works on touchscreen
- preview mode on input fields

### Beoordeling
Tijdens de beoordeling krijg je feedback op het resultaat en op je functioneren. De vakdocenten kijken niet naar je code, maar beoordelen In hoeverre je in het project laten zien dat je de bijhorende vakken beheerst en goed hebt toegepast.
---

Het project telt als AVV mee met de Meesterproef.
## 📄 Licence 📄
This project has a MIT License - see the license file for more details.

### Feedback over functioneren
Je hebt een leergierig, gedreven en zelfredzame houding nodig om de minor te kunnen halen. Welke vaardigheden heb je laten zien? Onderzoekend vermogen? Creativiteit? Conceptueel? In hoeverre komen je houding en verworven vaardigheden overeen met wat een frontender in de praktijk nodig heeft?
---

### Oplevering & criteria
- Presentatie.
- Github met je code en readme.
## 💾 Used technologies 💾
- EJS templating engine
- Node.js
- Service worker
- Express

<!-- Add a link to your live demo in Github Pages 🌐-->
---

<!-- ☝️ replace this description with a description of your own work -->
## 🖊 Schetsen 🖊
### Schets 1
![schets1](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/idee-0.png)

<!-- replace the code in the /docs folder with your own, so you can showcase your work with GitHub Pages 🌍 -->
### Schets 2
![schets1](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/idee-1.png)

<!-- Add a nice poster image here at the end of the week, showing off your shiny frontend 📸 -->

<!-- Maybe a table of contents here? 📚 -->
### Schets 3
![schets1](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/idee-2.png)

<!-- How about a section that describes how to install this project? 🤓 -->

<!-- ...but how does one use this project? What are its features 🤔 -->
### Schets 4
![schets1](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/idee-3.png)

<!-- Maybe a checklist of done stuff and stuff still on your wishlist? ✅ -->
### Startpage schets
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/startpage.png)

<!-- How about a license here? 📜 (or is it a licence?) 🤷 -->
### Loading state schets
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/main/public/images/loading-state.png)

---

## 🔮 Hi fi prototype 🔮
### Startpagina
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/Tapan/public/images/Startpagina.png)

### Generate 1
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/Tapan/public/images/Startpagina.png)


### Generate 2
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/Tapan/public/images/prompt%20forms.png)


### Generate 3
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/Tapan/public/images/propmpt-page.png)

### Loading
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/Tapan/public/images/loading.png)

### Poems
![startpage](https://github.com/RainbowJM/dicho-hackaton/blob/Tapan/public/images/poems%20page.png)

---

## 👩🏼 User test 👩🏼
We conducted a user test on 3 users. We asked if they could just scroll and navigate through our application. During the user test we discover various things like, the user can’t use the keyboard. 

We noted all the obstacle the user had while using our application. Per user we have described what they went through

---

### User 1: 
Remove on the home page the home button, because he thought that he wasn’t on the home page. 
On the screen you can’t type in the text in the input fields, no keyboard
The touchscreen is basically just a mouse
Keep in mind the touch screen

### User 2: 
Everything went smoothly
He knew where to navigate and what to click 


### User 3:
The UI of the application has to change a bit, it is not that easy to navigate
Give the user feedback, so that they know they are right on track, the user she was really confused on where exactly to go
She was second doubting everything, she was really confused on the page where she had to generate the poems. 


In the future if we want to continue with the application, we will keep these notes in mind and try to implement it to our code. 

---

## 📁 Sources 📁
* https://codepen.io/hilallx/pen/LYgpmGr
* https://developer.mozilla.org/en-US/docs/Web/API/ServiceWorkerGlobalScope/skipWaiting

---
35 changes: 35 additions & 0 deletions app.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
const express = require('express');
const app = express();
const port = 8000;
// let minifyHTML = require('express-minify-html');

let options = {
maxAge: '2y',
etag: false
}

// Setup the template engine ejs
app.set('view engine', 'ejs');
app.set('views', 'views')

app.use(express.static('public', options));

// app.use(minifyHTML({
// override: true,
// exception_url: false,
// htmlMinifier: {
// removeComments: true,
// collapseWhitespace: true,
// collapseBooleanAttributes: true,
// removeAttributeQuotes: true,
// removeEmptyAttributes: true,
// minifyJS: true
// }
// }));

var poemsRouter = require('./routes/poems');
app.use('/', poemsRouter);

app.listen(port, () => {
console.log(`Example app listening on port ${port}`)
})
Loading