Skip to content

#M06. As a User, I would like to see my account. #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravelTimN merged 6 commits into from
Oct 19, 2020
Merged

#M06. As a User, I would like to see my account. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
53dc605
in base script tags moved before </body>
aticodein Oct 16, 2020
28b67dd
changed html code formating and comments, deleted empty lines in prof…
aticodein Oct 16, 2020
bf8012d
commit changes to my branch
aticodein Oct 17, 2020
969c197
Merge branch 'master' of https://github.com/Code-Institute-Community/…
aticodein Oct 17, 2020
d74c8e3
final changes fro PR
aticodein Oct 18, 2020
f46a559
remove Doctype tag
aticodein Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion main/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
urlpatterns = [
path("", include("home.urls")),
path("admin/", admin.site.urls),
path("accounts", include("allauth.urls")),
path("accounts/", include("allauth.urls")),
path("profile/", include("profiles.urls")),
path("hackathon/", include(("hackathon.urls", "hackathon"),
namespace='hackathon')),
Expand Down
36 changes: 34 additions & 2 deletions profiles/templates/profiles/profile.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,39 @@

{% block content %}

<!-- TO DO : build profile page -->
TEST PROFILE PAGE
<h1>Profile Page</h1>
<h2>You are logged in as:</h2>

<!-- Profile display -->

<div class="container-fluid">
<div class="row">

<div class="col-md-4">
<h4>Username:</h4>
<p>{{ user.username }}</p>
</div>

<div class="col-md-4">
<h4>Email Address:</h4>
<p>{{ user.email }}</p>
</div>

</div>

<div class="row">

<div class="col-md-4">
<h4>First name:</h4>
<p>{{ user.first_name }}</p>
</div>

<div class="col-md-4">
<h4>Last name:</h4>
<p>{{ user.last_name }}</p>
</div>

</div>

</div>
{% endblock %}
4 changes: 2 additions & 2 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
{% include "includes/footer.html" %}
</footer>

</body>

<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js"
integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous">
</script>
Expand All @@ -52,4 +50,6 @@
{% endblock %}
<script src="{% static 'js/script.js' %}"></script>

</body>

</html>
2 changes: 1 addition & 1 deletion templates/includes/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<a class="dropdown-item" href="#">Register</a>
<a class="dropdown-item" href="#">Login</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item" href="#">My Profile</a>
<a class="dropdown-item" href="{% url 'profile' %}">My Profile</a>
<a class="dropdown-item" href="#">Logout</a>
</div>
</li>
Expand Down