From 2e7d445d62d705da540a9471fefce2eeaaedea7f Mon Sep 17 00:00:00 2001
From: D Shrat <dshrat29@gmail.com>
Date: Tue, 9 Nov 2021 10:01:15 +0700
Subject: [PATCH 1/4] change nav notif and payment
---
views/pages/notif-pay.ejs | 10 +---------
views/pages/payment.ejs | 11 +----------
views/pages/success-add.ejs | 10 +---------
3 files changed, 3 insertions(+), 28 deletions(-)
diff --git a/views/pages/notif-pay.ejs b/views/pages/notif-pay.ejs
index 8b8add9..723f595 100644
--- a/views/pages/notif-pay.ejs
+++ b/views/pages/notif-pay.ejs
@@ -132,15 +132,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/lazysizes/5.3.2/lazysizes.min.js"></script>
</head>
<body>
- <nav class="navbar navbar-dark nav-color ml-5 mr-5 nav-radius">
- <a href="/"><img alt="Banner" class="navbar-brand lazyload" src="img/logo_transparent.webp" style="margin-top: 0%;"></a>
- <ul class="navbar-nav">
- <li class="nav-item">
- <a style="color: white; font-size: 16pt;">Payment</a>
- </li>
- </ul>
- <div class="collapse navbar-collapse" id="navbarTogglerDemo01"></div>
- </nav>
+ <%- include('../layouts/navbar.ejs', {types: 'v3', title: 'Notification'}); %>
<br>
diff --git a/views/pages/payment.ejs b/views/pages/payment.ejs
index a6b2517..b6a7212 100644
--- a/views/pages/payment.ejs
+++ b/views/pages/payment.ejs
@@ -142,16 +142,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/lazysizes/5.3.2/lazysizes.min.js"></script>
</head>
<body>
- <nav class="navbar navbar-dark nav-color ml-5 mr-5 nav-radius">
- <img alt="Banner" class="navbar-brand lazyload" src="img/logo_transparent.webp" style="margin-top: 0%;"
- width="5%">
- <ul class="navbar-nav">
- <li class="nav-item">
- <a style="color: white; font-size: 16pt;">Payment</a>
- </li>
- </ul>
- <div class="collapse navbar-collapse" id="navbarTogglerDemo01"></div>
- </nav>
+ <%- include('../layouts/navbar.ejs', {types: 'v3', title: 'Payment'}); %>
<br>
diff --git a/views/pages/success-add.ejs b/views/pages/success-add.ejs
index 51147e6..becf72b 100644
--- a/views/pages/success-add.ejs
+++ b/views/pages/success-add.ejs
@@ -132,15 +132,7 @@
<script src="https://cdnjs.cloudflare.com/ajax/libs/lazysizes/5.3.2/lazysizes.min.js"></script>
</head>
<body>
- <nav class="navbar navbar-dark nav-color ml-5 mr-5 nav-radius">
- <a href="/"><img alt="Banner" class="navbar-brand lazyload" src="img/logo_transparent.webp" style="margin-top: 0%;"></a>
- <ul class="navbar-nav">
- <li class="nav-item">
- <a style="color: white; font-size: 16pt;">Payment</a>
- </li>
- </ul>
- <div class="collapse navbar-collapse" id="navbarTogglerDemo01"></div>
- </nav>
+ <%- include('../layouts/navbar.ejs', {types: 'v3', title: 'Notification'}); %>
<br>
From ee6d0050b4e88b72c4aa3fd652d5dd95ce38eab8 Mon Sep 17 00:00:00 2001
From: Matthew Patrick <Matthew.535200018@stu.untar.ac.id>
Date: Tue, 9 Nov 2021 10:04:15 +0700
Subject: [PATCH 2/4] Dynamic Navbar for About-Us
---
views/pages/about-us.ejs | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
diff --git a/views/pages/about-us.ejs b/views/pages/about-us.ejs
index ffc192d..4ec2ada 100644
--- a/views/pages/about-us.ejs
+++ b/views/pages/about-us.ejs
@@ -19,37 +19,7 @@
</head>
<body>
- <nav class="navbar navbar-expand-lg navbar-dark comp-color ml-5 mr-5 nav-radius">
- <img alt="Banner" class="navbar-brand lazyload" src="assets/logo_transparent.webp">
- <button aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation"
- class="navbar-toggler" data-target="#navbarTogglerDemo01" data-toggle="collapse" type="button">
- <span class="navbar-toggler-icon"></span>
- </button>
- <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
- <ul class="navbar-nav mx-auto">
- <li class="nav-item">
- <a class="nav-link" href="/">Home</a>
- </li>
- <li class="nav-item">
- <a class="nav-link" href="/product-list.html">Products</a>
- </li>
- <li class="nav-item active">
- <a aria-disabled="true" class="nav-link disabled" href="/about-us.html">About Us</a>
- </li>
- <li class="nav-item">
- <a class="nav-link" href="faq.html">FAQ</a>
- </li>
- </ul>
- <span class="navbar-nav my-2 my-lg-0 text-white">
- <div class="my-4">
- <a href="login.html"><button class="btn btn-outline-success mt-auto mb-auto mr-3"
- type="button">Login</button></a>
- </div>
- <a href="bag.html" class="mt-auto mb-auto" style="color: inherit;"><i class="fas fa-shopping-cart"><span
- class="ml-2 mt-auto mb-auto">Rp 999.999</span></i></a>
- </span>
- </div>
- </nav>
+ <%- include('../layouts/navbar.ejs', {types: 'v1', state: 'home'}); %>
<br style="display: block;content: ' '; margin: 1vw 0; line-height: 1vw;">
From b39959e1ccfce1961cd64b993db883647f148389 Mon Sep 17 00:00:00 2001
From: Matthew Patrick <Matthew.535200018@stu.untar.ac.id>
Date: Tue, 9 Nov 2021 10:04:34 +0700
Subject: [PATCH 3/4] Fixed Navbar's logo icon
---
views/layouts/navbar.ejs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/views/layouts/navbar.ejs b/views/layouts/navbar.ejs
index 3aed32a..9b8bf5d 100644
--- a/views/layouts/navbar.ejs
+++ b/views/layouts/navbar.ejs
@@ -1,6 +1,6 @@
<% if(types == "v1") { %>
<nav class="navbar navbar-expand-lg navbar-dark comp-color ml-5 mr-5 nav-radius">
- <a href="/"><img alt="Banner" class="navbar-brand lazyload" height="80" src="img/logo_transparent.webp"
+ <a href="/"><img alt="Banner" class="navbar-brand lazyload" src="img/logo_transparent.webp"
style="margin-top: 0%;" width="80"></a>
<button aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation"
class="navbar-toggler" data-target="#navbarTogglerDemo01" data-toggle="collapse" type="button">
From 845af3ce592973da0e12060532caba78d5f75759 Mon Sep 17 00:00:00 2001
From: Matthew Patrick <Matthew.535200018@stu.untar.ac.id>
Date: Tue, 9 Nov 2021 10:07:05 +0700
Subject: [PATCH 4/4] Reverted Dynamic Navbar usage
---
views/pages/about-us.ejs | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/views/pages/about-us.ejs b/views/pages/about-us.ejs
index 4ec2ada..ffc192d 100644
--- a/views/pages/about-us.ejs
+++ b/views/pages/about-us.ejs
@@ -19,7 +19,37 @@
</head>
<body>
- <%- include('../layouts/navbar.ejs', {types: 'v1', state: 'home'}); %>
+ <nav class="navbar navbar-expand-lg navbar-dark comp-color ml-5 mr-5 nav-radius">
+ <img alt="Banner" class="navbar-brand lazyload" src="assets/logo_transparent.webp">
+ <button aria-controls="navbarTogglerDemo01" aria-expanded="false" aria-label="Toggle navigation"
+ class="navbar-toggler" data-target="#navbarTogglerDemo01" data-toggle="collapse" type="button">
+ <span class="navbar-toggler-icon"></span>
+ </button>
+ <div class="collapse navbar-collapse" id="navbarTogglerDemo01">
+ <ul class="navbar-nav mx-auto">
+ <li class="nav-item">
+ <a class="nav-link" href="/">Home</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="/product-list.html">Products</a>
+ </li>
+ <li class="nav-item active">
+ <a aria-disabled="true" class="nav-link disabled" href="/about-us.html">About Us</a>
+ </li>
+ <li class="nav-item">
+ <a class="nav-link" href="faq.html">FAQ</a>
+ </li>
+ </ul>
+ <span class="navbar-nav my-2 my-lg-0 text-white">
+ <div class="my-4">
+ <a href="login.html"><button class="btn btn-outline-success mt-auto mb-auto mr-3"
+ type="button">Login</button></a>
+ </div>
+ <a href="bag.html" class="mt-auto mb-auto" style="color: inherit;"><i class="fas fa-shopping-cart"><span
+ class="ml-2 mt-auto mb-auto">Rp 999.999</span></i></a>
+ </span>
+ </div>
+ </nav>
<br style="display: block;content: ' '; margin: 1vw 0; line-height: 1vw;">