Skip to content

Commit 0b373e0

Browse files
wesky93wesky93
committed
Merged feature/changeFrontFramWrk into dev
2 parents 3d4a4b9 + 344b92a commit 0b373e0

49 files changed

Lines changed: 45712 additions & 1218 deletions

Some content is hidden

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

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ everypython의 블로깅을 목적으로 제작중인 블로그 입니다.
2828
4. 포스트
2929
4.1. 페이스북 공유(og태그 지원)
3030
4.2. 댓글(disqus)
31+
4.3. 구글 애드센스 지원(모바일 접속 페이지 광고 및 포스트상세페이지 상단 광고영역)
3132

3233
### 포스팅
3334
1. 에디터

‎requirments.txt‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
1-
boto==2.41.0
2-
configparser==3.5.0
3-
Django==1.9.7
4-
django-ckeditor==5.0.3
5-
django-debug-toolbar==1.4
6-
django-extensions==1.6.7
7-
django-hitcount==1.2.2
8-
django-jet==0.1.4
9-
django-jinja==2.1.3
10-
django-macros==0.4.0
11-
django-storages==1.4.1
12-
django-taggit==0.20.1
13-
google-api-python-client==1.5.1
14-
httplib2==0.9.2
15-
Jinja2==2.8
16-
MarkupSafe==0.23
17-
mysqlclient==1.3.7
18-
oauth2client==2.2.0
19-
psycopg2==2.6.2
20-
pyasn1==0.1.9
21-
pyasn1-modules==0.0.8
22-
pytz==2016.4
23-
rsa==3.4.2
24-
simplejson==3.8.2
25-
six==1.10.0
26-
sqlparse==0.1.19
27-
uritemplate==0.6
28-
Werkzeug==0.11.10
29-
whitenoise==3.2
1+
boto (2.41.0)
2+
configparser (3.5.0)
3+
Django (1.9.7)
4+
django-ckeditor (5.0.3)
5+
django-debug-toolbar (1.4)
6+
django-extensions (1.6.7)
7+
django-hitcount (1.2.2)
8+
django-jet (0.1.4)
9+
django-storages (1.4.1)
10+
django-taggit (0.20.1)
11+
google-api-python-client (1.5.1)
12+
httplib2 (0.9.2)
13+
MarkupSafe (0.23)
14+
oauth2client (2.2.0)
15+
pip (8.1.2)
16+
psycopg2 (2.6.2)
17+
pyasn1 (0.1.9)
18+
pyasn1-modules (0.0.8)
19+
pytz (2016.4)
20+
rsa (3.4.2)
21+
setuptools (24.3.0)
22+
simplejson (3.8.2)
23+
six (1.10.0)
24+
sqlparse (0.1.19)
25+
uritemplate (0.6)
26+
Werkzeug (0.11.10)
27+
wheel (0.29.0)
28+
whitenoise (3.2)

‎webproject/blog/admin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from django.contrib import admin
2-
from blog.models import Category, Post, OrderCategory
2+
from .models import Category, Post, OrderCategory
33
from django.utils.html import format_html
44

55
def Tag_list(obj):

‎webproject/blog/models.py‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from django.contrib.auth.models import User
33
from ckeditor_uploader.fields import RichTextUploadingField
44
from taggit.managers import TaggableManager
5+
from taggit.models import Tag
56
from hitcount.models import HitCountMixin, HitCount
67
from django.db.models.query import QuerySet
78
from django.db.models import Q, Count, Sum, Case, When, IntegerField
@@ -50,7 +51,7 @@ def navi_bar(self):
5051
# 발행된 포스트만 계수하기 위한 ORM : 발행=1, 미발행=0으로 하여 총 합을 구한다.
5152
postcount=Sum(Case(When(post__publish=True, then=1), default=0, output_field=IntegerField()))
5253
# 전체 카테고리의 정보를 튜플로 추출한다.
53-
c_info = c_list.annotate(count_posts=postcount).values_list('level', 'id', 'name', 'count_posts')
54+
c_info = c_list.annotate(count_posts=postcount).values_list('level', 'name', 'count_posts')
5455

