Skip to content

Commit 25d05a2

Browse files
committed
Updated pagination
1 parent 9383640 commit 25d05a2

File tree

4 files changed

+25
-15
lines changed

4 files changed

+25
-15
lines changed

src/assets/scss/components/pagination.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,12 @@
2727
color: $primary;
2828
font-weight: bold;
2929
}
30+
31+
&-disabled {
32+
color: $medium-gray;
33+
34+
&:hover {
35+
cursor: not-allowed;
36+
}
37+
}
3038
}

src/assets/scss/variables/colors.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ $light-blue: $eos-cerulean-500;
33

44
$dark-color: #1A2A3A;
55
$gray-bg: #eaeaea;
6+
$medium-gray: #bbb;
67
$light-gray: #777777;
78
$dark-gray-transparent: rgba(71, 71, 71, 0.808);
89
$border-gray: #EDEFF0;

src/components/Pagination.js

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
import React, { useState, useEffect } from 'react'
22

3-
import { Link } from '@reach/router'
4-
53
const Pagination = (props) => {
64
const { getPage, storyCount, status, product } = props
75

86
const [currNumber, setCurrNumber] = useState(1)
97

10-
const [pages, setPages] = useState()
8+
const [pages, setPages] = useState(null)
119

1210
useEffect(() => {
1311
const resetPage = () => {
@@ -30,51 +28,52 @@ const Pagination = (props) => {
3028

3129
return (
3230
<div className='pagination'>
33-
<Link
34-
className='btn btn-pagination'
31+
<span
32+
className={`btn btn-pagination ${
33+
currNumber <= 1 ? 'btn-pagination-disabled' : ''
34+
}`}
3535
onClick={() => {
3636
if (pages.find((page) => page === currNumber - 1)) {
3737
setCurrNumber((currNumber) => currNumber - 1)
3838
getPage(currNumber - 1)
3939
}
4040
}}
41-
to='/'
4241
>
4342
<i className='eos-icons eos-18'>keyboard_arrow_left</i>
4443
{`Prev`}
45-
</Link>
46-
<div className='btn-pagination'>
44+
</span>
45+
<div className='btn btn-pagination'>
4746
{pages
4847
? pages.map((ele, key) => {
4948
return (
50-
<Link
49+
<span
5150
className={`number ${currNumber === ele ? 'selected' : ''}`}
5251
onClick={() => {
5352
setCurrNumber(ele)
5453
getPage(ele)
5554
}}
56-
to='/'
5755
key={key}
5856
>
5957
{ele}
60-
</Link>
58+
</span>
6159
)
6260
})
6361
: ''}
6462
</div>
65-
<Link
66-
className='btn btn-pagination'
63+
<span
64+
className={`btn btn-pagination ${
65+
currNumber >= pages?.length ? 'btn-pagination-disabled' : ''
66+
}`}
6767
onClick={() => {
6868
if (pages.find((page) => page === currNumber + 1)) {
6969
setCurrNumber((currNumber) => currNumber + 1)
7070
getPage(currNumber + 1)
7171
}
7272
}}
73-
to='/'
7473
>
7574
{`Next`}
7675
<i className='eos-icons eos-18'>keyboard_arrow_right</i>
77-
</Link>
76+
</span>
7877
</div>
7978
)
8079
}

src/modules/SearchInput.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,7 @@ function SearchInput(props) {
7272
<div className='close-btn-div'>
7373
<span
7474
className='close-btn'
75+
data-cy='btn-clear'
7576
onClick={() => {
7677
if (fieldToSearch === 'Title' && searchTerm.length > 0) {
7778
setSearchTerm('')
@@ -98,6 +99,7 @@ function SearchInput(props) {
9899
<Button
99100
type='submit'
100101
className='btn btn-default'
102+
data-cy='btn-search'
101103
onClick={handleSearchSubmit}
102104
>
103105
Search

0 commit comments

Comments
 (0)