odon
/
free-pmo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add agency tagline, clean up some layout views and unused classes

pull/1/head
Nafies Luthfi 8 years ago
parent
5dee6628e4
commit
0c04ea3c78
12 changed files with 22 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      app/Http/Controllers/Users/AgencyController.php
  2. 2
      app/Http/Controllers/Users/UsersController.php
  3. 33
      app/Http/Requests/Users/CreateRequest.php
  4. 1
      resources/lang/id/agency.php
  5. 4
      resources/views/auth/login.blade.php
  6. 6
      resources/views/layouts/partials/footer.blade.php
  7. 4
      resources/views/layouts/partials/sidebar.blade.php
  8. 6
      resources/views/layouts/partials/top-header.blade.php
  9. 4
      resources/views/layouts/partials/top-nav.blade.php
  10. 1
      resources/views/users/agency/edit.blade.php
  11. 1
      resources/views/users/agency/show.blade.php
  12. 5
      tests/Feature/Users/UserProfileTest.php

1
app/Http/Controllers/Users/AgencyController.php
View File

@ -20,6 +20,7 @@ class AgencyController extends Controller
public function update()
{
Option::set('agency_name', request('name'));
Option::set('agency_tagline', request('tagline'));
Option::set('agency_email', request('email'));
Option::set('agency_website', request('website'));
Option::set('agency_address', request('address'));

2
app/Http/Controllers/Users/UsersController.php
View File

@ -35,7 +35,7 @@ class UsersController extends Controller
$userData = $request->validate([
'name' => 'required|min:5',
'email' => 'required|email|unique:users,email',
'password' => 'between:6,15|confirmed',
'password' => 'nullable|between:6,15|confirmed',
'password_confirmation' => 'required_with:password',
]);

33
app/Http/Requests/Users/CreateRequest.php
View File

@ -1,33 +0,0 @@
<?php
namespace App\Http\Requests\Users;
use App\Http\Requests\Request;
class CreateRequest extends Request
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return $this->user()->can('manage_users');
}
/**
* Get the validation rules that apply to the request.
*
* @return array
*/
public function rules()
{
return [
'name' => 'required|min:5',
'email' => 'required|email|unique:users,email',
'password' => 'between:6,15|confirmed',
'password_confirmation' => 'required_with:password',
];
}
}

1
resources/lang/id/agency.php
View File

