@nyris/nyris-webapp 0.3.4 → 0.3.9

package/src/components/Feedback.tsx

@@ -1,94 +1,55 @@
-import { useAppDispatch, useAppSelector } from "Store/Store";
-import {
-  feedbackNegative,
-  feedbackSubmitPositive,
-  NyrisFeedbackState,
-} from "Store/Nyris";
-import React from "react";
-import { Animate } from "react-move";
-import { feedbackSuccessEpic } from "services/Feedback";
+import React from 'react';
+import {NyrisFeedbackState} from "../actions/nyrisAppActions";
+import {Animate} from "react-move";
+
 interface FeedbackProps {
-  feedbackState: NyrisFeedbackState;
-  onClose?: () => void;
+    feedbackState: NyrisFeedbackState,
+    onPositiveFeedback?: () => void,
+    onNegativeFeedback?: () => void,
+    onClose?: () => void
 }
 
-const Feedback: React.FC<FeedbackProps> = ({ feedbackState, onClose }) => {
-  let inner: any = null;
-  const state = useAppSelector((state) => state);
-  const dispatch = useAppDispatch();
-  const onPositiveFeedback = (data: boolean) => {
-    feedbackSuccessEpic(state, data);
-    if (data) {
-      dispatch(feedbackSubmitPositive());
-    } else {
-      dispatch(feedbackNegative());
+const Feedback: React.FC<FeedbackProps> = ({feedbackState, onPositiveFeedback, onNegativeFeedback, onClose}) => {
+    let inner : any = null;
+    switch (feedbackState) {
+        case 'question':
+            inner =
+                <div className="feedbackForm">
+                    <p>Did you find what you were looking for?</p>
+                    <div className="btn primary positiveFeedback" onClick={onPositiveFeedback}>Yes</div>
+                    <div className="btn secondary negativeFeedback" onClick={onNegativeFeedback}>No</div>
+                </div>;
+            break;
+        case 'positive':
+            inner = <div className="feedbackMessage positive">Great, thank you for your feedback!</div>
+            break;
+        case 'negative':
+            inner =
+                <div className="feedbackMessage negative">We saved your request so we can track down the
+                    issue and improve the search experience. Your Feedback helps us to make our service
+                    better for everyone,
+                    thank you!<br/>
+                    <div className="btn dismiss" onClick={onClose}>Dismiss</div>
+                </div>;
+            break;
+        default:
+            inner = null;
+            break;
     }
-  };
-
-  switch (feedbackState) {
-    case "question":
-      inner = (
-        <div className="feedbackForm">
-          <p>Did you find what you were looking for?</p>
-          <div
-            className="btn primary positiveFeedback"
-            onClick={() => onPositiveFeedback(true)}
-          >
-            Yes
-          </div>
-          <div
-            className="btn secondary negativeFeedback"
-            onClick={() => onPositiveFeedback(false)}
-          >
-            No
-          </div>
-        </div>
-      );
-      break;
-    case "positive":
-      inner = (
-        <div className="feedbackMessage positive">
-          Great, thank you for your feedback!
-        </div>
-      );
-      break;
-    case "negative":
-      inner = (
-        <div className="feedbackMessage negative">
-          We saved your request so we can track down the issue and improve the
-          search experience. Your Feedback helps us to make our service better
-          for everyone, thank you!
-          <br />
-          <div className="btn dismiss" onClick={onClose}>
-            Dismiss
-          </div>
-        </div>
-      );
-      break;
-    default:
-      inner = null;
-      break;
-  }
-  return (
-    <Animate
-      show={feedbackState !== "hidden"}
-      start={{ y: 100, opacity: 0 }}
-      enter={{ y: [0], opacity: [1] }}
-      leave={{ y: [100], opacity: [0] }}
-    >
-      {({ y, opacity }) => (
-        <section
-          className="feedback"
-          style={{ transform: `translateY(${y}%)`, opacity }}
-        >
-          <div className="wrapper">{inner}</div>
-          <div className="closeFeedbackContainer">
-            <div className="closeFeedback" onClick={onClose} />
-          </div>
-        </section>
-      )}
-    </Animate>
-  );
+    return (
+        <Animate show={feedbackState !== 'hidden'} start={{y: 100, opacity: 0}} enter={{y: [0], opacity: [1]}} leave={{y: [100], opacity: [0] }}>
+            {({y, opacity}) =>
+                <section className="feedback" style={{transform: `translateY(${y}%)`, opacity }}>
+                    <div className="wrapper">
+                        {inner}
+                    </div>
+                    <div className="closeFeedbackContainer">
+                        <div className="closeFeedback" onClick={onClose}/>
+                    </div>
+                </section>
+            }
+        </Animate>
+    );
 };
 
 export default Feedback;

package/src/components/FiltersList.tsx

@@ -0,0 +1,67 @@
+
+import React from 'react';
+import {Filter} from '../../../nyris-api/index';
+import { addToSelectedFilters, removeFromSelectedFilters } from '../actions/searchActions';
+import {  useDispatch } from 'react-redux';
+import { RiLayoutGridLine} from 'react-icons/ri';
+
+interface FilterProps {
+    filter : Filter,
+    selectedValues?: string[]
+}
+
+
+
+const FiltersList : React.FC<FilterProps> = ({filter, selectedValues})=>{
+    const dispatch = useDispatch();
+
+    const onFilterChanged=(e: React.ChangeEvent<HTMLInputElement>,value:string) =>{     
+       if (e.target.checked) {
+        if(filter.key)
+         dispatch(addToSelectedFilters(filter.key , value));
+        } else {
+            if(filter.key)
+            dispatch(removeFromSelectedFilters(filter.key, value));
+       }
+    }
+    
+    if(filter && filter.values && filter.key && filter.values.length > 0){   
+          
+        return (
+            <div>
+                <div className='item'>
+                <RiLayoutGridLine className="sidebar-icon" />
+                 <span className="sidebar-text"> {filter.key}</span>
+                </div>
+                
+               <div className='item'>
+               <div className="list-container">
+       
+             {filter.values.slice(0, 6).map((item, index) => { 
+                  const checked = selectedValues && selectedValues.includes(item);        
+            return ( 
+              
+                <div key={index}>
+                 
+                <input value={item} checked={checked ? true: false} type="checkbox" onChange={(e)=>onFilterChanged(e,item)} />          
+                <label className='itemLabel'>{item}</label>
+               </div>
+               )
+            })}
+       </div>  
+               </div>
+                                 
+            </div>
+
+        );
+    }
+    else{
+     return (
+       <div>
+        No filter to load
+       </div>
+  );
+ } 
+}
+
+export default FiltersList;

package/src/components/Header.tsx

@@ -1,35 +1,20 @@
 import React from "react";
 
-function HeaderComponent(): JSX.Element {
-  return (
-    <div className="navWrap">
-      <div className="wrapper" style={{ padding: 0 }}>
-        <section id="branding" />
-        <div id="menu" className="menuWrap" role="navigation">
-          <ul>
-            <li>
-              <a
-                href="https://nyris.io/imprint/#privacy"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                Privacy Policy
-              </a>
-            </li>
-            <li>
-              <a
-                href="https://nyris.io/"
-                target="_blank"
-                rel="noopener noreferrer"
-              >
-                Visit our Website
-              </a>
-            </li>
-          </ul>
-        </div>
-      </div>
-    </div>
-  );
-}
+const Header = () =>{
+return (
+    <div id="header">
+     
+    <section id="branding"></section>
+              <div id="menu" className="menuWrap" role="navigation" >
+                  <ul>
+                      <li><a href="https://nyris.io/imprint/#privacy" target="_blank"
+                             rel="noopener noreferrer">Privacy Policy</a></li>
+                      <li><a href="https://nyris.io/" target="_blank" rel="noopener noreferrer">Visit our
+                          Website</a></li>
+                  </ul>
+              </div>
+</div>
+);
 
-export default HeaderComponent;
+}
+export default Header;

package/src/components/Result.tsx

@@ -1,210 +1,137 @@
-import React from "react";
-import { OfferNyrisResult as ResultData } from "@nyris/nyris-api";
+import React from 'react';
+import {OfferNyrisResult as ResultData} from "@nyris/nyris-api";
 
 // TODO this needs refactoring: Make it one block with parameters for first line, second line, image url ..
 
 interface Options {
-  result: any;
-  noImageUrl: string;
-  onImageClick: (e: React.MouseEvent) => void;
-  onLinkClick: (e: React.MouseEvent) => void;
+    result: any,
+    noImageUrl: string,
+    onImageClick: (e: React.MouseEvent) => void,
+    onLinkClick: (e: React.MouseEvent) => void
 }
 
 const renderPrice = (result: ResultData) =>
-  result.p ? "" + (result.p.vi / 100).toFixed(2) + " " + result.p.c : "";
+    result.p ? '' + (result.p.vi / 100).toFixed(2) + ' ' + result.p.c : '';
 
-const renderDefault = ({
-  result,
-  noImageUrl,
-  onImageClick,
-  onLinkClick,
-}: Options) => {
-  return (
-    <>
-      <a
-        href={result.l}
-        className="imageLink"
-        title="Click the image so see similar products"
-        onClick={onImageClick}
-        onAuxClick={onLinkClick}
-      >
-        <div className="prdctImg">
-          <div className="imgWrap">
-            <img
-              src={(result.img && result.img.url + "?r=512x512") || noImageUrl}
-              alt={result.title}
-            />
-          </div>
-        </div>
-      </a>
-      <div className="prdctDetailsWrap">
-        <div>
-          <div className="prdctTitle">{result.title}</div>
-          <div className="prdctMeta">
-            <span className="prdctPrice">{renderPrice(result)}</span>
-          </div>
-          <a
-            onClick={onLinkClick}
-            onAuxClick={onLinkClick}
-            className="prdctShopLink"
-            href={result.l}
-            target="_blank"
-            rel="noopener noreferrer"
-          >
-            Buy Now
-          </a>
-        </div>
-      </div>
-    </>
-  );
+const renderDefault = ({result, noImageUrl, onImageClick, onLinkClick}: Options) => {
+    return (
+        <>
+            <a href={result.l} className="imageLink" title="Click the image so see similar products"
+               onClick={onImageClick}
+               onAuxClick={onLinkClick}>
+                <div className="prdctImg">
+                    <div className="imgWrap">
+                        <img src={(result.img && result.img.url + '?r=512x512') || noImageUrl} alt={result.title}/>
+                    </div>
+                </div>
+            </a>
+            <div className="prdctDetailsWrap">
+                <div>
+                    <div className="prdctTitle">{result.title}</div>
+                    <div className="prdctMeta">
+                        <span className="prdctPrice">{renderPrice(result)}</span>
+                    </div>
+                    <a onClick={onLinkClick} onAuxClick={onLinkClick} className="prdctShopLink" href={result.l}
+                       target="_blank" rel="noopener noreferrer">Buy Now</a>
+                </div>
+            </div>
+        </>
+    );
 };
 
-const renderSnr = ({
-  result,
-  noImageUrl,
-  onImageClick,
-  onLinkClick,
-}: Options) => (
-  <>
-    <a
-      href={result.l}
-      className="imageLink"
-      onClick={onImageClick}
-      onAuxClick={onLinkClick}
-    >
-      <div className="prdctImg">
-        <div className="imgWrap">
-          <img
-            src={(result.img && result.img.url + "?r=512x512") || noImageUrl}
-            alt={result.title}
-          />
-        </div>
-      </div>
-    </a>
-    <div className="prdctDetailsWrap">
-      <div>
-        <div className="prdctTitle">{result.sku}</div>
-        <div
-          className="prdctMeta"
-          style={{ height: "5em", whiteSpace: "normal" }}
-        >
-          {result.title}
-        </div>
-        <a
-          style={{ backgroundImage: "none", paddingLeft: "10px" }}
-          className="prdctShopLink"
-          href={result.l}
-          target="_blank"
-          rel="noopener noreferrer"
-          onClick={onLinkClick}
-          onAuxClick={onLinkClick}
-        >
-          Info
+const renderSnr = ({result, noImageUrl, onImageClick, onLinkClick}: Options) => (
+    <>
+        <a href={result.l} className="imageLink" onClick={onImageClick} onAuxClick={onLinkClick}>
+            <div className="prdctImg">
+                <div className="imgWrap">
+                    <img src={(result.img && result.img.url + '?r=512x512') || noImageUrl} alt={result.title}/>
+                </div>
+            </div>
         </a>
-      </div>
-    </div>
-  </>
+        <div className="prdctDetailsWrap">
+            <div>
+                <div className="prdctTitle">{result.sku}</div>
+                <div className="prdctMeta" style={{height: '5em', whiteSpace: 'normal'}}>
+                    {result.title}
+                </div>
+                <a style={{backgroundImage: 'none', paddingLeft: '10px'}} className="prdctShopLink" href={result.l}
+                   target="_blank" rel="noopener noreferrer"
+                   onClick={onLinkClick} onAuxClick={onLinkClick}>Info</a>
+            </div>
+        </div>
+    </>
 );
 
-const renderSnrMultilink = (
-  { result, noImageUrl, onImageClick }: Options,
-  onLinkClick: (url: string) => void
-) => (
-  <>
-    <a
-      href={result.l}
-      className="imageLink"
-      onClick={onImageClick}
-      onAuxClick={onImageClick}
-    >
-      <div className="prdctImg">
-        <div className="imgWrap">
-          <img
-            src={(result.img && result.img.url + "?r=512x512") || noImageUrl}
-            alt={result.title}
-          />
-        </div>
-      </div>
-    </a>
-    <div className="prdctDetailsWrap">
-      <div>
-        <div className="prdctTitle">{result.sku}</div>
-        <div
-          className="prdctMeta"
-          style={{ height: "5em", whiteSpace: "normal" }}
-        >
-          {result.title}
+const renderSnrMultilink = ({result, noImageUrl, onImageClick}: Options, onLinkClick: (url: string) => void) => (
+    <>
+        <a href={result.l} className="imageLink"
+           onClick={onImageClick} onAuxClick={onImageClick}>
+            <div className="prdctImg">
+                <div className="imgWrap">
+                    <img src={(result.img && result.img.url + '?r=512x512') || noImageUrl} alt={result.title}/>
+                </div>
+            </div>
+        </a>
+        <div className="prdctDetailsWrap">
+            <div>
+                <div className="prdctTitle">{result.sku}</div>
+                <div className="prdctMeta" style={{height: '5em', whiteSpace: 'normal'}}>
+                    {result.title}
+                </div>
+                {result.l.map((l: { text: string, href: string }) =>
+                    <a style={{backgroundImage: 'none', paddingLeft: '10px'}} className="prdctShopLink" href={l.href}
+                       onClick={() => onLinkClick(l.href)} onAuxClick={() => onLinkClick(l.href)} target="_blank"
+                       key={l.href}
+                       rel="noopener noreferrer">{l.text}</a>
+                )}
+            </div>
         </div>
-        {result.l.map((l: { text: string; href: string }) => (
-          <a
-            style={{ backgroundImage: "none", paddingLeft: "10px" }}
-            className="prdctShopLink"
-            href={l.href}
-            onClick={() => onLinkClick(l.href)}
-            onAuxClick={() => onLinkClick(l.href)}
-            target="_blank"
-            key={l.href}
-            rel="noopener noreferrer"
-          >
-            {l.text}
-          </a>
-        ))}
-      </div>
-    </div>
-  </>
+    </>
 );
 
 export interface ResultProps {
-  result: any;
-  style: any;
-  template?: string;
-  onImageClick: (pos: number, url: string) => void;
-  onLinkClick: (pos: number, url: string) => void;
-  noImageUrl?: string;
+    result: any,
+    style: any,
+    template?: string,
+    onImageClick: (pos: number, url: string) => void,
+    onLinkClick: (pos: number, url: string) => void,
+    noImageUrl?: string
 }
 
-const Result: React.FC<ResultProps> = ({
-  result,
-  style,
-  template,
-  onImageClick,
-  onLinkClick,
-  noImageUrl,
-}) => {
-  let options: Options = {
-    onImageClick: (e: React.MouseEvent) => {
-      e.preventDefault();
-      onImageClick(result.position, result.img.url);
-    },
-    onLinkClick: (e: React.MouseEvent) => {
-      e.preventDefault();
-      onLinkClick(result.position, result.l);
-    },
-    noImageUrl: noImageUrl || "images/ic_cam_large_noimage.png",
-    result,
-  };
+const Result: React.FC<ResultProps> = ({result, style, template, onImageClick, onLinkClick, noImageUrl}) => {
+    let options: Options = {
+        onImageClick: (e: React.MouseEvent) => {
+            e.preventDefault();
+            onImageClick(result.position, result.img.url);
+        },
+        onLinkClick: (e: React.MouseEvent) => {
+            e.preventDefault();
+            onLinkClick(result.position, result.l);
+        },
+        noImageUrl: noImageUrl || 'images/ic_cam_large_noimage.png',
+        result
+    };
 
-  let resultInner = null;
-  switch (template) {
-    case "snr":
-      resultInner = renderSnr(options);
-      break;
-    case "snr-multilink":
-      resultInner = renderSnrMultilink(options, (url) =>
-        onLinkClick(result.position, url)
-      );
-      break;
-    case "default":
-    default:
-      resultInner = renderDefault(options);
-      break;
-  }
+    let resultInner = null;
+    switch (template) {
+        case "snr":
+            resultInner = renderSnr(options);
+            break;
+        case "snr-multilink":
+            resultInner = renderSnrMultilink(options, (url) => onLinkClick(result.position, url));
+            break;
+        case 'default':
+        default:
+            resultInner = renderDefault(options);
+            break;
+    }
 
-  return (
-    <div className="prdctItem" style={{ ...style }}>
-      {resultInner}
-    </div>
-  );
+    return (
+        <div className="prdctItem" style={{...style}}>
+            {resultInner}
+        </div>
+    );
 };
 
+
 export default Result;

package/src/components/Sidebar.tsx

@@ -0,0 +1,42 @@
+import React, { useState } from 'react';
+import {RiMenuLine} from 'react-icons/ri';
+import { Filter } from '../../../nyris-api/index';
+import  FiltersList from './FiltersList';
+
+interface SidebarProps {
+    filters: Filter[],
+    selectedFilters: Map<string, string[]>
+}
+
+const Sidebar: React.FC<SidebarProps> = ({filters, selectedFilters}) =>{
+  const [isExpanded, setIsExpanded] = useState(false);
+  const handleToggler =()=>{
+      if(isExpanded){
+          setIsExpanded(false);
+          return;
+      }
+      setIsExpanded(true);
+  }
+  return (
+
+      <div className={isExpanded ? "sidebar" : "Sidebar collapsed"}>
+        <div className="sidebarContent" >
+           <div className="sidebarHeader">
+            <RiMenuLine className="sidebar-icon" onClick={handleToggler}/>
+            <h1 className={isExpanded ? "sidebar-logo" : "sidebar-logo collapsedHide"}> Select Filters </h1>
+            </div>
+            <div className={isExpanded ? "Sidebar-items" : "Sidebar-items collapsedHide"}>
+            {filters && filters.map((x) => {
+                let selectedValues =  x.key ? selectedFilters.get(x.key): undefined
+               return <FiltersList filter={x} selectedValues={selectedValues}/>
+               })
+            }   
+            </div>
+        </div>     
+      </div>
+ 
+             
+  )
+}
+
+export default Sidebar

package/src/defaults.ts

@@ -17,10 +17,7 @@ export const defaultSettings : AppSettings = {
         '^https?://(www.)?vimeo.com/',
         '^https?://(www.)?dailymotion.com/',
         '^https?://(www.)?dai.ly/'
-    ],
-    themePage: {
-        default: { active: true }
-    }
+    ]
 };
 
 export const defaultMdSettings = {
@@ -30,8 +27,10 @@ export const defaultMdSettings = {
     appBarTitle: '',
     primaryColor: '#e2001a',
     secondaryColor: '#777777',
+
     resultFirstRowProperty: 'title',
     resultSecondRowProperty: 'sku',
     resultLinkText: 'Info',
+
     customFontFamily: 'Helvetica',
 };