Skip to content

small updates #28

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.

Sign up for GitHub

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

Merged
Fridish merged 1 commit into from
Jan 12, 2024
Merged

small updates #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 modified Yrgopelag.db
View file
Open in desktop
Binary file not shown.
5 changes: 4 additions & 1 deletion events.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,12 @@
require __DIR__ . '/pageview/header.php';
require __DIR__ . '/pageview/navbar.php';
?>
<div>
<div class="eventHeader">
<h1>EVENTS</h1>
<p>Here you can find all the events that are happening at STUUGA</p>
</div>
<div>

</div>
<?php
require __DIR__ . '/pageview/footer.php';
6 changes: 3 additions & 3 deletions functions/hotelFunctions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ function addLogbook()

$vacation = [];

$vacation = json_decode(file_get_contents(__DIR__ . '/../logbook.json'), true);
$vacation = json_decode(file_get_contents(__DIR__ . '/../hotelLogbook.json'), true);

$vacation['vacation'][] = [
'guest' => $name,
Expand All @@ -240,11 +240,11 @@ function addLogbook()
'arrival_date' => $_POST['arrival'],
'departure_date' => $_POST['departure'],
'total_cost' => $_POST['orderTotal'],
'stars' => '2',
'stars' => '3',
'features' => addFeatureJson(),
'addtional_info' => "Thank you for choosing STUUGA",
'booking_id' => $_SESSION['bookingId'],
];
file_put_contents(__DIR__ . '/../logbook.json', json_encode($vacation, JSON_PRETTY_PRINT));
file_put_contents(__DIR__ . '/../hotelLogbook.json', json_encode($vacation, JSON_PRETTY_PRINT));
}
}
Empty file added hotelLogbook.json
View file
Open in desktop
Empty file.
90 changes: 2 additions & 88 deletions logbook.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,89 +1,3 @@
{
"vacation": [
{
"guest": "Rune",
"island": "Berghav",
"hotel": "STUUGA",
"arrival_date": "2024-01-03",
"departure_date": "2024-01-04",
"total_cost": "13",
"stars": "2",
"features": [
{
"name": "kayak",
"price": 5
}
],
"addtional_info": "Thank you for choosing STUUGA",
"booking_id": "31b812f9-b754-4b85-b8d1-3231c9c6b369"
},
{
"guest": "frida",
"island": "Berghav",
"hotel": "STUUGA",
"arrival_date": "2024-01-05",
"departure_date": "2024-01-06",
"total_cost": "13",
"stars": "2",
"features": [
{
"name": "kayak",
"price": 5
}
],
"addtional_info": "Thank you for choosing STUUGA",
"booking_id": "480ec049-a833-4f52-aa0b-2cf69d6223ff"
},
{
"guest": "Rune",
"island": "Berghav",
"hotel": "STUUGA",
"arrival_date": "2024-01-04",
"departure_date": "2024-01-05",
"total_cost": "17",
"stars": "2",
"features": [
{
"name": "kayak",
"price": 5
}
],
"addtional_info": "Thank you for choosing STUUGA",
"booking_id": "0effe03e-486c-480b-99ac-514b50126fe7"
},
{
"guest": "Rune",
"island": "Berghav",
"hotel": "STUUGA",
"arrival_date": "2024-01-06",
"departure_date": "2024-01-07",
"total_cost": "17",
"stars": "2",
"features": [
{
"name": "kayak",
"price": 5
}
],
"addtional_info": "Thank you for choosing STUUGA",
"booking_id": "d5c6d19b-bdf1-4199-970c-e7883ebcf4c5"
},
{
"guest": "Frida",
"island": "Berghav",
"hotel": "STUUGA",
"arrival_date": "2024-01-06",
"departure_date": "2024-01-07",
"total_cost": "13",
"stars": "2",
"features": [
{
"name": "guided tour of the island",
"price": 8
}
],
"addtional_info": "Thank you for choosing STUUGA",
"booking_id": "94a018f4-7dd4-4380-abf5-5fa831da9711"
}
]
}
"vacation": []
}
2 changes: 2 additions & 0 deletions pageview/calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<?php

declare(strict_types=1);
require __DIR__ . '/../hotelFunctions.php';
require __DIR__ . '/calendarFunctions.php';
$calendar = new Calendar();
Expand Down
1 change: 1 addition & 0 deletions pageview/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
?>
<script src="https://unpkg.com/swiper/swiper-bundle.min.js"></script>
<script src="/assets/scripts/script.js"></script>
<script src="/assets/scripts/swiper.js"></script>

</body>

Expand Down