Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
H
hw87AlenBolatov
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
Болатов Ален
hw87AlenBolatov
Commits
88ce6589
Commit
88ce6589
authored
Mar 30, 2023
by
Болатов Ален
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
#9
added track history slice
parent
0e3f49f7
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
375 additions
and
3 deletions
+375
-3
App.tsx
frontend/src/App.tsx
+4
-0
Header.tsx
frontend/src/components/Header.tsx
+29
-0
Layout.tsx
frontend/src/components/Layout/Layout.tsx
+3
-1
HomePage.tsx
frontend/src/containers/HomePage.tsx
+3
-2
Login.tsx
frontend/src/containers/Login.tsx
+92
-0
TrackHistory.tsx
frontend/src/containers/TrackHistory.tsx
+33
-0
Tracks.tsx
frontend/src/containers/Tracks.tsx
+16
-0
trackHistorySlice.ts
frontend/src/features/track-history/trackHistorySlice.ts
+90
-0
userSlice.ts
frontend/src/features/user/userSlice.ts
+83
-0
ITrackHistory.ts
frontend/src/interfaces/ITrackHistory.ts
+9
-0
ITrackHistoryDto.ts
frontend/src/interfaces/ITrackHistoryDto.ts
+4
-0
IUser.ts
frontend/src/interfaces/IUser.ts
+5
-0
store.ts
frontend/src/store/store.ts
+4
-0
No files found.
frontend/src/App.tsx
View file @
88ce6589
...
@@ -4,6 +4,8 @@ import {BrowserRouter, Routes, Route} from 'react-router-dom';
...
@@ -4,6 +4,8 @@ import {BrowserRouter, Routes, Route} from 'react-router-dom';
import
Layout
from
'./components/Layout/Layout'
;
import
Layout
from
'./components/Layout/Layout'
;
import
Albums
from
'./containers/Albums'
;
import
Albums
from
'./containers/Albums'
;
import
Tracks
from
'./containers/Tracks'
;
import
Tracks
from
'./containers/Tracks'
;
import
Login
from
'./containers/Login'
;
import
TrackHistory
from
'./containers/TrackHistory'
;
const
App
=
()
=>
{
const
App
=
()
=>
{
return
(
return
(
...
@@ -13,6 +15,8 @@ const App = () => {
...
@@ -13,6 +15,8 @@ const App = () => {
<
Route
index
element=
{
<
HomePage
/>
}
/>
<
Route
index
element=
{
<
HomePage
/>
}
/>
<
Route
path=
"albums"
element=
{
<
Albums
/>
}
/>
<
Route
path=
"albums"
element=
{
<
Albums
/>
}
/>
<
Route
path=
"tracks"
element=
{
<
Tracks
/>
}
/>
<
Route
path=
"tracks"
element=
{
<
Tracks
/>
}
/>
<
Route
path=
"login"
element=
{
<
Login
/>
}
/>
<
Route
path=
"track-history"
element=
{
<
TrackHistory
/>
}
/>
</
Route
>
</
Route
>
</
Routes
>
</
Routes
>
</
BrowserRouter
>
</
BrowserRouter
>
...
...
frontend/src/components/Header.tsx
0 → 100644
View file @
88ce6589
import
React
from
'react'
;
import
{
Link
,
useNavigate
}
from
'react-router-dom'
;
import
{
useAppSelector
}
from
'../store/hooks'
;
const
Header
=
()
=>
{
const
navigate
=
useNavigate
();
const
{
userLoggedIn
}
=
useAppSelector
((
state
)
=>
state
.
user
);
return
(
<
div
>
{
!
userLoggedIn
?
(
<
Link
to=
{
'login'
}
className=
"bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
>
sign in
</
Link
>
)
:
(
<
Link
className=
"bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
to=
{
'track-history'
}
>
Track History
</
Link
>
)
}
</
div
>
);
};
export
default
Header
;
frontend/src/components/Layout/Layout.tsx
View file @
88ce6589
import
React
from
'react'
;
import
React
from
'react'
;
import
{
Outlet
}
from
'react-router-dom'
;
import
{
Outlet
}
from
'react-router-dom'
;
import
Header
from
'../Header'
;
const
Layout
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
const
Layout
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
return
(
return
(
<
div
className=
"container mx-auto px-96"
>
<
div
className=
"container mx-auto px-96 pt-4"
>
<
Header
/>
<
Outlet
/>
<
Outlet
/>
</
div
>
</
div
>
);
);
...
...
frontend/src/containers/HomePage.tsx
View file @
88ce6589
import
React
,
{
useEffect
}
from
'react'
;
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
getArtists
}
from
'../features/artist/artistSlice'
;
import
{
getArtists
}
from
'../features/artist/artistSlice'
;
import
{
useAppDispatch
,
useAppSelector
}
from
'../store/hooks'
;
import
{
useAppDispatch
,
useAppSelector
}
from
'../store/hooks'
;
import
{
useNavigate
}
from
'react-router-dom'
;
import
{
useNavigate
}
from
'react-router-dom'
;
import
Preloader
from
'../components/UI/Preloader'
;
import
Preloader
from
'../components/UI/Preloader'
;
const
HomePage
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
const
HomePage
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
const
{
artists
,
loading
}
=
useAppSelector
((
state
)
=>
state
.
artist
);
const
{
loading
,
artists
}
=
useAppSelector
((
state
)
=>
state
.
artist
);
const
dispatch
=
useAppDispatch
();
const
dispatch
=
useAppDispatch
();
const
navigate
=
useNavigate
();
const
navigate
=
useNavigate
();
...
...
frontend/src/containers/Login.tsx
0 → 100644
View file @
88ce6589
import
React
,
{
useEffect
,
useState
}
from
'react'
;
import
{
Navigate
,
useNavigate
}
from
'react-router-dom'
;
import
{
createUser
,
loginUser
}
from
'../features/user/userSlice'
;
import
IUser
from
'../interfaces/IUser'
;
import
{
useAppDispatch
,
useAppSelector
}
from
'../store/hooks'
;
const
Login
=
()
=>
{
const
dispatch
=
useAppDispatch
();
const
navigate
=
useNavigate
();
const
[
user
,
setUser
]
=
useState
({}
as
IUser
);
const
{
userLoggedIn
}
=
useAppSelector
((
state
)
=>
state
.
user
);
const
handleRegister
=
async
()
=>
{
await
dispatch
(
createUser
(
user
));
};
const
handleUserInput
=
(
e
:
React
.
ChangeEvent
<
HTMLInputElement
>
)
=>
{
setUser
((
prevState
)
=>
({...
prevState
,
[
e
.
target
.
name
]:
e
.
target
.
value
}));
};
const
handleSubmit
=
async
(
e
:
React
.
ChangeEvent
<
HTMLFormElement
>
)
=>
{
e
.
preventDefault
();
await
dispatch
(
loginUser
(
user
));
};
if
(
userLoggedIn
)
{
return
<
Navigate
to=
{
'/'
}
/>;
}
return
(
<
div
className=
"w-full max-w-xs m-auto h-screen mt-[200px]"
>
<
form
onSubmit=
{
handleSubmit
}
className=
"bg-white shadow-md rounded px-8 pt-6 pb-8 mb-4"
>
<
div
className=
"mb-4"
>
<
label
className=
"block text-gray-700 text-sm font-bold mb-2"
htmlFor=
"username"
>
Username
</
label
>
<
input
onChange=
{
handleUserInput
}
className=
"shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline"
id=
"username"
type=
"text"
placeholder=
"Username"
name=
"username"
/>
</
div
>
<
div
className=
"mb-6"
>
<
label
className=
"block text-gray-700 text-sm font-bold mb-2"
htmlFor=
"password"
>
Password
</
label
>
<
input
onChange=
{
handleUserInput
}
className=
"shadow appearance-none border rounded w-full py-2 px-3 text-gray-700 mb-3 leading-tight focus:outline-none focus:shadow-outline"
id=
"password"
type=
"password"
placeholder=
"Password"
name=
"password"
/>
</
div
>
<
div
className=
"flex items-center justify-between"
>
<
button
className=
"bg-blue-500 hover:bg-blue-700 text-white font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline"
type=
"submit"
>
Sign In
</
button
>
<
a
className=
"inline-block align-baseline font-bold text-sm text-blue-500 hover:text-blue-800"
href=
"#"
type=
"button"
onClick=
{
handleRegister
}
>
Register
</
a
>
</
div
>
</
form
>
<
p
className=
"text-center text-gray-500 text-xs"
>
©
2020 Acme Corp. All rights reserved.
</
p
>
</
div
>
);
};
export
default
Login
;
frontend/src/containers/TrackHistory.tsx
0 → 100644
View file @
88ce6589
import
React
,
{
useEffect
}
from
'react'
;
import
{
useNavigate
}
from
'react-router-dom'
;
import
{
getTracks
}
from
'../features/track-history/trackHistorySlice'
;
import
{
useAppDispatch
,
useAppSelector
}
from
'../store/hooks'
;
const
TrackHistory
=
()
=>
{
const
dispatch
=
useAppDispatch
();
const
{
tracks
}
=
useAppSelector
((
state
)
=>
state
.
trackHistory
);
const
{
userLoggedIn
}
=
useAppSelector
((
state
)
=>
state
.
user
);
const
token
=
window
.
sessionStorage
.
getItem
(
'token'
);
const
navigate
=
useNavigate
();
useEffect
(()
=>
{
if
(
!
userLoggedIn
)
navigate
(
'/'
);
dispatch
(
getTracks
(
token
!
));
},
[]);
return
(
<
div
className=
"flex gap-3 flex-col pt-8"
>
{
tracks
.
map
((
track
:
any
)
=>
{
return
(
<
div
className=
"p-6 border-black border"
key=
{
track
.
_id
}
>
<
p
>
Song Name:
{
track
.
track
.
name
}
</
p
>
<
p
>
Artist Name:
{
track
.
track
.
album
.
artist
.
name
}
</
p
>
<
p
>
Datetime:
{
track
.
datetime
}
</
p
>
</
div
>
);
})
}
</
div
>
);
};
export
default
TrackHistory
;
frontend/src/containers/Tracks.tsx
View file @
88ce6589
import
React
,
{
useEffect
}
from
'react'
;
import
React
,
{
useEffect
}
from
'react'
;
import
{
useLocation
}
from
'react-router-dom'
;
import
{
useLocation
}
from
'react-router-dom'
;
import
{
addTrackHistory
}
from
'../features/track-history/trackHistorySlice'
;
import
{
getTracksByQuery
}
from
'../features/track/trackSlice'
;
import
{
getTracksByQuery
}
from
'../features/track/trackSlice'
;
import
ITrackHistoryDto
from
'../interfaces/ITrackHistoryDto'
;
import
{
useAppDispatch
,
useAppSelector
}
from
'../store/hooks'
;
import
{
useAppDispatch
,
useAppSelector
}
from
'../store/hooks'
;
const
Tracks
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
const
Tracks
:
React
.
FunctionComponent
=
():
React
.
ReactElement
=>
{
...
@@ -9,11 +11,22 @@ const Tracks: React.FunctionComponent = (): React.ReactElement => {
...
@@ -9,11 +11,22 @@ const Tracks: React.FunctionComponent = (): React.ReactElement => {
const
dispatch
=
useAppDispatch
();
const
dispatch
=
useAppDispatch
();
const
params
=
new
URLSearchParams
(
window
.
location
.
search
);
const
params
=
new
URLSearchParams
(
window
.
location
.
search
);
const
album
=
params
.
get
(
'album'
);
const
album
=
params
.
get
(
'album'
);
const
{
userLoggedIn
}
=
useAppSelector
((
state
)
=>
state
.
user
);
useEffect
(()
=>
{
useEffect
(()
=>
{
dispatch
(
getTracksByQuery
(
album
!
));
dispatch
(
getTracksByQuery
(
album
!
));
},
[
dispatch
]);
},
[
dispatch
]);
const
handleClick
=
async
(
trackId
:
string
)
=>
{
const
token
=
window
.
sessionStorage
.
getItem
(
'token'
);
const
data
:
ITrackHistoryDto
=
{
track
:
trackId
,
token
:
token
!
,
};
await
dispatch
(
addTrackHistory
(
data
));
};
return
(
return
(
<
div
>
<
div
>
<
h2
className=
"mt-0 mb-2 text-4xl font-medium leading-tight "
>
Tracks
</
h2
>
<
h2
className=
"mt-0 mb-2 text-4xl font-medium leading-tight "
>
Tracks
</
h2
>
...
@@ -24,6 +37,9 @@ const Tracks: React.FunctionComponent = (): React.ReactElement => {
...
@@ -24,6 +37,9 @@ const Tracks: React.FunctionComponent = (): React.ReactElement => {
tracks
.
map
((
track
)
=>
{
tracks
.
map
((
track
)
=>
{
return
(
return
(
<
div
<
div
onClick=
{
()
=>
userLoggedIn
?
handleClick
(
track
.
_id
)
:
undefined
}
className=
"border border-solid color border-black p-4"
className=
"border border-solid color border-black p-4"
key=
{
track
.
_id
}
key=
{
track
.
_id
}
>
>
...
...
frontend/src/features/track-history/trackHistorySlice.ts
0 → 100644
View file @
88ce6589
import
{
createAsyncThunk
,
createSlice
}
from
'@reduxjs/toolkit'
;
import
type
{
PayloadAction
}
from
'@reduxjs/toolkit'
;
import
axios
from
'axios'
;
import
ITrackHistoryDto
from
'../../interfaces/ITrackHistoryDto'
;
import
ITrackHistory
from
'../../interfaces/ITrackHistory'
;
interface
TrackHistoryState
{
track
:
string
;
loading
:
boolean
;
tracks
:
ITrackHistory
[];
}
const
initialState
:
TrackHistoryState
=
{
track
:
''
,
loading
:
false
,
tracks
:
[],
};
export
const
addTrackHistory
=
createAsyncThunk
(
'addTrackHistory'
,
async
(
data
:
ITrackHistoryDto
)
=>
{
try
{
await
axios
.
post
(
`
${
import
.
meta
.
env
.
VITE_MY_URL
}
/track_history`
,
{
track
:
data
.
track
,
},
{
headers
:
{
Authorization
:
`Bearer
${
data
.
token
}
`
,
},
}
);
}
catch
(
err
:
any
)
{
console
.
log
(
err
);
}
}
);
export
const
getTracks
=
createAsyncThunk
(
'getTracks'
,
async
(
token
:
string
)
=>
{
try
{
const
response
=
await
axios
.
get
(
`
${
import
.
meta
.
env
.
VITE_MY_URL
}
/track_history`
,
{
headers
:
{
Authorization
:
`Bearer
${
token
}
`
,
},
}
);
return
response
.
data
;
}
catch
(
err
:
unknown
)
{
console
.
log
(
err
);
}
}
);
export
const
trackHistorySlice
=
createSlice
({
name
:
'trackHistory'
,
initialState
,
reducers
:
{},
extraReducers
:
(
builder
)
=>
{
builder
.
addCase
(
addTrackHistory
.
pending
,
(
state
,
action
)
=>
{
state
.
loading
=
true
;
})
.
addCase
(
addTrackHistory
.
rejected
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
})
.
addCase
(
addTrackHistory
.
fulfilled
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
})
.
addCase
(
getTracks
.
pending
,
(
state
,
action
)
=>
{
state
.
loading
=
true
;
})
.
addCase
(
getTracks
.
rejected
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
})
.
addCase
(
getTracks
.
fulfilled
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
state
.
tracks
=
action
.
payload
;
console
.
log
(
action
.
payload
);
});
},
});
export
const
{}
=
trackHistorySlice
.
actions
;
export
default
trackHistorySlice
.
reducer
;
frontend/src/features/user/userSlice.ts
0 → 100644
View file @
88ce6589
import
{
createAsyncThunk
,
createSlice
}
from
'@reduxjs/toolkit'
;
import
type
{
PayloadAction
}
from
'@reduxjs/toolkit'
;
import
axios
from
'axios'
;
import
IUser
from
'../../interfaces/IUser'
;
interface
UserState
{
user
:
IUser
;
loading
:
boolean
;
userLoggedIn
:
boolean
;
}
const
initialState
:
UserState
=
{
user
:
{}
as
IUser
,
loading
:
false
,
userLoggedIn
:
false
,
};
export
const
createUser
=
createAsyncThunk
(
'createUser'
,
async
(
user
:
IUser
)
=>
{
try
{
await
axios
.
post
(
`
${
import
.
meta
.
env
.
VITE_MY_URL
}
/users`
,
{
username
:
user
.
username
,
password
:
user
.
password
,
});
}
catch
(
err
:
any
)
{
console
.
log
(
err
);
}
}
);
export
const
loginUser
=
createAsyncThunk
(
'loginUser'
,
async
(
user
:
IUser
)
=>
{
try
{
const
response
=
await
axios
.
post
(
`
${
import
.
meta
.
env
.
VITE_MY_URL
}
/users/sessions`
,
{
username
:
user
.
username
,
password
:
user
.
password
,
}
);
return
response
.
data
;
}
catch
(
err
:
any
)
{
throw
new
Error
(
err
);
}
});
export
const
userSlice
=
createSlice
({
name
:
'user'
,
initialState
,
reducers
:
{},
extraReducers
:
(
builder
)
=>
{
builder
.
addCase
(
createUser
.
pending
,
(
state
,
action
)
=>
{
state
.
loading
=
true
;
})
.
addCase
(
createUser
.
rejected
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
})
.
addCase
(
createUser
.
fulfilled
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
})
.
addCase
(
loginUser
.
pending
,
(
state
,
action
)
=>
{
state
.
loading
=
true
;
})
.
addCase
(
loginUser
.
rejected
,
(
state
,
action
)
=>
{
state
.
loading
=
false
;
console
.
log
(
action
.
error
);
state
.
userLoggedIn
=
false
;
})
.
addCase
(
loginUser
.
fulfilled
,
(
state
,
{
payload
}:
PayloadAction
<
{
token
:
string
}
>
)
=>
{
state
.
loading
=
false
;
state
.
userLoggedIn
=
true
;
window
.
sessionStorage
.
setItem
(
'token'
,
payload
.
token
);
}
);
},
});
export
const
{}
=
userSlice
.
actions
;
export
default
userSlice
.
reducer
;
frontend/src/interfaces/ITrackHistory.ts
0 → 100644
View file @
88ce6589
import
ITrack
from
'./ITrack'
;
import
IUser
from
'./IUser'
;
export
default
interface
ITrackHistory
{
_id
:
string
;
user
:
string
;
track
:
ITrack
;
datetime
:
Date
;
}
frontend/src/interfaces/ITrackHistoryDto.ts
0 → 100644
View file @
88ce6589
export
default
interface
ITrackHistoryDto
{
track
:
string
;
token
:
string
;
}
frontend/src/interfaces/IUser.ts
0 → 100644
View file @
88ce6589
export
default
interface
IUser
{
username
:
string
;
password
:
string
;
token
?:
string
;
}
frontend/src/store/store.ts
View file @
88ce6589
import
{
configureStore
}
from
'@reduxjs/toolkit'
;
import
{
configureStore
}
from
'@reduxjs/toolkit'
;
import
albumSlice
from
'../features/album/albumSlice'
;
import
albumSlice
from
'../features/album/albumSlice'
;
import
artistSlice
from
'../features/artist/artistSlice'
;
import
artistSlice
from
'../features/artist/artistSlice'
;
import
trackHistorySlice
from
'../features/track-history/trackHistorySlice'
;
import
trackSlice
from
'../features/track/trackSlice'
;
import
trackSlice
from
'../features/track/trackSlice'
;
import
userSlice
from
'../features/user/userSlice'
;
export
const
store
=
configureStore
({
export
const
store
=
configureStore
({
reducer
:
{
reducer
:
{
artist
:
artistSlice
,
artist
:
artistSlice
,
album
:
albumSlice
,
album
:
albumSlice
,
track
:
trackSlice
,
track
:
trackSlice
,
user
:
userSlice
,
trackHistory
:
trackHistorySlice
,
},
},
});
});
...
...
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