Skip to content

Commit 6fcffee

Browse files
SeongIkKimSeongIkKim
committed
Merge branch 'dev'
2 parents 501cb37 + 1c7f9f1 commit 6fcffee

File tree

600 files changed

+87375
-1131
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

600 files changed

+87375
-1131
lines changed

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,4 +301,6 @@ env.bak/
301301
venv.bak/
302302
pip-selfcheck.json
303303

304-
# End of https://www.gitignore.io/api/macos,django,python,pycharm,virtualenv
304+
# End of https://www.gitignore.io/api/macos,django,python,pycharm,virtualenv
305+
306+
.config_secret

‎accounts/templates/accounts/signupbase.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
font-size: 25px;
3030
line-height: 80px;
3131
display: inline;
32+
font-weight: bold;
3233
/*font-weight: bold; style로 해줌.*/
3334
}
3435

@@ -69,7 +70,7 @@
6970
<div class="logo">
7071
<a href="{% url 'main:main_front' %}">
7172
<a href="{% url 'main:main_front' %}">
72-
<div class="logofont" style="font-weight: bold">LOG SHARE</div>
73+
<div class="logofont" >LOG SHARE</div>
7374
<div class="logoimg_div"><img id="logoimg" src="{% static 'img/로고%20하얀.png' %}" alt=""/></div>
7475
</a>
7576
</a>

‎group_management/migrations/0002_auto_20200220_1351.py

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎group_management/migrations/0002_auto_20200220_2226.py

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎group_management/templates/group_management/create_group.html

Lines changed: 87 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
background: #fff;
5959
border-radius: 5px;
6060
padding: 1em 2em;
61-
height: 60%;
61+
height: 70%;
6262
}
6363

6464
.modal_close {
@@ -128,6 +128,7 @@
128128
line-height: 20px;
129129
align-content: center;
130130
padding-left: 10px;
131+
font-size: 16px;
131132
}
132133

133134
input[type=checkbox] {
@@ -141,9 +142,7 @@
141142
background-color: #1a237e;
142143
border-radius: 5px;
143144
color: white;
144-
}
145-
#id_notes{
146-
border: solid 1px #b0bec9;
145+
margin-bottom: 40px;
147146
}
148147

149148
h3 {
@@ -161,6 +160,17 @@
161160
border-radius: 5px;
162161
border: solid 1px #b0bec9;
163162
}
163+
164+
#id_group_category {
165+
font-size: 16px;
166+
}
167+
168+
#id_notes {
169+
margin-top: 10px;
170+
font-size: 16px;
171+
border: solid 1px #b0bec9;
172+
}
173+
164174
.my_group {
165175
width: 75%;
166176
border-bottom: none;
@@ -174,14 +184,14 @@
174184
height: 35px;
175185
padding: 20px 40px 10px;
176186
border-bottom: 2px solid #b0bec9;
177-
{#background-color: #1a237e;#}
187+
{#background-color: #1a237e;#}
178188

179189
}
180190

181191
#title {
182192
float: left;
183193
font-size: 20px;
184-
color:#1a237e;
194+
color: #1a237e;
185195
line-height: 35px;
186196
font-weight: bold;
187197
}
@@ -258,14 +268,29 @@
258268
transition: all .2s;
259269
}
260270

271+
.my_grouplist_alarm {
272+
position: relative;
273+
margin-right: 35px;
274+
width: 300px;
275+
height: 250px;
276+
border: 2px solid lightcoral;
277+
box-shadow: 2px 2px 2px #b0bec9;
278+
display: block;
279+
float: left;
280+
border-radius: 5px;
281+
transition: all .2s;
282+
}
283+
261284
.my_grouplist:hover {
262285
background-color: #b0bec9;
263286
}
287+
.my_grouplist_alarm:hover {
288+
background-color: lightcoral;
289+
}
264290

265291

