Skip to content

Commit

Permalink
Merge pull request #3 from laravel-frontend-presets/feature/changes
Browse files Browse the repository at this point in the history
Feature/changes
  • Loading branch information
teamupdivision authored Mar 15, 2019
2 parents af154cb + 9ae64e9 commit 1a55eb1
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 20 deletions.
9 changes: 6 additions & 3 deletions src/argon-stubs/resources/views/auth/login.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

@section('content')
@include('layouts.headers.guest')

<div class="container mt--8 pb-5">
<div class="row justify-content-center">
<div class="col-lg-5 col-md-7">
Expand All @@ -22,8 +22,11 @@
</div>
<div class="card-body px-lg-5 py-lg-5">
<div class="text-center text-muted mb-4">
<small>{{ __('Or sign in with credentials') }}</small><br>
<small>You can use <strong>[email protected]</strong> and <strong>secret</strong> to loggin</small>
<small>
Create new account OR Sign in with these credentials:
<br>
Username <strong>[email protected]</strong> Password: <strong>secret</strong>
</small>
</div>
<form role="form" method="POST" action="{{ route('login') }}">
@csrf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
<div class="header-body text-center mb-7">
<div class="row justify-content-center">
<div class="col-lg-5 col-md-6">
<h1 class="text-white">{{ __('Welcome!') }}</h1>
<p class="text-lead text-light">
{{ __('Use these awesome forms to login or create new account in your project for free.') }}
</p>
<h1 class="text-white">{{ __('Welcome to Argon Dashboard FREE Laravel Live Preview.') }}</h1>
</div>
</div>
</div>
Expand Down
31 changes: 24 additions & 7 deletions src/argon-stubs/resources/views/layouts/navbars/sidebar.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,15 +84,27 @@
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('profile.edit') }}">
<i class="ni ni-single-02 text-yellow"></i> {{ __('User profile') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('user.index') }}">
<i class="ni ni-bullet-list-67 text-red"></i> {{ __('User Management') }}
<a class="nav-link active" href="#navbar-examples" data-toggle="collapse" role="button" aria-expanded="true" aria-controls="navbar-examples">
<i class="fab fa-laravel" style="color: #f4645f;"></i>
<span class="nav-link-text" style="color: #f4645f;">{{ __('Laravel Examples') }}</span>
</a>

<div class="collapse show" id="navbar-examples">
<ul class="nav nav-sm flex-column">
<li class="nav-item">
<a class="nav-link" href="{{ route('profile.edit') }}">
{{ __('User profile') }}
</a>
</li>
<li class="nav-item">
<a class="nav-link" href="{{ route('user.index') }}">
{{ __('User Management') }}
</a>
</li>
</ul>
</div>
</li>

<li class="nav-item">
<a class="nav-link" href="#">
<i class="ni ni-planet text-blue"></i> {{ __('Icons') }}
Expand All @@ -113,6 +125,11 @@
<i class="ni ni-circle-08 text-pink"></i> {{ __('Register') }}
</a>
</li>
<li class="nav-item mb-5" style="position: absolute; bottom: 0;">
<a class="nav-link" href="https://www.creative-tim.com/product/argon-dashboard-pro-laravel" target="_blank">
<i class="ni ni-cloud-download-95"></i> Upgrade to PRO
</a>
</li>
</ul>
<!-- Divider -->
<hr class="my-3">
Expand Down
9 changes: 3 additions & 6 deletions src/argon-stubs/resources/views/welcome.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,10 @@
@section('content')
<div class="header bg-gradient-primary py-7 py-lg-8">
<div class="container">
<div class="header-body text-center mb-7">
<div class="header-body text-center mt-7 mb-7">
<div class="row justify-content-center">
<div class="col-lg-5 col-md-6">
<h1 class="text-white">{{ __('Welcome!') }}</h1>
<p class="text-lead text-light">
{{ __('Use Argon theme to create a great project.') }}
</p>
<h1 class="text-white">{{ __('Welcome to Argon Dashboard FREE Laravel Live Preview.') }}</h1>
</div>
</div>
</div>
Expand All @@ -20,6 +17,6 @@
</svg>
</div>
</div>

<div class="container mt--10 pb-5"></div>
@endsection

0 comments on commit 1a55eb1

Please sign in to comment.