updated profile

Author: rohitsh16

.env.example

@@ -1,5 +1,4 @@
 SECRET_KEY=abcd
-CLIENT_ID=Googleclient_id
 DEBUG=True
 ALLOWED_HOSTS=localhost
 Client_id=jdoodle_id

codeara/__pycache__/settings.cpython-37.pyc

@@ -1,4 +1,4 @@
-# Generated by Django 3.0.1 on 2019-12-26 03:26
+# Generated by Django 3.0.1 on 2019-12-27 04:03
 
 from django.db import migrations, models
 

compiler/migrations/0001_initial.py

@@ -39,7 +39,7 @@
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ user.username}} <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                    <li><a href="{% url 'user:profile' %}">Profile</a></li>
+                    <li><a href="{% url 'user:user_detail' %}">Profile</a></li>
                       <li><a href="{% url 'account_logout' %}">Logout</a></li>  
                     </ul>
                 </li>

compiler/migrations/__pycache__/0001_initial.cpython-37.pyc

@@ -1,4 +1,6 @@
 from django.contrib import admin
-from .models import User
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 
-admin.site.register(User)
+from .models import User_profile
+
+admin.site.register(User_profile)

compiler/templates/base.html

@@ -0,0 +1,32 @@
+# Generated by Django 3.0.1 on 2019-12-27 04:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='user',
+            name='person',
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='name',
+            field=models.CharField(blank=True, max_length=250),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='ques',
+            field=models.IntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='source_code',
+            field=models.CharField(blank=True, max_length=4500),
+        ),
+    ]

db.sqlite3

@@ -1,19 +1,15 @@
-# Generated by Django 2.1.7 on 2019-12-25 05:01
+# Generated by Django 3.0.1 on 2019-12-27 05:57
 
 from django.db import migrations
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('user', '0001_initial'),
+        ('user', '0002_auto_20191227_0933'),
     ]
 
     operations = [
-        migrations.RemoveField(
-            model_name='user',
-            name='person',
-        ),
         migrations.DeleteModel(
             name='user',
         ),

user/__pycache__/admin.cpython-37.pyc

@@ -1,9 +1,13 @@
 from django.db import models
-from django.contrib.auth.models import User
-
-class User(models.Model):
-    name = models.CharField(max_length=250)
-    ques = models.IntegerField(default=0)
-    points = models.IntegerField(default=0)
-    source_code = models.CharField(max_length=4500)
-    
+from django.utils import timezone
+from django.contrib.auth.models import AbstractUser
+
+class User_profile(models.Model):
+  name = models.CharField(max_length=200, blank=True)
+  #user = models.OneToOneField(User)
+  #image = models.ImageField(upload_to=get_image_path, blank=True,null=True)
+
+
+
+  def __str__(self):
+    return self.name

user/__pycache__/models.cpython-37.pyc

@@ -1,5 +1,5 @@
 {% extends "account/base.html" %}
-{% load crispy_forms_tags %}
+<br><br>
 {% load i18n %}
 {% load account socialaccount %}
 {% block head_title %}{% trans "Sign In" %}{% endblock %}
@@ -8,29 +8,20 @@
     <h1>{% trans "Sign In" %}</h1>
     <form class="login" method="POST" action="{% url 'account_login' %}">
         {% csrf_token %}
-        {{ form|crispy }}
-        {% if redirect_field_value %}
-            <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
-        {% endif %}
-        <div class="login-signup-button-container">
-            <button class="btn btn-success login-signup-button primaryAction" type="submit">
-                {% trans "Sign In" %}
-            </button>
-        </div>
         <div class="links">
-            <div class="signup-link">
-                Don't have an account ? <a href="{{ signup_url }}">Sign up</a>
-            </div>
             {% get_providers as socialaccount_providers %}
             {% if socialaccount_providers %}
                 <div class="social-login-bar">
-                    <div class="social-login-text">or use</div>
+                    <div class="social-login-text"></div>
                     <a href="/accounts/google/login/?process=login">
                         <i class="fa fa-3x fa-google"></i>
                     </a>
                     <a href="/accounts/github/login/?process=login">
                         <i class="fa fa-3x fa-github"></i>
                     </a>
+                    <a href="/accounts/facebook/login/?process=login">
+                        <i class="fa fa-3x fa-facebook"></i>
+                    </a>
                 </div>
             {% endif %}
         </div>

user/__pycache__/urls.cpython-37.pyc

@@ -1,44 +1,11 @@
 {% extends 'base.html' %}
-{% block title %}
-    Profile
-{% endblock %}
-{% block content %}
-    <style type="text/css">
-    .personal{
-        display: none;
-    }
-    </style>
-<div class='col-md-9'>
-    {% if personal %}
-     <h1>Hello {{ name }}</h1>
-    {% else %} 
-    <h1>You are viewing {{name}}'s profile</h1>
-    {% endif %}
-    
-    <div class="panel panel-default">
-    <div class="panel-body">
-    <p>Total points:- {{ points }}</p>
-    {% if solved %}
-    <p>Solved questions:-</p>
-    <ul class="list-group">
-    {% for question in solved %}
-        <li class="list-group-item">{{ question }}</li>
-    {% endfor %}
-    </ul>
-    {% else   %}
-        <h4>No questions solved</h4>
-        <a href="{% url 'alltracks' %}" class="personal">Solve questions</a>
-
-
-    {% endif %}
-    </div>
 
-    </div>
-</div>
-
-    {% if personal %}
-    <script type="text/javascript">
-    $(".personal").show()
-    </script>
-{% endif %}
-{% endblock %}
+{% block body %}
+{% block content %}
+{% load account socialaccount %}
+<div class="container login-signup-container" id="login_cont">
+    <p>You're logged in {{ user.get_provider }} as {{ user }}.</p>
+    <img src="{{ user.get_avatar_url }}" />
+ </div>
+{% endblock content %}
+{% endblock body %}

user/__pycache__/views.cpython-37.pyc

@@ -8,5 +8,6 @@
 urlpatterns = [
     path('', views.home, name = 'home'),
     path('accounts/profile/', views.profile , name = 'profile'),
-    #path('accounts/profiles/(?P<id>\d+)', views.profiles , name = 'user_profile'),
+    #path('accounts/profile/view/', views.user_detail, name = 'user_detail'),
+    path('accounts/profile/view', views.user_detail, name='user_detail'),
 ]

user/admin.py

@@ -6,6 +6,7 @@
 from django.http import HttpResponse, JsonResponse
 import os
 from compiler.models import Question
+#from user.models import User
 from decouple import config
 
 def home(request):
@@ -14,22 +15,14 @@ def home(request):
     question = {"q_num":ques}
     return render(request,"home.html", question)
 
-def signup(request):
-    if request.method == 'POST':
-        form = UserCreationForm(request.POST)
-        if form.is_valid():
-            form.save()
-            username = form.cleaned_data.get('username')
-            raw_password = form.cleaned_data.get('password1')
-            user = authenticate(username=username, password=raw_password)
-            login(request, user)
-            return redirect('code_editor.html')
-    else:
-        form = UserCreationForm()
-    return render(request, 'registration/signup.html', {'form': form})
+def profile(request):
+    #cur_user = request.User
+    #usr = User.objects.get(id=cur_user.id)
+    #usr = {"user":usr}
+    return render(request,'code_editor.html')
+
+def user_detail(request):
+    #cur_user = request.user.get.id
+    return render(request,'profile.html')
+
 
-def profile(requests):
-    context = {}
-    user = requests.user
-    context['name']=user.username
-    return render(requests,'code_editor.html')