@nyris/nyris-webapp 0.3.22 → 0.3.24

package/src/modules/LandingPage/AppMD.tsx

@@ -1,399 +1,72 @@
-import { useDropzone } from "react-dropzone";
-import {
-  makeStyles,
-  Button,
-  Card,
-  CardActions,
-  CardContent,
-  CardMedia,
-  CircularProgress,
-  Container,
-  CssBaseline,
-  Fab,
-  Grid,
-  Hidden,
-  Typography,
-} from "@material-ui/core";
-import { PhotoCamera, ArrowBack, Image } from "@material-ui/icons";
-import Icon from "@material-ui/core/Icon";
-import { NodeGroup } from "react-move";
-import classNames from "classnames";
-import {Capture, Preview} from "@nyris/nyris-react-components";
-import _  from "lodash";
-import {AppProps} from "./propsType";
-import React from "react";
+import { Box } from '@material-ui/core';
+import React, { useState } from 'react';
+import './common.scss';
+import { cadExtensions } from '@nyris/nyris-api';
+import algoliasearch from 'algoliasearch/lite';
+import IconSupport from 'common/assets/icons/support3.svg';
+import DragDropFile from 'components/DragDropFile';
+import CustomSearchBox from 'components/input/inputSearch';
+import { connectInfiniteHits } from 'react-instantsearch-dom';
+import { useMediaQuery } from 'react-responsive';
+import { Link } from 'react-router-dom';
+import { useAppSelector } from 'Store/Store';
+import { AlgoliaSettings } from '../../types';
 
-const useStyles = makeStyles((theme) => ({
-  icon: {
-    marginRight: theme.spacing(2),
-  },
-  heroContent: {
-    backgroundColor: theme.palette.background.paper,
-    padding: theme.spacing(8, 0, 6),
-    transition: "all 300ms",
-    overflow: "hidden",
-    height: 500,
-  },
-  heroContentClosed: {
-    height: 0,
-    padding: 0,
-  },
-  heroButtons: {
-    marginTop: theme.spacing(4),
-  },
-  cardGrid: {
-    paddingTop: theme.spacing(8),
-    paddingBottom: theme.spacing(8),
-    minHeight: 600,
-    overflow: "hidden",
-    transition: "all 300ms",
-  },
-  cardGridCollapsed: {
-    height: 0,
-    opacity: 0,
-    minHeight: 0,
-    paddingTop: 0,
-    paddingBottom: 0,
-  },
-  card: {
-    height: "100%",
-    display: "flex",
-    flexDirection: "column",
-  },
-  cardMedia: {
-    paddingTop: "56.25%", // 16:9
-    backgroundSize: "contain",
-  },
-  cardContent: {
-    flexGrow: 1,
-    paddingBottom: 0,
-  },
-  footer: {
-    backgroundColor: theme.palette.background.paper,
-    padding: theme.spacing(6),
-  },
-  withElipsis: {
-    textOverflow: "ellipsis",
-    overflow: "hidden",
-    whiteSpace: "nowrap",
-  },
-  loading: {
-    margin: theme.spacing(2),
-  },
-  fabContainer: {
-    position: "fixed",
-    bottom: theme.spacing(2),
-  },
-  fab: {
-    marginLeft: theme.spacing(2),
-  },
-}));
+interface Props {}
 
-const makeFileHandler = (action: any) => (e: any) => {
-  let file = (e.dataTransfer && e.dataTransfer.files[0]) || e.target.files[0];
-  if (e.target && e.target.value) {
-    e.target.value = "";
-  }
+function AppMD(props: Props) {
+  const { settings } = useAppSelector(state => state);
+  const [isLoading, setLoading] = useState<boolean>(false);
+  const { apiKey, appId, indexName } = settings.algolia as AlgoliaSettings;
+  const searchClient = algoliasearch(appId, apiKey);
+  searchClient.initIndex(indexName);
+  const isMobile = useMediaQuery({ query: '(max-width: 776px)' });
 
-  if (file) {
-    action(file);
-  }
-};
+  const acceptTypes = ['image/*']
+    .concat(settings.cadSearch ? cadExtensions : [])
+    .join(',');
 
-const LandingPageAppMD = (props: AppProps) => {
-  const classes = useStyles();
-  const {
-    handlers,
-    showPart,
-    acceptTypes,
-    settings,
-    search,
-    loading,
-    previewImage
-  } = props;
+  const InfiniteHits = ({ hits }: any) => {
+    return <div></div>;
+  };
 
-  const mdSettings = settings.themePage.materialDesign;
-
-  const {
-    results,
-    regions,
-    previewSelection,
-  } = search;
-
-  const {
-    onLinkClick,
-    onFileDropped,
-    onCaptureComplete,
-    onCaptureCanceled,
-    onSelectFile,
-    onCameraClick,
-    onShowStart,
-    onSelectionChange,
-  } = handlers;
-
-  const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop: (fs: File[]) => {
-      onFileDropped(fs[0]);
-    },
-  });
+  const onChangeLoading = (value: boolean) => {
+    setLoading(value);
+  };
 
