From 8edd3c46e76cc02a772bf3a8727bb033daa381a9 Mon Sep 17 00:00:00 2001 From: LinQuixote Date: Fri, 7 Jul 2023 14:34:38 +0900 Subject: [PATCH 1/5] =?UTF-8?q?style:=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relanz/static/css/challenge.css | 17 ++++++++++++++ relanz/static/css/user/user_delete.css | 3 +++ relanz/static/js/challenge.js | 28 ++++++++++++++++++++++- relanz/templates/challenge/challenge.html | 4 ++-- 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/relanz/static/css/challenge.css b/relanz/static/css/challenge.css index 443b4a0..acd2f6d 100644 --- a/relanz/static/css/challenge.css +++ b/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; } \ No newline at end of file diff --git a/relanz/static/css/user/user_delete.css b/relanz/static/css/user/user_delete.css index e6db4b0..4017a71 100644 --- a/relanz/static/css/user/user_delete.css +++ b/relanz/static/css/user/user_delete.css @@ -292,4 +292,7 @@ .for-padding { height: 100px; +} +#real_submit_btn { + visibility: hidden; } \ No newline at end of file diff --git a/relanz/static/js/challenge.js b/relanz/static/js/challenge.js index 9e57904..34528e8 100644 --- a/relanz/static/js/challenge.js +++ b/relanz/static/js/challenge.js @@ -1 +1,27 @@ -document.getElementById(`${color}_${num}`).src = `` \ No newline at end of file +// 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("
"); +const paragraphs_2 = contentDiv_2.innerHTML.split("
"); +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); + }); +}) + diff --git a/relanz/templates/challenge/challenge.html b/relanz/templates/challenge/challenge.html index 7427792..29aa37d 100644 --- a/relanz/templates/challenge/challenge.html +++ b/relanz/templates/challenge/challenge.html @@ -54,11 +54,11 @@
해소효과
-
{{challenge.effect|linebreaksbr}}
+
{{challenge.effect|linebreaksbr}}
이런 사람에게 추천해요!
-
{{challenge.recommand|linebreaksbr}}
+
{{challenge.recommand|linebreaksbr}}
{% comment %} 여기가 장소라 if 템플릿 사용하면 되용! {% endcomment %}
From 6693a48f3a36134a2362dbbc9a747b957d5161ca Mon Sep 17 00:00:00 2001 From: LinQuixote Date: Fri, 7 Jul 2023 14:54:53 +0900 Subject: [PATCH 2/5] =?UTF-8?q?style:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EA=BD=89=EC=B2=B4=EC=9A=B8=EA=BC=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relanz/static/css/detail.css | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/relanz/static/css/detail.css b/relanz/static/css/detail.css index 348f817..6376146 100644 --- a/relanz/static/css/detail.css +++ b/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,13 +358,30 @@ display: flex; justify-content: center; align-items: center; + + flex-wrap: wrap; } .main-image-div > img { /* object-fit: cover; */ - object-fit: contain; - max-width: 430px; - max-height: 430px; + /* 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 { From a57483fbed117307b2fffeb83ab81fa3f47da27c Mon Sep 17 00:00:00 2001 From: LinQuixote Date: Fri, 7 Jul 2023 14:57:51 +0900 Subject: [PATCH 3/5] =?UTF-8?q?style:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EA=BD=89=EC=B2=B4=EC=9A=B8=EA=BC=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relanz/static/css/detail.css | 1 + 1 file changed, 1 insertion(+) diff --git a/relanz/static/css/detail.css b/relanz/static/css/detail.css index 6376146..f206683 100644 --- a/relanz/static/css/detail.css +++ b/relanz/static/css/detail.css @@ -382,6 +382,7 @@ display:block; width:100%; height:auto; + overflow: hidden; } .rest-image-bundle-div { From 744cb0d3ebb63540ca23919f4e91b6cfdb2b1bd6 Mon Sep 17 00:00:00 2001 From: LinQuixote Date: Fri, 7 Jul 2023 15:28:56 +0900 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relanz/community/views.py | 41 +++++++++++++++++++++++++++++-- relanz/static/css/detail.css | 2 +- relanz/static/js/communityHome.js | 2 +- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/relanz/community/views.py b/relanz/community/views.py index e3f4146..91e3c4f 100644 --- a/relanz/community/views.py +++ b/relanz/community/views.py @@ -112,6 +112,7 @@ 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): @@ -119,8 +120,12 @@ def detail(request, challenge_id, article_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) @@ -134,7 +139,7 @@ def detail(request, challenge_id, article_id): isExist = Like.objects.filter(likedUser=request.user, article=page_obj.object_list[0]).exists() except PageNotAnInteger: - page = 1 + page = article_num page_obj = paginator.get_page(page) like_count = len(Like.objects.filter(article=article)) author_nickname = article.author.user.nickname @@ -147,6 +152,38 @@ def detail(request, challenge_id, article_id): res_data = {'challenge':challenge, 'articles':page_obj, 'like_count':like_count, 'author_nickname':author_nickname, "isExist": isExist, "participant":participant} return render(request, 'community/detail.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, id__lte=article_id).order_by('-created_at') +# paginator = Paginator(articles, 1) +# try: +# page_number = request.GET.get('page') +# if page_number is not None and paginator.num_pages < page_number: +# message = {'message': '더 이상 기록이 없습니다.'} +# return JsonResponse(message, status=400) +# else: +# page_obj = paginator.get_page(page_number) +# like_count = len(Like.objects.filter(article=page_obj.object_list[0])) +# author_nickname = page_obj.object_list[0].author.user.nickname +# isExist = Like.objects.filter(likedUser=request.user, article=page_obj.object_list[0]).exists() + +# except PageNotAnInteger: +# page = 1 +# page_obj = paginator.get_page(page) +# like_count = len(Like.objects.filter(article=article)) +# author_nickname = article.author.user.nickname +# isExist = Like.objects.filter(likedUser=request.user, article=article).exists() + +# except EmptyPage: +# page=paginator.num_pages +# page_obj=paginator.page(page) +# messages.add_message(request, messages.ERROR, '더 이상 인증 글이 없습니다.') + +# res_data = {'challenge':challenge, 'articles':page_obj, 'like_count':like_count, 'author_nickname':author_nickname, "isExist": isExist} +# return render(request, 'community/detail.html', res_data) @csrf_exempt @login_required(login_url='/user/signin') diff --git a/relanz/static/css/detail.css b/relanz/static/css/detail.css index f206683..80cc186 100644 --- a/relanz/static/css/detail.css +++ b/relanz/static/css/detail.css @@ -360,6 +360,7 @@ align-items: center; flex-wrap: wrap; + overflow: hidden; } .main-image-div > img { /* object-fit: cover; */ @@ -382,7 +383,6 @@ display:block; width:100%; height:auto; - overflow: hidden; } .rest-image-bundle-div { diff --git a/relanz/static/js/communityHome.js b/relanz/static/js/communityHome.js index 76001e2..3fb6507 100644 --- a/relanz/static/js/communityHome.js +++ b/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); } From 8e949f6bb79d4a9a7074ca01d4fb876c23bb3743 Mon Sep 17 00:00:00 2001 From: LinQuixote Date: Fri, 7 Jul 2023 15:49:12 +0900 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20=EC=A7=84=EC=A7=9C=20=EC=B5=9C?= =?UTF-8?q?=EC=A2=85=20=EC=88=98=EC=A0=95=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- relanz/community/views.py | 32 ----------------------------- relanz/templates/tag/tagsurvey.html | 2 +- 2 files changed, 1 insertion(+), 33 deletions(-) diff --git a/relanz/community/views.py b/relanz/community/views.py index 91e3c4f..b2fb621 100644 --- a/relanz/community/views.py +++ b/relanz/community/views.py @@ -152,38 +152,6 @@ def detail(request, challenge_id, article_id): res_data = {'challenge':challenge, 'articles':page_obj, 'like_count':like_count, 'author_nickname':author_nickname, "isExist": isExist, "participant":participant} return render(request, 'community/detail.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, id__lte=article_id).order_by('-created_at') -# paginator = Paginator(articles, 1) -# try: -# page_number = request.GET.get('page') -# if page_number is not None and paginator.num_pages < page_number: -# message = {'message': '더 이상 기록이 없습니다.'} -# return JsonResponse(message, status=400) -# else: -# page_obj = paginator.get_page(page_number) -# like_count = len(Like.objects.filter(article=page_obj.object_list[0])) -# author_nickname = page_obj.object_list[0].author.user.nickname -# isExist = Like.objects.filter(likedUser=request.user, article=page_obj.object_list[0]).exists() - -# except PageNotAnInteger: -# page = 1 -# page_obj = paginator.get_page(page) -# like_count = len(Like.objects.filter(article=article)) -# author_nickname = article.author.user.nickname -# isExist = Like.objects.filter(likedUser=request.user, article=article).exists() - -# except EmptyPage: -# page=paginator.num_pages -# page_obj=paginator.page(page) -# messages.add_message(request, messages.ERROR, '더 이상 인증 글이 없습니다.') - -# res_data = {'challenge':challenge, 'articles':page_obj, 'like_count':like_count, 'author_nickname':author_nickname, "isExist": isExist} -# return render(request, 'community/detail.html', res_data) @csrf_exempt @login_required(login_url='/user/signin') diff --git a/relanz/templates/tag/tagsurvey.html b/relanz/templates/tag/tagsurvey.html index c00c031..5969b93 100644 --- a/relanz/templates/tag/tagsurvey.html +++ b/relanz/templates/tag/tagsurvey.html @@ -12,7 +12,7 @@
체크리스트 결과가 반영되었어요!
-
캄크루즈님은 주로
어떤 방식으로 스트레스를 푸시나요?
+
{{user.nickname}}님은 주로
어떤 방식으로 스트레스를 푸시나요?
(중복 가능)