Skip to content

user should be able to become a seller #78

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.

Sign up for GitHub

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

Merged
merged 6 commits into from
Aug 21, 2024
Merged

user should be able to become a seller #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9f60fd0
user should be able to becomme a seller
Aime-Patrick Aug 8, 2024
79f0a23
user be able to become a seller
Aime-Patrick Aug 13, 2024
f714fa6
Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-fe…
Aime-Patrick Aug 13, 2024
c0298c0
Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-fe…
Aime-Patrick Aug 15, 2024
1f96c7d
Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-fe…
Aime-Patrick Aug 19, 2024
379a4ef
Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-fe…
Aime-Patrick Aug 20, 2024
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
882 changes: 775 additions & 107 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 7 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,12 @@
"build-storybook": "storybook build"
},
"dependencies": {
"@emotion/react": "^11.11.4",
"@emotion/styled": "^11.11.5",
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@mui/icons-material": "^5.16.4",
"@mui/joy": "^5.0.0-beta.48",
"@mui/material": "^5.16.4",
"@reduxjs/toolkit": "^2.2.5",
"antd": "^5.19.2",
Expand All @@ -27,20 +28,24 @@
"html-webpack-plugin": "^5.6.0",
"jwt-decode": "^4.0.0",
"mini-css-extract-plugin": "^2.9.0",
"pdfjs-dist": "^4.5.136",
"papaparse": "^5.4.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-fast-marquee": "^1.6.5",
"react-helmet": "^6.1.0",
"react-icons": "^5.2.1",
"react-input-emoji": "^5.9.0",
"react-loader-spinner": "^6.1.6",
"react-pdf": "^9.1.0",
"react-redux": "^9.1.2",
"react-router-dom": "^6.24.0",
"react-spinners": "^0.14.1",
"react-toastify": "^10.0.5",
"recharts": "^2.12.7",
"save-dev": "0.0.1-security",
"socket.io-client": "^4.7.5",
"ts-loader": "^9.5.1",
"xlsx": "^0.18.5",
"yup": "^1.4.0"
},
Expand Down
Binary file added public/assets/images/Na_Dec_44.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/assets/images/rejected.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 7 additions & 1 deletion src/App.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,11 @@
@import "./assets//styles/UserProfile.scss";
@import "./assets/styles/SellerSideProduct.scss";
@import "./assets/styles/SellerDeleteItem.scss";
@import "./assets/styles/verticalStepper.scss";
@import "./assets/styles/requests.scss";
@import "./assets/styles/AboutUs.scss";
@import "./assets/styles/UserDetails.scss";
@import "./assets/styles/SellerRegistration.scss";
@import "./assets/styles/ServicesPage.scss";
@import "./assets/styles/Settings.scss";
@import "./assets/styles/Settings.scss";
@import "./assets/styles/HomePage.scss";
187 changes: 187 additions & 0 deletions src/assets/styles/AboutUs.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,187 @@
.about {
background-color: $container-color;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;

&__container {
background-color: $white-color;
width: 80%;
padding: 4rem 0;

h1 {
color: $text-color;
font-family: $text-family;
font-size: 4rem;
text-align: center;
padding-bottom: 1.5rem;
}

.welcome {
display: flex;
flex-direction: column;
align-items: center;

h2 {
color: $text2-color;
font-family: $text-family;
font-size: 2.4rem;
text-align: center;
}

.paragraph {
color: $text2-color;
font-family: $text-family;
font-size: 1.8rem;
text-align: center;
margin-top: 2rem;
line-height: 1.5;
margin-bottom: 4rem;
width: 50%;
}
}

.mission {
display: flex;
flex-direction: column;
align-items: center;

h2 {
color: $text2-color;
font-family: $text-family;
font-size: 2.4rem;
text-align: center;
margin-bottom: 1rem;
}

.paragraph {
color: $text2-color;
font-family: $text-family;
font-size: 1.8rem;
text-align: center;
margin-top: 2rem;
line-height: 1.5;
margin-bottom: 4rem;
width: 50%;
}
}

.team {
display: flex;
flex-direction: column;
align-items: center;

h2 {
color: $text2-color;
font-family: $text-family;
font-size: 2.4rem;
text-align: center;
margin-bottom: 1rem;
}

.team__members {
display: flex;
flex-wrap: wrap;
justify-content: center;
margin-top: 2rem;
overflow: hidden;
gap: 2rem;
// position: absolute;

.team__member {
position: relative;
overflow: hidden;
img {
width: 25rem;
height: 25rem;
object-fit: cover;
display: block;
}

&__desc {
position: absolute;
bottom: -100%;
left: 0;
width: 100%;
background-color: rgba(0, 0, 0, 0.7);
padding: 10px;
box-sizing: border-box;
transition: bottom 0.3s ease-in-out;

h3 {
color: $white-color;
font-family: $text-family;
font-size: 1.8rem;
text-align: center;
margin-bottom: 0.5rem;
}

p {
color: $white-color;
font-family: $text-family;
font-size: 1.6rem;
text-align: center;
margin-top: 1rem;
}

&__icon {
font-size: 3rem;
display: flex;
justify-content: center;
gap: 1rem;

a {
color: $primary-color;

&:hover {
transition: all 0.5s ease-in-out;
animation: bounce 1s backwards;
}
}

@keyframes bounce {

0%,
100% {
transform: translateY(0);
}

50% {
transform: translateY(-10px);
}
}
}
}

}
.team__member:hover .team__member__desc{
bottom: 0;
}
}
}

.get-in-touch {
display: flex;
flex-direction: column;
align-items: center;
margin-top: 4rem;

button {
padding: 2rem;
background-color: $primary-color;
color: $white-color;
border: none;
border-radius: 1rem;
font-size: 2rem;
cursor: pointer;
transition: all 0.3s ease-in-out;

&:hover {
background-color: $primary-color-dark;
}
}
}
}

}
7 changes: 4 additions & 3 deletions src/assets/styles/Colors.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ $border-color: #D9D9D9;
$red-color:red;
$grayColor:gray;
$primary-color-half: rgb(248,244,244);
$red-color:red;
$red-color-light:rgb(250, 169, 169);
$red-color-dark:rgb(59, 1, 1);
$menu-hover: #FE975B;
$green-color: rgb(3, 216, 3);
$green-color: rgb(15, 145, 3);
$green-middle-color: rgba(3, 216, 3, 0.3);
$red-middle-color: rgba(216, 8, 3, 0.3);

$green-color-light:#97fa97;

$toastify-color-light: #fff;
$toastify-color-dark: #121212;
Expand Down
28 changes: 28 additions & 0 deletions src/assets/styles/HomePage.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.banner {
background-color: $primary-color;
display: flex;
justify-content: center;
align-items: center;
gap: 1rem;
color: $white;
font-size: 2rem;
padding: 1rem;

.btn-link {
background-color: $primary-color-light;
border: none;
padding: 1rem 2rem;
border-radius: 5px;
cursor: pointer;
color: $white;
transition: all 0.5s ease-in-out;

&:hover {
background-color: $menu-hover;
transition: all 0.5s ease-in-out;
color: $text2-color;

}
}

}
Loading
Loading