Files modifed, images added

iamwebwiz · Nov 24, 2017 · 43bced3 · 43bced3
1 parent baee350
commit 43bced3
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 45 deletions.
diff --git a/database/seeds/TrackingsTableSeeder.php b/database/seeds/TrackingsTableSeeder.php
@@ -24,7 +24,7 @@ public function run()
  $tracking->departure_time = '08:30';
  $tracking->package = 'Silver Items';
  $tracking->carrier = 'Ferris Air';
- $tracking->weight = '400kg';
+ $tracking->weight = '400';
  $tracking->product = 'Silver Items';
  $tracking->pickup_date = '2017-11-22';
  $tracking->pickup_time = '08:30';

diff --git a/public/images/AXon.png b/public/images/AXon.png
diff --git a/public/images/boat-cargo.jpg b/public/images/boat-cargo.jpg
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -15,10 +15,19 @@
 
  <!-- JQuery -->
  <script src="{{ asset('js/jquery-3.2.1.min.js') }}"></script>
+
+ <style>
+ body {
+ background-image: url({{ url('images/boat-cargo.jpg') }});
+ background-size: cover;
+ background-repeat: no-repeat;
+ }
+ </style>
 </head>
 <body>
  <div id="app">
- <nav class="navbar navbar-default navbar-static-top">
+ <nav class="navbar navbar-default navbar-static-top"
+ style="padding-bottom:15px;">
  <div class="container">
  <div class="navbar-header">
 
@@ -32,10 +41,7 @@
 
  <!-- Branding Image -->
  <a class="navbar-brand" href="{{ url('/home') }}">
- <!-- insert the image for logo here using the format below: -->
- <!-- <img src="{{ asset('images/logo.png') }}"> -->
- <!-- the "images/logo.png" specify the file path which is located in public/images/logo.png -->
- Trackr
+ <img src="{{ asset('images/AXon.png') }}" alt="Trackr" width="120">
  </a>
  </div>
 
@@ -50,7 +56,7 @@
  <!-- Authentication Links -->
  @if (Auth::guest())
  <li><a href="{{ route('login') }}">Login</a></li>
- <li><a href="{{ route('register') }}">Register</a></li>
+ {{-- <li><a href="{{ route('register') }}">Register</a></li> --}}
  @else
  <li class="dropdown">
  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">

diff --git a/resources/views/track.blade.php b/resources/views/track.blade.php
@@ -16,12 +16,17 @@
  <style>
  body {
  padding-top: 50px;
+ background-image: url({{ url('images/boat-cargo.jpg') }});
+ background-size: cover;
+ background-repeat: no-repeat;
  }
  </style>
  </head>
  <body>
 
- <div class="container">
+ <div class="container" align="center">
+
+ <img src="{{ asset('images/AXon.png') }}" alt="Logo" style="margin-bottom:50px;">
 
  <form action="{{ route('displayTrackingDetails') }}" method="post" class="form-inline">
  {{ csrf_field() }}

diff --git a/resources/views/trackingresult.blade.php b/resources/views/trackingresult.blade.php
@@ -16,13 +16,24 @@
  <style>
  body {
  padding-top: 50px;
+ background-image: url({{ url('images/boat-cargo.jpg') }});
+ background-size: cover;
+ background-repeat: no-repeat;
  }
  </style>
 
  </head>
  <body>
 
- <div class="container">
+ <div class="container" align="center">
+
+ <img src="{{ asset('images/AXon.png') }}" alt="Logo" style="margin-bottom:50px;">
+
+ <div style="padding:20px 50px;margin:5px 0px 20px 0px;background-color:lightgray;color:#000;font-family:Raleway;clear:both;
+ font-size:30px;font-weight:bolder">
+ TRACK YOUR SHIPPING INFORMATION
+ </div>
+ <div class="clearfix"></div>
 
  <form action="{{ route('displayTrackingDetails') }}" method="post" class="form-inline">
  {{ csrf_field() }}
@@ -54,44 +65,46 @@
  </div>
  @else
  <div class="row">
