Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/lunetas cam #48

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion 404.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Salinaka - React Ecommerce Store</title>
<title>Lunetas-cam - React Ecommerce Store</title>
<link rel="icon" type="image/png" href="/static/favicon.png" />
</head>

Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no, maximum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Salinaka - React Ecommerce Store</title>
<title>Lunetas-cam - React Ecommerce Store</title>
<link rel="icon" type="image/png" href="/static/favicon.png" />
</head>

Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
9 changes: 4 additions & 5 deletions src/components/common/Footer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ const Footer = () => {
<div className="footer-col-1">
<strong>
<span>
Developed by
{' '}
<a href="https://github.com/jgudo">JULIUS GUEVARRA</a>
Contacts <br />
tel : +237 651 97 76 85 <br />
email : [email protected]
</span>
</strong>
</div>
Expand All @@ -32,8 +32,7 @@ const Footer = () => {
<div className="footer-col-3">
<strong>
<span>
Fork this project &nbsp;
<a href="https://github.com/jgudo/ecommerce-react">HERE</a>
Welcome
</span>
</strong>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/common/MobileNavigation.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const Navigation = (props) => {
<div className="mobile-navigation-main">
<div className="mobile-navigation-logo">
<Link onClick={onClickLink} to={HOME}>
<h2>SALINAKA</h2>
<h2>LUNETAS-CAM</h2>
</Link>
</div>

Expand Down
4 changes: 2 additions & 2 deletions src/helpers/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
Binary file modified src/images/banner-girl.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/defaultAvatar.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/defaultBanner.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/logo-full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/logo-wordmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/images/square.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/views/account/edit_account/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const FormSchema = Yup.object().shape({
});

const EditProfile = () => {
useDocumentTitle('Edit Account | Salinaka');
useDocumentTitle('Edit Account | Lunetas-cam');
useScrollTop();

const modal = useModal();
Expand Down
2 changes: 1 addition & 1 deletion src/views/account/user_account/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const Loader = () => (

const UserAccount = () => {
useScrollTop();
useDocumentTitle('My Account | Salinaka');
useDocumentTitle('My Account | Lunetas-cam');

return (
<UserTab>
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/add_product/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/edit_product/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/views/admin/products/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => ({
Expand Down
2 changes: 1 addition & 1 deletion src/views/auth/forgot_password/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions src/views/auth/signin/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const SignIn = ({ history }) => {
const dispatch = useDispatch();

useScrollTop();
useDocumentTitle('Sign In | Salinaka');
useDocumentTitle('Sign In | Lunetas-cam');

useEffect(() => () => {
dispatch(setAuthStatus(null));
Expand Down Expand Up @@ -65,7 +65,7 @@ const SignIn = ({ history }) => {
)}
<div className={`auth ${authStatus?.message && (!authStatus?.success && 'input-error')}`}>
<div className="auth-main">
<h3>Sign in to Salinaka</h3>
<h3>Sign in to Lunetas-cam</h3>
<br />
<div className="auth-wrapper">
<Formik
Expand Down
4 changes: 2 additions & 2 deletions src/views/auth/signup/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const SignUp = ({ history }) => {
const dispatch = useDispatch();

useScrollTop();
useDocumentTitle('Sign Up | Salinaka');
useDocumentTitle('Sign Up | Lunetas-cam');

useEffect(() => () => {
dispatch(setAuthStatus(null));
Expand Down Expand Up @@ -68,7 +68,7 @@ const SignUp = ({ history }) => {
)}
<div className={`auth ${authStatus?.message && (!authStatus?.success && 'input-error')}`}>
<div className="auth-main">
<h3>Sign up to Salinaka</h3>
<h3>Sign up to Lunetas-cam</h3>
<Formik
initialValues={{
fullname: '',
Expand Down
2 changes: 1 addition & 1 deletion src/views/checkout/components/StepTracker.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const StepTracker = ({ current }) => {
<div className="checkout-header-icon">
<h4 className="checkout-header-step">2</h4>
</div>
<h6 className="checkout-header-subtitle">Shipping Details</h6>
<h6 className="checkout-header-subtitle">Delivery Details</h6>
</div>
</li>
<li className={`checkout-header-list ${className(3)}`}>
Expand Down
2 changes: 1 addition & 1 deletion src/views/checkout/step1/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
12 changes: 6 additions & 6 deletions src/views/checkout/step2/ShippingForm.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const ShippingForm = () => {
<Field
name="address"
type="text"
label="* Shipping Address"
placeholder="Enter full shipping address"
label="* Delivery Address"
placeholder="Enter full delivery address"
component={CustomInput}
/>
</div>
Expand All @@ -55,7 +55,7 @@ const ShippingForm = () => {
className="label-input"
htmlFor={field.name}
>
Shipping Option
Delivery Option
</label>
)}
<div className="checkout-checkbox-field">
Expand All @@ -70,10 +70,10 @@ const ShippingForm = () => {
/>
<label className="d-flex w-100" htmlFor={field.name}>
<h5 className="d-flex-grow-1 margin-0">
&nbsp; International Shipping &nbsp;
<span className="text-subtle">7-14 days</span>
&nbsp; Delivery Charges &nbsp;
<span className="text-subtle">1-2 days</span>
</h5>
<h4 className="margin-0">$50.00</h4>
<h4 className="margin-0">2500FCFA</h4>
</label>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions src/views/checkout/step2/ShippingTotal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ const ShippingTotal = ({ subtotal }) => {
<tr>
<td>
<span className="d-block margin-0 padding-right-s text-right">
International Shipping: &nbsp;
Delivery Charges: &nbsp;
</span>
</td>
<td>
<h4 className="basket-total-amount text-subtle text-right margin-0 ">
{values.isInternational ? '$50.00' : '$0.00'}
{values.isInternational ? '2500FCFA' : '0FCFA'}
</h4>
</td>
</tr>
Expand All @@ -42,7 +42,7 @@ const ShippingTotal = ({ subtotal }) => {
</td>
<td>
<h2 className="basket-total-amount text-right">
{displayMoney(Number(subtotal) + (values.isInternational ? 50 : 0))}
{displayMoney(Number(subtotal) + (values.isInternational ? 2500 : 0))}
</h2>
</td>
</tr>
Expand Down
4 changes: 2 additions & 2 deletions src/views/checkout/step2/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -70,7 +70,7 @@ const ShippingDetails = ({ profile, shipping, subtotal }) => {
<div className="checkout">
<StepTracker current={2} />
<div className="checkout-step-2">
<h3 className="text-center">Shipping Details</h3>
<h3 className="text-center">Delivery Details</h3>
<Formik
initialValues={initFormikValues}
validateOnChange
Expand Down
2 changes: 1 addition & 1 deletion src/views/checkout/step3/Total.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const Total = ({ isInternational, subtotal }) => {
<div className="basket-total text-right">
<p className="basket-total-title">Total:</p>
<h2 className="basket-total-amount">
{displayMoney(subtotal + (isInternational ? 50 : 0))}
{displayMoney(subtotal + (isInternational ? 2500 : 0))}
</h2>
</div>
<br />
Expand Down
2 changes: 1 addition & 1 deletion src/views/checkout/step3/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion src/views/featured/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/views/home/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Link } from 'react-router-dom';


const Home = () => {
useDocumentTitle('Salinaka | Home');
useDocumentTitle('Lunetas-cam | Home');
useScrollTop();

const {
Expand Down
2 changes: 1 addition & 1 deletion src/views/recommended/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/views/shop/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -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) => ({
Expand Down
Binary file modified static/logo-full.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified static/logo-wordmark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.