diff --git a/inspiredblog/src/pages/index/App.js b/inspiredblog/src/pages/index/App.js index 2024f1c..245d3f0 100644 --- a/inspiredblog/src/pages/index/App.js +++ b/inspiredblog/src/pages/index/App.js @@ -168,6 +168,8 @@ const App = (props) => { const [state, setState] = React.useState({ left: false, }); + const [mql, setMql] = React.useState(window.matchMedia(`(max-width: 600px)`)); + const [mobile, setMobile] = React.useState(false); useEffect(()=>{ props.checkAuthState(); },[]) @@ -175,6 +177,14 @@ const App = (props) => { props.trackUser(); },[]) + useEffect(()=>{ // similar to componentWillMount. when it's unmounted, run the returned function + // refer to this: https://zhuanlan.zhihu.com/p/21650585 + mql.addListener(mediaQueryChanged); + return () =>{ + setMql(mql); + setMobile(mql.matches); + } + },[]) let history = useHistory(); const toggleDrawer = (side, open) => event => { if (event.type === 'keydown' && (event.key === 'Tab' || event.key === 'Shift')) { @@ -262,9 +272,13 @@ const App = (props) => { ) + const mediaQueryChanged = ()=> { + setMobile(mql.matches); + } + return ( - {window.innerWidth>600? + {!mobile?
({ '@media(max-width:600px)':{ fontSize:'12px', padding:'4px 12px', - top: '20px' + marginTop: '0px' } }, followBtn: { @@ -91,6 +91,7 @@ const useStyles = makeStyles(theme => ({ blogContent: { width:'85%', margin: '0 auto', + paddingTop:'25px', '@media(max-width:500px)':{ width:'100%', } @@ -157,7 +158,7 @@ const BlogDetail = (props) => { let viewsArr = views.split(','); if (!viewsArr.includes(props.match.params.blog_id.toLocaleString())){ increaseCount = true; - cookies.set('viewsHistory', views+`${props.match.params.blog_id},`, {maxAge: 1000*60*60}); + cookies.set('viewsHistory', views+`${props.match.params.blog_id},`, {maxAge: 1000*60*60*24}); } } else { @@ -421,7 +422,7 @@ const BlogDetail = (props) => { {' '+props.blog.blogDetail.username}
- {format(new Date(props.blog.blogDetail.created_on), 'MMM dd, yyyy')} + {format(new Date(props.blog.blogDetail.created_on), 'MMM dd, yyyy')}{props.blog.blogDetail.views} views