Skip to content

Commit 6cab583

Browse files
authored
Fx fixes (#65)
* [Finishes #187584877] Admin should be able to disable an account * [Delivers #187584880]Users should be able to chat
1 parent 6dbbfdd commit 6cab583

24 files changed

+253
-25
lines changed

Diff for: package-lock.json

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

Diff for: package.json

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"@mui/material": "^5.16.4",
1919
"@reduxjs/toolkit": "^2.2.5",
2020
"antd": "^5.19.2",
21+
"aos": "^2.3.4",
2122
"axios": "^1.7.2",
2223
"cors": "^2.8.5",
2324
"dotenv": "^16.4.5",
@@ -61,6 +62,7 @@
6162
"@testing-library/dom": "^10.2.0",
6263
"@testing-library/jest-dom": "^6.4.6",
6364
"@testing-library/react": "^16.0.0",
65+
"@types/aos": "^3.0.7",
6466
"@types/fork-ts-checker-webpack-plugin": "^0.4.5",
6567
"@types/jest": "^29.5.12",
6668
"@types/mini-css-extract-plugin": "^2.5.1",

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

1.5 MB
Loading
Loading

Diff for: public/assets/images/cyber-monday-shopping-sales.jpg

1.33 MB
Loading
Loading
Loading

Diff for: public/assets/images/shopping-cart-gift-boxes.jpg

1.08 MB
Loading
13.6 MB
Loading

Diff for: public/assets/shoe1.jpeg

-6.91 KB
Binary file not shown.

Diff for: public/assets/shoe2.jpeg

-8.79 KB
Binary file not shown.

Diff for: public/assets/shoe3.jpeg

-5.76 KB
Binary file not shown.

Diff for: public/assets/shoe4.jpeg

-6.57 KB
Binary file not shown.

Diff for: src/App.scss

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import './assets/styles/Colors.scss';
22
@import './assets/styles/style.scss';
3+
@import './assets/styles/toastify.scss';
34
@import './assets/styles/Sample.scss';
45
@import './assets/styles/signup.scss';
56
@import './assets/styles/Login.scss';

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

+15
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,24 @@ $text-family: 'Averia Serif Libre';
2626
$white-color: #FFFFFF;
2727
$border-color: #D9D9D9;
2828
$red-color:red;
29+
$grayColor:gray;
2930
$primary-color-half: rgb(248,244,244);
3031
$red-color:red;
3132
$menu-hover: #FE975B;
3233
$green-color: rgb(3, 216, 3);
3334
$green-middle-color: rgba(3, 216, 3, 0.3);
3435
$red-middle-color: rgba(216, 8, 3, 0.3);
36+
37+
38+
$toastify-color-light: #fff;
39+
$toastify-color-dark: #121212;
40+
$toastify-color-info: #3498db;
41+
$toastify-color-success: orange;
42+
$toastify-color-warning: #f1c40f;
43+
$toastify-color-error: #e74c3c;
44+
45+
46+
$toastify-icon-color-info: var($toastify-color-info);
47+
$toastify-icon-color-success: var($toastify-color-success);
48+
$toastify-icon-color-warning: var($toastify-color-warning);
49+
$toastify-icon-color-error: var($toastify-color-error);

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

+72-1
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,52 @@
11
.landing-container {
22
padding: 3rem 2rem 4rem 5rem;
33
background-color: $container-color;
4+
45
.loader {
56
display: flex;
67
justify-content: center;
78
align-items: center;
89
height: 100vh;
910
}
1011

12+
.load-more {
13+
display: flex;
14+
justify-content: center;
15+
align-items: center;
16+
margin-top: 2rem;
17+
padding: 1rem 2rem;
18+
cursor: pointer;
19+
20+
button {
21+
background-color: $primary-color;
22+
color: $white-color;
23+
border: none;
24+
padding: 0.8rem 1rem;
25+
border-radius: 0.5rem;
26+
cursor: pointer;
27+
}
28+
29+
button:hover {
30+
background-color: $primary-color-dark;
31+
padding: 0.8rem 2rem;
32+
transition: all 0.5s ease-in-out;
33+
animation: bounce 1s infinite;
34+
35+
}
36+
37+
@keyframes bounce {
38+
39+
0%,
40+
100% {
41+
transform: translateY(0);
42+
}
43+
44+
50% {
45+
transform: translateY(-10px);
46+
}
47+
}
48+
}
49+
1150
.error-message {
1251
display: flex;
1352
justify-content: center;
@@ -21,11 +60,13 @@
2160
padding: 2rem;
2261
}
2362

63+
2464
.head {
2565
display: flex;
2666
justify-content: space-between;
2767
align-items: center;
2868

69+
2970
h1 {
3071
font-size: 3.6rem;
3172
}
@@ -51,7 +92,8 @@
5192
label {
5293
width: 15rem;
5394
}
54-
.span{
95+
96+
.span {
5597
width: 20rem;
5698
}
5799
}
@@ -161,6 +203,7 @@
161203
width: 40vw;
162204
}
163205

206+
164207
.not-found-text {
165208
font-family: $text-family;
166209
font-weight: 700;
@@ -173,8 +216,20 @@
173216
color: $text2-color;
174217
text-decoration: none;
175218
transition: all 0.3s ease-in-out;
219+
font-family: $text-family;
220+
font-weight: 700;
221+
font-size: 1.2rem;
222+
margin-top: 1rem;
223+
margin-bottom: 2rem;
224+
text-align: center;
225+
line-height: 1.5;
226+
letter-spacing: 0.05em;
227+
color: $text2-color;
228+
text-decoration: none;
229+
transition: all 0.3s ease-in-out;
176230
}
177231

232+
178233
.btn-link {
179234
border: none;
180235
background-color: $primary-color;
@@ -186,6 +241,16 @@
186241
font-size: 1.2rem;
187242
border-radius: 2rem;
188243
cursor: pointer;
244+
border: none;
245+
background-color: $primary-color;
246+
padding: 1rem 4rem;
247+
text-decoration: none;
248+
color: $white-color;
249+
font-family: $text-family;
250+
font-weight: 700;
251+
font-size: 1.2rem;
252+
border-radius: 2rem;
253+
cursor: pointer;
189254
}
190255

191256
.btn-link:hover {
@@ -194,13 +259,19 @@
194259
border: 1px solid $border-color;
195260
box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
196261
transition: all 0.3s ease-in-out;
262+
background-color: $white-color;
263+
color: $primary-color;
264+
border: 1px solid $border-color;
265+
box-shadow: 2px 2px 10px rgba(0, 0, 0, 0.5);
266+
transition: all 0.3s ease-in-out;
197267
}
198268
}
199269

200270
@media screen and (max-width: 768px) {
201271
.landing-container {
202272
padding: 3rem 4rem 4rem 4rem;
203273

274+
204275
.head {
205276
h1 {
206277
font-size: 2.6rem;

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

+21-17
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
11
.sampleImages1 {
22
display: flex;
3-
width: 100%;
3+
width: 100vw;
44
color: $white;
55
background-color: $white;
6-
z-index: -1;
76
gap: 1rem;
8-
height: 30rem;
7+
height: 40rem;
98

109
.sample1, .sample3 {
1110
flex: 1;
1211
display: flex;
1312
flex-direction: column;
14-
width: 30%;
15-
z-index: 100;
13+
width: 20%;
14+
height: 40rem;
1615
gap: 1rem;
1716
}
1817

1918
.sample2 {
20-
flex: 1;
21-
background-size: cover;
22-
background-position: center;
23-
background-repeat: no-repeat;
24-
width: 30%;
25-
z-index: 100;
19+
width: 40%;
2620
display: flex;
2721
position: relative;
2822

23+
img{
24+
width: 100%;
25+
height: 100%;
26+
object-fit: fill;
27+
}
2928
.arrow {
3029
position: absolute;
3130
top: 50%;
@@ -72,14 +71,13 @@
7271
display: flex;
7372
align-items: center;
7473
position: relative;
75-
z-index: 100;
74+
height: 40rem;
7675
img{
7776
width: 100%;
78-
height: 14.5rem;
79-
object-fit: cover;
77+
height: 100%;
8078
}
8179
p {
82-
font-size: 1.4rem;
80+
font-size: 1.8rem;
8381
}
8482

8583
button {
@@ -103,6 +101,7 @@
103101
flex-direction: column;
104102
align-items: flex-start;
105103
left: 3rem;
104+
gap: 1rem;
106105
}
107106

108107
button {
@@ -118,6 +117,8 @@
118117
align-items: flex-start;
119118
position: absolute;
120119
left: 3rem;
120+
gap: 1rem;
121+
121122
}
122123

123124
button {
@@ -136,6 +137,8 @@
136137
align-items: flex-end;
137138
position: absolute;
138139
right: 3rem;
140+
gap: 1rem;
141+
139142
}
140143

141144
button {
@@ -144,16 +147,17 @@
144147
}
145148

146149
.accessories {
147-
// background-image: url('../../public/assets/right-bottom.png');
148150

149151
.text-container {
150152
display: flex;
151153
flex-direction: column;
152154
align-items: flex-end;
153155
position: absolute;
154156
right: 3rem;
157+
gap: 1rem;
158+
155159
p {
156-
padding-right: 1.5rem;
160+
padding-right: .1rem;
157161
}
158162

159163
button {

0 commit comments

Comments
 (0)