- <div class="col-md-4 col-sm-4">
- <h3>TRACKING NO: {{ $tracking->trackingID }}</h3>
- <br>
- <img src="{{ asset('images/barcode.png') }}" alt="Barcode">
- </div>
- <div class="col-md-8 col-sm-8">
- @if (is_null($tracking->geolocation))
- <div id="map" style="width:100%;height:400px;border:none;border-radius:10px"></div>
- <script>
- var map;
- function initMap() {
- var latitude = {{ $tracking->latitude }};
- var longitude = {{ $tracking->longitude }};
- map = new google.maps.Map(document.getElementById('map'), {
- center: {lat: latitude, lng: longitude},
- zoom: 19
- });
- var marker = new google.maps.Marker({
- position: {lat: latitude, lng: longitude},
- map: map
- });
- }
- </script>
- <script src="http:https://maps.googleapis.com/maps/api/js?key=AIzaSyDHV6Sxsq5XldAyCAtirJoj7VVrotpz92c
- &callback=initMap" async defer></script>
- @else
- <iframe src="http:https://www.google.com/maps/embed/v1/place?q={{ $tracking->geolocation }}
- &zoom=18&attribution_source=Google+Maps+Embed+API
- &attribution_web_url=https://developers.google.com/maps/documentation/embed/
- &key=AIzaSyBmMgh9QLh_fn9d51SbcsZa7O98Aw86T9s" allowfullscreen
- style="width:100%;height:400px;border:none;border-radius:10px">
- </iframe>
- @endif
+ <div class="panel">
+ <div class="panel-body">
+ <div class="col-md-4 col-sm-4">
+ <h3>TRACKING NO: {{ $tracking->trackingID }}</h3>
+ <br>
+ <img src="{{ asset('images/barcode.png') }}" alt="Barcode">
+ </div>
+ <div class="col-md-8 col-sm-8">
+ @if (is_null($tracking->geolocation))
+ <div id="map" style="width:100%;height:400px;border:none;border-radius:10px"></div>
+ <script>
+ var map;
+ function initMap() {
+ var latitude = {{ $tracking->latitude }};
+ var longitude = {{ $tracking->longitude }};
+ map = new google.maps.Map(document.getElementById('map'), {
+ center: {lat: latitude, lng: longitude},
+ zoom: 19
+ });
+ var marker = new google.maps.Marker({
+ position: {lat: latitude, lng: longitude},
+ map: map
+ });
+ }
+ </script>
+ <script src="http:https://maps.googleapis.com/maps/api/js?key=AIzaSyDHV6Sxsq5XldAyCAtirJoj7VVrotpz92c
+ &callback=initMap" async defer></script>
+ @else
+ <iframe src="http:https://www.google.com/maps/embed/v1/place?q={{ $tracking->geolocation }}
+ &zoom=18&attribution_source=Google+Maps+Embed+API
+ &attribution_web_url=https://developers.google.com/maps/documentation/embed/
+ &key=AIzaSyBmMgh9QLh_fn9d51SbcsZa7O98Aw86T9s" allowfullscreen
+ style="width:100%;height:400px;border:none;border-radius:10px">
+ </iframe>
+ @endif
+ </div>
+ </div>
  </div>
  </div>
 
- <hr>
-
  <div class="row">
  <div class="col-md-6">
  <div class="panel panel-default">

diff --git a/routes/web.php b/routes/web.php
@@ -18,7 +18,15 @@
 Route::get('track', 'FrontendController@showTrackingForm')->name('showTrackingForm');
 Route::post('track', 'FrontendController@displayTrackingDetails')->name('displayTrackingDetails');
 
-Auth::routes();
+// Auth::routes();
+
+Route::get('registeruser', 'Auth\RegisterController@showRegistrationForm');
+Route::post('registeruser', 'Auth\RegisterController@register')->name('register');
+Route::get('login', 'Auth\LoginController@showLoginForm');
+Route::post('login', 'Auth\LoginController@login')->name('login');
+Route::get('password/reset', 'Auth\ForgotPasswordController@showLinkRequestForm')->name('password.request');
+Route::post('password/reset', 'Auth\ForgotPasswordController@sendResetLinkEmail')->name('password.email');
+Route::post('logout', 'Auth\LoginController@logout')->name('logout');
 
 Route::get('/home', 'HomeController@index')->name('home');
 Route::get('trackings', 'TrackingsController@showAllTrackings')->name('showAllTrackings');