s442783/HighNeed_projekt_inz
1
1
Fork 1
Code Issues Pull Requests Releases Wiki Activity

Poprawa profile, calendar i fanpage

Browse Source
This commit is contained in:
AgataKow 2022-01-13 21:58:27 +01:00
parent adfd69022c
commit 732f30858b
7 changed files with 86 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
highneed/events/templates/account/password_reset_done.html
View File

@ -21,12 +21,12 @@
<ul>
<li><a href="{% url 'events:index' %}">Strona główna</a></li>
<li><a href="{% url 'events' %}">Wyszukaj wydarzenia</a></li>
<li><a href="calendar.html">Kalendarz</a></li>
<li><a href="{% url 'calendar' %}">Kalendarz</a></li>
<li><a href="">Fanpage</a></li>
<li><a href="{% url 'fanpage' %}">Fanpage</a></li>
{% if user.is_authenticated %}
<li><a href="{% url 'profil' %}">{{ user.username }}</a></li>
<li><a href="">Koszyk</a></li>
<li><a href="{% url 'koszyk' %}">Koszyk</a></li>
<li><a href="{% url 'account_logout' %}">Wyloguj się</a></li>
{% else %}
<li><a href="{% url 'account_login' %}">Koszyk</a></li>

22
highneed/events/templates/add_event.html
View File

@ -42,10 +42,10 @@
<div class="container grid-2">
<div class="col1">
<a href="{% url 'events' %}" class="btn btn-list-2">Zobacz Wydarzenia</a>
<a href="add_event/" class="btn btn-list-2">Stwórz Wydarzenie</a>
<a href="{% url 'events' %}" class="btn btn-list-2">Zobacz wydarzenia</a>
<a href="add_event/" class="btn btn-list-2">Utwórz wydarzenie</a>
{% if user.username == "admin" %}
<a href="../add_category/" class="btn btn-list-2">Stwórz Kategorie</a>
<a href="../add_category/" class="btn btn-list-2">Utwórz kategorię</a>
{% endif %}
</div>
@ -54,11 +54,11 @@
<div class="grid article3">
<div class="showcase-text">
<h1>Stwórz wydarzenie</h1>
<h1>Utwórz wydarzenie</h1>
<form method="POST" class="post_form">
{% csrf_token %}
{{ form }}
<button type="submit" class="btn btn-success">Save</button>
<button type="submit" class="btn btn-list-2">Dodaj wydarzenie</button>
</form>
</div>
@ -67,12 +67,12 @@
</div>
<!--Powrot na strone glowna-->
<div class="return-panel">
<div class="container">
<h1><a href="../">Powrót</a></h1>
</div>
</div>
<!--Powrot na strone glowna-->
<div class="return-panel">
<div class="container">
<h1><a href="../">Powrót</a></h1>
</div>
</div>
</body>

104
highneed/events/templates/events/calendar.html
View File

