From 12f6f5a5c974236691ab18a8b702305bfd2d919d Mon Sep 17 00:00:00 2001
From: enesebastian <51080680+enesebastian@users.noreply.github.com>
Date: Tue, 1 Jun 2021 18:30:18 +0300
Subject: [PATCH 1/9] Add or update the App Service deployment workflow
 configuration from Azure Portal.

---
 .github/workflows/master_ftpapps.yml | 62 ++++++++++++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 .github/workflows/master_ftpapps.yml

diff --git a/.github/workflows/master_ftpapps.yml b/.github/workflows/master_ftpapps.yml
new file mode 100644
index 00000000..cfd25c25
--- /dev/null
+++ b/.github/workflows/master_ftpapps.yml
@@ -0,0 +1,62 @@
+# Docs for the Azure Web Apps Deploy action: https://github.com/Azure/webapps-deploy
+# More GitHub Actions for Azure: https://github.com/Azure/actions
+# More info on Python, GitHub Actions, and Azure App Service: https://aka.ms/python-webapps-actions
+
+name: Build and deploy Python app to Azure Web App - ftpapps
+
+on:
+  push:
+    branches:
+      - master
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python version
+      uses: actions/setup-python@v1
+      with:
+        python-version: '3.8'
+
+    - name: Create and start virtual environment
+      run: |
+        python -m venv venv
+        source venv/bin/activate
+
+    - name: Install dependencies
+      run: pip install -r requirements.txt
+
+    # Optional: Add step to run tests here (PyTest, Django test suites, etc.)
+
+    - name: Upload artifact for deployment jobs
+      uses: actions/upload-artifact@v2
+      with:
+        name: python-app
+        path: |
+          .
+          !venv/
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    environment:
+      name: 'production'
+      url: ${{ steps.deploy-to-webapp.outputs.webapp-url }}
+
+    steps:
+      - name: Download artifact from build job
+        uses: actions/download-artifact@v2
+        with:
+          name: python-app
+          path: .
+
+      - name: 'Deploy to Azure Web App'
+        uses: azure/webapps-deploy@v2
+        with:
+          app-name: 'ftpapps'
+          slot-name: 'production'
+          publish-profile: ${{ secrets.AzureAppService_PublishProfile_c2f557e82a9545e298a8ff89de12e554 }}
\ No newline at end of file

From 8b5e407e58c32ecd5ddc610ad8d2cf96c47ae46c Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 19:22:13 +0300
Subject: [PATCH 2/9] 1

---
 .idea/.gitignore                               |  3 +++
 .idea/djangoapp.iml                            | 14 ++++++++++++++
 .idea/inspectionProfiles/profiles_settings.xml |  6 ++++++
 .idea/misc.xml                                 |  7 +++++++
 .idea/modules.xml                              |  8 ++++++++
 .idea/vcs.xml                                  |  6 ++++++
 polls/templates/polls/index.html               |  2 +-
 7 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/djangoapp.iml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 00000000..26d33521
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/djangoapp.iml b/.idea/djangoapp.iml
new file mode 100644
index 00000000..8e5446ac
--- /dev/null
+++ b/.idea/djangoapp.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/venv" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 00000000..105ce2da
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 00000000..2641f7b4
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9 (djangoapp)" project-jdk-type="Python SDK" />
+  <component name="PyCharmProfessionalAdvertiser">
+    <option name="shown" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 00000000..9b9c4123
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/djangoapp.iml" filepath="$PROJECT_DIR$/.idea/djangoapp.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 00000000..94a25f7f
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/polls/templates/polls/index.html b/polls/templates/polls/index.html
index 18260b0d..a8fb9245 100644
--- a/polls/templates/polls/index.html
+++ b/polls/templates/polls/index.html
@@ -2,7 +2,7 @@
 
 <link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}">
 
