psmattas/Employee-Management-Portal
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

logout button and user in navbar

Browse Source
This commit is contained in:
Alicja Cięciwa
2020-11-14 17:40:14 +01:00
parent 68337fcf66
commit 5ef5ba52f4
7 changed files with 73 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.idea/workspace.xml generated
View File

@@ -2,13 +2,12 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="15f590a5-5017-44f1-a85e-17dfe3fc5379" name="Default Changelist" comment=""> <list default="true" id="15f590a5-5017-44f1-a85e-17dfe3fc5379" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/static/img/usericon.png" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/config/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/config/urls.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/static/css/main.css" beforeDir="false" afterPath="$PROJECT_DIR$/static/css/main.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/base.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/templates/base.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/base.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/inputhours.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/inputhours.html" afterDir="false" /> <change beforePath="$PROJECT_DIR$/templates/inputhours.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/inputhours.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/work/forms.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/forms.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/work/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/models.py" afterDir="false" /> <change beforePath="$PROJECT_DIR$/work/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/models.py" afterDir="false" />
<change beforePath="$PROJECT_DIR$/work/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/work/views.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />

24
static/css/main.css
View File

@@ -73,12 +73,6 @@ a:active {
align-content: center; align-content: center;
overflow: scroll; overflow: scroll;
} }
/*
@media (max-width: 979px) {
.container {
padding-top: 0px;
}
}*/
/* Hide scrollbar for Chrome, Safari and Opera */ /* Hide scrollbar for Chrome, Safari and Opera */
.container::-webkit-scrollbar { .container::-webkit-scrollbar {
@@ -122,3 +116,21 @@ a:active {
padding: 10px; padding: 10px;
font-size: 16px; font-size: 16px;
} }
.nav-logout{
opacity: 0.7;
justify-content: flex-end;
}
.btn-logout{
margin-left: 10px;
}
a.btn-logout {
-webkit-appearance: button;
-moz-appearance: button;
appearance: button;
text-decoration: none;
color: #EDEDED;
}

BIN
static/img/usericon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

81
templates/base.html
View File

@@ -21,52 +21,58 @@
</head> </head>
<body class="text-center"> <body class="text-center">
<div class="navbar-wrapper"> <div class="navbar-wrapper">
<header> <nav role="navigation" class="navbar fixed-top navbar-light bg-nav navbar-expand-md">
<nav class="navbar fixed-top navbar-light bg-nav navbar-expand-md"> <div class="container-fluid">
<!--Logo--> <div class="navbar-header pull-left">
{% load static %} <!--Logo-->
<a class="navbar-brand" href="#"><img src="{% static 'img/logo.png' %}" width="150" alt="logo" {% load static %}
class="d-inline-block mr-1 align-center"></a> <a class="navbar-brand" href="#"><img src="{% static 'img/logo.png' %}" width="150" alt="logo"
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#mainmenu"> class="d-inline-block mr-1 align-center"></a>
<span class="navbar-toggler-icon"></span> </div>
</button>
<div class="collapse navbar-collapse" id="mainmenu"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse">
<ul class="navbar-nav"> <span class="navbar-toggler-icon"></span>
<!--Start--> </button>
<li class="nav-item">
<a class="nav-link" href="#">Start</a>
</li>
<!--Dodaj godziny-->
<li class="nav-item">
<a class="nav-link" href="/">Dodaj godziny</a>
</li>
{% load auth_extras %} <div class="collapse navbar-collapse navbar-left" id="mainmenu">
{% if request.user|has_group:"moderators" %} <ul class="nav navbar-nav pull-right">
<!--Dodaj pracownika--> <!--Start-->
<li class="nav-item"> <li class="nav-item">
<a class="nav-link" href="/register">Dodaj pracownika</a> <a class="nav-link" href="#">Start</a>
</li> </li>
{% endif %} <!--Dodaj godziny-->
<li class="nav-item">
<a class="nav-link" href="/">Dodaj godziny</a>
</li>
{% load auth_extras %}
{% if request.user|has_group:"moderators" %}
<!--Dodaj pracownika-->
<li class="nav-item">
<a class="nav-link" href="/register">Dodaj pracownika</a>
</li>
{% endif %}
</ul>
</div>
<div class="collapse navbar-collapse navbar-right pull-right nav-logout">
<ul class="nav navbar-nav pull-right">
</ul> <li>
{% if user.is_authenticated %}
<!-- <div class="text-right">-->
<img src="{% static 'img/usericon.png' %}" width="17" alt="user"
class="d-inline-block mr-1"> {{ user.username }}
<a href="{% url 'login' %}" class="btn btn-sm btn-secondary text-nowrap btn-logout">Wyloguj</a>
<!-- </div>-->
{% endif %}
</li>
</ul>
</div>
</div> </div>
</nav> </nav>
</header>
</div> </div>
<div class = "container"> <div class = "container">
<div class="row">
{% if user.is_authenticated %}
Zalogowany: {{ user.username }} &nbsp;
<p><a href="{% url 'login' %}">Wyloguj</a></p> <br>
{% endif %}
</div>
<div class="row"> <div class="row">
{% block content %} {% block content %}
{% endblock %} {% endblock %}
@@ -75,6 +81,7 @@
<footer><p class="mt-5 mb-3 text-muted"> <footer><p class="mt-5 mb-3 text-muted">
&copy; Alicja Cięciwa</p></footer> &copy; Alicja Cięciwa</p></footer>
</div> </div>
</div>
</div> </div>
<script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script> <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script> <script src="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ho+j7jyWK8fNQe+A12Hb8AhRq26LrZ/JpcUGGOn+Y7RsweNrtN/tE3MoK7ZeZDyx" crossorigin="anonymous"></script>

8
templates/inputhours.html
View File

@@ -3,9 +3,9 @@
{% block content %} {% block content %}
{% load crispy_forms_tags %} {% load crispy_forms_tags %}
<div class="container"> <!--<div class="container">-->
<!-- form to input working hours--> <!-- form to input working hours-->
<div class="row"> <!-- <div class="row">-->
<div class="form-hours"> <div class="form-hours">
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
@@ -13,6 +13,6 @@
<button class="btn btn-lg btn-success btn-block" type="submit">Dodaj</button> <button class="btn btn-lg btn-success btn-block" type="submit">Dodaj</button>
</form> </form>
</div> </div>
</div> <!-- </div>-->
</div> <!--</div>-->
{% endblock %} {% endblock %}

BIN
work/__pycache__/models.cpython-38.pyc
View File

Binary file not shown.

6
work/models.py
View File

@@ -1,9 +1,13 @@
from django.db import models from django.db import models
import datetime import datetime
from django.core.validators import MaxValueValidator, MinValueValidator
class HoursInput(models.Model): class HoursInput(models.Model):
date = models.DateField(default=datetime.date.today) date = models.DateField(default=datetime.date.today)
hours_number = models.IntegerField() hours_number = models.IntegerField(validators=[
MaxValueValidator(15, "Niemożliwe, że tyle pracowałeś"),
MinValueValidator(0, "Wprowadź liczbę dodatnią 0-15")
])
workplace = models.CharField(max_length=100) workplace = models.CharField(max_length=100)