Skip to content

Commit

Permalink
Re-rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
ndahimana154 committed Jul 8, 2024
1 parent 4d1e751 commit 172d2ce
Show file tree
Hide file tree
Showing 5 changed files with 211 additions and 212 deletions.
1 change: 0 additions & 1 deletion src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import { Provider } from 'react-redux';
import { store } from './store/store';
import App from './App';
import { ToastContainer } from'react-toastify';
import 'react-toastify/dist/ReactToastify.css';

const root = createRoot(document.getElementById("root")!);
root.render(
Expand Down
3 changes: 0 additions & 3 deletions src/pages/LandingPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { useAppDispatch, useAppSelector } from '../store/store';
import { IWelcomeMessage } from '../utils/types/store';
import { loadWelcomeMessage } from '../store/features/welcomeSlice';
import { fetchProducts } from '../store/features/product/productSlice';
import Header from "../components/layout/Header";
import Footer from "../components/layout/Footer";
import Product from '../components/product/Product';
import Sample from '../components/layout/Sample';
Expand All @@ -16,7 +15,6 @@ const LandingPage: React.FC = () => {
const dispatch = useAppDispatch();
const { products, isError, isSuccess, isLoading, message } = useAppSelector((state: any) => state.products);

console.log(localStorage.getItem('token'))
console.log(localStorage.getItem('token'))
const welcomeMessage: IWelcomeMessage = useAppSelector((state) => state.initialMessage.welcomeMessage);
useEffect(() => {
Expand All @@ -25,7 +23,6 @@ const LandingPage: React.FC = () => {

return (
<>
<Header />
<Sample />
<div className="landing-container">
{isLoading ? (
Expand Down
4 changes: 2 additions & 2 deletions src/pages/SignUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { useAppDispatch, useAppSelector } from '../store/store';
import { googleAuth, registerUser } from '../store/features/auth/authSlice';
import { CircleLoader } from 'react-spinners';
import SignUpIcon from '../../public/images/sign-up.png'
import "../styles/signup.scss"
const SignUpSchema = Yup.object().shape({
email: Yup.string().email('Email must be valid').required('Email is required'),
password: Yup.string().required('Password is required'),
Expand Down Expand Up @@ -75,7 +76,7 @@ export const SignUp = () => {
</p>
</div>
<div className='img'>
<img src={SignUpIcon} alt="login-icon" />
<img src={SignUpIcon} alt="Signup-icon" />
</div>
</div>
<div className='right-side-login'>
Expand Down Expand Up @@ -137,4 +138,3 @@ export const SignUp = () => {
</>
)
}

1 change: 1 addition & 0 deletions src/styles/LandingPage.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@import "./Colors";
@import "color";

.landing-container {
padding: 3rem 2rem 4rem 5rem;
Expand Down
Loading

0 comments on commit 172d2ce

Please sign in to comment.