Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
44bf7d4
problemy po zmianie bazy na postgresa
BigBadSheep Oct 22, 2023
a9e21f3
dodanie pierwsze części uprawnień
BigBadSheep Oct 22, 2023
9ff0335
dodanie requirements.txt
BigBadSheep Oct 22, 2023
3cf6e10
Create testowyplik
addisek Oct 23, 2023
7d4763f
Rename testowyplik to testowyplik.html
addisek Oct 23, 2023
b1eb3ab
Delete testowyplik.html
addisek Oct 23, 2023
3d70231
uprawnienia do aplikacji
BigBadSheep Oct 27, 2023
e939167
nowe funckcje
BigBadSheep Nov 20, 2023
f104106
wyświetlanie grup, dodawanie grup, dodawnie flow
BigBadSheep Nov 23, 2023
7a92166
test
Bzdyniuk Nov 24, 2023
cb654b2
moje zmiany od wczoraj
BigBadSheep Nov 24, 2023
6145305
dodanie do gitignore
BigBadSheep Nov 24, 2023
078b112
dodanie domyślnego css
BigBadSheep Nov 24, 2023
fe9e34f
dodanie pustego main.html
BigBadSheep Nov 24, 2023
c4f316a
grupy
BigBadSheep Nov 24, 2023
d1b71b7
dodanie elementów do flow
BigBadSheep Nov 24, 2023
39ab5af
5.12
Bzdyniuk Dec 5, 2023
4741e17
dodanie usuniętego kodu
BigBadSheep Dec 5, 2023
027d3df
naprawa logowania
BigBadSheep Dec 5, 2023
07d0282
dodanie zmian do mian
BigBadSheep Dec 5, 2023
cde49c2
o co biega?
BigBadSheep Dec 5, 2023
69fb763
Merge branch 'main' into stara_wersja
BigBadSheep Dec 5, 2023
1613d48
Merge pull request #2 from BigBadSheep/stara_wersja
BigBadSheep Dec 5, 2023
5e19dda
dodanie prostego upolad
BigBadSheep Dec 5, 2023
898f86b
Merge pull request #3 from BigBadSheep/sheep
BigBadSheep Dec 5, 2023
14766f8
dodanie upload plikow
BigBadSheep Dec 6, 2023
f396839
Merge pull request #4 from BigBadSheep/sheep
BigBadSheep Dec 6, 2023
feec590
zmiana systemu logowania
BigBadSheep Dec 10, 2023
bdccd50
dodawanie obslugi bugow
BigBadSheep Dec 12, 2023
72e0c46
zmiana z id na nazwy
BigBadSheep Dec 14, 2023
ce301ab
Update dodatkowe.txt
BigBadSheep Dec 14, 2023
eeccc3f
dodanie opcji zmiany hasla
BigBadSheep Dec 14, 2023
39c6bce
15.12
Bzdyniuk Dec 15, 2023
a8767a3
15.12
Bzdyniuk Dec 15, 2023
c0f91a8
15.12
Bzdyniuk Dec 15, 2023
af5ad9f
Update add_grp_mem.html
Bzdyniuk Dec 15, 2023
5b0695a
Update admin_bugs.html
Bzdyniuk Dec 15, 2023
5383b92
Update admin_docks.html
Bzdyniuk Dec 15, 2023
d36f7b4
Update admin_edit_user.html
Bzdyniuk Dec 15, 2023
e235379
Update admin_menu.html
Bzdyniuk Dec 15, 2023
f824e0f
Update admin_settings.html
Bzdyniuk Dec 15, 2023
142d417
Update admin_upload.html
Bzdyniuk Dec 15, 2023
e3e4e07
Update base.html
Bzdyniuk Dec 15, 2023
eff03d5
Update docks.html
Bzdyniuk Dec 15, 2023
e71d51c
Update edit_user.html
Bzdyniuk Dec 15, 2023
81fe925
Update flows.html
Bzdyniuk Dec 15, 2023
355c5f8
Update groups.html
Bzdyniuk Dec 15, 2023
e124e60
Update groups_info.html
Bzdyniuk Dec 15, 2023
40e6675
Update login.html
Bzdyniuk Dec 15, 2023
108952f
Create menu.html
Bzdyniuk Dec 15, 2023
20a0b92
Update login.html
Bzdyniuk Dec 15, 2023
c951d81
Update new_flow.html
Bzdyniuk Dec 15, 2023
4a61bcd
Update new_grp.html
Bzdyniuk Dec 15, 2023
06a3c4d
Update new_user.html
Bzdyniuk Dec 15, 2023
6cf2f8d
Update self_edit_user.html
Bzdyniuk Dec 15, 2023
a644bba
Update upload.html
Bzdyniuk Dec 15, 2023
88978f2
Update users.html
Bzdyniuk Dec 15, 2023
e15184b
15.12
Bzdyniuk Dec 15, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .gitattributes

