From b5b1d05ab169b33e90b7baed7b63eb341559990c Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:12:28 +0530 Subject: [PATCH 01/16] update urls.py --- website/website/urls.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/website/website/urls.py b/website/website/urls.py index 0ee2723d..6e1b693c 100644 --- a/website/website/urls.py +++ b/website/website/urls.py @@ -14,8 +14,18 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin +<<<<<<< HEAD +from django.urls import path,include + +app_name='website' + +urlpatterns = [ + path('admin/', admin.site.urls, name="admin"), + path('members/',include('recursion_website.urls')) +======= from django.urls import path urlpatterns = [ path('admin/', admin.site.urls), +>>>>>>> cb981e560a3e23deb796a99c56479f9464e862b8 ] From d937b2101d3603f11398c29580f79f59be02bd9a Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:19:38 +0530 Subject: [PATCH 02/16] Update urls.py --- website/website/urls.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/website/website/urls.py b/website/website/urls.py index 6e1b693c..50f5cd1f 100644 --- a/website/website/urls.py +++ b/website/website/urls.py @@ -14,7 +14,6 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -<<<<<<< HEAD from django.urls import path,include app_name='website' @@ -22,10 +21,4 @@ urlpatterns = [ path('admin/', admin.site.urls, name="admin"), path('members/',include('recursion_website.urls')) -======= -from django.urls import path - -urlpatterns = [ - path('admin/', admin.site.urls), ->>>>>>> cb981e560a3e23deb796a99c56479f9464e862b8 ] From bd2efe7fa39369676bcfa8f6949c9518b3a04ec4 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:21:07 +0530 Subject: [PATCH 03/16] added crud operations for members --- website/recursion_website/views.py | 45 ++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) diff --git a/website/recursion_website/views.py b/website/recursion_website/views.py index 91ea44a2..1f34b8c4 100644 --- a/website/recursion_website/views.py +++ b/website/recursion_website/views.py @@ -1,3 +1,44 @@ -from django.shortcuts import render - +from django.http import HttpResponse +from django.shortcuts import get_object_or_404,render, redirect +from recursion_website.models import Members +from django.contrib.auth.models import User +from . import forms # Create your views here. +def member_list(request): + + members = Members.objects.all().order_by('id') + args={'form' : forms.CreateMember , 'members' : members} + return render(request, 'recursion_website/members/members_list.html' , args) +def member_create(request): + if request.method == "POST": + form=forms.CreateMember(request.POST) + if form.is_valid(): + #save member to database + new_member=form.save(commit=False) + new_member.save() + return redirect('recursion_website:list') + + else: + form=forms.CreateMember() + return render(request,'recursion_website/members/members_create.html',{'form':form}) + +def member_edit(request, id=None): + member=get_object_or_404(Members,id=id) + form = forms.CreateMember(request.POST or None, instance=member) + if request.method == 'POST': + if form.is_valid(): + form.save() + return redirect('recursion_website:list') + + else: + return render(request, 'recursion_website/members/members_edit.html',{'form':form}) + +def member_delete(request, id=None): + member=get_object_or_404(Members,id=id) + if request.method == 'GET': + member.delete() + return redirect('recursion_website:list') + + + + From 2ac1016d7717c03e69e7c64ff691e09cc67ca485 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:21:46 +0530 Subject: [PATCH 04/16] added crud operations for members --- website/recursion_website/forms.py | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 website/recursion_website/forms.py diff --git a/website/recursion_website/forms.py b/website/recursion_website/forms.py new file mode 100644 index 00000000..27b58fdb --- /dev/null +++ b/website/recursion_website/forms.py @@ -0,0 +1,8 @@ +from django import forms +from . import models + +class CreateMember(forms.ModelForm): + class Meta: + model = models.Members + fields=['name','year','position','branch','contact_details','experience'] + From 86f1ab29f98521fd918198f9053008d14b3438bb Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:22:34 +0530 Subject: [PATCH 05/16] added crud operations for members --- website/recursion_website/urls.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 website/recursion_website/urls.py diff --git a/website/recursion_website/urls.py b/website/recursion_website/urls.py new file mode 100644 index 00000000..f23b9ecc --- /dev/null +++ b/website/recursion_website/urls.py @@ -0,0 +1,12 @@ +from django.contrib import admin +from django.urls import path +from . import views + +app_name = 'recursion_website' + +urlpatterns = [ + path('list/', views.member_list, name="list"), + path('create/',views.member_create, name="create"), + path('/edit/',views.member_edit, name="edit"), + path('/delete/',views.member_delete, name="delete") +] \ No newline at end of file From cf40575709073857a9369a7b70577a79dcf50220 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:24:24 +0530 Subject: [PATCH 06/16] added crud operations for members --- website/recursion_website/models.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/website/recursion_website/models.py b/website/recursion_website/models.py index 1c83264a..6855092a 100644 --- a/website/recursion_website/models.py +++ b/website/recursion_website/models.py @@ -9,6 +9,20 @@ from django.contrib.auth.models import User # Done + +class Members(models.Model): + + name = models.CharField(max_length=100) + year = models.CharField(max_length=20) + position = models.CharField(max_length=100) + branch = models.CharField(max_length=100) + contact_details = models.CharField(max_length=200) + experience = models.CharField(max_length=500) + class Meta: + managed = True + db_table = 'members' + +#Done class Questions(models.Model): title = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) From 7e27c03c5fb43f87302a78198b33d5f3c89dd5c7 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:25:27 +0530 Subject: [PATCH 07/16] added crud operations for members --- website/recursion_website/templates/base.html | 72 +++++++++++++++++++ .../members/members_create.html | 13 ++++ .../members/members_edit.html | 13 ++++ .../members/members_list.html | 18 +++++ 4 files changed, 116 insertions(+) create mode 100644 website/recursion_website/templates/base.html create mode 100644 website/recursion_website/templates/recursion_website/members/members_create.html create mode 100644 website/recursion_website/templates/recursion_website/members/members_edit.html create mode 100644 website/recursion_website/templates/recursion_website/members/members_list.html diff --git a/website/recursion_website/templates/base.html b/website/recursion_website/templates/base.html new file mode 100644 index 00000000..c768d7a4 --- /dev/null +++ b/website/recursion_website/templates/base.html @@ -0,0 +1,72 @@ + + + + + RECursion-NITD Coding Community + + {% load staticfiles %} + + + + + + + +
+
+
+
+ + face + +
+
+
+
+

Coding, Teaching and Problem Setting

+
+
+
+ +
+
+
+ +
+ + +
+
+ +
+
+
+

+ {% block content %} + {% endblock %} +
+
+
+
+
+
+ diff --git a/website/recursion_website/templates/recursion_website/members/members_create.html b/website/recursion_website/templates/recursion_website/members/members_create.html new file mode 100644 index 00000000..68c55395 --- /dev/null +++ b/website/recursion_website/templates/recursion_website/members/members_create.html @@ -0,0 +1,13 @@ +{% extends 'base.html' %} + +{% block content %} +
+

Register a New Member

+
+ {% csrf_token %} + {{form.as_p}} + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/website/recursion_website/templates/recursion_website/members/members_edit.html b/website/recursion_website/templates/recursion_website/members/members_edit.html new file mode 100644 index 00000000..a0d55bf6 --- /dev/null +++ b/website/recursion_website/templates/recursion_website/members/members_edit.html @@ -0,0 +1,13 @@ +{% extends 'base.html' %} + +{% block content %} +
+

Edit Member

+
+ {% csrf_token %} + {{form.as_p}} + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/website/recursion_website/templates/recursion_website/members/members_list.html b/website/recursion_website/templates/recursion_website/members/members_list.html new file mode 100644 index 00000000..a085340a --- /dev/null +++ b/website/recursion_website/templates/recursion_website/members/members_list.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} + +{% block content %} +
+

