From c653472382834bb5f900523e15befa7ce98faf11 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Mon, 18 Sep 2023 15:02:22 +0700 Subject: homepage service list --- src/pages/index.jsx | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/pages') diff --git a/src/pages/index.jsx b/src/pages/index.jsx index 47a0a493..64f3ac10 100644 --- a/src/pages/index.jsx +++ b/src/pages/index.jsx @@ -31,6 +31,7 @@ const FlashSale = dynamic(() => import('@/lib/flashSale/components/FlashSale'), const BannerSection = dynamic(() => import('@/lib/home/components/BannerSection')) const CategoryHomeId = dynamic(() => import('@/lib/home/components/CategoryHomeId')) const CustomerReviews = dynamic(() => import('@/lib/review/components/CustomerReviews')) +const ServiceList = dynamic(() => import('@/lib/home/components/ServiceList')) export default function Home() { const bannerRef = useRef(null) @@ -72,6 +73,7 @@ export default function Home() {
+ @@ -87,6 +89,9 @@ export default function Home() {
+ + + -- cgit v1.2.3 From 065a0e341cc42443fe5e2380e078983b3c66f111 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Mon, 25 Sep 2023 16:48:25 +0700 Subject: migrasi get brand di homepage dan page all brand ke solr --- src/pages/api/shop/brands.js | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 src/pages/api/shop/brands.js (limited to 'src/pages') diff --git a/src/pages/api/shop/brands.js b/src/pages/api/shop/brands.js new file mode 100644 index 00000000..e4619d15 --- /dev/null +++ b/src/pages/api/shop/brands.js @@ -0,0 +1,44 @@ +import axios from 'axios' + +export default async function handler(req, res) { + try { + let params = '*:*' + let sort = 'sort=if(exists(sequence_i),0,1) asc,sequence_i asc' + let rows = 2000 + + if (req.query.params) { + rows = 100 + switch (req?.query?.params) { + case 'level_s': + params = 'level_s:prioritas' + break + default: + params = `name_s:${req.query.params}` + } + } + let brands = await axios( + process.env.SOLR_HOST + + `/solr/brands/select?q=${params}&q.op=OR&indent=true&rows=${rows}&${sort}` + ) + + let dataBrands = responseMap(brands.data.response.docs) + + res.status(200).json(dataBrands) + } catch (error) { + console.error('Error fetching data from Solr:', error) + res.status(500).json({ error: 'Internal Server Error' }) + } +} + +const responseMap = (brands) => { + return brands.map((brand) => { + let brandMapping = { + id: brand.id, + name: brand.display_name_s, + logo: brand.image_s || '', + sequance: brand.sequence_i || '' + } + + return brandMapping + }) +} -- cgit v1.2.3 From 5b281f755af9277b75a199195d693cf49dc49d29 Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Mon, 25 Sep 2023 17:09:09 +0700 Subject: asc by image --- src/pages/api/shop/brands.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/api/shop/brands.js b/src/pages/api/shop/brands.js index e4619d15..e93fe2c9 100644 --- a/src/pages/api/shop/brands.js +++ b/src/pages/api/shop/brands.js @@ -3,7 +3,7 @@ import axios from 'axios' export default async function handler(req, res) { try { let params = '*:*' - let sort = 'sort=if(exists(sequence_i),0,1) asc,sequence_i asc' + let sort = 'sort=if(exists(sequence_i),0,1) asc,sequence_i asc, if(exists(image_s),0,1) asc ' let rows = 2000 if (req.query.params) { -- cgit v1.2.3 From 81787db3eddc401e40304286e4d01cf60a7ea3d0 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 27 Sep 2023 10:23:50 +0700 Subject: Update globals css and app js --- src/pages/_app.jsx | 33 ++++++++++----------------------- 1 file changed, 10 insertions(+), 23 deletions(-) (limited to 'src/pages') diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx index 0062f7fc..d5b59486 100644 --- a/src/pages/_app.jsx +++ b/src/pages/_app.jsx @@ -1,15 +1,16 @@ import '../styles/globals.css' import 'react-loading-skeleton/dist/skeleton.css' +import '@fontsource/inter' + import NextProgress from 'next-progress' import { useRouter, Router } from 'next/router' import { AnimatePresence, motion } from 'framer-motion' import { Toaster } from 'react-hot-toast' import { QueryClient, QueryClientProvider } from 'react-query' import useDevice from '@/core/hooks/useDevice' -import { createContext, useContext, useEffect, useState } from 'react' +import { createContext, useEffect, useState } from 'react' import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner' import { SessionProvider } from 'next-auth/react' -import { getAuth } from '@/core/utils/auth' import { ProductProvider } from '@/contexts/ProductContext' import { ProductCartProvider } from '@/contexts/ProductCartContext' @@ -25,12 +26,6 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }) { const { isMobile } = useDevice() const [animateLoader, setAnimateLoader] = useState(false) - const [authenticated, setAuthenticated] = useState(null) - const auth = getAuth() - - // useEffect(() => { - // setAuthenticated(auth) - // }, [auth]) useEffect(() => { const handleRouteChangeStart = () => setAnimateLoader(true) @@ -63,14 +58,13 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }) { }, [isMobile]) return ( - // {animateLoader && ( - window.scrollTo(0, 0)} - > - - - {!animateLoader && } - - - + + + + + - // ) } -- cgit v1.2.3 From 616e9292cd1db6bbc0cd28208e5403dd667152b9 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Wed, 27 Sep 2023 14:05:15 +0700 Subject: Update with chakra UI theme --- src/pages/_app.jsx | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/pages') diff --git a/src/pages/_app.jsx b/src/pages/_app.jsx index d5b59486..afebc293 100644 --- a/src/pages/_app.jsx +++ b/src/pages/_app.jsx @@ -1,6 +1,5 @@ import '../styles/globals.css' import 'react-loading-skeleton/dist/skeleton.css' -import '@fontsource/inter' import NextProgress from 'next-progress' import { useRouter, Router } from 'next/router' @@ -8,19 +7,16 @@ import { AnimatePresence, motion } from 'framer-motion' import { Toaster } from 'react-hot-toast' import { QueryClient, QueryClientProvider } from 'react-query' import useDevice from '@/core/hooks/useDevice' -import { createContext, useEffect, useState } from 'react' +import { useEffect, useState } from 'react' import LogoSpinner from '@/core/components/elements/Spinner/LogoSpinner' import { SessionProvider } from 'next-auth/react' import { ProductProvider } from '@/contexts/ProductContext' import { ProductCartProvider } from '@/contexts/ProductCartContext' +import { ChakraProvider } from '@chakra-ui/react' +import theme from '../../chakra.theme' const queryClient = new QueryClient() -export const AuthContext = createContext({ - authenticated: false, - setAuthenticated: (auth) => {} -}) - function MyApp({ Component, pageProps: { session, ...pageProps } }) { const router = useRouter() const { isMobile } = useDevice() @@ -86,7 +82,9 @@ function MyApp({ Component, pageProps: { session, ...pageProps } }) { - + + + -- cgit v1.2.3 From 607b943dae3cacffcd76a6763fddc3c218792d74 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Fri, 29 Sep 2023 15:35:44 +0700 Subject: Add except for non publish product solr --- src/pages/api/shop/search.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index d465d94b..54c89716 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -49,7 +49,8 @@ export default async function handler(req, res) { 'qf=name_s', `start=${offset}`, `rows=${limit}`, - `sort=${paramOrderBy}` + `sort=${paramOrderBy}`, + `facet.query=-publish_b:false` ] if (priceFrom > 0 || priceTo > 0) { -- cgit v1.2.3 From 435912559bf2d251b5c29d09d275445638fe1c32 Mon Sep 17 00:00:00 2001 From: Rafi Zadanly Date: Mon, 2 Oct 2023 09:11:05 +0700 Subject: Add except query for not publish product solr --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 54c89716..57b16db8 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -50,7 +50,7 @@ export default async function handler(req, res) { `start=${offset}`, `rows=${limit}`, `sort=${paramOrderBy}`, - `facet.query=-publish_b:false` + `fq=-publish_b:false` ] if (priceFrom > 0 || priceTo > 0) { -- cgit v1.2.3 From bdfaa0b8564e89d72ffd2de93eb088e8cf0db31e Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Mon, 2 Oct 2023 17:07:20 +0700 Subject: mapping new pricelist --- src/pages/api/shop/search.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/pages') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 57b16db8..79083ee7 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -104,17 +104,19 @@ const escapeSolrQuery = (query) => { const productResponseMap = (products, pricelist) => { return products.map((product) => { - let price = product.price_f || 0 + let price = price_tier1_v2_f || 0 let priceDiscount = product.price_discount_f || 0 let discountPercentage = product.discount_f || 0 if (pricelist) { - const pricelistDiscount = product?.[`price_${pricelist}_f`] || false - const pricelistDiscountPerc = product?.[`discount_${pricelist}_f`] || false + // const pricelistDiscount = product?.[`price_${pricelist}_f`] || false + // const pricelistDiscountPerc = product?.[`discount_${pricelist}_f`] || false - if (pricelistDiscount && pricelistDiscount > 0) priceDiscount = pricelistDiscount - if (pricelistDiscountPerc && pricelistDiscountPerc > 0) - discountPercentage = pricelistDiscountPerc + // if (pricelistDiscount && pricelistDiscount > 0) priceDiscount = pricelistDiscount + // if (pricelistDiscountPerc && pricelistDiscountPerc > 0) + // discountPercentage = pricelistDiscountPerc + + price = product?.[`price_${pricelist}_v2_f`] || 0 } if (product?.flashsale_id_i > 0) { -- cgit v1.2.3 From 787d3aaa3187d3432c8e6b743b555ea3e4a4980c Mon Sep 17 00:00:00 2001 From: "HATEC\\SPVDEV001" Date: Tue, 3 Oct 2023 15:25:14 +0700 Subject: new pricelist di page product cart, product detail & product variant --- src/pages/api/shop/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pages') diff --git a/src/pages/api/shop/search.js b/src/pages/api/shop/search.js index 79083ee7..7b44ef37 100644 --- a/src/pages/api/shop/search.js +++ b/src/pages/api/shop/search.js @@ -104,7 +104,7 @@ const escapeSolrQuery = (query) => { const productResponseMap = (products, pricelist) => { return products.map((product) => { - let price = price_tier1_v2_f || 0 + let price = product.price_tier1_v2_f || 0 let priceDiscount = product.price_discount_f || 0 let discountPercentage = product.discount_f || 0 -- cgit v1.2.3