Skip to content

Commit

Permalink
Merge pull request #98 from Sokilskill/fix-diaryPage
Browse files Browse the repository at this point in the history
+
  • Loading branch information
Sokilskill authored Jan 25, 2024
2 parents e861559 + 83d2c1c commit 5632d7c
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 9 deletions.
1 change: 0 additions & 1 deletion src/components/DayDashboard/DayDashboard.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ const DayDashboard = () => {
const minutesSpentOnSports = Math.floor(normOfSports);

const restOfSports = Math.floor(normOfSports - minutesSpentOnSports / 60);
console.log('restOfSports:', restOfSports);

return restOfSports;
};
Expand Down
4 changes: 2 additions & 2 deletions src/components/DayExercises/DayExercises.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ export const DayExercises = () => {
<SubTitleEx>Execrcises</SubTitleEx>
<StyledLinkEx to="/exercises/body">
<AddProductEx>Add exercise</AddProductEx>
<Icon width={16} height={16} className="orange">
<use href={`${sprite}#icon-start`}></use>
<Icon width={16} height={16} className="orange" stroke='#E6533C'>
<use href={`${sprite}#icon-arrow`}></use>
</Icon>
</StyledLinkEx>
</TitleMainEx>
Expand Down
5 changes: 2 additions & 3 deletions src/components/DayProducts/DayProducts.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ const DayProducts = () => {
<SubTitle>Products</SubTitle>
<StyledLink to="/products">
<AddProduct>Add product</AddProduct>
<Icon width={16} height={16} className="orange">
<use href={`${sprite}#icon-start`}></use>
<Icon width={16} height={16} className="orange" stroke='#E6533C'>
<use href={`${sprite}#icon-arrow`}></use>
</Icon>
</StyledLink>
</TitleMain>
Expand All @@ -58,7 +58,6 @@ const DayProducts = () => {
};
export const ProductsTable = ({ products, date }) => {
const dispatch = useDispatch();
// const isLoading = useSelector(diarySelectors.getIsLoading);
const isLoading = false;

return (
Expand Down
3 changes: 0 additions & 3 deletions src/components/services/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,8 @@ export const handleStatisticsFulfilled = (state, { payload }) => {

//--------------------------DIARY
export const handleFulfilled = (state, { payload }) => {
// console.log('payload', payload);
state.data = payload;
state.isLoading = false;
console.log(state.data);
};

export const handleFulfilledAddProduct = (state, { payload }) => {
Expand All @@ -122,7 +120,6 @@ export const handleFulfilledAddExercise = (state, { payload }) => {
};

export const handleFulfilledDeleteExercise = (state, { payload }) => {
console.log('payload', payload);
state.data.diary.exercises = state.data.diary.exercises.filter(
(el) => el._id !== payload._id
);
Expand Down

0 comments on commit 5632d7c

Please sign in to comment.