diff --git a/README.md b/README.md
index 63a1f89..0287c5e 100644
--- a/README.md
+++ b/README.md
@@ -1,44 +1,50 @@
-# 307project
+# 307 Project: AnyWares
-Suggested technologies:
+## Team members
+Ryan Bass
-### Frontend:
+Shihang Zhu
+
+Francesca Ryan
+
+## How to set up
+
+-Download .zip (the one zip contains all of our code)
+
+-Unzip the folder to anywhere in the filesystem
+
+-Make sure you have python 2.7 and pip installed (it is untested on python 3)
+
+-Install Django with the command: `pip install Django`
+-Open a terminal in the root directory of the extracted folder
+
+-Run the command: `python manage.py runserver`
+
+-Enter `127.0.0.1:8000/anyWares` in your browser or use the development server address indicated by the terminal
+
+-All functionalities should now be available for testing
+
+## Technologies used
+### Frontend:
1. HTML/CSS
-2. JS (registration/login popup)
+2. JS
3. JQuery
-4. Bootstrap/Angurlar for framework
-5. XML/JSON for transfering data
+4. Bootstrap
+5. JSON for transfering data
6. AJAX
+7. Django-Templates
-### Backend (if we choose to use PHP):
-
-7. XAMPP
-8. Apache
-9. MySQL/MongoDB
-10. PHP
-11. Perl
+### Backend:
+7. Django
+8. SQLLite
+9. Python
-Or Python, then we maybe need Flask/Django
-Or we can use Node.js to build backend
### Other:
12. Google Maps API
-13. socket programming
-
-
-### Page templates:
-
-Search results
-Home page:
- Slideshow?
- Random/features items populate the page
-Login
-Account Information
-Item Information
-Sidebar:
- Home page sidebar: Categories
- REFINE SEARCH RESULTS
- Price range
- Lease length
+13. reCHAPTCHA
+14. PayPal
+15. CSRF
+
diff --git a/anyWares/__pycache__/__init__.cpython-36.pyc b/anyWares/__pycache__/__init__.cpython-36.pyc
index ea689c5..b9fb72c 100644
Binary files a/anyWares/__pycache__/__init__.cpython-36.pyc and b/anyWares/__pycache__/__init__.cpython-36.pyc differ
diff --git a/anyWares/__pycache__/admin.cpython-36.pyc b/anyWares/__pycache__/admin.cpython-36.pyc
index 72491f1..7f4d989 100644
Binary files a/anyWares/__pycache__/admin.cpython-36.pyc and b/anyWares/__pycache__/admin.cpython-36.pyc differ
diff --git a/anyWares/__pycache__/apps.cpython-36.pyc b/anyWares/__pycache__/apps.cpython-36.pyc
index 96236ec..e609385 100644
Binary files a/anyWares/__pycache__/apps.cpython-36.pyc and b/anyWares/__pycache__/apps.cpython-36.pyc differ
diff --git a/anyWares/__pycache__/models.cpython-36.pyc b/anyWares/__pycache__/models.cpython-36.pyc
index 4420394..4995a54 100644
Binary files a/anyWares/__pycache__/models.cpython-36.pyc and b/anyWares/__pycache__/models.cpython-36.pyc differ
diff --git a/anyWares/__pycache__/urls.cpython-36.pyc b/anyWares/__pycache__/urls.cpython-36.pyc
index a8eca76..0181460 100644
Binary files a/anyWares/__pycache__/urls.cpython-36.pyc and b/anyWares/__pycache__/urls.cpython-36.pyc differ
diff --git a/anyWares/__pycache__/views.cpython-36.pyc b/anyWares/__pycache__/views.cpython-36.pyc
index e73beb9..cfca933 100644
Binary files a/anyWares/__pycache__/views.cpython-36.pyc and b/anyWares/__pycache__/views.cpython-36.pyc differ
diff --git a/anyWares/static/anyWares/media/itemImages/camera_vfuoYX8.jpg b/anyWares/static/anyWares/media/itemImages/camera_vfuoYX8.jpg
new file mode 100644
index 0000000..52d2662
Binary files /dev/null and b/anyWares/static/anyWares/media/itemImages/camera_vfuoYX8.jpg differ
diff --git a/anyWares/static/anyWares/style.css b/anyWares/static/anyWares/style.css
index 927eb75..3862524 100644
--- a/anyWares/static/anyWares/style.css
+++ b/anyWares/static/anyWares/style.css
@@ -129,12 +129,14 @@ footer {
.spybox{
position: relative;
- height: 480px;
+ height: 400px;
overflow-y: scroll;
}
.h480{
- height: 480px;
+ height: 400px;
+padding-left: 10%;
+
}
.ui-autocomplete { z-index:2000 !important; }
@@ -147,3 +149,36 @@ footer {
color: #fdc02f;
transition: 0.5s ease;
}
+
+#pswd_info{
+ color:red;
+ width:100%;
+ margin-left: 50%;
+}
+
+#emailowner{
+padding: 15px 0 0 0;
+}
+
+#emailowner a{
+ color: white;
+ background-color:#113358;
+ padding: 5px 5px 4px 5px;
+ text-decoration: none;
+ cursor: pointer;
+ border:none;
+}
+
+#emailowner a:visited{
+ color:white;
+}
+
+#emailowner a:hover{
+ text-decoration: none;
+ color: #fdc02f;
+}
+
+#emailowner a:active{
+ text-decoration: none;
+ color: white;
+}
diff --git a/anyWares/templates/anyWares/about.html b/anyWares/templates/anyWares/about.html
index 3952f9a..93965df 100644
--- a/anyWares/templates/anyWares/about.html
+++ b/anyWares/templates/anyWares/about.html
@@ -2,67 +2,95 @@
-
-
-
-
Frontend
-
-
HTML5
-
CSS 3
-
Bootstrap 4
-
-
-
-
+
+
+
+
anyWares
+
+ AnyWares is dedicated to promote the “Sharing Economy” by making best use of spare facilities.
+ Our goal is to make renting accessable, facile and pleasant.
+
+
Contributors:
+
+
Ryan Bass
+
Shihang Zhu
+
Francesca Ryan
+
+
+
Frontend
+
+
HTML
+
+ / CSS
+
+
+
Bootstrap 4
+
Django Web Templates
+
JQuery
+
AJAX
+
+
+
+
+
Backend
+
+
Django
+
Python
+
SQLite 3
+
+
+
+
+
Special Tech
+
+
Google Maps
+
reCAPTCHA
+
CSRF
+
PayPal
+
+
+
+
Positive
+
+
New Technologies
+
Team Work
+
Planning before implementing
+
+
+
+
Negative
+
+
Simple is complicated
+
Version Control
+
Project Structure and Naming
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/anyWares/templates/anyWares/edititem.html b/anyWares/templates/anyWares/edititem.html
index 4848907..d94402c 100644
--- a/anyWares/templates/anyWares/edititem.html
+++ b/anyWares/templates/anyWares/edititem.html
@@ -1,84 +1,75 @@
+
{% extends "./index.html" %}
+{% load static from staticfiles %}
+{% load widget_tweaks %}
+
{% block mainbody %}
-