This file was deleted.

8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__pycache__/app.cpython-311.pyc
env/*
*.pyc
env
__pycache__/app.cpython-311.pyc
__pycache__/app.cpython-311.pyc
__pycache__/app.cpython-311.pyc
*.py
17 changes: 17 additions & 0 deletions Templates/add_grp_flow.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html>
<head>
<title> new-flow </title>
<meta charset="="utf-8">
</head>
<body>
{% for message in get_flashed_messages() %}
<div> <p style="color:red"> {{message }} </p> </div>
{%endfor%}
<form id="add_group_flow" action="{{ url_for('add_group_flow') }}" method="POST">
<label> flow id </label> <input type="text" id="flow_id" name="flow_id" > <br>
<label> group id </label> <input type="text" id="group_id" name="group_id" > <br>
<label> value </label> <input type="number" id="value" name="value" > <br>
<input type="submit" value="Send"> <br>
</form>
</body>
242 changes: 242 additions & 0 deletions Templates/add_grp_mem.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,242 @@
<!DOCTYPE html>
<html>
<meta charset="utf-8">
<link href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.1/css/all.min.css">
<style>
body {
font-family: Arial, sans-serif;
background-image: url('https://scontent-waw1-1.xx.fbcdn.net/v/t1.15752-9/393982217_378995091131028_1858520123515179774_n.jpg?_nc_cat=107&ccb=1-7&_nc_sid=8cd0a2&_nc_ohc=1IWNuqyCjZwAX_Sgvd1&_nc_ht=scontent-waw1-1.xx&oh=03_AdQhB4IhOqDqyKDKmPoVNTueJKlaRz3cFzVYEWWacB-Yvw&oe=65840444'); /* Dodaj ścieżkę do pliku graficznego */
background-size: cover;
background-position: center center;
background-repeat: no-repeat;
margin: 0;
padding: 0;
height: 100vh; /* Dodano ustawienie wysokości na 100% wysokości okna przeglądarki */
}

h1 {
background-color: #5a9c65;
color: #fff;
padding: 20px;
text-align: center;
margin: 0;
}

#sidebar {
height: 100%;
width: 0;
position: fixed;
z-index: 1;
top: 0;
left: 0;
background-color: #406b46;
overflow-x: hidden;
transition: 0.5s;
padding-top: 60px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
}

#sidebar a {
padding: 15px 8px;
text-decoration: none;
font-size: 18px;
color: #ffffff;
display: block;
transition: 0.3s;
}

#sidebar a:hover {
color: #5a9c65;
}

#sidebar .close-btn {
position: absolute;
top: 0;
right: 25px;
font-size: 30px;
margin-left: 50px;
cursor: pointer;
}

#content {
transition: margin-left .5s;
padding: 16px;
margin-left: 0;
}

form {
background-color: #fff;
width: 400px;
margin: 0 auto;
padding: 20px;
border-radius: 5px;
box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
}