Members:

+ {% for member in members %} +

Name : {{ member.name }}

+

Year : {{ member.year }}

+

Position : {{ member.position }}

+

Branch : {{ member.branch }}

+

Contact Details : {{ member.contact_details }}

+

Experience : {{ member.experience }}

+ Edit + Delete + {% endfor %} +
+ +{% endblock %} \ No newline at end of file From 8bd5ad9af2563256e9057eaf59e71b0a5f8f3f90 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Wed, 30 Jan 2019 22:55:56 +0530 Subject: [PATCH 08/16] Update base.html --- website/recursion_website/templates/base.html | 92 +++++-------------- 1 file changed, 25 insertions(+), 67 deletions(-) diff --git a/website/recursion_website/templates/base.html b/website/recursion_website/templates/base.html index c768d7a4..149327c5 100644 --- a/website/recursion_website/templates/base.html +++ b/website/recursion_website/templates/base.html @@ -1,72 +1,30 @@ - - RECursion-NITD Coding Community - - {% load staticfiles %} - - - - + + + + + + {% block css %} + {% endblock %} + + {% block js %} + + {% endblock js %} + + + + {% block title %} + {% endblock %} + + + - -
-
-
-
- - face - -
-
-
-
-

Coding, Teaching and Problem Setting

-
-
-
- -
-
-
- -
- - -
-
- -
-
-
-

