profile edited

arpit551 · Feb 13, 2019 · 47721bb · 47721bb
1 parent 27ad08c
commit 47721bb
Show file tree

Hide file tree

Showing 68 changed files with 125 additions and 149 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,5 @@
+readme
+*.pyc
+__pycache__/
+.idea/
+.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/forms/__pycache__/__init__.cpython-36.pyc b/forms/__pycache__/__init__.cpython-36.pyc
diff --git a/forms/__pycache__/admin.cpython-36.pyc b/forms/__pycache__/admin.cpython-36.pyc
diff --git a/forms/__pycache__/models.cpython-36.pyc b/forms/__pycache__/models.cpython-36.pyc
diff --git a/forms/__pycache__/task.cpython-36.pyc b/forms/__pycache__/task.cpython-36.pyc
diff --git a/forms/__pycache__/tokens.cpython-36.pyc b/forms/__pycache__/tokens.cpython-36.pyc
diff --git a/forms/__pycache__/urls.cpython-36.pyc b/forms/__pycache__/urls.cpython-36.pyc
diff --git a/forms/__pycache__/views.cpython-36.pyc b/forms/__pycache__/views.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0001_initial.cpython-36.pyc b/forms/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0002_auto_20181006_1701.cpython-36.pyc b/forms/migrations/__pycache__/0002_auto_20181006_1701.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0002_auto_20181026_0557.cpython-36.pyc b/forms/migrations/__pycache__/0002_auto_20181026_0557.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0002_auto_20181030_2058.cpython-36.pyc b/forms/migrations/__pycache__/0002_auto_20181030_2058.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0002_auto_20181112_1119.cpython-36.pyc b/forms/migrations/__pycache__/0002_auto_20181112_1119.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0002_delete_referencemail.cpython-36.pyc b/forms/migrations/__pycache__/0002_delete_referencemail.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0002_userprofile_applied_for_member.cpython-36.pyc b/forms/migrations/__pycache__/0002_userprofile_applied_for_member.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0003_auto_20181007_0626.cpython-36.pyc b/forms/migrations/__pycache__/0003_auto_20181007_0626.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0003_auto_20181105_0759.cpython-36.pyc b/forms/migrations/__pycache__/0003_auto_20181105_0759.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0003_remove_userprofile_is_member.cpython-36.pyc b/forms/migrations/__pycache__/0003_remove_userprofile_is_member.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0004_auto_20181012_0633.cpython-36.pyc b/forms/migrations/__pycache__/0004_auto_20181012_0633.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0004_auto_20181108_0459.cpython-36.pyc b/forms/migrations/__pycache__/0004_auto_20181108_0459.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0005_auto_20181108_2035.cpython-36.pyc b/forms/migrations/__pycache__/0005_auto_20181108_2035.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0005_userprofile.cpython-36.pyc b/forms/migrations/__pycache__/0005_userprofile.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0006_auto_20181012_0925.cpython-36.pyc b/forms/migrations/__pycache__/0006_auto_20181012_0925.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0006_auto_20181109_1351.cpython-36.pyc b/forms/migrations/__pycache__/0006_auto_20181109_1351.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0007_auto_20181109_1514.cpython-36.pyc b/forms/migrations/__pycache__/0007_auto_20181109_1514.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0007_booking_name.cpython-36.pyc b/forms/migrations/__pycache__/0007_booking_name.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0008_auto_20181022_1526.cpython-36.pyc b/forms/migrations/__pycache__/0008_auto_20181022_1526.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0008_auto_20181109_1552.cpython-36.pyc b/forms/migrations/__pycache__/0008_auto_20181109_1552.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0009_auto_20181022_1709.cpython-36.pyc b/forms/migrations/__pycache__/0009_auto_20181022_1709.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0010_auto_20181023_0814.cpython-36.pyc b/forms/migrations/__pycache__/0010_auto_20181023_0814.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0011_auto_20181023_1013.cpython-36.pyc b/forms/migrations/__pycache__/0011_auto_20181023_1013.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0012_auto_20181024_1854.cpython-36.pyc b/forms/migrations/__pycache__/0012_auto_20181024_1854.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0013_auto_20181025_0924.cpython-36.pyc b/forms/migrations/__pycache__/0013_auto_20181025_0924.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0014_auto_20181025_2039.cpython-36.pyc b/forms/migrations/__pycache__/0014_auto_20181025_2039.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0014_auto_20181025_2040.cpython-36.pyc b/forms/migrations/__pycache__/0014_auto_20181025_2040.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0014_auto_20181026_0533.cpython-36.pyc b/forms/migrations/__pycache__/0014_auto_20181026_0533.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0014_userprofile_custom_user.cpython-36.pyc b/forms/migrations/__pycache__/0014_userprofile_custom_user.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0015_auto_20181026_0539.cpython-36.pyc b/forms/migrations/__pycache__/0015_auto_20181026_0539.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/0015_formsubmit_arrive.cpython-36.pyc b/forms/migrations/__pycache__/0015_formsubmit_arrive.cpython-36.pyc
diff --git a/forms/migrations/__pycache__/__init__.cpython-36.pyc b/forms/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/home/__pycache__/__init__.cpython-36.pyc b/home/__pycache__/__init__.cpython-36.pyc
diff --git a/home/__pycache__/admin.cpython-36.pyc b/home/__pycache__/admin.cpython-36.pyc
diff --git a/home/__pycache__/models.cpython-36.pyc b/home/__pycache__/models.cpython-36.pyc
diff --git a/home/__pycache__/views.cpython-36.pyc b/home/__pycache__/views.cpython-36.pyc
diff --git a/home/__pycache__/views_home.cpython-36.pyc b/home/__pycache__/views_home.cpython-36.pyc
diff --git a/home/migrations/__pycache__/__init__.cpython-36.pyc b/home/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/members/__pycache__/__init__.cpython-36.pyc b/members/__pycache__/__init__.cpython-36.pyc
diff --git a/members/__pycache__/admin.cpython-36.pyc b/members/__pycache__/admin.cpython-36.pyc
diff --git a/members/__pycache__/models.cpython-36.pyc b/members/__pycache__/models.cpython-36.pyc
diff --git a/members/__pycache__/url.cpython-36.pyc b/members/__pycache__/url.cpython-36.pyc
diff --git a/members/__pycache__/view.cpython-36.pyc b/members/__pycache__/view.cpython-36.pyc
diff --git a/members/__pycache__/views.cpython-36.pyc b/members/__pycache__/views.cpython-36.pyc
diff --git a/members/migrations/__pycache__/0001_initial.cpython-36.pyc b/members/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/members/migrations/__pycache__/0002_auto_20190207_0955.cpython-36.pyc b/members/migrations/__pycache__/0002_auto_20190207_0955.cpython-36.pyc
diff --git a/members/migrations/__pycache__/0002_auto_20190211_1828.cpython-36.pyc b/members/migrations/__pycache__/0002_auto_20190211_1828.cpython-36.pyc
diff --git a/members/migrations/__pycache__/0002_auto_20190211_1845.cpython-36.pyc b/members/migrations/__pycache__/0002_auto_20190211_1845.cpython-36.pyc
diff --git a/members/migrations/__pycache__/__init__.cpython-36.pyc b/members/migrations/__pycache__/__init__.cpython-36.pyc
diff --git a/members/url.py b/members/url.py
@@ -8,6 +8,7 @@
      path('register/',view.register,name='register'),
      path('login/',view.loginuser,name='login'),
      path('profile/',view.profile,name='profile'),
