IT2002 · jonaslwq · Mar 14, 2022 · Mar 16, 2022 · Mar 16, 2022 · Mar 16, 2022
diff --git a/.env b/.env
@@ -8,14 +8,14 @@ DEBUG = True
 RUN_LOCAL_DB = True 
 
 ##### Local database ######
-LOCAL_DB_NAME='appstore'
+LOCAL_DB_NAME='petsitting'
 LOCAL_DB_USER='postgres'
 # Leave the below empty if you haven't set up a local password
-LOCAL_DB_PASSWORD='postgres'
+LOCAL_DB_PASSWORD='baboon13'
 
 ##### Heroku database ######
-DB_HOST=
-DB_NAME=
-DB_USER=
-DB_PORT=
-DB_PASSWORD=
+DB_HOST='ec2-3-212-45-192.compute-1.amazonaws.com'
+DB_NAME='dcgs0k2jb4ro3j'
+DB_USER='zbuggbupzzuxul'
+DB_PORT='5432'
+DB_PASSWORD='4d8fc3397c4bdeadd1cff710320d96fcb0cd61c4f827a48346f05b93b96e45eb'
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+
+        {
+            "type": "pwa-chrome",
+            "request": "launch",
+            "name": "Open index.html",
+            "file": "c:\\Users\\jonas\\Petsitting\\app\\templates\\app\\index.html"
+        }
+    ]
+}
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "\"python.pythonPath\"": "\"Your_venv_path/bin/python\""
+    }
+}
diff --git a/AppStore/urls.py b/AppStore/urls.py
@@ -14,15 +14,30 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path
+from django.urls import path, include
 
 import app.views
 
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path('', app.views.index, name='index'),
-    path('add', app.views.add, name='add'),
-    path('view/<str:id>', app.views.view, name='view'),
-    path('edit/<str:id>', app.views.edit, name='edit'),
+    path('', app.views.login, name = 'login'),
+    path('main_page/', app.views.main_page, name='main_page'),
+    path('main_page/register_job/', app.views.register_job, name = 'register_job'),
+    path('main_page/sit_pet/', app.views.sit_pet, name='sit_pet'),
+    path('main_page/sit_pet/view_pet/<str:petid>', app.views.view_pet, name='view_pet'),
+    path('main_page/sit_pet/interested/<str:offerid>/', app.views.interested, name='interested'),
+    path('register_user/', app.views.register_user, name = 'register_user'),
+    path('main_page/register_pet/', app.views.register_pet, name = 'register_pet'),
+    path('main_page/mypets/', app.views.mypets, name='mypets'),
+    path('main_page/pending/', app.views.pending,  name='pending'),
+    path('main_page/pending/view_offer/<str:offerid>', app.views.view_offer, name='view_offer'),
+    path('main_page/pending/view_user/<str:username>', app.views.view_user, name='view_user'),
+    path('main_page/pending/offer_accepted/<str:offerid>/<str:petsitter>', app.views.offer_accepted, name='offer_accepted'),
+    path('main_page/history/', app.views.history, name = 'history'),
+    path('main_page/history/give_rating/<str:offerid>', app.views.give_rating, name = 'give_rating'),
+    #path('', app.views.index, name='index'),
+    #path('add', app.views.add, name='add'),
+    #path('view/<str:id>', app.views.view, name='view'),
+    #path('edit/<str:id>', app.views.edit, name='edit')
 ]
diff --git a/add_sql.sh b/add_sql.sh
@@ -1,9 +1,9 @@
 # Construct the URI from the .env
-DB_HOST=''
-DB_NAME=''
-DB_USER=''
-DB_PORT=''
-DB_PASSWORD=''
+DB_HOST='localhost'
+DB_NAME='prosgres'
+DB_USER='postgrs'
+DB_PORT='5432'
+DB_PASSWORD='baboon13'
 
 while IFS= read -r line
 do
@@ -33,3 +33,9 @@ psql ${URI} -f sql/AppStoreSchema.sql
 psql ${URI} -f sql/AppStoreCustomers.sql
 psql ${URI} -f sql/AppStoreGames.sql
 psql ${URI} -f sql/AppStoreDownloads.sql
