Skip to content

Commit d702355

Browse files
AleDouglasAleDouglas
committed
FIxed front-end bugs
1 parent da4f570 commit d702355

90 files changed

Lines changed: 28 additions & 3590 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Alpha/frontend/static/javascript/key.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ document.getElementById('newKeyForm').addEventListener('submit', function(event)
2828
var get_table = document.getElementById('KeyTable');
2929

3030
var new_table = '<tr class="tb-height" id="KeyID'+ response.key_id +'">';
31-
new_table += '<td>' + response.key_title + '#' + response.key_id + '</td>';
31+
new_table += '<td>' + response.key_title + ' <span style="color: grey">#' + response.key_id + '</span></td>';
3232
new_table += '<td style="color: red;">' + response.key_inventory +'</td>';
3333
new_table += '<td style="color: red;">' + response.key_playbook +'</td>';
3434
new_table += '<td style="color: red;">' + response.key_template +'</td>';

‎Alpha/frontend/templates/pages/_base.html‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,24 @@
4242

4343
}
4444
</style>
45-
<body id="body-pd" class="body-pd">
45+
<body id="body-pd">
4646

4747

48-
<header class="header body-pd" id="header">
49-
<div class="header_toggle"> <i class="bx bx-menu bx-x" id="header-toggle"></i></div>
48+
<header class="header" id="header">
49+
<div class="header_toggle"> <i class="bx bx-menu" id="header-toggle"></i></div>
50+
<div class="header_toggle"> <a href="#" data-bs-toggle="modal" data-bs-target="#LogoutModal"> <i class='bx bx-log-out nav_icon' style="color: red;"></i> <span class="nav_name" style="color: red;">SignOut</span></a></div>
51+
52+
5053
</header>
51-
<div class="l-navbar showNavBar" id="nav-bar">
54+
<div class="l-navbar" id="nav-bar">
5255
<nav class="nav">
5356
<div>
54-
<div class="btn-dropdown dropdown">
55-
<button class="btn-principal dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
56-
<div><i class='bx bxs-archive' style="font-size: 20px; margin-left: 5px;"></i>
57-
<span class="nav_logo-name">{{project_title}}</span></div>
57+
<a href="#" class="nav_logo">
58+
<i class='bx bxs-archive nav_logo-icon'></i>
59+
<span class="nav_logo-name">{{project_title}}</span>
60+
</a>
5861

59-
</button>
60-
<ul class="dropdown-menu">
61-
<li><a class="dropdown-item" href="{% url 'home' %}">Project List</a></li>
6262

63-
</ul>
64-
</div>
6563
<div class="nav_list">
6664
<a href="{% url 'dashboard' project_id%}" class="nav_link"> <i class='bx bxs-dashboard' ></i> <span class="nav_name">Dashboard</span> </a>
6765
<a href="{% url 'template' project_id%}" class="nav_link"> <i class='bx bx-task' ></i> <span class="nav_name">Task Templates</span> </a>
@@ -75,7 +73,6 @@
7573
<div>
7674
{% if user.is_staff %}
7775
{% endif %}
78-
<a href="#" class="nav_link" data-bs-toggle="modal" data-bs-target="#LogoutModal"> <i class='bx bx-log-out nav_icon'></i> <span class="nav_name">SignOut</span></a>
7976
</div>
8077
</nav>
8178
</div>

‎Alpha/frontend/templates/pages/project/project_dashboard.html‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88

99

1010

11-
12-
11+
<div class="welcomePage">
12+
<h1>Dashboard</h1>
13+
</div>
14+
<hr>
1315
<table id="logAct" class="table" style="width:100%;">
1416
<thead>
1517
<tr class="tb-height">

‎Alpha/frontend/templates/pages/project/project_inventory.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
.btn-newinventory{
1313
background-color: rgba(128, 128, 128, 0.301);
1414
border: 0px;
15-
border-radius: 5px;
15+
border-radius: 15px;
1616
padding: 10px 20px 10px 20px;
1717
font-weight: 900;
1818
}

