Skip to content

Commit

Permalink
Updated and replaced wireframe.png
Browse files Browse the repository at this point in the history
  • Loading branch information
@Gilleece
Gilleece committed Apr 5, 2021
1 parent 114c870 commit c1e6306
Show file tree
Hide file tree
Showing 10 changed files with 252 additions and 243 deletions.
2 changes: 1 addition & 1 deletion app.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ def not_found_error(error):
def internal_error(error):
"""
General Error Handler
"""
"""
return render_template('500.html'), 500


Expand Down
Binary file modified static/images/wireframe.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
126 changes: 64 additions & 62 deletions templates/edit_review.html
View file
Original file line number Diff line number Diff line change
@@ -1,39 +1,39 @@
{% extends "base.html" %}
{% block content %}

<section>
<!-- Error Messages-->
<section>
<!-- Error Messages-->

<!-- Username Input Errors -->
{% if form.review_text.errors %}
<div class="container">
<div class="row justify-content-center">
<div class="alert alert-warning alert-dismissible fade show col-6 mt-5 shadow-lg p-3 mb-5 rounded"
role="alert">
{% for error in form.review_type.errors %}
<strong>{{ error }}</strong><br>
{% endfor %}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
</div>
</div>
{% endif %}
<!-- Username Input Errors -->
{% if form.review_text.errors %}
<div class="container">
<div class="row justify-content-center">
<div class="alert alert-warning alert-dismissible fade show col-6 mt-5 shadow-lg p-3 mb-5 rounded"
role="alert">
{% for error in form.review_type.errors %}
<strong>{{ error }}</strong><br>
{% endfor %}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
</div>
</div>
{% endif %}

<!-- Email Input Errors -->
{% if form.image_url.errors %}
<div class="container">
<div class="row justify-content-center">
<div class="alert alert-warning alert-dismissible fade show col-6 mt-5 shadow-lg p-3 mb-5 rounded"
role="alert">
{% for error in form.image.errors %}
<strong>{{ error }}</strong>
{% endfor %}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
</div>
</div>
{% endif %}
</section>
<!-- Email Input Errors -->
{% if form.image_url.errors %}
<div class="container">
<div class="row justify-content-center">
<div class="alert alert-warning alert-dismissible fade show col-6 mt-5 shadow-lg p-3 mb-5 rounded"
role="alert">
{% for error in form.image.errors %}
<strong>{{ error }}</strong>
{% endfor %}
<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
</div>
</div>
</div>
{% endif %}
</section>

<div class="container">

Expand All @@ -48,72 +48,74 @@ <h3>
</div>

<div class="row justify-content-center">
<form class="card mt-5 col-10 col-md-8 text-white bg-primary shadow p-3 mb-5 rounded" method="POST" action="{{ url_for('edit_review', review_id=review_to_edit._id) }}">
<form class="card mt-5 col-10 col-md-8 text-white bg-primary shadow p-3 mb-5 rounded" method="POST"
action="{{ url_for('edit_review', review_id=review_to_edit._id) }}">
{{ form.hidden_tag() }}
<div class="card-body">
<!-- Material Name -->
<h6>Filament type: </h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.material_name(class_='form-control', placeholder='Filament Type') }}
</div>
</div>
<!-- Brand -->
<h6>Filament Maker:</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.brand(class_='form-control', placeholder='Filament Maker') }}
</div>
</div>
<!-- Filament Name -->
<h6>Filament Name:</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.filament_name(class_='form-control', placeholder='Filament Name') }}
</div>
</div>
<!-- rating -->
<h6>Rating (1 = Bad):</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.rating(class_='form-control', placeholder='Rating (1 = Bad)') }}
</div>
</div>
<!-- Cost -->
<h6>Cost (1 = Cheap):</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.cost(class_='form-control', placeholder='Cost (1 = Cheap)') }}
</div>
</div>
<!-- Temperature -->
<h6>Temperature you printed:</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.temperature(class_='form-control', placeholder='Printing Temperature') }}
</div>
</div>
<!-- Colour -->
<h6>Colour:</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.colour(class_='form-control', placeholder='Filament Colour') }}
</div>
</div>
<!-- Finish -->
<h6>Finish:</h6>
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.finish(class_='form-control', placeholder='Filament Finish') }}
</div>
</div>
<h6>Review Text:</h6>
<!-- Review Text -->
<div class="input-group flex-nowrap">
<div class="input-group flex-nowrap">
{{ form.review_text(class_='form-control', placeholder='Review Text (Max 250 characters)') }}
</div>
</div>
<!-- Image -->
<h6>Image URL:</h6>
<div class="input-group flex-nowrap mb-3">
{{ form.image_url(class_='form-control', placeholder='Image URL of a print') }}
</div>
<div class="row text-center">
<!-- Cancel and Submit button -->
<div class="text-center">
<div>
<a class="btn btn-secondary" role="button" href="{{ url_for('profile', username=session['user']) }}" >Cancel</a>
{{ form.submit(class_='btn btn-success') }}
</div>
<div class="row text-center">
<!-- Cancel and Submit button -->
<div class="text-center">
<div>
<a class="btn btn-secondary" role="button"
href="{{ url_for('profile', username=session['user']) }}">Cancel</a>
{{ form.submit(class_='btn btn-success') }}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>


{% endblock %}
10 changes: 6 additions & 4 deletions templates/login.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% extends "base.html" %}
{% block content %}
{% block content %}

<div class="container">

Expand All @@ -14,14 +14,15 @@ <h3>
</div>

<div class="row justify-content-center">
<form class="card mt-5 col-10 col-md-8 text-white bg-primary shadow p-3 mb-5 rounded" method="POST" action="{{ url_for('login') }}">
<form class="card mt-5 col-10 col-md-8 text-white bg-primary shadow p-3 mb-5 rounded" method="POST"
action="{{ url_for('login') }}">
{{ form.hidden_tag() }}
<div class="card-body">
<!-- Username -->
<div class="input-group flex-nowrap mb-3">
<span class="input-group-text form-icon"><i class="fas fa-user-cog"></i></span>
{{ form.name(class_='form-control', placeholder='Username') }}
</div>
</div>
<!-- Password -->
<div class="input-group mb-3">
<span class="input-group-text form-icon"><i class="fas fa-lock"></i></span>
Expand All @@ -37,7 +38,8 @@ <h3>

<div class="row">
<div class="col-12 text-center">
<h6>Don't have an account? <a href="{{ url_for('register') }}" class="text-decoration-underline">Sign Up</a></h6>
<h6>Don't have an account? <a href="{{ url_for('register') }}" class="text-decoration-underline">Sign Up</a>
</h6>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion templates/material_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h3>

<div class="row row-cols-1 row-cols-md-2 g-4">
{% for review in reviews %}
{% include 'reviews.html' %}
{% include 'reviews.html' %}
{% endfor %}
</div>

Expand Down
35 changes: 18 additions & 17 deletions templates/materials.html
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
{% extends "base.html" %}
{% block content %}
<div class="container">
<div class="container">

<div class="row justify-content-center">
<div class="card mt-3 col-10 col-md-8 text-white bg-primary shadow p-1 mb-3 rounded">
<div class="card-body title-card text-center">
<h3>
Choose a material to see reviews of:
</h3>
</div>
<div class="row justify-content-center">
<div class="card mt-3 col-10 col-md-8 text-white bg-primary shadow p-1 mb-3 rounded">
<div class="card-body title-card text-center">
<h3>
Choose a material to see reviews of:
</h3>
</div>
</div>
</div>


<div class="row justify-content-center">
{% for material in materials %}
<div class="card m-3 text-center shadow rounded" style="width: 18rem;">
<img src="{{ material.image }}" class="card-img-top material-card" alt="{{ material.material_name }} image">
<div class="card-body">
<a href="{{ url_for('material', material_name=material.path) }}" class="btn btn-primary stretched-link">{{ material.material_name }}</a>
</div>
</div>
{% endfor %}
<div class="row justify-content-center">
{% for material in materials %}
<div class="card m-3 text-center shadow rounded" style="width: 18rem;">
<img src="{{ material.image }}" class="card-img-top material-card" alt="{{ material.material_name }} image">
<div class="card-body">
<a href="{{ url_for('material', material_name=material.path) }}"
class="btn btn-primary stretched-link">{{ material.material_name }}</a>
</div>
</div>
{% endfor %}
</div>
</div>
{% endblock %}
1 change: 0 additions & 1 deletion templates/pla.html
View file

This file was deleted.

Loading

0 comments on commit c1e6306

Please sign in to comment.