-<h1>Polls app</h1>
+<h1>Cea mai tare comunitate</h1>
 
 {% if latest_question_list %}
     <ul>

From 9d16668a4e291056242c1dd2a8e5dbbae07d8b45 Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 19:26:42 +0300
Subject: [PATCH 3/9] 1

---
 polls/templates/polls/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/polls/templates/polls/index.html b/polls/templates/polls/index.html
index 18260b0d..a8fb9245 100644
--- a/polls/templates/polls/index.html
+++ b/polls/templates/polls/index.html
@@ -2,7 +2,7 @@
 
 <link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}">
 
-<h1>Polls app</h1>
+<h1>Cea mai tare comunitate</h1>
 
 {% if latest_question_list %}
     <ul>

From a71119f74f4f0d47a8044a437fa471fe29d02b43 Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 19:55:39 +0300
Subject: [PATCH 4/9] 2

---
 azuresite/settings.py | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/azuresite/settings.py b/azuresite/settings.py
index 0aa259ec..6ec33aa2 100644
--- a/azuresite/settings.py
+++ b/azuresite/settings.py
@@ -33,6 +33,7 @@
 
 INSTALLED_APPS = [
     'polls.apps.PollsConfig',
+    'cars.apps.CarsConfig',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -76,10 +77,14 @@
 # https://docs.djangoproject.com/en/2.1/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': BASE_DIR / 'db.sqlite3',
-    }
+   'default': {
+   'ENGINE': 'django.db.backends.postgresql_psycopg2',
+   'NAME': os.environ.get('DBNAME'),
+   'USER': os.environ.get('DBUSER'),
+   'PASSWORD': os.environ.get('DBPASS'),
+   'HOST': os.environ.get('DBHOST'),
+   'PORT': '5432',
+  }
 }
 
 

From e2ae1870d5caa9cac0382ee3e02b14b55f28aea5 Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 19:55:43 +0300
Subject: [PATCH 5/9] 2

---
 cars/__init__.py            |  0
 cars/admin.py               |  3 +++
 cars/apps.py                |  5 +++++
 cars/migrations/__init__.py |  0
 cars/models.py              | 22 ++++++++++++++++++++++
 cars/tests.py               |  3 +++
 cars/views.py               |  3 +++
 7 files changed, 36 insertions(+)
 create mode 100644 cars/__init__.py
 create mode 100644 cars/admin.py
 create mode 100644 cars/apps.py
 create mode 100644 cars/migrations/__init__.py
 create mode 100644 cars/models.py
 create mode 100644 cars/tests.py
 create mode 100644 cars/views.py

diff --git a/cars/__init__.py b/cars/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cars/admin.py b/cars/admin.py
new file mode 100644
index 00000000..8c38f3f3
--- /dev/null
+++ b/cars/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/cars/apps.py b/cars/apps.py
new file mode 100644
index 00000000..a7d5fcd7
--- /dev/null
+++ b/cars/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class CarsConfig(AppConfig):
+    name = 'cars'
diff --git a/cars/migrations/__init__.py b/cars/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/cars/models.py b/cars/models.py
new file mode 100644
index 00000000..347fee69
--- /dev/null
+++ b/cars/models.py
@@ -0,0 +1,22 @@
+from django.db import models
+
+# Create your models here.
+
+from django.db import models
+
+class Driver(models.Model):
+
+    name = models.TextField()
+
+    license = models.TextField()
+
+class Car(models.Model):
+
+    make = models.TextField()
+
+    model = models.TextField()
+
+    year = models.IntegerField()
+
+
+    owner = models.ForeignKey("Driver", on_delete=models.SET_NULL, null=True)
\ No newline at end of file
diff --git a/cars/tests.py b/cars/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/cars/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/cars/views.py b/cars/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/cars/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

From 1da267a8432a0eb12da42a1a55048a402f8329ca Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 20:01:51 +0300
Subject: [PATCH 6/9] 2

