@@ -133,6 +141,8 @@ const ProductDetails = function ({ detailproduct, backend, user, ...props }) {
product_price: e.target.value.toString(),
})
}}
+ // value={this.state.selectedOption}
+ // onChange={this.handleChange}
>
- Pilih Product OTR -
{detailproduct.map((option) => (
diff --git a/components/Yamaha/Shop/Cart.js b/components/Yamaha/Shop/Cart.js
index b89473f..bcb23da 100644
--- a/components/Yamaha/Shop/Cart.js
+++ b/components/Yamaha/Shop/Cart.js
@@ -178,15 +178,16 @@ const CartContent = function ({ backend, cart_product, ...props }) {
{
setFormValue({
...formValue,
- product_total: e.target.value,
+ product_total: e.target.value.toString(),
})
+ console.log("isi target value : ", e.target.value);
}}
/>
diff --git a/components/_App/NavbarHome.js b/components/_App/NavbarHome.js
index 04b6797..bdf7b34 100644
--- a/components/_App/NavbarHome.js
+++ b/components/_App/NavbarHome.js
@@ -1,5 +1,5 @@
import React, { useState } from "react";
-import {Links} from 'react-scroll'
+// import {Link} from 'react-scroll'
import Link from '@/utils/ActiveLink';
import * as Icon from 'react-feather';
diff --git a/components/_App/NavbarYamaha.js b/components/_App/NavbarYamaha.js
index 38f6040..bbd6bf1 100644
--- a/components/_App/NavbarYamaha.js
+++ b/components/_App/NavbarYamaha.js
@@ -96,8 +96,8 @@ export default function NavbarYamaha({ username, ...props }) {
-
- e.preventDefault()} className="nav-link">
+
+
Carrer
diff --git a/package.json b/package.json
index b9de1bd..0a614ac 100644
--- a/package.json
+++ b/package.json
@@ -28,6 +28,7 @@
"react-feather": "^2.0.9",
"react-hook-form": "^6.15.4",
"react-html-parser": "^2.0.2",
+ "react-icons": "^4.3.1",
"react-masonry-component": "^6.2.1",
"react-number-format": "^4.7.3",
"react-owl-carousel3": "^2.2.5",
diff --git a/pages/Sales/Sales.js b/pages/Sales/Sales.js
new file mode 100644
index 0000000..dd7a475
--- /dev/null
+++ b/pages/Sales/Sales.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import TeamStyleTwo from '@/components/Sales/Sales_Detail';
+
+import GetSales from "api/sales/sales-mercy.js";
+
+const Sales = function ({ backend, sales, ...props }) {
+ return (
+ <>
+
+ >
+ )
+}
+
+export default Sales;
+
+export async function getServerSideProps(context) {
+ var { query } = context;
+ var sales = [];
+ const backend = process.env.BACKEND_SERVER_URI;
+
+ var res = await GetSales.GetDetailSalesMerci(query.s || 0);
+ if (res["STATUS"] === 1) {
+ sales = res["DATA"]["salesMercies"];
+ }
+
+ return {
+ props: { sales, backend }, // will be passed to the page component as props
+ };
+}
\ No newline at end of file
diff --git a/pages/Sales/index.js b/pages/Sales/index.js
new file mode 100644
index 0000000..6a66a5e
--- /dev/null
+++ b/pages/Sales/index.js
@@ -0,0 +1,28 @@
+import React from 'react';
+import TeamStyleTwo from '@/components/Sales/Sales';
+
+import GetSales from "api/sales/sales-mercy.js";
+
+const Sales = function ({ backend, sales, ...props }) {
+ return (
+ <>
+
+ >
+ )
+}
+
+export default Sales;
+
+export async function getServerSideProps(context) {
+ var sales = [];
+ const backend = process.env.BACKEND_SERVER_URI;
+
+ var res = await GetSales.GetSalesMerci();
+ if (res["STATUS"] === 1) {
+ sales = res["DATA"]["salesMercies"];
+ }
+
+ return {
+ props: { sales, backend }, // will be passed to the page component as props
+ };
+}
\ No newline at end of file
diff --git a/pages/yamaha/Carrer/index.js b/pages/yamaha/Carrer/index.js
new file mode 100644
index 0000000..ef79050
--- /dev/null
+++ b/pages/yamaha/Carrer/index.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import Navbar from "@/components/_App/NavbarYamaha";
+import Footer from "@/components/_App/FooterYamaha";
+import PageBanner from '@/components/Common/PageBanner';
+import LatestNews from '@/components/Yamaha/LatestNews/LatestNews';
+
+import GetLatestNews from "api/latest_news/news.js"
+
+const News = function ({ backend, news, othernews, ...props }) {
+ return (
+ <>
+
+
+
+
+
+
+
+ >
+ )
+}
+
+export default News;
+
+export async function getServerSideProps(context) {
+ var news = [];
+ var othernews = [];
+ const backend = process.env.BACKEND_SERVER_URI;
+
+ var res = await GetLatestNews.GetNewsYamaha();
+ if (res["STATUS"] === 1) {
+ news = res["DATA"]["latestNews"];
+ }
+
+ var res = await GetLatestNews.GetOtherNewsYamaha();
+ if (res["STATUS"] === 1) {
+ othernews = res["DATA"]["latestNews"];
+ }
+
+ return {
+ props: { news, othernews, backend }, // will be passed to the page component as props
+ };
+}
\ No newline at end of file
diff --git a/pages/yamaha/LatestNews/LatestNewsDetail.js b/pages/yamaha/LatestNews/LatestNewsDetail.js
index 0893896..4ddcafe 100644
--- a/pages/yamaha/LatestNews/LatestNewsDetail.js
+++ b/pages/yamaha/LatestNews/LatestNewsDetail.js
@@ -36,7 +36,6 @@ export async function getServerSideProps(context) {
othernews = res["DATA"]["latestNews"];
}
- console.log(othernews);
return {
props: { news, othernews, backend }, // will be passed to the page component as props
};
diff --git a/pages/yamaha/LatestNews/index.js b/pages/yamaha/LatestNews/index.js
index 42d8e17..ef79050 100644
--- a/pages/yamaha/LatestNews/index.js
+++ b/pages/yamaha/LatestNews/index.js
@@ -37,7 +37,6 @@ export async function getServerSideProps(context) {
othernews = res["DATA"]["latestNews"];
}
- console.log(othernews);
return {
props: { news, othernews, backend }, // will be passed to the page component as props
};
diff --git a/pages/yamaha/Product/Ygp_Detail.js b/pages/yamaha/Product/Ygp_Detail.js
index 6a58971..530734c 100644
--- a/pages/yamaha/Product/Ygp_Detail.js
+++ b/pages/yamaha/Product/Ygp_Detail.js
@@ -49,8 +49,6 @@ export async function getServerSideProps(context) {
detailygp = res["DATA"]["ygParts"];
}
- console.log(detailygp);
-
return {
props: {
detailygp, backend, user,
diff --git a/pages/yamaha/index.js b/pages/yamaha/index.js
index 6e20b9c..8168535 100644
--- a/pages/yamaha/index.js
+++ b/pages/yamaha/index.js
@@ -57,9 +57,7 @@ export async function getServerSideProps(context) {
if (res["STATUS"] === 1) {
dealers = res["DATA"]["dealers"];
}
-
- console.log(dealers);
-
+
return {
props: { dealers, backend, user }, // will be passed to the page component as props
};
diff --git a/public/css/style.css b/public/css/style.css
index 3067866..defe591 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -127,7 +127,7 @@ a:hover, a:focus {
}
p {
- color: #6084a4;
+ color: #0e314c;
line-height: 1.8;
}
diff --git a/public/images/Sales/Logo Star.png b/public/images/Sales/Logo Star.png
new file mode 100644
index 0000000..dce8381
Binary files /dev/null and b/public/images/Sales/Logo Star.png differ
diff --git a/yarn.lock b/yarn.lock
index 40ac68c..8a29a6f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2816,6 +2816,11 @@ react-html-parser@^2.0.2:
dependencies:
htmlparser2 "^3.9.0"
+react-icons@^4.3.1:
+ version "4.3.1"
+ resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.3.1.tgz#2fa92aebbbc71f43d2db2ed1aed07361124e91ca"
+ integrity sha512-cB10MXLTs3gVuXimblAdI71jrJx8njrJZmNMEMC+sQu5B/BIOmlsAjskdqpn81y8UBVEGuHODd7/ci5DvoSzTQ==
+
react-is@16.13.1, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.1:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"