Skip to content

Commit deacb38

Browse files
committed
Add new feature, allowed print current year
1 parent 8123a3e commit deacb38

File tree

3 files changed

+30
-28
lines changed

3 files changed

+30
-28
lines changed

build/index.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,4 +59,4 @@
5959
"eslint-plugin-react": "^7.12.4",
6060
"react-test-renderer": "^16.8.6"
6161
}
62-
}
62+
}

src/components/content_year/index.js

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ const YearComponent = styled.div`
99
padding-right: 15px;
1010
padding-bottom: 10px;
1111
position: relative;
12-
width: 40px;
12+
text-align: right;
13+
width: 50px;
1314
1415
&::after {
1516
background: #ccc;
@@ -27,36 +28,37 @@ const YearComponentItem = styled.div`
2728
margin-bottom: 8px;
2829
`;
2930

30-
const ContentYear = (props) => {
31-
const { startYear, current } = props;
32-
33-
return (
34-
<YearComponent className="year-component">
35-
{current ? (
36-
<>
37-
<YearComponentItem className="item-year-component">
38-
{new Date().getFullYear()}
39-
</YearComponentItem>
40-
<YearComponentItem className="item-year-component">
41-
{startYear}
42-
</YearComponentItem>
43-
</>
44-
) : (
45-
<YearComponentItem className="item-year-component">
46-
{startYear}
47-
</YearComponentItem>
48-
)}
49-
</YearComponent>
50-
);
31+
const ContentYear = props => {
32+
const { startYear, currentYear } = props;
33+
const _date = new Date();
34+
35+
return (
36+
<YearComponent className="year-component">
37+
{currentYear ? (
38+
<>
39+
<YearComponentItem className="item-year-component">
40+
{_date.getFullYear()}
41+
</YearComponentItem>
42+
<YearComponentItem className="item-year-component">
43+
{startYear}
44+
</YearComponentItem>
45+
</>
46+
) : (
47+
<YearComponentItem className="item-year-component">
48+
{startYear}
49+
</YearComponentItem>
50+
)}
51+
</YearComponent>
52+
);
5153
};
5254

5355
ContentYear.defaultProps = {
54-
current: false,
56+
currentYear: false
5557
};
5658

5759
ContentYear.propTypes = {
58-
startYear: PropTypes.number.isRequired,
59-
current: PropTypes.bool,
60+
startYear: PropTypes.number.isRequired,
61+
currentYear: PropTypes.bool
6062
};
6163

6264
export default ContentYear;

0 commit comments

Comments
 (0)