All Francesca changes

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 <br/>
-Or we can use Node.js to build backend
 
 ### Other:
 
 12. Google Maps API
-13. socket programming
-
-
-### Page templates:
-
-Search results<br/>
-Home page:<br/>
-  Slideshow?<br/>
-  Random/features items populate the page<br/>
-Login<br/>
-Account Information<br/>
-Item Information<br/>
-Sidebar:<br/>
-  Home page sidebar: Categories<br/>
-  REFINE SEARCH RESULTS<br/>
-  Price range<br/>
-  Lease length<br/>
+13. reCHAPTCHA
+14. PayPal
+15. CSRF
+

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;
+} 

anyWares/templates/anyWares/about.html

@@ -2,67 +2,95 @@
 <div class="container mt-4">
 
 
-    <nav id="navbar-example2" class="navbar navbar-light">
-
-        <ul class="nav nav-tabs">
-            <li class="nav-item">
-                <a class="nav-link" href="#frontend">Frontend</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#backend">Backend</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#positive">Positive</a>
-            </li>
-            <li class="nav-item">
-                <a class="nav-link" href="#negative">Negative</a>
-            </li>
-        </ul>
-    </nav>
-    <div class="spybox" data-spy="scroll" data-target="#navbar-example2" data-offset="0">
-        <div class="h480">
-            <h4 id="frontend">Frontend</h4>
-            <br/>
-            <p><i class="fa fa-html5"></i>HTML5</p>
-            <p><i class="fa fa-css3"></i>CSS 3</p>
-            <i class="fa fa-github"></i><p>Bootstrap 4</p>
-            <br/>
-            <br/>
-            <br/>
-        </div>
+  <nav id="navbar-example2" class="navbar navbar-light">
 
-        <div class="h480">
-            <h4 id="backend">Backend</h4>
-            <p>...</p>
-            <p>Django</p>
-            <br/>
-            <br/>
-            <br/>
-            <br/>
-            <br/>
-        </div>
-
-        <div class="h480">
-            <h4 id="positive">Positive</h4>
-            <p>...</p>
-            <br/>
-            <br/>
-            <br/>
-
-        </div>
-        <div class="h480">
-            <h4 id="negative">Negative</h4>
-            <p>...</p>
-            <br/>
-            <br/>
-            <br/>
-            <br/>
-            <br/>
-
-        </div>
+    <ul class="nav nav-tabs">
+      <li class="nav-item">
+        <a class="nav-link" href="#intro">Intro</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#frontend">Frontend</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#backend">Backend</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#special">Special</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#positive">Positive</a>
+      </li>
+      <li class="nav-item">
+        <a class="nav-link" href="#negative">Negative</a>
+      </li>
+    </ul>
+  </nav>
+  <div class="spybox" data-spy="scroll" data-target="#navbar-example2" data-offset="0">
+    <div class="h480" id="intro">
+      <h1 style="color:orange;font-style:italic;font-weight:bold">anyWares</h1>
+      <p class="container" style="font-style:italic;">
+        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.
+      </p>
 
+      <p>Contributors:</p>
+      <ul>
+        <li>Ryan Bass</li>
+        <li>Shihang Zhu</li>
+        <li>Francesca Ryan</li>
+      </ul>
     </div>
 
+    <div class="h480" id="frontend">
+      <h1>Frontend</h1>
+      <ul style="font-size:x-large;">
+        <li>HTML
+          <i class="fa fa-html5"></i>
+          / CSS
+          <i class="fa fa-css3"></i>
+        </li>
+        <li>Bootstrap 4</li>
+        <li>Django Web Templates</li>
+        <li>JQuery</li>
+        <li>AJAX</li>
+      </ul>
+    </div>
+
+    <div class="h480" id="backend">
+      <h1>Backend</h1>
+      <ul style="font-size:x-large;">
+        <li>Django</li>
+        <li>Python</li>
+        <li>SQLite 3</li>
+      </ul>
+    </div>
+
+    <div class="h480" id="special">
+      <h1>Special Tech</h1>
+      <ul style="font-size:x-large;">
+        <li>Google Maps</li>
+        <li>reCAPTCHA</li>
+        <li>CSRF</li>
+        <li>PayPal</li>
+      </ul>
+    </div>
+    <div class="h480" id="positive">
+      <h1>Positive</h1>
+      <ul style="font-size:x-large;">
+        <li>New Technologies</li>
+        <li>Team Work</li>
+        <li>Planning before implementing</li>
+      </ul>
+    </div>
+    <div class="h480" id="negative">
+      <h1>Negative</h1>
+      <ul style="font-size:x-large;">
+        <li>Simple is complicated</li>
+        <li>Version Control</li>
+        <li>Project Structure and Naming</li>
+      </ul>
+    </div>
+  </div>
 </div>
 
 {% endblock %}