Merge branch 'develop' of https://github.com/kmin-jeong/CoverFlow-FE …

…into feat/answer
Team-Coverflow · May 9, 2024 · 8109c88 · 8109c88
2 parents e3c5848 + f30ad59
commit 8109c88
Show file tree

Hide file tree

Showing 29 changed files with 816 additions and 320 deletions.
diff --git a/src/asset/image/chat.svg b/src/asset/image/chat.svg
diff --git a/src/asset/image/noContents.svg b/src/asset/image/noContents.svg
diff --git a/src/asset/image/view.svg b/src/asset/image/view.svg
diff --git a/src/asset/sass/etc/header/userInfoHeader.scss b/src/asset/sass/etc/header/userInfoHeader.scss
@@ -72,6 +72,8 @@ img.loginuser {
     border-color: #d9d9d9;
     margin-left: 92%;
     margin-top: -12%;
+    letter-spacing: -1px;
+    font-family: 'Pretendard-Medium';
   }
 }
 
@@ -98,8 +100,9 @@ img.loginuser {
 
     border-radius: 10px;
     border-color: #d9d9d9;
-    margin-left: 82%;
-    margin-top: -3%;
+    // margin-left: 82%;
+    // margin-top: -3%;
+    left: 78%;
   }
 
   .dropdown-item {
@@ -112,7 +115,7 @@ img.loginuser {
 
   .dropdown-item-edit,
   .dropdown-item-delete {
-    margin-bottom: 5%;
+    margin-bottom: 0;
 
     display: flex;
     justify-content: center;

diff --git a/src/asset/sass/etc/noContentsComponent/noContentsComponents.scss b/src/asset/sass/etc/noContentsComponent/noContentsComponents.scss
@@ -0,0 +1,52 @@
+.no-contents-wrapper {
+  width: 550px;
+  height: 25rem;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around;
+  align-items: center;
+  margin: 5rem 0 20rem 0;
+}
+.ask-question {
+  font-size: 1.5rem;
+  color: #ff8d1d;
+  font-family: Pretendard-Medium;
+  letter-spacing: -1px;
+}
+
+.no-component-plus {
+  width: 11px;
+  height: 11px;
+  margin-right: 1rem;
+}
+
+.no-component-plus-container {
+  width: 200px;
+  height: 30px;
+  border-radius: 20px;
+  border: 1px solid #ff8d1d;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  cursor: pointer;
+}
+
+.no-component-diclaimer {
+  font-size: 2rem;
+  color: #808080;
+  font-family: Pretendard-Medium;
+  letter-spacing: -1px;
+
+}
+
+.no-component-title {
+  text-align: center;
+  font-size: 3rem;
+  color: #474646;
+  font-family: Pretendard-Bold;
+  letter-spacing: -1px;
+}
+
+.my-component-css{
+  margin-bottom:6rem;
+}
diff --git a/src/asset/sass/etc/question/answer.scss b/src/asset/sass/etc/question/answer.scss
@@ -2,18 +2,16 @@
   display: flex;
   flex-direction: column;
   width: 527px;
-  height: 308px;
-  margin-top: 20%;
-  margin-bottom: 5%;
-  padding: 0px 50px;
+
+  margin: 15px 0px;
+  padding: 25px !important;
+  border: 1px solid #d9d9d9;
+  border-radius: 10px;
+
   :nth-child(1) {
-    font-weight: bold;
-    margin: 3px 6px 0 0;
+    margin: 0px 6px 0 0;
   }
 
-  border: 1px solid #cacaca;
-  border-radius: 20px;
-
   .user-info-container {
     display: flex;
     align-items: center;
@@ -32,6 +30,8 @@
     letter-spacing: -1px;
     font-weight: normal;
     font-family: Pretendard-Regular;
+    margin: 5% 0 -3% 0;
+    line-height: 2.5rem;
   }
 }
 
@@ -43,13 +43,14 @@
   align-items: flex-start;
   top: -4.5rem;
   margin: auto;
-  padding-bottom: 25px;
+  // padding-bottom: 25px;
   // margin: -12% 6% 0% 82%;
   color: #808080;
   white-space: nowrap;
   gap: 20px;
-  font-size: 1.3rem;
-  font-family: 'Pretendard-Regular';
+  font-size: 1.5rem;
+  font-family: 'Pretend-ExtraLight';
+  padding-top: 1rem;
 }
 
 .answerer {
@@ -123,3 +124,11 @@
   margin-left: 2.5%;
   width: 95%;
 }
+
+.answer-container-info {
+  display: flex;
+  justify-content: space-between;
+  img {
+    cursor: pointer;
+  }
+}
diff --git a/src/asset/sass/etc/question/question.scss b/src/asset/sass/etc/question/question.scss
@@ -2,21 +2,43 @@
   margin-top: 5%;
   cursor: pointer;
   width: 541px;
-  height: 133px;
+  height: 143px;
   border-radius: 10px;
   font-size: 1.6rem;
   box-shadow: 1px 1px 3px rgba(0, 0, 0, 0.2);
   margin: 0 auto;
+  .questionar-icon {
+    width: 14px;
+    height: 14px;
+    margin: 4% 2.5% -1% 5%;
+  }
+
+  .questionar-name-tag {
+    font-size: 1.6rem;
+    width: max-content;
+    margin: 5% 3% 0% 0%;
+  }
+  .questionar-point-tag {
+    font-size: 1.6rem;
+    width: max-content;
+    margin: 5% 6% 0% -2%;
+  }
 }
 
