Skip to content

Boodle
Boodle
Commit c7bafd11 authored by Martina Therese R. Reyes's avatar Martina Therese R. Reyes
Browse files
Options

Added an about html file and urls, view and photos. 

Edited the forms to look more aesthetic.
Added a cancel button to exit the form.
parent e634f39e
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 73 deletions
boodlesite/static/css/styles.css
View file @ c7bafd11
...@@ -373,14 +373,6 @@ nav a { ...@@ -373,14 +373,6 @@ nav a {
align-items: center; align-items: center;
} }
/* item detail view / add, edit item */
.item-image-container,
.item-form-container {
border: 2px solid black;
padding: 1rem;
}
/* ?USER'S PROFILE */ /* ?USER'S PROFILE */
.profile-container { .profile-container {
display: flex; display: flex;
...@@ -408,9 +400,52 @@ nav a { ...@@ -408,9 +400,52 @@ nav a {
padding: 3rem; padding: 3rem;
} }
.profile-submit-button { /* About Page*/
border: none; .about__container {
border-radius: 0.5rem; margin: 0 auto;
padding: .3rem; width: 90%;
background-color: #F9BD82; }
.about__header{
text-align: center;
}
.about__blockone, .about__blocktwo, .about__blockthree {
display: flex;
justify-content: center;
padding: 2rem;
}
.block-explanation{
width: 70%;
border-radius: 20px;
border: 5px black solid;
padding: 20px;
margin: 10px;
}
.block-image, .row, .col {
text-align: center;
padding: 1rem;
}
.form-space, .button-space{
display: flex;
justify-content: center;
padding: 3rem;
}
/* Add Item */
.additem-container{
text-align: center;
}
/* item detail view / add, edit item */
.item-form-container {
padding: 1rem;
margin: 0 auto;
}
.storeform-header {
text-align: center;
} }
\ No newline at end of file
boodlesite/templates/about.html 0 → 100644
View file @ c7bafd11
{% extends 'boodlesite\templates\base.html' %}
{% load static %}
{% block title %}Boodle Homepage{% endblock %}
{% block styles %}
{% endblock %}
{% block content %}
<div class="about__header">
<h1>About Boodle</h1>
</div>
<div class="about__container">
<!-- overview -->
<div class="about__blockone">
<div class="block-image">
<img src="../static/media/block_one_pic.jpg">
</div>
<div class="block-explanation">
<h3>What is Boodle?</h3>
<p>
Boodle aims to provide an online bidding platform for online users. Its services are tailored specifically to bidding services to make communication and purchsing facilitation easier between buyers and sellers. For buyers, the common practice of "paunahan" is made easy for sellers can track which user bid on what and prevents issues such as scamming by correctly identifying the user with the highest bid.
</p>
</div>
</div>
<!-- About the product -->
<div class="about__blocktwo">
<div class="block-explanation">
<h3>Mission-Vision</h3>
<p>
Our mission has been to improve current bidding platforms and to provide a space for auctioneers and consumers to interact freely.
Boodle aims to provide sellers with the appropriate tools to auction items and aims to provide buyers a reliable platform for placing
bids on auctioned items.
</p>
</div>
<div class="block-image">
<img src="../static/media/block_two_pic.jpg">
</div>
</div>
<!-- About the makers -->
<div class="about__blockthree">
<div class="block-explanation">
<h3>Who are we?</h3>
<p> The developers are Computer Science students from Ateneo de Manila University. They consider themselves online shopaholics and so they
decided to create a platform for online auctions.
</p>
</div>
</div>
<div class="block-image">
<div class="row">
<div class="col">
<h6>Carmina Atienza</h6>
<img src="../static/media/profile_pics/didz.jpg">
</div>
<div class="col">
<h6>Christine Dela Rosa</h6>
</div>
</div>
<div class="row">
<div class="col">
<h6>Martina Reyes</h6>
<img src="../static/media/profile_pics/mate.jpg">
</div>
<div class="col">
<h6>Felizia Tiburcio</h6>
<img src="../static/media/profile_pics/felizia.jpg">
</div>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
boodlesite/templates/additem.html
View file @ c7bafd11
...@@ -9,32 +9,20 @@ ...@@ -9,32 +9,20 @@
{% block content %} {% block content %}
<div class="container"> <div class="additem-container">
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
<div class="row">
<div class="col-lg-7 col-md-6">ITEM IMAGE CONTAINER <form action="" method="POST">
<div class="item-image-container"></div> {% csrf_token %}
</div>
<div class=" col-lg-5 col-md-6">ITEM FORM CONTAINER
<div class="item-form-container"> <div class="item-form-container">
<form action="" method="POST"> {{ form.as_p }}
{% csrf_token %}
{{ form.as_p }}
</div> </div>
<button type="submit" name="Add Item"> Add Item </button> <div class="button-space">
</form> <button type="button" class="btn btn-danger"><a href= "{% url 'storeid' request.user.id %}">Cancel</a></button>
</div> <button type="submit" class="btn btn-dark" name="Add Item"> Add Item </button>
</div> </div>
</div> </form>
<!-- Form with fields:
[Item name]
[Item Description]
[Floor Price] -->
<!-- Image, if no image add image -->
</div>
{% endblock %} {% endblock %}
\ No newline at end of file
boodlesite/templates/base.html
View file @ c7bafd11
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<h1>Hello, {{request.user}}</h1> <h1>Hello, {{request.user}}</h1>
<ul> <ul>
<li><a href="/">Home</a></li> <li><a href="/">Home</a></li>
<li><a href="#">About</a></li> <li><a href="{% url 'about' %}">About</a></li>
<li><a href="#">Help</a></li> <li><a href="#">Help</a></li>
<li><a href="{% url 'profileid' request.user.id %}">My Profile</a></li> <li><a href="{% url 'profileid' request.user.id %}">My Profile</a></li>
<li><a href="{% url 'logout' %}">Logout</a></li> <li><a href="{% url 'logout' %}">Logout</a></li>
......
boodlesite/templates/editBoodleUser.html
View file @ c7bafd11
...@@ -13,18 +13,17 @@ ...@@ -13,18 +13,17 @@
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
<div class=""> <div class="">
<div class="profile-form-container"> <div class="profile-form-container">
<div class="">EDIT PROFILE PICTURE
<div class="profile-image-container"></div>
</div>
<form action="" method="POST"> <form action="" method="POST">
{% csrf_token %} {% csrf_token %}
{{ form.as_p }} {{ form.as_p }}
<button class="profile-submit-button" type="submit" name="Add Item"> Save Changes </button> <div class="button-space">
<button type="button" class="btn btn-danger"><a href= "{% url 'profileid' request.user.id %}">Cancel</a></button>
<button class="profile-submit-button btn btn-dark" type="submit" name="Add Item"> Save Changes </button>
</div>
</form> </form>
</div> </div>
</div> </div>
<!--img goes here-->
</div> </div>
{% endblock %} {% endblock %}
\ No newline at end of file
boodlesite/templates/index.html
View file @ c7bafd11
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<p>Boodle was founded by a group of four talented software engineers, who are currently Computer Science students <p>Boodle was founded by a group of four talented software engineers, who are currently Computer Science students
in Ateneo de Manila University. They believed they could change the status quo in Ateneo de Manila University. They believed they could change the status quo
of the e-commerce world—and with Boodle, they did. </p> of the e-commerce world—and with Boodle, they did. </p>
<button id="btn-read-more">Read more</button> <button id="btn-read-more"><a href="{% url 'about' %}">Read more</a></button>
</div> </div>
</div> </div>
</div> </div>
......
boodlesite/templates/startauction.html
View file @ c7bafd11
...@@ -9,13 +9,20 @@ ...@@ -9,13 +9,20 @@
{% block content %} {% block content %}
<div class="container"> <div class="container">
<form action="" method="POST"> <form action="" method="POST">
{% csrf_token %} {% csrf_token %}
{{ form.as_p }} <div class="form-space">
{{ form.as_p }}
<button type="submit" name="savesauction">Save Auction</button> </div>
<div class="button-space">
<button type="button" class="btn btn-danger"><a href= "{% url 'storeid' request.user.id %}">Cancel</a></button>
<button type="submit" class="btn btn-dark" name="savesauction">Save Auction</button>
</div>
</form> </form>
</div> </div>
<!-- Form fields: <!-- Form fields:
......
boodlesite/templates/storeForm.html
View file @ c7bafd11
...@@ -10,31 +10,19 @@ ...@@ -10,31 +10,19 @@
{% block content %} {% block content %}
<div class="container"> <div class="container">
<div class = "storeform-header">
<h1>{{ title }}</h1> <h1>{{ title }}</h1>
<div class="row">
<div class="col-lg-7 col-md-6">ITEM IMAGE CONTAINER
<div class="item-image-container"></div>
</div>
<div class=" col-lg-5 col-md-6">ITEM FORM CONTAINER
<div class="item-form-container">
<form action="" method="POST">
{% csrf_token %}
{{ form.as_p }}
</div>
<button type="submit" name="Add Item"> Save Changes </button>
</form>
</div>
</div> </div>
<form action="" method="POST">
{% csrf_token %}
<div class="form-space">
{{ form.as_p }}
</div>
<div class="button-space">
<button type="button" class="btn btn-danger"><a href= "{% url 'storeid' request.user.id %}">Cancel</a></button>
<button type="submit" class="btn btn-dark" name="Add Item"> Save Changes </button>
</div>
</form>
</div> </div>
<!-- Form with fields:
[Item name]
[Item Description]
[Floor Price] -->
<!-- Image, if no image add image -->
{% endblock %} {% endblock %}
\ No newline at end of file
main/urls.py
View file @ c7bafd11
...@@ -8,7 +8,6 @@ urlpatterns = [ ...@@ -8,7 +8,6 @@ urlpatterns = [
path('auction', auction, name='auction'), path('auction', auction, name='auction'),
path('auction/<int:pk>/',auction, name='auctionid'), path('auction/<int:pk>/',auction, name='auctionid'),
path('error404', error404, name='error404'), path('error404', error404, name='error404'),
# path('store', tempstore, name='store'), # this is tempstore
path('store/<int:pk>', mystore, name='storeid'), path('store/<int:pk>', mystore, name='storeid'),
path('additem', addItem, name='additem'), path('additem', addItem, name='additem'),
path('additem/<int:pk>', addItem, name='additemid'), path('additem/<int:pk>', addItem, name='additemid'),
...@@ -16,12 +15,11 @@ urlpatterns = [ ...@@ -16,12 +15,11 @@ urlpatterns = [
path('jsi18n', JavaScriptCatalog.as_view(), name='js-catlog'), path('jsi18n', JavaScriptCatalog.as_view(), name='js-catlog'),
path('startauction', startAuction, name='startauction'), path('startauction', startAuction, name='startauction'),
path('startauction/<int:pk>', startAuction, name='startauctionid'), path('startauction/<int:pk>', startAuction, name='startauctionid'),
# this is tempuser profile
# path('profile', tempProfile, name='profile'),
path('profile/<int:pk>', profile, name='profileid'), path('profile/<int:pk>', profile, name='profileid'),
path('editstore/<int:pk>', editStore, name='editstoreid'), path('editstore/<int:pk>', editStore, name='editstoreid'),
path('editProfile/<int:pk>', editProfile, name='editProfile'), path('editProfile/<int:pk>', editProfile, name='editProfile'),
path('login', loginPage, name='login'), path('login', loginPage, name='login'),
path('register', registerPage, name='register'), path('register', registerPage, name='register'),
path('logout', logoutUser, name='logout') path('logout', logoutUser, name='logout'),
path('about', about, name='about')
] ]
\ No newline at end of file
main/views.py
View file @ c7bafd11
...@@ -142,6 +142,10 @@ def auction(request,pk): ...@@ -142,6 +142,10 @@ def auction(request,pk):
def error404(request): def error404(request):
return render(request, "boodlesite/templates/error404/notstarted_error404.html") return render(request, "boodlesite/templates/error404/notstarted_error404.html")
@login_required(login_url='login')
def about(request):
return render(request, "boodlesite/templates/about.html")
@login_required(login_url='login') @login_required(login_url='login')
def mystore(request, pk): def mystore(request, pk):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment