Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2025-06-13 12:54:29 +00:00
Code Issues Projects Releases Wiki Activity

improve layout on large screens

Browse Source
This commit is contained in:
Oliver Giles 2020-09-04 13:08:34 +12:00
parent 4316eb8a00
commit e29568f627
3 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/laminar.cpp
View File

@ -259,7 +259,7 @@ std::string Laminar::getStatus(MonitorScope scope) {
populateArtifacts(j, scope.job, scope.num); populateArtifacts(j, scope.job, scope.num);
j.EndArray(); j.EndArray();
} else if(scope.type == MonitorScope::JOB) { } else if(scope.type == MonitorScope::JOB) {
const uint runsPerPage = 10; const uint runsPerPage = 20;
j.startArray("recent"); j.startArray("recent");
// ORDER BY param cannot be bound // ORDER BY param cannot be bound
std::string order_by; std::string order_by;
@ -364,7 +364,7 @@ std::string Laminar::getStatus(MonitorScope scope) {
j.EndObject(); j.EndObject();
} else { // Home page } else { // Home page
j.startArray("recent"); j.startArray("recent");
db->stmt("SELECT * FROM builds ORDER BY completedAt DESC LIMIT 15") db->stmt("SELECT * FROM builds ORDER BY completedAt DESC LIMIT 20")
.fetch<str,uint,str,time_t,time_t,time_t,int>([&](str name,uint build,str context,time_t,time_t started,time_t completed,int result){ .fetch<str,uint,str,time_t,time_t,time_t,int>([&](str name,uint build,str context,time_t,time_t started,time_t completed,int result){
j.StartObject(); j.StartObject();
j.set("name", name) j.set("name", name)

14
src/resources/index.html
View File

@ -66,14 +66,12 @@
<div><canvas id="chartUtil"></canvas></div> <div><canvas id="chartUtil"></canvas></div>
</div> </div>
</div> </div>
<div> <div id="page-home-plots">
<div style="display: grid; grid-template-columns: repeat(auto-fill, minmax(380px, 1fr)); gap: 5px; padding: 5px;"> <div><canvas id="chartBpd"></canvas></div>
<div><canvas id="chartBpd"></canvas></div> <div><canvas id="chartBpj"></canvas></div>
<div><canvas id="chartBpj"></canvas></div> <div><canvas id="chartTpj"></canvas></div>
<div><canvas id="chartTpj"></canvas></div> <div><canvas id="chartBuildTimeChanges"></canvas></div>
<div><canvas id="chartBuildTimeChanges"></canvas></div> <div><canvas id="chartBuildTimeDist"></canvas></div>
<div><canvas id="chartBuildTimeDist"></canvas></div>
</div>
</div> </div>
</section> </section>
</div></template> </div></template>

15
src/resources/style.css
View File

@ -214,6 +214,8 @@ button:not([disabled]) { cursor: pointer; color: var(--main-fg); }
grid-template-columns: 1fr 1fr 1fr; grid-template-columns: 1fr 1fr 1fr;
padding: 15px; padding: 15px;
gap: 15px; gap: 15px;
max-width: 1600px;
margin: auto;
text-align: center; text-align: center;
} }
@media (max-width: 650px) { @media (max-width: 650px) {
@ -221,6 +223,19 @@ button:not([disabled]) { cursor: pointer; color: var(--main-fg); }
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
} }
#page-home-plots {
display: grid;
grid-template-columns: 1fr 1fr;
padding: 5px;
gap: 5px;
max-width: 1600px;
margin: auto;
}
@media (max-width: 1095px) {
#page-home-plots {
grid-template-columns: 1fr;
}
}
#page-job-main { #page-job-main {
display: grid; display: grid;
grid-template: auto 1fr / minmax(550px, 1fr) 1fr; grid-template: auto 1fr / minmax(550px, 1fr) 1fr;