Skip to content

Commit

Permalink
Merge pull request #12 from ViktorSvertoka/Dima-Diary
Browse files Browse the repository at this point in the history
Fix(Calender) Error correction
  • Loading branch information
ViktorSvertoka authored Sep 16, 2023
2 parents be7222b + 24fb83c commit c4a9509
Show file tree
Hide file tree
Showing 11 changed files with 502 additions and 30 deletions.
148 changes: 148 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"modern-normalize": "^2.0.0",
"proptypes": "^1.1.0",
"react": "^18.2.0",
"react-datepicker": "^4.18.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.15.0",
"react-select": "^5.7.4",
Expand Down
20 changes: 13 additions & 7 deletions src/components/Diary/DayDashboard/DayDashboard.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import DashboardItem from '../../DashboardItem/DashboardItem';
import Icon from '../../Icon/Icon';
import { Grid, GridItem, Wrapper } from './DayDashboard.styled';
import ExclamationCircle from '../ExclamationCircle/ExclamationCircle';
import {
Grid,
GridItem,
TextWarning,
WrapWarning,
Wrapper,
} from './DayDashboard.styled';

const icons = [
'icon-apple',
Expand All @@ -24,13 +30,13 @@ const DayDashboard = () => {
);
})}
</Grid>
<div>
<Icon symbolId="icon-arrow-right" width="16" height="16" />
<span>
<WrapWarning>
<ExclamationCircle />
<TextWarning>
Record all your meals in a calorie diary every day. This will help me
be aware of my nutrition and make me responsible for my choices.
</span>
</div>
</TextWarning>
</WrapWarning>
</Wrapper>
);
};
Expand Down
19 changes: 18 additions & 1 deletion src/components/Diary/DayDashboard/DayDashboard.styled.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,23 @@ const Wrapper = styled.div`
width: 100%;
`;

const WrapWarning = styled.div`
display: flex;
margin-top: 48px;
gap: 8px;
`;

const TextWarning = styled.span`
width: 358px;
flex-shrink: 0;
color: rgba(239, 237, 232, 0.3);
font-family: Roboto;
font-size: 16px;
font-style: normal;
font-weight: 400;
line-height: 24px;
`;

const Grid = styled.div`
display: grid;
grid-template-columns: repeat(2, 1fr);
Expand All @@ -17,4 +34,4 @@ const GridItem = styled.div`
width: 100%;
`;

export { Wrapper, Grid, GridItem };
export { Wrapper, Grid, GridItem, WrapWarning, TextWarning };
Loading

0 comments on commit c4a9509

Please sign in to comment.