Skip to content
This repository was archived by the owner on Jul 5, 2023. It is now read-only.

Commit 2faa70e

Browse files
SaibamenSaibamen
authored
Merge pull request #27 from Saibamen/laravel_5.6
Laravel 5.6, Bootstrap 4
2 parents 8a45b98 + 3c08dd5 commit 2faa70e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+2270
-1129
lines changed

‎.editorconfig

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
root = true
2+
3+
[*]
4+
charset = utf-8
5+
end_of_line = lf
6+
insert_final_newline = true
7+
indent_style = space
8+
indent_size = 4
9+
trim_trailing_whitespace = true
10+
11+
[*.md]
12+
trim_trailing_whitespace = false
13+
14+
[*.yml]
15+
indent_style = space
16+
indent_size = 2

‎.env.example

+5-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@ APP_NAME=Laravel
22
APP_ENV=local
33
APP_KEY=
44
APP_DEBUG=true
5-
APP_LOG_LEVEL=debug
65
APP_URL=http://localhost
76

7+
LOG_CHANNEL=daily
8+
89
DB_CONNECTION=mysql
910
DB_HOST=127.0.0.1
1011
DB_PORT=3306
@@ -33,3 +34,6 @@ PUSHER_APP_ID=
3334
PUSHER_APP_KEY=
3435
PUSHER_APP_SECRET=
3536
PUSHER_APP_CLUSTER=mt1
37+
38+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
39+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,14 @@
44
/storage/*.key
55
/vendor
66
/.idea
7+
/.vscode
78
/.vagrant
89
Homestead.json
910
Homestead.yaml
1011
npm-debug.log
1112
yarn-error.log
1213
.env
14+
.phpunit.result.cache
1315

1416
# Created by https://www.gitignore.io/api/sublimetext,notepadpp,windows
1517

@@ -141,8 +143,6 @@ sh.exe.stackdump
141143

142144
### Own rules ###
143145
/_ide_helper.php
144-
bootstrap/cache/*
145-
!bootstrap/cache/.gitkeep
146146

147147
### Yarn 2
148148
.yarn/*

‎.travis.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
language: php
22

3-
dist: trusty
3+
dist: trusty # TODO: Migrate to xenial: https://docs.travis-ci.com/user/trusty-to-xenial-migration-guide
44

55
cache:
66
directories:
@@ -12,7 +12,6 @@ os:
1212
#- osx
1313

1414
php:
15-
- 7.0
1615
- 7.1
1716
- 7.2
1817
- 7.3
@@ -36,11 +35,12 @@ env:
3635

3736
matrix:
3837
include:
39-
- php: 7.0.0
38+
# Minimum PHP version for Laravel 5.6 is 7.1.3
39+
- php: 7.1.3
4040
dist: precise
4141
env: DB=sqlite DB_CONNECTION=sqlite
4242

43-
- php: 7.0.0
43+
- php: 7.1.3
4444
dist: precise
4545
env: DB=postgres DB_CONNECTION=pgsql
4646

@@ -50,6 +50,7 @@ addons:
5050
mariadb: '10.0'
5151

5252
before_install:
53+
#- sudo mount -o remount,size=50% /var/ramfs # https://docs.travis-ci.com/user/trusty-to-xenial-migration-guide
5354
- sh -c "if [ '$DB' = 'sqlite' ]; then echo 'Creating database'; touch database/database.sqlite; fi"
5455
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS homestead_test;' -U postgres; fi"
5556
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'CREATE DATABASE homestead_test;' -U postgres; fi"

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
[![SymfonyInsight](https://insight.symfony.com/projects/37d84994-c778-4373-94f2-a3218c22f96d/mini.svg)](https://insight.symfony.com/projects/37d84994-c778-4373-94f2-a3218c22f96d)
1010
[![codecov](https://codecov.io/gh/Saibamen/HotelManager/branch/master/graph/badge.svg)](https://codecov.io/gh/Saibamen/HotelManager)
1111

12-
Web application for managing hotel rooms, guests and reservations with flexible and responsive frontend written in [Laravel](https://laravel.com) 5.5
12+
Web application for managing hotel rooms, guests and reservations with flexible and responsive frontend written in [Laravel](https://laravel.com) 5.6
1313

1414
![All reservations](github_images/all_reservations.PNG)
1515

1616
## Requirements
1717

18-
* [PHP](http://php.net) >= 7.0.0
18+
* [PHP](http://php.net) >= 7.1.3
1919
* OpenSSL PHP Extension
2020
* PDO PHP Extension
2121
* Mbstring PHP Extension

‎app/Exceptions/Handler.php

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ class Handler extends ExceptionHandler
2929
/**
3030
* Report or log an exception.
3131
*
32-
* This is a great spot to send exceptions to Sentry, Bugsnag, etc.
33-
*
3432
* @param \Exception $exception
3533
*
3634
* @return void

‎app/Http/Kernel.php

+10-8
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ class Kernel extends HttpKernel
1414
* @var array
1515
*/
1616
protected $middleware = [
17-
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
17+
\App\Http\Middleware\CheckForMaintenanceMode::class,
1818
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
1919
\App\Http\Middleware\TrimStrings::class,
2020
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
@@ -51,12 +51,14 @@ class Kernel extends HttpKernel
5151
* @var array
5252
*/
5353
protected $routeMiddleware = [
54-
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
55-
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
56-
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
57-
'can' => \Illuminate\Auth\Middleware\Authorize::class,
58-
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
59-
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
60-
'admin' => \App\Http\Middleware\Admin::class,
54+
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
55+
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
56+
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
57+
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
58+
'can' => \Illuminate\Auth\Middleware\Authorize::class,
59+
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
60+
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
61+
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
62+
'admin' => \App\Http\Middleware\Admin::class,
6163
];
6264
}

