minicms/core
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FEATURE #1530: make urls without /public

Browse Source 
This change consist in renaming server.php to index.php, tweaking /.htaccess and replacing all asset('../resources....') with asset('resource/...') path. Everything should work fine now.
This commit is contained in:
Michal Kváček
2016-04-02 16:56:53 +02:00
parent 7bb63aca3f
commit 31c1648597
13 changed files with 49 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.htaccess
+17
View File
@@ -0,0 +1,17 @@
RewriteEngine On
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)/$ /$1 [L,R=301]
RewriteCond %{REQUEST_URI} !(\.css|\.js|\.png|\.jpg|\.gif|robots\.txt)$ [NC]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule ^ index.php [L]
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_URI} !^/public/
RewriteRule ^(css|js|images)/(.*)$ public/$1/$2 [L,NC]
#disable viewing all hiden files
RedirectMatch 403 /\..*$
app/Http/routes.php
+3 -3
View File
@@ -254,17 +254,17 @@ Route::group([
Route::group(['middleware' => ['web']], function () { Route::group(['middleware' => ['web']], function () {
Route::get('', 'Visitor\Homepage@getIndex') Route::get('/', 'Visitor\Homepage@getIndex')
->name('page.index'); ->name('page.index');
// display login form // display login form
Route::get('login', function () { Route::get('admin/login', function () {
return view('admin.loginForm.form'); return view('admin.loginForm.form');
}) })
->name('loginForm'); ->name('loginForm');
// handle login // handle login
Route::post('login', 'Admin\Login@postLogin') Route::post('admin/login', 'Admin\Login@postLogin')
->name('login'); ->name('login');
// route for all content pages. This rule must be specified last (because it matches every route) // route for all content pages. This rule must be specified last (because it matches every route)
server.php → index.php
View File
resources/views/admin/content/editForm.blade.php
+1 -1
View File
@@ -29,7 +29,7 @@
</form> </form>
@section('javascripts') @section('javascripts')
<script src="{{asset('../resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script> <script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript"> <script type="application/javascript">
CKEDITOR.replace ('pageContent'); CKEDITOR.replace ('pageContent');
resources/views/admin/content/newForm.blade.php
+1 -1
View File
@@ -23,7 +23,7 @@
</form> </form>
@section('javascripts') @section('javascripts')
<script src="{{asset('../resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script> <script src="{{asset('/resources/assets/js/vendor/ckeditor/ckeditor.js')}}"></script>
<script type="application/javascript"> <script type="application/javascript">
CKEDITOR.replace ('pageContent'); CKEDITOR.replace ('pageContent');
resources/views/admin/fileManager/edit.blade.php
+2 -2
View File
@@ -44,12 +44,12 @@
@stop @stop
@section('head_stylesheets') @section('head_stylesheets')
<link rel="stylesheet" href="{{asset('../resources/assets/js/vendor/highlightjs/style/default.css')}}"> <link rel="stylesheet" href="{{asset('/resources/assets/js/vendor/highlightjs/style/default.css')}}">
@stop @stop
@section('javascripts') @section('javascripts')
<script type="text/javascript" src="{{asset('../resources/assets/js/vendor/highlightjs/highlight.min.js')}}"></script> <script type="text/javascript" src="{{asset('/resources/assets/js/vendor/highlightjs/highlight.min.js')}}"></script>
<script type="text/javascript"> <script type="text/javascript">
hljs.initHighlightingOnLoad(); hljs.initHighlightingOnLoad();
resources/views/admin/layout.blade.php
+7 -7
View File
@@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@yield('head_meta') @yield('head_meta')
<title>@yield('pageName', @trans('admin/common.admin')) | {{$pageName}}</title> <title>@yield('pageName', @trans('admin/common.admin')) | {{$pageName}}</title>
<link rel="stylesheet" href="{{asset('../resources/assets/css/foundation.min.css')}}" /> <link rel="stylesheet" href="{{asset('resources/assets/css/foundation.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/font-awesome.min.css')}}" /> <link rel="stylesheet" href="{{asset('resources/assets/css/font-awesome.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/admin.css')}}" /> <link rel="stylesheet" href="{{asset('resources/assets/css/admin.css')}}" />
@yield('head_stylesheets') @yield('head_stylesheets')
</head> </head>
<body class="admin"> <body class="admin">
@@ -51,10 +51,10 @@
&copy; {{$pageName}} {{date('Y')}} &copy; {{$pageName}} {{date('Y')}}
</footer> </footer>
</div> </div>
<script src="{{asset('../resources/assets/js/vendor/jquery.min.js')}}"></script> <script src="{{asset('resources/assets/js/vendor/jquery.min.js')}}"></script>
<script src="{{asset('../resources/assets/js/vendor/what-input.min.js')}}"></script> <script src="{{asset('resources/assets/js/vendor/what-input.min.js')}}"></script>
<script src="{{asset('../resources/assets/js/foundation.min.js')}}"></script> <script src="{{asset('resources/assets/js/foundation.min.js')}}"></script>
<script src="{{asset('../resources/assets/js/app.js')}}"></script> <script src="{{asset('resources/assets/js/app.js')}}"></script>
@yield('javascripts') @yield('javascripts')
</body> </body>
resources/views/admin/loginForm/form.blade.php
+5 -5
View File
@@ -5,8 +5,8 @@
<meta http-equiv="x-ua-compatible" content="ie=edge"> <meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>@lang('admin/loginForm.login') | {{$pageName}}</title> <title>@lang('admin/loginForm.login') | {{$pageName}}</title>
<link rel="stylesheet" href="{{asset('../resources/assets/css/foundation.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/foundation.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/admin.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/admin.css')}}" />
</head> </head>
<body> <body>
@@ -66,9 +66,9 @@
</div> </div>
</div> </div>
<script src="{{asset('../resources/assets/js/vendor/jquery.min.js')}}"></script> <script src="{{asset('/resources/assets/js/vendor/jquery.min.js')}}"></script>
<script src="{{asset('../resources/assets/js/vendor/what-input.min.js')}}"></script> <script src="{{asset('/resources/assets/js/vendor/what-input.min.js')}}"></script>
<script src="{{asset('../resources/assets/js/foundation.min.js')}}"></script> <script src="{{asset('/resources/assets/js/foundation.min.js')}}"></script>
</body> </body>
</html> </html>
resources/views/admin/snippets/aceEditor.blade.php
+1 -1
View File
@@ -5,7 +5,7 @@
</div> </div>
@section('javascripts') @section('javascripts')
<script src="{{asset('../resources/assets/js/vendor/ace/ace.js')}}"></script> <script src="{{asset('resources/assets/js/vendor/ace/ace.js')}}"></script>
<script type="application/javascript"> <script type="application/javascript">
var editor = ace.edit("{{$name}}Editor"); var editor = ace.edit("{{$name}}Editor");
resources/views/visitor/default_theme/errorLayout.blade.php
+3 -3
View File
@@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@yield('head_meta') @yield('head_meta')
<title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title> <title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title>
<link rel="stylesheet" href="{{asset('../resources/assets/css/foundation.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/foundation.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/font-awesome.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/font-awesome.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/admin.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/admin.css')}}" />
@yield('head_stylesheets') @yield('head_stylesheets')
<link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
resources/views/visitor/default_theme/layout.blade.php
+3 -3
View File
@@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@yield('head_meta') @yield('head_meta')
<title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title> <title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title>
<link rel="stylesheet" href="{{asset('../resources/assets/css/foundation.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/foundation.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/font-awesome.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/font-awesome.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/admin.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/admin.css')}}" />
@yield('head_stylesheets') @yield('head_stylesheets')
<style> <style>
resources/views/visitor/errorLayout.blade.php
+3 -3
View File
@@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@yield('head_meta') @yield('head_meta')
<title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title> <title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title>
<link rel="stylesheet" href="{{asset('../resources/assets/css/foundation.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/foundation.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/font-awesome.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/font-awesome.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/admin.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/admin.css')}}" />
@yield('head_stylesheets') @yield('head_stylesheets')
<link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
resources/views/visitor/layout.blade.php
+3 -3
View File
@@ -6,9 +6,9 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@yield('head_meta') @yield('head_meta')
<title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title> <title>@yield('pageName', @trans('visitor/common.welcome')) | {{$pageName}}</title>
<link rel="stylesheet" href="{{asset('../resources/assets/css/foundation.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/foundation.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/font-awesome.min.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/font-awesome.min.css')}}" />
<link rel="stylesheet" href="{{asset('../resources/assets/css/admin.css')}}" /> <link rel="stylesheet" href="{{asset('/resources/assets/css/admin.css')}}" />
@yield('head_stylesheets') @yield('head_stylesheets')
<link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">