label {
display: block;
margin-bottom: 5px;
font-weight: bold;
}

input[type="password"] {
width: 100%;
padding: 10px;
margin-bottom: 15px;
border: 1px solid #ccc;
border-radius: 3px;
}

input[type="submit"] {
background-color: #5a9c65;
color: #fff;
padding: 10px 20px;
border: none;
border-radius: 3px;
cursor: pointer;
}

input[type="submit"]:hover {
background-color: #406b46;
}

p {
font-size: 12px;
color: #888;
}

.fa-user,
.fa-lock,
.fa-sign-in-alt,
.fa-arrow-left {
margin-right: 10px;
}

.btn-back {
text-decoration: none;
color: #fff;
background-color: #406b46;
padding: 10px 20px;
border-radius: 3px;
margin-top: 20px;
display: inline-block;
}

.btn-back:hover {
background-color: #5a9c65;
}

#openBtn {
font-size: 30px;
cursor: pointer;
position: fixed;
top: 50%;
left: 0;
margin-top: -15px;
padding: 15px;
background-color: #406b46;
color: #ffffff;
z-index: 2;
transition: left 0.5s;
}

.btn-block {
width: 100%;
}

#userWelcome {
color: #303030;
font-size: 24px;
text-align: center;
margin-bottom: 20px;
position: absolute;
left: 50%;
transform: translateX(-50%);
}
#sidebar a.settings {
font-weight: bold;
background-color: #5a9c65;
color: #fff;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.2);
}
</style>
</head>

<body>
<div id="sidebar">
<div class="close-btn" onclick="closeNav()">×</div>
<a href="{{ url_for('new_user') }}">Rejestracja użytkowników</a>
<a href="{{ url_for('new_grp') }}" class="settings">Dodawanie nowej grupy</a>
<a href="{{ url_for('new_flow') }}">Prześlij nowy dokument</a>
<a href="{{ url_for('flows') }}">Twoje dokumenty</a>
<a href="{{ url_for('admin_bugs') }}">Zgłoszenia użytkowników</a>
<a href="{{ url_for('users') }}">Zarządzanie użytkownikami</a>
<a href="{{ url_for('groups') }}">Zarządzanie grupami</a>
<a href="{{ url_for('admin_settings') }}">Ustawienia</a>
</div>

<div id="content">
<div id="openBtn" onclick="toggleNav()">☰</div>
<nav class="navbar navbar-expand-lg navbar-light bg-light">


<ul class="navbar-nav ml-auto">
<li class="nav-item">
<a class="nav-link" href="{{ url_for('logout') }}">Wyloguj</a>
</li>
</ul>
</nav>
<h1> Dodaj użytownika do grupy </h1>
<br>
<form id="add_group_member" action="{{ url_for('add_group_member') }}" method="POST">

<label> E-mail </label>
<input list="emailb" name="email" id="email">
<datalist id="emailb">
{% for user in users %}
<option value="{{ user.email }}">
{% endfor %}
</datalist>
<br>

<label> Nazwa grupy </label>
<input list="groups" name="groupname" id="groupname">
<datalist id="groups">
{% for gorup in groups %}
<option value="{{ gorup.groupname }}">
{% endfor %}
</datalist>
<br><br>
<input type="submit" value="Send"> <br>
</form>
</div>

<script>
function toggleNav() {
var sidebar = document.getElementById("sidebar");
var content = document.getElementById("content");
var openBtn = document.getElementById("openBtn");

if (sidebar.style.width === "250px") {
closeNav();
} else {
openNav();
}
}

function openNav() {
document.getElementById("sidebar").style.width = "250px";
document.getElementById("content").style.marginLeft = "250px";
document.getElementById("openBtn").style.left = "250px";
}

function closeNav() {
document.getElementById("sidebar").style.width = "0";
document.getElementById("content").style.marginLeft = "0";
document.getElementById("openBtn").style.left = "0";
}
</script>
</body>

</html>
Loading