@sikka/hawa 0.0.31 → 0.0.32

package/src/blocks/AuthForms/ResetPasswordForm.js

@@ -53,7 +53,7 @@ export const ResetPasswordForm = (props) => {
         </form>
       ) : (
         <HawaTypography style={{ textAlign: "center", margin: 5 }}>
-          {props.emailSentText}
+          {props.texts.emailSentText}
         </HawaTypography>
       )}
     </Container>
@@ -68,8 +68,12 @@ ResetPasswordForm.propTypes = {
     emailPlaceholder: PropTypes.string,
     emailRequiredText: PropTypes.string,
     emailInvalidText: PropTypes.string,
+    emailSentText: PropTypes.string,
     resetPassword: PropTypes.string
   }),
-  emailSentText: PropTypes.string,
+  /**
+   * a boolean to replace the form with a success message
+   */
+  sent: PropTypes.bool,
   handleResetPassword: PropTypes.func
 };

package/src/blocks/AuthForms/SignUpForm.js

@@ -1,5 +1,5 @@
 import React from "react";
-import { HawaTextField, HawaLogoButton } from "../../elements";
+import { HawaTextField, HawaLogoButton, HawaAlert } from "../../elements";
 import PropTypes from "prop-types";
 import { Controller, FormProvider, useForm } from "react-hook-form";
 import PersonIcon from "@mui/icons-material/PermIdentityOutlined";
@@ -10,8 +10,6 @@ import Container from "@mui/material/Container";
 import Divider from "@mui/material/Divider";
 import Typography from "@mui/material/Typography";
 import Button from "@mui/material/Button";
