Merge branch 'dev'

Author: SeongIkKim

.gitignore

@@ -1,6 +1,3 @@
-
-/static
-/media
 .idea
 .idea/
 
@@ -15,10 +12,9 @@ __pycache__/
 local_settings.py
 db.sqlite3
 db.sqlite3-journal
-media
 
 # If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/
-# in your Git repository. Update and uncomment the following line accordingly.
+# in your Git repository. Update and uncont the following line accordingly.
 # <django-project-name>/staticfiles/
 
 ### Django.Python Stack ###
@@ -297,6 +293,9 @@ pyvenv.cfg
 .venv
 env/
 venv/
+myvenv/
+.myvenv
+myvenv.bak/
 ENV/
 env.bak/
 venv.bak/

Twisted-19.10.0-cp38-cp38-win_amd64.whl

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

accounts/__init__.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class AccountsConfig(AppConfig):
+    name = 'accounts'

accounts/admin.py

@@ -0,0 +1,63 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm, PasswordChangeForm
+from django.contrib.auth import get_user_model
+from django.contrib.auth.forms import UserCreationForm, UserChangeForm
+from django.contrib.auth.models import User
+from django.forms import FileInput
+
+from myprofile.models import Profile
+
+
+class CreateUserForm(UserCreationForm):  # 내장 회원가입 폼을 상속받아서 확장한다.
+    email = forms.EmailField(required=True)  # 이메일 필드 추가
+    last_name = forms.CharField(required=True, max_length=10)
+    first_name = forms.CharField(required=True, max_length=10)
+
+    class Meta:
+        model = User
+        fields = ("username", "password1", "password2", "last_name", "first_name", "email")
+        labels={"username":"아이디","last_name":"성","first_name":"이름","email":"이메일"}
+
+    def save(self, commit=True):  # 저장하는 부분 오버라이딩
+        user = super(CreateUserForm, self).save(commit=False)  # 본인의 부모를 호출해서 저장하겠다.
+        user.email = self.cleaned_data["email"]
+        user.last_name = self.cleaned_data["last_name"]
+        user.first_name = self.cleaned_data["first_name"]
+
+        if commit:
+            user.save()
+        return user
+
+
+class CustomUserChangeForm(UserChangeForm):
+    class Meta:
+        model = get_user_model()  # settings.py에서 설정된 User 모델을 갖고옴
+        fields = ['last_name', 'first_name', 'email']
+
+    def __init__(self, *args, **kwargs):
+        super(UserChangeForm, self).__init__(*args, **kwargs)
+        f = self.fields.get('user_permissions', None)
+        self.fields.get('password').label = ''
+        self.fields.get('password').help_text = ''
+        if f is not None:
+            f.queryset = f.queryset.select_related('content_type')
+
+
+class SignupModelForm(forms.ModelForm):
+    class Meta:
+        model = Profile
+        fields = ('department', 'description', 'photo', 'interested_tag', 'naver', 'daum', 'github', 'other_url')
+        widgets = {
+            'photo': FileInput(),
+        }
+
+        def __init__(self, *args, **kwargs):
+            super(SignupModelForm, self).__init__(*args, **kwargs)
+            self.fields['photo'].widget.attrs = {'id': 'selectedFile'}
+
+
+class password_changeForm(PasswordChangeForm):  # 내장 회원가입 폼을 상속받아서 확장한다.
+    class Meta:
+        model = User
+        fields = ("old_password","new_password1","new_password2")
+        labels={"old_password":"기존 비밀번호","new_password1":"새 비밀번호","new_password2":"새 비밀번호 확인"}

accounts/apps.py

@@ -0,0 +1 @@
+

accounts/forms.py

@@ -0,0 +1,19 @@
+from django.core.mail.message import EmailMessage
+
+
+def send_email():
+    subject = "메시지"
+    to = ['[email protected]']
+    from_email = '[email protected]'
+    message = "메시지를 성공적으로 전송"
+    EmailMessage(subject=subject, body=message, to=to, from_email=from_email).send()
+
+def send_mail(subject, message, recipient_list=None):
+	from django.conf import settings
+	default_recipient_list = ['[email protected]']
+	send_mail(
+		subject=subject,
+		message=message,
+		from_email=settings.EMAIL_HOST_USER, #!
+		recipient_list=recipient_list if recipient_list else default_recipient_list
+)

accounts/migrations/__init__.py

@@ -0,0 +1,96 @@
+<style>
+    * {
+        font-family: 나눔스퀘어;
+        text-decoration: none;
+        margin: 0;
+        padding: 0;
+    }
+
+    .container {
+        box-shadow: 2px 2px 2px #b0bec9;
+        border: solid 1px #b0bec9;
+        border-radius: 5px;
+        margin: 80px auto;
+        text-align: center;
+        width: 400px;
+        padding-top: 30px;
+        padding-bottom: 30px;
+    }
+
+    h1 {
+        color: #1a237e;
+        line-height: 60px;
+    }
+
+    .start_logo {
+        line-height: 60px;
+        font-size: 25px;
+    }
+
+    form {
+        font-size: 20px;
+    }
+
+    input {
+        width: 300px;
+        height: 40px;
+        border-radius: 5px;
+        border: solid 1px #b0bec9;
+        margin-top: 20px;
+        padding-left: 10px;
+    }
+
+    a {
+        color: #1a237e;
+        font-weight: bold;
+    }
+
+    #help {
+        line-height: 50px;
+    }
+
+    #error {
+        font-size: 15px;
+        margin: 0;
+        padding: 0;
+    }
+
+    footer > div {
+        display: inline-block;
+        font-size: 14px;
+        margin: 10px;
+    }
+
+    input[type=password] {
+        font-family: "Adobe 고딕 Std B";
+    }
+
+    input[type=submit] {
+        background-color: #1E88E5;
+        border: 1px solid #00B0F0;
+        color: white;
+        font-size: 15px;
+    }
+
+</style>
+{% extends "accounts/signupbase.html" %}
+
+{% block content %}
+    <div class="container">
+        <div>
+            <h1>LOG SHARE</h1>
+        </div>
+        <div class="start_logo">지금 로그쉐어를 시작하세요!</div>
+        <form method="POST" action="{% url 'accounts:login' %}">
+            {% csrf_token %}
+            <div id="error">{{ error }}</div>
+            <input name="username" type="text" placeholder="아이디">
+            <input name="password" type="password" placeholder="비밀번호">
+            <input type="submit" class="btn btn-primary" value="로그인">
+        </form>
+        <div id="help"><a href="{% url "accounts:password_reset" %}">암호를 잊으셨나요?</a></div>
+        <div>로그쉐어는 처음이신가요? <a href="{% url "accounts:signup" %}">회원가입</a></div>
+    </div>
+{% endblock %}
+</body>
+</html>