Skip to content
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.

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

[NEW UI] Improve errors page and fix logs height #1113

Merged
merged 5 commits into from
Jan 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ node_modules/
/tests/UI/test-results/

## Compile assets
/views/assets/
/views/css/
/views/img/
/views/js/
Expand Down
22 changes: 0 additions & 22 deletions _dev/img/404.svg

This file was deleted.

5 changes: 0 additions & 5 deletions _dev/img/500.svg

This file was deleted.

45 changes: 45 additions & 0 deletions _dev/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions _dev/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"prettier": "^3.3.3",
"rollup-plugin-delete": "^2.1.0",
"sass": "^1.77.8",
"terser": "^5.37.0",
"ts-jest": "^29.2.5",
"ts-node": "^10.9.2",
"typescript": ">=5.5.4 <=5.6.0",
Expand Down
Binary file added _dev/src/fonts/Prestafont-Regular.woff
Binary file not shown.
6 changes: 6 additions & 0 deletions _dev/src/scss/_fonts.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@font-face {
font-family: "Prestafont";
font-weight: 400;
src: url("../fonts/Prestafont-Regular.woff");
font-display: swap;
}
1 change: 1 addition & 0 deletions _dev/src/scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ $cdk-prefix: "cdk-";
--#{$ua-prefix}primary: var(--#{$ua-prefix}primary-800);
--#{$ua-prefix}primary-hover: var(--#{$ua-prefix}primary-700);
--#{$ua-prefix}muted-background-color: var(--#{$ua-prefix}primary-200);
--#{$ua-prefix}font-family-prestafont: "Prestafont", sans-serif;
--#{$ua-prefix}font-family-material-icons: var(
--#{$cdk-prefix}font-family-material-icons,
"Material Icons"
Expand Down
51 changes: 32 additions & 19 deletions _dev/src/scss/layouts/_error.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@use "../variables" as *;
@use "../fonts" as *;

$e: ".error-page";

Expand All @@ -14,9 +15,21 @@ $e: ".error-page";
border: 1px solid var(--#{$ua-prefix}border-color);
}

&__img {
max-width: 100%;
height: auto;
&__code {
font-family: var(--#{$ua-prefix}font-family-prestafont);
font-size: clamp(7rem, 13vw, 12rem);
line-height: 1;
color: var(--#{$ua-prefix}primary-800);
}

&__code-char {
&[data-error-code-char-index="2"] {
font-feature-settings: "ss02";
}

&[data-error-code-char-index="3"] {
font-feature-settings: "ss01";
}
}

&__infos {
Expand Down Expand Up @@ -54,10 +67,6 @@ $e: ".error-page";
padding: 2rem;
}

&__img {
width: 17.5rem;
}

&__infos {
justify-self: center;
width: 100%;
Expand All @@ -72,18 +81,6 @@ $e: ".error-page";
}
}
}

// Handle auto fit height
@container html-block (min-width: 0) {
display: grid;
grid-template-rows: 1fr;
grid-template-columns: minmax(0, 1fr);
min-height: calc(100cqh - var(--#{$ua-prefix}header-offset-mobile));
}

@container html-block (min-width: 1024px) {
min-height: calc(100cqh - var(--#{$ua-prefix}header-offset));
}
}

// Enable auto fit height
Expand Down Expand Up @@ -122,6 +119,22 @@ html {
#main {
padding-block-end: 0;
}

// Handle auto fit height
@container html-block (min-width: 0) {
#{$ua-id} {
display: grid;
grid-template-rows: 1fr;
grid-template-columns: minmax(0, 1fr);
min-height: calc(100cqh - var(--#{$ua-prefix}header-offset-mobile));
}
}

@container html-block (min-width: 1024px) {
#{$ua-id} {
min-height: calc(100cqh - var(--#{$ua-prefix}header-offset));
}
}
}
}
}
4 changes: 4 additions & 0 deletions _dev/src/scss/layouts/_logs-pages.scss
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ html {
// Logs adjustments
.logs {
flex-grow: 1;

&__scroll {
container-type: size;
}
}

// Page adjustments to handle auto fit height
Expand Down
6 changes: 6 additions & 0 deletions _dev/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,12 @@ export default defineConfig({
return 'assets/[name].[ext]';
}
}
},
minify: 'terser',
terserOptions: {
mangle: {
reserved: ['$']
}
}
},
plugins: [
Expand Down
6 changes: 4 additions & 2 deletions views/templates/layouts/error.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,10 @@
{% block update_assistant %}
<div id="ua_error_{{ error_code }}" class="error-page">
<div class="error-page__container">
{% block img %}
{# Default image can go here, or it can be left empty so that children can override it #}
{% block error_code %}
<div class="error-page__code">
{% for char in error_code|split('') %}<span class="error-page__code-char" data-error-code-char-index="{{ loop.index }}">{{ char == '0' ? 'O' : char }}</span>{% endfor %}
</div>
{% endblock %}

<div class="error-page__infos">
Expand Down
4 changes: 0 additions & 4 deletions views/templates/pages/errors/404.html.twig
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{% extends "@ModuleAutoUpgrade/layouts/error.html.twig" %}

{% block img %}
<img class="error-page__img" src="{{ assets_base_path }}/img/404.svg" width="408" height="141" alt=""/>
{% endblock %}

{% block title %}
<h2 class="error-page__title">
{{ 'Something went wrong...'|trans({}) }}
Expand Down
4 changes: 0 additions & 4 deletions views/templates/pages/errors/500.html.twig
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{% extends "@ModuleAutoUpgrade/layouts/error.html.twig" %}

{% block img %}
<img class="error-page__img" src="{{ psBaseUri }}img/500.svg" width="403" height="174" alt=""/>
{% endblock %}

{% block title %}
<h2 class="error-page__title">
{{ 'Something went wrong...'|trans({}) }}
Expand Down
Loading