diff --git a/.env b/.env new file mode 100644 index 00000000..3b8a9e51 --- /dev/null +++ b/.env @@ -0,0 +1,7 @@ +FIREBASE_API_KEY=AIzaSyA_GwSDcNjP8RtGmdLrMm7Ns-zEqWMFnPA +FIREBASE_AUTH_DOMAIN=lunetas-cam-e9b0b.firebaseapp.com +FIREBASE_DB_URL=https://lunetas-cam-e9b0b-default-rtdb.firebaseio.com/ +FIREBASE_PROJECT_ID=lunetas-cam-e9b0b +FIREBASE_STORAGE_BUCKET=lunetas-cam-e9b0b.appspot.com +FIREBASE_MSG_SENDER_ID=452658448198 +FIREBASE_APP_ID=1:452658448198:web:2ad23daf51b52679080747 \ No newline at end of file diff --git a/404.html b/404.html index 797ffaee..f6ce11a1 100644 --- a/404.html +++ b/404.html @@ -5,7 +5,7 @@ - Salinaka - React Ecommerce Store + Lunetas-cam - React Ecommerce Store diff --git a/index.html b/index.html index 797ffaee..f6ce11a1 100644 --- a/index.html +++ b/index.html @@ -5,7 +5,7 @@ - Salinaka - React Ecommerce Store + Lunetas-cam - React Ecommerce Store diff --git a/package.json b/package.json index 7fda268b..3181ba9b 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,8 @@ { "name": "ecommerce-react", - "version": "1.2.0", + "version": "1.3.0", "main": "index.js", - "author": "Julius Guevarra", + "author": "William Steve", "keywords": [ "react-webpack", "boilerplate", diff --git a/src/components/common/Footer.jsx b/src/components/common/Footer.jsx index 59f7ab70..44aa737a 100644 --- a/src/components/common/Footer.jsx +++ b/src/components/common/Footer.jsx @@ -16,9 +16,9 @@ const Footer = () => {
- Developed by - {' '} - JULIUS GUEVARRA + Contacts
+ tel : +237 651 97 76 85
+ email : lunetas@yahoo.fr
@@ -32,8 +32,7 @@ const Footer = () => {
- Fork this project   - HERE + Welcome
diff --git a/src/components/common/MobileNavigation.jsx b/src/components/common/MobileNavigation.jsx index 25578549..dc67cea5 100644 --- a/src/components/common/MobileNavigation.jsx +++ b/src/components/common/MobileNavigation.jsx @@ -23,7 +23,7 @@ const Navigation = (props) => {
-

SALINAKA

+

LUNETAS-CAM

diff --git a/src/helpers/utils.js b/src/helpers/utils.js index cc3b63d2..d1525a13 100644 --- a/src/helpers/utils.js +++ b/src/helpers/utils.js @@ -16,9 +16,9 @@ export const displayDate = (timestamp) => { }; export const displayMoney = (n) => { - const format = new Intl.NumberFormat('en-US', { + const format = new Intl.NumberFormat('fr-CM', { style: 'currency', - currency: 'USD' + currency: 'XAF' }); // or use toLocaleString() diff --git a/src/images/banner-girl.png b/src/images/banner-girl.png index b900c619..7add797f 100644 Binary files a/src/images/banner-girl.png and b/src/images/banner-girl.png differ diff --git a/src/images/defaultAvatar.jpg b/src/images/defaultAvatar.jpg index af1a74aa..e11b4019 100644 Binary files a/src/images/defaultAvatar.jpg and b/src/images/defaultAvatar.jpg differ diff --git a/src/images/defaultBanner.jpg b/src/images/defaultBanner.jpg index acb211e2..8ed0af0a 100644 Binary files a/src/images/defaultBanner.jpg and b/src/images/defaultBanner.jpg differ diff --git a/src/images/logo-full.png b/src/images/logo-full.png index a3b23e91..29ce9f8c 100644 Binary files a/src/images/logo-full.png and b/src/images/logo-full.png differ diff --git a/src/images/logo-wordmark.png b/src/images/logo-wordmark.png index e66f4e3e..3d458bdd 100644 Binary files a/src/images/logo-wordmark.png and b/src/images/logo-wordmark.png differ diff --git a/src/images/square.jpg b/src/images/square.jpg index ac6e9b4a..cd9a10ca 100644 Binary files a/src/images/square.jpg and b/src/images/square.jpg differ diff --git a/src/views/account/edit_account/index.jsx b/src/views/account/edit_account/index.jsx index 621dbec0..11541278 100644 --- a/src/views/account/edit_account/index.jsx +++ b/src/views/account/edit_account/index.jsx @@ -31,7 +31,7 @@ const FormSchema = Yup.object().shape({ }); const EditProfile = () => { - useDocumentTitle('Edit Account | Salinaka'); + useDocumentTitle('Edit Account | Lunetas-cam'); useScrollTop(); const modal = useModal(); diff --git a/src/views/account/user_account/index.jsx b/src/views/account/user_account/index.jsx index 11308627..5060fed7 100644 --- a/src/views/account/user_account/index.jsx +++ b/src/views/account/user_account/index.jsx @@ -17,7 +17,7 @@ const Loader = () => ( const UserAccount = () => { useScrollTop(); - useDocumentTitle('My Account | Salinaka'); + useDocumentTitle('My Account | Lunetas-cam'); return ( diff --git a/src/views/admin/add_product/index.jsx b/src/views/admin/add_product/index.jsx index 09e56143..35807a1c 100644 --- a/src/views/admin/add_product/index.jsx +++ b/src/views/admin/add_product/index.jsx @@ -9,7 +9,7 @@ const ProductForm = lazy(() => import('../components/ProductForm')); const AddProduct = () => { useScrollTop(); - useDocumentTitle('Add New Product | Salinaka'); + useDocumentTitle('Add New Product | Lunetas-cam'); const isLoading = useSelector((state) => state.app.loading); const dispatch = useDispatch(); diff --git a/src/views/admin/edit_product/index.jsx b/src/views/admin/edit_product/index.jsx index dc546ed8..02472c45 100644 --- a/src/views/admin/edit_product/index.jsx +++ b/src/views/admin/edit_product/index.jsx @@ -9,7 +9,7 @@ import { editProduct } from 'redux/actions/productActions'; const ProductForm = lazy(() => import('../components/ProductForm')); const EditProduct = ({ match }) => { - useDocumentTitle('Edit Product | Salinaka'); + useDocumentTitle('Edit Product | Lunetas-cam'); useScrollTop(); const { product, error, isLoading } = useProduct(match.params.id); const dispatch = useDispatch(); diff --git a/src/views/admin/products/index.jsx b/src/views/admin/products/index.jsx index f7a95c52..9782a123 100644 --- a/src/views/admin/products/index.jsx +++ b/src/views/admin/products/index.jsx @@ -10,7 +10,7 @@ import { ProductsNavbar } from '../components'; import ProductsTable from '../components/ProductsTable'; const Products = () => { - useDocumentTitle('Product List | Salinaka Admin'); + useDocumentTitle('Product List | Lunetas-cam Admin'); useScrollTop(); const store = useSelector((state) => ({ diff --git a/src/views/auth/forgot_password/index.jsx b/src/views/auth/forgot_password/index.jsx index e97e2724..016ce5fc 100644 --- a/src/views/auth/forgot_password/index.jsx +++ b/src/views/auth/forgot_password/index.jsx @@ -16,7 +16,7 @@ const ForgotPassword = () => { const [field, setField] = useState({}); useScrollTop(); - useDocumentTitle('Forgot Password | Salinaka'); + useDocumentTitle('Forgot Password | Lunetas-cam'); useEffect(() => { if (didMount) { setForgotPWStatus(authStatus); diff --git a/src/views/auth/signin/index.jsx b/src/views/auth/signin/index.jsx index 1877047a..b61834fb 100644 --- a/src/views/auth/signin/index.jsx +++ b/src/views/auth/signin/index.jsx @@ -29,7 +29,7 @@ const SignIn = ({ history }) => { const dispatch = useDispatch(); useScrollTop(); - useDocumentTitle('Sign In | Salinaka'); + useDocumentTitle('Sign In | Lunetas-cam'); useEffect(() => () => { dispatch(setAuthStatus(null)); @@ -65,7 +65,7 @@ const SignIn = ({ history }) => { )}
-

Sign in to Salinaka

+

Sign in to Lunetas-cam


{ const dispatch = useDispatch(); useScrollTop(); - useDocumentTitle('Sign Up | Salinaka'); + useDocumentTitle('Sign Up | Lunetas-cam'); useEffect(() => () => { dispatch(setAuthStatus(null)); @@ -68,7 +68,7 @@ const SignUp = ({ history }) => { )}
-

Sign up to Salinaka

+

Sign up to Lunetas-cam

{

2

-
Shipping Details
+
Delivery Details
  • diff --git a/src/views/checkout/step1/index.jsx b/src/views/checkout/step1/index.jsx index 94e3a973..7cb8053e 100644 --- a/src/views/checkout/step1/index.jsx +++ b/src/views/checkout/step1/index.jsx @@ -11,7 +11,7 @@ import { StepTracker } from '../components'; import withCheckout from '../hoc/withCheckout'; const OrderSummary = ({ basket, subtotal }) => { - useDocumentTitle('Check Out Step 1 | Salinaka'); + useDocumentTitle('Check Out Step 1 | Lunetas-cam'); useScrollTop(); const dispatch = useDispatch(); const history = useHistory(); diff --git a/src/views/checkout/step2/ShippingForm.jsx b/src/views/checkout/step2/ShippingForm.jsx index c09e8771..bd9451a3 100644 --- a/src/views/checkout/step2/ShippingForm.jsx +++ b/src/views/checkout/step2/ShippingForm.jsx @@ -34,8 +34,8 @@ const ShippingForm = () => {
    • @@ -55,7 +55,7 @@ const ShippingForm = () => { className="label-input" htmlFor={field.name} > - Shipping Option + Delivery Option )}
    @@ -70,10 +70,10 @@ const ShippingForm = () => { />
    diff --git a/src/views/checkout/step2/ShippingTotal.jsx b/src/views/checkout/step2/ShippingTotal.jsx index b7a1186c..3cfbfe1f 100644 --- a/src/views/checkout/step2/ShippingTotal.jsx +++ b/src/views/checkout/step2/ShippingTotal.jsx @@ -13,12 +13,12 @@ const ShippingTotal = ({ subtotal }) => { - International Shipping:   + Delivery Charges:  

    - {values.isInternational ? '$50.00' : '$0.00'} + {values.isInternational ? '2500FCFA' : '0FCFA'}

    @@ -42,7 +42,7 @@ const ShippingTotal = ({ subtotal }) => {

    - {displayMoney(Number(subtotal) + (values.isInternational ? 50 : 0))} + {displayMoney(Number(subtotal) + (values.isInternational ? 2500 : 0))}

    diff --git a/src/views/checkout/step2/index.jsx b/src/views/checkout/step2/index.jsx index 85b66c39..4977b923 100644 --- a/src/views/checkout/step2/index.jsx +++ b/src/views/checkout/step2/index.jsx @@ -39,7 +39,7 @@ const FormSchema = Yup.object().shape({ }); const ShippingDetails = ({ profile, shipping, subtotal }) => { - useDocumentTitle('Check Out Step 2 | Salinaka'); + useDocumentTitle('Check Out Step 2 | Lunetas-cam'); useScrollTop(); const dispatch = useDispatch(); const history = useHistory(); @@ -70,7 +70,7 @@ const ShippingDetails = ({ profile, shipping, subtotal }) => {
    -

    Shipping Details

    +

    Delivery Details

    {

    Total:

    - {displayMoney(subtotal + (isInternational ? 50 : 0))} + {displayMoney(subtotal + (isInternational ? 2500 : 0))}


    diff --git a/src/views/checkout/step3/index.jsx b/src/views/checkout/step3/index.jsx index 101ba42d..6c6591c6 100644 --- a/src/views/checkout/step3/index.jsx +++ b/src/views/checkout/step3/index.jsx @@ -30,7 +30,7 @@ const FormSchema = Yup.object().shape({ }); const Payment = ({ shipping, payment, subtotal }) => { - useDocumentTitle('Check Out Final Step | Salinaka'); + useDocumentTitle('Check Out Final Step | Lunetas-cam'); useScrollTop(); const initFormikValues = { diff --git a/src/views/featured/index.jsx b/src/views/featured/index.jsx index 013a4029..3dd4486e 100644 --- a/src/views/featured/index.jsx +++ b/src/views/featured/index.jsx @@ -5,7 +5,7 @@ import bannerImg from 'images/banner-guy.png'; import React from 'react'; const FeaturedProducts = () => { - useDocumentTitle('Featured Products | Salinaka'); + useDocumentTitle('Featured Products | Lunetas-cam'); useScrollTop(); const { diff --git a/src/views/home/index.jsx b/src/views/home/index.jsx index 953cddc3..4a7930a8 100644 --- a/src/views/home/index.jsx +++ b/src/views/home/index.jsx @@ -11,7 +11,7 @@ import { Link } from 'react-router-dom'; const Home = () => { - useDocumentTitle('Salinaka | Home'); + useDocumentTitle('Lunetas-cam | Home'); useScrollTop(); const { diff --git a/src/views/recommended/index.jsx b/src/views/recommended/index.jsx index 67e863cf..04e5f210 100644 --- a/src/views/recommended/index.jsx +++ b/src/views/recommended/index.jsx @@ -5,7 +5,7 @@ import bannerImg from 'images/banner-girl-1.png'; import React from 'react'; const RecommendedProducts = () => { - useDocumentTitle('Recommended Products | Salinaka'); + useDocumentTitle('Recommended Products | Lunetas-cam'); useScrollTop(); const { diff --git a/src/views/shop/index.jsx b/src/views/shop/index.jsx index df8ea79c..5425f881 100644 --- a/src/views/shop/index.jsx +++ b/src/views/shop/index.jsx @@ -6,7 +6,7 @@ import { shallowEqual, useSelector } from 'react-redux'; import { selectFilter } from 'selectors/selector'; const Shop = () => { - useDocumentTitle('Shop | Salinaka'); + useDocumentTitle('Shop | Lunetas-cam'); useScrollTop(); const store = useSelector((state) => ({ diff --git a/static/logo-full.png b/static/logo-full.png index a3b23e91..29ce9f8c 100644 Binary files a/static/logo-full.png and b/static/logo-full.png differ diff --git a/static/logo-wordmark.png b/static/logo-wordmark.png index e66f4e3e..3d458bdd 100644 Binary files a/static/logo-wordmark.png and b/static/logo-wordmark.png differ