Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
P
products_lesson_front
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Pavel Mishakov
products_lesson_front
Commits
db6fb5cb
Commit
db6fb5cb
authored
Mar 24, 2023
by
Pavel Mishakov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lesson 90 done
parent
81c06340
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
290 additions
and
25 deletions
+290
-25
App.tsx
src/App.tsx
+22
-0
userApi.ts
src/api/userApi.ts
+15
-0
Header.tsx
src/components/Header/Header.tsx
+30
-20
Layout.tsx
src/components/Layout/Layout.tsx
+2
-1
Login.module.css
src/containers/Login/Login.module.css
+29
-0
Login.tsx
src/containers/Login/Login.tsx
+42
-0
Register.module.css
src/containers/Register/Register.module.css
+29
-0
Register.tsx
src/containers/Register/Register.tsx
+43
-0
IUsersState.ts
src/store/users/IUsersState.ts
+3
-1
users.slice.ts
src/store/users/users.slice.ts
+75
-3
No files found.
src/App.tsx
View file @
db6fb5cb
...
@@ -2,14 +2,36 @@ import Layout from "./components/Layout/Layout";
...
@@ -2,14 +2,36 @@ import Layout from "./components/Layout/Layout";
import
{
Routes
,
Route
}
from
"react-router-dom"
;
import
{
Routes
,
Route
}
from
"react-router-dom"
;
import
ProductFormPage
from
"./containers/ProductFormPage/ProductFormPage"
;
import
ProductFormPage
from
"./containers/ProductFormPage/ProductFormPage"
;
import
ProductsPage
from
"./containers/ProductsPage/ProductsPage"
;
import
ProductsPage
from
"./containers/ProductsPage/ProductsPage"
;
import
{
AppDispatch
,
AppState
}
from
"./store/store"
;
import
{
shallowEqual
,
useDispatch
,
useSelector
}
from
"react-redux"
;
import
{
useEffect
}
from
"react"
;
import
{
checkToken
}
from
"./store/users/users.slice"
;
import
Login
from
"./containers/Login/Login"
;
import
Register
from
"./containers/Register/Register"
;
const
App
=
()
=>
{
const
App
=
()
=>
{
const
dispatch
:
AppDispatch
=
useDispatch
()
const
{
isAuth
}
=
useSelector
((
state
:
AppState
)
=>
state
.
users
,
shallowEqual
)
useEffect
(()
=>
{
dispatch
(
checkToken
())
},
[])
return
(
return
(
<
Layout
>
<
Layout
>
{
isAuth
?
<
Routes
>
<
Routes
>
<
Route
path=
{
'/'
}
element=
{
<
h1
>
HOME
</
h1
>
}
/>
<
Route
path=
{
'/products'
}
element=
{
<
ProductsPage
/>
}
/>
<
Route
path=
{
'/products'
}
element=
{
<
ProductsPage
/>
}
/>
<
Route
path=
{
'/add-product'
}
element=
{
<
ProductFormPage
/>
}
/>
<
Route
path=
{
'/add-product'
}
element=
{
<
ProductFormPage
/>
}
/>
</
Routes
>
</
Routes
>
:
<
Routes
>
<
Route
path=
{
'/'
}
element=
{
<
Login
/>
}
/>
<
Route
path=
{
'/register'
}
element=
{
<
Register
/>
}
/>
</
Routes
>
}
</
Layout
>
</
Layout
>
)
)
}
}
...
...
src/api/userApi.ts
View file @
db6fb5cb
...
@@ -35,6 +35,21 @@ class UserApi {
...
@@ -35,6 +35,21 @@ class UserApi {
return
response
return
response
}
}
}
}
public
checkToken
=
async
():
Promise
<
IResponse
<
IUserGetDto
|
undefined
>>
=>
{
try
{
const
response
=
await
instance
.
get
(
`/users/token`
)
return
response
.
data
}
catch
(
err
:
unknown
)
{
const
error
=
err
as
Error
const
response
:
IResponse
<
undefined
>
=
{
status
:
EStatuses
.
NOT_OK
,
result
:
undefined
,
message
:
error
.
message
}
return
response
}
}
}
}
export
const
userApi
=
new
UserApi
()
export
const
userApi
=
new
UserApi
()
\ No newline at end of file
src/components/Header/Header.tsx
View file @
db6fb5cb
import
React
,
{
FunctionComponent
,
ReactElement
}
from
"react"
;
import
React
,
{
FunctionComponent
,
ReactElement
}
from
"react"
;
import
{
shallowEqual
,
useSelector
}
from
"react-redux"
;
import
{
NavLink
}
from
"react-router-dom"
;
import
{
NavLink
}
from
"react-router-dom"
;
import
styles
from
'./Header.module.css'
import
{
AppState
}
from
"../../store/store"
;
import
styles
from
"./Header.module.css"
;
const
Header
:
FunctionComponent
=
():
ReactElement
=>
{
const
Header
:
FunctionComponent
=
():
ReactElement
=>
{
return
(
const
{
isAuth
}
=
useSelector
((
state
:
AppState
)
=>
state
.
users
,
shallowEqual
)
<
header
className=
{
styles
.
Header
}
>
<
NavLink
return
(
className=
{
styles
.
Header__link
}
<
header
className=
{
styles
.
Header
}
>
to=
{
'/add-product'
}
{
isAuth
?
(
>
<>
Add product
<
NavLink
className=
{
styles
.
Header__link
}
to=
{
"/add-product"
}
>
</
NavLink
>
Add product
<
NavLink
</
NavLink
>
className=
{
styles
.
Header__link
}
<
NavLink
className=
{
styles
.
Header__link
}
to=
{
"/products"
}
>
to=
{
'/products'
}
Products
>
</
NavLink
>
Products
</>
</
NavLink
>
)
:
(
</
header
>
<>
)
<
NavLink
className=
{
styles
.
Header__link
}
to=
{
"/register"
}
>
}
Sign up
</
NavLink
>
<
NavLink
className=
{
styles
.
Header__link
}
to=
{
"/"
}
>
Login
</
NavLink
>
</>
)
}
</
header
>
);
};
export
default
Header
export
default
Header
;
\ No newline at end of file
src/components/Layout/Layout.tsx
View file @
db6fb5cb
...
@@ -5,9 +5,10 @@ import styles from './Layout.module.css'
...
@@ -5,9 +5,10 @@ import styles from './Layout.module.css'
const
Layout
:
FunctionComponent
<
ILayoutProps
>
=
(
props
):
ReactElement
=>
{
const
Layout
:
FunctionComponent
<
ILayoutProps
>
=
(
props
):
ReactElement
=>
{
return
(
return
(
<
div
className=
{
styles
.
Layout
}
>
<
div
className=
{
styles
.
Layout
}
>
<
Header
/>
<
Header
/>
<
main
>
<
main
>
{
props
.
children
}
{
props
.
children
}
</
main
>
</
main
>
...
...
src/containers/Login/Login.module.css
0 → 100644
View file @
db6fb5cb
.Login
{
padding
:
20px
;
margin
:
0
auto
;
max-width
:
1000px
;
border
:
1px
solid
black
;
border-radius
:
20px
;
display
:
flex
;
flex-direction
:
column
;
box-sizing
:
border-box
;
align-items
:
center
;
}
.Login__input
{
border
:
none
;
background
:
lightgrey
;
padding
:
5px
10px
;
border-radius
:
20px
;
width
:
100%
;
margin
:
10px
;
}
.Login__button
{
border
:
none
;
background
:
lightgreen
;
padding
:
5px
10px
;
border-radius
:
20px
;
margin
:
10px
0
;
align-self
:
flex-end
;
cursor
:
pointer
;
}
\ No newline at end of file
src/containers/Login/Login.tsx
0 → 100644
View file @
db6fb5cb
import
React
,
{
useState
}
from
'react'
import
IUserDto
from
'../../interfaces/IUserCreateDto'
import
styles
from
'./Login.module.css'
import
{
Link
}
from
'react-router-dom'
import
{
shallowEqual
,
useDispatch
,
useSelector
}
from
'react-redux'
import
{
AppDispatch
,
AppState
}
from
'../../store/store'
import
{
login
}
from
'../../store/users/users.slice'
const
Login
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
const
{
messageUser
}
=
useSelector
((
state
:
AppState
)
=>
state
.
users
,
shallowEqual
)
const
dispatch
:
AppDispatch
=
useDispatch
()
const
[
values
,
setValues
]
=
useState
<
IUserDto
>
({
username
:
''
,
password
:
''
})
const
inputHandler
=
(
e
:
React
.
ChangeEvent
<
HTMLInputElement
>
):
void
=>
{
setValues
(
prevState
=>
{
return
{...
prevState
,
[
e
.
target
.
name
]:
e
.
target
.
value
}
})
}
const
loginHandler
=
async
(
e
:
React
.
FormEvent
)
=>
{
e
.
preventDefault
()
dispatch
(
login
(
values
))
}
return
(
<>
<
div
>
<
form
onSubmit=
{
loginHandler
}
className=
{
styles
.
Login
}
>
<
span
>
{
messageUser
}
</
span
>
<
input
onChange=
{
inputHandler
}
value=
{
values
.
username
}
placeholder=
'Username'
className=
{
styles
.
Login__input
}
type=
"text"
name=
{
'username'
}
required
/>
<
input
onChange=
{
inputHandler
}
value=
{
values
.
password
}
placeholder=
'Password'
className=
{
styles
.
Login__input
}
type=
"password"
name=
{
'password'
}
required
/>
<
button
className=
{
styles
.
Login__button
}
>
Sign in
</
button
>
<
Link
to=
{
'/register'
}
className=
{
styles
.
Login__button
}
>
Sign up now
</
Link
>
</
form
>
</
div
>
</>
)
}
export
default
Login
\ No newline at end of file
src/containers/Register/Register.module.css
0 → 100644
View file @
db6fb5cb
.Register
{
padding
:
20px
;
margin
:
0
auto
;
max-width
:
1000px
;
border
:
1px
solid
black
;
border-radius
:
20px
;
display
:
flex
;
flex-direction
:
column
;
box-sizing
:
border-box
;
align-items
:
center
;
}
.Register__input
{
border
:
none
;
background
:
lightgrey
;
padding
:
5px
10px
;
border-radius
:
20px
;
width
:
100%
;
margin
:
10px
;
}
.Register__button
{
border
:
none
;
background
:
lightgreen
;
padding
:
5px
10px
;
border-radius
:
20px
;
margin
:
10px
0
;
align-self
:
flex-end
;
cursor
:
pointer
;
}
\ No newline at end of file
src/containers/Register/Register.tsx
0 → 100644
View file @
db6fb5cb
import
React
,
{
useState
}
from
'react'
import
IUserDto
from
'../../interfaces/IUserCreateDto'
import
styles
from
'./Register.module.css'
import
{
useNavigate
}
from
'react-router-dom'
import
{
shallowEqual
,
useDispatch
,
useSelector
}
from
'react-redux'
import
{
AppDispatch
,
AppState
}
from
'../../store/store'
import
{
register
}
from
'../../store/users/users.slice'
const
Register
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
const
{
messageUser
,
isAuth
}
=
useSelector
((
state
:
AppState
)
=>
state
.
users
,
shallowEqual
)
const
navigate
=
useNavigate
()
const
dispatch
:
AppDispatch
=
useDispatch
()
const
[
values
,
setValues
]
=
useState
<
IUserDto
>
({
username
:
''
,
password
:
''
})
const
inputHandler
=
(
e
:
React
.
ChangeEvent
<
HTMLInputElement
>
):
void
=>
{
setValues
(
prevState
=>
{
return
{...
prevState
,
[
e
.
target
.
name
]:
e
.
target
.
value
}
})
}
const
registerHandler
=
async
(
e
:
React
.
FormEvent
)
=>
{
e
.
preventDefault
()
dispatch
(
register
(
values
))
isAuth
&&
navigate
(
'/'
)
}
return
(
<>
<
div
>
<
form
onSubmit=
{
registerHandler
}
className=
{
styles
.
Login
}
>
<
span
>
{
messageUser
}
</
span
>
<
input
onChange=
{
inputHandler
}
value=
{
values
.
username
}
placeholder=
'Username'
className=
{
styles
.
Login__input
}
type=
"text"
name=
{
'username'
}
required
/>
<
input
onChange=
{
inputHandler
}
value=
{
values
.
password
}
placeholder=
'Password'
className=
{
styles
.
Login__input
}
type=
"password"
name=
{
'password'
}
required
/>
<
button
className=
{
styles
.
Login__button
}
>
Sign Up
</
button
>
</
form
>
</
div
>
</>
)
}
export
default
Register
\ No newline at end of file
src/store/users/IUsersState.ts
View file @
db6fb5cb
import
IUserGetDto
from
"../../interfaces/IUserGetDto"
;
import
IUserGetDto
from
"../../interfaces/IUserGetDto"
;
export
default
interface
IUsersState
{
export
default
interface
IUsersState
{
user
:
IUserGetDto
user
:
IUserGetDto
|
undefined
isAuth
:
boolean
isAuth
:
boolean
loadingUser
:
boolean
messageUser
:
string
}
}
\ No newline at end of file
src/store/users/users.slice.ts
View file @
db6fb5cb
import
{
createSlice
}
from
"@reduxjs/toolkit"
;
import
{
createSlice
}
from
"@reduxjs/toolkit"
;
import
{
userApi
}
from
"../../api/userApi"
;
import
IUser
from
"../../interfaces/IUser"
;
import
IUser
from
"../../interfaces/IUser"
;
import
IUserCreateDto
from
"../../interfaces/IUserCreateDto"
;
import
{
createAppAsyncThunk
}
from
"../createAppAsyncThunk"
;
import
IUsersState
from
"./IUsersState"
;
import
IUsersState
from
"./IUsersState"
;
const
namespace
=
'users'
const
namespace
=
'users'
export
const
login
=
createAppAsyncThunk
(
`
${
namespace
}
/login`
,
async
(
user
:
IUserCreateDto
)
=>
{
return
userApi
.
login
(
user
)
}
)
export
const
register
=
createAppAsyncThunk
(
`
${
namespace
}
/register`
,
async
(
user
:
IUserCreateDto
)
=>
{
return
userApi
.
register
(
user
)
}
)
export
const
checkToken
=
createAppAsyncThunk
(
`
${
namespace
}
/checkToken`
,
async
()
=>
{
return
userApi
.
checkToken
()
}
)
export
const
usersSlice
=
createSlice
({
export
const
usersSlice
=
createSlice
({
name
:
namespace
,
name
:
namespace
,
initialState
:
{
initialState
:
{
user
:
{}
as
IUser
,
user
:
{}
as
IUser
,
isAuth
:
false
isAuth
:
false
,
loadingUser
:
false
,
messageUser
:
''
}
as
IUsersState
,
}
as
IUsersState
,
reducers
:
{},
reducers
:
{},
extraReducers
:
(
builder
)
=>
{
extraReducers
:
(
builder
)
=>
{
// builder
builder
// .addCase()
.
addCase
(
login
.
rejected
,
(
state
)
=>
{
state
.
loadingUser
=
false
})
.
addCase
(
login
.
pending
,
(
state
)
=>
{
state
.
loadingUser
=
true
})
.
addCase
(
login
.
fulfilled
,
(
state
,
action
)
=>
{
state
.
loadingUser
=
false
const
user
=
action
.
payload
.
result
state
.
user
=
user
state
.
messageUser
=
action
.
payload
.
message
if
(
user
)
{
localStorage
.
setItem
(
'token'
,
user
.
token
)
state
.
isAuth
=
true
}
})
.
addCase
(
register
.
rejected
,
(
state
)
=>
{
state
.
loadingUser
=
false
})
.
addCase
(
register
.
pending
,
(
state
)
=>
{
state
.
loadingUser
=
true
})
.
addCase
(
register
.
fulfilled
,
(
state
,
action
)
=>
{
state
.
loadingUser
=
false
const
user
=
action
.
payload
.
result
state
.
user
=
user
state
.
messageUser
=
action
.
payload
.
message
if
(
user
)
{
localStorage
.
setItem
(
'token'
,
user
.
token
)
state
.
isAuth
=
true
}
})
.
addCase
(
checkToken
.
rejected
,
(
state
)
=>
{
state
.
loadingUser
=
false
})
.
addCase
(
checkToken
.
pending
,
(
state
)
=>
{
state
.
loadingUser
=
true
})
.
addCase
(
checkToken
.
fulfilled
,
(
state
,
action
)
=>
{
state
.
loadingUser
=
false
const
user
=
action
.
payload
.
result
state
.
user
=
user
state
.
messageUser
=
action
.
payload
.
message
if
(
user
)
{
state
.
isAuth
=
true
}
})
}
}
})
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment