Skip to content

Commit d07820e

Browse files
Aime-PatrickAime-Patrick
committed
Merge branch 'develop' of github.com:atlp-rwanda/e-commerce-ninjas-fe into ft-become-seller
2 parents 1f96c7d + 910ebf6 commit d07820e

30 files changed

+1929
-463
lines changed

Diff for: ‎public/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
66
<meta name="viewport" content="width=device-width, initial-scale=1" />
77
<link rel="icon" href="./assets/images/logo.png" type="image/png" />
8-
<title>E-Commerce Ninjas FrontEnd</title>
8+
<title>E-Commerce Ninjas</title>
99
</head>
1010
<body>
1111
<div id="root"></div>

Diff for: ‎src/App.scss

+4-3
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,11 @@
4444
@import "./assets//styles/UserProfile.scss";
4545
@import "./assets/styles/SellerSideProduct.scss";
4646
@import "./assets/styles/SellerDeleteItem.scss";
47-
@import "./assets/styles/ServicesPage.scss"
48-
;
4947
@import "./assets/styles/verticalStepper.scss";
5048
@import "./assets/styles/requests.scss";
5149
@import "./assets/styles/AboutUs.scss";
5250
@import "./assets/styles/UserDetails.scss";
53-
@import "./assets/styles/SellerRegistration.scss"
51+
@import "./assets/styles/SellerRegistration.scss";
52+
@import "./assets/styles/ServicesPage.scss";
53+
@import "./assets/styles/Settings.scss";
54+
@import "./assets/styles/HomePage.scss";

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

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
.banner {
2+
background-color: $primary-color;
3+
display: flex;
4+
justify-content: center;
5+
align-items: center;
6+
gap: 1rem;
7+
color: $white;
8+
font-size: 2rem;
9+
padding: 1rem;
10+
11+
.btn-link {
12+
background-color: $primary-color-light;
13+
border: none;
14+
padding: 1rem 2rem;
15+
border-radius: 5px;
16+
cursor: pointer;
17+
color: $white;
18+
transition: all 0.5s ease-in-out;
19+
20+
&:hover {
21+
background-color: $menu-hover;
22+
transition: all 0.5s ease-in-out;
23+
color: $text2-color;
24+
25+
}
26+
}
27+
28+
}

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

