Skip to content

Commit

Permalink
Merge pull request #86 from fac-23/final-touches
Browse files Browse the repository at this point in the history
final final touches
  • Loading branch information
duckRabbitPy authored Mar 11, 2022
2 parents 3bc7cc7 + dc8e0b7 commit 7e51669
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
2 changes: 0 additions & 2 deletions database/init.sql
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ INSERT INTO medications (user_id, medicationType, medName, medDose, units, tabCo
(1, 'tablets','Paracetemol',500,'mg',28,'15:00','no','for pain'),
(1, 'tablets','Ramipril',300,'mg',28,'18:00','no','no grapefruit');


INSERT INTO record (date, user_id, med_id, taken) VALUES
INSERT INTO record (date, user_id, med_id, taken) VALUES
('2022-02-12 18:00:00',1, 1, true),
('2022-02-12 18:00:00',1, 2, true),
Expand Down
11 changes: 10 additions & 1 deletion pages/record.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import styled from "styled-components";
const StyledList = styled.ul`
margin: 0;
padding: 0;
font-family: var(--heading-font);
list-style: none;
`;

Expand All @@ -20,6 +21,12 @@ const StyledHeader = styled.div`
font-size: 1rem;
`;

const StyledCurrentStreak = styled.div`
p {
font-family: var(--heading-font);
}
`;

const StyledTitle = styled.h3`
font-family: var(--heading-font);
`;
Expand Down Expand Up @@ -147,7 +154,9 @@ export default function Record({ dayScore, streak }) {
<Layout>
<StyledDiv className="box">
<StyledH2>Current Streak</StyledH2>
<CurrentStreak streak={streak}></CurrentStreak>
<StyledCurrentStreak>
<CurrentStreak streak={streak}></CurrentStreak>
</StyledCurrentStreak>
<StyledList>
{dayScore &&
dayScore.map((day) => (
Expand Down

1 comment on commit 7e51669

@vercel
Copy link

@vercel vercel bot commented on 7e51669 Mar 11, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.