266292
.box_my_grouplist {
267-
{#padding-left: 85px;#}
268-
padding-top: 50px;
293+
{#padding-left: 85px;#} padding-top: 50px;
269294
overflow: hidden;
270295
display: flex;
271296
flex-wrap: wrap;
@@ -305,10 +330,11 @@
305330
#manage_img {
306331
width: 50px;
307332
position: relative;
308-
{#margin-bottom: 10px;#}
333+
{#margin-bottom: 10px;#}
309334

310335
}
311-
.mark2{
336+
337+
.mark2 {
312338
display: inline-block;
313339
overflow: hidden;
314340
width: 310px;
@@ -317,9 +343,10 @@
317343
text-align: center;
318344

319345
}
320-
.manager_text{
346+
347+
.manager_text {
321348
font-size: 15px;
322-
color:#1a237e;
349+
color: #1a237e;
323350
margin-bottom: 5px;
324351
}
325352

@@ -330,45 +357,55 @@
330357

331358
{% block content %}
332359
<div class="background">
333-
<div class="my_group">
334-
<div id="topbar">
335-
<div id="title">내 그룹 리스트</div>
336-
<label class="btn" for="open-pop">그룹 만들기</label>
337-
</div>
338-
<div>
339-
{% if not groups %}
340-
<div class="imgbox">
341-
<h2><a style="color: #1a237e; font-weight: bold; font-size: 35px;">Group</a>이 아직 없어요. <a style="font-size: 20px; color:black;">그룹을 찾아볼까요?</a></h2>
342-
<img id="group_search_img" src="{% static 'img/그룹%20검색.png' %}"git alt=""/>
343-
<h4>가입하고 싶은 그룹을 검색하거나 원하는 그룹을 검색해 보세요.</h4>
344-
<div class="btn_search"><a href="{% url 'group_management:search_group' %}" id="search_link">그룹
345-
검색</a></div>
346-
</div>
347-
{% else %}
348-
<div class="box_my_grouplist">
349-
{% for group in groups %}
350-
<div class="mark2">
351-
{% if group.manager == request.user %}
352-
<div class="mark"><img id="manage_img" src="../../media/관리자 왕관.png" alt=""/></div>
353-
<div class="manager_text">manager</div>
354-
{% else %}
355-
<div class="mark"><img id="manage_img" src="" alt="" style="visibility: hidden;"/></div>
356-
<div class="manager_text"></div>
357-
{% endif %}
358-
<div class="my_grouplist">
359-
<a class="group" href="{% url 'group_management:detail_group' group.id %}">
360-
<div class="group_name"><p> {{ group.group_name }}</p></div>
361-
<div class="group_content">
362-
<p>관리자:({{ group.manager }})</p>
363-
<p>카테고리 : {{ group.get_group_category_display }}</p>
364-
<p>회원 수:{{ group.members.count }}</p>
365-
</div>
366-
</a>
367-
</div>
368-
</div>
369-
{% endfor %}
360+
<div class="my_group">
361+
<div id="topbar">
362+
<div id="title">내 그룹 리스트</div>
363+
<label class="btn" for="open-pop">그룹 만들기</label>
364+
</div>
365+
<div>
366+
{% if not groups %}
367+
<div class="imgbox">
368+
<h2><a style="color: #1a237e; font-weight: bold; font-size: 35px;">Group</a>이 아직 없어요. <a
369+
style="font-size: 20px; color:black;">그룹을 찾아볼까요?</a></h2>
370+
<img id="group_search_img" src="{% static 'img/그룹%20검색.png' %}" git alt=""/>
371+
<h4>가입하고 싶은 그룹을 검색하거나 원하는 그룹을 검색해 보세요.</h4>
372+
<div class="btn_search"><a href="{% url 'group_management:search_group' %}" id="search_link">그룹
373+
검색</a></div>
374+
</div>
375+
{% else %}
376+
<div class="box_my_grouplist">
377+
{% for group in groups %}
378+
<div class="mark2">
379+
{% if group.manager == request.user %}
380+
<div class="mark"><img id="manage_img" src={% static 'img/관리자 왕관.png' %} alt=""/></div>
381+
<div class="manager_text">manager</div>
382+
{% if group in requested_groups %}
383+
<div class="my_grouplist_alarm">
384+
{% else %}
385+
<div class="my_grouplist">
386+
{% endif %}
387+
{% else %}
388+
<div class="mark"><img id="manage_img" src="" alt="" style="visibility: hidden;"/>
389+
</div>
390+
<div class="manager_text"></div>
391+
<div class="my_grouplist">
392+
{% endif %}
393+
394+
<a class="group" href="{% url 'group_management:detail_group' group.id %}">
395+
<div class="group_name"><p> {{ group.group_name }}</p></div>
396+
<div class="group_content">
397+
<p>관리자:({{ group.manager }})</p>
398+
<p>카테고리 : {{ group.get_group_category_display }}</p>
399+
<p>회원 수:{{ group.members.count }}</p>
370400
</div>
371-
{% endif %}
401+
</a>
402+
</div>
403+
404+
405+
</div>
406+
{% endfor %}
407+
</div>
408+
{% endif %}
372409
</div>
373410
</div>
374411
</div>

‎group_management/templates/group_management/detail_group.html

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,20 @@
133133
color: white;
134134
}
135135

136+
.group_create_form input {
137+
font-size: 16px;
138+
}
139+
140+
#id_group_category {
141+
font-size: 16px;
142+
}
143+
144+
#id_notes {
145+
margin-top: 10px;
146+
font-size: 16px;
147+
border: solid 1px #b0bec9;
148+
}
149+
136150
h3 {
137151
margin-bottom: 20px;
138152
}
@@ -157,7 +171,7 @@
157171
{#end-update-open-pop#}
158172

159173
.group_detail_content_row {
160-
width: 70%;
174+
width: 75%;
161175
margin: 0 auto;
162176
margin-top: 40px
163177
}

‎group_management/templates/group_management/search_group.html

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -219,24 +219,34 @@
219219
}
220220

221221
.searched_group {
222+
width: 90%;
222223
background-color: white;
223-
border: 1px solid #b0bec9;
224+
border: 1px solid #00B0F0;
224225
border-radius: 5px;
225-
padding: 10px 20px 30px 20px;
226-
box-shadow: 2px 2px 2px #b0bec9;
227-
margin: 15px auto;
226+
padding: 20px 20px 20px 20px;
227+
box-shadow: 1px 1px 1px #b0bec9;
228+
margin: 30px auto;
229+
letter-spacing: 1px;
228230
}
229231

230232
.searched_group a {
231233
text_decoration: none;
232-
color: black;
234+
letter-spacing: 2px;
235+
color: #1a237e;
233236
}
234237

235238
.searched_group a:hover {
236-
color: #514aac;
239+
{#color: #514aac;#}
240+
color: #00B0F0;
237241
font-weight: bold;
238242
}
239243

244+
245+
.group_notes_span {
246+
margin-left: 1%;
247+
color: #343a40;
248+
}
249+
240250
input:focus::-webkit-input-placeholder {
241251
color: transparent;
242252
}
@@ -247,6 +257,9 @@
247257
font-size: 16px;
248258
}
249259

260+
.group_category_span {
261+
color: #3c3c3c;
262+
}
250263
</style>
251264
{% endblock %}
252265

@@ -298,10 +311,9 @@
298311
<h3 style="display: inline-block">
299312
<a href="{% url 'group_management:detail_group' group.id %}">{{ group.group_name }}</a>
300313
</h3>
301-
<span>({{ group.group_category }})</span>
314+
<span class="group_category_span">&nbsp&nbsp | &nbsp{{ group.get_group_category_display }}</span>
302315
<br><br>
303-
<p style="font-weight: bold; margin-bottom: 10px;">소개</p>
304-
<p>{{ group.notes }}</p>
316+
<span class="group_notes_span">{{ group.notes }}</span>
305317

306318
</div>
307319
{% endfor %}

0 commit comments

Comments
 (0)