New set of changes (#81)

upstream package for azure blobs (django storage) has not been upgraded yet, if ever. so fix it for the moment here. upgrade django wohn to the latest release of azure keyvault fix finally google analytics move to nginx (https no working) start moving html from back-to-front end include fontawesome FIX for text-align: center; + fonts + other css problems make it buildable again
dmpe · Nov 24, 2019 · c5c17bc · c5c17bc
1 parent 5107d44
commit c5c17bc
Show file tree

Hide file tree

Showing 74 changed files with 6,429 additions and 2,465 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,13 +2,11 @@
 #
 # Check https://circleci.com/docs/2.0/language-javascript/ for more details
 # https://circleci.com/gh/dmpe/django-wohn
-version: 2
+version: 2.1
 jobs:
   build:
     machine:
       image: ubuntu-1604:201903-01
-      # setup_remote_docker:
-      #     version: 18.09.3
     working_directory: ~/repo
     steps:
       - checkout
@@ -31,3 +29,10 @@ workflows:
     jobs:
     - build:
         context: DockerHub
+        filters:
+          branches:
+            ignore:
+              - docs
+              - server-config
+              - gh-pages
+              - azure-functions
diff --git a/.gitignore b/.gitignore
@@ -33,6 +33,7 @@ node_modules/
 # local env files
 .env.local
 .env.*.local
+schemav1.json
 
 # Log files
 npm-debug.log*

diff --git a/README.md b/README.md
@@ -1,5 +1,6 @@
 [![image](https://img.shields.io/github/license/dmpe/django-wohn)](https://github.com/dmpe/django-wohn/LICENSE)
 [![Build Status](https://johnmalc.visualstudio.com/DJango-Wohn/_apis/build/status/dmpe.django-wohn?branchName=master)](https://johnmalc.visualstudio.com/DJango-Wohn/_build/latest?definitionId=7&branchName=master)
+[![CircleCI](https://circleci.com/gh/dmpe/django-wohn/tree/master.svg?style=svg)](https://circleci.com/gh/dmpe/django-wohn/tree/master)
 ![GitHub language count](https://img.shields.io/github/languages/count/dmpe/django-wohn)
 [![Requirements Status](https://requires.io/github/dmpe/django-wohn/requirements.svg?branch=master)](https://requires.io/github/dmpe/django-wohn/requirements/?branch=master)
 ![GitHub repo size](https://img.shields.io/github/repo-size/dmpe/django-wohn)

diff --git a/backend/core/forms.py b/backend/core/forms.py
@@ -22,7 +22,7 @@ class RegisterForm(forms.Form):
 
 class LoginForm(forms.Form):
     """
-	Users can login either via username or email. 
+	Users can login either via username or email.
 	Hence, input type="text"
 	"""
 

diff --git a/backend/core/migrations/0001_initial.py b/backend/core/migrations/0001_initial.py
diff --git a/backend/core/migrations/0002_auto_20191102_2035_squashed_0003_auto_20191102_2157.py b/backend/core/migrations/0002_auto_20191102_2035_squashed_0003_auto_20191102_2157.py
@@ -0,0 +1,131 @@
+# Generated by Django 2.2.6 on 2019-11-02 21:15
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('core', '0002_auto_20191102_2035'), ('core', '0003_auto_20191102_2157')]
+
+    dependencies = [
+        ('core', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='apartment',
+            name='apartment_floor',
+            field=models.PositiveSmallIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_address_city_town',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_address_street',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_address_zipcode',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100000)]),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_furnished',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_garage',
+            field=models.PositiveSmallIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_address_city_town',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_address_street',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_address_zipcode',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100000)]),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_furnished',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_garage',
+            field=models.PositiveSmallIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='apartment_floor',
+            field=models.PositiveSmallIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_address_city_town',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_address_street',
+            field=models.TextField(null=True),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_address_zipcode',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100000)]),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_furnished',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_garage',
+            field=models.PositiveSmallIntegerField(default=0),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_status',
+            field=models.CharField(choices=[('N', 'New'), ('G', 'Good'), ('UC', 'Under Construction')], default='G', max_length=2, null=True),
+        ),
+        migrations.AddField(
+            model_name='apartment',
+            name='property_wash_machine',
+            field=models.CharField(choices=[('O', 'Owned'), ('S', 'Shared in house'), ('NP', 'Not present')], default='NP', max_length=2),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_status',
+            field=models.CharField(choices=[('N', 'New'), ('G', 'Good'), ('UC', 'Under Construction')], default='G', max_length=2, null=True),
+        ),
+        migrations.AddField(
+            model_name='house',
+            name='property_wash_machine',
+            field=models.CharField(choices=[('O', 'Owned'), ('S', 'Shared in house'), ('NP', 'Not present')], default='NP', max_length=2),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_status',
+            field=models.CharField(choices=[('N', 'New'), ('G', 'Good'), ('UC', 'Under Construction')], default='G', max_length=2, null=True),
+        ),
+        migrations.AddField(
+            model_name='room',
+            name='property_wash_machine',
+            field=models.CharField(choices=[('O', 'Owned'), ('S', 'Shared in house'), ('NP', 'Not present')], default='NP', max_length=2),
+        ),
+    ]
diff --git a/backend/core/migrations/0004_auto_20191102_2200_squashed_0005_auto_20191102_2208.py b/backend/core/migrations/0004_auto_20191102_2200_squashed_0005_auto_20191102_2208.py
@@ -0,0 +1,76 @@
+# Generated by Django 2.2.6 on 2019-11-02 21:17
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('core', '0004_auto_20191102_2200'), ('core', '0005_auto_20191102_2208')]
+
+    dependencies = [
+        ('core', '0003_auto_20191102_2157'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='room',
+            old_name='apartment_floor',
+            new_name='room_floor',
+        ),
+        migrations.AlterField(
+            model_name='apartment',
+            name='property_address_zipcode',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(9999), django.core.validators.MaxValueValidator(100000)]),
+        ),
+        migrations.AlterField(
+            model_name='house',
+            name='property_address_zipcode',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(9999), django.core.validators.MaxValueValidator(100000)]),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='property_address_zipcode',
+            field=models.IntegerField(default=0, validators=[django.core.validators.MinValueValidator(9999), django.core.validators.MaxValueValidator(100000)]),
+        ),
+        migrations.AlterField(
+            model_name='apartment',
+            name='apartment_floor',
+            field=models.PositiveSmallIntegerField(default=1),
+        ),
+        migrations.AlterField(
+            model_name='apartment',
+            name='property_status',
+            field=models.CharField(choices=[('N', 'New'), ('G', 'Good'), ('UC', 'Under Construction')], default='G', max_length=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='apartment',
+            name='property_wash_machine',
+            field=models.CharField(choices=[('O', 'Owned'), ('S', 'Shared in house'), ('NP', 'Not present')], default='NP', max_length=3),
+        ),
+        migrations.AlterField(
+            model_name='house',
+            name='property_status',
+            field=models.CharField(choices=[('N', 'New'), ('G', 'Good'), ('UC', 'Under Construction')], default='G', max_length=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='house',
+            name='property_wash_machine',
+            field=models.CharField(choices=[('O', 'Owned'), ('S', 'Shared in house'), ('NP', 'Not present')], default='NP', max_length=3),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='property_status',
+            field=models.CharField(choices=[('N', 'New'), ('G', 'Good'), ('UC', 'Under Construction')], default='G', max_length=3, null=True),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='property_wash_machine',
+            field=models.CharField(choices=[('O', 'Owned'), ('S', 'Shared in house'), ('NP', 'Not present')], default='NP', max_length=3),
+        ),
+        migrations.AlterField(
+            model_name='room',
+            name='room_floor',
+            field=models.PositiveSmallIntegerField(default=1),
+        ),
+    ]
diff --git a/backend/core/models.py b/backend/core/models.py
@@ -1,14 +1,13 @@
 import hashlib
-
 # for gravatar URLs and user's profile image and its unique name
 import urllib
 
 import django
-
 # for time related tasks, incl. timezone
 import pytz
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser, UserManager
+from django.core.validators import MaxValueValidator, MinValueValidator
 from django.db import models
 from django.utils.safestring import *
 from django_countries.fields import CountryField
@@ -52,6 +51,25 @@ class AbstractProperty(django.db.models.Model):
         max_digits=7, decimal_places=2, null=True, blank=True
     )
 
+    property_garage = models.PositiveSmallIntegerField(default=0)
+
+    PROPERTY_STATUS = (("N", "New"), ("G", "Good"), ("UC", "Under Construction"))
+    property_status = models.CharField(
+        max_length=3, choices=PROPERTY_STATUS, null=True, default="G"
+    )
+
+    property_furnished = models.BooleanField(default=False)
+
+    WASHING_MACHINE = (("O", "Owned"), ("S", "Shared in house"), ("NP", "Not present"))
+    property_wash_machine = models.CharField(
+        max_length=3, choices=WASHING_MACHINE, null=False, default="NP"
+    )
+    property_address_street = models.TextField(null=True)
+    property_address_city_town = models.TextField(null=True)
+    property_address_zipcode = models.IntegerField(
+        default=0, validators=[MinValueValidator(9999), MaxValueValidator(100000)]
+    )
+
     class Meta:
         verbose_name_plural = "properties"
         abstract = True
@@ -85,6 +103,8 @@ class Apartment(AbstractProperty):
 
     """
 
+    apartment_floor = models.PositiveSmallIntegerField(default=1)
+
     class Meta:
         verbose_name_plural = "Apartments"
 
@@ -95,6 +115,8 @@ class Room(AbstractProperty):
 
     """
 
+    room_floor = models.PositiveSmallIntegerField(default=1)
+
     class Meta:
         verbose_name_plural = "Rooms"
 

diff --git a/backend/core/pages/footer/about.html b/backend/core/pages/footer/about.html