Skip to content

Commit d4e54ea

Browse files
ndahimana154ndahimana154
authored
Fix user pay via stripe 187584890 (#64)
* Finishes user pay cart functionality * --ammend * --ammend * --ammend * --ammend
1 parent 2d99f3a commit d4e54ea

File tree

12 files changed

+710
-246
lines changed

12 files changed

+710
-246
lines changed

Diff for: ‎src/App.scss

+14-12
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,20 @@
2222
@import './assets/styles/ImageSlider.scss';
2323
@import './assets/styles/Queries.scss';
2424
@import './assets/styles/ViewCart.scss';
25-
@import "./assets/styles/Notifications.scss";
26-
@import "./assets/styles/Search.scss";
27-
@import "./assets/styles/CustomSelect.scss";
28-
@import "./assets/styles/SellerProduct.scss";
29-
@import "./assets/styles/SellerCollection.scss";
30-
@import "./assets/styles/SellerLayout.scss";
31-
@import "./assets/styles/tables.scss";
32-
@import "./assets/styles/adminDashboard.scss";
33-
@import "./assets/styles/users.scss";
34-
@import "./assets/styles/liveChat.scss";
35-
@import "./assets//styles/UserProfile.scss";
36-
@import "./assets/styles/SellerSideProduct.scss";
25+
@import './assets/styles/Notifications.scss';
26+
@import './assets/styles/Search.scss';
27+
@import './assets/styles/CustomSelect.scss';
28+
@import './assets/styles/SellerProduct.scss';
29+
@import './assets/styles/SellerCollection.scss';
30+
@import './assets/styles/SellerLayout.scss';
31+
@import './assets/styles/tables.scss';
32+
@import './assets/styles/adminDashboard.scss';
33+
@import './assets/styles/users.scss';
34+
@import './assets/styles/liveChat.scss';
35+
@import './assets//styles/UserProfile.scss';
36+
@import './assets/styles/SellerSideProduct.scss';
37+
@import './assets/styles/myOrders.scss';
3738
@import "./assets/styles/tables.scss";
3839
@import "./assets/styles/cards.scss";
3940
@import "./assets/styles/trackOrder.scss";
41+
@import './assets/styles/trackOrder.scss';

Diff for: ‎src/assets/styles/Colors.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import url('https://fonts.googleapis.com/css2?family=Averia+Serif+Libre:ital,wght@0,300;0,400;0,700;1,300;1,400;1,700&display=swap');
22
$primary-color: #ff6d18;
3+
$primary-color-opacity: #ff6d184d;
34
$primary-color-light: #ffe2d1;
45
$primary-color-dark: #ff8a46;
56
$secondary-color: #777777;

Diff for: ‎src/assets/styles/myOrders.scss

+118
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
.my-orders-section {
2+
h1 {
3+
color: $primary-color;
4+
text-align: center;
5+
font-size: 22px;
6+
padding: 10px;
7+
}
8+
.order {
9+
width: 90%;
10+
margin: auto;
11+
font-size: 14px;
12+
margin-top: 20px;
13+
margin-bottom: 20px;
14+
15+
.head {
16+
display: flex;
17+
flex-direction: row;
18+
justify-content: space-between;
19+
align-items: center;
20+
padding: 10px 0;
21+
background: $border-color;
22+
text-transform: uppercase;
23+
font-size: 12px;
24+
25+
div {
26+
flex: 1;
27+
color: $black;
28+
font-weight: bold;
29+
font-size: 12px;
30+
padding-left: 5px;
31+
}
32+
33+
.or {
34+
flex: 2;
35+
}
36+
}
37+
38+
.order-body {
39+
display: flex;
40+
flex-direction: row;
41+
justify-content: space-between;
42+
align-items: center;
43+
background: $white;
44+
45+
div {
46+
flex: 1;
47+
color: $black;
48+
padding: 5px;
49+
border: 1px solid $border-color;
50+
min-height: 100px;
51+
margin: -1px 0 0 -1px; // Adjust to remove gaps between borders
52+
}
53+
54+
.order-product {
55+
display: flex;
56+
flex-direction: row;
57+
font-size: 12px;
58+
59+
img {
60+
width: 48%;
61+
height: 80px;
62+
object-fit: cover;
63+
}
64+
65+
p {
66+
padding-left: 10px;
67+
68+
h3 {
69+
margin-top: 5px;
70+
font-size: 12px;
71+
}
72+
73+
span {
74+
font-weight: bold;
75+
}
76+
77+
.o-price {
78+
margin-left: 20px;
79+
}
80+
}
81+
}
82+
83+
.order-details {
84+
a {
85+
top: 20px;
86+
position: relative;
87+
text-transform: uppercase;
88+
text-decoration: underline;
89+
font-size: 12px;
90+
}
91+
}
92+
93+
.date-placed {
94+
span {
95+
top: 20px;
96+
position: relative;
97+
}
98+
}
99+
100+
.track {
101+
button {
102+
padding: 5px;
103+
border: 2px solid $primary-color;
104+
color: $primary-color;
105+
border-radius: 5px;
106+
margin-top: 20px;
107+
cursor: pointer;
108+
}
109+
110+
.disabled {
111+
cursor: default;
112+
color: $primary-color-opacity;
113+
border: 2px solid $primary-color-opacity;
114+
}
115+
}
116+
}
117+
}
118+
}

Diff for: ‎src/assets/styles/trackOrder.scss

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ $text-family: 'Averia Serif Libre';
3535

3636
p {
3737
margin: 30px 0;
38-
38+
3939
}
4040

4141
img {
@@ -64,7 +64,7 @@ $text-family: 'Averia Serif Libre';
6464
padding: 0;
6565
position: relative;
6666
margin-left: 20px;
67-
67+
6868

6969
&::before {
7070
content: '';
@@ -91,7 +91,7 @@ $text-family: 'Averia Serif Libre';
9191
border-radius: 50%;
9292
margin-right: 10px;
9393
z-index: 1;
94-
94+
9595
}
9696

9797
p {
@@ -120,4 +120,4 @@ $text-family: 'Averia Serif Libre';
120120
border-bottom: 2px solid #ccc;
121121
padding-bottom: 5px;
122122
}
123-
}
123+
}

0 commit comments

Comments
 (0)