Skip to content

Commit 643d3c0

Browse files
mitulgolakiyamitulgolakiya
authored
Merge pull request #65 from InfyOmLabs/mitul/v3
Support for AdminLTE V3 (Issues #60)
2 parents 69d3c31 + e5bfa9d commit 643d3c0

Some content is hidden

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

42 files changed

+910
-673
lines changed

‎src/AdminLTETemplatesServiceProvider.php‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace InfyOm\AdminLTETemplates;
44

5+
use Illuminate\Pagination\Paginator;
56
use Illuminate\Support\ServiceProvider;
67

78
class AdminLTETemplatesServiceProvider extends ServiceProvider
@@ -14,6 +15,9 @@ class AdminLTETemplatesServiceProvider extends ServiceProvider
1415
public function boot()
1516
{
1617
$this->loadViewsFrom(__DIR__.'/../views', 'adminlte-templates');
18+
19+
Paginator::defaultView('adminlte-templates::common.paginator');
20+
Paginator::defaultSimpleView('adminlte-templates::common.simple_paginator');
1721
}
1822

1923
/**

‎templates/scaffold/auth/email.stub‎

Lines changed: 0 additions & 87 deletions
This file was deleted.

templates/scaffold/emails/password.stub renamed to templates/scaffold/auth/emails/password.stub

File renamed without changes.

templates/scaffold/emails/password_locale.stub renamed to templates/scaffold/auth/emails/password_locale.stub

File renamed without changes.

‎templates/scaffold/auth/login.stub‎

Lines changed: 73 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,20 @@
88
<!-- Tell the browser to be responsive to screen width -->
99
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
1010

11-
<!-- Bootstrap 3.3.7 -->
12-
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css">
13-
1411
<!-- Font Awesome -->
15-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/4.7.0/css/font-awesome.min.css">
16-
17-
<!-- Ionicons -->
18-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/ionicons/2.0.1/css/ionicons.min.css">
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css"
13+
integrity="sha512-0S+nbAYis87iX26mmj/+fWt1MmaKCv80H+Mbo+Ne7ES4I6rxswpfnC6PxmLiw33Ywj2ghbtTw0FkLbMWqh4F7Q=="
14+
crossorigin="anonymous"/>
1915

20-
<!-- Theme style -->
21-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/2.4.3/css/AdminLTE.min.css">
22-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/2.4.3/css/skins/_all-skins.min.css">
16+
<!-- AdminLTE -->
17+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/3.0.5/css/adminlte.min.css"
18+
integrity="sha512-rVZC4rf0Piwtw/LsgwXxKXzWq3L0P6atiQKBNuXYRbg2FoRbSTIY0k2DxuJcs7dk4e/ShtMzglHKBOJxW8EQyQ=="
19+
crossorigin="anonymous"/>
2320

2421
<!-- iCheck -->
25-
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/iCheck/1.0.2/skins/square/_all.css">
22+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/icheck-bootstrap/3.0.1/icheck-bootstrap.min.css"
23+
integrity="sha512-8vq2g5nHE062j3xor4XxPeZiPjmRDh6wlufQlfC6pdQ/9urJkU07NM0tEREeymP++NczacJ/Q59ul+/K2eYvcg=="
24+
crossorigin="anonymous"/>
2625

2726
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
2827
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -35,75 +34,81 @@
3534
<body class="hold-transition login-page">
3635
<div class="login-box">
3736
<div class="login-logo">
38-
<a href="{{ url('/home') }}"><b>InfyOm </b>Generator</a>
37+
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
3938
</div>
4039

4140
<!-- /.login-logo -->
42-
<div class="login-box-body">
43-
<p class="login-box-msg">Sign in to start your session</p>
44-
45-
<form method="post" action="{{ url('/login') }}">
46-
@csrf
47-
48-
<div class="form-group has-feedback {{ $errors->has('email') ? ' has-error' : '' }}">
49-
<input type="email" class="form-control" name="email" value="{{ old('email') }}" placeholder="Email">
50-
<span class="glyphicon glyphicon-envelope form-control-feedback"></span>
51-
@if ($errors->has('email'))
52-
<span class="help-block">
53-
<strong>{{ $errors->first('email') }}</strong>
54-
</span>
55-
@endif
56-
</div>
57-
58-
<div class="form-group has-feedback{{ $errors->has('password') ? ' has-error' : '' }}">
59-
<input type="password" class="form-control" placeholder="Password" name="password">
60-
<span class="glyphicon glyphicon-lock form-control-feedback"></span>
61-
@if ($errors->has('password'))
62-
<span class="help-block">
63-
<strong>{{ $errors->first('password') }}</strong>
64-
</span>
65-
@endif
66-
67-
</div>
68-
<div class="row">
69-
<div class="col-xs-8">
70-
<div class="checkbox icheck">
71-
<label>
72-
<input type="checkbox" name="remember"> Remember Me
73-
</label>
41+
42+
<!-- /.login-box-body -->
43+
<div class="card">
44+
<div class="card-body login-card-body">
45+
<p class="login-box-msg">Sign in to start your session</p>
46+
47+
<form method="post" action="{{ url('/login') }}">
48+
@csrf
49+
50+
<div class="input-group mb-3">
51+
<input type="email"
52+
name="email"
53+
value="{{ old('email') }}"
54+
placeholder="Email"
55+
class="form-control @error('email') is-invalid @enderror">
56+
<div class="input-group-append">
57+
<div class="input-group-text"><span class="fas fa-envelope"></span></div>
7458
</div>
59+
@error('email')
60+
<span class="error invalid-feedback">{{ $message }}</span>
61+
@enderror
7562
</div>
76-
<!-- /.col -->
77-
<div class="col-xs-4">
78-
<button type="submit" class="btn btn-primary btn-block btn-flat">Sign In</button>
63+
64+
<div class="input-group mb-3">
65+
<input type="password"
66+
name="password"
67+
placeholder="Password"
68+
class="form-control @error('password') is-invalid @enderror">
69+
<div class="input-group-append">
70+
<div class="input-group-text">
71+
<span class="fas fa-lock"></span>
72+
</div>
73+
</div>
74+
@error('password')
75+
<span class="error invalid-feedback">{{ $message }}</span>
76+
@enderror
77+
7978
</div>
80-
<!-- /.col -->
81-
</div>
82-
</form>
8379

84-
<a href="{{ url('/password/reset') }}">I forgot my password</a><br>
85-
<a href="{{ url('/register') }}" class="text-center">Register a new membership</a>
80+
<div class="row">
81+
<div class="col-8">
82+
<div class="icheck-primary">
83+
<input type="checkbox" id="remember">
84+
<label for="remember">Remember Me</label>
85+
</div>
86+
</div>
8687

88+
<div class="col-4">
89+
<button type="submit" class="btn btn-primary btn-block">Sign In</button>
90+
</div>
91+
92+
</div>
93+
</form>
94+
95+
<p class="mb-1">
96+
<a href="{{ route('password.request') }}">I forgot my password</a>
97+
</p>
98+
<p class="mb-0">
99+
<a href="{{ route('register') }}" class="text-center">Register a new membership</a>
100+
</p>
101+
</div>
102+
<!-- /.login-card-body -->
87103
</div>
88-
<!-- /.login-box-body -->
104+
89105
</div>
90106
<!-- /.login-box -->
91107

92-
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
93-
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
94-
95108
<!-- AdminLTE App -->
96-
<script src="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/2.4.3/js/adminlte.min.js"></script>
97-
98-
<script src="https://cdnjs.cloudflare.com/ajax/libs/iCheck/1.0.2/icheck.min.js"></script>
99-
<script>
100-
$(function () {
101-
$('input').iCheck({
102-
checkboxClass: 'icheckbox_square-blue',
103-
radioClass: 'iradio_square-blue',
104-
increaseArea: '20%' // optional
105-
});
106-
});
107-
</script>
109+
<script src="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/3.0.5/js/adminlte.min.js"
110+
integrity="sha512-++c7zGcm18AhH83pOIETVReg0dr1Yn8XTRw+0bWSIWAVCAwz1s2PwnSj4z/OOyKlwSXc4RLg3nnjR22q0dhEyA=="
111+
crossorigin="anonymous"></script>
112+
108113
</body>
109114
</html>

‎templates/scaffold/auth/passwords/confirm.stub‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<!DOCTYPE html>
2+
<html>
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<title>{{ config('app.name') }}</title>
7+
8+
<!-- Tell the browser to be responsive to screen width -->
9+
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
10+
11+
<!-- Font Awesome -->
12+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.11.2/css/all.min.css"
13+
integrity="sha512-0S+nbAYis87iX26mmj/+fWt1MmaKCv80H+Mbo+Ne7ES4I6rxswpfnC6PxmLiw33Ywj2ghbtTw0FkLbMWqh4F7Q=="
14+
crossorigin="anonymous"/>
15+
16+
<!-- AdminLTE -->
17+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/3.0.5/css/adminlte.min.css"
18+
integrity="sha512-rVZC4rf0Piwtw/LsgwXxKXzWq3L0P6atiQKBNuXYRbg2FoRbSTIY0k2DxuJcs7dk4e/ShtMzglHKBOJxW8EQyQ=="
19+
crossorigin="anonymous"/>
20+
21+
<!-- iCheck -->
22+
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/icheck-bootstrap/3.0.1/icheck-bootstrap.min.css"
23+
integrity="sha512-8vq2g5nHE062j3xor4XxPeZiPjmRDh6wlufQlfC6pdQ/9urJkU07NM0tEREeymP++NczacJ/Q59ul+/K2eYvcg=="
24+
crossorigin="anonymous"/>
25+
26+
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
27+
<!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
28+
<!--[if lt IE 9]>
29+
<script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
30+
<script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
31+
<![endif]-->
32+
33+
</head>
34+
<body class="hold-transition login-page">
35+
<div class="login-box">
36+
<div class="login-logo">
37+
<a href="{{ url('/home') }}"><b>{{ config('app.name') }}</b></a>
38+
</div>
39+
40+
<div class="card">
41+
<div class="card-body login-card-body">
42+
<p class="login-box-msg">Please confirm your password before continuing.</p>
43+
44+
<form method="POST" action="{{ route('password.confirm') }}">
45+
@csrf
46+
47+
<div class="input-group mb-3">
48+
<input type="password"
49+
name="password"
50+
class="form-control @error('password') is-invalid @enderror"
51+
placeholder="Password"
52+
required autocomplete="current-password">
53+
<div class="input-group-append">
54+
<div class="input-group-text"><span class="fas fa-lock"></span></div>
55+
</div>
56+
@error('password')
57+
<span class="error invalid-feedback">{{ $message }}</span>
58+
@enderror
59+
</div>
60+
61+
62+
<div class="row">
63+
<div class="col-12">
64+
<button type="submit" class="btn btn-primary btn-block">Confirm Password</button>
65+
</div>
66+
<!-- /.col -->
67+
</div>
68+
</form>
69+
70+
<p class="mt-3 mb-1">
71+
<a href="{{ route('password.request') }}">Forgot Your Password?</a>
72+
</p>
73+
</div>
74+
<!-- /.login-card-body -->
75+
</div>
76+
77+
</div>
78+
<!-- /.login-box -->
79+
80+
<!-- AdminLTE App -->
81+
<script src="https://cdnjs.cloudflare.com/ajax/libs/admin-lte/3.0.5/js/adminlte.min.js"
82+
integrity="sha512-++c7zGcm18AhH83pOIETVReg0dr1Yn8XTRw+0bWSIWAVCAwz1s2PwnSj4z/OOyKlwSXc4RLg3nnjR22q0dhEyA=="
83+
crossorigin="anonymous"></script>
84+
85+
</body>
86+
</html>

0 commit comments

Comments
 (0)