Skip to content

Commit c0298c0

Browse files
committed
Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-fe into ft-become-seller
2 parents f714fa6 + 38cda3b commit c0298c0

30 files changed

+1366
-122
lines changed

Diff for: package-lock.json

+122
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

+3
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
"jwt-decode": "^4.0.0",
3030
"mini-css-extract-plugin": "^2.9.0",
3131
"pdfjs-dist": "^4.5.136",
32+
"papaparse": "^5.4.1",
3233
"react": "^18.3.1",
3334
"react-dom": "^18.3.1",
3435
"react-fast-marquee": "^1.6.5",
@@ -45,6 +46,7 @@
4546
"save-dev": "0.0.1-security",
4647
"socket.io-client": "^4.7.5",
4748
"ts-loader": "^9.5.1",
49+
"xlsx": "^0.18.5",
4850
"yup": "^1.4.0"
4951
},
5052
"devDependencies": {
@@ -72,6 +74,7 @@
7274
"@types/jest": "^29.5.12",
7375
"@types/mini-css-extract-plugin": "^2.5.1",
7476
"@types/node": "^20.14.9",
77+
"@types/papaparse": "^5.3.14",
7578
"@types/react": "^18.3.3",
7679
"@types/react-dom": "^18.3.0",
7780
"@types/react-helmet": "^6.1.11",

Diff for: public/assets/images/Na_Dec_44.jpg

1.01 MB
Loading

Diff for: src/App.scss

+1
Original file line numberDiff line numberDiff line change
@@ -48,3 +48,4 @@
4848
@import "./assets/styles/requests.scss";
4949
@import "./assets/styles/AboutUs.scss";
5050
@import "./assets/styles/UserDetails.scss";
51+
@import "./assets/styles/SellerRegistration.scss"

Diff for: src/assets/styles/SellerLayout.scss

+28-12
Original file line numberDiff line numberDiff line change
@@ -341,21 +341,37 @@
341341
}
342342
}
343343

344-
.monthDropDown {
345-
.dropdown-button {
346-
background-color: #ff7300;
347-
color: #fff;
348-
border: none;
349-
padding: 5px 10px;
350-
border-radius: 5px;
351-
cursor: pointer;
352-
font-size: 14px;
353-
354-
.arrow-down {
355-
margin-left: 5px;
344+
.export-section{
345+
display: flex;
346+
gap: 10px;
347+
.monthDropDown {
348+
.dropdown-button {
349+
background-color: #ff7300;
350+
color: #fff;
351+
border: none;
352+
padding: 5px 10px;
353+
border-radius: 5px;
354+
cursor: pointer;
355+
font-size: 14px;
356+
357+
.arrow-down {
358+
margin-left: 5px;
359+
}
356360
}
357361
}
362+
.export-btn{
363+
background-color: #0f8615;
364+
color: #fff;
365+
border: none;
366+
padding: 5px 10px;
367+
border-radius: 5px;
368+
cursor: pointer;
369+
font-size: 14px;
370+
display: flex;
371+
gap: 4px;
372+
}
358373
}
374+
359375
}
360376
}
361377
}

0 commit comments

Comments
 (0)