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

final update #47

Open
wants to merge 87 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
6ffa7d0
first : riley
ryryesther Sep 12, 2024
2456a3c
Merge branch 'fdnd-task:main' into main
RenzoWille Sep 13, 2024
cc27384
renzo
RenzoWille Sep 13, 2024
f29ad85
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
RenzoWille Sep 13, 2024
5be4145
renzo
RenzoWille Sep 13, 2024
d31ee59
Update README.md
RenzoWille Sep 13, 2024
bdd8e96
Update README.md
RenzoWille Sep 13, 2024
f5c94c6
Miel website update
miel775 Sep 13, 2024
9181fe5
Update README.md
miel775 Sep 13, 2024
712074b
Update README.md
miel775 Sep 13, 2024
17aeb85
Update README.md
miel775 Sep 13, 2024
f69b022
alt attribuut toegevoed (fixus #1)
RenzoWille Sep 13, 2024
50c168d
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
RenzoWille Sep 13, 2024
d20637d
nieuw
RenzoWille Sep 15, 2024
ea2d1f6
nieuw
RenzoWille Sep 15, 2024
7746ffe
nieuw
RenzoWille Sep 15, 2024
4534544
nieuw renzo
RenzoWille Sep 15, 2024
c4b50f4
renzo nieuw
RenzoWille Sep 15, 2024
a3012ad
javarenzonieuw
RenzoWille Sep 15, 2024
6a9393b
nieuw
RenzoWille Sep 15, 2024
e1c6962
nieuw
RenzoWille Sep 15, 2024
7d19b8e
nieuw
RenzoWille Sep 15, 2024
9277139
nieuw
RenzoWille Sep 15, 2024
4620022
nieuw
RenzoWille Sep 15, 2024
9ad191d
nieuw
RenzoWille Sep 15, 2024
e3da685
final
RenzoWille Sep 18, 2024
dc28e3f
Merge branch 'fdnd-task:main' into main
miel775 Sep 18, 2024
2a23d6a
raw draft
ryryesther Sep 18, 2024
342cd90
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
ryryesther Sep 18, 2024
6546c76
niewu
RenzoWille Sep 18, 2024
04990a0
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
RenzoWille Sep 18, 2024
ae4afc6
nieuw
RenzoWille Sep 18, 2024
5e20fd7
nieuw
RenzoWille Sep 18, 2024
526eb4f
nieuw
RenzoWille Sep 18, 2024
32240ea
nieuw
RenzoWille Sep 18, 2024
dd78f9e
nieuw
RenzoWille Sep 18, 2024
41e35ec
nieuw
RenzoWille Sep 18, 2024
0257362
nieuw
RenzoWille Sep 18, 2024
06096bf
nieuw
RenzoWille Sep 18, 2024
d59d480
help
ryryesther Sep 18, 2024
a40d115
nieuw
RenzoWille Sep 18, 2024
ef52f92
nieuw
RenzoWille Sep 18, 2024
44a29b3
nieuw
RenzoWille Sep 18, 2024
a247321
nieuw
RenzoWille Sep 18, 2024
fdbe831
niuew
RenzoWille Sep 18, 2024
dea191b
nieuwe
RenzoWille Sep 18, 2024
f791a17
nieuwe
RenzoWille Sep 18, 2024
3a3eb49
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
ryryesther Sep 18, 2024
bece28c
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
ryryesther Sep 18, 2024
c0976ae
Update finalstyles.css
ryryesther Sep 18, 2024
b88aaf8
nieuwe
RenzoWille Sep 18, 2024
e0ec1b4
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
RenzoWille Sep 18, 2024
24f9c9c
nieuw
RenzoWille Sep 18, 2024
5e1a9d2
nieuwe
RenzoWille Sep 18, 2024
98c816a
nieuw
RenzoWille Sep 18, 2024
f56ff38
README.md
RenzoWille Sep 19, 2024
2be6a11
README.md
RenzoWille Sep 19, 2024
e654bb9
README.md
RenzoWille Sep 19, 2024
c8eacec
README.md
RenzoWille Sep 19, 2024
6260af5
README.md
RenzoWille Sep 19, 2024
ecc1acc
README.md
RenzoWille Sep 19, 2024
20605a6
README.md
RenzoWille Sep 19, 2024
34d034e
README.md
RenzoWille Sep 19, 2024
adcd078
README.md
RenzoWille Sep 19, 2024
1a6c544
README.md
RenzoWille Sep 19, 2024
9546b19
loopie de loopie
ryryesther Sep 19, 2024
28a98ce
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
ryryesther Sep 19, 2024
48cf787
nieuw
RenzoWille Sep 19, 2024
15e5801
nieyw
RenzoWille Sep 19, 2024
ac2670d
nieuwe
RenzoWille Sep 19, 2024
4d6fdab
nieuw
RenzoWille Sep 20, 2024
77a0095
Update README.md
miel775 Sep 20, 2024
0976f85
Fotos voor Readme
miel775 Sep 20, 2024
0fc4391
nieuw
RenzoWille Sep 20, 2024
988e07e
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
RenzoWille Sep 20, 2024
edf6ce8
Update README.md
miel775 Sep 20, 2024
c507bc4
Update README.md
miel775 Sep 20, 2024
13a93d8
nieuw
RenzoWille Sep 20, 2024
df3d24f
Merge branch 'main' of https://github.com/RenzoWille/squad-page-rmr
RenzoWille Sep 20, 2024
1ae7498
nieuw
RenzoWille Sep 20, 2024
b8345aa
nieuw
RenzoWille Sep 20, 2024
f57e804
nieuw
RenzoWille Sep 20, 2024
80ec9bc
nieuw
RenzoWille Sep 20, 2024
7af24e2
nieuw
RenzoWille Sep 20, 2024
051a4cf
Update README.md
ryryesther Sep 20, 2024
f95d929
Update README.md
ryryesther Sep 20, 2024
ce6c27e
Update README.md
ryryesther Sep 20, 2024
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.
Binary file added 1. Cafe Fest.mp4
Binary file not shown.
Binary file added 2. Uitzicht_1.mp4
Binary file not shown.
Binary file added 215697_small.mp4
Binary file not shown.
Binary file added 3. Winkel.mp4
Binary file not shown.
Binary file added 4. Lokaal Huren.mp4
Binary file not shown.
Binary file added 5. Trappenhuis.mp4
Binary file not shown.
Binary file added 6. Aquarium.mp4
Binary file not shown.
Binary file added Illustrator/1x/Artboard 1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5,358 changes: 5,358 additions & 0 deletions Illustrator/illu map hva.ai

Large diffs are not rendered by default.

124 changes: 121 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,128 @@
# Squad Page RMR

# Squad page
Dit is het ontwerp van de squad page gemaakt door Renzo, Miel en Riley.

Ontwerp en maak met een team een Squad Page met HTML, CSS en JS.
## Inhoudsopgave

De instructie van deze leertaak staan in de [INSTRUCTIONS.md](https://github.com/fdnd-task/your-tribe-squad-page/blob/main/docs/INSTRUCTIONS.md)
* [Beschrijving](#beschrijving)
* [Gebruik](#gebruik)
* [Kenmerken](#kenmerken)
* [Bronnen](#bronnen)
* [Licentie](#licentie)

## Beschrijving

Voor Sprint 1 is er de opdracht gegeven om een Squad Page te ontwerpen in groepen van drie personen. De reden voor deze Squad Page is om de visitekaartjes en interessante plekken op de Amstel Campus te laten zien op een interactieve manier.

Met behulp van foto's is er laten zien wat onze gedachtegang was tijdens dit project en welke ontwerpen er zijn gemaakt.

De pagina is responsive ontworpen en dus bereikbaar voor mobiele, tablet, en desktop gebruikers.

Hier staat de website: https://renzowille.github.io/squad-page-rmr/finalindex.html

<img width="1439" alt="squadpage" src="https://github.com/user-attachments/assets/b17df2d0-29f7-4fb2-a3b5-435c5b91b696">

_Layout van de homepage_



## Gebruik

De Squad Page kan op deze manier gebruikt worden:

KLik op de foto van de persoon van wiens visitekaartje je wilt zien, dit brengt je naar een ander tablad waar je het visitekaartje kan zien en gebruiken. Zoals je ziet, zijn alle foto's in een carousel gezet waardoor de doorloop makkelijk en clean is. Hover over een foto, en de carousel stopt met draaien voor een optimale gebruikservaring.

Voor de map van de Amstel Campus, hover over een punt op de kaart om meer informatie te kunnen zien over een interessante plek op de campus waar gewerkt kan worden.

## dingen waar we tegen aan liepen

Gebaseerd op onze schets was heel snel duidelijk voor ons dat we een bewegende achtergrond wilde om wat extra effect te creëren. Dat was gelukt door middel van een video als achtergrond te zetten maar we kwamen er al snel dat niet alle browsers de video’s registreren als achtergronden waardoor de conclusie al snel getrokken kon worden dat niet iedereen de vid zou kunnen zien als achtergrond, we hebben hiervoor een oplossing bedacht waarbij wij een screenshot hebben gemaakt van de video en die in onze code achter de video hebben geplakt. Op deze manier hebben gebruikers waarvan hun browsers niet de video kunnen ondersteunen nog steeds hetzelfde design als gebruikers waarbij hun browsers wel de video kunnen ondersteunen.

```html
<video playsinline autoplay muted loop poster="image.png" id="bgvid">
<source src="215697_small.mp4" type="video/mp4">
</video>

```


### Visitekaartjes


<img width="1440" alt="Scherm­afbeelding 2024-09-19 om 10 43 08" src="https://github.com/user-attachments/assets/21fa9bef-c3ab-4146-a3d5-46ce249219dd">


### Amstel Campus

We hebben ook de amstel campus map toegevoegd aan onze website. We hebben een leuke functie toegevoegd waar de gebouwen in de zero state blauwe puntjes zijn , met een hover hebben we kunnen creëren dat zodra je met je curser over een van de blauwe puntjes gaat informatie te voorverschijn komt over wat voor gebouw op die plek staat etc. Op deze manier word de gebruiker niet overvallen met veel informatie maar kan de gebruiker zelf bepalen wat voor informatie op dat moment willen zien.

<img width='1440' alt='schermafbeelding' src='https://github.com/RenzoWille/squad-page-rmr/blob/main/Screenshot%202024-09-20%20084119.png?raw=true'>



## Kenmerken

De website is gebouwd met [HTML](#html) en [CSS](#CSS), en [JavaScript](#JavaScript).

### HTML

Hieronder staat de basis structuur uitgelegd met de setting in de [HEAD](#HEAD) en opmaak van de [BODY](#BODY):

#### HEAD

In de `<head>` worden twee CSS file geladen. De algemene styleguide met basis settings en kleuren.
En een local CSS file met specifieke styling voor deze pagina.
```html
<link rel="stylesheet" href="finalstyles.css">
```

#### BODY

De structuur van de body is [HEADER](#HEADER), [CAROUSEL](#CAROUSEL):

##### HEADER
In de header staat de H1 titel.

##### CAROUSEL
In de carousel staan de verschillende classes de squad page aan moet voldoen om de carousel werkend te maken. Dit wordt gedaan door:
```html
<div class="carousel">
<div class="carousel-wrapper">
<div class="carousel-slide">
```

### CSS

In de CSS staat een `carousel-slide;` op de html voor een animatie wanneer de pagina wordt ingeladen dat de carousel naar links blijft bewegen door de carousel leven in te blazen.

```css
.carousel-slide {
display: flex;
flex: 1 0 calc(100% / 33); /* Elke afbeelding neemt 1/33 van de wrapper */
margin-right: 20px;
}
```
### JavaScript

In de JavaScript staat de 'carousel-slide' toepassing die zorgt dat de carousel draait.

(foto van JavaScript)

Bij de achtergrond van de tweede pagina zijn sterren op de achtergrond toegepast. Deze sterren staan elke keer op een andere plek doordat de functie 'random' is gebruikt.

<img width='1440' alt='schermafbeelding' src='https://github.com/RenzoWille/squad-page-rmr/blob/main/Screenshot%202024-09-20%20084449.png?raw=true)'>


## Bronnen

Renzo: https://renzowille.github.io/squad-page-rmr/indexrenzo.html
Riley: https://renzowille.github.io/squad-page-rmr/docs/index.html
Miel: https://renzowille.github.io/squad-page-rmr/indexMiel.html

Final:



## Licentie

This project is licensed under the terms of the [MIT license](./LICENSE).
Binary file added Screenshot 2024-09-20 084119.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Screenshot 2024-09-20 084449.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Anouar.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Anouk.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Aria.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Arman.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Daan.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Finn.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Kai.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Kate.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Kerem.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Kyan.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Luuk-2.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Luuk.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Marije.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Miel (1).JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Miel.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Mkiyas.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Nawal.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Nayome.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Rapha.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Renzo.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Reyhan.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Rick.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Squad1H-Riley.JPG
Binary file added Squad1H-Safoe.JPG
Binary file added Squad1H-Sascha.JPG
Binary file added Squad1H-Sebastiaan-2.JPG
Binary file added Squad1H-Sebastiaan.JPG
Binary file added Squad1H-Senne.JPG
Binary file added Squad1H-Sidney.JPG
Binary file added Squad1H-Sjors.JPG
Binary file added Squad1H-Stella.JPG
Binary file added amstelcampus.png
Binary file added amstelcampuss.png
Binary file added assets/Squad1H-Anouar.JPG
Binary file added assets/Squad1H-Anouk.JPG
Binary file added assets/Squad1H-Aria.JPG
Binary file added assets/Squad1H-Arman.JPG
Binary file added assets/Squad1H-Daan.JPG
Binary file added assets/Squad1H-Finn.JPG
Binary file added assets/Squad1H-Kai.JPG
Binary file added assets/Squad1H-Kate.JPG
Binary file added assets/Squad1H-Kerem.JPG
Binary file added assets/Squad1H-Kyan.JPG
Binary file added assets/Squad1H-Luuk-2.JPG
Binary file added assets/Squad1H-Luuk.JPG
Binary file added assets/Squad1H-Marije.JPG
Binary file added assets/Squad1H-Miel.JPG
Binary file added assets/Squad1H-Mkiyas.JPG
Binary file added assets/Squad1H-Nawal.JPG
Binary file added assets/Squad1H-Nayome.JPG
Binary file added assets/Squad1H-Rapha.JPG
Binary file added assets/Squad1H-Renzo.JPG
Binary file added assets/Squad1H-Reyhan.JPG
Binary file added assets/Squad1H-Rick.JPG
Binary file added assets/Squad1H-Riley.JPG
Binary file added assets/Squad1H-Safoe.JPG
Binary file added assets/Squad1H-Sascha.JPG
Binary file added assets/Squad1H-Sebastiaan-2.JPG
Binary file added assets/Squad1H-Sebastiaan.JPG
Binary file added assets/Squad1H-Senne.JPG
Binary file added assets/Squad1H-Sidney.JPG
Binary file added assets/Squad1H-Sjors.JPG
Binary file added assets/Squad1H-Stella.JPG
Binary file added assets/Squad1H-Suleyman.JPG
Binary file added assets/Squad1H-Tessa.JPG
Binary file added assets/Squad1H-Yamen.JPG
Binary file added assets/illu map hva-01.png
Binary file added assets/space-background.jpg
Binary file added button down.png
Binary file added button.png
34 changes: 34 additions & 0 deletions docs/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Colorful Circles Background</title>
<!-- Link to CSS file -->
<link rel="stylesheet" href="styles.css">
</head>
<body>
<!-- Background Circles -->
<div class="circle circle1"></div>
<div class="circle circle2"></div>
<div class="circle circle3"></div>
<div class="circle circle4"></div>
<div class="circle circle5"></div>

<!-- Header Section -->
<header>
<h1>FDND squad page</h1>
</header>

<!-- Main Content Section -->
<main>
<p>Meet our squad.</p>
</main>

<!-- Footer Section -->
<footer>
<p>&copy; 2024 FDND program. All rights reserved.</p>
</footer>
</body>
</html>
91 changes: 91 additions & 0 deletions docs/styles.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
/* Reset default browser styling */
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}

/* Set the background color of the entire page to white */
body {
background-color: white;
color: #333; /* Default text color */
font-family: Arial, sans-serif;
padding: 20px;
overflow-x: hidden; /* Prevent horizontal scroll */
position: relative; /* To position the background circles */
}

/* Header styling */
header {
text-align: center;
margin-bottom: 40px;
z-index: 10; /* Higher z-index to ensure it stays above the circles */
position: relative; /* Relative positioning to keep it above the circles */
}

/* Main content styling */
main {
text-align: center;
margin-bottom: 40px;
z-index: 10; /* Higher z-index to ensure it stays above the circles */
position: relative; /* Relative positioning to keep it above the circles */
}

/* Footer styling */
footer {
text-align: center;
margin-top: 40px;
font-size: 0.9em;
color: #666;
z-index: 10; /* Higher z-index to ensure it stays above the circles */
position: relative; /* Relative positioning to keep it above the circles */
}

/* Circle styles */
.circle {
position: fixed; /* Fixed to stay visible while scrolling */
border-radius: 50%;
z-index: 1; /* Lower z-index to stay behind other content */
opacity: 0.5; /* Slight transparency for a soft look */
}

/* Specific circles with different sizes and colors */
.circle1 {
width: 300px;
height: 300px;
background-color: #a2d5f2; /* Pastel blue */
top: 10%;
left: 5%;
}

.circle2 {
width: 500px;
height: 500px;
background-color: #c4aedb; /* Pastel purple */
top: 50%;
left: 15%;
}

.circle3 {
width: 150px;
height: 150px;
background-color: #b1e5d3; /* Pastel green */
top: 30%;
left: 75%;
}

.circle4 {
width: 100px;
height: 100px;
background-color: #d4b5ff; /* Another pastel purple */
top: 75%;
left: 80%;
}

.circle5 {
width: 200px;
height: 200px;
background-color: #f3d5b5; /* Pastel peach */
top: 20%;
left: 50%;
}
Loading