‎app/Http/Middleware/CheckForMaintenanceMode.php

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?php
2+
3+
namespace App\Http\Middleware;
4+
5+
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
6+
7+
class CheckForMaintenanceMode extends Middleware
8+
{
9+
/**
10+
* The URIs that should be reachable while maintenance mode is enabled.
11+
*
12+
* @var array
13+
*/
14+
protected $except = [
15+
//
16+
];
17+
}

‎app/Http/Middleware/TrustProxies.php

+3-9
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,9 @@ class TrustProxies extends Middleware
1515
protected $proxies;
1616

1717
/**
18-
* The current proxy header mappings.
18+
* The headers that should be used to detect proxies.
1919
*
20-
* @var array
20+
* @var int
2121
*/
22-
protected $headers = [
23-
Request::HEADER_FORWARDED => 'FORWARDED',
24-
Request::HEADER_X_FORWARDED_FOR => 'X_FORWARDED_FOR',
25-
Request::HEADER_X_FORWARDED_HOST => 'X_FORWARDED_HOST',
26-
Request::HEADER_X_FORWARDED_PORT => 'X_FORWARDED_PORT',
27-
Request::HEADER_X_FORWARDED_PROTO => 'X_FORWARDED_PROTO',
28-
];
22+
protected $headers = Request::HEADER_X_FORWARDED_ALL;
2923
}

‎app/Models/Guest.php

