Merge branch 'develop' into FE/feat/#220

2023-Winter-Bootcamp-Team-N · Jan 30, 2024 · 43ce70d · 43ce70d
2 parents dc31342 + 4fcfdf2
commit 43ce70d
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 105 deletions.
diff --git a/frontend/public/icon-128.png b/frontend/public/icon-128.png
diff --git a/frontend/public/icon-34.png b/frontend/public/icon-34.png
diff --git a/frontend/src/pages/newtab/SummaryPage.tsx b/frontend/src/pages/newtab/SummaryPage.tsx
@@ -280,26 +280,25 @@ const SummaryPage: React.FC<SummaryPageProps> = ({
           </div>
         </div>
 
-
-
-        {selectedChannel &&          
-        <button 
-        onClick={() => DeleteChannel(selectedChannel)}
-        style={{ 
-          color: '#686868' , 
-          background: 'transparent', 
-          position: 'absolute', 
-          bottom: '3%', 
-          right: '5%', 
-          width:'12%',
-          height: '5%' ,
-          boxShadow:'0px 0px 6px rgba(0, 0, 0, 0.1)',
-          borderRadius: '20px' , 
-          fontFamily: 'WantedSansRegular',
-          fontWeight: 'bold'}}>
-        구독취소
-        </button> };
-
+        {selectedChannel && (
+          <button
+            onClick={() => DeleteChannel(selectedChannel)}
+            style={{
+              color: '#686868',
+              background: 'transparent',
+              position: 'absolute',
+              bottom: '3%',
+              right: '5%',
+              width: '12%',
+              height: '5%',
+              boxShadow: '0px 0px 6px rgba(0, 0, 0, 0.1)',
+              borderRadius: '20px',
+              fontFamily: 'WantedSansRegular',
+              fontWeight: 'bold',
+            }}>
+            구독취소
+          </button>
+        )}
 
         {selectedChannel &&
           ChannelData.map((Channel, index) => (

diff --git a/frontend/src/pages/sidepanel/SidePanel.css b/frontend/src/pages/sidepanel/SidePanel.css
@@ -12,32 +12,3 @@
 .summaryText {
   white-space: pre-wrap;
 }
-
-.tooltip {
-  position: relative;
-  display: inline-block;
-}
-
-.tooltip .tooltiptext {
-  visibility: hidden;
-  width: 160px;
-  background-color: black;
-  color: white;
-  text-align: center;
-  border-radius: 6px;
-  padding: 5px 0;
-  position: absolute;
-  z-index: 1;
-  top: 130%; /* bottom을 top으로 변경하고 값 조정 */
-  left: 50%;
-  margin-left: -80px; /* 너비의 절반 값으로 조정 */
-
-  opacity: 0;
-  transition: opacity 0.3s;
-  font-size: 12px;
-}
-
-.tooltip:hover .tooltiptext {
-  visibility: visible;
-  opacity: 1;
-}
diff --git a/frontend/src/pages/sidepanel/SidePanel.tsx b/frontend/src/pages/sidepanel/SidePanel.tsx
@@ -38,40 +38,7 @@ const SidePanel = () => {
   //구독이 이미 돼있는지 자체 확인
   const [subscribedChannels, setSubscribedChannels] = useState(new Set());
 
-  // 회원가입 및 로그인 폼 상태
-  // const [signupEmail, setSignupEmail] = useState('');
-  // const [signupPassword, setSignupPassword] = useState('');
-  // const [signinEmail, setSigninEmail] = useState('');
-  // const [signinPassword, setSigninPassword] = useState('');
-  // 요약본 저장을 위한 분류
-
-  // 회원가입 처리 함수
-  // const handleSignup = async () => {
-  //   try {
-  //     const response = await axios.post('https://pre-view.store/api/v1/account/signup', {
-  //       email: signupEmail,
-  //       password: signupPassword,
-  //     });
-  //     console.log(response.data);
-  //     // 회원가입 성공 처리
-  //   } catch (error) {
-  //     console.error('회원가입 실패:', error);
-  //   }
-  // };
-
-  // // 로그인 처리 함수
-  // const handleSignin = async () => {
-  //   try {
-  //     const response = await axios.post('http://localhost:8000/api/account/login', {
-  //       email: signinEmail,
-  //       password: signinPassword,
-  //     });
-  //     console.log(response.data);
-  //     // 로그인 성공 처리
-  //   } catch (error) {
-  //     console.error('로그인 실패:', error);
-  //   }
-  // };
+
 
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [modalMessage, setModalMessage] = useState('');
@@ -273,7 +240,7 @@ const SidePanel = () => {
     <div className="rounded-lg bg-color p-4 space-y-4 border-none side-panel">
       <div className="flex items-center justify-between">
         <div className="flex items-center space-x-3">
-          <img src={teamlogo} alt="teamlogo" className="w-8 h-8" />
+          <img src={teamlogo} alt="teamlogo" className="w-8 h-8" style={{ pointerEvents: 'none' }} />
           <span className="font-semibold text-xl">Preview</span>
         </div>
         <div style={{ position: 'relative' }}>
@@ -368,31 +335,12 @@ const SidePanel = () => {
         <img
           src={transparencylogo}
           alt="transparencylogo"
-          className="fixed top-1/2 left-1/2 transform -translate-x-1/2 -translate-y-1/2 mt-4 w-80 h-80 opacity-50"
+          className="fixed top-1/3 left-1/2 transform -translate-x-1/2 -translate-y-1/2 mt-4 w-80 h-80 opacity-50"
+          style={{ pointerEvents: 'none' }}
         />
         <div className="overflow-y-auto max-h-full">
           <p className="text-sm summaryText z-10">{formatSummary(summary)}</p>
         </div>
-        {/* <div>
-          <input type="email" value={signupEmail} onChange={e => setSignupEmail(e.target.value)} placeholder="이메일" />
-          <input
-            type="password"
-            value={signupPassword}
-            onChange={e => setSignupPassword(e.target.value)}
-            placeholder="비밀번호"
-          />
-          <button onClick={handleSignup}>회원가입</button>
-        </div> */}
-        {/* <div>
-        <input type="email" value={signinEmail} onChange={e => setSigninEmail(e.target.value)} placeholder="이메일" />
-        <input
-          type="password"
-          value={signinPassword}
-          onChange={e => setSigninPassword(e.target.value)}
-          placeholder="비밀번호"
-        />
-        <button onClick={handleSignin}>로그인</button>
-      </div>  */}
       </div>
     </div>
   );