From 828dd63b0ebcf5ccf3eadab84cfc736e929801c5 Mon Sep 17 00:00:00 2001
From: jaskaran <jaskaran.sarkaria@googlemail.com>
Date: Sun, 31 Jan 2021 13:20:23 +0000
Subject: [PATCH] get jewellery roughly working

---
 .routify/config.js                            |  2 +-
 .routify/routes.js                            |  4 +-
 rollup.config.js                              |  3 +-
 src/components/ProductView/ProductView.svelte | 18 +++--
 .../SearchJewellery/SearchJewellery.svelte    |  3 +
 src/libs/requests.ts                          | 18 ++---
 src/pages/online-shop/[category].svelte       | 44 +++++++------
 .../[subCategory]/[subCategory].svelte        | 65 ++++++++++++++++++-
 src/stores/categories.ts                      | 13 +++-
 9 files changed, 128 insertions(+), 42 deletions(-)

diff --git a/.routify/config.js b/.routify/config.js
index 0fc406c3..9681972a 100644
--- a/.routify/config.js
+++ b/.routify/config.js
@@ -13,5 +13,5 @@ module.exports = {
     "svx",
     "md"
   ],
-  "started": "2021-01-30T20:58:04.111Z"
+  "started": "2021-01-31T12:48:46.113Z"
 }
\ No newline at end of file
diff --git a/.routify/routes.js b/.routify/routes.js
index d9f3e9b9..91199f96 100644
--- a/.routify/routes.js
+++ b/.routify/routes.js
@@ -1,11 +1,11 @@
 
 /**
  * @roxi/routify 2.7.3
- * File generated Sat Jan 30 2021 20:58:05 GMT+0000 (Greenwich Mean Time)
+ * File generated Sun Jan 31 2021 12:48:47 GMT+0000 (Greenwich Mean Time)
  */
 
 export const __version = "2.7.3"
-export const __timestamp = "2021-01-30T20:58:05.710Z"
+export const __timestamp = "2021-01-31T12:48:47.585Z"
 
 //buildRoutes
 import { buildClientTree } from "@roxi/routify/runtime/buildRoutes"
diff --git a/rollup.config.js b/rollup.config.js
index b6a434bb..d73fd3a1 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -71,7 +71,8 @@ export default {
       'process.env.SERVER_URL': production ?
         JSON.stringify('https://server.enki.jobspeed.uk') :
         JSON.stringify('http://localhost:8080'),
-      'process.env.STRIPE_KEY': JSON.stringify('pk_test_51HpvnTAk37gvJ51oYwywMtrDcDlL6FXuVY0aQ1EYEJUiw9MG70UElEMhhazqhhafUOslK1IugHRApQ7GWNUcnqT400dJ4HWjbp')
+      'process.env.STRIPE_KEY': JSON.stringify('pk_test_51HpvnTAk37gvJ51oYwywMtrDcDlL6FXuVY0aQ1EYEJUiw9MG70UElEMhhazqhhafUOslK1IugHRApQ7GWNUcnqT400dJ4HWjbp'),
+      'process.env.JEWELLERY_CATEGORY_ID': JSON.stringify('1875996')
     }),
 
 		// In dev mode, call `npm run start` once
diff --git a/src/components/ProductView/ProductView.svelte b/src/components/ProductView/ProductView.svelte
index 2c563fb4..0adbb305 100644
--- a/src/components/ProductView/ProductView.svelte
+++ b/src/components/ProductView/ProductView.svelte
@@ -3,6 +3,7 @@
   import { onMount } from 'svelte';
   import AddToBasket from '../AddToBasket/AddToBasket.svelte';
   import { retrieveStateFn } from '../../libs/requests';