@ -13,6 +13,7 @@ return [
// Attributes
'name' => 'Nama Agensi',
'tagline' => 'Tagline Agensi',
'email' => 'Email Agensi',
'website' => 'Website Agensi',
'address' => 'Alamat Agensi',

4
resources/views/auth/login.blade.php
View File

@ -5,7 +5,7 @@
@section('content')
@include('flash::message')
<div class="login-panel col-md-4 col-md-offset-4 text-center">
{{ Html::image(url('assets/imgs/logo.png'), 'Logo '.Option::get('app_name','Aplikasi Laravel')) }}
{{ Html::image(url('assets/imgs/logo.png'), 'Logo '.Option::get('agency_name','Aplikasi Laravel')) }}
<h3>{{ Option::get('app_name','Aplikasi Laravel') }}</h3>
<div class="panel panel-default">
<div class="panel-body">
@ -26,4 +26,4 @@
</div>
</div>
</div>
@endsection
@endsection

6
resources/views/layouts/partials/footer.blade.php
View File

@ -1,7 +1,7 @@
<footer class="footer" id="footer">
<div id="copy" class="hidden-print">
Copyright <span style="font-size:16px">&copy;</span> {{ date('Y') }}
| <a href="{{ Option::get('app_owner_url','http://jasawebsitebanjarmasin.com') }}" target="_blank" title="{{ Option::get('app_tagline','Laravel app description') }}">{{ Option::get('app_owner','Aplikasi Laravel') }}</a>
| Develop by <a href="{{ url('http://jasawebsitebanjarmasin.com') }}" target="_blank" title="Jasa Website dan Aplikasi Web Banjarmasin">JWB</a>
| <a href="{{ Option::get('agency_website','http://jasawebsitebanjarmasin.com') }}" target="_blank" title="{{ Option::get('agency_tagline','Laravel app description') }}">{{ Option::get('agency_name','Aplikasi Laravel') }}</a>
| Develop by <a href="{{ url('https://jasawebsitebanjarmasin.com') }}" target="_blank" title="Jasa Website dan Aplikasi Web Banjarmasin">JWB</a>
</div>
</footer>
</footer>

4
resources/views/layouts/partials/sidebar.blade.php
View File

@ -9,8 +9,8 @@
<div class="navbar-default sidebar hidden-print" role="navigation">
<div class="sidebar-nav navbar-collapse">
<a class="navbar-brand text-center" title="Home | {{ Option::get('app_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
{!! Html::image(url('assets/imgs/logo.png'), 'Logo '.Option::get('app_name','Laravel'), ['class' => 'sidebar-logo']) !!}
<a class="navbar-brand text-center" title="Home | {{ Option::get('agency_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
{!! Html::image(url('assets/imgs/logo.png'), 'Logo '.Option::get('agency_name','Laravel'), ['class' => 'sidebar-logo']) !!}
<div class="small" style="margin-top:10px">{{ Option::get('app_name','Laravel') }}</div>
</a>
<ul class="nav" id="side-menu">

6
resources/views/layouts/partials/top-header.blade.php
View File

@ -11,8 +11,8 @@
</div>
@endif
<a class="logo-brand" title="{{ Option::get('app_name', 'Aplikasi Laravel') }}" href="{{ route('home') }}">
<img src="{{ url('assets/imgs/logo.png') }}" alt="Logo {{ Option::get('app_name', 'Aplikasi Laravel') }}" width="60px">
<h1>{{ Option::get('app_name', 'Aplikasi Laravel') }} <br><small>{{ Option::get('app_tagline', 'Tagline Aplikasi Laravel') }}</small></h1>
<img src="{{ url('assets/imgs/logo.png') }}" alt="Logo {{ Option::get('agency_name', 'Aplikasi Laravel') }}" width="60px">
<h1>{{ Option::get('app_name', 'Aplikasi Laravel') }} <br><small>{{ Option::get('agency_tagline', 'Tagline Aplikasi Laravel') }}</small></h1>
</a>
</div>
@ -23,4 +23,4 @@
Menu
</button>
</div>
</nav>
</nav>

4
resources/views/layouts/partials/top-nav.blade.php
View File

@ -5,7 +5,7 @@
<span class="sr-only">Toggle navigation</span>
Menu
</button>
<a class="navbar-brand" title="Home | {{ Option::get('app_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
<a class="navbar-brand" title="Home | {{ Option::get('agency_tagline', 'Laravel app description') }}" href="{{ route('home') }}">
{{ Option::get('app_name', 'Laravel') }}
</a>
</div>
@ -28,4 +28,4 @@
<!-- /.dropdown -->
</ul>
<!-- /.navbar-top-links -->
</nav>
</nav>

1
resources/views/users/agency/edit.blade.php
View File

@ -7,6 +7,7 @@
<div class="col-md-6 col-lg-offset-2">
{{ Form::open(['route' => 'users.agency.update', 'method' => 'patch']) }}
{!! FormField::text('name', ['value' => Option::get('agency_name')]) !!}
{!! FormField::text('tagline', ['value' => Option::get('agency_tagline')]) !!}
{!! FormField::email('email', ['value' => Option::get('agency_email')]) !!}
{!! FormField::text('website', ['value' => Option::get('agency_phone')]) !!}
{!! FormField::textarea('address', ['value' => Option::get('agency_address')]) !!}

1
resources/views/users/agency/show.blade.php
View File

@ -8,6 +8,7 @@
<div class="panel panel-default">
<table class="table">
<tr><th class="col-xs-4">{{ trans('agency.name') }}</th><td>{{ Option::get('agency_name') }}</td></tr>
<tr><th>{{ trans('agency.tagline') }}</th><td>{{ Option::get('agency_tagline') }}</td></tr>
<tr><th>{{ trans('agency.email') }}</th><td>{{ Option::get('agency_email') }}</td></tr>
<tr><th>{{ trans('agency.phone') }}</th><td>{{ Option::get('agency_phone') }}</td></tr>
<tr><th>{{ trans('agency.address') }}</th><td>{!! nl2br(Option::get('agency_address')) !!}</td></tr>

5
tests/Feature/Users/UserProfileTest.php
View File

@ -58,6 +58,7 @@ class UserProfileTest extends TestCase
$this->submitForm(trans('agency.update'), [
'name' => 'Nama Agensi Saya',
'tagline' => 'Tagline agensi saya',
'email' => 'nama_agensi@domain.com',
'address' => 'Jln. Kalimantan, No. 20, Kota',
'phone' => '081234567890',
@ -87,5 +88,9 @@ class UserProfileTest extends TestCase
'key' => 'agency_website',
'value' => 'https://example.com',
]);
$this->seeInDatabase('site_options', [
'key' => 'agency_tagline',
'value' => 'Tagline agensi saya',
]);
}
}
Write Preview
Loading…
Cancel
Save