Merge pull request daldal-Mango#41 from SJLEE316/main

강퇴 confirm
hyeoneedyou · Aug 28, 2021 · b66c1fa · b66c1fa
2 parents fca2cca + 3306a45
commit b66c1fa
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 16 deletions.
diff --git a/Miracle30/static/css/main.css b/Miracle30/static/css/main.css
@@ -96,6 +96,12 @@
   color: var(--grey-dark-color);
 }
 
+.certify_list.member {
+  width: 50%;
+  border: 2px solid var(--point-green-color);
+  border-radius: 5px;
+}
+
 /* modal btn */
 .btn4 {
   color: var(--black-color);

diff --git a/Miracle30/static/css/main_login.css b/Miracle30/static/css/main_login.css
@@ -10,6 +10,6 @@
   font-weight: 600;
 }
 
-.home_container > img {
+/* .home_container > img {
   width: 300px;
-}
+} */
diff --git a/Miracle30/static/css/mypage.css b/Miracle30/static/css/mypage.css
@@ -74,10 +74,6 @@
   color: #777777;
 }
 
-.my_info_update {
-  width: 30px;
-}
-
 .my_info span {
   float: right;
 }
diff --git a/groups/templates/groups/main.html b/groups/templates/groups/main.html
@@ -107,8 +107,8 @@ <h3 class="text_center">하루 {{ goal.goal_page }}페이지 독서하기</h3>
         </div>
         {% else %}
         <div class="psn_boxes">
-            <h2>{{dates|index_1:0}} ~ {{dates|index_1:29}}</h2>
-          </div>
+          <h2>{{dates|index_1:0}} ~ {{dates|index_1:29}}</h2>
+        </div>
         {% endif %}
         <div class="psn_check table_container">
           <table>
@@ -172,14 +172,24 @@ <h2>{{dates|index_1:0}} ~ {{dates|index_1:29}}</h2>
         </div>
       </article>
       <article id="tab3" class="content-container__content certify_container">
-          {{goal.manager}}
-        {% for member in goal.member.all %}
-        {% if request.user == goal.manager %}
-            <a href="{% url 'groups:delete_member' goal.id member.id %}">{{member}}</a>
-        {% else %}
-            {{member}}
-        {% endif %}
-        {% endfor %}
+        <ul class="certify_list member">
+          <li><i class="fas fa-crown"></i> 매니저<span>{{goal.manager}}</span></li>
+          <li><i class="fas fa-user-circle"></i> 팀원
+            <span>
+              {% for member in goal.member.all %}
+              {% if request.user == goal.manager %}
+              <a href="{% url 'groups:delete_member' goal.id member.id %}" class="a_deco"
+                onclick="return confirm('정말로 팀원은 퇴장시키겠습니까?😥')">{{member}}, </a>
+              {% else %}
+              {{member}}
+              {% endif %}
+              {% endfor %}
+            </span>
+          </li>
+          <li>
+            퇴장시키고 싶은 팀원을 클릭해주세요! 매니저만 팀원을 퇴장시킬 수 있습니다.
+          </li>
+        </ul>
         {% for certify in certifies %}
         <ul class="certify_list">
           <li>아이디<span>{{ certify.user }}</span></li>