+
   import type { GetFn } from '../../libs/requests';
 
   interface Product {
@@ -16,17 +17,20 @@
 
   let productArr: readonly Product[] = [];
 
-  const getProducts: GetFn<Product> = (url: string): Promise<ReadonlyArray<Product>> =>
-    fetch(url).then((res) => res.json());
+  const getProducts: GetFn<Product> = (
+    url: string
+  ): Promise<ReadonlyArray<Product>> => fetch(url).then((res) => res.json());
 
-  onMount(async () => {
+  const refreshProducts = async (id: string) => {
     const result = await retrieveStateFn(
-      process.env.SERVER_URL as string,
-      categoryId,
+      `${process.env.SERVER_URL}/products-by-category?id=${id}`,
       getProducts
     )()();
-    productArr = result['_tag'] === 'Right' ? result.right : [];
-  });
+    productArr = result['_tag'] === 'Right' ? result.right as Product[] : [];
+  }
+
+  onMount(async () => await refreshProducts(categoryId));
+  $: refreshProducts(categoryId)
 </script>
 
 <style>
diff --git a/src/components/SearchJewellery/SearchJewellery.svelte b/src/components/SearchJewellery/SearchJewellery.svelte
index 78694d72..b1621bd9 100644
--- a/src/components/SearchJewellery/SearchJewellery.svelte
+++ b/src/components/SearchJewellery/SearchJewellery.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
   import { jewellery } from '../../stores/jewellery';
   import { onMount } from 'svelte';
+  
   let searchValue: string = '';
+  
   let results: any[] = [];
 
   const fetchJewelleryProducts = async () => {
@@ -10,6 +12,7 @@
         `${process.env.SERVER_URL}/jewellery-products`
       );
       const parsedResult = await response.json();
+      console.log("fetched", parsedResult)
       return parsedResult;
     } catch (err) {
       console.error('fetching jewellery products failed', err);
diff --git a/src/libs/requests.ts b/src/libs/requests.ts
index a0d53094..5051e7e1 100644
--- a/src/libs/requests.ts
+++ b/src/libs/requests.ts
@@ -12,12 +12,11 @@ export const fetchCategories = async () => {
 };
 
 export const retrieveStateFn = <T>(
-  serverUrl: string,
-  catId: string,
-  getState: GetFn<T>,
-) => (): () => Promise<E.Either<Error, ReadonlyArray<T>>> => {
+  url: string,
+  getState: GetFn<T>
+) => (): (() => Promise<E.Either<Error, T | ReadonlyArray<T>>>) => {
   // fetch all the products in a specific category
-  const get = (url: string): TE.TaskEither<Error, ReadonlyArray<T>> =>
+  const get = (url: string): TE.TaskEither<Error, T | ReadonlyArray<T>> =>
     // TaskEither is from asynchronous operations that can fail
     TE.tryCatch(
       () => getState(url),
@@ -25,11 +24,14 @@ export const retrieveStateFn = <T>(
     );
 
   return pipe(
-    `${serverUrl}/products-by-category?id=${catId}`,
+    url,
     get,
     TE.chain((result) => TE.of(result))
   );
 };
-export interface GetFn <T>{
-  (url: string): Promise<ReadonlyArray<T>>;
+export interface GetFn<T> {
+  (url: string): Promise<T | ReadonlyArray<T>>;
 }
+
+
+export const getCategoryId: GetFn<string> = (url: string): Promise<string> => fetch(url).then((res) => res.json());
diff --git a/src/pages/online-shop/[category].svelte b/src/pages/online-shop/[category].svelte
index 13fd2d29..dcb1d31b 100644
--- a/src/pages/online-shop/[category].svelte
+++ b/src/pages/online-shop/[category].svelte
@@ -4,45 +4,47 @@
   import { categories } from '../../stores/categories';
   import ProductView from '../../components/ProductView/ProductView.svelte';
   import SearchJewellery from '../../components/SearchJewellery/SearchJewellery.svelte';
+  import { retrieveStateFn, getCategoryId } from '../../libs/requests';
+
+  import type { Category } from '../../stores/categories'
 
   export let category: string;
 
-  const fetchCategoryById = async (id: string) => {
-    const response = await fetch(`${process.env.SERVER_URL}/category?id=${id}`);
-    const parsedResult = JSON.parse(await response.json());
-    return parsedResult;
-  };
-
-  onMount(async () => {
-    if (!$categories.hasOwnProperty('Id')) {
-      try {
-        const data = await fetchCategoryById(category);
-        categories.set(data);
-      } catch (err) {
-        console.error('fetching category failed', err);
-      }
-    }
+  const JEWELLERY_CATEGORY = process.env.JEWELLERY_CATEGORY_ID
+
+
+    onMount(async () => {
+    // This prevents the app for fetching the categories if it has already pulled them
+    // but will pull them if visiting the link directly
+    // if (!$categories.hasOwnProperty('Id') || $categories.Id === '') {
+    //   const result = await retrieveStateFn(`${process.env.SERVER_URL}/category?id=${category}`, getCategoryId)()()
+    //   const data: Category = result['_tag'] === 'Right' ? JSON.parse(result.right as string) : { Id: '', Name: '', Children: []}
+    //   categories.set(data);
+    // }
+      const result = await retrieveStateFn(`${process.env.SERVER_URL}/category?id=${category}`, getCategoryId)()()
+      const data: Category = result['_tag'] === 'Right' ? JSON.parse(result.right as string) : { Id: '', Name: '', Children: []}
+      categories.set(data);
   });
 </script>
 
 <h1>PARAMS {$params.category}</h1>
 <h1>{category}</h1>
 
-{#if category === '1821413'}
+{#if category === JEWELLERY_CATEGORY}
   <SearchJewellery />
 {/if}
 
-{#if $categories.hasOwnProperty('Id')}
+{#if $categories.Id !== JEWELLERY_CATEGORY}
   <h1>{$categories.Id}</h1>
   <h1>{$categories.Name}</h1>
   {#if $categories.Children.length > 0}
-    {#each $categories.Children as category}
+    {#each $categories.Children as cat}
       <button
         on:click={() => {
-          categories.set(category);
-          $goto(`./${$params.category}/${category.Id}`);
+          // categories.set(cat);
+          $goto(`./${$params.category}/${cat.Id}`);
         }}>
-        {category.Name}
+        {cat.Name}
       </button>
     {/each}
   {:else}
diff --git a/src/pages/online-shop/[subCategory]/[subCategory].svelte b/src/pages/online-shop/[subCategory]/[subCategory].svelte
index 69262a91..24b0e89d 100644
--- a/src/pages/online-shop/[subCategory]/[subCategory].svelte
+++ b/src/pages/online-shop/[subCategory]/[subCategory].svelte
@@ -1,10 +1,73 @@
 <script lang="ts">
   import { params } from '@roxi/routify';
+  import { onMount } from 'svelte';
   import ProductView from '../../../components/ProductView/ProductView.svelte';
+  import { categories } from '../../../stores/categories';
+  import { retrieveStateFn, getCategoryId } from '../../../libs/requests';
+  import type { Category } from '../../../stores/categories';
 
   export let subCategory: string;
+  let showProduct = false;
+  let productToShow: string;
+
+  onMount(async () => {
+    // This prevents the app for fetching the categories if it has already pulled them
+    // but will pull them if visiting the link directly
+    // if (!$categories.hasOwnProperty('Id') || $categories.Id === '') {
+    //   const result = await retrieveStateFn(
+    //     `${process.env.SERVER_URL}/category?id=${subCategory}`,
+    //     getCategoryId
+    //   )()();
+    //   const data: Category =
+    //     result['_tag'] === 'Right'
+    //       ? JSON.parse(result.right as string)
+    //       : { Id: '', Name: '', Children: [] };
+
+    //   categories.set(data);
+    // } else {
+      //   // show category children OR show productview
+      //   const matchedCat = [...$categories.Children];
+      //   categories.set(matchedCat.find(obj => obj.Id.toString() === subCategory)!)
+      // }
+      
+      const result = await retrieveStateFn(
+        `${process.env.SERVER_URL}/category?id=${subCategory}`,
+        getCategoryId
+        )()();
+        const data: Category =
+        result['_tag'] === 'Right'
+        ? JSON.parse(result.right as string)
+        : { Id: '', Name: '', Children: [] };
+          categories.set(data);
+  });
 </script>
 
 <h1>{JSON.stringify($params.subCategory)}</h1>
 <h1>{subCategory}</h1>
-<ProductView categoryId={subCategory} />
+
+<!-- <SearchJewellery /> -->
+
+{#if $categories.hasOwnProperty('Id') || $categories.Id === ''}
+  <h1>{$categories.Id}</h1>
+  <h1>{$categories.Name}</h1>
+  {#if $categories.Children.length > 0}
+    {#each $categories.Children as cat}
+      <button
+        on:click={() => {
+          showProduct = true
+          console.log(cat.Id)
+          productToShow = cat.Id
+          console.log(productToShow)
+          }}>
+        {cat.Name}
+      </button>
+      {/each}
+      {:else}
+      <ProductView categoryId={subCategory} />
+      {/if}
+      
+  {#if showProduct}
+    {console.log("product to show:", productToShow)}
+    <ProductView categoryId={productToShow} />
+  {/if}
+{/if}
\ No newline at end of file
diff --git a/src/stores/categories.ts b/src/stores/categories.ts
index a844fdc0..f65fb1a8 100644
--- a/src/stores/categories.ts
+++ b/src/stores/categories.ts
@@ -1,3 +1,14 @@
 import { writable } from 'svelte/store';
 
-export const categories = writable({});
+export interface Category {
+    Id: string;
+    Name: string;
+    Children: Category[];
+  }
+
+
+export const categories = writable<Category>({
+  Id: '',
+  Name: '',
+  Children: []
+});