diff --git a/public/assets/main/css/style.css b/public/assets/main/css/style.css index 0e6f8d3..4ae4f06 100644 --- a/public/assets/main/css/style.css +++ b/public/assets/main/css/style.css @@ -1,4 +1,8 @@ +<<<<<<< HEAD +/*!5 +======= /*! +>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b * Bootstrap v4.3.1 (https://getbootstrap.com/) * Copyright 2011-2019 The Bootstrap Authors * Copyright 2011-2019 Twitter, Inc. @@ -1768,7 +1772,11 @@ textarea.form-control { font-size: 0.875rem; line-height: 1.5; color: #fff; +<<<<<<< HEAD + background-color: rgba(40, 159, 167, 0.9); +======= background-color: rgba(40, 167, 69, 0.9); +>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b border-radius: 0.25rem; } .was-validated .form-control:valid, .form-control.is-valid { @@ -8969,7 +8977,11 @@ h1, h2, h3, h4, h5, right: 0; bottom: 0; content: ''; +<<<<<<< HEAD + background: #000035; +======= background: #01d28e; +>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b z-index: -2; width: 63%; } @media (max-width: 767.98px) { @@ -9158,7 +9170,11 @@ textarea.form-control { font-weight: 700; color: #fff; } .ftco-footer .logo span { +<<<<<<< HEAD + color: #FFB6C1; } +======= color: #01d28e; } +>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b .ftco-footer .ftco-footer-widget h2 { font-weight: normal; color: #fff; @@ -9287,7 +9303,11 @@ textarea.form-control { font-size: 18px; display: block; margin-bottom: 5px; +<<<<<<< HEAD + color: #FFB6C1; +======= color: #1089ff; +>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b font-size: 12px; font-weight: 600; letter-spacing: 2px; diff --git a/public/assets/main/images/Black.png b/public/assets/main/images/Black.png new file mode 100644 index 0000000..e274c4f Binary files /dev/null and b/public/assets/main/images/Black.png differ diff --git a/public/assets/main/images/Cyan.png b/public/assets/main/images/Cyan.png new file mode 100644 index 0000000..e31476b Binary files /dev/null and b/public/assets/main/images/Cyan.png differ diff --git a/public/assets/main/images/Logo.png b/public/assets/main/images/Logo.png new file mode 100644 index 0000000..2f0a999 Binary files /dev/null and b/public/assets/main/images/Logo.png differ diff --git a/public/assets/main/images/SOF.png b/public/assets/main/images/SOF.png new file mode 100644 index 0000000..8c5675a Binary files /dev/null and b/public/assets/main/images/SOF.png differ diff --git a/public/assets/main/images/Supra.jpg b/public/assets/main/images/Supra.jpg new file mode 100644 index 0000000..e9e6ee3 Binary files /dev/null and b/public/assets/main/images/Supra.jpg differ diff --git a/public/assets/main/images/Toriq.jpeg b/public/assets/main/images/Toriq.jpeg new file mode 100644 index 0000000..297a87f Binary files /dev/null and b/public/assets/main/images/Toriq.jpeg differ diff --git a/public/assets/main/images/aboutus.jpg b/public/assets/main/images/aboutus.jpg new file mode 100644 index 0000000..c0e46c6 Binary files /dev/null and b/public/assets/main/images/aboutus.jpg differ diff --git a/public/assets/main/images/car-ijo.jpg b/public/assets/main/images/car-ijo.jpg new file mode 100644 index 0000000..8f5db01 Binary files /dev/null and b/public/assets/main/images/car-ijo.jpg differ diff --git a/public/assets/main/images/dimas.jpg b/public/assets/main/images/dimas.jpg new file mode 100644 index 0000000..3a6b445 Binary files /dev/null and b/public/assets/main/images/dimas.jpg differ diff --git a/public/assets/main/images/ferrari.jpg b/public/assets/main/images/ferrari.jpg new file mode 100644 index 0000000..6aff66a Binary files /dev/null and b/public/assets/main/images/ferrari.jpg differ diff --git a/public/assets/main/images/gilang.jpg b/public/assets/main/images/gilang.jpg new file mode 100644 index 0000000..eaec6cd Binary files /dev/null and b/public/assets/main/images/gilang.jpg differ diff --git a/public/assets/main/images/pito.jpg b/public/assets/main/images/pito.jpg new file mode 100644 index 0000000..1d0ab9a Binary files /dev/null and b/public/assets/main/images/pito.jpg differ diff --git a/public/assets/main/images/zuma.jpg b/public/assets/main/images/zuma.jpg new file mode 100644 index 0000000..e4d0a4d Binary files /dev/null and b/public/assets/main/images/zuma.jpg differ diff --git a/public/storage/brand-logo/montainer-car b/public/storage/brand-logo/montainer-car deleted file mode 100644 index 48f82dc..0000000 Binary files a/public/storage/brand-logo/montainer-car and /dev/null differ diff --git a/public/storage/guarante-ktp/KTP-02-05-22-03-12-51-member-2.png b/public/storage/guarante-ktp/KTP-02-05-22-03-12-51-member-2.png deleted file mode 100644 index c06bb03..0000000 Binary files a/public/storage/guarante-ktp/KTP-02-05-22-03-12-51-member-2.png and /dev/null differ diff --git a/public/storage/guarante-ktp/KTP-02-05-22-03-32-10-member-2.png b/public/storage/guarante-ktp/KTP-02-05-22-03-32-10-member-2.png deleted file mode 100644 index efcffec..0000000 Binary files a/public/storage/guarante-ktp/KTP-02-05-22-03-32-10-member-2.png and /dev/null differ diff --git a/public/storage/guarante-ktp/KTP-02-05-22-03-58-42-member-1.png b/public/storage/guarante-ktp/KTP-02-05-22-03-58-42-member-1.png deleted file mode 100644 index efcffec..0000000 Binary files a/public/storage/guarante-ktp/KTP-02-05-22-03-58-42-member-1.png and /dev/null differ diff --git a/public/storage/guarante-ktp/KTP-02-05-22-03-59-26-member-1.png b/public/storage/guarante-ktp/KTP-02-05-22-03-59-26-member-1.png deleted file mode 100644 index efcffec..0000000 Binary files a/public/storage/guarante-ktp/KTP-02-05-22-03-59-26-member-1.png and /dev/null differ diff --git a/public/storage/guarante-ktp/KTP-03-05-22-11-50-53-member-2.png b/public/storage/guarante-ktp/KTP-03-05-22-11-50-53-member-2.png deleted file mode 100644 index cc5c29b..0000000 Binary files a/public/storage/guarante-ktp/KTP-03-05-22-11-50-53-member-2.png and /dev/null differ diff --git a/public/storage/user-avatar/default.png b/public/storage/user-avatar/default.png deleted file mode 100644 index 4b93de4..0000000 Binary files a/public/storage/user-avatar/default.png and /dev/null differ diff --git a/public/storage/vehicle-image/default.png b/public/storage/vehicle-image/default.png deleted file mode 100644 index a8adf71..0000000 Binary files a/public/storage/vehicle-image/default.png and /dev/null differ diff --git a/resources/views/Admin/dashboard.blade.php b/resources/views/Admin/dashboard.blade.php index b15bb30..a78f353 100644 --- a/resources/views/Admin/dashboard.blade.php +++ b/resources/views/Admin/dashboard.blade.php @@ -75,7 +75,11 @@ class="rounded"
+<<<<<<< HEAD +
Latest Transactions
+=======
Lasted Transactions
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b +<<<<<<< HEAD +=======

Adventure starts here 🚀

Make your app management easy and fun!

+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b @csrf diff --git a/resources/views/Guest/about.blade.php b/resources/views/Guest/about.blade.php index 85e3096..70cfaf7 100644 --- a/resources/views/Guest/about.blade.php +++ b/resources/views/Guest/about.blade.php @@ -1,6 +1,10 @@ @extends('Layouts.Guest.default') @section('content') +<<<<<<< HEAD +
+=======
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
@@ -15,15 +19,23 @@
+<<<<<<< HEAD +
+=======
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
About us

Welcome to Carbook

+<<<<<<< HEAD +

SoF Rental since 2022 specializing in the rental of cars, motorcyle, bicyle and commercial vehicles in The Java. With offices in The Jepara and Krasak, SoF Rental is one of the larger rental companies in the region. For both individuals and companies SoF Rental offers a solution for almost all (temporary) traffic requirements.

+=======

A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.

On her way she met a copy. The copy warned the Little Blind Text, that where it came from it would have been rewritten a thousand times and everything that was left from its origin would be the word "and" and the Little Blind Text should turn around and return to its own, safe country. A small river named Duden flows by their place and supplies it with the necessary regelialia. It is a paradisematic country, in which roasted parts of sentences fly into your mouth.

+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b

Search Vehicle

@@ -31,7 +43,11 @@
+<<<<<<< HEAD +
+=======
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
@@ -57,56 +73,101 @@