‎Alpha/frontend/templates/pages/project/project_key.html‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
margin-top: 45px;
1414
text-align-last: center;
1515
}
16-
17-
.btn-newKey{
18-
background-color: rgba(128, 128, 128, 0.301);
19-
border: 0px;
20-
border-radius: 5px;
21-
padding: 10px 20px 10px 20px;
22-
font-weight: 900;
23-
}
2416
.btn-newKey:hover{
2517
background-color: rgba(128, 128, 128, 0.671);
2618

@@ -32,10 +24,6 @@
3224
padding: 10px 20px 10px 20px;
3325
font-weight: 900;
3426
}
35-
.btn-newKey:hover{
36-
background-color: rgba(162, 226, 119, 0.671);
37-
38-
}
3927
.tb-height td{
4028
height: 75px;
4129
vertical-align: middle;
@@ -99,7 +87,7 @@
9987

10088
<div class="welcomePage">
10189
<h1>Project Key's</h1>
102-
<button class="btn-newKey" data-bs-toggle="modal" data-bs-target="#newKeyModal">Generate a new key</button>
90+
<button class="btn-newKey" data-bs-toggle="modal" data-bs-target="#newKeyModal">NEW KEY</button>
10391
</div>
10492

10593
<hr>
@@ -118,7 +106,7 @@ <h1>Project Key's</h1>
118106
<tbody id="KeyTable">
119107
{% for key in project_key %}
120108
<tr class="tb-height" id="KeyID{{key.id}}">
121-
<td>{{ key.name }} #{{key.id}}</td> <!-- TITLE -->
109+
<td>{{ key.name }} <span style="color: grey;">#{{key.id}}</span></td> <!-- TITLE -->
122110
<td style="color: red;">{{key.add_inventory}}</td> <!-- ADD INVENTORY -->
123111
<td style="color: red;">{{key.add_playbook}}</td> <!-- ADD PLAYBOOK -->
124112
<td style="color: red;">{{key.add_template}}</td> <!-- ADD TEMPLATE -->

‎Alpha/frontend/templates/pages/project/project_playbook.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
text-align-last: center;
1010
}
1111

12-
.btn-newplaybook{
12+
.btn-newplaybook{
1313
background-color: rgba(128, 128, 128, 0.301);
1414
border: 0px;
15-
border-radius: 5px;
15+
border-radius: 15px;
1616
padding: 10px 20px 10px 20px;
1717
font-weight: 900;
1818
}

‎Alpha/frontend/templates/pages/project/project_project.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ <h3>Recent projects</h3>
115115

116116
<!-- Project List-->
117117
<!-- Resultado da criação do projeto -->
118-
<div id="result"></div>
118+
<div id="result" style="color: #517021;font-weight: 900;"></div>
119119
<div class="card">
120120
{% for project in project_list %}
121121
<div class="card-principal" id="card-id{{project.id}}">
@@ -152,7 +152,7 @@ <h1 class="modal-title fs-5" id="createProjectModalLabel">New Project</h1>
152152
<div class="card">
153153
{% csrf_token %}
154154
<input type="text" id="title" name="title" placeholder="Título do projecto" style="border-bottom: 1px solid rgba(139, 139, 139, 0.534);" required>
155-
<input type="password" id="password" name="password" placeholder="Senha do projecto ( Opcional )">
155+
<input type="password" id="password" name="password" placeholder="Senha do projecto ( Opcional )" hidden>
156156
</div>
157157
<button type="submit" class="btn-createproject" style="margin-top: 15px;" data-bs-dismiss="modal" aria-label="Close" >Create Project</button>
158158

‎Alpha/frontend/templates/pages/project/project_task.html‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,17 +130,13 @@
130130
font-weight: 900;
131131
}
132132
@media (min-width: 992px){
133-
.modal-dialog{
134-
max-width: none;
135-
margin-right: 0;
136-
margin-left: 0;
137-
}
138133
.modal-lg, .modal-xl {
139134
--bs-modal-width: 1200px;
140135
}
141136
}
142137

143-
@media (min-width: 576px){
138+
139+
@media (max-width: 992px){
144140
.modal-dialog{
145141
max-width: none;
146142
margin-right: 0;

‎Alpha/frontend/templates/pages/project/project_template.html‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
.btn-newtemplate{
1616
background-color: rgba(128, 128, 128, 0.301);
1717
border: 0px;
18-
border-radius: 5px;
18+
border-radius: 15px;
1919
padding: 10px 20px 10px 20px;
2020
font-weight: 900;
2121
}
@@ -138,7 +138,8 @@
138138
}
139139
}
140140

141-
@media (min-width: 576px){
141+
142+
@media (max-width: 992px){
142143
.modal-dialog{
143144
max-width: none;
144145
margin-right: 0;

‎WebApi/backend/DAL/DAO/ansibleDAO.py‎

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)