header changes

jeyashwin · Dec 23, 2020 · 37b0c35 · 37b0c35
1 parent 2f0f422
commit 37b0c35
Show file tree

Hide file tree

Showing 36 changed files with 49 additions and 18 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/chat/.DS_Store b/chat/.DS_Store
diff --git a/checkout/.DS_Store b/checkout/.DS_Store
diff --git a/discussion/.DS_Store b/discussion/.DS_Store
diff --git a/notifications/.DS_Store b/notifications/.DS_Store
diff --git a/property/.DS_Store b/property/.DS_Store
diff --git a/property/__pycache__/__init__.cpython-36.pyc b/property/__pycache__/__init__.cpython-36.pyc
diff --git a/property/__pycache__/admin.cpython-36.pyc b/property/__pycache__/admin.cpython-36.pyc
diff --git a/property/__pycache__/forms.cpython-36.pyc b/property/__pycache__/forms.cpython-36.pyc
diff --git a/property/__pycache__/models.cpython-36.pyc b/property/__pycache__/models.cpython-36.pyc
diff --git a/property/__pycache__/urls.cpython-36.pyc b/property/__pycache__/urls.cpython-36.pyc
diff --git a/property/__pycache__/utils.cpython-36.pyc b/property/__pycache__/utils.cpython-36.pyc
diff --git a/property/__pycache__/views.cpython-36.pyc b/property/__pycache__/views.cpython-36.pyc
diff --git a/property/templates/.DS_Store b/property/templates/.DS_Store
diff --git a/property/templates/property/.DS_Store b/property/templates/property/.DS_Store
diff --git a/property/templates/property/manage-properties.html b/property/templates/property/manage-properties.html
@@ -20,7 +20,12 @@
 					<br><br>
 					<h2 style="margin-bottom: 30px">
 						Manage Properties - Total {{object_list.count}}
+						{% if object_list.all %}
+
+						test
+							{% else %}
 						<a href="{% url 'property:propertyCreate' %}" class="btn pull-right" style="background-color: #044C7E; border-radius:50px; color:#fff;"><i class="fa fa-plus"></i> Add new Property</a>
+						{% endif %}
 					</h2>
 					<hr>
 					{% if messages %}
@@ -109,10 +114,26 @@ <h2 style="margin-bottom: 30px">
 							</div>
 							{% endfor %}
 						{% else %}
+						{% comment %}
+						<h1 style="margin-left: 45%; ">
+							<br>
+							<br>
+							<br>
+							<br>
+							<a href="{% url 'property:propertyCreate' %}" class="btn pull-right" 
+							style="background-color: #044C7E; border-radius:50px; color:#fff;"><i 
+							class="fa fa-plus"></i> Add new Property</a>
+
+						</h1>
+						{% endcomment %}
 							<center>
-								<div class="container-fluid" style="min-height:350px; min-width:100%;">
-										<div class="alert alert-warning" style="width:100%; border-radius:10px;">
-											<h5 style="color:maroon;"><i> No property added yet! </i></h5>
+								<div class="container-fluid" style="min-height:550px; min-width:100%;">
+										<div  style="width:100%; border-radius:10px;">
+											<br>
+											<br>
+											<br>
+											<br>
+											<br>
 										</div>
 								</div>
 							</center>

diff --git a/requirements.txt b/requirements.txt
@@ -37,10 +37,7 @@ Markdown==3.3.1
 mccabe==0.6.1
 msgpack==0.6.2
 msgpack-python==0.5.6
-numpy==1.19.2
-pandas==1.1.2
 phonenumbers==8.12.10
-Pillow==7.2.0
 psycopg2==2.8.6
 pyasn1==0.4.8
 pyasn1-modules==0.2.8