+  const CustomInfiniteHits = connectInfiniteHits(InfiniteHits);
 
   return (
-    <React.Fragment>
-      {!_.isEmpty(mdSettings?.resultLinkIcon) && (
-        <link
-          rel="stylesheet"
-          href="https://fonts.googleapis.com/icon?family=Material+Icons"
-        />
-      )}
-      <CssBaseline />
-      {showPart === "camera" && (
-        <Capture
-          onCaptureComplete={onCaptureComplete}
-          onCaptureCanceled={onCaptureCanceled}
-          useAppText="Use default camera app"
-        />
+    <Box className={`box-content-main ${isLoading ? 'loading' : ''}`}>
+      {isMobile && (
+        <Box className="btn-open-support">
+          <Link to={'/support'} style={{ color: '#3E36DC' }}>
+            <img src={IconSupport} alt="" width={16} height={16} />
+          </Link>
+        </Box>
       )}
-      <main>
-        <div
-          className={classNames(
-            classes.heroContent,
-            showPart === "results" ? classes.heroContentClosed : null
-          )}
-        >
-          <Container maxWidth="md">
-            <div>
-              <Hidden mdUp>
-                <div style={{ textAlign: "center" }}>
-                  <PhotoCamera style={{ fontSize: "20em", color: "#cccccc" }} />
-                </div>
-                <div style={{ textAlign: "center" }}>
-                  <Button
-                    variant={"contained"}
-                    color={"primary"}
-                    onClick={onCameraClick}
-                  >
-                    Take a picture
-                  </Button>
-                </div>
-                <div style={{ textAlign: "center" }}>
-                  <Typography>or</Typography>
-                </div>
-                <div style={{ textAlign: "center" }}>
-                  <input
-                    accept={acceptTypes}
-                    id="raised-button-file"
-                    type="file"
-                    onChange={makeFileHandler(onSelectFile)}
-                    style={{
-                      width: ".1px",
-                      height: ".1px",
-                      overflow: "hidden",
-                      opacity: 0,
-                    }}
-                  />
-                  <label htmlFor="raised-button-file">
-                    <Button
-                      variant={"contained"}
-                      color={"primary"}
-                      component="span"
-                    >
-                      Select a file
-                    </Button>
-                  </label>
-                </div>
-              </Hidden>
-              <Hidden smDown>
-                <div
-                  style={{
-                    borderStyle: "dashed",
-                    borderWidth: 5,
-                    borderColor: isDragActive ? "#ccc" : "#eee",
-                    borderRadius: 10,
-                    padding: 10,
-                    paddingBottom: 30,
-                  }}
-                  {...getRootProps({
-                    onClick: (e) => {
-                      e.stopPropagation();
-                    },
-                  })}
-                >
-                  <div style={{ textAlign: "center" }}>
-                    <Image style={{ fontSize: "20em", color: "#cccccc" }} />
-                  </div>
-                  <div style={{ textAlign: "center" }}>
-                    <Typography variant="body2">DROP AN IMAGE</Typography>
-                  </div>
-                  <div style={{ textAlign: "center" }}>
-                    <Typography variant="subtitle2">or</Typography>
-                  </div>
-                  <div style={{ textAlign: "center" }}>
-                    <input
-                      accept={acceptTypes}
-                      id="raised-button-file"
-                      type="file"
-                      {...getInputProps()}
-                      onChange={makeFileHandler(onSelectFile)}
-                      style={{
-                        width: ".1px",
-                        height: ".1px",
-                        overflow: "hidden",
-                        opacity: 0,
-                      }}
-                    />
-                    <label htmlFor="raised-button-file">
-                      <Button
-                        variant={"contained"}
-                        color={"primary"}
-                        component="span"
-                      >
-                        Select an image
-                      </Button>
-                    </label>
-                  </div>
-                </div>
-              </Hidden>
+      <Box className="box-content_top">
+        <Box className="fw-700 text-f32 text-dark2">
+          <h1>{settings.headerText}</h1>
+        </Box>
+        <div className="box-input">
+          <div className="wrap-input-search">
+            <div style={{ display: 'none' }}>
+              <CustomInfiniteHits />
             </div>
-          </Container>
+            <CustomSearchBox />
+          </div>
         </div>
-        <Container
-          className={classNames(
-            classes.cardGrid,
-            showPart !== "results" && classes.cardGridCollapsed
-          )}
-          maxWidth="md"
-        >
-          {previewImage && (
-            <Card style={{ marginBottom: "4em" }} raised={true}>
-              <Preview
-                key={previewImage?.id}
-                onSelectionChange={onSelectionChange}
-                image={previewImage?.canvas}
-                selection={previewSelection}
-                regions={regions}
-                maxWidth={400}
-                maxHeight={500}
-                dotColor="#FBD914"
-              />
-            </Card>
-          )}
-
-          {loading && (
-            <div style={{ textAlign: "center" }}>
-              <CircularProgress className={classes.loading} />
-            </div>
-          )}
-
-          <Grid container spacing={4}>
-            <NodeGroup
-              data={results}
-              keyAccessor={(r) => r.position + r.sku}
-              start={(r, i) => ({ opacity: 0, translateX: -100 })}
-              enter={(r, i) => ({
-                opacity: [1],
-                translateX: [0],
-                timing: { delay: i * 100, duration: 300 },
-              })}
-            >
-              {(rs) => (
-                <>
-                  {rs.map(({ key, data: result, state }) => (
-                    <Grid item key={key} xs={12} sm={4} md={3}>
-                      <Card
-                        className={classes.card}
-                        style={{
-                          opacity: state.opacity,
-                          position: "relative",
-                          transform: `translateX(${state.translateX}%)`,
-                        }}
-                      >
-                        <CardMedia
-                          className={classes.cardMedia}
-                          image={
-                            (result.img && result.img.url) ||
-                            settings.noImageUrl
-                          }
-                          title={result.title}
-                        />
-                        <CardContent className={classes.cardContent}>
-                          <Typography
-                            gutterBottom
-                            variant="subtitle2"
-                            component="h5"
-                            className={classes.withElipsis}
-                          >
-                            {result[mdSettings?.resultFirstRowProperty!!]}
-                          </Typography>
-                          <Typography
-                            variant="body2"
-                            className={classes.withElipsis}
-                          >
-                            {result[mdSettings?.resultSecondRowProperty!!]}
-                          </Typography>
-                        </CardContent>
-                        {result.l && (
-                          <CardActions>
-                            <Button
-                              variant="outlined"
-                              style={{ marginLeft: "auto" }}
-                              size="small"
-                              color="primary"
-                              onClick={
-                                () => {
-                                  onLinkClick(
-                                    result.position,
-                                    result.l
-                                  );
-                                }
-                              }
-                              onAuxClick={() => {
-                                onLinkClick(
-                                  result.position,
-                                  result.l
-                                );
-                              }}
-                            >
-                              {mdSettings?.resultLinkIcon && (
-                                <React.Fragment>
-                                  <Icon>{mdSettings.resultLinkIcon}</Icon>{" "}
-                                </React.Fragment>
-                              )}
-                              {mdSettings?.resultLinkText}
-                            </Button>
-                          </CardActions>
-                        )}
-                      </Card>
-                    </Grid>
-                  ))}
-                </>
-              )}
-            </NodeGroup>
-          </Grid>
-
-          {results.length === 0 && showPart === "results" && !loading && (
-            <Typography variant="h3" align="center">
-              We did not find anything
-            </Typography>
-          )}
-        </Container>
-        {showPart !== "start" && (
-          <Container maxWidth="lg">
-            <div className={classes.fabContainer}>
-              <Fab
-                aria-label="back"
-                className={classes.fab}
-                color="primary"
-                onClick={onShowStart}
-              >
-                <ArrowBack />
-              </Fab>
-            </div>
-          </Container>
-        )}
-      </main>
-    </React.Fragment>
+      </Box>
+      <Box className="box-content_bottom">
+        <DragDropFile
+          acceptTypes={acceptTypes}
+          isLoading={isLoading}
+          onChangeLoading={onChangeLoading}
+        />
+      </Box>
+    </Box>
   );
-};
+}
 
