diff --git a/accounts/templates/accounts/home.html b/accounts/templates/accounts/home.html deleted file mode 100644 index 4a05f45..0000000 --- a/accounts/templates/accounts/home.html +++ /dev/null @@ -1,11 +0,0 @@ -{% if user.is_authenticated %} -환영합니다. {{ user.username }} 님!
-Update -Logout -
- {% csrf_token %} -
-{% else %} -Signup -Login -{% endif %} \ No newline at end of file diff --git a/accounts/templates/accounts/login.html b/accounts/templates/accounts/login.html index f6d98b2..6347a9a 100644 --- a/accounts/templates/accounts/login.html +++ b/accounts/templates/accounts/login.html @@ -2,6 +2,7 @@ {% block content %}
+
@@ -31,5 +32,6 @@

Sign in

+ {% endblock %} \ No newline at end of file diff --git a/accounts/templates/accounts/signup.html b/accounts/templates/accounts/signup.html index 61a57b4..e155799 100644 --- a/accounts/templates/accounts/signup.html +++ b/accounts/templates/accounts/signup.html @@ -1,3 +1,5 @@ + + {% extends 'base.html' %} {% block content %} @@ -5,39 +7,106 @@
-
-
-
+ + -
- {% csrf_token %} -
아이디(ID):
-
비밀번호(Password):
-
비밀번호 확인(Confirm Password):
-
성별(Gender): 남성(Man) - 여성(Woman)
-
성(Last Name):
-
이름(First Name):
-
생년월일(birthdate):
-
닉네임(Nickname):
-
관리자아이디여부:
-
- -
-
-
-
- - +
diff --git a/board/models.py b/board/models.py index e43dda7..9d9683c 100644 --- a/board/models.py +++ b/board/models.py @@ -10,8 +10,9 @@ class Board(models.Model) : body = models.TextField() product_price = models.PositiveIntegerField(blank=True,default=0) order_price = models.PositiveIntegerField(default=0) - state = models.CharField(max_length=20) + state = models.CharField(max_length=15) userId = models.IntegerField() + userName = models.CharField(max_length=20) image = models.ImageField(upload_to='images/', blank=True) image1 = models.ImageField(upload_to='images/', blank=True) image2 = models.ImageField(upload_to='images/', blank=True) @@ -33,7 +34,7 @@ def __str__(self) : class Comment(models.Model): post = models.IntegerField() userId = models.IntegerField() - author = models.CharField(max_length=20) + author = models.CharField(max_length=15) text = models.TextField() price = models.IntegerField() created_date = models.DateTimeField(auto_now_add=True) diff --git a/board/templates/board_new.html b/board/templates/board_new.html index 5259285..a11294d 100644 --- a/board/templates/board_new.html +++ b/board/templates/board_new.html @@ -38,17 +38,22 @@

게시물 등록

본문을 작성해주세요!
- +
+
+
+
+ +
- +
@@ -56,7 +61,7 @@

게시물 등록

@@ -64,7 +69,7 @@

게시물 등록

@@ -72,7 +77,7 @@

게시물 등록

@@ -80,7 +85,7 @@

게시물 등록

@@ -98,8 +103,43 @@

게시물 등록

+ + + + + +
+ +
+ +
+ + + + 글목록 +
+ + + + + +{% endblock %} \ No newline at end of file diff --git a/board/templates/test.html b/board/templates/test.html index 8f8b8cd..7e6af23 100644 --- a/board/templates/test.html +++ b/board/templates/test.html @@ -31,8 +31,20 @@

{{ board.title }}

글목록 - + 차트보기 +
+ +
+
+

댓글

+ +
+ {% csrf_token %} +
+ +

가격 :

+


diff --git a/board/urls.py b/board/urls.py index 2e8d562..c968b63 100644 --- a/board/urls.py +++ b/board/urls.py @@ -6,6 +6,7 @@ path('create/',views.create, name="board_create"), path('test/',views.test, name="test"), path('test//create/comment',views.createcomment, name="createcomment"), + path('test/chart/', views.chart, name='chart'), path('', views.board, name="board"), ] diff --git a/board/views.py b/board/views.py index 06f0e6b..0760323 100644 --- a/board/views.py +++ b/board/views.py @@ -66,10 +66,10 @@ def create(request) : print("로그인 안됨") - # 보완 - 로그인 상태 아닐 경우, #if(request.user.username is None) - boards.userId = request.user.id + boards.userId = request.user.id + boards.userName = request.user.nickname ## 수정필요 ## boards.save() @@ -113,3 +113,6 @@ def createcomment(request, board_id): comments.save() return redirect('test', board_id) + +def chart(request, board_id): + return render(request, 'chart.html') \ No newline at end of file diff --git a/chart/apps.py b/chart/apps.py deleted file mode 100644 index 16aa43d..0000000 --- a/chart/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class ChartConfig(AppConfig): - name = 'chart' diff --git a/chart/templates/home.html b/chart/templates/home.html deleted file mode 100644 index 26c5d96..0000000 --- a/chart/templates/home.html +++ /dev/null @@ -1 +0,0 @@ -

