Skip to content

Dodanie kolumny z ilością wystąpień danej komendy + drobna poprawka w kodzie (brakowało zamknięcia nawiasu) #37

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

Open
python-kdomanski wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Dodanie kolumny z ilością wystąpień danej komendy + drobna poprawka w kodzie (brakowało zamknięcia nawiasu) #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ea5d71
Dodanie kolumny z ilością wystapień danej komendy
python-kdomanski Apr 23, 2022
f2a5833
Merge branch 'ZPXD:main' into main
python-kdomanski Apr 24, 2022
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: 2 additions & 0 deletions app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def load_classic_data():
command = {}
command['name'] = None
command['rank'] = None
command['rank_number'] = None
command['rank_list'] = []
command['description'] = []

Expand Down Expand Up @@ -105,6 +106,7 @@ def load_classic_data():
rank = 33 - rank
command['rank_list'].append(rank)
command['rank'] = sum(command['rank_list'])
command['rank_number'] = len(command['rank_list'])

# Description:
description = text_lines[idx+1]
Expand Down
252 changes: 132 additions & 120 deletions templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<!DOCTYPE html>
<html>

<head>
<title>LinuxHot16Challenge</title>
<meta charset="UTF-8">
Expand All @@ -8,136 +9,147 @@
<link rel="stylesheet" href="{{ url_for('static', filename='bootstrap.css')}}">
<link rel="stylesheet" href="{{ url_for('static', filename='style.css')}}">
</head>

<body class="app-body" style="background-color: var(--bs-gray-200)">

<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom border-1">
<div class="container">
<a class="navbar-brand fw-bolder" href="#">mg wymiata</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
<nav class="navbar navbar-expand-lg navbar-light bg-light border-bottom border-1">
<div class="container">
<a class="navbar-brand fw-bolder" href="#">mg wymiata</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav"
aria-controls="navbarNav" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active text-decoration-underline" aria-current="page" href="#">Strona główna</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Podstrona</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Podstrona 2</a>
</li>
</ul>
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link active text-decoration-underline" aria-current="page" href="#">Strona
główna</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Podstrona</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#">Podstrona 2</a>
</li>
</ul>
</div>
</div>
</div>
</nav>

<div class="container py-5 bg-warning">
<h1 class="h1 text-uppercase fw-bold fs-1 text-center mt-5 mb-5">Linux hot 16 challenge</h1>
</div>

<div class="container bg-light">
<nav class="pt-3 pb-1" style="--bs-breadcrumb-divider: '>';" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item text-dark"><a href="#">Strona główna</a></li>
<li class="breadcrumb-item active text-dark" aria-current="page">Podstrona</li>
</ol>
</nav>
</div>

<div class="container py-5 bg-warning">
<h1 class="h1 text-uppercase fw-bold fs-1 text-center mt-5 mb-5">Linux hot 16 challenge</h1>
</div>

<div class="container bg-light">
<nav class="pt-3 pb-1" style="--bs-breadcrumb-divider: '>';" aria-label="breadcrumb">
<ol class="breadcrumb">
<li class="breadcrumb-item text-dark"><a href="#">Strona główna</a></li>
<li class="breadcrumb-item active text-dark" aria-current="page">Podstrona</li>
</ol>
</nav>
</div>


<div class="container bg-dark text-light py-3">
<div class="d-flex p-3 align-content-between">
<div class="fs-4 fw-bold col-3 d-none d-lg-flex"><span>Szukaj komendy:</span></div>
<form class="input-group">
<input type="text" class="form-control" placeholder="Znajdź komendę">
<input type="button" value="Szukaj" class="input-group-text">
</form>
<div class="container bg-dark text-light py-3">
<div class="d-flex p-3 align-content-between">
<div class="fs-4 fw-bold col-3 d-none d-lg-flex"><span>Szukaj komendy:</span></div>
<form class="input-group">
<input type="text" class="form-control" placeholder="Znajdź komendę">
<input type="button" value="Szukaj" class="input-group-text">
</form>
</div>
</div>
</div>

<div class="container bg-light py-2">
<table class="table table-hover table-bordered ">
<thead class="table-light">
<tr>
<th class="d-none d-md-table-cell">Pozycja</th>
<th class="col-2 d-none d-md-table-cell">Ilość punktów</th>
<th class="col-2">Komenda</th>
<th>Opis</th>
</tr>
</thead>
<tbody>
<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[0].nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell"><span class="badge fs-2 bg-dark">{{ranking[0].rank}}</span></td>
<td class="fw-bold">{{ranking[0].name}}</td>
<td class="text-justify p-3">{{ranking[0].description[3]}}</td>

</tr>
<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[1].nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell"><span class="badge fs-3 bg-secondary">{{ranking[1].rank}}</span></td>
<td class="fw-bold">{{ranking[1].name}}</td>
<td class="text-justify p-3">{{ranking[1].description[3]}}</td>
</tr>

<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[2].nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell"><span
class="badge fs-4 bg-white text-dark border border-secondary">{{ranking[2].rank}}</span></td>
<td class="fw-bold">{{ranking[2].name}}</td>
<td class="text-justify p-3">{{ranking[2].description[3]}}</td>
</tr>