---
 polls/templates/polls/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/polls/templates/polls/index.html b/polls/templates/polls/index.html
index a8fb9245..7d2527ef 100644
--- a/polls/templates/polls/index.html
+++ b/polls/templates/polls/index.html
@@ -2,7 +2,7 @@
 
 <link rel="stylesheet" type="text/css" href="{% static 'polls/style.css' %}">
 
-<h1>Cea mai tare comunitate</h1>
+<h1>Cea mai tare comunssxitate</h1>
 
 {% if latest_question_list %}
     <ul>

From 5df5f4a5daefea4ffb8116ced85effb5cfc362ca Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 20:24:14 +0300
Subject: [PATCH 7/9] 3

---
 azuresite/urls.py              |  1 +
 cars/templates/base.html       | 25 +++++++++++++++++++++++++
 cars/templates/car_detail.html | 29 +++++++++++++++++++++++++++++
 cars/urls.py                   | 11 +++++++++++
 cars/views.py                  | 21 +++++++++++++++++++++
 5 files changed, 87 insertions(+)
 create mode 100644 cars/templates/base.html
 create mode 100644 cars/templates/car_detail.html
 create mode 100644 cars/urls.py

diff --git a/azuresite/urls.py b/azuresite/urls.py
index 7acc83f5..2a0576c3 100644
--- a/azuresite/urls.py
+++ b/azuresite/urls.py
@@ -18,5 +18,6 @@
 
 urlpatterns = [
     path('', include('polls.urls')),
+    path('', include('cars.urls')),
     path('admin/', admin.site.urls),
 ]
diff --git a/cars/templates/base.html b/cars/templates/base.html
new file mode 100644
index 00000000..140437b9
--- /dev/null
+++ b/cars/templates/base.html
@@ -0,0 +1,25 @@
+<!doctype html>
+
+<html>
+
+    <head>
+
+        <meta charset="utf-8">
+
+        <meta name="viewport" content="width=device-width, initial-scale=1">
+
+
+
+        <title>Contacts</title>
+
+        <link rel="stylesheet" href="https://unpkg.com/tachyons@4.10.0/css/tachyons.min.css"/>
+
+    </head>
+
+    <body>
+
+{% block page_content %}{% endblock %}
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/cars/templates/car_detail.html b/cars/templates/car_detail.html
new file mode 100644
index 00000000..3e6d47bf
--- /dev/null
+++ b/cars/templates/car_detail.html
@@ -0,0 +1,29 @@
+{% extends "base.html" %}
+
+{% block page_content %}
+
+        <div class="mw6 center pa3 sans-serif">
+
+            <h1 class="mb4">Driver: {{ drivers.name | linebreaks }}</h1>
+
+            <header class="b mb2">License: {{ drivers.license }}</header>
+
+        {% for v in vehicles %}
+
+            <div class="pa2 mb3 striped--near-white">
+
+                <div class="pl2">
+
+                    <p class="mb2">Make/Model: {{ v.make }} {{ v.model }}</p>
+
+                    <p class="mb2">Year: {{ v.year }}</p>
+
+                </div>
+
+            </div>
+
+        {% endfor %}
+
+        </div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/cars/urls.py b/cars/urls.py
new file mode 100644
index 00000000..41deb72c
--- /dev/null
+++ b/cars/urls.py
@@ -0,0 +1,11 @@
+from django.urls import path
+
+from . import views
+
+
+
+urlpatterns = [
+
+    path("/cars/<int:pk>/", views.car_detail, name="car_detail"),
+
+]
\ No newline at end of file
diff --git a/cars/views.py b/cars/views.py
index 91ea44a2..67dca3e2 100644
--- a/cars/views.py
+++ b/cars/views.py
@@ -1,3 +1,24 @@
 from django.shortcuts import render
 
 # Create your views here.