+15-10
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,23 @@
1919
* @property \Illuminate\Support\Carbon $updated_at
2020
* @property-read string $full_name
2121
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Reservation[] $reservations
22+
* @property-read int|null $reservations_count
2223
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Room[] $rooms
24+
* @property-read int|null $rooms_count
2325
*
24-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereAddress($value)
25-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereContact($value)
26-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereCreatedAt($value)
27-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereFirstName($value)
28-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereId($value)
29-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereLastName($value)
30-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest wherePESEL($value)
31-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest wherePlace($value)
32-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereUpdatedAt($value)
33-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Guest whereZipCode($value)
26+
* @method static \Illuminate\Database\Eloquent\Builder|Guest newModelQuery()
27+
* @method static \Illuminate\Database\Eloquent\Builder|Guest newQuery()
28+
* @method static \Illuminate\Database\Eloquent\Builder|Guest query()
29+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereAddress($value)
30+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereContact($value)
31+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereCreatedAt($value)
32+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereFirstName($value)
33+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereId($value)
34+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereLastName($value)
35+
* @method static \Illuminate\Database\Eloquent\Builder|Guest wherePESEL($value)
36+
* @method static \Illuminate\Database\Eloquent\Builder|Guest wherePlace($value)
37+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereUpdatedAt($value)
38+
* @method static \Illuminate\Database\Eloquent\Builder|Guest whereZipCode($value)
3439
* @mixin \Eloquent
3540
*/
3641
class Guest extends Model

‎app/Models/Reservation.php

+13-10
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,19 @@
1919
* @property-read \App\Models\Guest $guest
2020
* @property-read \App\Models\Room $room
2121
*
22-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation getCurrentReservations()
23-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation getFutureReservations()
24-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereCreatedAt($value)
25-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereDateEnd($value)
26-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereDateStart($value)
27-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereGuestId($value)
28-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereId($value)
29-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation wherePeople($value)
30-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereRoomId($value)
31-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Reservation whereUpdatedAt($value)
22+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation getCurrentReservations()
23+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation getFutureReservations()
24+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation newModelQuery()
25+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation newQuery()
26+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation query()
27+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereCreatedAt($value)
28+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereDateEnd($value)
29+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereDateStart($value)
30+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereGuestId($value)
31+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereId($value)
32+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation wherePeople($value)
33+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereRoomId($value)
34+
* @method static \Illuminate\Database\Eloquent\Builder|Reservation whereUpdatedAt($value)
3235
* @mixin \Eloquent
3336
*/
3437
class Reservation extends Model

‎app/Models/Room.php

+16-11
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,24 @@
1818
* @property \Illuminate\Support\Carbon $created_at
1919
* @property \Illuminate\Support\Carbon $updated_at
2020
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Guest[] $guests
21+
* @property-read int|null $guests_count
2122
* @property-read \Illuminate\Database\Eloquent\Collection|\App\Models\Reservation[] $reservations
23+
* @property-read int|null $reservations_count
2224
*
23-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room currentlyFreeRooms()
24-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room currentlyOccupiedRooms()
25-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room freeRoomsForReservation($dateStart, $dateEnd, $people)
26-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereCapacity($value)
27-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereComment($value)
28-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereCreatedAt($value)
29-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereFloor($value)
30-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereId($value)
31-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereNumber($value)
32-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room wherePrice($value)
33-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\Room whereUpdatedAt($value)
25+
* @method static \Illuminate\Database\Eloquent\Builder|Room currentlyFreeRooms()
26+
* @method static \Illuminate\Database\Eloquent\Builder|Room currentlyOccupiedRooms()
27+
* @method static \Illuminate\Database\Eloquent\Builder|Room freeRoomsForReservation($dateStart, $dateEnd, $people)
28+
* @method static \Illuminate\Database\Eloquent\Builder|Room newModelQuery()
29+
* @method static \Illuminate\Database\Eloquent\Builder|Room newQuery()
30+
* @method static \Illuminate\Database\Eloquent\Builder|Room query()
31+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereCapacity($value)
32+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereComment($value)
33+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereCreatedAt($value)
34+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereFloor($value)
35+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereId($value)
36+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereNumber($value)
37+
* @method static \Illuminate\Database\Eloquent\Builder|Room wherePrice($value)
38+
* @method static \Illuminate\Database\Eloquent\Builder|Room whereUpdatedAt($value)
3439
* @mixin \Eloquent
3540
*/
3641
class Room extends Model

