ordering-ui-external 14.0.6 → 14.0.8

package/src/themes/five/src/components/ReviewOrder/layouts/Simple/index.js

@@ -0,0 +1,211 @@
+import React, { useState, useEffect } from 'react'
+import { useForm } from 'react-hook-form'
+import {
+  useLanguage,
+  OrderReview as ReviewOrderController
+} from 'ordering-components-external'
+import MdClose from '@meronex/icons/md/MdClose'
+import BsArrowRight from '@meronex/icons/bs/BsArrowRight'
+import IfillStar from '@meronex/icons/ai/AiFillStar'
+import IUnfillStar from '@meronex/icons/ai/AiOutlineStar'
+
+import {
+  Container,
+  ReviewOrderContainer,
+  Comments,
+  Send,
+  ReviewsProgressWrapper,
+  ReviewsProgressContent,
+  LogoAndReviewWrapper,
+  CommentsList,
+  CommentButton,
+  ContinueContainer
+} from './styles'
+
+import { Alert } from '../../../Confirm'
+import { TextArea } from '../../../../styles/Inputs'
+import { Button } from '../../../../styles/Buttons'
+import { reviewCommentList } from '../../../../../../../utils'
+
+const ReviewOrderUI = (props) => {
+  const {
+    stars,
+    handleSendReview,
+    formState,
+    setIsReviewed,
+    setStars
+  } = props
+
+  const [, t] = useLanguage()
+  const { handleSubmit, errors } = useForm()
+  const [alertState, setAlertState] = useState({ open: false, content: [], success: false })
+  const [comments, setComments] = useState([])
+  const [extraComment, setExtraComment] = useState('')
+
+  const commentsList = reviewCommentList('order')
+
+  const qualificationList = [
+    { key: 1, text: t('TERRIBLE', 'Terrible'), middleNode: false, left: 0, right: 'initial' },
+    { key: 2, text: t('BAD', 'Bad'), middleNode: true, left: '25%', right: '75%' },
+    { key: 3, text: t('OKAY', 'Okay'), middleNode: true, left: '50%', right: '50%' },
+    { key: 4, text: t('GOOD', 'Good'), middleNode: true, left: '75%', right: '25%' },
+    { key: 5, text: t('GREAT', 'Great'), middleNode: false, left: 'initial', right: 0 }
+  ]
+
+  const handleChangeStars = (index) => {
+    if (index) setStars({ ...stars, quality: index, punctiality: index, service: index, packaging: index, comments: '' })
+    setComments([])
+  }
+
+  const handleChangeComment = (commentItem) => {
+    const found = comments.find((comment) => comment?.key === commentItem.key)
+    if (found) {
+      const _comments = comments.filter((comment) => comment?.key !== commentItem.key)
+      setComments(_comments)
+    } else {
+      setComments([...comments, commentItem])
+    }
+  }
+
+  const isSelectedComment = (commentKey) => {
+    const found = comments.find((comment) => comment?.key === commentKey)
+    return found
+  }
+
+  useEffect(() => {
+    if (!formState.loading && formState.result?.error) {
+      setAlertState({
+        open: true,
+        success: false,
+        content: formState.result?.result || [t('ERROR', 'Error')]
+      })
+    }
+    if (!formState.loading && !formState.result?.error && alertState.success) {
+      setIsReviewed && setIsReviewed()
+    }
+  }, [formState])
+
+  useEffect(() => {
+    if (Object.keys(errors).length > 0) {
+      setAlertState({
+        open: true,
+        success: false,
+        content: Object.values(errors).map(error => error.message)
+      })
+    }
+  }, [errors])
+
+  const onSubmit = values => {
+    if (Object.values(stars).some((value) => value === 0)) {
+      setAlertState({
+        open: true,
+        content: stars.quality === 0 ? [`${t('REVIEW_QUALIFICATION_REQUIRED', 'Review qualification is required')}`] : []
+      })
+      return
+    }
+    setAlertState({ ...alertState, success: true })
+    handleSendReview()
+  }
+
+  const closeAlert = () => {
+    setAlertState({
+      open: false,
+      content: []
+    })
+  }
+
+  useEffect(() => {
+    let _comments = ''
+    if (comments.length > 0) {
+      comments.map(comment => (_comments += comment.content + '. '))
+    }
+    const _comment = _comments + extraComment
+    setStars({ ...stars, comments: _comment })
+  }, [comments, extraComment])
+
+  return (
+    <Container>
+      <LogoAndReviewWrapper>
+        <ReviewsProgressWrapper>
+          <p style={{ fontWeight: 'bold' }}>{t('HOW_WAS_YOUR_ORDER', 'How was your order?')}</p>
+          <ReviewsProgressContent>
+            {
+              qualificationList?.map(qualification => (
+                <div
+                  key={qualification?.key}
+                >
+                  {qualification?.key <= stars?.quality
+                    ? <IfillStar onClick={() => handleChangeStars(qualification?.key)} />
+                    : <IUnfillStar onClick={() => handleChangeStars(qualification?.key)} />}
+                </div>
+              ))
+            }
+          </ReviewsProgressContent>
+        </ReviewsProgressWrapper>
+        {stars?.quality <= 3 && (
+          <CommentsList>
+            <p>{commentsList[stars?.quality || 1]?.title}</p>
+            {
+              commentsList[stars?.quality || 1]?.list?.map((commentItem, i) => (
+                <CommentButton
+                  key={i}
+                  active={isSelectedComment(commentItem?.key)}
+                  onClick={() => handleChangeComment(commentItem)}
+                  initialIcon
+                >
+                  {commentItem.content}
+                  {
+                    isSelectedComment(commentItem?.key) && <MdClose />
+                  }
+                </CommentButton>
+              ))
+            }
+          </CommentsList>
+        )}
+      </LogoAndReviewWrapper>
+      <ReviewOrderContainer onSubmit={handleSubmit(onSubmit)}>
+        <Comments>
+          <p>{t('DO_YOU_WANT_TO_ADD_SOMETHING', 'Do you want to add something?')}</p>
+          <TextArea
+            name='comments'
+            value={extraComment}
+            onChange={(e) => setExtraComment(e.target.value)}
+            autoComplete='off'
+          />
+        </Comments>
+        <Send>
+          <Button
+            color={!formState.loading ? 'primary' : 'secondary'}
+            type='submit'
+            disabled={formState.loading}
+            className='review-sent'
+          >
+            {!formState.loading ? (
+              <ContinueContainer><p>{t('CONTINUE', 'Continue')}</p><BsArrowRight /></ContinueContainer>
+            ) : t('LOADING', 'Loading')}
+          </Button>
+        </Send>
+        <Alert
+          title={t('ORDER_REVIEW', 'Order Review')}
+          content={alertState.content}
+          acceptText={t('ACCEPT', 'Accept')}
+          open={alertState.open}
+          onClose={() => closeAlert()}
+          onAccept={() => closeAlert()}
+          closeOnBackdrop={false}
+        />
+      </ReviewOrderContainer>
+    </Container>
+  )
+}
+
+export const ReviewOrder = (props) => {
+  const ReviewOrderProps = {
+    ...props,
+    UIComponent: ReviewOrderUI,
+    isToast: true,
+    defaultStar: props?.defaultStar ?? 0
+  }
+
+  return <ReviewOrderController {...ReviewOrderProps} />
+}