diff --git a/resources/.DS_Store b/resources/.DS_Store
diff --git a/services/.DS_Store b/services/.DS_Store
diff --git a/students/.DS_Store b/students/.DS_Store
diff --git a/students/__pycache__/__init__.cpython-36.pyc b/students/__pycache__/__init__.cpython-36.pyc
diff --git a/students/__pycache__/admin.cpython-36.pyc b/students/__pycache__/admin.cpython-36.pyc
diff --git a/students/__pycache__/models.cpython-36.pyc b/students/__pycache__/models.cpython-36.pyc
diff --git a/students/__pycache__/urls.cpython-36.pyc b/students/__pycache__/urls.cpython-36.pyc
diff --git a/students/__pycache__/views.cpython-36.pyc b/students/__pycache__/views.cpython-36.pyc
diff --git a/templates/layout/header.html b/templates/layout/header.html
@@ -141,9 +141,7 @@
                         <ul class="pxp-nav list-inline">
 							{% if user.is_authenticated%}
                                 {% if user.usertype.is_student %}
-                                    <li class="list-inline-item" style="padding:0px 5px; color:orange;">
-                                        <a href="/">Home</a>
-                                    </li>
+
                                     <li class="list-inline-item" style="padding:0px 5px;">
                                         <a href="{% url 'property:propertyList' %}">Properties</a>
                                     </li>
@@ -182,7 +180,7 @@
 									<a href="#" class="pxp-signin-trigger">Services</a>
 								</li>
 							{% endif %}
-                            {% comment %} <li class="list-inline-item" style="padding:0px 20px;">
+                            {% comment %} <li class="list-inline-item" style="padding:50px 50px;">
                                 <a href="blog.html">Blog </a>                                
                             </li>  {% endcomment %}
 							<li class="list-inline-item" style="padding:0px 12px;">
@@ -191,6 +189,18 @@
                             <li class="list-inline-item pxp-is-last">
                                 <a href="{% url 'user:contactUs' %}{% if request.GET.invite_code %}?invite_code={{request.GET.invite_code}}{% endif %}">Contact Us</a>
                             </li>
+                            {% if user.is_authenticated%}
+                                {% if user.usertype.is_landlord %} 
+
+                             	{% elif user.usertype.is_student %}
+
+                            	{% endif %}
+      						{% else %}
+      							<li class="list-inline-item pxp-is-last" style="border-radius: 12px;padding:0px 25px; right:-270px; ">
+                            	<a href="javascript:void(0);" style ="border: 2px solid #ffff; border-radius: 50px; padding:7px;   "class="pxp-header-user pxp-signup-trigger"id="user-action-btn" 
+                            	onclick="triggerlandlordsignup()">List Your Property</a>
+                            	</li>
+                            {% endif %}
                             <li class="list-inline-item pxp-has-btns">
                                 <div class="pxp-user-btns">
                                     <a href="#" class="pxp-user-btns-signup pxp-signup-trigger">Sign Up</a>
@@ -1452,6 +1462,9 @@ <h4><b>Living Habits</b></h4>
 						});
 					});
 				});
+				function triggerlandlordsignup() {
+					$("#regusertype2label").click(); 
+				}
 			</script>
 
 

diff --git a/users/.DS_Store b/users/.DS_Store
diff --git a/users/__pycache__/__init__.cpython-36.pyc b/users/__pycache__/__init__.cpython-36.pyc
diff --git a/users/__pycache__/admin.cpython-36.pyc b/users/__pycache__/admin.cpython-36.pyc
diff --git a/users/__pycache__/forms.cpython-36.pyc b/users/__pycache__/forms.cpython-36.pyc
diff --git a/users/__pycache__/models.cpython-36.pyc b/users/__pycache__/models.cpython-36.pyc
diff --git a/users/__pycache__/urls.cpython-36.pyc b/users/__pycache__/urls.cpython-36.pyc
diff --git a/users/__pycache__/views.cpython-36.pyc b/users/__pycache__/views.cpython-36.pyc
diff --git a/users/migrations/0001_initial.py b/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.2 on 2020-12-15 15:34
+# Generated by Django 3.1.2 on 2020-12-22 07:39
 
 from django.conf import settings
 import django.core.validators
