Skip to content
This repository was archived by the owner on Sep 18, 2020. It is now read-only.

Commit 0c18e66

Browse files
author
Matt Fletcher
committed
Refactoring: Build on Laravel UI using macros
1 parent 35712b8 commit 0c18e66

Some content is hidden

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

52 files changed

+146
-1493
lines changed

.github/ISSUE_TEMPLATE/1_Bug_report.md

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

.github/ISSUE_TEMPLATE/2_Support_question.md

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

.github/ISSUE_TEMPLATE/3_Feature_request.md

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

.github/ISSUE_TEMPLATE/4_Documentation_issue.md

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

.github/ISSUE_TEMPLATE/5_Security_vulnerabilities.md

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

.github/PULL_REQUEST_TEMPLATE.md

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

.styleci.yml

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

SECURITY.md

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

composer.json

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,23 @@
1717
"email": "[email protected]"
1818
}
1919
],
20-
"require": {
21-
"php": "^7.1.3",
22-
"illuminate/console": "~5.8|^6.0",
23-
"illuminate/filesystem": "~5.8|^6.0",
24-
"illuminate/support": "~5.8|^6.0"
25-
},
20+
"require": {},
2621
"require-dev": {
2722
"roave/security-advisories": "dev-master",
28-
"mockery/mockery": "^1.0",
29-
"phpunit/phpunit": "^8.0"
23+
"laravel/ui": "^1.0"
3024
},
3125
"autoload": {
3226
"psr-4": {
33-
"Laravel\\Ui\\": "src/"
34-
}
35-
},
36-
"autoload-dev": {
37-
"psr-4": {
38-
"Laravel\\Ui\\Tests\\": "tests/"
27+
"Torrix\\": "src/"
3928
}
4029
},
4130
"config": {
4231
"sort-packages": true
4332
},
4433
"extra": {
45-
"branch-alias": {
46-
"dev-master": "1.x-dev"
47-
},
4834
"laravel": {
4935
"providers": [
50-
"Laravel\\Ui\\UiServiceProvider"
36+
"Torrix\\Providers\\UikitServiceProvider"
5137
]
5238
}
5339
},

phpunit.xml.dist

Lines changed: 0 additions & 25 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

src/Auth/stubs/routes.stub renamed to resources/stubs/authroutes.stub

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,3 @@
22
Auth::routes();
33

44
Route::get('/home', 'HomeController@index')->name('home');
5-
6-
Route::view('/demo', 'demo')->name('demo');

src/Auth/stubs/controllers/HomeController.stub renamed to resources/stubs/controllers/HomeController.stub

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
namespace {{namespace}}Http\Controllers;
3+
namespace App\Http\Controllers;
44

55
use Illuminate\Http\Request;
66

resources/stubs/routes.stub

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
2+
Route::view('/demo', 'demo')->name('demo');
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/Auth/uikit-stubs/layouts/app.stub renamed to resources/views/layouts/app.blade.php

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<div class="uk-background-primary uk-light">
1818
<nav class="uk-navbar-container uk-navbar-transparent">
1919
<div class="uk-container">
20-
<div class="uk-navbar" uk-navbar>
20+
<div class="uk-navbar" data-uk-navbar>
2121
<div class="uk-navbar-left">
2222
<a class="uk-navbar-item uk-logo" href="/">{{ config('app.name', 'Laravel') }}</a>
2323

@@ -26,7 +26,7 @@
2626
<li>
2727
<a href="#">Useful Links</a>
2828
<div class="uk-navbar-dropdown uk-navbar-dropdown-width-3">
29-
<div class="uk-navbar-dropdown-grid uk-child-width-1-3" uk-grid>
29+
<div class="uk-navbar-dropdown-grid uk-child-width-1-3" data-uk-grid>
3030
<div>
3131
<ul class="uk-nav uk-navbar-dropdown-nav">
3232
<li class="uk-nav-header">Laravel</li>
@@ -54,9 +54,11 @@
5454
<ul class="uk-navbar-nav">
5555
<!-- Authentication Links -->
5656
@guest
57-
<li>
58-
<a href="{{ route('login') }}">{{ __('Log In') }}</a>
59-
</li>
57+
@if (Route::has('login'))
58+
<li>
59+
<a href="{{ route('login') }}">{{ __('Log In') }}</a>
60+
</li>
61+
@endif
6062
@if (Route::has('register'))
6163
<li>
6264
<a href="{{ route('register') }}">{{ __('Register') }}</a>
@@ -69,17 +71,18 @@
6971
</a>
7072
<div class="uk-navbar-dropdown">
7173
<ul class="uk-nav uk-navbar-dropdown-nav">
72-
<li>
73-
<a href="{{ route('logout') }}"
74-
onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
75-
{{ __('Logout') }}
76-
</a>
74+
<li>
75+
<a href="{{ route('logout') }}"
76+
onclick="event.preventDefault(); document.getElementById('logout-form').submit();">
77+
{{ __('Log Out') }}
78+
</a>
7779

78-
<form id="logout-form" action="{{ route('logout') }}" method="POST"
79-
style="display: none;">
80-
@csrf
81-
</form>
82-
</li>
80+
<form id="logout-form" action="{{ route('logout') }}" method="POST"
81+
style="display: none;">
82+
@csrf
83+
</form>
84+
</li>
85+
</ul>
8386
</div>
8487
</li>
8588
@endguest
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)