Skip to content

Commit f7e46c9

Browse files
happytodevhappytodev
committed
Merge branch 'release/v1.2'
2 parents dc57e26 + 7de7ea2 commit f7e46c9

File tree

14 files changed

+544
-122
lines changed

14 files changed

+544
-122
lines changed

‎.env.dusk.local‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
APP_NAME="Laravel Todolist"
2+
APP_ENV=local
3+
APP_KEY=base64:GZdZiQ15ja8exqfkRmH33F3c79XwRSUOSxG25bo96eM=
4+
APP_DEBUG=true
5+
APP_URL=http://laravel-todo.test:8080
6+
7+
LOG_CHANNEL=stack
8+
9+
DB_CONNECTION=mysql
10+
DB_HOST=127.0.0.1
11+
DB_PORT=3306
12+
DB_DATABASE=laravel-todo-dusk
13+
DB_USERNAME=root
14+
DB_PASSWORD=
15+
16+
BROADCAST_DRIVER=log
17+
CACHE_DRIVER=file
18+
QUEUE_CONNECTION=sync
19+
SESSION_DRIVER=file
20+
SESSION_LIFETIME=120
21+
22+
REDIS_HOST=127.0.0.1
23+
REDIS_PASSWORD=null
24+
REDIS_PORT=6379
25+
26+
MAIL_DRIVER=log
27+
MAIL_HOST=smtp.mailtrap.io
28+
MAIL_PORT=2525
29+
MAIL_USERNAME=null
30+
MAIL_PASSWORD=null
31+
MAIL_ENCRYPTION=null
32+
MAIL_FROM_ADDRESS=null
33+
MAIL_FROM_NAME="${APP_NAME}"
34+
35+
AWS_ACCESS_KEY_ID=
36+
AWS_SECRET_ACCESS_KEY=
37+
AWS_DEFAULT_REGION=us-east-1
38+
AWS_BUCKET=
39+
40+
PUSHER_APP_ID=
41+
PUSHER_APP_KEY=
42+
PUSHER_APP_SECRET=
43+
PUSHER_APP_CLUSTER=mt1
44+
45+
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
46+
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

‎README.md‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,16 @@
11
# Laravel Todo
2+
3+
## Release notes
4+
5+
### Version 1.2
6+
7+
- Add a basic static home page
8+
9+
### Version 1.1
10+
11+
- Add authentication
12+
13+
### Version 1.0
14+
15+
- Laravel installation
16+

‎composer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"require-dev": {
1818
"facade/ignition": "^1.4",
1919
"fzaninotto/faker": "^1.4",
20+
"laravel/dusk": "^5.9",
2021
"mockery/mockery": "^1.0",
2122
"nunomaduro/collision": "^3.0",
2223
"phpunit/phpunit": "^8.0"

‎composer.lock‎

Lines changed: 134 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎resources/views/layouts/app.blade.php‎

Lines changed: 41 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!doctype html>
22
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
3+
34
<head>
45
<meta charset="utf-8">
56
<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -18,15 +19,20 @@
1819

1920
<!-- Styles -->
2021
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
22+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css"
23+
integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
2124
</head>
25+
2226
<body>
2327
<div id="app">
24-
<nav class="navbar navbar-expand-md navbar-light bg-white shadow-sm">
28+
<nav class="navbar navbar-expand-md navbar-dark bg-primary shadow-sm">
2529
<div class="container">
2630
<a class="navbar-brand" href="{{ url('/') }}">
2731
{{ config('app.name', 'Laravel') }}
2832
</a>
29-
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
33+
<button class="navbar-toggler" type="button" data-toggle="collapse"
34+
data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false"
35+
aria-label="{{ __('Toggle navigation') }}">
3036
<span class="navbar-toggler-icon"></span>
3137
</button>
3238

@@ -40,32 +46,33 @@
4046
<ul class="navbar-nav ml-auto">
4147
<!-- Authentication Links -->
4248
@guest
43-
<li class="nav-item">
44-
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
45-
</li>
46-
@if (Route::has('register'))
47-
<li class="nav-item">
48-
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
49-
</li>
50-
@endif
49+
<li class="nav-item">
50+
<a class="nav-link" href="{{ route('login') }}">{{ __('Login') }}</a>
51+
</li>
52+
@if (Route::has('register'))
53+
<li class="nav-item">
54+
<a class="nav-link" href="{{ route('register') }}">{{ __('Register') }}</a>
55+
</li>
56+
@endif
5157
@else
52-
<li class="nav-item dropdown">
53-
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
54-
{{ Auth::user()->name }} <span class="caret"></span>
55-
</a>
58+
<li class="nav-item dropdown">
59+
<a id="navbarDropdown" class="nav-link dropdown-toggle" href="#" role="button"
60+
data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" v-pre>
61+
{{ Auth::user()->name }} <span class="caret"></span>
62+
</a>
5663

57-
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
58-
<a class="dropdown-item" href="{{ route('logout') }}"
59-
onclick="event.preventDefault();
64+
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="navbarDropdown">
65+
<a class="dropdown-item" href="{{ route('logout') }}" onclick="event.preventDefault();
6066
document.getElementById('logout-form').submit();">
61-
{{ __('Logout') }}
62-
</a>
67+
{{ __('Logout') }}
68+
</a>
6369

64-
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
65-
@csrf
66-
</form>
67-
</div>
68-
</li>
70+
<form id="logout-form" action="{{ route('logout') }}" method="POST"
71+
style="display: none;">
72+
@csrf
73+
</form>
74+
</div>
75+
</li>
6976
@endguest
7077
</ul>
7178
</div>
@@ -76,5 +83,15 @@
7683
@yield('content')
7784
</main>
7885
</div>
86+
{{-- <script src="https://code.jquery.com/jquery-3.4.1.slim.min.js"
87+
integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous">
88+
</script> --}}
89+
{{-- <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
90+
integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous">
91+
</script>
92+
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js"
93+
integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous">
94+
</script> --}}
7995
</body>
96+
8097
</html>

0 commit comments

Comments
 (0)