+
+
+
+ {% csrf_token %}
+
+ {% else %}
+
+
+
+ Sign Up
+
+
+ Sign In
+
+ {% endif %}
+
+
+
+ -
+ {% if user.is_authenticated %}
+
- + 환영합니다. {{user}} 님! + + {% endif %} + +
- + Service + + + + {% if user.is_authenticated %} +
- + Mypage + +
- + Logout + +
-
-
+
-
-
-
-
+
+ -
Category
-
-
-
+ + {% block content %} + {% endblock %} ++ +
-
-
+
+
\ No newline at end of file
diff --git a/gasili/templates/base.html.rej b/gasili/templates/base.html.rej
deleted file mode 100644
index c75ca03..0000000
--- a/gasili/templates/base.html.rej
+++ /dev/null
@@ -1,9 +0,0 @@
-diff a/gasili/templates/base.html b/gasili/templates/base.html (rejected hunks)
-@@ -148,6 +148,7 @@
- {% load staticfiles %}
-
-{% block content %}
-{% endblock %}
-
-
-
- {% if user.is_authenticated %}
-
-
+
+
+
-{% else %}
-{% endif %}
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ National Transaction Corporation is a Registered MSP/ISO of Elavon, Inc. Georgia [a wholly owned subsidiary of U.S. Bancorp, Minneapolis, MN]
+© All right Reversed.Sunlimetech
+
-
-+
-
-
-
diff --git a/gasili/urls.py b/gasili/urls.py
index 612d1ef..0c234d3 100644
--- a/gasili/urls.py
+++ b/gasili/urls.py
@@ -15,9 +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
@@ -25,8 +26,7 @@
path('admin/', admin.site.urls),
path('', home.views.index, name='index'),
path('accounts/', include('accounts.urls')),
- path('board/new',board.views.board_new, name="board_new"),
- path('board/create/',board.views.create, name="board_create"),
- path('test/',board.views.test, name="test"),
- path('board/', board.views.board, name="board"),
+ 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
new file mode 100644
index 0000000..140ca70
--- /dev/null
+++ b/home/static/css/style.css
@@ -0,0 +1,83 @@
+@charset "utf-8";
+/* CSS Document */
+
+body {
+ margin: 0px; /* 언제나 전체 body에는 margin 값을 0으로 세팅해준다*/
+ font-size: 18px;
+ color: #FFF;
+}
+#box {
+ position: relative;
+ height: auto;
+ margin: auto; /*레이아웃을 싸고 있는 box의 margin을 auto로 주면 중앙정렬 효과*/
+ background-color: #F90;
+}
+#top {
+ background-color: #333;
+ height: 100px;
+ position: relative;
+}
+#left {
+ background-color: #09C;
+ float: left;
+ height: 500px;
+ width: 15%;
+ position: relative;
+}
+#main {
+ background-color: #3C0;
+ float: left;
+ height: 500px;
+ width: 85%;
+ position: relative;
+}
+#bottom {
+ background-color: #C0F;
+ height: 70px;
+ position: relative;
+ clear: both; /* 상단의 흐름을 한번 끊어주기 위해 clear를 해준다.. -.-;;??*/
+ float: left; /*새로운 흐름을 지정해줘야 깨지지 않는다*/
+}
+/* 여기까지 그냥 test용 css */
+
+
+/* board_new.html 적용 css */
+.container-board-new row {
+ width:100%;
+ margin:0;
+ padding:0;
+}
+
+.container-board-new {
+ margin:0,25px,25px,25px;
+ width:100%;
+}
+
+.classframe {
+ border-radius: 5px;
+ border:1px dashed rgb(91,155,213);
+ width:100%;
+}
+
+.mb-3 .form-control {
+ margin-bottom: 5px;
+}
+.area-file {
+ border:1px solid black;
+ height: 100px;
+ overflow:scroll;
+}
+
+.area-file input {
+ margin: 10px 10px;
+}
+
+.flexbox {
+ display: flex;
+ flex-direction: row-reverse;
+ padding-right: 10%;
+}
+.flexbox .item {
+ margin-left: 1%;
+}
+/* board_new.html 적용 css */
\ No newline at end of file
diff --git a/home/static/gratisography-299H.jpg b/home/static/gratisography-299H.jpg
new file mode 100644
index 0000000..a0d7668
Binary files /dev/null and b/home/static/gratisography-299H.jpg differ
diff --git a/home/static/gratisography-309H.jpg b/home/static/gratisography-309H.jpg
new file mode 100644
index 0000000..08a158b
Binary files /dev/null and b/home/static/gratisography-309H.jpg differ
diff --git a/home/static/gratisography-330H.jpg b/home/static/gratisography-330H.jpg
new file mode 100644
index 0000000..895248d
Binary files /dev/null and b/home/static/gratisography-330H.jpg differ
diff --git a/home/static/illustration4.PNG b/home/static/illustration4.PNG
deleted file mode 100644
index 38aecba..0000000
Binary files a/home/static/illustration4.PNG and /dev/null differ
diff --git a/home/static/illustration5.PNG b/home/static/illustration5.PNG
deleted file mode 100644
index deaf576..0000000
Binary files a/home/static/illustration5.PNG and /dev/null differ
diff --git a/home/static/illustration6.PNG b/home/static/illustration6.PNG
deleted file mode 100644
index 44f2cc4..0000000
Binary files a/home/static/illustration6.PNG and /dev/null differ
diff --git a/home/static/illustration8.PNG b/home/static/illustration8.PNG
new file mode 100644
index 0000000..2cff2cb
Binary files /dev/null and b/home/static/illustration8.PNG differ
diff --git a/home/static/illustration9.PNG b/home/static/illustration9.PNG
new file mode 100644
index 0000000..452b8a8
Binary files /dev/null and b/home/static/illustration9.PNG differ
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/mainimg3.png b/home/static/mainimg3.png
new file mode 100644
index 0000000..3fb67a5
Binary files /dev/null and b/home/static/mainimg3.png differ
diff --git a/home/static/mainimg4.png b/home/static/mainimg4.png
new file mode 100644
index 0000000..9a5b72b
Binary files /dev/null and b/home/static/mainimg4.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 e87b59b..d852713 100644
--- a/home/templates/index.html
+++ b/home/templates/index.html
@@ -3,196 +3,28 @@
{% block content %}
{% load staticfiles %}
-
-
-
- 최근 게시물
-
-
-
-
-
-
- 추천 게시물
-
-
-
-
-
-
- 마감 촉박 게시물
-
-
-
최근 게시물
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
- 추천 게시물
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
- 마감 촉박 게시물
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
-
-
-
-
-
-
-
-
-
-
-
-
-
- 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
+
+
-
-
+
-
+
-
-
diff --git a/board/__init__.py b/mypage/__init__.py
similarity index 100%
rename from board/__init__.py
rename to mypage/__init__.py
diff --git a/chart/admin.py b/mypage/admin.py
similarity index 100%
rename from chart/admin.py
rename to mypage/admin.py
diff --git a/mypage/apps.py b/mypage/apps.py
new file mode 100644
index 0000000..358a40f
--- /dev/null
+++ b/mypage/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class MypageConfig(AppConfig):
+ name = 'mypage'
diff --git a/chart/__init__.py b/mypage/migrations/__init__.py
similarity index 100%
rename from chart/__init__.py
rename to mypage/migrations/__init__.py
diff --git a/chart/models.py b/mypage/models.py
similarity index 50%
rename from chart/models.py
rename to mypage/models.py
index 137941f..71a8362 100644
--- a/chart/models.py
+++ b/mypage/models.py
@@ -1 +1,3 @@
from django.db import models
+
+# Create your models here.
diff --git a/mypage/templates/mypage/mypageBlog.html b/mypage/templates/mypage/mypageBlog.html
new file mode 100644
index 0000000..a453d24
--- /dev/null
+++ b/mypage/templates/mypage/mypageBlog.html
@@ -0,0 +1,49 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
-
-
-
+
-
+
-
-
-
-
-
-
+
+
+ Previous
+
+
+
+ Next
+
-
-
+ 제목 : ...
- 작성자 : ...
제품 이름 : ...
사용 기간 : ...
희망 가격 : ...
한 줄 어필 : ...
-
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/mypage/templates/mypage/mypageComment.html b/mypage/templates/mypage/mypageComment.html
new file mode 100644
index 0000000..22be870
--- /dev/null
+++ b/mypage/templates/mypage/mypageComment.html
@@ -0,0 +1,49 @@
+{% extends 'base.html' %}
+
+{% block content %}
+
+
+
+
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/chart/tests.py b/mypage/tests.py
similarity index 100%
rename from chart/tests.py
rename to mypage/tests.py
diff --git a/mypage/urls.py b/mypage/urls.py
new file mode 100644
index 0000000..e9a0ffb
--- /dev/null
+++ b/mypage/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+ path('mypageBlog/', views.mypageBlog, name='mypageBlog'),
+ path('mypageComment/', views.mypageComment, name='mypageComment'),
+]
\ No newline at end of file
diff --git a/mypage/views.py b/mypage/views.py
new file mode 100644
index 0000000..f8ee646
--- /dev/null
+++ b/mypage/views.py
@@ -0,0 +1,17 @@
+from django.shortcuts import render, redirect
+from board.models import Board, Comment
+
+# Create your views here.
+def mypageBlog(request):
+ if request.user.is_authenticated:
+ posts = Board.objects.filter(userId = request.user.id)
+ return render(request, 'mypage/mypageBlog.html', {'posts': posts})
+ else:
+ return redirect('login')
+
+def mypageComment(request):
+ if request.user.is_authenticated:
+ posts = Comment.objects.filter(userId = request.user.id)
+ return render(request, 'mypage/mypageComment.html', {'posts': posts})
+ else:
+ return redirect('login')
\ No newline at end of file
diff --git a/chart/migrations/__init__.py b/service/__init__.py
similarity index 100%
rename from chart/migrations/__init__.py
rename to service/__init__.py
diff --git a/service/admin.py b/service/admin.py
new file mode 100644
index 0000000..4ba9e15
--- /dev/null
+++ b/service/admin.py
@@ -0,0 +1,6 @@
+from django.contrib import admin
+
+from .models import Service
+# Register your models here.
+
+admin.site.register(Service)
diff --git a/service/admin.py.rej b/service/admin.py.rej
new file mode 100644
index 0000000..0cc23f9
--- /dev/null
+++ b/service/admin.py.rej
@@ -0,0 +1,7 @@
+diff a/service/admin.py b/service/admin.py (rejected hunks)
+@@ -1,5 +1,4 @@
+ from django.contrib import admin
+-
+ from .models import Service
+ # Register your models here.
+
diff --git a/service/apps.py b/service/apps.py
new file mode 100644
index 0000000..9728199
--- /dev/null
+++ b/service/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class ServiceConfig(AppConfig):
+ name = 'service'
diff --git a/service/migrations/__init__.py b/service/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/service/models.py b/service/models.py
new file mode 100644
index 0000000..25f1b4b
--- /dev/null
+++ b/service/models.py
@@ -0,0 +1,15 @@
+from django.db import models
+
+# Create your models here.
+
+class Service(models.Model) :
+ #pk = models.AutoField()
+ title = models.CharField(max_length=200)
+ body = models.TextField()
+ def __str__(self) :
+ return self.title
+ #제목
+ #날짜
+ #카테고리
+ #본문
+ #작성자
\ No newline at end of file
diff --git a/service/templates/servicecenter.html b/service/templates/servicecenter.html
new file mode 100644
index 0000000..a2c4f36
--- /dev/null
+++ b/service/templates/servicecenter.html
@@ -0,0 +1,34 @@
+{% extends 'base.html' %}
+
+
+ {% block content %}
+
+
+
+
+
+
+
+서비스 센터 (Service Center)
+ + {% for service in services.all %} + +
+
+
+
+ {% endfor %}
+
+
+ {% endblock %}
+
+
diff --git a/service/tests.py b/service/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/service/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/service/urls.py b/service/urls.py
new file mode 100644
index 0000000..f637a2d
--- /dev/null
+++ b/service/urls.py
@@ -0,0 +1,7 @@
+from django.urls import path
+from . import views
+
+urlpatterns = [
+ path('servicecenter/', views.servicecenter, name='servicecenter'),
+
+]
diff --git a/service/views.py b/service/views.py
new file mode 100644
index 0000000..c40ca1d
--- /dev/null
+++ b/service/views.py
@@ -0,0 +1,9 @@
+from django.shortcuts import render, get_object_or_404
+from .models import Service
+# Create your views here.
+
+def servicecenter(request):
+ services = Service.objects
+ return render(request, 'servicecenter.html', {'services' : services})
+
+
diff --git a/static/css/style.css b/static/css/style.css
new file mode 100644
index 0000000..4d9607a
--- /dev/null
+++ b/static/css/style.css
@@ -0,0 +1,7 @@
+/* 안쓰는 css 파일임
+ css 추가하려면
+ home
+ - static
+ - css
+ - style.css 파일에 추가 하시길.
+*/
\ No newline at end of file
diff --git a/static/illustration4.PNG b/static/illustration4.PNG
deleted file mode 100644
index 38aecba..0000000
Binary files a/static/illustration4.PNG and /dev/null differ
+
+
+ + +
+
+
+
+
+
{{ comments.text|linebreaks }}
+제시한 가격 : {{comments.price}}
+