@@ -54,8 +54,7 @@ class Migration(migrations.Migration):
                 ('phone', phonenumber_field.modelfields.PhoneNumberField(max_length=128, region='US')),
                 ('university', models.CharField(max_length=50)),
                 ('classYear', models.IntegerField(validators=[django.core.validators.MinValueValidator(2010, 'Minimum year 2010'), django.core.validators.MaxValueValidator(2030, 'Maximum year 2030')])),
-                ('bio', models.CharField(max_length=200)),
-                ('profilePicture', models.ImageField(upload_to=users.models.profile_image_file_path)),
+                ('profilePicture', models.ImageField(default='uploads/avatar/profile_avatar.png', upload_to=users.models.profile_image_file_path)),
                 ('fbLink', models.URLField(blank=True, max_length=250, null=True)),
                 ('snapLink', models.URLField(blank=True, max_length=250, null=True)),
                 ('instaLink', models.URLField(blank=True, max_length=250, null=True)),
@@ -64,12 +63,13 @@ class Migration(migrations.Migration):
                 ('sleepScheduleTo', models.TimeField(blank=True, null=True)),
                 ('studyHourFrom', models.TimeField(blank=True, null=True)),
                 ('studyHourTo', models.TimeField(blank=True, null=True)),
-                ('tobaccoUsage', models.CharField(choices=[('never', 'Never'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('occasionally', 'Occasionally')], default='never', max_length=100)),
-                ('alcoholUsage', models.CharField(choices=[('never', 'Never'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('occasionally', 'Occasionally')], default='never', max_length=100)),
-                ('cleanliness', models.CharField(choices=[('daily', 'Daily'), ('occasionally', 'Occasionally')], default='daily', max_length=100)),
-                ('guests', models.CharField(choices=[('daily', 'Daily'), ('occasionally', 'Occasionally')], default='daily', max_length=100)),
+                ('tobaccoUsage', models.CharField(blank=True, choices=[('never', 'Never'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('occasionally', 'Occasionally')], max_length=100)),
+                ('alcoholUsage', models.CharField(blank=True, choices=[('never', 'Never'), ('daily', 'Daily'), ('weekly', 'Weekly'), ('occasionally', 'Occasionally')], max_length=100)),
+                ('cleanliness', models.CharField(blank=True, choices=[('daily', 'Daily'), ('occasionally', 'Occasionally')], max_length=100)),
+                ('guests', models.CharField(blank=True, choices=[('daily', 'Daily'), ('occasionally', 'Occasionally')], max_length=100)),
                 ('emailVerified', models.BooleanField(default=False)),
                 ('phoneVerified', models.BooleanField(default=False)),
+                ('livingHabitsLater', models.BooleanField(default=False)),
                 ('createdDate', models.DateTimeField(auto_now_add=True)),
                 ('interests', models.ManyToManyField(to='users.Interest')),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='users.usertype')),
@@ -82,7 +82,7 @@ class Migration(migrations.Migration):
                 ('phone', phonenumber_field.modelfields.PhoneNumberField(max_length=128, region='US')),
                 ('emailVerified', models.BooleanField(default=False)),
                 ('phoneVerified', models.BooleanField(default=False)),
-                ('profilePicture', models.ImageField(upload_to=users.models.profile_image_file_path)),
+                ('profilePicture', models.ImageField(default='uploads/avatar/profile_avatar.png', upload_to=users.models.profile_image_file_path)),
                 ('createdDate', models.DateTimeField(auto_now_add=True)),
                 ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='users.usertype')),
             ],

diff --git a/users/migrations/__pycache__/0001_initial.cpython-36.pyc b/users/migrations/__pycache__/0001_initial.cpython-36.pyc
diff --git a/users/migrations/__pycache__/__init__.cpython-36.pyc b/users/migrations/__pycache__/__init__.cpython-36.pyc