Merge branch 'hotfix/0.0.4'

w1lldone · Apr 8, 2021 · 90f8268 · 90f8268
2 parents 9fa0c82 + 34b062f
commit 90f8268
Show file tree

Hide file tree

Showing 17 changed files with 121 additions and 32 deletions.
diff --git a/public/css/tailwind.css b/public/css/tailwind.css
diff --git a/public/img/about_1.jpeg b/public/img/about_1.jpeg
diff --git a/public/img/about_2.jpeg b/public/img/about_2.jpeg
diff --git a/public/img/about_3.jpeg b/public/img/about_3.jpeg
diff --git a/public/img/about_4.jpeg b/public/img/about_4.jpeg
diff --git a/public/img/about_5.jpeg b/public/img/about_5.jpeg
diff --git a/public/img/about_6.jpeg b/public/img/about_6.jpeg
diff --git a/public/img/about_7.jpeg b/public/img/about_7.jpeg
diff --git a/public/js/app.js b/public/js/app.js
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/app.js": "/js/app.js?id=1dc7ac7a160aa68216eb",
+    "/js/app.js": "/js/app.js?id=7e77af7a7489834f670c",
     "/js/alpine.js": "/js/alpine.js?id=aff2cc1198083b1e3dd6",
     "/css/app.css": "/css/app.css?id=c3bf9f2999a83e5ef503",
-    "/css/tailwind.css": "/css/tailwind.css?id=a6f83fcfe78a3eec9f4f"
+    "/css/tailwind.css": "/css/tailwind.css?id=d76641a45ef2f820cc4d"
 }
diff --git a/resources/js/components/Explore/MarkerModal.vue b/resources/js/components/Explore/MarkerModal.vue
@@ -10,8 +10,12 @@
                         </button>
                     </div>
                     <div class="modal-body mx-4">
-                        <div class="d-flex">
+                        <!-- <div class="d-flex">
                             <img src="img/dummy_image.png" alt="" class="img-fluid mx-auto" style="max-height:200px">
+                        </div> -->
+                        <div class="d-flex align-items-center justify-content-center text-muted card card-body border rounded bg-light" style="height:200px">
+                            <span class="mdi mdi-image-filter h1"></span>
+                            <h3>Foto belum tersedia</h3>
                         </div>
                         <div class="mt-4">
                             <h5 class="text-secondary font-weight-bold">{{ station.name }}</h5>
@@ -21,9 +25,12 @@
                                     <span class="mdi mdi-archive-outline text-secondary"></span>
                                     <span class="text-secondary font-weight-bold align-middle ml-2">{{ station.dropboxes_count }} Dropbox tersedia</span>
                                 </div>
-                                <div>
+                                <div class="d-flex">
                                     <img src="img/icon_clock.svg" alt="" style="max-height:16px">
-                                    <span class="text-secondary font-weight-bold align-middle ml-2">07.00 - 20.00 WIB</span>
+                                    <span class="text-secondary font-weight-bold align-middle ml-2">
+                                        Senin-Jumat: Buka 08.00 - 15.00 WIB <br>
+                                        Sabtu dan Minggu: Tutup
+                                    </span>
                                 </div>
                                 <div v-if="distance">
                                     <span class="mdi mdi-crosshairs-gps text-secondary"></span>