-export default LandingPageAppMD;
+export default AppMD;

package/src/modules/LandingPage/AppMobile.tsx

@@ -87,7 +87,7 @@ function AppMobile(props: Props): JSX.Element {
             height: '100%',
             width: '100%',
             zIndex: 1,
-            background: `${settings.themePage.searchSuite?.mobileFooterImageColor}`,
+            background: `${settings.theme?.mobileFooterImageColor}`,
           }}
         ></div>
         <Box style={{ position: 'inherit', zIndex: 100 }} className="title-top">

package/src/modules/LandingPage/propsType.ts

@@ -1,43 +1,41 @@
-import {CategoryPrediction, Code, RectCoords, Region} from "@nyris/nyris-api";
-import {AppSettings, CanvasWithId, MDSettings} from "../../types";
-import {NyrisAppPart, NyrisFeedbackState} from "../../Store/Nyris";
+import { CategoryPrediction, Code, RectCoords, Region } from '@nyris/nyris-api';
+import { AppSettings, CanvasWithId } from '../../types';
+import { NyrisAppPart, NyrisFeedbackState } from '../../Store/Nyris';
 
 export interface AppHandlers {
-    onExampleImageClick: (url: string) => void;
-    onImageClick: (position: number, url: string) => void;
-    onLinkClick: (position: number, url: string) => void;
-    onFileDropped: (file: File) => void;
-    onCaptureComplete: (image: HTMLCanvasElement) => void;
-    onCaptureCanceled: () => void;
-    onSelectFile: (f: File) => void;
-    onCameraClick: () => void;
-    onShowStart: () => void;
-    onSelectionChange: (r: RectCoords) => void;
-    onPositiveFeedback: () => void;
-    onNegativeFeedback: () => void;
-    onCloseFeedback: () => void;
+  onExampleImageClick: (url: string) => void;
+  onImageClick: (position: number, url: string) => void;
+  onLinkClick: (position: number, url: string) => void;
+  onFileDropped: (file: File) => void;
+  onCaptureComplete: (image: HTMLCanvasElement) => void;
+  onCaptureCanceled: () => void;
+  onSelectFile: (f: File) => void;
+  onCameraClick: () => void;
+  onShowStart: () => void;
+  onSelectionChange: (r: RectCoords) => void;
+  onPositiveFeedback: () => void;
+  onNegativeFeedback: () => void;
+  onCloseFeedback: () => void;
 }
 
