Skip to content

Commit c571121

Browse files
Jadowacu1Jadowacu1
authored
Users should be presented with a reset password link (#12)
* Users should be presented with a reset password link * Users should be presented with a reset password link * Users should be presented with a reset password link * Users should be presented with a reset password link
1 parent 002a997 commit c571121

39 files changed

+1363
-834
lines changed

‎.eslintrc.json

+9-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
"airbnb-typescript",
1717
"plugin:react/recommended",
1818
"plugin:@typescript-eslint/recommended",
19+
"plugin:jsx-a11y/recommended",
1920
"plugin:storybook/recommended"
2021
],
21-
"ignorePatterns":["jest.config.ts"],
22+
"ignorePatterns": ["jest.config.ts"],
2223
"rules": {
2324
"react-hooks/rules-of-hooks": "error",
2425
"react-hooks/exhaustive-deps": "warn",
@@ -58,7 +59,12 @@
5859
"no-param-reassign": "off",
5960
"arrow-body-style": ["warn", "as-needed"],
6061
"jsx-a11y/no-static-element-interactions": "off",
61-
"max-len": "off"
62+
"max-len": "off",
63+
"jsx-a11y/label-has-associated-control": ["error", {
64+
"required": {
65+
"some": ["nesting", "id"]
66+
}
67+
}]
6268
},
6369
"settings": {
6470
"react": {
@@ -72,4 +78,4 @@
7278
}
7379
}
7480
}
75-
}
81+
}

‎netlify.toml

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
[[redirects]]
2-
from = "/*"
3-
to = "/index.html"
4-
status = 200
5-
6-
[[redirects]]
7-
from = "/api/*"
8-
to = "/index.html"
9-
status = 200
1+
[[redirects]]
2+
from = "/*"
3+
to = "/index.html"
4+
status = 200
5+
6+
[[redirects]]
7+
from = "/api/*"
8+
to = "/index.html"
9+
status = 200
1010
force = true

‎package-lock.json

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

‎package.json

+2
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
"build-storybook": "storybook build"
1111
},
1212
"dependencies": {
13+
"@fortawesome/free-solid-svg-icons": "^6.5.2",
14+
"@fortawesome/react-fontawesome": "^0.2.2",
1315
"@reduxjs/toolkit": "^2.2.5",
1416
"axios": "^1.7.2",
1517
"dotenv": "^16.4.5",

‎public/assets/images/resetPassword.png

14.5 KB
Loading

‎src/App.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,6 @@
1414
@import './assets/styles/Sidebar.scss';
1515
@import './assets/styles/Header.scss';
1616
@import "./assets/styles/Product.scss";
17-
@import "./assets/styles/Loader.scss"
17+
@import "./assets/styles/Loader.scss";
18+
@import "./assets/styles/reset-password.scss";
19+

‎src/assets/styles/AdminHeader.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,4 @@
100100
}
101101
}
102102
}
103-
}
103+
}

‎src/assets/styles/Button.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,4 +69,4 @@
6969
.button-text {
7070
vertical-align: middle;
7171
}
72-
}
72+
}

‎src/assets/styles/Categories.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,4 @@
183183
font-size: 2.4rem;
184184
font-weight: 900;
185185
}
186-
}
186+
}

‎src/assets/styles/Footer.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,4 +144,4 @@
144144
height: 3.2rem;
145145
color: $white-2;
146146
}
147-
}
147+
}

‎src/assets/styles/Header.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -300,4 +300,4 @@
300300
z-index: 2;
301301
}
302302
}
303-
}
303+
}

‎src/assets/styles/Input.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@
155155
color: $icon-color;
156156
margin-right: 0.1rem;
157157
}
158-
}
158+
}

‎src/assets/styles/LandingPage.scss