diff --git a/resources/views/about.blade.php b/resources/views/about.blade.php
@@ -0,0 +1,65 @@
+@extends('layouts.app')
+
+@section('title', 'Tentang Dumask.id')
+
+@section('content')
+
+<div class="container w-md-75 my-4">
+    <div class="card rounded border-0 shadow px-4 py-2 mx-3 my-2" style="border-radius: 0.5rem">
+        <h2 class="text-primary text-center font-weight-bold mt-2 mb-0">
+            ABOUT DUMASK.ID
+        </h2>
+        <hr class="my-2">
+        <div class="text-secondary text-center mt-4 mx-auto">
+            <h5 style="line-height: 175%">
+                Pada masa pandemi saat ini, penduduk dunia memakai
+                <b>129 milyar masker dan 65 milyar sarung tangan plastik</b> sekali pakai setiap bulannya. 
+                Jumlah pemakaian yang luar biasa ini telah terlihat dampaknya di lingkungan sekitar berupa tercemarnya sungai, 
+                pantai dan lautan serta berbagai macam hewan terjerat oleh limbah ini. 
+                Mudah sekali saat ini dijumpai limbah masker bekas berserakan di pinggir jalan.
+            </h5>
+        </div>
+    </div>
+    <div class="d-flex row text-center my-4 mx-auto">
+        <div class="col-12 col-md-4 my-2">
+            <img class="img img-fluid rounded shadow" src="{{ asset('img/about_1.jpeg')}}" alt="About Dumask.id">
+        </div>
+        <div class="col-12 col-md-4 my-2">
+            <img class="img img-fluid rounded shadow" src="{{ asset('img/about_2.jpeg')}}" alt="About Dumask.id">
+        </div>
+        <div class="col-12 col-md-4 my-2">
+            <img class="img img-fluid rounded shadow" src="{{ asset('img/about_3.jpeg')}}" alt="About Dumask.id">
+        </div>
+    </div>
+    <div class="card rounded border-0 shadow px-4 py-2 mx-3 my-2" style="border-radius: 0.5rem">
+        <div class="text-secondary text-center my-2 mx-auto">
+            <h5 style="line-height: 175%">
+                <b>Dumask</b> adalah penelitian kolaboratif yang didanai oleh program PPKI 2021 - 2023. 
+                Program penelitian ini merupakan kolaborasi antara peneliti PTNBH dari UGM, ITB, UNS dan UNAIR 
+                yang juga didukung oleh para peneliti dari UAD, Politeknik ATK, UJB, dan UP45. DUMASK bertujuan 
+                khusus untuk menyediakan jalur pembuangan masker dan sarung tangan bekas dari masyarakat umum yang 
+                aman dan ramah lingkungan.
+            </h5>
+        </div>
+    </div>
+    <div class="d-flex row text-center my-4 mx-auto">
+        <div class="col-12 col-md-4 my-2">
+            <img class="img img-fluid rounded shadow" src="{{ asset('img/about_4.jpeg')}}" alt="About Dumask.id">
+        </div>
+        <div class="col-12 col-md-4 my-2">
+            <img class="img img-fluid rounded shadow" src="{{ asset('img/about_6.jpeg')}}" alt="About Dumask.id">
+        </div>
+        <div class="col-12 col-md-4 my-2">
+            <img class="img img-fluid rounded shadow" src="{{ asset('img/about_7.jpeg')}}" alt="About Dumask.id">
+        </div>
+    </div>
+    <div class="card rounded border-0 shadow px-4 py-2 mx-3 my-2" style="border-radius: 0.5rem">
+        <h5 class="text-secondary text-center font-weight-bold my-2 mb-0">
+            Kumpulkan masker bekasmu di rumah, simpan dalam kantong plastik/kertas 
+            tertutup rapi dan buang ke dropbox Dumask terdekat.
+        </h5>
+    </div>
+
+</div>
+
+@endsection
diff --git a/resources/views/explore/explore.blade.php b/resources/views/explore/explore.blade.php
@@ -1,4 +1,7 @@
 @extends('layouts.app')
+
+@section('title', 'Temukan Dumask disekitarmu!')
+
 @section('content')
 
 <div class="container w-md-75 my-4">

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
@@ -4,7 +4,7 @@
         <meta charset="utf-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
 
-        <title>Dumask.id</title>
+        <title>Dumask.id - @yield('title')</title>
         @env('production')
             <meta name="google-site-verification" content="ZQmYpcWC-8MF6KLnmUF_rYWNLh10NSrhICri74g17gU">
         @endenv
@@ -41,27 +41,19 @@
                             <li class="nav-item">
                                 <a 
                                 class="nav-link font-weight-bold px-3 {{ Request::is('/') ? 'text-primary' : 'text-secondary' }}" 
