Merge pull request #86 from Sokilskill/newDiary

fix bmr
Sokilskill · Jan 25, 2024 · ade450b · ade450b
2 parents 3536142 + 22a8a44
commit ade450b
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 15 deletions.
diff --git a/src/assets/sprite.svg b/src/assets/sprite.svg
diff --git a/src/components/DayDashboard/CardDashboard/CardDashboard.jsx b/src/components/DayDashboard/CardDashboard/CardDashboard.jsx
@@ -17,7 +17,8 @@ const Icon = styled.svg`
 `;
 
 export const Card = ({ value, children }) => {
-  const isLoading = useSelector(diarySelectors.getIsLoading);
+  // const isLoading = useSelector(diarySelectors.getIsLoading);
+  const isLoading = false;
   let icon = '';
   let displayValue = value;
 

diff --git a/src/components/DayDashboard/DayDashboard.jsx b/src/components/DayDashboard/DayDashboard.jsx
@@ -37,4 +37,4 @@ const DayDashboard = () => {
   );
 };
 
-export { DayDashboard };
+export { DayDashboard };
diff --git a/src/components/DayExercises/DayExercises.jsx b/src/components/DayExercises/DayExercises.jsx
@@ -63,7 +63,8 @@ export const DayExercises = () => {
 
 export const ExercisesTable = ({ exercises, date }) => {
   const dispatch = useDispatch();
-  const isLoading = useSelector(diarySelectors.getIsLoading);
+  // const isLoading = useSelector(diarySelectors.getIsLoading);
+  const isLoading = false;
 
   return (
     <>
@@ -110,7 +111,7 @@ export const ExercisesTable = ({ exercises, date }) => {
                     >
                       <DeleteIconWrapper>
                         <Icon width={20} height={20} className="orange">
-                          <use href={`${sprite}#icon-trash`}></use>
+                          <use href={`${sprite}#icon-trash-03`}></use>
                         </Icon>
                       </DeleteIconWrapper>
                     </ButtonEx>

diff --git a/src/components/DayExercises/DayExercises.styled.jsx b/src/components/DayExercises/DayExercises.styled.jsx
@@ -4,6 +4,7 @@ import '../../index.css';
 
 export const ContainerEx = styled.div`
   /* 320-375 */
+  margin: 0 auto;
   box-sizing: border-box;
   max-height: 824px;
   width: 335px;

diff --git a/src/components/DayProducts/DayProducts.jsx b/src/components/DayProducts/DayProducts.jsx
@@ -58,7 +58,8 @@ const DayProducts = () => {
 };
 export const ProductsTable = ({ products, date }) => {
   const dispatch = useDispatch();
-  const isLoading = useSelector(diarySelectors.getIsLoading);
+  // const isLoading = useSelector(diarySelectors.getIsLoading);
+  const isLoading = false;
 
   return (
     <>

diff --git a/src/components/DayProducts/DayProducts.styled.jsx b/src/components/DayProducts/DayProducts.styled.jsx
@@ -4,6 +4,7 @@ import '../../index.css';
 
 export const Container = styled.div`
   /* 320-375 */
+  margin: 0 auto;
   box-sizing: border-box;
   max-height: 824px;
   width: 335px;
@@ -166,7 +167,7 @@ export const SliceText = styled.div`
 export const IconWrapper = styled.svg`
   width: ${(props) => props.size || '13px'};
   height: ${(props) => props.size || '13px'};
-  fill: ${(props) => props.color || '#ffffff'};
+  stroke: #EF8964;
   display: inline-block;
   margin-left: 9px;
 `;

diff --git a/src/components/DaySwitch/DaySwitch.styled.js b/src/components/DaySwitch/DaySwitch.styled.js
@@ -6,10 +6,10 @@ export const DaySwitchContainer = styled.div`
   align-items: center;
   justify-content: center;
   margin-right: 20px;
-  margin-top: 20px;
 
   @media screen and (min-width: 768px) {
     margin-right: 0;
+    margin-bottom: 32px;
   }
 `;
 
@@ -19,17 +19,20 @@ font-weight: bold;
 background: transparent;
 border: 0;
 padding: 0;
+margin-right: 8px;
 box-sizing: border-box;
 background-color: inherit;
 color: var(--white);
 font-size: 18px;
 line-height: 1.5;
 outline: none;
 cursor: pointer;
+width: 96px;
 
 
 @media screen and (min-width: 768px) {
-  width: 135px;
+  width: 129px;
+  height: 32px;
   font-size: 24px;
   line-height: 1.5;
 }

diff --git a/src/pages/DiaryPage/DiaryPage.jsx b/src/pages/DiaryPage/DiaryPage.jsx
@@ -128,7 +128,26 @@ export const IconInfo = ({ size }) => {
   return (
     <div style={{ width: `${size}px`, height: `${size}px` }}>
       <Icon width={size} height={size} className="orange">
-        <use href={`${sprite}#icon-exclamation-mark`}></use>
+      <use
+              href={sprite + '#icon-Ellipse-1'}
+              style={{
+                fill: 'rgba(239, 160, 130, 1)',
+                width: '100%',
+                height: '100%',
+                position: 'relative',
+              }}
+            />
+            <use
+              href={sprite + '#icon-tabler_exclamation-mark'}
+              style={{
+                fill: 'rgba(239, 237, 232, 1)',
+                position: 'absolute',
+                top: '50%',
+                left: '50%',
+                width: '100%',
+                height: '100%',
+              }}
+            />
       </Icon>
     </div>
   );

diff --git a/src/pages/DiaryPage/DiaryPage.styled.jsx b/src/pages/DiaryPage/DiaryPage.styled.jsx
@@ -3,7 +3,7 @@ import '../../index.css';
 
 export const Container = styled.div`
   margin: 0 auto;
-  padding-top: 106px;
+  padding-top: 40px;
   padding-bottom: 80px;
 
   @media screen and (min-width: 375px) {
@@ -65,7 +65,7 @@ export const WrapTitle = styled.div`
   margin-bottom: 40px;
 
   @media screen and (min-width: 768px) {
-    height: 64px;
+    margin-top: 72px;
     margin-bottom: 32px;
     align-items: normal;
   }