test

\ No newline at end of file diff --git a/chart/views.py b/chart/views.py deleted file mode 100644 index b44ed0e..0000000 --- a/chart/views.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.shortcuts import render - -# query Set 결과물을 [ list ] 로 변환한다 -def chart(request): - return render(request, 'home.html') \ No newline at end of file diff --git a/gasili/settings.py b/gasili/settings.py index d8419bc..936baf0 100644 --- a/gasili/settings.py +++ b/gasili/settings.py @@ -31,16 +31,18 @@ # Application definition INSTALLED_APPS = [ - 'accounts.apps.AccountsConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'chart.apps.ChartConfig', 'home.apps.HomeConfig', - 'board.apps.BoardConfig' + 'board.apps.BoardConfig', + 'accounts.apps.AccountsConfig', + 'mypage.apps.MypageConfig', + 'service.apps.ServiceConfig', + ] MIDDLEWARE = [ diff --git a/gasili/settings.py.rej b/gasili/settings.py.rej deleted file mode 100644 index 1d0cce1..0000000 --- a/gasili/settings.py.rej +++ /dev/null @@ -1,9 +0,0 @@ -diff a/gasili/settings.py b/gasili/settings.py (rejected hunks) -@@ -125,6 +125,7 @@ - STATIC_ROOT = os.path.join(BASE_DIR, 'static') - STATIC_URL = '/static/' - -+ <<<<<<< HEAD - AUTH_USER_MODEL = 'accounts.CustomUser' - ======= - MEDIA_ROOT = os.path.join(BASE_DIR, 'media') diff --git a/gasili/templates/base.html b/gasili/templates/base.html index 007a91d..ba92bdc 100644 --- a/gasili/templates/base.html +++ b/gasili/templates/base.html @@ -29,33 +29,35 @@ - - - - + + + + + + - + +
{% load staticfiles %}
@@ -163,14 +296,15 @@
-
- -
- +
+ +
+
+
@@ -196,12 +330,72 @@
-
+
{% block content %} {% endblock %}
+
+ + + + + + + \ No newline at end of file diff --git a/gasili/urls.py b/gasili/urls.py index 7145c6b..0c234d3 100644 --- a/gasili/urls.py +++ b/gasili/urls.py @@ -15,8 +15,10 @@ """ from django.contrib import admin from django.urls import path, include -import chart.views import home.views +import board.views +import service.views + from django.conf import settings from django.conf.urls.static import static @@ -24,5 +26,7 @@ path('admin/', admin.site.urls), path('', home.views.index, name='index'), path('accounts/', include('accounts.urls')), + path('service/', include('service.urls')), path('board/', include('board.urls')), + path('mypage/', include('mypage.urls')), ]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/home/static/css/style.css b/home/static/css/style.css index d93a058..5b6a908 100644 --- a/home/static/css/style.css +++ b/home/static/css/style.css @@ -64,9 +64,6 @@ body { .mb-3 .form-control { margin-bottom: 5px; } -.mb-3 #fileAdd { - margin: 20px 5px 5px 90% -} .area-file { border:1px solid black; height: 200px; @@ -79,4 +76,12 @@ body { .confirmOrCancel { text-align: center; } +.flexbox { + display: flex; + flex-direction: row-reverse; + margin: 25px 10px 10px 25px; +} +.flexbox .item { + margin-left: 1%; +} /* board_new.html 적용 css */ \ No newline at end of file diff --git a/home/static/mainimg12.png b/home/static/mainimg12.png new file mode 100644 index 0000000..54ffddb Binary files /dev/null and b/home/static/mainimg12.png differ diff --git a/home/static/mainimg8.png b/home/static/mainimg8.png new file mode 100644 index 0000000..72bd322 Binary files /dev/null and b/home/static/mainimg8.png differ diff --git a/home/templates/index.html b/home/templates/index.html index c949fdb..d852713 100644 --- a/home/templates/index.html +++ b/home/templates/index.html @@ -6,13 +6,13 @@