From a0475cb183e954c3d656c8fff5c6ddb010f28832 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9rard=20Le=20Cloerec?= Date: Tue, 13 Apr 2021 15:19:04 +0200 Subject: [PATCH] chore: update README fix: change password regexp fix: pages in footer are a map same for navbar --- components/auth/LoginView.tsx | 4 +- components/auth/SignUpView.tsx | 6 +- .../cart/CartSidebarView/CartSidebarView.tsx | 2 +- components/common/Footer/Footer.tsx | 40 ++++++------- components/common/Navbar/Navbar.tsx | 20 ++++--- framework/aquilacms/README.md | 57 +++++++++---------- .../api/customers/handlers/signup.ts | 4 +- pages/cart.tsx | 2 +- 8 files changed, 62 insertions(+), 73 deletions(-) diff --git a/components/auth/LoginView.tsx b/components/auth/LoginView.tsx index 89d5bf893..a8ac88676 100644 --- a/components/auth/LoginView.tsx +++ b/components/auth/LoginView.tsx @@ -43,11 +43,11 @@ const LoginView: FC = () => { const handleValidation = useCallback(() => { // Test for Alphanumeric password - const validPassword = /^(?=.*[a-zA-Z])(?=.*[0-9])/.test(password) + const validPassword = /^(.*[a-zA-Z0-9]){6,}/.test(password) // Unable to send form unless fields are valid. if (dirty) { - setDisabled(!validate(email) || password.length < 7 || !validPassword) + setDisabled(!validate(email) || password.length < 6 || !validPassword) } }, [email, password, dirty]) diff --git a/components/auth/SignUpView.tsx b/components/auth/SignUpView.tsx index f7c1aa747..d2f9986e7 100644 --- a/components/auth/SignUpView.tsx +++ b/components/auth/SignUpView.tsx @@ -48,9 +48,7 @@ const SignUpView: FC = () => { const handleValidation = useCallback(() => { // Test for Alphanumeric password - const validPassword = /^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\w\d:])([^\s]){6,}$/.test( - password - ) + const validPassword = /^(.*[a-zA-Z0-9]){6,}/.test(password) // Unable to send form unless fields are valid. if (dirty) { @@ -84,7 +82,7 @@ const SignUpView: FC = () => { {' '} Info: Passwords must be longer than 6 chars and - include numbers, upper and lower case.{' '} + include numbers.{' '}
diff --git a/components/cart/CartSidebarView/CartSidebarView.tsx b/components/cart/CartSidebarView/CartSidebarView.tsx index 8db225420..326390327 100644 --- a/components/cart/CartSidebarView/CartSidebarView.tsx +++ b/components/cart/CartSidebarView/CartSidebarView.tsx @@ -120,7 +120,7 @@ const CartSidebarView: FC = () => {
  • Estimated Shipping - Calculated at checkout + FREE
    • diff --git a/components/common/Footer/Footer.tsx b/components/common/Footer/Footer.tsx index 974a741f1..29306df01 100644 --- a/components/common/Footer/Footer.tsx +++ b/components/common/Footer/Footer.tsx @@ -15,10 +15,25 @@ interface Props { pages?: Page[] } -const LEGAL_PAGES = ['legal-notice', 'terms'] +const LEGAL_PAGES = ['terms-of-use', 'shipping-returns', 'privacy-policy'] + +const defaultPages = [ + { + url: '/', + name: 'Home', + }, + { + url: '/', + name: 'Careers', + }, + { + url: '/blog', + name: 'Blog', + }, +] const Footer: FC = ({ className, pages }) => { - const { sitePages, legalPages } = usePages(pages) + const { sitePages = defaultPages, legalPages } = usePages(pages) const rootClassName = cn(className) return ( @@ -37,27 +52,6 @@ const Footer: FC = ({ className, pages }) => {
      - {/*
    • - - - Home - - -
      • -
    • - - - Careers - - -
      • -
    • - - - Blog - - -
      • */} {sitePages.map((page) => (
    • diff --git a/components/common/Navbar/Navbar.tsx b/components/common/Navbar/Navbar.tsx index a0d9ad2ce..831771b3e 100644 --- a/components/common/Navbar/Navbar.tsx +++ b/components/common/Navbar/Navbar.tsx @@ -5,6 +5,12 @@ import { Searchbar, UserNav } from '@components/common' import NavbarRoot from './NavbarRoot' import s from './Navbar.module.css' +const searchPath = [ + { link: '/search?q=clothes', name: 'Clothes' }, + { link: '/search?q=accessories', name: 'Accessories' }, + { link: '/search?q=shoes', name: 'Shoes' }, +] + const Navbar: FC = () => ( @@ -19,15 +25,11 @@ const Navbar: FC = () => ( All - {/* - Clothes - - - Accessories - - - Shoes - */} + {searchPath.map((e) => ( + + {e.name} + + ))}
    diff --git a/framework/aquilacms/README.md b/framework/aquilacms/README.md index 2609b1544..394b382aa 100644 --- a/framework/aquilacms/README.md +++ b/framework/aquilacms/README.md @@ -1,6 +1,7 @@ # Table of Contents -- [BigCommerce Storefront Data Hooks](#bigcommerce-storefront-data-hooks) +- [Table of Contents](#table-of-contents) +- [Aquilacms Storefront Data Hooks](#aquilacms-storefront-data-hooks) - [Installation](#installation) - [General Usage](#general-usage) - [CommerceProvider](#commerceprovider) @@ -21,11 +22,11 @@ - [getProduct](#getproduct) - [More](#more) -# BigCommerce Storefront Data Hooks +# Aquilacms Storefront Data Hooks > This project is under active development, new features and updates will be continuously added over time -UI hooks and data fetching methods built from the ground up for e-commerce applications written in React, that use BigCommerce as a headless e-commerce platform. The package provides: +UI hooks and data fetching methods built from the ground up for e-commerce applications written in React, that use Aquilacms as a headless e-commerce platform. The package provides: - Code splitted hooks for data fetching using [SWR](https://swr.vercel.app/), and to handle common user actions - Code splitted data fetching methods for initial data population and static generation of content @@ -42,12 +43,8 @@ yarn add storefront-data-hooks After install, the first thing you do is: set your environment variables in `.env.local` ```sh -BIGCOMMERCE_STOREFRONT_API_URL=<> -BIGCOMMERCE_STOREFRONT_API_TOKEN=<> -BIGCOMMERCE_STORE_API_URL=<> -BIGCOMMERCE_STORE_API_TOKEN=<> -BIGCOMMERCE_STORE_API_CLIENT_ID=<> -BIGCOMMERCE_CHANNEL_ID=<> +AQUILACMS_URL=<> +AQUILACMS_API_URL=<> ``` ## General Usage @@ -58,7 +55,7 @@ This component is a provider pattern component that creates commerce context for ```jsx ... -import { CommerceProvider } from '@bigcommerce/storefront-data-hooks' +import { CommerceProvider } from '@aquilacms/storefront-data-hooks' const App = ({ locale = 'en-US', children }) => { return ( @@ -72,11 +69,11 @@ const App = ({ locale = 'en-US', children }) => { ### useLogin hook -Hook for bigcommerce user login functionality, returns `login` function to handle user login. +Hook for aquilacms user login functionality, returns `login` function to handle user login. ```jsx ... -import useLogin from '@bigcommerce/storefront-data-hooks/use-login' +import useLogin from '@aquilacms/storefront-data-hooks/use-login' const LoginView = () => { const login = useLogin() @@ -103,7 +100,7 @@ Hook to logout user. ```jsx ... -import useLogout from '@bigcommerce/storefront-data-hooks/use-logout' +import useLogout from '@aquilacms/storefront-data-hooks/use-logout' const LogoutLink = () => { const logout = useLogout() @@ -121,7 +118,7 @@ Hook for getting logged in customer data, and fetching customer info. ```jsx ... -import useCustomer from '@bigcommerce/storefront-data-hooks/use-customer' +import useCustomer from '@aquilacms/storefront-data-hooks/use-customer' ... const Profile = () => { @@ -139,11 +136,11 @@ const Profile = () => { ### useSignup -Hook for bigcommerce user signup, returns `signup` function to handle user signups. +Hook for aquilacms user signup, returns `signup` function to handle user signups. ```jsx ... -import useSignup from '@bigcommerce/storefront-data-hooks/use-login' +import useSignup from '@aquilacms/storefront-data-hooks/use-login' const SignupView = () => { const signup = useSignup() @@ -171,7 +168,7 @@ const SignupView = () => { Helper hook to format price according to commerce locale, and return discount if available. ```jsx -import usePrice from '@bigcommerce/storefront-data-hooks/use-price' +import usePrice from '@aquilacms/storefront-data-hooks/use-price' ... const { price, discount, basePrice } = usePrice( data && { @@ -190,7 +187,7 @@ Returns the current cart data for use ```jsx ... -import useCart from '@bigcommerce/storefront-data-hooks/cart/use-cart' +import useCart from '@aquilacms/storefront-data-hooks/cart/use-cart' const countItem = (count: number, item: LineItem) => count + item.quantity @@ -206,7 +203,7 @@ const CartNumber = () => { ```jsx ... -import useAddItem from '@bigcommerce/storefront-data-hooks/cart/use-add-item' +import useAddItem from '@aquilacms/storefront-data-hooks/cart/use-add-item' const AddToCartButton = ({ productId, variantId }) => { const addItem = useAddItem() @@ -227,7 +224,7 @@ const AddToCartButton = ({ productId, variantId }) => { ```jsx ... -import useUpdateItem from '@bigcommerce/storefront-data-hooks/cart/use-update-item' +import useUpdateItem from '@aquilacms/storefront-data-hooks/cart/use-update-item' const CartItem = ({ item }) => { const [quantity, setQuantity] = useState(item.quantity) @@ -257,7 +254,7 @@ Provided with a cartItemId, will remove an item from the cart: ```jsx ... -import useRemoveItem from '@bigcommerce/storefront-data-hooks/cart/use-remove-item' +import useRemoveItem from '@aquilacms/storefront-data-hooks/cart/use-remove-item' const RemoveButton = ({ item }) => { const removeItem = useRemoveItem() @@ -276,9 +273,9 @@ const RemoveButton = ({ item }) => { Wishlist hooks are similar to cart hooks. See the below example for how to use `useWishlist`, `useAddItem`, and `useRemoveItem`. ```jsx -import useAddItem from '@bigcommerce/storefront-data-hooks/wishlist/use-add-item' -import useRemoveItem from '@bigcommerce/storefront-data-hooks/wishlist/use-remove-item' -import useWishlist from '@bigcommerce/storefront-data-hooks/wishlist/use-wishlist' +import useAddItem from '@aquilacms/storefront-data-hooks/wishlist/use-add-item' +import useRemoveItem from '@aquilacms/storefront-data-hooks/wishlist/use-remove-item' +import useWishlist from '@aquilacms/storefront-data-hooks/wishlist/use-wishlist' const WishlistButton = ({ productId, variant }) => { const addItem = useAddItem() @@ -320,11 +317,11 @@ const WishlistButton = ({ productId, variant }) => { ### useSearch -`useSearch` handles searching the bigcommerce storefront product catalog by catalog, brand, and query string. +`useSearch` handles searching the aquilacms storefront product catalog by catalog, brand, and query string. ```jsx ... -import useSearch from '@bigcommerce/storefront-data-hooks/products/use-search' +import useSearch from '@aquilacms/storefront-data-hooks/products/use-search' const SearchPage = ({ searchString, category, brand, sortStr }) => { const { data } = useSearch({ @@ -349,8 +346,8 @@ const SearchPage = ({ searchString, category, brand, sortStr }) => { API function to retrieve a product list. ```js -import { getConfig } from '@bigcommerce/storefront-data-hooks/api' -import getAllProducts from '@bigcommerce/storefront-data-hooks/api/operations/get-all-products' +import { getConfig } from '@aquilacms/storefront-data-hooks/api' +import getAllProducts from '@aquilacms/storefront-data-hooks/api/operations/get-all-products' const { products } = await getAllProducts({ variables: { field: 'featuredProducts', first: 6 }, @@ -365,8 +362,8 @@ API product to retrieve a single product when provided with the product slug string. ```js -import { getConfig } from '@bigcommerce/storefront-data-hooks/api' -import getProduct from '@bigcommerce/storefront-data-hooks/api/operations/get-product' +import { getConfig } from '@aquilacms/storefront-data-hooks/api' +import getProduct from '@aquilacms/storefront-data-hooks/api/operations/get-product' const { product } = await getProduct({ variables: { slug }, diff --git a/framework/aquilacms/api/customers/handlers/signup.ts b/framework/aquilacms/api/customers/handlers/signup.ts index ca37bdd2e..066fe901b 100644 --- a/framework/aquilacms/api/customers/handlers/signup.ts +++ b/framework/aquilacms/api/customers/handlers/signup.ts @@ -12,9 +12,7 @@ const signup: SignupHandlers['signup'] = async ({ firstName: Joi.string().min(1), lastName: Joi.string().min(1), email: Joi.string().email({ tlds: false }), - password: Joi.string().pattern( - new RegExp(/^(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[^\d\s:])([^\s]){6,}$/) - ), + password: Joi.string().pattern(new RegExp(/^(.*[a-zA-Z0-9]){6,}/)), }) const validation = schema.validate({ email, password }) diff --git a/pages/cart.tsx b/pages/cart.tsx index b79f71a46..cd5bedacc 100644 --- a/pages/cart.tsx +++ b/pages/cart.tsx @@ -144,7 +144,7 @@ export default function Cart() {
  • Estimated Shipping - Calculated at checkout + FREE