-
 export interface AppProps {
-    search: {
-        results: any[];
-        requestId?: string;
-        duration?: number;
-        categoryPredictions: CategoryPrediction[];
-        codes: Code[];
-        filterOptions: string[];
-        errorMessage?: string;
-        regions: Region[];
-        previewSelection: RectCoords;
-        toastErrorMessage?: string;
-    };
-    acceptTypes: string,
-    previewImage?: CanvasWithId;
-    settings: AppSettings;
-    loading: boolean;
-    showPart: NyrisAppPart;
-    feedbackState: NyrisFeedbackState;
-    handlers: AppHandlers;
-    mdSettings: MDSettings;
+  search: {
+    results: any[];
+    requestId?: string;
+    duration?: number;
+    categoryPredictions: CategoryPrediction[];
+    codes: Code[];
+    filterOptions: string[];
+    errorMessage?: string;
+    regions: Region[];
+    previewSelection: RectCoords;
+    toastErrorMessage?: string;
+  };
+  acceptTypes: string;
+  previewImage?: CanvasWithId;
+  settings: AppSettings;
+  loading: boolean;
+  showPart: NyrisAppPart;
+  feedbackState: NyrisFeedbackState;
+  handlers: AppHandlers;
 }

package/src/page/result/index.tsx

@@ -74,7 +74,7 @@ function ResultComponent(props: Props) {
     async (canvas: any, r?: RectCoords) => {
       const preFilter = [
         {
-          key: settings.filterType,
+          key: settings.visualSearchFilterKey,
           values: [`${keyFilter}`],
         },
       ];
@@ -148,7 +148,7 @@ function ResultComponent(props: Props) {
     }
     const preFilter = [
       {
-        key: settings.filterType,
+        key: settings.visualSearchFilterKey,
         values: [`${keyFilter}`],
       },
     ];