+psql ${URI} -f sql/PetsittingSchema.sql
+psql ${URI} -f sql/Petsittingjoboffer.sql
+psql ${URI} -f sql/Petsittingpending.sql
+psql ${URI} -f sql/Petsittingpet.sql
+psql ${URI} -f sql/Petsittingportfolio.sql
+psql ${URI} -f sql/Petsittingtransaction.sql
diff --git a/app/static/app/images/pets.jpg b/app/static/app/images/pets.jpg
diff --git a/app/templates/app/add.html b/app/templates/app/add.html
diff --git a/app/templates/app/edit.html b/app/templates/app/edit.html
diff --git a/app/templates/app/give_rating.html b/app/templates/app/give_rating.html
@@ -0,0 +1,62 @@
+<html>
+<body>
+    <h1>Leave a rating!</h1>
+
+    <style> 
+
+        Body {    
+          font-family: Calibri, Helvetica, sans-serif;    
+          background-color: AntiqueWhite;    
+        }    
+        button {     
+               background-color: black;     
+               width: 100%;    
+                color: white;     
+                padding: 15px; 
+                font-size: 15;     
+                margin: 10px 0px;     
+                border: none;     
+                cursor: pointer;     
+                 }     
+
+         input[type=text], input[type=password] {     
+                width: 100%;     
+                margin: 8px 0;    
+                padding: 12px 20px;     
+                display: inline-block;     
+                border: 2px solid green;     
+                box-sizing: border-box;     
+            }    
+         button:hover {     
+                opacity: 0.7;     
+            }     
+          .cancelbtn {     
+                width: auto;     
+                padding: 10px 18px;    
+                margin: 10px 5px;    
+            }     
+
+
+         .container {     
+                padding: 25px;     
+
+
+            }     
+        </style> 
+
+
+    <a href="/main_page/">Back to home</a>
+    <br><br>
+    <!-- Create a Form -->
+    <form method="POST">
+        <!-- Security token by Django -->
+        {% csrf_token %}
+        <!-- form -->
+        <div id="div_id_first_name" class="control-group"> <label for="id_first_name" class="control-label requiredField">
+        Rating(1/2/3/4/5)<span class="asteriskField">*</span> </label> <div class="controls"> <input type="text" name="rating" maxlength="16" class="textinput textInput" required="" id="id_rating"> </div> </div>
+
+        <br>
+        <button type="submit" value="Add">Add</button>
+    </form>
+</body>
+</html>
diff --git a/app/templates/app/history.html b/app/templates/app/history.html
@@ -0,0 +1,102 @@
+<html> 
+<body> 
+    <h1>Transaction History</h1> 
+    <style> 
+
+        Body {    
+          font-family: Calibri, Helvetica, sans-serif;    
+          background-color: AntiqueWhite;    
+        }    
+        button {     
+               background-color: black;     
+               width: 100%;    
+                color: white;     
+                padding: 15px; 
+                font-size: 15;     
+                margin: 10px 0px;     
+                border: none;     
+                cursor: pointer;     
+                 }     
+
+         input[type=text], input[type=password] {     
+                width: 100%;     
+                margin: 8px 0;    
+                padding: 12px 20px;     
+                display: inline-block;     
+                border: 2px solid green;     
+                box-sizing: border-box;     
+            }    
+         button:hover {     
+                opacity: 0.7;     
+            }     
+          .cancelbtn {     
+                width: auto;     
+                padding: 10px 18px;    
+                margin: 10px 5px;    
+            }     
+
+
+         .container {     
+                padding: 25px;     
+
+
+            }     
+        </style>
+    <a href="/main_page/">Back to home</a>
+    <br/><br/> 
+    <table border=1>
+        <thead> Remember to give a rating!<thead>  
+        <thead> 
+            <th>Job Offer ID</th> 
+            <th>Price</th> 
+            <th>Location</th> 
+            <th>Date From</th> 
+            <th>Date To</th> 
+            <th>Pet ID</th> 
+            <th>Petsitter</th> 
+            <th>Action</th> 
+        </thead> 
+        {% for transactions_nr in history_nr %} 
+        <tr> 
+
+            <td> {{ transactions_nr.0 }} </td> 
+            <td> {{ transactions_nr.1 }} </td> 
+            <td> {{ transactions_nr.2 }} </td> 
+            <td> {{ transactions_nr.3 }} </td> 
+            <td> {{ transactions_nr.4 }} </td> 
+            <td> {{ transactions_nr.5 }} </td> 
+            <td> {{ transactions_nr.6 }} </td> 
+            <td><a href="give_rating/{{transactions_nr.0}}"><button>Give Rating</button></a><td>
+
+        </tr> 
+        {% endfor %} 
+    </table> 
+    <br/><br/> 
+    <table border=1>
+        <thead> Past Transactions<thead>  
+        <thead> 
+            <th>Job Offer ID</th> 
+            <th>Price</th> 
+            <th>Location</th> 
+            <th>Date From</th> 
+            <th>Date To</th> 
+            <th>Pet ID</th> 
+            <th>Petsitter</th> 
+            <th>Rating</th> 
+        </thead> 
+        {% for transactions_r in history_r %} 
+        <tr> 
+
+            <td> {{ transactions_r.0 }} </td> 
+            <td> {{ transactions_r.1 }} </td> 
+            <td> {{ transactions_r.2 }} </td> 
+            <td> {{ transactions_r.3 }} </td> 
+            <td> {{ transactions_r.4 }} </td> 
+            <td> {{ transactions_r.5 }} </td> 
+            <td> {{ transactions_r.6 }} </td> 
+            <td> {{ transactions_r.7 }} </td> 
+        </tr> 
+        {% endfor %} 
+    </table>
+</body> 
+</html>
diff --git a/app/templates/app/index.html b/app/templates/app/index.html