@ -9,61 +9,63 @@
</head>
<body>
<!--Navbar-->
<div class="navbar">
<div class="container flex">
<h1 class="logo">HighNeed.pl Poznań</h1>
<nav>
<ul>
<li><a href="{% url 'events:index' %}">Strona główna</a></li>
<li><a href="{% url 'events' %}">Wyszukaj wydarzenia</a></li>
<li><a href="{% url 'calendar' %}">Kalendarz</a></li>
<li><a href="{% url 'fanpage' %}">Fanpage</a></li>
{% if user.is_authenticated %}
<li><a href="{% url 'profil' %}">{{ user.username }}</a></li>
<li><a href="{% url 'koszyk' %}">Koszyk</a></li>
<li><a href="{% url 'account_logout' %}">Wyloguj się</a></li>
{% else %}
<li><a href="{% url 'account_login' %}">Koszyk</a></li>
<li><a href="{% url 'account_login' %}">Zaloguj się</a></li>
{% endif %}
</ul>
</nav>
</div>
</div>
<!--Navbar-->
<div class="navbar">
<div class="container nav-panel">
<h1 class="logo">HighNeed.pl Poznań</h1>
<nav>
<ul>
<li><a href="{% url 'events:index' %}">Strona główna</a></li>
<li><a href="{% url 'events' %}">Wyszukaj wydarzenia</a></li>
<li><a href="{% url 'calendar' %}">Kalendarz</a></li>
<!--Panel-->
<div class="container flex-panel">
<div class="showcase-form flex-col">
<h1>Przepraszamy, kalendarz jest niedostępny</h1>
</div>
</div>
<!--Footer-->
<div class="footer">
<div class="container">
<h2>Kontakt</h2>
<div class="icon-text">
<svg width="22" height="18" viewBox="0 0 22 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.19995" y="2.26282" width="17.6" height="13.5771" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.011941 1.22869C0.011941 0.550109 0.559142 0 1.23416 0H20.7778C21.4528 0 22 0.550109 22 1.22869V15.1426C22 16.4998 20.9056 17.6 19.5556 17.6H2.44444C1.09441 17.6 0 16.4998 0 15.1426V1.62705C0 1.56854 0.0040699 1.51099 0.011941 1.45466V1.22869ZM2.44444 3.961V15.1426H19.5556V3.96142L13.5929 9.95559C12.161 11.3951 9.83938 11.3951 8.40748 9.95559L2.44444 3.961ZM4.36617 2.41763H17.6342L11.8645 8.21798C11.3872 8.69778 10.6133 8.69778 10.136 8.21798L4.36617 2.41763Z" fill="#FF0000" />
</svg>
<p>testowymail@mail.com</p>
</div>
<div class="icon-text">
<svg width="22" height="23" viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22 11.3492C22 5.08071 17.0756 0 11 0C4.92438 0 0 5.08071 0 11.3492C0 17.0145 4.02027 21.7096 9.28219 22.5616V14.6327H6.49151V11.3492H9.28219V8.84927C9.28219 6.00731 10.9216 4.43396 13.4351 4.43396C14.6405 4.43396 15.9003 4.65784 15.9003 4.65784V7.45005H14.514C13.1458 7.45005 12.7238 8.3269 12.7238 9.2224V11.3492H15.7737L15.2855 14.6327H12.7238V22.5616C17.9797 21.7096 22 17.0145 22 11.3492Z" fill="#1877F2" />
<path d="M15.2794 14.6327L15.7677 11.3492H12.7178V9.22239C12.7178 8.32689 13.1457 7.45005 14.5079 7.45005H15.8942V4.65783C15.8942 4.65783 14.6345 4.43396 13.429 4.43396C10.9156 4.43396 9.27616 6.0073 9.27616 8.84927V11.3492H6.48547V14.6327H9.27616V22.5616C9.83671 22.6549 10.4093 22.6984 10.994 22.6984C11.5786 22.6984 12.1512 22.6487 12.7118 22.5616V14.6327H15.2794Z" fill="white" />
</svg>
<p2>Facebook fanpage</p2>
<li><a href="{% url 'fanpage' %}">Fanpage</a></li>
{% if user.is_authenticated %}
<li><a href="{% url 'profil' %}">{{ user.username }}</a></li>
<li><a href="{% url 'koszyk' %}">Koszyk</a></li>
<li><a href="{% url 'account_logout' %}">Wyloguj się</a></li>
{% else %}
<li><a href="{% url 'account_login' %}">Koszyk</a></li>
<li><a href="{% url 'account_login' %}">Zaloguj się</a></li>
{% endif %}
</ul>
</nav>
</div>
</div>
<!--Panel-->
<div class="container flex-panel">
<div class="showcase-form flex-col">
<h1>Przepraszamy, kalendarz jest tymczasowo niedostępny</h1>
</div>
</div>
<!--Footer-->
<div class="footer">
<div class="container">
<h2>Kontakt</h2>
<div class="icon-text">
<svg width="22" height="18" viewBox="0 0 22 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<rect x="2.19995" y="2.26282" width="17.6" height="13.5771" fill="white" />
<path fill-rule="evenodd" clip-rule="evenodd" d="M0.011941 1.22869C0.011941 0.550109 0.559142 0 1.23416 0H20.7778C21.4528 0 22 0.550109 22 1.22869V15.1426C22 16.4998 20.9056 17.6 19.5556 17.6H2.44444C1.09441 17.6 0 16.4998 0 15.1426V1.62705C0 1.56854 0.0040699 1.51099 0.011941 1.45466V1.22869ZM2.44444 3.961V15.1426H19.5556V3.96142L13.5929 9.95559C12.161 11.3951 9.83938 11.3951 8.40748 9.95559L2.44444 3.961ZM4.36617 2.41763H17.6342L11.8645 8.21798C11.3872 8.69778 10.6133 8.69778 10.136 8.21798L4.36617 2.41763Z" fill="#FF0000" />
</svg>
<p>testowymail@mail.com</p>
</div>
<div class="icon-text">
<svg width="22" height="23" viewBox="0 0 22 23" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M22 11.3492C22 5.08071 17.0756 0 11 0C4.92438 0 0 5.08071 0 11.3492C0 17.0145 4.02027 21.7096 9.28219 22.5616V14.6327H6.49151V11.3492H9.28219V8.84927C9.28219 6.00731 10.9216 4.43396 13.4351 4.43396C14.6405 4.43396 15.9003 4.65784 15.9003 4.65784V7.45005H14.514C13.1458 7.45005 12.7238 8.3269 12.7238 9.2224V11.3492H15.7737L15.2855 14.6327H12.7238V22.5616C17.9797 21.7096 22 17.0145 22 11.3492Z" fill="#1877F2" />
<path d="M15.2794 14.6327L15.7677 11.3492H12.7178V9.22239C12.7178 8.32689 13.1457 7.45005 14.5079 7.45005H15.8942V4.65783C15.8942 4.65783 14.6345 4.43396 13.429 4.43396C10.9156 4.43396 9.27616 6.0073 9.27616 8.84927V11.3492H6.48547V14.6327H9.27616V22.5616C9.83671 22.6549 10.4093 22.6984 10.994 22.6984C11.5786 22.6984 12.1512 22.6487 12.7118 22.5616V14.6327H15.2794Z" fill="white" />
</svg>
<p2>Facebook fanpage</p2>
</div>
</div>
</div>
</div>
</body>
</html>