package/src/themes/five/src/components/ReviewOrder/layouts/Simple/styles.js

@@ -0,0 +1,173 @@
+import styled, { css } from 'styled-components'
+import { Button } from '../../../../styles/Buttons'
+
+export const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  border-radius: 7.6px;
+  padding: 20px;
+  box-shadow: 0px 4px 10px 0px #0000001F;
+  margin: 55px 0 30px;
+`
+
+export const ReviewOrderContainer = styled.form`
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+`
+
+export const Comments = styled.div`
+  display: flex;
+  width: 100%;
+  flex-direction: column;
+  margin-top: 10px;
+
+  p {
+    text-transform: capitalize;
+    margin-top: 0;
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: ${props => props.theme?.colors.darkTextColor};
+  }
+
+  textarea {
+    min-height: 104px;
+  }
+`
+
+export const Send = styled.div`
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  margin-top: 30px;
+  width: 100%;
+
+  span {
+    cursor: pointer;
+    font-weight: 600;
+    font-size: 16px;
+    user-select: none;
+  }
+
+  button {
+    font-size: 14px;
+    padding: 6px 20px;
+    width: 300px;
+    height: 45px;
+    line-height: 0;
+    svg {
+      color: white;
+      font-size: 21px;
+      vertical-align: middle;
+      margin-left: 8px;
+      ${props => props.theme?.rtl && css`
+        margin-left: 0;
+        margin-right: 8px;
+        transform: rotateZ(180deg);
+      `}
+    }
+  }
+`
+
+export const ReviewsProgressWrapper = styled.div`
+  width: 100%;
+  margin-bottom: 20px;
+
+  p {
+    margin-top: 0;
+    margin-bottom: 17px;
+    font-size: 15px;
+    color: ${props => props.theme?.colors.darkTextColor};
+    text-align: center;
+  }
+`
+
+export const ReviewsProgressContent = styled.div`
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+
+  svg {
+    font-size: 4rem;
+    color: ${props => props.theme?.colors.primary};
+    cursor: pointer;
+  }
+`
+
+export const LogoAndReviewWrapper = styled.div`
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+`
+
+export const CommentsList = styled.div`
+  p {
+    margin-top: 0;
+    margin-bottom: 10px;
+    font-size: 15px;
+    color: ${props => props.theme?.colors.darkTextColor};
+  }
+
+  button {
+    border-radius: 7.6px;
+    margin-bottom: 18px;
+    margin-right: 40px;
+
+    ${props => props.theme?.rtl && css`
+      margin-left: 40px;
+      margin-right: 0;
+    `}
+
+    svg {
+      vertical-align: middle;
+      margin-left: 5px;
+
+      ${props => props.theme?.rtl && css`
+        margin-right: 5px;
+        margin-left: 0;
+      `}
+    }
+  }
+`
+
+export const CommentButton = styled(Button)`
+  border-radius: 7.6px;
+  margin-bottom: 18px;
+  margin-right: 18px;
+  font-size: 13px;
+  color: #414954;
+  background: #E9ECEF;
+  border: 1px solid #E9ECEF;
+  transition: all 0.3s linear;
+
+  ${props => props.theme?.rtl && css`
+    margin-left: 18px;
+    margin-right: 0;
+  `}
+
+  svg {
+    vertical-align: middle;
+    margin-left: 5px;
+
+    ${props => props.theme?.rtl && css`
+      margin-right: 5px;
+      margin-left: 0;
+    `}
+  }
+
+  ${({ active }) => active && css`
+    background: ${props => props.theme?.colors.primary};
+    border: 1px solid ${props => props.theme?.colors.primary};
+    color: white;
+  `}
+`
+
+export const ContinueContainer = styled.div`
+  display: flex;
+  align-items: center;
+  p{
+    flex: 1;
+    margin: 0;
+  }
+`

package/src/themes/five/src/components/SingleProductCard/layouts/original/styles.js

@@ -8,6 +8,7 @@ export const CardContainer = styled.div`
   background: ${({ soldOut, theme }) => soldOut ? '#6c757d33' : theme?.colors?.backgroundPage};
   border: 1px solid #E9ECEF;
   padding: 10px;