+     path('bookings/',view.bookings,name='bookings'),
      path('logout/',view.logoutuser,name="logout"),
      path('roombooking/', view.roombook, name='roombook'),
      path('roombooking/formsubmit/', view.submit, name='submit'),

diff --git a/members/view.py b/members/view.py
@@ -16,6 +16,11 @@
 from forms.task import send_verification_email
 @login_required
 def profile(request):
+	user=request.user
+	formsubmits=(FormSubmit.objects.filter(userbookings=user))
+	return render(request, 'room/index.html',{'user':user,'formsubmits':formsubmits})
+@login_required
+def bookings(request):
 	user=request.user
 	formsubmits=(FormSubmit.objects.filter(userbookings=user))
 	return render(request, 'bookings.html',{'user':user,'formsubmits':formsubmits})

diff --git a/templates/bookings.html b/templates/bookings.html
@@ -40,7 +40,7 @@
   <section class="navigation">
   <div class="nav-container">
     <div class="brand">
-      <a href="#!">Hi {{user.username}}!</a>
+      <a href="#">Hi {{user.username}}!</a>
     </div>
     <nav>
       <div class="nav-mobile"><a id="nav-toggle" href="#!"><span></span></a></div>
@@ -49,14 +49,11 @@
           <a href="/">Home</a>
         </li>
         <li>