-import Alert from "@mui/material/Alert";
-import AlertTitle from "@mui/material/AlertTitle";
 
 export const SignUpForm = (props) => {
   const methods = useForm();
@@ -27,11 +25,12 @@ export const SignUpForm = (props) => {
       variant="auth"
       style={{ direction: props.lang === "ar" ? "rtl" : "ltr" }}
     >
-      {props.error && (
-        <Alert severity="error" variant="inContainer">
-          {props.errorTitle && <AlertTitle>{props.errorTitle}</AlertTitle>}
-          {props.errorText}
-        </Alert>
+      {props.showError && (
+        <HawaAlert
+          title={props.errorTitle}
+          text={props.errorText}
+          severity="error"
+        />
       )}
 
       <FormProvider {...methods}>
@@ -163,26 +162,6 @@ export const SignUpForm = (props) => {
   );
 };
 
-// fullNameLabel: "Full Name",
-// fullNamePlaceholder: "Fulan AlFulani",
-// fullNameRequiredText: "Full Name is required",
-// emailLabel: "Email",
-// emailPlaceholder: "Enter your email",
-// emailRequiredText: "Email is required",
-// emailInvalidText: "Invalid email address",
-// passwordLabel: "Password",
-// passwordPlaceholder: "Minimum 8 characters",
-// passwordRequiredText: "Password is required",
-// passwordTooShortText: "Password too short",
-// forgotPasswordText: "Forgot password?",
-// newUserText: "New user?",
-// signUpText: "Sign up",
-// signInText: "Sign in",
-// existingUserText: "Existing User?",
-// googleButtonLabel: "Sign in with Google",
-// githubButtonLabel: "Sign in with Github",
-// twitterButtonLabel: "Sign in with Twitter"
-
 SignUpForm.propTypes = {
   /**
    *  An object of all the texts in the blocks

package/src/blocks/Payment/ChargeWalletForm.js

@@ -48,16 +48,15 @@ export const ChargeWalletForm = (props) => {
                   field.onChange(parseFloat(e.target.value));
                   setWalletAmount(e.target.value);
                 }}
+                helperText={errors.amount?.message}
               />
             )}
+            rules={{
+              required: props.texts.amountRequired
+            }}
           />
 
-          <Button
-            type="submit"
-            fullWidth
-            variant="last"
-            onClick={props.handleSignIn}
-          >
+          <Button type="submit" fullWidth variant="last">
             {props.texts.chargeWallet}
           </Button>
         </form>
@@ -67,9 +66,20 @@ export const ChargeWalletForm = (props) => {
 };
 
 ChargeWalletForm.propTypes = {
+  /**
+   * The texts object for all the texts in the block
+   */
   texts: PropTypes.shape({
     amountLabel: PropTypes.string,
-    chargeWallet: PropTypes.string
+    chargeWallet: PropTypes.string,
+    amountRequired: PropTypes.string
   }),
-  handleChargeWallet: PropTypes.func
+  /**
+   * Function called when charge wallet button is clicked
+   */
+  handleChargeWallet: PropTypes.func,
+  /**
+   * The currency text under the amount
+   */
+  currency: PropTypes.string
 };

package/src/blocks/Payment/Confirmation.js

@@ -100,6 +100,9 @@ export const ConfirmationPage = (props) => {
 };
 
 ConfirmationPage.propTypes = {
+  /**
+   * The texts object for all the texts in the block
+   */
   texts: PropTypes.shape({
     print: PropTypes.string,
     history: PropTypes.string,

package/src/blocks/Payment/CreditCardForm.js

@@ -21,19 +21,12 @@ export const CreditCardForm = (props) => {
           placeholder="Enter password"
           type="tel"
           label="Card Number"
-          // variant="unscrollable"
-          // startAdornment={
-          //   <InputAdornment position="start">
-          //     <PasswordIcon />
-          //   </InputAdornment>
-          // }
           rules={{
             required: "Password is rquired"
           }}
           helperText={errors.password?.message}
         />
 
-       
         <Controller
           control={control}
           name="cardName"
@@ -44,11 +37,6 @@ export const CreditCardForm = (props) => {
               placeholder="Enter password"
               type="password"
               label="Name On Card"
-              // startAdornment={
-              //   <InputAdornment position="start">
-              //     <PasswordIcon />
-              //   </InputAdornment>
-              // }
               rules={{
                 required: "Password is rquired"
               }}
@@ -66,11 +54,6 @@ export const CreditCardForm = (props) => {
               placeholder="Enter password"
               type="password"
               label="Expiry Date"
-              // startAdornment={
-              //   <InputAdornment position="start">
-              //     <PasswordIcon />
-              //   </InputAdornment>
-              // }
               rules={{
                 required: "Password is rquired"
               }}
@@ -88,11 +71,6 @@ export const CreditCardForm = (props) => {
               placeholder="Enter password"
               type="password"
               label="CCV"
-              // startAdornment={
-              //   <InputAdornment position="start">
-              //     <PasswordIcon />
-              //   </InputAdornment>
-              // }
               rules={{
                 required: "Password is rquired"
               }}
@@ -107,7 +85,6 @@ export const CreditCardForm = (props) => {
           variant="last"
           onClick={props.handlePayWithCreditCard}
         >
-          {/* {props.texts.signInText} */}
           {"Pay with Credit Card"}
         </Button>
       </form>

package/src/blocks/Pricing/PricingPlans.js

@@ -58,6 +58,9 @@ export const PricingPlans = (props) => {
 };
 
 PricingPlans.propTypes = {
+  /**
+   * An array of the pricing plans
+   */
   plans: PropTypes.arrayOf(
     PropTypes.shape({
       title: PropTypes.string,

package/src/elements/HawaPricingCard.js

@@ -4,6 +4,7 @@ import Button from "@mui/material/Button";
 import Typography from "@mui/material/Typography";
 import CheckIcon from "@mui/icons-material/CheckCircleOutlined";
 import PropTypes from "prop-types";
+import Chip from "@mui/material/Chip";
 
 export const HawaPricingCard = (props) => {
   let isArabic = props.lang === "ar";
@@ -24,6 +25,7 @@ export const HawaPricingCard = (props) => {
     sar: isArabic ? "ريال" : "SAR"
   };
   let featuresMapping = isArabic ? props.features_ar : props.features;
+  let chipSpacing = isArabic ? { left: 10 } : { right: 10 };
   return (
     <Container
       maxWidth="xs"
@@ -31,6 +33,19 @@ export const HawaPricingCard = (props) => {
       style={{ direction: isArabic ? "rtl" : "ltr" }}
     >
       <Container variant="plan-header">
+        {props.discount && (
+          <Chip
+            label={props.discount}
+            variant="standard"
+            style={{
+              maxWidth: "fit-content",
+              position: "absolute",
+              bottom: 10,
+              ...chipSpacing
+            }}
+            color="success"
+          />
+        )}
         <Typography variant="h3" fontWeight={500}>
           {isArabic ? props.title_ar : props.title}
         </Typography>
@@ -144,5 +159,7 @@ HawaPricingCard.propTypes = {
   subtitle: PropTypes.string,
   subtitle_ar: PropTypes.string,
   features: PropTypes.array,
-  features_ar: PropTypes.array
+  features_ar: PropTypes.array,
+  currency: PropTypes.oneOf(["sar", "usd"]),
+  cycleText: PropTypes.oneOf(["monthly", "3-months", "6-months", "annually"])
 };

package/src/elements/HawaRange.js

@@ -5,7 +5,7 @@ import PropTypes from "prop-types";
 
 export const HawaRange = (props) => {
   return (
-    <Stack spacing={2} direction="row" alignItems="center">
+    <Stack spacing={2} direction="row" alignItems="center" style={props.style}>
       {props.startElement}
       <Slider
         size="small"
@@ -18,9 +18,14 @@ export const HawaRange = (props) => {
   );
 };
 HawaRange.propTypes = {
+  /**
+   * The element at the side where the range value is 0
+   * Can be an icon
+   */
   startElement: PropTypes.element,
+  /**
+   * The element at the side where the range value is 100
+   */
   endElement: PropTypes.element,
-  defaultValue: PropTypes.string,
-  handleChange: PropTypes.func,
-  location: PropTypes.string
+  handleChange: PropTypes.func
 };

package/src/elements/HawaTextField.js

@@ -16,9 +16,13 @@ export const HawaTextField = (props) => {
           }}
         >
           {props.label && <InputLabel>{props.label}</InputLabel>}
-
           {props.helperText && (
-            <Typography variant="validation">{props.helperText}</Typography>
+            <Typography
+              style={{ marginBottom: !props.label && 10 }}
+              variant="validation"
+            >
+              {props.helperText}
+            </Typography>
           )}
         </div>
         <Input disableUnderline {...props} />

package/src/layout/HawaAppLayout.js

@@ -17,7 +17,9 @@ import Avatar from "@mui/material/Avatar";
 import Tooltip from "@mui/material/Tooltip";
 import { HawaPopMenu } from "../elements/HawaPopMenu";
 // use this to detect size and change things accordingly
-// import useMediaQuery from '@mui/material/useMediaQuery';
+import useMediaQuery from "@mui/material/useMediaQuery";
+import { BottomNavigation, BottomNavigationAction } from "@mui/material";
+import { RestoreOutlined } from "@mui/icons-material";
 
 const drawerWidth = 240;
 
@@ -36,7 +38,7 @@ const closedMixin = (theme) => ({
     duration: theme.transitions.duration.leavingScreen
   }),
   overflowX: "hidden",
-  width: `calc(${theme.spacing(7)} + 1px)`,
+  width: `calc(${theme.spacing(8)} + 1px)`,
   [theme.breakpoints.up("sm")]: {
     width: `calc(${theme.spacing(8)} + 1px)`
   }
@@ -89,10 +91,11 @@ const Drawer = styled(MuiDrawer, {
 export function HawaAppLayout(props) {
   const theme = useTheme();
   const [open, setOpen] = React.useState(true);
+  const matches = useMediaQuery("(max-width:600px)");
 
   const [anchorElNav, setAnchorElNav] = React.useState(null);
   const [anchorElUser, setAnchorElUser] = React.useState(null);
-
+  console.log("match is ", matches);
   const handleOpenNavMenu = (event) => setAnchorElNav(event.currentTarget);
   const handleOpenUserMenu = (event) => setAnchorElUser(event.currentTarget);
   const handleCloseNavMenu = () => setAnchorElNav(null);
@@ -102,6 +105,19 @@ export function HawaAppLayout(props) {
 
   return (
     <Box sx={{ display: "flex" }}>
+      {matches && (
+        <BottomNavigation
+          showLabels
+          // value={value}
+          // onChange={(event, newValue) => {
+          //   setValue(newValue);
+          // }}
+        >
+          <BottomNavigationAction label="Recents" icon={<RestoreOutlined />} />
+          <BottomNavigationAction label="Favorites" icon={<RestoreOutlined />} />
+          <BottomNavigationAction label="Nearby" icon={<RestoreOutlined />} />
+        </BottomNavigation>
+      )}{" "}
       <AppBar variant="appbar" position="fixed" open={open}>
         <Toolbar variant="appbar">
           <IconButton

package/storybook-static/iframe.html

@@ -345,4 +345,4 @@
           
       
           
-            window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)(?!\\.)(?=.)[^\\\\/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)(?!\\.)(?=.)[^\\\\/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.708d7ac1.iframe.bundle.js"></script><script src="vendors~main.6c796c97.iframe.bundle.js"></script><script src="main.4bd34158.iframe.bundle.js"></script></body></html>
+            window['STORIES'] = [{"titlePrefix":"","directory":"./src","files":"**/*.stories.mdx","importPathMatcher":"^\\.[\\\\/](?:src(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)(?!\\.)(?=.)[^\\\\/]*?\\.stories\\.mdx)$"},{"titlePrefix":"","directory":"./src","files":"**/*.stories.@(js|jsx|ts|tsx)","importPathMatcher":"^\\.[\\\\/](?:src(?:[\\\\/](?!\\.)(?:(?:(?!(?:^|[\\\\/])\\.).)*?)[\\\\/]|[\\\\/]|$)(?!\\.)(?=.)[^\\\\/]*?\\.stories\\.(js|jsx|ts|tsx))$"}];</script><script src="runtime~main.708d7ac1.iframe.bundle.js"></script><script src="vendors~main.924b4d3c.iframe.bundle.js"></script><script src="main.c86d0451.iframe.bundle.js"></script></body></html>