-.category-select-hard-coding {
+.category-select-style {
+  display: flex;
+  justify-content: center;
+  align-items: center;
   border-radius: 20px;
-
-  padding: 1% 2.5% 1% 2.5%;
+  letter-spacing: -1px;
+  margin: 0% 3% 0% 0%;
+  padding: 0.5% 2.5% 0.5% 2.5%;
   box-sizing: border-box;
-  border: 1px solid #bcbcbc;
-  color: #47474c;
+  border: 1px solid #474646;
+  color: #000000;
   font-size: 1.3rem;
+  font-family: 'Pretendard-Medium';
+  height: 3rem;
 }
 
 // 유저 닉네임 + 태그 부분 scss
@@ -35,10 +57,9 @@
 }
 
 .questioner {
-  font-weight: 900;
   color: #000;
   display: flex;
-  width: 20rem;
+  width: 100%;
   margin-left: 1rem;
   margin-top: 1rem;
   align-items: center;
@@ -53,8 +74,10 @@
   }
   .questioner-tag {
     border-radius: 4px;
-    font-size: 1rem;
     color: #808080;
+    font-size: 1.2rem;
+    font-family: 'Pretendard-Regular';
+    margin: 2.9rem 0% -2% -2.5rem;
   }
 }
 
@@ -74,11 +97,12 @@
   position: relative;
   white-space: nowrap;
   // margin: 0% 0% -5% 13%;
+  margin-top: 0.5%;
+  margin-left: 1.5%;
   align-items: center;
 }
 
 .chat-img {
-  margin-top: 6%;
   margin-right: 1.5%;
   width: 15px;
   height: 15px;
@@ -88,20 +112,19 @@
   white-space: nowrap;
   margin-right: 2%;
   font-size: 12px;
-  margin-top: 7%;
 }
 
 .view-img {
   white-space: nowrap;
   margin-right: 1.5%;
-  margin-top: 6%;
-  width: 15px;
-  height: 15px;
+  margin-right: 1.5%;
+  width: 18px;
+  height: 18px;
 }
 
 .view-count {
   font-size: 12px;
-  margin-top: 7%;
+
   margin-left: -3%;
 }
 
@@ -124,27 +147,31 @@
 .question-title {
   display: flex;
   justify-content: flex-start;
-  font-family: 'Pretendard-Bold';
+  font-family: 'Pretendard-Medium';
   letter-spacing: -1.5px;
   text-overflow: ellipsis;
-  font-size: 1.6rem;
+  font-size: 1.5rem;
   white-space: nowrap;
   // margin: 8% 0% 0% 13%;
   align-items: center;
   gap: 10px;
+  margin-left: 2%;
+  width: 30rem;
 }
 
 .reward {
   border-radius: 5px;
   background-color: #ff8d1d;
-  padding: 0 5px;
-  font-size: 12px;
+  padding: 0.4rem 0.8rem;
+  font-size: 1.2rem;
   font-family: 'Pretendard';
+  letter-spacing: -1px;
   display: flex;
   justify-content: center;
   align-items: center;
   color: #ffffff;
   margin-right: 4px;
+  width: min-content;
 }
 
 .question-content {
@@ -172,13 +199,18 @@
   display: flex;
   flex-direction: column;
   margin: 3% 0% 2.5% 10%;
+  padding-left: 1.5rem;
   width: 81%;
 }
 
 .question-list-info {
   display: flex;
   justify-content: space-between;
-  &:first-child div {
-    display: flex;
-  }
+}
+
+.question-reward-container {
+  display: flex;
+  align-items: baseline;
+  justify-content: center;
+  margin: 1% 0 3.5% 1.2%;
 }