Skip to content

Next features #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 12, 2020
Merged

Next features #11

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bac9289
Add updates icons and data
PrinceSumberia May 12, 2020
b3fe152
minor changes
PrinceSumberia May 12, 2020
872f515
Add updates
PrinceSumberia May 12, 2020
35367fe
Add last updated time
PrinceSumberia May 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add updates
  • Loading branch information
@PrinceSumberia
PrinceSumberia committed May 12, 2020
commit 872f515945e0a7e3a457a4b39b87c7a643155d52
17 changes: 9 additions & 8 deletions src/components/CovidApp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { Component } from "react";
import { formatDistance, format } from "date-fns";
import { formatDistance } from "date-fns";
import Overview from "./Overview";
import { withStyles } from "@material-ui/styles";
import colors from "../constants/colors";
Expand All @@ -19,7 +19,7 @@ import Barchart from "./Barchart";
import stateCodes from "../constants/stateCodes";
import Lottie from "react-lottie";
import * as animationData from "../assets/loading.json";
import FadeIn from "react-fade-in";
// import FadeIn from "react-fade-in";
import Footer from "./Footer";

const defaultOptions = {
Expand Down Expand Up @@ -151,26 +151,27 @@ class CovidApp extends Component {
.map(({ update, timestamp }, i) => {
update = update.replace("\n", "<br/>");
return (
<React.Fragment key={i}>
<h5>
<div className={classes.updateBox} key={i}>
<h5 className={classes.updateHeading}>
{`${formatDistance(
new Date(timestamp * 1000),
new Date()
)} ago`}
</h5>
<h4
className={classes.updateText}
dangerouslySetInnerHTML={{
__html: update,
}}
></h4>
</React.Fragment>
</div>
);
});
} catch (err) {}

return (
<>
<div className={classes.header} style={{ zIndex: "999" }}>
<div className={classes.header}>
<h1 className={classes.heading}>
<span>Covid-19</span> India Trend
</h1>
Expand All @@ -197,7 +198,7 @@ class CovidApp extends Component {
</div>
)}
</div>
<div className={classes.update}>{expanded && displayUpdates}</div>
{expanded && <div className={classes.update}>{displayUpdates}</div>}
</div>
<div className="darkModeButton">
<label className="switch">
Expand All @@ -210,7 +211,7 @@ class CovidApp extends Component {
</label>
</div>
</div>
<div style={{ position: "relative", zIndex: "-1" }}>
<div>
<Overview
isDarkMode={isDarkMode}
data={this.state.todayData}
Expand Down
27 changes: 24 additions & 3 deletions src/styles/CovidAppStyles.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,12 @@ export default {
fontSize: "3rem",
color: colors.darkPurple,
position: "relative",
transition: "all .5s ease",
transition: "all .4s ease",

"&:hover": {
transform: "scale(1.15)",
color: "#000",
},
},

notificationBell: {
Expand All @@ -58,11 +63,27 @@ export default {
},

update: {
fontSize: "1.5rem",
display: "block",
position: "absolute",
left: "-25rem",
backgroundColor: "red",
zIndex: "99999999",
backgroundColor: "rgba(255,255,255,.95)",
borderRadius: "2rem",
boxShadow: "0 1rem 2rem rgba(0,0,0,.15)",
padding: "3rem",
zIndex: "1",
transition: "all .5s",
},

updateBox: {
marginBottom: "1.5rem",
},

updateHeading: {
textTransform: "capitalize",
},
updateText: {
fontWeight: "400",
},

content: {
Expand Down