diff --git a/app/Facades/Utils.php b/app/Facades/Utils.php
index 4643cbad..1378f884 100644
--- a/app/Facades/Utils.php
+++ b/app/Facades/Utils.php
@@ -6,9 +6,14 @@ use \Illuminate\Support\Facades\Facade;
class Utils extends Facade
{
- public static function secondsToTime($seconds) {
+ public static function secondsToTime($seconds, $incl_sec=false) {
$dtF = new \DateTime('@0');
$dtT = new \DateTime("@$seconds");
- return $dtF->diff($dtT)->format('%hh %im %ss');
+ $format = '%hh %im';
+ if($incl_sec) {
+ $format .= ' %ss';
+ }
+
+ return $dtF->diff($dtT)->format($format);
}
}
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index ae5ccf17..e98bbd78 100755
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -25,7 +25,7 @@ class LoginController extends Controller
*
* @var string
*/
- protected $redirectTo = '/home';
+ protected $redirectTo = '/dashboard';
public function showLoginForm()
{
diff --git a/app/Http/Controllers/Frontend/BaseController.php b/app/Http/Controllers/Frontend/BaseController.php
deleted file mode 100644
index 11b12a4e..00000000
--- a/app/Http/Controllers/Frontend/BaseController.php
+++ /dev/null
@@ -1,10 +0,0 @@
-view('frontend/dashboard');
- }
- public function test()
- {
- return $this->view('frontend/dashboard');
+ return $this->view('dashboard.index', [
+ 'user' => Auth::user(),
+ ]);
}
}
diff --git a/app/Http/Controllers/Frontend/ProfileController.php b/app/Http/Controllers/Frontend/ProfileController.php
new file mode 100644
index 00000000..c1b350f5
--- /dev/null
+++ b/app/Http/Controllers/Frontend/ProfileController.php
@@ -0,0 +1,50 @@
+airportRepository = $airportRepo;
+ }
+
+ public function index()
+ {
+ $airports = $this->airportRepository->all();
+
+ return $this->view('profile.index', [
+ 'user' => Auth::user(),
+ 'airports' => $airports,
+ ]);
+ }
+
+ public function show($id)
+ {
+ $user = User::where('id', $id)->first();
+ if (empty($user)) {
+ Flash::error('User not found!');
+ return redirect(route('frontend.dashboard.index'));
+ }
+
+ $airports = $this->airportRepository->all();
+
+ return $this->view('profile.index', [
+ 'user' => $user,
+ 'airports' => $airports,
+ ]);
+ }
+
+ public function update()
+ {
+
+ }
+}
diff --git a/database/seeds/dev.yml b/database/seeds/dev.yml
index 986a428b..d9809cb4 100644
--- a/database/seeds/dev.yml
+++ b/database/seeds/dev.yml
@@ -13,6 +13,11 @@ users:
email: admin@phpvms.net
password: admin
rank_id: 1
+ airline_id: 1
+ home_airport_id: 1
+ curr_airport_id: 2
+ flights: 1
+ flight_time: 21600
created_at: now
updated_at: now
diff --git a/phpvms.iml b/phpvms.iml
index 0654ee8b..b4589776 100644
--- a/phpvms.iml
+++ b/phpvms.iml
@@ -3,6 +3,9 @@
+
+
+
@@ -39,4 +42,11 @@
+
+
+
\ No newline at end of file
diff --git a/public/assets/frontend/css/now-ui-kit.css b/public/assets/frontend/css/now-ui-kit.css
index 3f578cc6..744039f8 100644
--- a/public/assets/frontend/css/now-ui-kit.css
+++ b/public/assets/frontend/css/now-ui-kit.css
@@ -3222,11 +3222,10 @@ Created using IcoMoon - icomoon.io
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
text-align: center;
- color: #FFFFFF;
width: 100%;
max-width: 880px; }
.page-header .category, .page-header .description {
- color: rgba(255, 255, 255, 0.5); }
+ }
.page-header.page-header-small {
height: 60vh;
max-height: 440px; }
diff --git a/public/img/logo.svg b/public/assets/frontend/img/logo.svg
similarity index 100%
rename from public/img/logo.svg
rename to public/assets/frontend/img/logo.svg
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
deleted file mode 100644
index 08f5ecbc..00000000
--- a/resources/views/layouts/app.blade.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- {{ config('app.name', 'Laravel') }}
-
-
-
-
-
-
-
-
-
-
-
- @yield('content')
-