- {% block content %} - {% endblock %} -
-
-
-
-
-
- +{% block content %} +{% endblock %} + + + From 16af610c978e63d655a0d2fd277a42472b171a32 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:12:28 +0530 Subject: [PATCH 09/16] update urls.py --- website/website/urls.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/website/website/urls.py b/website/website/urls.py index de576a92..9355ddf9 100644 --- a/website/website/urls.py +++ b/website/website/urls.py @@ -14,6 +14,7 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin +<<<<<<< 2b49a4090b8c013f65e6a6d1b8512575cdca468c from django.contrib.auth import views as auth_views from django.urls import path,include from recursion_website import views @@ -26,4 +27,20 @@ path('oauth/', include('social_django.urls', namespace='social')), path('forum/',include('recursion_website.urls')) +======= +<<<<<<< HEAD +from django.urls import path,include + +app_name='website' + +urlpatterns = [ + path('admin/', admin.site.urls, name="admin"), + path('members/',include('recursion_website.urls')) +======= +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +>>>>>>> cb981e560a3e23deb796a99c56479f9464e862b8 +>>>>>>> update urls.py ] From c90a0a493de9a5934e3e84b229242e71c929ed8b Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:19:38 +0530 Subject: [PATCH 10/16] Update urls.py --- website/website/urls.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/website/website/urls.py b/website/website/urls.py index 9355ddf9..8ceb9f0d 100644 --- a/website/website/urls.py +++ b/website/website/urls.py @@ -14,10 +14,10 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin -<<<<<<< 2b49a4090b8c013f65e6a6d1b8512575cdca468c from django.contrib.auth import views as auth_views from django.urls import path,include from recursion_website import views +from django.urls import path,include urlpatterns = [ path('admin/', admin.site.urls), @@ -27,20 +27,10 @@ path('oauth/', include('social_django.urls', namespace='social')), path('forum/',include('recursion_website.urls')) -======= -<<<<<<< HEAD -from django.urls import path,include app_name='website' urlpatterns = [ path('admin/', admin.site.urls, name="admin"), path('members/',include('recursion_website.urls')) -======= -from django.urls import path -urlpatterns = [ - path('admin/', admin.site.urls), ->>>>>>> cb981e560a3e23deb796a99c56479f9464e862b8 ->>>>>>> update urls.py -] From b0e0cd54f48298e35b7604931a09461aed0fd643 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:21:07 +0530 Subject: [PATCH 11/16] added crud operations for members --- website/recursion_website/views.py | 45 +++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/website/recursion_website/views.py b/website/recursion_website/views.py index 89b98120..81e02f3e 100644 --- a/website/recursion_website/views.py +++ b/website/recursion_website/views.py @@ -1,4 +1,5 @@ + from django.contrib.auth.decorators import login_required from django.shortcuts import render from django.shortcuts import render, redirect,get_object_or_404, get_list_or_404 @@ -15,7 +16,11 @@ from django.conf import settings from django.forms import modelformset_factory from itertools import chain - +from django.http import HttpResponse +from django.shortcuts import get_object_or_404,render, redirect +from recursion_website.models import Members +from django.contrib.auth.models import User +from . import forms @login_required def home(request): return render(request, 'home.html') @@ -250,4 +255,42 @@ def voting(request, id): upvote = Upvotes.objects.create(answer=answer, user=user) upvote.save() return HttpResponseRedirect(reverse('detail_questions', args=(question.id,))) +======= +# Create your views here. +def member_list(request): + + members = Members.objects.all().order_by('id') + args={'form' : forms.CreateMember , 'members' : members} + return render(request, 'recursion_website/members/members_list.html' , args) +def member_create(request): + if request.method == "POST": + form=forms.CreateMember(request.POST) + if form.is_valid(): + #save member to database + new_member=form.save(commit=False) + new_member.save() + return redirect('recursion_website:list') + + else: + form=forms.CreateMember() + return render(request,'recursion_website/members/members_create.html',{'form':form}) + +def member_edit(request, id=None): + member=get_object_or_404(Members,id=id) + form = forms.CreateMember(request.POST or None, instance=member) + if request.method == 'POST': + if form.is_valid(): + form.save() + return redirect('recursion_website:list') + + else: + return render(request, 'recursion_website/members/members_edit.html',{'form':form}) + +def member_delete(request, id=None): + member=get_object_or_404(Members,id=id) + if request.method == 'GET': + member.delete() + return redirect('recursion_website:list') + + From 443ac1cd90fb0fedcc28cf576b36cf8e07afab86 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:21:46 +0530 Subject: [PATCH 12/16] added crud operations for members --- website/recursion_website/forms.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/website/recursion_website/forms.py b/website/recursion_website/forms.py index 8c60c96d..6042ef75 100644 --- a/website/recursion_website/forms.py +++ b/website/recursion_website/forms.py @@ -1,7 +1,7 @@ from django import forms from .models import * from django.contrib.auth.models import User - +from . import models class Questionform(forms.ModelForm): title = models.CharField(max_length=100) @@ -38,4 +38,12 @@ class Commentform(forms.ModelForm): class Meta: model = Comments - fields = ('body',) \ No newline at end of file + fields = ('body',) + + +class CreateMember(forms.ModelForm): + class Meta: + model = models.Members + fields=['name','year','position','branch','contact_details','experience'] + + From 7ac692ebf3472c63ec4e4dae0a13f017541adf06 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:22:34 +0530 Subject: [PATCH 13/16] added crud operations for members --- website/recursion_website/urls.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/website/recursion_website/urls.py b/website/recursion_website/urls.py index 36d70b94..a6edd87a 100644 --- a/website/recursion_website/urls.py +++ b/website/recursion_website/urls.py @@ -1,7 +1,11 @@ +<<<<<<< 443ac1cd90fb0fedcc28cf576b36cf8e07afab86 from django.urls import path from .views import * from django.conf.urls import include,url from django.conf import settings +from django.contrib import admin +from django.urls import path +from . import views urlpatterns = [ path('add', add_question, name='add_question'), @@ -16,3 +20,12 @@ path('comment//', add_comment, name='add_comment'), path('editcomment//', update_comment, name='update_comment'), ] +app_name = 'recursion_website' + +urlpatterns = [ + path('list/', views.member_list, name="list"), + path('create/',views.member_create, name="create"), + path('/edit/',views.member_edit, name="edit"), + path('/delete/',views.member_delete, name="delete") +] + From ad45ad25eb9cc49be21db77e404bcc5d68e300ac Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:24:24 +0530 Subject: [PATCH 14/16] added crud operations for members --- website/recursion_website/models.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/website/recursion_website/models.py b/website/recursion_website/models.py index 7e91f633..7d46a7fc 100644 --- a/website/recursion_website/models.py +++ b/website/recursion_website/models.py @@ -9,6 +9,20 @@ from django.contrib.auth.models import User # Done + +class Members(models.Model): + + name = models.CharField(max_length=100) + year = models.CharField(max_length=20) + position = models.CharField(max_length=100) + branch = models.CharField(max_length=100) + contact_details = models.CharField(max_length=200) + experience = models.CharField(max_length=500) + class Meta: + managed = True + db_table = 'members' + +#Done class Questions(models.Model): title = models.CharField(max_length=100) description = models.TextField(blank=True, null=True) From 6d723b04e4a64f4a12c74218ad0d242e93578143 Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Thu, 13 Dec 2018 21:25:27 +0530 Subject: [PATCH 15/16] added crud operations for members --- website/recursion_website/templates/base.html | 3 +-- .../members/members_create.html | 13 +++++++++++++ .../members/members_edit.html | 13 +++++++++++++ .../members/members_list.html | 18 ++++++++++++++++++ 4 files changed, 45 insertions(+), 2 deletions(-) create mode 100644 website/recursion_website/templates/recursion_website/members/members_create.html create mode 100644 website/recursion_website/templates/recursion_website/members/members_edit.html create mode 100644 website/recursion_website/templates/recursion_website/members/members_list.html diff --git a/website/recursion_website/templates/base.html b/website/recursion_website/templates/base.html index 23c19343..747a28f7 100644 --- a/website/recursion_website/templates/base.html +++ b/website/recursion_website/templates/base.html @@ -26,5 +26,4 @@ {% block content %} {% endblock %} - - \ No newline at end of file + diff --git a/website/recursion_website/templates/recursion_website/members/members_create.html b/website/recursion_website/templates/recursion_website/members/members_create.html new file mode 100644 index 00000000..68c55395 --- /dev/null +++ b/website/recursion_website/templates/recursion_website/members/members_create.html @@ -0,0 +1,13 @@ +{% extends 'base.html' %} + +{% block content %} +
+

Register a New Member

+
+ {% csrf_token %} + {{form.as_p}} + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/website/recursion_website/templates/recursion_website/members/members_edit.html b/website/recursion_website/templates/recursion_website/members/members_edit.html new file mode 100644 index 00000000..a0d55bf6 --- /dev/null +++ b/website/recursion_website/templates/recursion_website/members/members_edit.html @@ -0,0 +1,13 @@ +{% extends 'base.html' %} + +{% block content %} +
+

Edit Member

+
+ {% csrf_token %} + {{form.as_p}} + +
+
+ +{% endblock %} \ No newline at end of file diff --git a/website/recursion_website/templates/recursion_website/members/members_list.html b/website/recursion_website/templates/recursion_website/members/members_list.html new file mode 100644 index 00000000..a085340a --- /dev/null +++ b/website/recursion_website/templates/recursion_website/members/members_list.html @@ -0,0 +1,18 @@ +{% extends 'base.html' %} + +{% block content %} +
+

Members:

+ {% for member in members %} +

Name : {{ member.name }}

+

Year : {{ member.year }}

+

Position : {{ member.position }}

+

Branch : {{ member.branch }}

+

Contact Details : {{ member.contact_details }}

+

Experience : {{ member.experience }}

+ Edit + Delete + {% endfor %} +
+ +{% endblock %} \ No newline at end of file From aadbd88a86bdc4e32c3c94c71cb3c960357f0adc Mon Sep 17 00:00:00 2001 From: Sparsh Kedia Date: Wed, 30 Jan 2019 22:55:56 +0530 Subject: [PATCH 16/16] Update base.html --- website/recursion_website/templates/base.html | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/website/recursion_website/templates/base.html b/website/recursion_website/templates/base.html index 747a28f7..f33485f2 100644 --- a/website/recursion_website/templates/base.html +++ b/website/recursion_website/templates/base.html @@ -20,10 +20,4 @@ {% endblock %} - - - -{% block content %} -{% endblock %} - - + \ No newline at end of file