+201
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
.settings {
2+
border: 1px solid $border-color;
3+
width: 100%;
4+
height: 100%;
5+
background-color: $white-color;
6+
7+
h2 {
8+
margin: 0;
9+
padding: 2%;
10+
font-size: 2.5rem;
11+
font-weight: bold;
12+
text-align: left;
13+
}
14+
15+
.menu-bar {
16+
display: flex;
17+
margin: 0 2.5rem;
18+
border-bottom: 1px solid #ddd;
19+
20+
21+
.menu-item {
22+
cursor: pointer;
23+
font-size: 1.3rem;
24+
25+
p {
26+
margin-right: 1rem;
27+
padding: 1rem;
28+
29+
&.active {
30+
background-color: $primary-color-light;
31+
color: $primary-color;
32+
padding: 1rem;
33+
border-bottom: 1px solid $primary-color;
34+
transition: padding .2s ease-in-out;
35+
}
36+
}
37+
38+
}
39+
}
40+
41+
42+
.section_container {
43+
flex-grow: 1;
44+
padding: 0 2.5rem;
45+
46+
.loading__spinner {
47+
display: flex;
48+
justify-content: center;
49+
align-items: center;
50+
width: 100%;
51+
height: 50rem;
52+
53+
}
54+
55+
.section-content {
56+
background-color: white;
57+
overflow-y: auto;
58+
padding: 10px;
59+
height: 70vh;
60+
61+
62+
label {
63+
font-size: 2.5rem;
64+
font-weight: bold;
65+
}
66+
67+
.password_exp {
68+
background-color: $secondary-color-light;
69+
padding: 2rem 5rem;
70+
border-radius: .5rem;
71+
margin-bottom: 2rem;
72+
73+
.form-group {
74+
display: flex;
75+
justify-content: space-between;
76+
align-items: center;
77+
margin-bottom: 20px;
78+
79+
input {
80+
padding: 10px;
81+
border: 1px solid #ddd;
82+
border-radius: 5px;
83+
font-size: 1.4rem;
84+
width: 30%;
85+
}
86+
}
87+
88+
.btn {
89+
padding: 10px 20px;
90+
background-color: $primary-color;
91+
color: $white-color;
92+
border: none;
93+
border-radius: 5px;
94+
font-size: 1.6rem;
95+
width: 8rem;
96+
cursor: pointer;
97+
transition: width 0.5s linear;
98+
99+
&:hover {
100+
background-color: $primary-color-dark;
101+
width: 10rem;
102+
transition: width 0.5s linear;
103+
}
104+
}
105+
}
106+
107+
.terms {
108+
background-color: $secondary-color-light;
109+
padding: 2rem 5rem;
110+
border-radius: .5rem;
111+
margin-bottom: 2rem;
112+
113+
.nav__terms {
114+
padding-bottom: 1rem;
115+
116+
.terms__link {
117+
padding: 1rem;
118+
119+
&.active {
120+
background-color: $primary-color-light;
121+
border-bottom: 1px solid $primary-color;
122+
color: $primary-color;
123+
}
124+
}
125+
126+
ul {
127+
display: flex;
128+
list-style: none;
129+
margin: 0;
130+
padding: 0;
131+
cursor: pointer;
132+
border-bottom: 1px solid rgba(0, 0, 0, 0.2);
133+
134+
li {
135+
font-size: 1.5rem;
136+
}
137+
}
138+
}
139+
140+
form {
141+
padding: 0;
142+
margin: 2rem 0;
143+
144+
div:first-child {
145+
margin: 20px 0;
146+
display: flex;
147+
flex-direction: column;
148+
justify-content: space-between;
149+
150+
textarea {
151+
padding: 10px;
152+
border: 1px solid #ddd;
153+
border-radius: 5px;
154+
font-size: 1.4rem;
155+
width: 50%;
156+
height: 100px;
157+
158+
&:hover {
159+
border-color: $primary-color;
160+
}
161+
}
162+
163+
select {
164+
border: 1px solid #ddd;
165+
border-radius: 5px;
166+
font-size: 1.4rem;
167+
height: 30%;
168+
width: 20%;
169+
margin: 2rem 0;
170+
171+
&:hover {
172+
border-color: $primary-color;
173+
}
174+
}
175+
}
176+
177+
.form-group {
178+
.btn {
179+
padding: 10px 20px;
180+
background-color: $primary-color;
181+
color: $white-color;
182+
border: none;
183+
border-radius: 5px;
184+
font-size: 1.6rem;
185+
width: 8rem;
186+
cursor: pointer;
187+
transition: width 0.5s linear;
188+
189+
&:hover {
190+
background-color: $primary-color-dark;
191+
width: 10rem;
192+
transition: width 0.5s linear;
193+
}
194+
}
195+
}
196+
}
197+
}
198+
}
199+
}
200+
201+
}

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

+14-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
flex-direction: column;
2020
height: 100%;
2121
width: 100%;
22-
.dashboard,
23-
.users,
24-
.logout {
22+
.menu__item,.logout {
2523
display: flex;
2624
align-items: center;
2725
padding-left: 1rem;
@@ -214,5 +212,17 @@
214212
.dropdown-item:hover {
215213
background-color: #f1f1f1;
216214
}
217-
@media only screen and (min-width: 76.8rem) {
215+
216+
.password-expiration-container {
217+
display: flex;
218+
justify-content: space-between;
219+
align-items: center;
220+
margin-bottom: 20px;
221+
}
222+
223+
.password-expiration-input {
224+
padding: 8px;
225+
font-size: 1rem;
226+
border: 1px solid #ccc;
227+
border-radius: 4px;
218228
}

0 commit comments

Comments
 (0)