+79-79
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
.landing-container {
2-
padding: 3rem 2rem 4rem 5rem;
3-
4-
.loader {
5-
display: flex;
6-
justify-content: center;
7-
align-items: center;
8-
height: 100vh;
9-
}
10-
11-
.error-message {
12-
display: flex;
13-
justify-content: center;
14-
align-items: center;
15-
height: 100vh;
16-
color: $black-3;
17-
font-size: 1.8rem;
18-
background-color: $primary-color-light;
19-
border: 1px solid $primary-color-dark;
20-
border-radius: 0.5rem;
21-
padding: 2rem;
22-
}
23-
.head {
24-
display: flex;
25-
justify-content: space-between;
26-
align-items: center;
27-
h1 {
28-
font-size: 3.6rem;
29-
}
30-
}
31-
32-
.product-list {
33-
display: grid;
34-
grid-template-columns: repeat(auto-fill, minmax(26rem, 1fr));
35-
gap: 1.7rem;
36-
}
37-
}
38-
39-
.not-found{
40-
display: flex;
41-
align-items: center;
42-
flex-direction: column;
43-
44-
.not-found-img img{
45-
width: 40vw;
46-
}
47-
.not-found-text{
48-
font-family: $text-family;
49-
font-weight: 700;
50-
font-size: 1.2rem;
51-
margin-top: 1rem;
52-
margin-bottom: 2rem;
53-
text-align: center;
54-
line-height: 1.5;
55-
letter-spacing: 0.05em;
56-
color: $text2-color;
57-
text-decoration: none;
58-
transition: all 0.3s ease-in-out;
59-
}
60-
.btn-link{
61-
border: none;
62-
background-color: $primary-color;
63-
padding: 1rem 4rem;
64-
text-decoration: none;
65-
color: $white-color;
66-
font-family: $text-family;
67-
font-weight: 700;
68-
font-size: 1.2rem;
69-
border-radius: 2rem;
70-
cursor: pointer;
71-
}
72-
73-
.btn-link:hover{
74-
background-color: $white-color;
75-
color: $primary-color;
76-
border: 1px solid $border-color;
77-
box-shadow: 2px 2px 10px rgba(0,0,0,0.5);
78-
transition: all 0.3s ease-in-out;
79-
}
1+
.landing-container {
2+
padding: 3rem 2rem 4rem 5rem;
3+
4+
.loader {
5+
display: flex;
6+
justify-content: center;
7+
align-items: center;
8+
height: 100vh;
9+
}
10+
11+
.error-message {
12+
display: flex;
13+
justify-content: center;
14+
align-items: center;
15+
height: 100vh;
16+
color: $black-3;
17+
font-size: 1.8rem;
18+
background-color: $primary-color-light;
19+
border: 1px solid $primary-color-dark;
20+
border-radius: 0.5rem;
21+
padding: 2rem;
22+
}
23+
.head {
24+
display: flex;
25+
justify-content: space-between;
26+
align-items: center;
27+
h1 {
28+
font-size: 3.6rem;
29+
}
30+
}
31+
32+
.product-list {
33+
display: grid;
34+
grid-template-columns: repeat(auto-fill, minmax(26rem, 1fr));
35+
gap: 1.7rem;
36+
}
37+
}
38+
39+
.not-found{
40+
display: flex;
41+
align-items: center;
42+
flex-direction: column;
43+
44+
.not-found-img img{
45+
width: 40vw;
46+
}
47+
.not-found-text{
48+
font-family: $text-family;
49+
font-weight: 700;
50+
font-size: 1.2rem;
51+
margin-top: 1rem;
52+
margin-bottom: 2rem;
53+
text-align: center;
54+
line-height: 1.5;
55+
letter-spacing: 0.05em;
56+
color: $text2-color;
57+
text-decoration: none;
58+
transition: all 0.3s ease-in-out;
59+
}
60+
.btn-link{
61+
border: none;
62+
background-color: $primary-color;
63+
padding: 1rem 4rem;
64+
text-decoration: none;
65+
color: $white-color;
66+
font-family: $text-family;
67+
font-weight: 700;
68+
font-size: 1.2rem;
69+
border-radius: 2rem;
70+
cursor: pointer;
71+
}
72+
73+
.btn-link:hover{
74+
background-color: $white-color;
75+
color: $primary-color;
76+
border: 1px solid $border-color;
77+
box-shadow: 2px 2px 10px rgba(0,0,0,0.5);
78+
transition: all 0.3s ease-in-out;
79+
}
8080
}

‎src/assets/styles/Product.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,4 +107,4 @@
107107
margin-bottom: 1rem;
108108
}
109109
}
110-
}
110+
}

‎src/assets/styles/Sample.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -197,4 +197,4 @@
197197
}
198198
}
199199
}
200-
}
200+
}

‎src/assets/styles/SearchInput.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,4 +53,4 @@
5353
outline: none;
5454
}
5555
}
56-
}
56+
}

‎src/assets/styles/SellerHeader.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@
5757
height: 3.2rem;
5858
transform: translateX(0.6rem);
5959
background-color: #666;
60-
}
60+
}

‎src/assets/styles/Sidebar.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,4 +132,4 @@
132132

133133
.rotate {
134134
transform: rotate(-90deg);
135-
}
135+
}

0 commit comments

Comments
 (0)