+  margin: 10px;
   border-radius: 7.6px;
   box-sizing: border-box;
   display: flex;
@@ -39,7 +40,7 @@ export const CardContainer = styled.div`
     margin: 10px 0;
   ` : css`
     width: 100%;
-    margin: 10px 0;
+    margin: 10px;
     @media (min-width: 576px) {
       margin: 10px;
       width: calc(100% - 20px);
@@ -64,7 +65,7 @@ export const CardContainer = styled.div`
       `}
     }
   `}
-  
+
   `}
 `
 

package/template/app.js

@@ -34,6 +34,7 @@ import { SpinnerLoader } from '../src/components/SpinnerLoader'
 import { Input } from '../src/themes/five/src/styles/Inputs'
 import { QueryLoginSpoonity } from '../src/themes/five/src/components/QueryLoginSpoonity'
 import { orderTypeList } from '../src/utils'
+import { WebsocketStatus } from '../src/themes/five'
 
 const Header = loadable(() => import('../src/themes/five/src/components/Header'))
 const HeaderKiosk = loadable(() => import('../src/themes/five/src/components/Header/layouts/Kiosk'))
@@ -912,6 +913,9 @@ export const App = () => {
             {(!isFooterPage || enabledPoweredByOrdering) && (
               <Footer isFooterPage={isFooterPage} />
             )}
+            {auth && (
+              <WebsocketStatus useReconnectByLogin />
+            )}
             {(windowSize.width < 576 && onlineStatus) && (
               <NavigationBar />
             )}