5556
# 카테고리 정보를 뷰와 템플릿에서 처리하기 쉽도록 구조를 변경한다.
5657
category_tree = []
@@ -189,6 +190,16 @@ def dreft(self):
189190
"""미발행 포스트(초안) 목록"""
190191
return self.filter(publish=False)
191192

193+
def posts_info(self,post_queryset):
194+
"""
195+
포스트 목록 쿼리셋을 받아 포스트목록에 보여줄 정보를 취합하여 list로 넘겨준다
196+
list에 담겨지는 포스 정보의 구조 : (pk,category,created_date,hitcounts,title,description(없을시엔 contnent의 100자까지로 대체),tags)
197+
"""
198+
posts = list(post_queryset.select_related('category').prefetch_related('tag'))
199+
info_list = [(p.pk, p.category.name, p.create_date, p.title, p.description if p.description else p.content[:100] , [t.name for t in p.tag.all()]) for p in posts]
200+
return info_list
201+
202+
192203
class PublishQuerySets(QuerySet, PublishMixin):
193204
pass
194205

@@ -224,6 +235,3 @@ def __str__(self):
224235

225236

226237

227-
228-
229-

‎webproject/blog/static/css/admin.css‎

Lines changed: 277 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,277 @@
1+
/* 커스텀 팔레트 */
2+
3+
4+
5+
/* MAIN STYLES */
6+
7+
* {
8+
margin: 0;
9+
padding: 0;
10+
}
11+
12+
body {
13+
background-color: #F5F5F5 !important;
14+
}
15+
16+
.ui.main.grid {
17+
left: 18.75%;
18+
position: relative;
19+
width: 81.25%;
20+
}
21+
22+
#mainwidget {
23+
height: auto!important;
24+
}
25+
26+
.ui.main.grid .ui.secondary.pointing.fluid.menu h2 {
27+
margin: calc(2rem - .14285em) 0 1rem;
28+
}
29+
30+
.ui.fixed.inverted.main.menu {
31+
display: none;
32+
}
33+
34+
.ui.left.fixed.vertical.inverted.menu {
35+
padding-left: 0;
36+
padding-right: 0;
37+
}
38+
39+
.ui.left.fixed.vertical.inverted.menu a.item:first-child {
40+
padding-bottom: 30px;
41+
padding-top: 60px;
42+
}
43+
44+
.ui.sidebar.inverted.vertical.menu a.item:first-child {
45+
padding-bottom: 15px;
46+
padding-top: 30px;
47+
}
48+
49+
/* LOGIN STYLES */
50+
51+
[data-page="login"] .ui.container {
52+
display: flex;
53+
flex-direction: column;
54+
height: 100%;
55+
justify-content: center;
56+
margin: 0 auto;
57+
width: 465px;
58+
}
59+
60+
.dashboard.brand.icon {
61+
width: 100%;
62+
margin-bottom: 36px;
63+
}
64+
65+
[data-page="login"] .ui.container .ui.segment {
66+
padding: 35px;
67+
}
68+
69+
p.signup {
70+
padding-top: 25px;
71+
}
72+
73+
p.dashboard {
74+
font-size: 12px;
75+
padding-top: 10px;
76+
text-transform: uppercase;
77+
}
78+
79+
p.signup, p.dashboard {
80+
color: #999999;
81+
text-align: center;
82+
}
83+
84+
/* PRODUCTS STYLES */
85+
.ui.striped.table {
86+
padding-left: 0;
87+
padding-right: 0;
88+
}
89+
90+
.ui.main.grid .products.column, .ui.main.grid .products.column .basic.segment {
91+
padding: 1rem 0;
92+
}
93+
94+
.ui.divided.product.items {
95+
width: 100%;
96+
}
97+
98+
.ui.divided.product.items img {
99+
height: 187px;
100+
width: 150px;
101+
}
102+
103+
/* CUSTOMER STYLES */
104+
105+
.customer.statistics {
106+
width: 100%;
107+
}
108+
109+
.feedback.segments {
110+
width: 100%;
111+
}
112+
113+
/* EMPLOYEES STYLES */
114+
115+
.ui.mobile.cards {
116+
display: none;
117+
}
118+
119+
/* DASHBOARD STYLES */
120+
121+
.ui.dashboard.segment {
122+
display: flex;
123+
flex-direction: column;
124+
justify-content: center;
125+
min-height: 171px;
126+
}
127+
128+
.ui.dashboard.statistic .value {
129+
color: #FFFFFF;
130+
}
131+
132+
.ui.dashboard.statistic .label {
133+
color: #F5F5F5;
134+
}
135+
136+
.harlf.column {
137+
width: 50% !important;
138+
}
139+
140+
.top-table.column {
141+
width: 33.33333333% !important;
142+
}
143+
144+
.top-table.column .ui.segment:last-child, .doughnut-chart.column .ui.segment:last-child {
145+
height: 219px;
146+
}
147+
148+
.doughnut-chart.column {
149+
width: 66.66666666% !important;
150+
}
151+
152+
ul#dashboard_legend {
153+
display: inline-block;
154+
vertical-align: top;
155+
}
156+
157+
ul.doughnut-legend {
158+
list-style-type: none;
159+
}
160+
161+
.doughnut-legend li span {
162+
border-radius: 50%;
163+
display: inline-block;
164+
margin-right: 8px;
165+
height: 12px;
166+
width: 12px;
167+
}
168+
169+
/* SMARTPHONE */
170+
@media only screen and (min-width: 320px) and (max-width: 767px) {
171+
.ui.mobile.cards {
172+
display: flex;
173+
}
174+
175+
.ui.special.three.cards {
176+
display: none;
177+
}
178+
179+
.row {
180+
padding-top: 0;
181+
padding-bottom: 0;
182+
}
183+
184+
.top-table.column .ui.segment:last-child, .doughnut-chart.column .ui.segment:last-child {
185+
height: auto;
186+
}
187+
188+
.ui.special.three.cards .card .content a.header,
189+
.ui.special.three.cards .card .content div.header {
190+
font-size: 1em;
191+
}
192+
193+
.ui.four.customer.statistics .statistic .value {
194+
font-size: 1.5em;
195+
}
196+
197+
.ui.grid .nine.wide.products.column, .ui.grid .seven.wide.products.column {
198+
padding: 0;
199+
width: 100% !important;
200+
}
201+
202+
.ui.grid .seven.wide.products.column .ui.basic.right.aligned.segment {
203+
text-align: left;
204+
}
205+
206+
/* 메인페이지 칼럼 스타일 */
207+
.one.column, .harlf.column{
208+
margin-bottom: 30px!important;
209+
width: 100% !important;
210+
padding-left: 0.5rem!important;
211+
padding-right: 0.5rem!important;
212+
}
213+
214+
.ui.grid .ui.three.column.row .dashboard-stat.column,
215+
.top-table.column, .doughnut-chart.column, .ui.grid .four.wide.sales.column,
216+
.ui.grid .twelve.wide.sales.column{
217+
margin-bottom: 30px;
218+
width: 100% !important;
219+
}
220+
221+
.ui.header.datetime {
222+
margin: 3rem 0 1rem;
223+
}
224+
225+
.ui.left.fixed.vertical.inverted.menu {
226+
display: none;
227+
}
228+
229+
.ui.fixed.inverted.main.menu {
230+
display: block;
231+
}
232+
233+
.ui.main.grid {
234+
left: 0%;
235+
margin : 40px auto!important;
236+
padding: 1rem 0 0!important;
237+
position: relative;
238+
width: 100%;
239+
}
240+
}
241+
242+
/* TABLET */
243+
@media only screen and (min-width: 768px) and (max-width: 991px) {
244+
.ui.header.datetime {
245+
margin: 3rem 0 1rem;
246+
}
247+
248+
.ui.left.fixed.vertical.inverted.menu {
249+
display: none;
250+
}
251+
252+
.ui.fixed.inverted.main.menu {
253+
display: block;
254+
}
255+
256+
.ui.main.grid {
257+
margin-top: 40px!important;
258+
left: 0%;
259+
padding-top: 1rem !important;
260+
position: relative;
261+
width: 100%;
262+
}
263+
}
264+
265+
@media only screen and (min-width: 992px) {
266+
.ui.fixed.inverted.main.menu {
267+
display: none;
268+
}
269+
270+
.ui.left.fixed.vertical.inverted.menu.sidebar {
271+
display: block;
272+
}
273+
274+
.ui.sidebar{
275+
visibility: visible!important;
276+
}
277+
}

0 commit comments

Comments
 (0)