-                                href=""
+                                href="{{ url('/') }}"
                                 >
                                 Home
                                 </a>
                             </li>
                             <li class="nav-item">
                                 <a 
-                                class="nav-link text-secondary font-weight-bold px-3 {{ Request::is('/about') ? 'text-primary' : 'text-secondary' }}" 
-                                href=""
+                                class="nav-link font-weight-bold px-3 {{ Request::is('about') ? 'text-primary' : 'text-secondary' }}" 
+                                href="{{ url('/about') }}"
                                 >
                                 About Us
                                 </a>
                             </li>
-                            <li class="nav-item">
-                                <a 
-                                class="nav-link text-secondary font-weight-bold px-3 {{ Request::is('/contact') ? 'text-primary' : 'text-secondary' }}" 
-                                href=""
-                                >
-                                Contact
-                                </a>
-                            </li>
                         </ul>
 
                         <!-- Right Side Of Navbar -->

diff --git a/resources/views/layouts/footer.blade.php b/resources/views/layouts/footer.blade.php
@@ -1,13 +1,36 @@
 <style>
-    .footer-link:hover{
+    .footer-link:hover {
         color: #1B2460;
     }
 </style>
 
-<div class="container-fluid d-flex align-middle sm:items-center w-100" style="background: #C4C4C4">
-    <p class="text-center text-white mx-auto my-auto py-2">
-        DUMASK.ID Brought to you by 
-        <a class="footer-link text-white" href="https://piat.ugm.ac.id/" target="_blank"><u>Pusat Inovasi Agroteknologi UGM</u></a>  
-        developed by Smart System Research Group UGM
-    </p>
+<div class="bg-secondary text-white">
+    <div class="container">
+        <div class="row py-5">
+            <div class="col-md-4 mb-3 mb-md-0">
+                <h5 class="font-weight-bold">Kontak Kami</h5>
+                <div>
+                    <span class="mdi mdi-account mr-2"></span>
+                    <span>Ilham</span>
+                </div>
+                <div>
+                    <span class="mdi mdi-whatsapp mr-2"></span>
+                    <a href="https://wa.me/6285729141485" target="_blank">+62 857-2914-1485 (WhatsApp Only)</a>
+                </div>
+                <div>
+
+                </div>
+            </div>
+            <div class="col-md-3 mb-3 mb-md-0">
+                <h5 class="font-weight-bold">Tautan</h5>
+                <a href="{{ route('about') }}">About Us</a>
+            </div>
+            <div class="col-md-5 mb-3 mb-md-0">
+                <h5 class="font-weight-bold">Tentang Dumask.id</h5>
+                Dumask.id merupakan kolaborasi antara peneliti PTNBH dari UGM, ITB, UNS dan UNAIR yang juga didukung oleh peneliti dari UAD, Politeknik ATK, UJB, dan UP45. Dumask.id menyediakan jalur pembuangan masker dan sarung tangan
+                bekas dari masyarakat umum yang aman dan ramah lingkungan.
+            </div>
+        </div>
+    </div>
+
 </div>
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/layouts/navigation.blade.php
@@ -5,7 +5,7 @@
             <div class="flex">
                 <!-- Logo -->
                 <div class="flex-shrink-0 flex items-center">
-                    <a href="{{ route('dashboard') }}">
+                    <a href="/">
                         <x-application-logo class="block h-10 w-auto fill-current text-gray-600" />
                     </a>
                 </div>

diff --git a/routes/web.php b/routes/web.php
@@ -16,13 +16,12 @@
 |
 */
 
-Route::get('/', [App\Http\Controllers\ExploreController::class, 'index']);
+require __DIR__ . '/auth.php';
 
-Route::get('/dashboard', function () {
-    return view('dashboard');
-})->middleware(['auth'])->name('dashboard');
+Route::get('/', [App\Http\Controllers\ExploreController::class, 'index']);
 
-require __DIR__.'/auth.php';
+Route::view('/dashboard', 'dashboard')->middleware(['auth'])->name('dashboard');
+Route::view('/about', 'about')->name('about');
 
 Route::prefix('user')->name('user.')->middleware('auth')->group(function ()
 {