+from django.shortcuts import render
+
+from cars.models import Car, Driver
+
+
+
+def car_detail(request, pk):
+
+    owner_obj = Driver.objects.get(pk=pk)
+
+    car_objs = Car.objects.filter(owner_id=owner_obj.id)
+
+    context = {
+
+        "vehicles": car_objs,
+
+        "drivers": owner_obj,
+
+    }
+
+    return render(request, "car_detail.html", context)
\ No newline at end of file

From 5473f141e2fbb42fa2bf045a6543056f44032eec Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 20:37:27 +0300
Subject: [PATCH 8/9] 4

---
 cars/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cars/urls.py b/cars/urls.py
index 41deb72c..97f89a2e 100644
--- a/cars/urls.py
+++ b/cars/urls.py
@@ -6,6 +6,6 @@
 
 urlpatterns = [
 
-    path("/cars/<int:pk>/", views.car_detail, name="car_detail"),
+    path("cars/<int:pk>/", views.car_detail, name="car_detail"),
 
 ]
\ No newline at end of file

From 876db82a61954ed5fbbf5fc9997e4843ce4b19f8 Mon Sep 17 00:00:00 2001
From: sebastian <sebastianrichard.ene@gmail.com>
Date: Tue, 1 Jun 2021 20:58:00 +0300
Subject: [PATCH 9/9] eactivities1

---
 azuresite/settings.py              | 1 +
 eactivities/__init__.py            | 0
 eactivities/admin.py               | 3 +++
 eactivities/apps.py                | 5 +++++
 eactivities/migrations/__init__.py | 0
 eactivities/models.py              | 8 ++++++++
 eactivities/tests.py               | 3 +++
 eactivities/views.py               | 3 +++
 8 files changed, 23 insertions(+)
 create mode 100644 eactivities/__init__.py
 create mode 100644 eactivities/admin.py
 create mode 100644 eactivities/apps.py
 create mode 100644 eactivities/migrations/__init__.py
 create mode 100644 eactivities/models.py
 create mode 100644 eactivities/tests.py
 create mode 100644 eactivities/views.py

diff --git a/azuresite/settings.py b/azuresite/settings.py
index 6ec33aa2..316d999f 100644
--- a/azuresite/settings.py
+++ b/azuresite/settings.py
@@ -33,6 +33,7 @@
 
 INSTALLED_APPS = [
     'polls.apps.PollsConfig',
+    'eactivities.apps.EactivitesConfig',
     'cars.apps.CarsConfig',
     'django.contrib.admin',
     'django.contrib.auth',
diff --git a/eactivities/__init__.py b/eactivities/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/eactivities/admin.py b/eactivities/admin.py
new file mode 100644
index 00000000..8c38f3f3
--- /dev/null
+++ b/eactivities/admin.py
@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.
diff --git a/eactivities/apps.py b/eactivities/apps.py
new file mode 100644
index 00000000..f3c91355
--- /dev/null
+++ b/eactivities/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class EactivitiesConfig(AppConfig):
+    name = 'eactivities'
diff --git a/eactivities/migrations/__init__.py b/eactivities/migrations/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/eactivities/models.py b/eactivities/models.py
new file mode 100644
index 00000000..7e0a9738
--- /dev/null
+++ b/eactivities/models.py
@@ -0,0 +1,8 @@
+from django.db import models
+
+# Create your models here.
+class UploadModel(models.Model):
+    # file will be uploaded to MEDIA_ROOT/uploads
+    # or...
+    # file will be saved to MEDIA_ROOT/uploads/2015/01/30
+    upload = models.FileField(upload_to='files',null=True)
\ No newline at end of file
diff --git a/eactivities/tests.py b/eactivities/tests.py
new file mode 100644
index 00000000..7ce503c2
--- /dev/null
+++ b/eactivities/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/eactivities/views.py b/eactivities/views.py
new file mode 100644
index 00000000..91ea44a2
--- /dev/null
+++ b/eactivities/views.py
@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.