{% for position in ranking[3:] %}
<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{position.nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell">{{position.rank}}</td>
<td class="fw-bold">{{position.name}}</td>
{% if position.description[3]|length > 2 %}
<td class="text-justify p-3">{{position.description[3]}}</td>
{% else %}
<td class="text-justify p-3">{{position.description[0]}}</td>
{% endif %}
</tr>
{% endfor %}


</tbody>
</table>
</div>

<div class="container bg-light py-4">
<nav class="bg-light">
<ul class="pagination justify-content-end">
<li class="page-item"><a class="page-link bg-dark text-light" href="#">1</a></li>
<li class="page-item"><a class="page-link bg-light text-dark" href="#">2</a></li>
<li class="page-item"><a class="page-link bg-light text-dark" href="#">3</a></li>
<li class="page-item"><a class="page-link bg-light text-dark" href="#">Następny</a></li>

<div class="container bg-light py-2">
<table class="table table-hover table-bordered ">
<thead class="table-light">
<tr>
<th class="d-none d-md-table-cell">Pozycja</th>
<th class="col-2 d-none d-md-table-cell">Ilość punktów</th>
<th class="col-2 d-none d-md-table-cell">Ilość wystąpień</th>
<th class="col-2">Komenda</th>
<th>Opis</th>
</tr>
</thead>
<tbody>
<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[0].nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell"><span
class="badge fs-2 bg-dark">{{ranking[0].rank}}</span></td>
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[0].rank_number}}</td>
<td class="fw-bold">{{ranking[0].name}}</td>
<td class="text-justify p-3">{{ranking[0].description[3]}}</td>

</tr>
<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[1].nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell"><span
class="badge fs-3 bg-secondary">{{ranking[1].rank}}</span></td>
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[1].rank_number}}</td>
<td class="fw-bold">{{ranking[1].name}}</td>
<td class="text-justify p-3">{{ranking[1].description[3]}}</td>
</tr>

<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[2].nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell"><span
class="badge fs-4 bg-white text-dark border border-secondary">{{ranking[2].rank}}</span>
</td>
<td class="text-center fw-bold d-none d-md-table-cell">{{ranking[2].rank_number}}</td>
<td class="fw-bold">{{ranking[2].name}}</td>
<td class="text-justify p-3">{{ranking[2].description[3]}}</td>
</tr>

{% for position in ranking[3:] %}
<tr class="align-middle">
<td class="text-center fw-bold d-none d-md-table-cell">{{position.nr}}</td>
<td class="text-center fw-bold d-none d-md-table-cell">{{position.rank}}</td>
<td class="text-center fw-bold d-none d-md-table-cell">{{position.rank_number}}</td>
<td class="fw-bold">{{position.name}}</td>
{% if position.description[3]|length > 2 %}
<td class="text-justify p-3">{{position.description[3]}}</td>
{% else %}
<td class="text-justify p-3">{{position.description[0]}}</td>
{% endif %}
</tr>
{% endfor %}


</tbody>
</table>
</div>

<div class="container bg-light py-4">
<nav class="bg-light">
<ul class="pagination justify-content-end">
<li class="page-item"><a class="page-link bg-dark text-light" href="#">1</a></li>
<li class="page-item"><a class="page-link bg-light text-dark" href="#">2</a></li>
<li class="page-item"><a class="page-link bg-light text-dark" href="#">3</a></li>
<li class="page-item"><a class="page-link bg-light text-dark" href="#">Następny</a></li>
</ul>
</nav>
</div>

<div class="container-fluid">
<ul class="nav justify-content-center py-5">
<li class="nav-item">
<a class="nav-link text-black fw-bold" aria-current="page" href="#">Link 1</a>
</li>
<li class="nav-item">
<a class="nav-link text-black" href="#">Link 2</a>
</li>
<li class="nav-item">
<a class="nav-link text-black" href="#">Link 3</a>
</li>
<li class="nav-item">
<a class="nav-link disabled">Disabled</a>
</li>
</ul>
</nav>
</div>

<div class="container-fluid">
<ul class="nav justify-content-center py-5">
<li class="nav-item">
<a class="nav-link text-black fw-bold" aria-current="page" href="#">Link 1</a>
</li>
<li class="nav-item">
<a class="nav-link text-black" href="#">Link 2</a>
</li>
<li class="nav-item">
<a class="nav-link text-black" href="#">Link 3</a>
</li>
<li class="nav-item">
<a class="nav-link disabled">Disabled</a>
</li>
</ul>
<div class="text-center pb-2">&copy; 2022</div>
</div>
<div class="text-center pb-2">&copy; 2022</div>
</div>

</body>
<script src="bootstrap.bundle.js"></script>
<!--<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-ka7Sk0Gln4gmtz2MlQnikT1wXgYsOg+OMhuP+IlRH9sENBO0LRn5q+8nbTov4+1p" crossorigin="anonymous"></script>-->
</html>

</html>