From 31c1648597505e2e71d3da0b4b811d204fa50600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20Kv=C3=A1=C4=8Dek?= <michal@binarity.cz>
Date: Sat, 2 Apr 2016 16:56:53 +0200
Subject: [PATCH] FEATURE #1530: make urls without /public

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.
---
 .htaccess                                       | 17 +++++++++++++++++
 app/Http/routes.php                             |  6 +++---
 server.php => index.php                         |  0
 .../views/admin/content/editForm.blade.php      |  2 +-
 resources/views/admin/content/newForm.blade.php |  2 +-
 .../views/admin/fileManager/edit.blade.php      |  4 ++--
 resources/views/admin/layout.blade.php          | 14 +++++++-------
 resources/views/admin/loginForm/form.blade.php  | 10 +++++-----
 .../views/admin/snippets/aceEditor.blade.php    |  2 +-
 .../visitor/default_theme/errorLayout.blade.php |  6 +++---
 .../visitor/default_theme/layout.blade.php      |  6 +++---
 resources/views/visitor/errorLayout.blade.php   |  6 +++---
 resources/views/visitor/layout.blade.php        |  6 +++---
 13 files changed, 49 insertions(+), 32 deletions(-)
 create mode 100644 .htaccess
 rename server.php => index.php (100%)

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 00000000..041d6c43
--- /dev/null
+++ b/.htaccess
@@ -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 /\..*$
\ No newline at end of file
diff --git a/app/Http/routes.php b/app/Http/routes.php
index 7a3bf86b..c2f3407e 100644
--- a/app/Http/routes.php
+++ b/app/Http/routes.php
@@ -254,17 +254,17 @@ Route::group([
 
 Route::group(['middleware' => ['web']], function () {
 
-    Route::get('', 'Visitor\Homepage@getIndex')
+    Route::get('/', 'Visitor\Homepage@getIndex')
          ->name('page.index');
 
     // display login form
-    Route::get('login', function () {
+    Route::get('admin/login', function () {
         return view('admin.loginForm.form');
     })
          ->name('loginForm');
 
     // handle login
-    Route::post('login', 'Admin\Login@postLogin')
+    Route::post('admin/login', 'Admin\Login@postLogin')
          ->name('login');
 
     // route for all content pages. This rule must be specified last (because it matches every route)
diff --git a/server.php b/index.php
similarity index 100%
rename from server.php
rename to index.php
diff --git a/resources/views/admin/content/editForm.blade.php b/resources/views/admin/content/editForm.blade.php
index f0319dd6..643b8a1f 100644
--- a/resources/views/admin/content/editForm.blade.php
+++ b/resources/views/admin/content/editForm.blade.php
@@ -29,7 +29,7 @@
 </form>
 
 @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">
         CKEDITOR.replace ('pageContent');
diff --git a/resources/views/admin/content/newForm.blade.php b/resources/views/admin/content/newForm.blade.php
index e7d516b6..0d5485c2 100644
--- a/resources/views/admin/content/newForm.blade.php
+++ b/resources/views/admin/content/newForm.blade.php
@@ -23,7 +23,7 @@
 </form>
 
 @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">
         CKEDITOR.replace ('pageContent');
diff --git a/resources/views/admin/fileManager/edit.blade.php b/resources/views/admin/fileManager/edit.blade.php
index 9d3352f2..cb716492 100644
--- a/resources/views/admin/fileManager/edit.blade.php
+++ b/resources/views/admin/fileManager/edit.blade.php
@@ -44,12 +44,12 @@
 @stop
 
 @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
 
 @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">
         hljs.initHighlightingOnLoad();
diff --git a/resources/views/admin/layout.blade.php b/resources/views/admin/layout.blade.php
index 7bd0865c..a99bb576 100644
--- a/resources/views/admin/layout.blade.php
+++ b/resources/views/admin/layout.blade.php
@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     @yield('head_meta')
     <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/font-awesome.min.css')}}" />
-    <link rel="stylesheet" href="{{asset('../resources/assets/css/admin.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/admin.css')}}" />
     @yield('head_stylesheets')
 </head>
 <body class="admin">
@@ -51,10 +51,10 @@
         &copy; {{$pageName}} {{date('Y')}}
     </footer>
 </div>
-<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/foundation.min.js')}}"></script>
-<script src="{{asset('../resources/assets/js/app.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/foundation.min.js')}}"></script>
+<script src="{{asset('resources/assets/js/app.js')}}"></script>
 
 @yield('javascripts')
 </body>
diff --git a/resources/views/admin/loginForm/form.blade.php b/resources/views/admin/loginForm/form.blade.php
index b66d361d..a9267e30 100644
--- a/resources/views/admin/loginForm/form.blade.php
+++ b/resources/views/admin/loginForm/form.blade.php
@@ -5,8 +5,8 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <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/admin.css')}}" />
+    <link rel="stylesheet" href="{{asset('/resources/assets/css/foundation.css')}}" />
+    <link rel="stylesheet" href="{{asset('/resources/assets/css/admin.css')}}" />
 </head>
 <body>
 
@@ -66,9 +66,9 @@
         </div>
     </div>
 
-    <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/foundation.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/foundation.min.js')}}"></script>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/resources/views/admin/snippets/aceEditor.blade.php b/resources/views/admin/snippets/aceEditor.blade.php
index c746d8c3..bd7f7aad 100644
--- a/resources/views/admin/snippets/aceEditor.blade.php
+++ b/resources/views/admin/snippets/aceEditor.blade.php
@@ -5,7 +5,7 @@
 </div>
 
 @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">
         var editor = ace.edit("{{$name}}Editor");
diff --git a/resources/views/visitor/default_theme/errorLayout.blade.php b/resources/views/visitor/default_theme/errorLayout.blade.php
index 59063134..cac905e3 100644
--- a/resources/views/visitor/default_theme/errorLayout.blade.php
+++ b/resources/views/visitor/default_theme/errorLayout.blade.php
@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     @yield('head_meta')
     <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/font-awesome.min.css')}}" />
-    <link rel="stylesheet" href="{{asset('../resources/assets/css/admin.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/admin.css')}}" />
     @yield('head_stylesheets')
 
     <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
diff --git a/resources/views/visitor/default_theme/layout.blade.php b/resources/views/visitor/default_theme/layout.blade.php
index 914c304e..9f7c452d 100755
--- a/resources/views/visitor/default_theme/layout.blade.php
+++ b/resources/views/visitor/default_theme/layout.blade.php
@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     @yield('head_meta')
     <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/font-awesome.min.css')}}" />
-    <link rel="stylesheet" href="{{asset('../resources/assets/css/admin.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/admin.css')}}" />
     @yield('head_stylesheets')
 
     <style>
diff --git a/resources/views/visitor/errorLayout.blade.php b/resources/views/visitor/errorLayout.blade.php
index 59063134..cac905e3 100644
--- a/resources/views/visitor/errorLayout.blade.php
+++ b/resources/views/visitor/errorLayout.blade.php
@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     @yield('head_meta')
     <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/font-awesome.min.css')}}" />
-    <link rel="stylesheet" href="{{asset('../resources/assets/css/admin.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/admin.css')}}" />
     @yield('head_stylesheets')
 
     <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">
diff --git a/resources/views/visitor/layout.blade.php b/resources/views/visitor/layout.blade.php
index 59063134..cac905e3 100644
--- a/resources/views/visitor/layout.blade.php
+++ b/resources/views/visitor/layout.blade.php
@@ -6,9 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     @yield('head_meta')
     <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/font-awesome.min.css')}}" />
-    <link rel="stylesheet" href="{{asset('../resources/assets/css/admin.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/admin.css')}}" />
     @yield('head_stylesheets')
 
     <link href="https://fonts.googleapis.com/css?family=Lato:100" rel="stylesheet" type="text/css">