conflict 수정

src/Modals/WriterModal.js

@@ -106,7 +106,7 @@ const WriterModal = ({
  });
 
  useEffect(() => {
- if (title == 'beverage' || title == 'food') {
+ if (title === 'beverage' || title === 'food') {
  setIsFood(true);
  }
  }, []);
@@ -117,7 +117,7 @@ const WriterModal = ({
  <ModalBlock>
  {
  <ScheduleSticker
- src={delivery == 'weekly' ? Weekly : WeeklyMonthly}
+ src={delivery === 'weekly' ? Weekly : WeeklyMonthly}
  />
  }
  {custom && <CustomSticker src={Custom} />}

src/components/FounderLogo.js

@@ -1,7 +1,7 @@
-import styled  from "styled-components";
+import styled from 'styled-components';
 
-export const Logo = styled.img`
-position : static;
-width : 100%;
-z-index:2;
-`
+export const Logo = styled.video`
+ position: static;
+ width: 100%;
+ z-index: 2;
+`;

src/components/ItemDetailComponents/ItemReviewComponents/ItemReviewCard.js

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import styled from 'styled-components';
 import DownArrow from '../../../assets/ItemDetailPageAssets/DownArrow.png';
 import UpArrow from '../../../assets/ItemDetailPageAssets/UpArrow.png';
-import { color, fontsize, fontWeight } from '../../../styles/theme';
+import { color } from '../../../styles/theme';
 import Rated from '../../StarRating/Rated';
 import { css } from 'styled-components';
 
@@ -42,7 +42,7 @@ const ItemReviewCard = ({
  };
 
  const changeView = () => {
- if (sizes.reviewHeight == '56px') {
+ if (sizes.reviewHeight === '56px') {
  // 닫혀있는경우
  setSizes({
  cardHeight: 'auto',
@@ -64,10 +64,10 @@ const ItemReviewCard = ({
  <Writer>{userId}님의 후기</Writer>
  </DateWriterWrapper>
 
- {sizes.reviewHeight == '56px' ? (
+ {sizes.reviewHeight === '56px' ? (
  <>
  <Image src={main_img}></Image>
- {tag != '' ? <TagWrapper>{tagShow()}</TagWrapper> : <div></div>}
+ {tag !== '' ? <TagWrapper>{tagShow()}</TagWrapper> : <div></div>}
  <ReviewPreview sizes={sizes}>{text}</ReviewPreview>
  <Writer>
  더보기
@@ -81,7 +81,7 @@ const ItemReviewCard = ({
  {photoShow()}
  </ImageContainer>
  <Rated rating={star} />
- {tag != '' ? (
+ {tag !== '' ? (
  <TagWrapper margin={'30.38px 0px'}>{tagShow()}</TagWrapper>
  ) : (
  <div></div>
@@ -196,7 +196,7 @@ const MoreButton = styled.img`
 
 const ImageContainer = styled.div`
  ${(props) =>
- props.num == 1
+ props.num === 1
  ? css`
  display: flex;
  justify-content: center;

src/components/SurveyComponents/Survey.js

@@ -1,4 +1,4 @@
-import { useState, useRef, useEffect, useCallback } from 'react';
+import { useState, useRef, useEffect } from 'react';
 import answerSet from '../../assets/json/answerSet.json';
 import answerValue from '../../assets/json/answerValue.json';
 import SurveyPart from './SurveyPart';
@@ -53,7 +53,7 @@ const Survey = () => {
  console.log(localStorage.accesstoken);
 
  function SubmitSurvey() {
- if (answerSet[0].answer_num == 1) {
+ if (answerSet[0].answer_num === 1) {
  setGender(true);
  } else {
  setGender(false);

src/pages/BrandDetailPage.js

@@ -24,7 +24,6 @@ const BrandDetailPage = () => {
  }, []);
 
  if (!brandDetaildata) return null;
- console.log(brandDetaildata);
 
  return (
  <>

src/pages/MainPage.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import FounderLogo from '../assets/MainPageAssets/logo.png';
+import FounderLogoVideo from '../assets/MainPageAssets/FounderLogoVideo.mp4';
 import Banner from '../components/MainPageComponents/Banner';
 import styled from 'styled-components';
 import TopBar from '../components/TopBarComponents/TopBar';
@@ -50,7 +50,7 @@ const MainPage = () => {
 
  //초기 상태 유저를 위해
  var token =
- localStorage.accesstoken == undefined
+ localStorage.accesstoken === undefined
  ? ``
  : `Bearer ${localStorage.accesstoken}`;
 
@@ -90,10 +90,12 @@ const MainPage = () => {
 
  if (!recommendationData) return null;
 
- console.log(recommendationData);
  return (
  <>
- <Logo src={FounderLogo} />
+ <Logo autoPlay muted loop width="100%">
+ <source src={FounderLogoVideo} type="video/mp4" />
+ </Logo>
+
  <TopBar position={'sticky'} main={'main'} />
  <WidthWrapper>
  <Wrapper>
@@ -133,7 +135,7 @@ const MainPage = () => {
  <TagArray tag={content.type_tag_arr} key={content.id} />
  </RowWrapper>
 
- {content.type_product != '' && (
+ {content.type_product !== '' && (
  <GridWrapper>
  {content.type_product.map(
  ({

src/pages/MyPage.js

@@ -22,10 +22,7 @@ import { KAKAO_AUTH_URL } from '../components/SharedComponents/KaKaoAuth';
 
 const MyPage = () => {
  const [isLoggedIn, setIsLoggedIn] = useRecoilState(loginState); //recoil 적용
- const [username, setUsername] = useState('Username');
- const [id, setId] = useState('UserId');
  const gender = useRecoilValue(GenderState);
- const [email, setEmail] = useState('[email protected]');
  const access = localStorage.getItem('accesstoken');
  const [userData, setuserData] = useState(null);