Skip to content

Refonte de la page generateur #55

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
TefDesign wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Refonte de la page generateur #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fbaf7c
Refonte de la page generateur
TefDesign Sep 8, 2023
370df6e
Suggest a different design for building queues and refactor fast_view…
Kern046 Dec 15, 2023
08061b5
Fixing font info
TefDesign Jun 21, 2024
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: 1 addition & 1 deletion assets/less/colors/color1.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

@color-type: 1;
@light: #b01e2d;
@dark: #510816;
@textOverBg: white;
@medium: #6e161b;
@dark: #510816;

@import '../main.desktop.v3.less';
4 changes: 2 additions & 2 deletions assets/less/colors/color2.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

@color-type: 2;
@light: #233dc0;
@dark: #0c1944;
@textOverBg: white;
@medium: #1d257e;
@medium: #263083;
@dark: #172c70;

@import '../main.desktop.v3.less';
4 changes: 2 additions & 2 deletions assets/less/colors/color4.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

@color-type: 4;
@light: #a935c7;
@dark: #310948;
@textOverBg: white;
@medium: #5a1072;
@medium: #6f1d8c;
@dark: #480f6e;

@import '../main.desktop.v3.less';
9 changes: 6 additions & 3 deletions assets/less/component/common.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,10 @@ input {
padding: 10px;
line-height: 150%;
background: black;
font-size: 14px;
strong {
color: @light;
}
}

.alone-button {
Expand Down Expand Up @@ -885,7 +889,7 @@ input {
text-align: center;
font-size: 12px;
border-radius: 100%;
top: 38px; left: 58px;
top: 30px; left: 50px;
border: solid 1px white;
z-index: 22;
background: @medium;
Expand Down Expand Up @@ -917,7 +921,6 @@ input {

.button {
display: block;
margin: 10px; padding: 5px 10px;
width: 240px; line-height: 20px;
text-align: right;
color: white;
Expand All @@ -935,7 +938,7 @@ input {
}

&.disable {
background: #202020;
background: rgba(@medium, .4);
cursor: default;
}

Expand Down
24 changes: 13 additions & 11 deletions assets/less/component/queue.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
position: relative;
background: black;
border: solid 1px #0A0A0A;
border-top: solid 1px #202020;
border-top-color: #202020;
min-height: 60px;
display: block;

Expand Down Expand Up @@ -65,19 +65,14 @@
float: left;
width: 40px; height: 40px;
margin: 5px; padding: 5px;
background: black;
background: #151515;
border-radius: 100%;
border: solid 1px #202020;
border: solid 1px @light;
}

strong {
display: block;
margin: 6px 0 2px 0;

.level {
font-size: 11px;
color: #CCC;
}
}

.big {
Expand All @@ -86,15 +81,16 @@

em {
display: block;
font-style: normal;
color: #AEAEAE;
}

.progress-container {
position: relative;
display: block;
clear: both;
margin: 5px; height: 3px;
border-radius: 14px;
margin: 5px;
height: 10px;
background: #4F4F4F;
}

Expand All @@ -103,7 +99,13 @@
display: block;
height: 100%;
background: @light;
border-radius: 14px;
}

.level {
font-size: 12px;
color: @light;
}
}

}
}
7 changes: 1 addition & 6 deletions assets/less/component/transaction.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,11 +225,6 @@
}
}

.component .build-item.disable .button span {
color: #696969;
}


.component.transaction .new-transaction {
width: 279px;
position: absolute;
Expand Down Expand Up @@ -276,4 +271,4 @@
&.max-price { right: 5px;}
}
}
}
}
15 changes: 7 additions & 8 deletions assets/less/global.desktop.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
html { height: 100%; }
body {
margin: 0; padding: 0;
font-family: 'Roboto', 'Trebuchet MS', 'Arial', sans-serif;
font-size: 13px;
font-family: 'Titillium Web', sans-serif;
font-size: 16px;
}

