diff --git a/app/Http/Controllers/UrlShortenerController.php b/app/Http/Controllers/UrlShortenerController.php index e11b169..a702e0a 100755 --- a/app/Http/Controllers/UrlShortenerController.php +++ b/app/Http/Controllers/UrlShortenerController.php @@ -100,7 +100,7 @@ class UrlShortenerController extends Controller $url = $urlAddress->url_destination; if ($httpPath == substr($url, 0, strlen($httpPath))) { $hasHttpOrHttps = true; - } else if ($httpsPath == substr($url, 0, strlen($httpsPath))) { + } elseif ($httpsPath == substr($url, 0, strlen($httpsPath))) { $hasHttpOrHttps = true; } @@ -145,7 +145,7 @@ class UrlShortenerController extends Controller $url = $urlAddress->url_destination; if ($httpPath == substr($url, 0, strlen($httpPath))) { $hasHttpOrHttps = true; - } else if ($httpsPath == substr($url, 0, strlen($httpsPath))) { + } elseif ($httpsPath == substr($url, 0, strlen($httpsPath))) { $hasHttpOrHttps = true; } diff --git a/resources/views/expired.blade.php b/resources/views/expired.blade.php index ce19f24..3870c59 100755 --- a/resources/views/expired.blade.php +++ b/resources/views/expired.blade.php @@ -1,11 +1,12 @@ + - + Short URL - + @@ -30,52 +31,49 @@ + href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic"> + -
- - -
- -

- I am sorry, the link is expired, so please just back to the homepage, or if you own the link just regenerate - the link, but if you get the link from somebody just ask to the person who share this link. -

-
- - - - + - -
- + - - - - - - - - - - + + + + + + + + + + - + + diff --git a/resources/views/home.blade.php b/resources/views/home.blade.php index c657b88..a083269 100755 --- a/resources/views/home.blade.php +++ b/resources/views/home.blade.php @@ -1,82 +1,75 @@ @extends('layout.default') @section('title') - Welcome +Welcome @endsection @section('subtitle') - The Simple URL Shortener +The Simple URL Shortener @endsection @section('content') -
-
-
- -
-
- +
+
+ + +
+
+ -
-
- -
- +
+
+
- +
- -
- + +
+ +
+ -
-
- -
- +
+
+
- +
-
-
-
- -
-
-
- + +
+
+
+
+ +
+
+
+
- -
- +
+
- + +
+ @endsection @section('js') - + @endsection diff --git a/resources/views/layout/default.blade.php b/resources/views/layout/default.blade.php index fe8360b..8290ee5 100755 --- a/resources/views/layout/default.blade.php +++ b/resources/views/layout/default.blade.php @@ -1,10 +1,11 @@ + Short URL - + @@ -21,8 +22,7 @@ - +