‎app/Models/User.php

+12-8
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,19 @@
1818
* @property \Illuminate\Support\Carbon $created_at
1919
* @property \Illuminate\Support\Carbon $updated_at
2020
* @property-read \Illuminate\Notifications\DatabaseNotificationCollection|\Illuminate\Notifications\DatabaseNotification[] $notifications
21+
* @property-read int|null $notifications_count
2122
*
22-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereCreatedAt($value)
23-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereEmail($value)
24-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereId($value)
25-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereIsAdmin($value)
26-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereName($value)
27-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User wherePassword($value)
28-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereRememberToken($value)
29-
* @method static \Illuminate\Database\Eloquent\Builder|\App\Models\User whereUpdatedAt($value)
23+
* @method static \Illuminate\Database\Eloquent\Builder|User newModelQuery()
24+
* @method static \Illuminate\Database\Eloquent\Builder|User newQuery()
25+
* @method static \Illuminate\Database\Eloquent\Builder|User query()
26+
* @method static \Illuminate\Database\Eloquent\Builder|User whereCreatedAt($value)
27+
* @method static \Illuminate\Database\Eloquent\Builder|User whereEmail($value)
28+
* @method static \Illuminate\Database\Eloquent\Builder|User whereId($value)
29+
* @method static \Illuminate\Database\Eloquent\Builder|User whereIsAdmin($value)
30+
* @method static \Illuminate\Database\Eloquent\Builder|User whereName($value)
31+
* @method static \Illuminate\Database\Eloquent\Builder|User wherePassword($value)
32+
* @method static \Illuminate\Database\Eloquent\Builder|User whereRememberToken($value)
33+
* @method static \Illuminate\Database\Eloquent\Builder|User whereUpdatedAt($value)
3034
* @mixin \Eloquent
3135
*/
3236
class User extends Authenticatable

‎storage/framework/cache/data/.gitignore renamed to ‎bootstrap/cache/.gitignore

File renamed without changes.

‎bootstrap/cache/.gitkeep

Whitespace-only changes.

‎composer.json

+14-11
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,24 @@
55
"license": "MIT",
66
"type": "project",
77
"require": {
8-
"php": ">=7.0.0",
9-
"fideloper/proxy": "~3.3",
10-
"fzaninotto/faker": "~1.4",
11-
"laravel/framework": "5.5.*",
12-
"laravel/tinker": "~1.0",
13-
"laravelcollective/html": "^5.5.0"
8+
"php": "^7.1.3",
9+
"fideloper/proxy": "^4.0",
10+
"fzaninotto/faker": "^1.4",
11+
"laravel/framework": "5.6.*",
12+
"laravel/tinker": "^1.0",
13+
"laravelcollective/html": "^5.6.0"
1414
},
1515
"require-dev": {
1616
"barryvdh/laravel-debugbar": "^3.0",
1717
"barryvdh/laravel-ide-helper": "^2.4",
1818
"codacy/coverage": "dev-master",
1919
"doctrine/dbal": "~2.3",
20-
"filp/whoops": "~2.0",
21-
"laravel/browser-kit-testing": "2.*",
22-
"mockery/mockery": "~1.0",
20+
"filp/whoops": "^2.0",
21+
"nunomaduro/collision": "^2.0",
22+
"laravel/browser-kit-testing": "4.*",
23+
"mockery/mockery": "^1.0",
2324
"neronmoon/scriptsdev": "^0.1.1",
24-
"phpunit/phpunit": "~6.0"
25+
"phpunit/phpunit": "^7.0"
2526
},
2627
"autoload": {
2728
"classmap": [
@@ -68,5 +69,7 @@
6869
"preferred-install": "dist",
6970
"sort-packages": true,
7071
"optimize-autoloader": true
71-
}
72+
},
73+
"minimum-stability": "dev",
74+
"prefer-stable": true
7275
}

0 commit comments

Comments
 (0)