Merge branch 'master' into development_tri/implementasi_raja_ongkir

# Conflicts:
#	src/lib/checkout/components/Checkout.jsx

2 files changed, 35 insertions, 32 deletions

diff --git a/src/pages/sitemap/products/[id].xml.js b/src/pages/sitemap/products/[id].xml.js
deleted file mode 100644
index 98c2bf40..00000000
--- a/src/pages/sitemap/products/[id].xml.js
+++ /dev/null
@@ -1,32 +0,0 @@
-import productSearchApi from '@/lib/product/api/productSearchApi'
-import { create } from 'xmlbuilder'
-import _ from 'lodash-contrib'
-import { createSlug } from '@/core/utils/slug'
-
-export async function getServerSideProps({ res }) {
-  const baseUrl = process.env.SELF_HOST + '/shop/product'
-  const limit = 2500
-  const query = { limit }
-  const products = await productSearchApi({ query: _.toQuery(query) })
-  console.log(products)
-  // const sitemap = create('urlset', { encoding: 'UTF-8' })
-
-  // const date = new Date()
-  // pages.forEach((page) => {
-  //   const url = sitemap.ele('url')
-  //   url.ele('loc', createSlug(baseUrl, '', ''))
-  //   url.ele('lastmod', date.toISOString().slice(0, 10))
-  //   url.ele('changefreq', 'weekly')
-  //   url.ele('priority', '0.8')
-  // })
-
-  // res.setHeader('Content-Type', 'text/xml')
-  // res.write(sitemap.end())
-  // res.end()
-
-  return { props: {} }
-}
-
-export default function SitemapProducts() {
-  return <></>
-}
diff --git a/src/pages/sitemap/products/[page].js b/src/pages/sitemap/products/[page].js
new file mode 100644
index 00000000..2f9c3198
--- /dev/null
+++ b/src/pages/sitemap/products/[page].js
@@ -0,0 +1,35 @@
+import productSearchApi from '@/lib/product/api/productSearchApi'
+import { create } from 'xmlbuilder'
+import _ from 'lodash-contrib'
+import { createSlug } from '@/core/utils/slug'
+
+export async function getServerSideProps({ query, res }) {
+  const baseUrl = process.env.SELF_HOST + '/shop/product/'
+  const { page } = query
+  const limit = 2500
+  const queries = { limit, page: page.replace('.xml', '') }
+  const products = await productSearchApi({ query: _.toQuery(queries) })
+  const sitemap = create('urlset', { encoding: 'utf-8' }).att(
+    'xmlns',
+    'http://www.sitemaps.org/schemas/sitemap/0.9'
+  )
+
+  const date = new Date()
+  products.response.products.forEach((product) => {
+    const url = sitemap.ele('url')
+    url.ele('loc', createSlug(baseUrl, product.name, product.id))
+    url.ele('lastmod', date.toISOString().slice(0, 10))
+    url.ele('changefreq', 'weekly')
+    url.ele('priority', '0.8')
+  })
+
+  res.setHeader('Content-Type', 'text/xml')
+  res.write(sitemap.end())
+  res.end()
+
+  return { props: {} }
+}
+
+export default function SitemapProducts() {
+  return null
+}