Skip to content

Commit 1dde0d7

Browse files
mitulgolakiyamitulgolakiya
committed
Merge branch 'master' into 1.x
# Conflicts: # composer.json
2 parents 4eea4ab + 175f8cc commit 1dde0d7

File tree

13 files changed

+43
-28
lines changed

13 files changed

+43
-28
lines changed

‎README.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,25 @@ And then run,
3131
Or for production,
3232

3333
`npm install && npm run prod`
34+
35+
## Screenshots
36+
37+
### Login
38+
39+
![Login](https://raw.github.com/InfyOmLabs/laravel-ui-adminlte/master/screenshots/Login.png)
40+
41+
### Register
42+
43+
![Register](https://raw.github.com/InfyOmLabs/laravel-ui-adminlte/master/screenshots/Register.png)
44+
45+
### Reset Password Form
46+
47+
![Reset Password Form](https://raw.github.com/InfyOmLabs/laravel-ui-adminlte/master/screenshots/Reset-Password-Form.png)
48+
49+
### Reset Password
50+
51+
![Reset Password](https://raw.github.com/InfyOmLabs/laravel-ui-adminlte/master/screenshots/Reset-Password.png)
52+
53+
### Admin Layout
54+
55+
![Reset Password](https://raw.github.com/InfyOmLabs/laravel-ui-adminlte/master/screenshots/Admin-Layout.png)

‎adminlte-stubs/auth/login.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +12,7 @@
1212
integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
1313
crossorigin="anonymous"/>
1414

15-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
15+
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
1616

1717
</head>
1818
<body class="hold-transition login-page">
@@ -88,7 +88,7 @@ class="form-control @error('password') is-invalid @enderror">
8888
</div>
8989
<!-- /.login-box -->
9090

91-
<script src="{{ asset('js/app.js') }}" defer></script>
91+
<script src="{{ mix('js/app.js') }}" defer></script>
9292

9393
</body>
9494
</html>

‎adminlte-stubs/auth/passwords/confirm.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +12,7 @@
1212
integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
1313
crossorigin="anonymous"/>
1414

15-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
15+
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
1616

1717
</head>
1818
<body class="hold-transition login-page">
@@ -60,7 +60,7 @@ class="form-control{{ $errors->has('password') ? ' is-invalid' : '' }}"
6060

6161
</div>
6262

63-
<script src="{{ asset('js/app.js') }}" defer></script>
63+
<script src="{{ mix('js/app.js') }}" defer></script>
6464

6565
</body>
6666
</html>

‎adminlte-stubs/auth/passwords/email.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +12,7 @@
1212
integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
1313
crossorigin="anonymous"/>
1414

15-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
15+
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
1616

1717
</head>
1818
<body class="hold-transition login-page">
@@ -68,7 +68,7 @@ class="form-control{{ $errors->has('email') ? ' is-invalid' : '' }}"
6868
</div>
6969
<!-- /.login-box -->
7070

71-
<script src="{{ asset('js/app.js') }}" defer></script>
71+
<script src="{{ mix('js/app.js') }}" defer></script>
7272

7373
</body>
7474
</html>

‎adminlte-stubs/auth/passwords/reset.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +12,7 @@
1212
integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
1313
crossorigin="anonymous"/>
1414

15-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
15+
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
1616

1717
</head>
1818
<body class="hold-transition login-page">
@@ -86,7 +86,7 @@ class="form-control"
8686

8787
</div>
8888

89-
<script src="{{ asset('js/app.js') }}" defer></script>
89+
<script src="{{ mix('js/app.js') }}" defer></script>
9090

9191
</body>
9292
</html>

‎adminlte-stubs/auth/register.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="utf-8">
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +12,7 @@
1212
integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
1313
crossorigin="anonymous"/>
1414

15-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
15+
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
1616

1717
</head>
1818
<body class="hold-transition register-page">
@@ -111,7 +111,7 @@ class="form-control"
111111
</div>
112112
<!-- /.register-box -->
113113

114-
<script src="{{ asset('js/app.js') }}" defer></script>
114+
<script src="{{ mix('js/app.js') }}" defer></script>
115115

116116
</body>
117117
</html>

‎adminlte-stubs/layouts/app.blade.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!DOCTYPE html>
2-
<html>
2+
<html lang="en">
33
<head>
44
<meta charset="UTF-8">
55
<title>{{ config('app.name') }}</title>
@@ -9,7 +9,7 @@
99
integrity="sha512-1PKOgIY59xJ8Co8+NE6FZ+LOAZKjy+KY8iq0G4B3CyeY6wYHN3yt9PW0XpSriVlkMXe40PTKnXrLnZ9+fkDaog=="
1010
crossorigin="anonymous"/>
1111

12-
<link href="{{ asset('css/app.css') }}" rel="stylesheet">
12+
<link href="{{ mix('css/app.css') }}" rel="stylesheet">
1313

1414
@yield('third_party_stylesheets')
1515

@@ -81,7 +81,7 @@ class="img-circle elevation-2"
8181
</footer>
8282
</div>
8383

84-
<script src="{{ asset('js/app.js') }}" defer></script>
84+
<script src="{{ mix('js/app.js') }}" defer></script>
8585

8686
@yield('third_party_scripts')
8787

‎adminlte-stubs/layouts/menu.blade.php‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,7 @@
11
<!-- need to remove -->
22
<li class="nav-item">
3-
<a href="../widgets.html" class="nav-link">
4-
<i class="nav-icon fas fa-th"></i>
5-
<p>Widgets</p>
6-
</a>
7-
</li>
8-
9-
<li class="nav-item">
10-
<a href="gallery.html" class="nav-link">
11-
<i class="nav-icon far fa-image"></i>
12-
<p>Gallery</p>
3+
<a href="{{ route('home') }}" class="nav-link active">
4+
<i class="nav-icon fas fa-home"></i>
5+
<p>Home</p>
136
</a>
147
</li>

‎screenshots/Admin-Layout.png‎

54.5 KB
Loading

‎screenshots/Login.png‎

28.2 KB
Loading

0 commit comments

Comments
 (0)