mirror of
https://github.com/supanadit/short-url.git
synced 2024-11-10 01:52:20 +00:00
Beautify code
This commit is contained in:
Supan Adit Pratama
parent
bc6e86d717
commit
f5318a6942
@ -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;
|
||||
}
|
||||
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="csrf_token" content="{{ csrf_token() }}"/>
|
||||
<meta name="csrf_token" content="{{ csrf_token() }}" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>Short URL</title>
|
||||
<link rel="shortcut icon" href="{{asset('favicon.png')}}"/>
|
||||
<link rel="shortcut icon" href="{{asset('favicon.png')}}" />
|
||||
<!-- Tell the browser to be responsive to screen width -->
|
||||
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
@ -32,8 +33,9 @@
|
||||
<link rel="stylesheet"
|
||||
href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
|
||||
</head>
|
||||
|
||||
<body class="hold-transition login-page">
|
||||
<div class="login-box">
|
||||
<div class="login-box">
|
||||
<div class="login-logo">
|
||||
<a href="/"><b>Short</b> URL</a>
|
||||
</div>
|
||||
@ -41,40 +43,36 @@
|
||||
<div class="login-box-body">
|
||||
<p class="login-box-msg">Expired</p>
|
||||
<p>
|
||||
I am sorry, the link is expired, so please just back to the homepage, or if you own the link just regenerate
|
||||
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.
|
||||
</p>
|
||||
<div class="input-group">
|
||||
<input type="text"
|
||||
class="form-control"
|
||||
placeholder="Generated URL"
|
||||
id="generated-url-field"
|
||||
value="{{$url}}"
|
||||
readonly>
|
||||
<input type="text" class="form-control" placeholder="Generated URL" id="generated-url-field"
|
||||
value="{{$url}}" readonly>
|
||||
<span class="input-group-btn">
|
||||
<button type="button" class="btn btn-danger btn-flat"
|
||||
data-clipboard-target="#generated-url-field">
|
||||
<button type="button" class="btn btn-danger btn-flat" data-clipboard-target="#generated-url-field">
|
||||
<i class="fa fa-clipboard"></i>
|
||||
</button>
|
||||
</span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.login-box-body -->
|
||||
</div>
|
||||
<!-- /.login-box -->
|
||||
</div>
|
||||
<!-- /.login-box -->
|
||||
|
||||
<!-- jQuery 3 -->
|
||||
<script src="{{asset('vendor/jquery/dist/jquery.min.js')}}"></script>
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
<script src="{{asset('vendor/bootstrap/dist/js/bootstrap.min.js')}}"></script>
|
||||
<!-- Toastr -->
|
||||
<script src="{{asset('vendor/toastr/toastr.min.js')}}"></script>
|
||||
<!-- Clipboard -->
|
||||
<script src="{{asset('vendor/clipboard.js/dist/clipboard.min.js')}}"></script>
|
||||
<!-- iCheck -->
|
||||
<script src="{{asset('plugin/iCheck/icheck.min.js')}}"></script>
|
||||
<!-- jQuery 3 -->
|
||||
<script src="{{asset('vendor/jquery/dist/jquery.min.js')}}"></script>
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
<script src="{{asset('vendor/bootstrap/dist/js/bootstrap.min.js')}}"></script>
|
||||
<!-- Toastr -->
|
||||
<script src="{{asset('vendor/toastr/toastr.min.js')}}"></script>
|
||||
<!-- Clipboard -->
|
||||
<script src="{{asset('vendor/clipboard.js/dist/clipboard.min.js')}}"></script>
|
||||
<!-- iCheck -->
|
||||
<script src="{{asset('plugin/iCheck/icheck.min.js')}}"></script>
|
||||
|
||||
<script type="application/javascript">
|
||||
<script type="application/javascript">
|
||||
const clipboard = new ClipboardJS('.btn');
|
||||
clipboard.on('success', function (e) {
|
||||
toastr.success("URL Copied");
|
||||
@ -84,6 +82,7 @@
|
||||
clipboard.on('error', function (e) {
|
||||
toastr.failed("Cannot Copy URL");
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@ -1,29 +1,27 @@
|
||||
@extends('layout.default')
|
||||
|
||||
@section('title')
|
||||
Welcome
|
||||
Welcome
|
||||
@endsection
|
||||
|
||||
@section('subtitle')
|
||||
The Simple URL Shortener
|
||||
The Simple URL Shortener
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="box box-default">
|
||||
<div class="box box-default">
|
||||
<div class="box-body">
|
||||
<form action="/" id="shorten-url-form">
|
||||
<input type="text" class="form-control" placeholder="Enter your URL" id="shorten-url-form-field-url"/>
|
||||
<br/>
|
||||
<input type="text" class="form-control" placeholder="Enter your URL" id="shorten-url-form-field-url" />
|
||||
<br />
|
||||
<div class="form-group">
|
||||
<label>Expired Date</label>
|
||||
|
||||
<div class="input-group date">
|
||||
<div class="input-group-addon">
|
||||
<input type="checkbox" id="shorten-url-form-field-expiration-date-checkbox"/>
|
||||
<input type="checkbox" id="shorten-url-form-field-expiration-date-checkbox" />
|
||||
</div>
|
||||
<input type="text"
|
||||
class="form-control pull-right"
|
||||
id="shorten-url-form-field-expiration-date"
|
||||
<input type="text" class="form-control pull-right" id="shorten-url-form-field-expiration-date"
|
||||
placeholder="Set expired date" readonly>
|
||||
</div>
|
||||
<!-- /.input group -->
|
||||
@ -34,16 +32,14 @@
|
||||
|
||||
<div class="input-group date">
|
||||
<div class="input-group-addon">
|
||||
<input type="checkbox" id="shorten-url-form-field-password-checkbox"/>
|
||||
<input type="checkbox" id="shorten-url-form-field-password-checkbox" />
|
||||
</div>
|
||||
<input type="password"
|
||||
class="form-control pull-right"
|
||||
placeholder="Insert password"
|
||||
<input type="password" class="form-control pull-right" placeholder="Insert password"
|
||||
id="shorten-url-form-field-password">
|
||||
</div>
|
||||
<!-- /.input group -->
|
||||
</div>
|
||||
<br/>
|
||||
<br />
|
||||
<div class="row">
|
||||
<div class="col-md-2 col-sm-4">
|
||||
<button type="submit" class="btn btn-info btn-flat btn-block">
|
||||
@ -51,13 +47,10 @@
|
||||
</button>
|
||||
</div>
|
||||
<div class="col-md-10 col-sm-8">
|
||||
<br class="visible-xs"/>
|
||||
<br class="visible-xs" />
|
||||
<div class="input-group" id="shorten-url-form-field-url-generated-group" style="display: none;">
|
||||
<input type="text"
|
||||
class="form-control"
|
||||
placeholder="Generated URL"
|
||||
id="shorten-url-form-field-url-generated"
|
||||
readonly>
|
||||
<input type="text" class="form-control" placeholder="Generated URL"
|
||||
id="shorten-url-form-field-url-generated" readonly>
|
||||
<span class="input-group-btn">
|
||||
<button type="button" class="btn btn-danger btn-flat"
|
||||
data-clipboard-target="#shorten-url-form-field-url-generated">
|
||||
@ -70,12 +63,12 @@
|
||||
</form>
|
||||
</div>
|
||||
<!-- /.box-body -->
|
||||
</div>
|
||||
<!-- /.box -->
|
||||
</div>
|
||||
<!-- /.box -->
|
||||
@endsection
|
||||
|
||||
@section('js')
|
||||
<script type="application/javascript">
|
||||
<script type="application/javascript">
|
||||
const clipboard = new ClipboardJS('.btn');
|
||||
|
||||
$('#shorten-url-form-field-expiration-date').datepicker({
|
||||
@ -129,5 +122,5 @@
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@ -1,10 +1,11 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>Short URL</title>
|
||||
<link rel="shortcut icon" href="{{asset('favicon.png')}}"/>
|
||||
<link rel="shortcut icon" href="{{asset('favicon.png')}}" />
|
||||
<!-- Tell the browser to be responsive to screen width -->
|
||||
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
@ -21,8 +22,7 @@
|
||||
<link rel="stylesheet" href="{{asset('vendor/toastr/toastr.min.css')}}">
|
||||
<!-- Theme style -->
|
||||
<link rel="stylesheet" href="{{asset('dist/css/AdminLTE.min.css')}}">
|
||||
<!-- AdminLTE Skins. Choose a skin from the css/skins
|
||||
folder instead of downloading all of them to reduce the load. -->
|
||||
<!-- AdminLTE Skins. Choose a skin from the css/skins folder instead of downloading all of them to reduce the load. -->
|
||||
<link rel="stylesheet" href="{{asset('dist/css/skins/_all-skins.min.css')}}">
|
||||
|
||||
<style type="text/css">
|
||||
@ -45,16 +45,15 @@
|
||||
@yield('css')
|
||||
</head>
|
||||
<!-- ADD THE CLASS layout-top-nav TO REMOVE THE SIDEBAR. -->
|
||||
|
||||
<body class="hold-transition skin-blue layout-top-nav">
|
||||
<div class="wrapper">
|
||||
<div class="wrapper">
|
||||
<header class="main-header">
|
||||
<nav class="navbar navbar-static-top">
|
||||
<div class="container">
|
||||
<div class="navbar-header">
|
||||
<a href="/" class="navbar-brand"><b>Short</b> URL</a>
|
||||
<button type="button"
|
||||
class="navbar-toggle collapsed"
|
||||
data-toggle="collapse"
|
||||
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse"
|
||||
data-target="#navbar-collapse">
|
||||
<i class="fa fa-bars"></i>
|
||||
</button>
|
||||
@ -137,10 +136,10 @@
|
||||
</div>
|
||||
<!-- /.container -->
|
||||
</footer>
|
||||
</div>
|
||||
<!-- ./wrapper -->
|
||||
</div>
|
||||
<!-- ./wrapper -->
|
||||
|
||||
@if(Session::get('user') == null)
|
||||
@if(Session::get('user') == null)
|
||||
{{-- Forgot Password Modal --}}
|
||||
<div class="modal fade" id="forgot-password-modal">
|
||||
<div class="modal-dialog">
|
||||
@ -250,7 +249,7 @@
|
||||
</div>
|
||||
<!-- /.modal-dialog -->
|
||||
</div>
|
||||
@else
|
||||
@else
|
||||
{{-- Change Password Modal --}}
|
||||
<div class="modal fade" id="change-password-modal">
|
||||
<div class="modal-dialog">
|
||||
@ -284,32 +283,32 @@
|
||||
</div>
|
||||
<!-- /.modal-dialog -->
|
||||
</div>
|
||||
@endif
|
||||
@endif
|
||||
|
||||
<!-- jQuery 3 -->
|
||||
<script src="{{asset('vendor/jquery/dist/jquery.min.js')}}"></script>
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
<script src="{{asset('vendor/bootstrap/dist/js/bootstrap.min.js')}}"></script>
|
||||
<!-- SlimScroll -->
|
||||
<script src="{{asset('vendor/jquery-slimscroll/jquery.slimscroll.min.js')}}"></script>
|
||||
<!-- FastClick -->
|
||||
<script src="{{asset('vendor/fastclick/lib/fastclick.js')}}"></script>
|
||||
<!-- Sweet Alert -->
|
||||
<script src="{{asset('vendor/sweetalert/sweetalert.min.js')}}"></script>
|
||||
<!-- Toastr -->
|
||||
<script src="{{asset('vendor/toastr/toastr.min.js')}}"></script>
|
||||
<!-- Bootstrap Datepicker -->
|
||||
<script src="{{asset('vendor/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js')}}"></script>
|
||||
<!-- iCheck 1.0.1 -->
|
||||
<script src="{{asset('plugin/iCheck/icheck.min.js')}}"></script>
|
||||
<!-- Clipboard -->
|
||||
<script src="{{asset('vendor/clipboard.js/dist/clipboard.min.js')}}"></script>
|
||||
<!-- AdminLTE App -->
|
||||
<script src="{{asset('dist/js/adminlte.min.js')}}"></script>
|
||||
<!-- AdminLTE for demo purposes -->
|
||||
<script src="{{asset('dist/js/demo.js')}}"></script>
|
||||
<!-- jQuery 3 -->
|
||||
<script src="{{asset('vendor/jquery/dist/jquery.min.js')}}"></script>
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
<script src="{{asset('vendor/bootstrap/dist/js/bootstrap.min.js')}}"></script>
|
||||
<!-- SlimScroll -->
|
||||
<script src="{{asset('vendor/jquery-slimscroll/jquery.slimscroll.min.js')}}"></script>
|
||||
<!-- FastClick -->
|
||||
<script src="{{asset('vendor/fastclick/lib/fastclick.js')}}"></script>
|
||||
<!-- Sweet Alert -->
|
||||
<script src="{{asset('vendor/sweetalert/sweetalert.min.js')}}"></script>
|
||||
<!-- Toastr -->
|
||||
<script src="{{asset('vendor/toastr/toastr.min.js')}}"></script>
|
||||
<!-- Bootstrap Datepicker -->
|
||||
<script src="{{asset('vendor/bootstrap-datepicker/dist/js/bootstrap-datepicker.min.js')}}"></script>
|
||||
<!-- iCheck 1.0.1 -->
|
||||
<script src="{{asset('plugin/iCheck/icheck.min.js')}}"></script>
|
||||
<!-- Clipboard -->
|
||||
<script src="{{asset('vendor/clipboard.js/dist/clipboard.min.js')}}"></script>
|
||||
<!-- AdminLTE App -->
|
||||
<script src="{{asset('dist/js/adminlte.min.js')}}"></script>
|
||||
<!-- AdminLTE for demo purposes -->
|
||||
<script src="{{asset('dist/js/demo.js')}}"></script>
|
||||
|
||||
<script type="application/javascript">
|
||||
<script type="application/javascript">
|
||||
$(document).ready(function () {
|
||||
@if(Session::get('user') == null)
|
||||
$("#forgot-password-modal-save-loading-indicator").hide();
|
||||
@ -478,9 +477,10 @@
|
||||
});
|
||||
@endif
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
|
||||
@yield('js')
|
||||
@yield('js')
|
||||
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
@extends('layout.default')
|
||||
|
||||
@section('title')
|
||||
My URL Shortener
|
||||
My URL Shortener
|
||||
@endsection
|
||||
|
||||
@section('subtitle')
|
||||
List all of your own URL Shortener
|
||||
List all of your own URL Shortener
|
||||
@endsection
|
||||
|
||||
@section('content')
|
||||
<div class="box box-info">
|
||||
<div class="box box-info">
|
||||
<div class="box-header">
|
||||
<h3 class="box-title"></h3>
|
||||
|
||||
@ -45,12 +45,12 @@
|
||||
of <span id="total-entries">0</span> entries
|
||||
<ul class="pagination pagination-sm no-margin pull-right" id="pagination-button"></ul>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.box -->
|
||||
</div>
|
||||
<!-- /.box -->
|
||||
@endsection
|
||||
|
||||
@section('js')
|
||||
<script type="application/javascript">
|
||||
<script type="application/javascript">
|
||||
const clipboard = new ClipboardJS('.btn');
|
||||
|
||||
let page = 1;
|
||||
@ -186,5 +186,5 @@
|
||||
// Initialize
|
||||
loadURLAddress();
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
@endsection
|
||||
|
||||
@ -1,11 +1,12 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="csrf_token" content="{{ csrf_token() }}"/>
|
||||
<meta name="csrf_token" content="{{ csrf_token() }}" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<title>Short URL</title>
|
||||
<link rel="shortcut icon" href="{{asset('favicon.png')}}"/>
|
||||
<link rel="shortcut icon" href="{{asset('favicon.png')}}" />
|
||||
<!-- Tell the browser to be responsive to screen width -->
|
||||
<meta content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" name="viewport">
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
@ -32,8 +33,9 @@
|
||||
<link rel="stylesheet"
|
||||
href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,600,700,300italic,400italic,600italic">
|
||||
</head>
|
||||
|
||||
<body class="hold-transition login-page">
|
||||
<div class="login-box">
|
||||
<div class="login-box">
|
||||
<div class="login-logo">
|
||||
<a href="/"><b>Short</b> URL</a>
|
||||
</div>
|
||||
@ -59,18 +61,18 @@
|
||||
</form>
|
||||
</div>
|
||||
<!-- /.login-box-body -->
|
||||
</div>
|
||||
<!-- /.login-box -->
|
||||
</div>
|
||||
<!-- /.login-box -->
|
||||
|
||||
<!-- jQuery 3 -->
|
||||
<script src="{{asset('vendor/jquery/dist/jquery.min.js')}}"></script>
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
<script src="{{asset('vendor/bootstrap/dist/js/bootstrap.min.js')}}"></script>
|
||||
<!-- Toastr -->
|
||||
<script src="{{asset('vendor/toastr/toastr.min.js')}}"></script>
|
||||
<!-- iCheck -->
|
||||
<script src="{{asset('plugin/iCheck/icheck.min.js')}}"></script>
|
||||
<script>
|
||||
<!-- jQuery 3 -->
|
||||
<script src="{{asset('vendor/jquery/dist/jquery.min.js')}}"></script>
|
||||
<!-- Bootstrap 3.3.7 -->
|
||||
<script src="{{asset('vendor/bootstrap/dist/js/bootstrap.min.js')}}"></script>
|
||||
<!-- Toastr -->
|
||||
<script src="{{asset('vendor/toastr/toastr.min.js')}}"></script>
|
||||
<!-- iCheck -->
|
||||
<script src="{{asset('plugin/iCheck/icheck.min.js')}}"></script>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$("#protection-form").on("submit", function (e) {
|
||||
e.preventDefault();
|
||||
@ -96,6 +98,7 @@
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<div>
|
||||
Hi, {{ $name }}<br/>
|
||||
This is your new password : {{ $password }}<br/>
|
||||
Hi, {{ $name }}<br />
|
||||
This is your new password : {{ $password }}<br />
|
||||
<p>You can change it after login back</p>
|
||||
</div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user