.bull {
Expand All @@ -11,11 +11,10 @@ body {
z-index: 1200;
padding: 4px 8px;
max-width: 280px;
color: white;
background: #202020;
color: @dark;
background: @light;
border-radius: 3px;
border: solid 1px #4F4F4F;
box-shadow: inset 0 0 3px black;
box-shadow: inset 0 0 3px @medium;

&:before {
content: '';
Expand All @@ -27,11 +26,11 @@ body {

&.top:before {
bottom: -14px;
border-color: #4F4F4F transparent transparent transparent;
border-color: @light transparent transparent transparent;
}
&.bottom:before {
top: -14px;
border-color: transparent transparent #4F4F4F transparent;
border-color: transparent transparent @light transparent;
}
&.left:before {
right: 12px;
Expand Down
12 changes: 7 additions & 5 deletions src/views/components/bases/ob/dock2.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@
$remainingTime = Utils::interval(Utils::now(), $queue->dEnd, 's');

echo $realSizeQueue > 1
? '<div class="item">'
: '<div class="item active progress" data-progress-output="lite" data-progress-current-time="' . $remainingTime . '" data-progress-total-time="' . $totalTimeShips . '">';
? '<div class="item py-2">'
: '<div class="item py-2 active progress" data-progress-output="lite" data-progress-current-time="' . $remainingTime . '" data-progress-total-time="' . $totalTimeShips . '">';
echo '<a href="' . Format::actionBuilder('dequeueship', $sessionToken, ['baseid' => $ob_dock2->getId(), 'dock' => '2', 'queue' => $queue->id]) . '"' .
'class="button hb lt" title="annuler la commande (attention, vous ne récupérerez que ' . $shipResourceRefund * 100 . '% du montant investi)">×</a>';
echo '<img class="picto" src="' . $mediaPath . 'ship/picto/' . ShipResource::getInfo($queue->shipNumber, 'imageLink') . '.png" alt="" />';
Expand All @@ -178,9 +178,11 @@
}
echo '</div>';
} else {
echo '<div class="item empty">';
echo '<span class="picto"></span>';
echo '<strong>Emplacement libre</strong>';
echo '<div class="item empty py-2">';
echo '<div class="flex items-center">';
echo '<span class="picto"></span>';
echo '<strong>Emplacement libre</strong>';
echo '</div>';
echo '<span class="progress-container"></span>';
echo '</div>';
}
Expand Down
3 changes: 3 additions & 0 deletions tailwind.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,7 @@ module.exports = {
plugins: [
require('@tailwindcss/forms'),
],
safelist: [
'py-2',
],
}
30 changes: 20 additions & 10 deletions templates/blocks/athena/building_panel.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,24 +39,34 @@
{% set level = i + 1 %}
{% set level_data = data[i] %}
<tr {% if current_level > level %}class="small-grey"{% elseif current_level == level %}class="active"{% endif %}>
<td>{{ level_data.note|raw }}</td>
<td><span class="inline-flex items-center gap-2">{{ level_data.note|raw }}</span></td>
<td>
{{ level_data.resourcePrice }}
<img src="{{ asset('build/media/resources/resource.png') }}" alt="ressources" class="icon-color" />
<span class="inline-flex items-center gap-2">
{{ level_data.resourcePrice }}
<img src="{{ asset('build/media/resources/resource.png') }}" alt="ressources" class="icon-color" />
</span>
</td>
<td>
{{ level_data.time }}
<img src="{{ asset('build/media/resources/time.png') }}" alt="relève" class="icon-color" />
<span class="inline-flex items-center gap-2">
{{ level_data.time }}
<img src="{{ asset('build/media/resources/time.png') }}" alt="relève" class="icon-color" />
</span>
</td>
{% for stat_data in level_data.stats %}
<td>
{{ stat_data.stat }}
{% if stat_data.image is defined %}
<img src="{{ asset('build/media/resources/' ~ stat_data.image ~ '.png') }}" alt="{{ stat_data.alt }}" class="icon-color" />
{% endif %}
<span class="inline-flex items-center gap-2">
{{ stat_data.stat }}
{% if stat_data.image is defined %}
<img src="{{ asset('build/media/resources/' ~ stat_data.image ~ '.png') }}" alt="{{ stat_data.alt }}" class="icon-color" />
{% endif %}
</span>
</td>
{% endfor %}
<td>{{ data[i].points }}</td>
<td>
<span class="inline-flex items-center gap-2">
{{ data[i].points }}
</span>
</td>
</tr>
{% endfor %}
</table>
Expand Down
8 changes: 5 additions & 3 deletions templates/components/base/building_queues.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@

{% if building_queues_count < available_queues %}
{% for i in range(building_queues_count, available_queues - 1) %}
<div class="item empty">
<span class="picto"></span>
<strong>Emplacement libre</strong>
<div class="item empty py-2">
<div class="flex items-center">
<span class="picto"></span>
<strong>Emplacement libre</strong>
</div>
<span class="progress-container"></span>
</div>
{% endfor %}
Expand Down
46 changes: 15 additions & 31 deletions templates/components/base/fast_view.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,20 @@

<h4>Générateur</h4>

{% set nextTime = 0 %}
{% set nextTotalTime = 0 %}
{% set realSizeQueue = 0 %}
{% set next_total_time = 0 %}
{% set building_queues_count = building_queues|length %}

<div class="queue">
<div class="queue mt-4">
{% for building_queue in building_queues %}
{% set realSizeQueue = realSizeQueue + 1 %}
{% set nextTime = building_queue|queue_duration %}
{% set nextTotalTime = nextTotalTime + building_queue|building_queue_time %}
{% set next_total_time = next_total_time + get_building_info(building_queue.buildingNumber, 'level', building_queue.targetLevel, 'time') %}

<div class="item {% if realSizeQueue > 1 %}active{% endif %} progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ nextTime }}" data-progress-total-time="{{ nextTotalTime }}">
<a class="button hb lt" title="annuler la construction (attention, vous ne récupérerez que {{ building_resource_refund * 100 }}% du montant investi)">×</a>
<img class="picto" src="{{ asset('build/media/orbitalbase/' ~ building_queue|queue_picture ~ '.png') }}" alt="" />
<strong>
{{ building_queue|queue_name }}
<span class="level">niv. {{ building_queue.targetLevel }}</span>
</strong>
<em>
<span class="progress-text">{{ nextTime|lite_seconds }}</span>
</em>
{% if realSizeQueue > 1 %}
<span class="progress-container"></span>
{% else %}
<span class="progress-container">
<span style="width: {{ (nextTotalTime - nextTime)|percent(nextTotalTime) }}%;" class="progress-bar"></span>
</span>
{% endif %}
</div>
{{ include('molecules/base/building_queue.html.twig', {
building_queues_count,
building_queue,
next_total_time,
}) }}
{% endfor %}
{% if orbital_base|base_max_building_queues > building_queues|length %}
{% if orbital_base|base_max_building_queues > building_queues_count %}
<a href="{{ path('switchbase', { 'baseId': orbital_base.id, 'page': 'generator'}) }}" class="item link">
Construire un bâtiment
</a>
Expand All @@ -88,9 +72,9 @@
{% set remainingTime = ship_queue|queue_duration %}

{% if realSizeQueue > 1 %}
<div class="item">
<div class="item py-2">
{% else %}
<div class="item active progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ remainingTime }}" data-progress-total-time="{{ totalTimeShips }}">
<div class="item py-2 active progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ remainingTime }}" data-progress-total-time="{{ totalTimeShips }}">
{% endif %}

<img class="picto" src="{{ asset('build/media/ship/picto/' ~ ship_queue|ship_queue_picture ~ '.png') }}" alt="" />
Expand Down Expand Up @@ -131,9 +115,9 @@
{% set remainingTime = ship_queue|queue_duration %}

{% if realSizeQueue > 1 %}
<div class="item">
<div class="item py-2">
{% else %}
<div class="item active progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ remainingTime }}" data-progress-total-time="{{ totalTimeShips }}">
<div class="item py-2 active progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ remainingTime }}" data-progress-total-time="{{ totalTimeShips }}">
{% endif %}

<img class="picto" src="{{ asset('build/media/ship/picto/' ~ ship_queue|ship_queue_picture ~ '.png') }}" alt="" />
Expand Down Expand Up @@ -175,7 +159,7 @@
{% set totalTimeTechno = totalTimeTechno + technology_queue|technology_queue_time %}
{% set remainingTotalTime = technology_queue|queue_duration %}

<div class="item active progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ remainingTotalTime }}" data-progress-total-time="{{ totalTimeTechno }}">
<div class="item py-2 active progress" data-progress-output="lite" data-progress-no-reload="true" data-progress-current-time="{{ remainingTotalTime }}" data-progress-total-time="{{ totalTimeTechno }}">
<img class="picto" src="{{ asset('build/media/technology/picto/' ~ technology_queue|queue_picture ~ '.png') }}" alt="" />
<strong>
{{ get_technology_info(technology_queue.technology, 'name') }}
Expand Down
Loading