2
highneed/events/templates/events/fanpage.html
View File

@ -38,7 +38,7 @@
<div class="showcase-form flex-col">
<h1>Zapraszamy do odwiedzenia nas na Facebooku</h1>
<a class="btn btn-list2" href="">Facebook fanpage link</a>
<a class="btn btn-list2" href="">Facebook fanpage</a>
</div>
</div>

9
highneed/events/templates/events/koszyk.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="pl">
<head>
<meta charset="UTF-8">
@ -42,8 +42,7 @@
<div class="container grid-2">
<div class="col1">
<a href="{% url 'events' %}" class="btn btn-list-2">Zobacz wydarzenia</a>
<a href="{% url 'events' %}" class="btn btn-list-2">Wszystkie wydarzenia</a>
</div>
@ -57,10 +56,10 @@
<p>Miasto: {{ i.place }}</p><b></b>
<p>Opublikowane: {{ i.pub_date }}</p><br>
{% endfor %}
</div>
</div>
</div>
</div>
</div>
</div>
</body>
</html>

17
highneed/events/templates/profil.html
View File

@ -42,24 +42,21 @@
<div class="container grid-2">
<div class="col1">
<a href="{% url 'events' %}" class="btn btn-list-2">Zobacz wydarzenia</a>
<a href="add_event/" class="btn btn-list-2">Stwórz wydarzenie</a>
<a href="{% url 'koszyk' %}" class="btn btn-list-2">Koszyk</a>
<a href="add_event/" class="btn btn-list-2">Utwórz wydarzenie</a>
{% if user.username == "admin" %}
<a href="../profil/add_category/" class="btn btn-list-2">Stwórz kategorię</a>
<a href="../profil/add_category/" class="btn btn-list-2">Utwórz kategorię</a>
{% endif %}
<a href="{% url 'events' %}" class="btn btn-list-2">Wszystkie wydarzenia</a>
<a href="{% url 'account_logout' %}" class="btn btn-list-2" style="background-color:var(--background-dark-green)">Wyloguj się</a>
</div>
<div class="col2">
<div class="grid article3">
<div class="showcase-text">
<h1>Zaplanowane Wydarzenia:</h1>
{% for i in latest_news_list %}
<p>Nazwa: {{ i.title }}</p><b></b>
<p>Data: {{ i.data }}</p><b></b>
<p>Miasto: {{ i.place }}</p><b></b>
<p>Opublikowane: {{ i.pub_date }}</p><br>
{% endfor %}
<h1>Witaj {{user.username}}</h1>
<p>Wybierz kategorię z listy po lewej stronie</p>
</div>
</div>
</div>

7
highneed/static/css/style.css
View File

@ -44,6 +44,13 @@ img {
background-color: black;
}
.post_form{
display:flex;
flex-direction:column;
grid-gap:10px;
margin:20px 0;
}
/* Navbar */
.navbar {
background-color: var(--background-green);