Merge branch 'main' into fix/detail

relanz/community/views.py

@@ -112,15 +112,20 @@ def new(request, challenge_id):
     res_data = {'form':form, 'challenge':challenge}
     return render(request, 'community/new.html', res_data)
 
+
 @login_required(login_url='/user/signin')
 @email_verified_required
 def detail(request, challenge_id, article_id):
     challenge = Challenge.objects.get(id=challenge_id)
     article = get_object_or_404(Article, pk=article_id)
     articles = Article.objects.filter(challenge=challenge).order_by('-created_at')
     participant = Participant.objects.filter(challenge_id=challenge_id)
-
+    
     paginator = Paginator(articles, 1)
+    for article_ in articles:
+        for i in range(1, paginator.num_pages+1):
+            if paginator.get_page(i)[0].id == article_.id:
+                article_num = i
     try:     
         page_number = request.GET.get('page')
         print(page_number)

relanz/static/css/challenge.css

@@ -485,4 +485,21 @@
     font-weight: 700;
     line-height: 145.023%;
     letter-spacing: -1px;
+}
+
+
+.content > p::before {
+    content: "•"; /* 원하는 리스트 마커를 설정합니다. */
+    display: inline-block;
+    width: 1em;
+    margin-right: 0.5em; /* 마커와 텍스트 사이의 간격을 조정합니다. */
+  }
+  .content > p {
+    display: flex;
+  }
+
+.new-p {
+    display: flex;
+    flex-direction: column;
+    gap: 10px;
 }

relanz/static/css/detail.css

@@ -349,7 +349,7 @@
   position: absolute;
   z-index: 100;
   min-height: 390px;
-  max-height: 390px;
+  max-height: 430px;
   width: 100%;
 
   top: 70px;
@@ -358,12 +358,31 @@
   display: flex;
   justify-content: center;
   align-items: center;
+
+  flex-wrap: wrap;
+  overflow: hidden;
 }
 .main-image-div > img {
-  /* object-fit: cover; */
-  object-fit: contain;
-  max-width: 430px;
-  max-height: 430px;
+    /* object-fit: cover; */
+
+    object-fit: contain;
+    max-width: 430px;
+    max-height: 430px; */
+
+    /* position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    width: auto;
+    height: auto;
+    max-width: 100%;
+    max-height: 100%;
+    margin: auto; */
+
+    display:block;
+    width:100%;
+    height:auto;
 }
 
 .rest-image-bundle-div {

relanz/static/css/user/user_delete.css

@@ -292,4 +292,7 @@
 
 .for-padding {
     height: 100px;
+}
+#real_submit_btn {
+    visibility: hidden;
 }

relanz/static/js/challenge.js

@@ -1 +1,27 @@
-document.getElementById(`${color}_${num}`).src = ``
+// document.getElementById(`${color}_${num}`).src = ``
+
+
+const contentDiv_1 = document.getElementById("linebreaks_fix_1");
+const contentDiv_2 = document.getElementById("linebreaks_fix_2");
+
+const paragraphs_1 = contentDiv_1.innerHTML.split("<br>");
+const paragraphs_2 = contentDiv_2.innerHTML.split("<br>");
+contentDiv_1.innerHTML = "";
+contentDiv_2.innerHTML = "";
+
+window.addEventListener('DOMContentLoaded',function() {
+    const newDiv = paragraphs_1.filter(word => word !== '')
+    newDiv.forEach((paragraph) => {
+    const p = document.createElement("p");
+    p.innerHTML = paragraph;
+    contentDiv_1.appendChild(p);
+    });
+
+    const newDi = paragraphs_2.filter(word => word !== '')
+    newDi.forEach((paragraph) => {
+    const p = document.createElement("p");
+    p.innerHTML = paragraph;
+    contentDiv_2.appendChild(p);
+    });
+})
+

relanz/static/js/communityHome.js

@@ -28,6 +28,7 @@ async function makeRequest(url) {
         pk: element.pk,
       }
     });
+    console.log(resultData)
 
     return resultData;
   } catch (error) {
@@ -90,7 +91,6 @@ async function handleIntersection(entries, observer) {
   for (let entry of entries) {
     if (entry.isIntersecting) {
       const listUrl = await getUrl();
-      console.log(listUrl)
       makeImageDiv(listUrl);
       observer.unobserve(entry.target);
     }

relanz/templates/challenge/challenge.html

@@ -54,11 +54,11 @@
         <div class="content-container-div">
             <div class="effect-div">
                 <div class="title">해소효과</div>
-                <div class="content">{{challenge.effect|linebreaksbr}}</div>
+                <div class="content new-p" id="linebreaks_fix_1">{{challenge.effect|linebreaksbr}}</div>
             </div>
             <div class="recommand-to-people-container-div">
                 <div class="title">이런 사람에게 추천해요!</div>
-                <div class="content">{{challenge.recommand|linebreaksbr}}</div>
+                <div class="content new-p" id="linebreaks_fix_2" >{{challenge.recommand|linebreaksbr}}</div>
             </div>
             {% comment %} 여기가 장소라 if 템플릿 사용하면 되용! {% endcomment %}
             <div class="recommand-place-container-outer-div">

relanz/templates/tag/tagsurvey.html

@@ -12,7 +12,7 @@
 <div class="container-mobile">
   <div class="text-div">
     <div class="title" id="title">체크리스트 결과가 반영되었어요!</div>
-    <div class="sub-title" id="sub_title">캄크루즈님은 주로<br>어떤 방식으로 스트레스를 푸시나요?</div>
+    <div class="sub-title" id="sub_title">{{user.nickname}}님은 주로<br>어떤 방식으로 스트레스를 푸시나요?</div>
     <div class="guide-small" id="guide_small">(중복 가능)</div>
   </div>
   <div class="select-outside-div">