-          <a href="/membership/roombooking">Book a room</a>
+          <a href="/membership/roombooking">Book A New Room</a>
         </li>
         <li>
           <a href="/membership/logout">Logout</a>
         </li>
-        <li>
-          <a href="">bookings</a>
-        </li>
       </ul>
     </nav>
   </div>

diff --git a/templates/room/index.html b/templates/room/index.html
@@ -291,8 +291,14 @@ <h1 class="brand"><a href="https://www.iiitm.ac.in/">Home</a></h1>
 					<!-- navigation -->
 					<nav class="pull-right nav-collapse collapse">
 						<ul id="menu-main" class="nav">
+							{% if user.username != "" %}
+							<li><a href="#">Hi {{user.username}}!</a></li>
+							{% endif %}
 							<li><a title="team" href="#about">About</a></li>
 							<li><a title="rooms" href="#rooms">Rooms</a></li>
+							{% if user.username != "" %}
+							<li><a href="/membership/roombooking">Book A Room</a></li>
+							{% endif %}
 							<li><a title="services" href="#services">Services</a></li>
 
 							<!--<li><a title="Book Your Room" href="/bookroom/">BOOK YOUR ROOM</a></li>-->
@@ -307,7 +313,12 @@ <h1 class="brand"><a href="https://www.iiitm.ac.in/">Home</a></h1>
 						<!--	<li><a title="blog" href="#blog">Blog</a></li>	-->
 							<li><a title="contact" href="#contact">Contact</a></li>
 							<li><a title="Admin login" href="/admin/">Administrative Login </a></li>
-							<li><a title="Members" href="/membership/">Members </a></li>
+							{% if user.username != "" %}
+							<li><a title="Members" href="/membership/bookings">Bookings </a></li>
+							<li><a href="/membership/logout">Logout</a></li>
+							{% else %}
+							<li><a title="Members" href="/membership/">LogIn/SignUp </a></li>
+							{% endif %}
 						</ul>
 					</nav>
 				</div>

diff --git a/website/__pycache__/__init__.cpython-36.pyc b/website/__pycache__/__init__.cpython-36.pyc
diff --git a/website/__pycache__/celery.cpython-36.pyc b/website/__pycache__/celery.cpython-36.pyc
diff --git a/website/__pycache__/settings.cpython-36.pyc b/website/__pycache__/settings.cpython-36.pyc
diff --git a/website/__pycache__/urls.cpython-36.pyc b/website/__pycache__/urls.cpython-36.pyc
diff --git a/website/__pycache__/wsgi.cpython-36.pyc b/website/__pycache__/wsgi.cpython-36.pyc
diff --git a/website/settings.py b/website/settings.py
@@ -81,7 +81,7 @@
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'form8',
+        'NAME': 'Form',
         'USER': 'arpit',
         'PASSWORD': 'arpitarpit',
         'HOST': 'localhost',