Martin Wicaksono

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;

resources/views/Admin/dashboard.blade.php

@@ -75,7 +75,11 @@ class="rounded"
       <div class="col-md-6 col-lg-8 order-2 mb-4">
         <div class="card h-100">
           <div class="card-header d-flex align-items-center justify-content-between">
+<<<<<<< HEAD
+            <h5 class="card-title m-0 me-2">Latest Transactions</h5>
+=======
             <h5 class="card-title m-0 me-2">Lasted Transactions</h5>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
             <div class="dropdown">
               <button
                 class="btn p-0"

resources/views/Auth/login.blade.php

@@ -70,7 +70,11 @@
             </div>
             <!-- /Logo -->
             <h4 class="mb-2">Welcome to {{ config('app.name') }}! 👋</h4>
+<<<<<<< HEAD
+            <p class="mb-4">Please sign-in to your account</p>
+=======
             <p class="mb-4">Please sign-in to your account and start the adventure</p>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
 
             <form id="formAuthentication" class="mb-3" action="{{ route('loginProcess') }}" method="POST">
               @csrf

resources/views/Auth/register.blade.php

@@ -69,8 +69,11 @@
               </a>
             </div>
             <!-- /Logo -->
+<<<<<<< HEAD
+=======
             <h4 class="mb-2">Adventure starts here 🚀</h4>
             <p class="mb-4">Make your app management easy and fun!</p>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
 
             <form id="formAuthentication" class="mb-3" action="{{ route('registerProcess') }}" method="POST">
               @csrf

resources/views/Guest/about.blade.php

@@ -1,6 +1,10 @@
 @extends('Layouts.Guest.default')
 @section('content')
+<<<<<<< HEAD
+<section class="hero-wrap hero-wrap-2 js-fullheight" style="background-image: url('assets/main/images/ferrari.jpg');" data-stellar-background-ratio="0.5">
+=======
 <section class="hero-wrap hero-wrap-2 js-fullheight" style="background-image: url('assets/main/images/bg_3.jpg');" data-stellar-background-ratio="0.5">
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
     <div class="overlay"></div>
     <div class="container">
       <div class="row no-gutters slider-text js-fullheight align-items-end justify-content-start">
@@ -15,23 +19,35 @@
   <section class="ftco-section ftco-about">
           <div class="container">
               <div class="row no-gutters">
+<<<<<<< HEAD
+                  <div class="col-md-6 p-md-5 img img-2 d-flex justify-content-center align-items-center" style="background-image: url(assets/main/images/aboutus.jpg);">
+=======
                   <div class="col-md-6 p-md-5 img img-2 d-flex justify-content-center align-items-center" style="background-image: url(assets/main/images/about.jpg);">
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
                   </div>
                   <div class="col-md-6 wrap-about ftco-animate">
             <div class="heading-section heading-section-white pl-md-5">
                 <span class="subheading">About us</span>
               <h2 class="mb-4">Welcome to Carbook</h2>
 
+<<<<<<< HEAD
+              <p>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.</p>
+=======
               <p>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.</p>
               <p>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.</p>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
               <p><a href="#" class="btn btn-primary py-3 px-4">Search Vehicle</a></p>
             </div>
                   </div>
               </div>
           </div>
       </section>
 
+<<<<<<< HEAD
+      <section class="ftco-section ftco-intro" style="background-image: url(assets/main/images/car-ijo.jpg);">
+=======
       <section class="ftco-section ftco-intro" style="background-image: url(assets/main/images/bg_3.jpg);">
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
           <div class="overlay"></div>
           <div class="container">
               <div class="row justify-content-end">
@@ -57,56 +73,101 @@
           <div class="carousel-testimony owl-carousel ftco-owl">
             <div class="item">
               <div class="testimony-wrap rounded text-center py-4 pb-5">
+<<<<<<< HEAD
+                <div class="user-img mb-2" style="background-image: url(assets/main/images/gilang.jpg)">
+                </div>
+                <div class="text pt-4">
+                  <p class="mb-4">Mantap admin ramah, service cepat, dan harga murah</p>
+                  <p class="name">Gilang</p>
+                  <span class="position">Pemain arknight</span>
+=======
                 <div class="user-img mb-2" style="background-image: url(assets/main/images/person_1.jpg)">
                 </div>
                 <div class="text pt-4">
                   <p class="mb-4">Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.</p>
                   <p class="name">Roger Scott</p>
                   <span class="position">Marketing Manager</span>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
                 </div>
               </div>
             </div>
             <div class="item">
               <div class="testimony-wrap rounded text-center py-4 pb-5">
+<<<<<<< HEAD
+                <div class="user-img mb-2" style="background-image: url(assets/main/images/Toriq.jpg)">
+                </div>
+                <div class="text pt-4">
+                  <p class="mb-4">Harga mantap, penanganan cepat, mobil mulus</p>
+                  <p class="name">Torik</p>
+                  <span class="position">Tukang gambar</span>
+=======
                 <div class="user-img mb-2" style="background-image: url(assets/main/images/person_2.jpg)">
                 </div>
                 <div class="text pt-4">
                   <p class="mb-4">Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.</p>
                   <p class="name">Roger Scott</p>
                   <span class="position">Interface Designer</span>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
                 </div>
               </div>
             </div>
             <div class="item">
               <div class="testimony-wrap rounded text-center py-4 pb-5">
+<<<<<<< HEAD
+                <div class="user-img mb-2" style="background-image: url(assets/main/images/zuma.jpg)">
+                </div>
+                <div class="text pt-4">
+                  <p class="mb-4">Kendaraan sesuai dan mulus</p>
+                  <p class="name">Zooma</p>
+                  <span class="position">Proplayer Valo</span>
+=======
                 <div class="user-img mb-2" style="background-image: url(assets/main/images/person_3.jpg)">
                 </div>
                 <div class="text pt-4">
                   <p class="mb-4">Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.</p>
                   <p class="name">Roger Scott</p>
                   <span class="position">UI Designer</span>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
                 </div>
               </div>
             </div>
             <div class="item">
               <div class="testimony-wrap rounded text-center py-4 pb-5">
+<<<<<<< HEAD
+                <div class="user-img mb-2" style="background-image: url(assets/main/images/pito.jpg)">
+                </div>
+                <div class="text pt-4">
+                  <p class="mb-4">CS ramah, ada kendala sedikit langsung selesai, harga mantap</p>
+                  <p class="name">Pito</p>
+                  <span class="position">Melers</span>
+=======
                 <div class="user-img mb-2" style="background-image: url(assets/main/images/person_1.jpg)">
                 </div>
                 <div class="text pt-4">
                   <p class="mb-4">Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.</p>
                   <p class="name">Roger Scott</p>
                   <span class="position">Web Developer</span>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
                 </div>
               </div>
             </div>
             <div class="item">
               <div class="testimony-wrap rounded text-center py-4 pb-5">
+<<<<<<< HEAD
+                <div class="user-img mb-2" style="background-image: url(assets/main/images/dimas.jpg)">
+                </div>
+                <div class="text pt-4">
+                  <p class="mb-4">A mimir</p>
+                  <p class="name">Dimas</p>
+                  <span class="position">Tukang Musik</span>
+=======
                 <div class="user-img mb-2" style="background-image: url(assets/main/images/person_1.jpg)">
                 </div>
                 <div class="text pt-4">
                   <p class="mb-4">Far far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts.</p>
                   <p class="name">Roger Scott</p>
                   <span class="position">System Analyst</span>
+>>>>>>> 3b8ebd402252851968106dd5ba9040141869cb7b
                 </div>
               </div>
             </div>