Merge pull request #7 from Likelion-at-SMWU-10th/feat/#1-social-login

[feat]userapp 생성 및 코드 수정
Likelion-at-SMWU-10th · Jul 21, 2022 · cb7a30e · cb7a30e
2 parents 7801b51 + 67db6e4
commit cb7a30e
Show file tree

Hide file tree

Showing 17 changed files with 35 additions and 102 deletions.
diff --git a/rememB/balanceapp/migrations/0001_initial.py b/rememB/balanceapp/migrations/0001_initial.py
diff --git a/rememB/letterapp/migrations/0001_initial.py b/rememB/letterapp/migrations/0001_initial.py
diff --git a/rememB/mainapp/migrations/0002_user_delete_blog.py b/rememB/mainapp/migrations/0002_user_delete_blog.py
diff --git a/rememB/mainapp/models.py b/rememB/mainapp/models.py
@@ -1,4 +1,6 @@
 from django.db import models
+<<<<<<< HEAD
+=======
 
 class User(models.Model):
     uuid = models.CharField(max_length=100)
@@ -7,3 +9,4 @@ class User(models.Model):
     birthday = models.CharField(max_length=100)
     email = models.CharField(max_length=100)
 
+>>>>>>> develop
diff --git a/rememB/mainapp/urls.py b/rememB/mainapp/urls.py
@@ -2,5 +2,5 @@
 from . import views
 
 urlpatterns=[
-    path('login/',views.login, name='login'),
-]
+
+]
diff --git a/rememB/mainapp/views.py b/rememB/mainapp/views.py
@@ -1,4 +1 @@
 from django.shortcuts import render
-
-def login(request):
-    return render(request,'mainapp/login.html')
diff --git a/rememB/rememB/settings.py b/rememB/rememB/settings.py
@@ -40,6 +40,7 @@
     'mainapp',
     'letterapp',
     'balanceapp',
+    'userapp',
 
     #allauth
     'allauth',

diff --git a/rememB/rememB/urls.py b/rememB/rememB/urls.py
@@ -7,4 +7,5 @@
     path('letterapp/',include('letterapp.urls')),
     path('mainapp/',include('mainapp.urls')),
     path('accounts/',include('allauth.urls')),
+    path('user/',include('userapp.urls')),
 ]
diff --git a/rememB/letterapp/serializers.py → rememB/userapp/__init__.py b/rememB/letterapp/serializers.py → rememB/userapp/__init__.py
diff --git a/rememB/userapp/admin.py b/rememB/userapp/admin.py
@@ -0,0 +1,2 @@
+from django.contrib import admin
+
diff --git a/rememB/userapp/apps.py b/rememB/userapp/apps.py
@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class UserappConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'userapp'
diff --git a/rememB/userapp/migrations/__init__.py b/rememB/userapp/migrations/__init__.py
diff --git a/rememB/userapp/models.py b/rememB/userapp/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/rememB/mainapp/templates/mainapp/login.html → rememB/userapp/templates/userapp/login.html b/rememB/mainapp/templates/mainapp/login.html → rememB/userapp/templates/userapp/login.html
@@ -1,7 +1,7 @@
 {% load socialaccount %}
 {% providers_media_js %}
 
-<a href="/accounts/signup">회원가입</a>
+<!-- <a href="/accounts/signup">회원가입</a> -->
 <br>
 
 {% if user.is_authenticated %}
@@ -10,7 +10,8 @@
     {{ user.username }}님이 환영합니다!
 {% else %}
     <!-- {% csrf_token %} -->
-    <a href="{% provider_login_url 'google' %}">구글 로그인</a><br>
-    <a href="{% provider_login_url 'naver'  %}">네이버 로그인</a>
+    <a href="{% provider_login_url 'google' %}">구글 로그인</a>
+    <br>
+    <a href="{% provider_login_url 'naver' %}">네이버 로그인</a>
 
 {% endif %}
diff --git a/rememB/userapp/tests.py b/rememB/userapp/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/rememB/userapp/urls.py b/rememB/userapp/urls.py
@@ -0,0 +1,6 @@
+from django.urls import path
+from . import views
+
+urlpatterns=[
+    path('login/',views.login, name='login'),
+]
diff --git a/rememB/userapp/views.py b/rememB/userapp/views.py
@@ -0,0 +1,4 @@
+from django.shortcuts import render
+
+def login(request):
+    return render(request,'userapp/login.html')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.db import models

		# Create your models here.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		from django.test import TestCase

		# Create your tests here.