diff --git a/src/applets/disks/disks.html b/src/applets/disks/disks.html index c7d34bd..1cb217f 100644 --- a/src/applets/disks/disks.html +++ b/src/applets/disks/disks.html @@ -1,31 +1,9 @@ {% extends "layout.html" %} {% block body %} -
+
-
- -

  System Installer - Disks and Partitions

- -
- -
- -
- -
- - - - - - - -
- -
- -

How would you like to install Debian?

+

How would you like to install Debian?


@@ -46,42 +24,11 @@
-

There are {{ blockdevs["blockdevices"]|count }} block devices detected.

-

They are

-
- -{% for disk in blockdevs["blockdevices"] %} -

Diskname: {{ disk['name'] }}

-

Model: {{ disk['model'] }}

-

Serial: {{ disk['serial'] }}

-

Removable: {{ disk['rm'] }}

-

Size: {{ (disk['size'] | int) / 1024000000 | round(2) }} GiB

-

ID: {{disk['id'] }}

-

pttype: {{disk['pttype'] }}

-

Maj:min: {{disk['maj:min']}}

-

phy-sec: {{ disk['phy-sec'] }}. log-sec: {{ disk['log-sec'] }}

-

There are {{ disk['children']|count }} Children

-{% for child in disk['children'] %} -
-

Name: {{ child['name'] }}. Path: {{ child['path'] }}. {{ child['size'] }}. Block: {{ child['subsystems'] }} {{ child['maj:min'] }} {{ child['type'] }}

-

Fstype: {{ child['fstype'] }}. Label: {{ child['label'] }}. Rota: {{ child['rota'] }}

-

Parttypename: {{ child['parttypename'] }} -
-{% endfor %} -
-{% endfor %} -

Proposed layout:

-
+
- -
- -

Physical disk: TOSHIBA HDWD120 (2000 GB)

@@ -129,11 +76,41 @@
- -

-
+ +
+ +

There are {{ blockdevs["blockdevices"]|count }} block devices detected.

+

They are

+
+ +{% for disk in blockdevs["blockdevices"] %} +

Diskname: {{ disk['name'] }}

+

Model: {{ disk['model'] }}

+

Serial: {{ disk['serial'] }}

+

Removable: {{ disk['rm'] }}

+

Size: {{ (disk['size'] | int) / 1024000000 | round(2) }} GiB

+

ID: {{disk['id'] }}

+

pttype: {{disk['pttype'] }}

+

Maj:min: {{disk['maj:min']}}

+

phy-sec: {{ disk['phy-sec'] }}. log-sec: {{ disk['log-sec'] }}

+

There are {{ disk['children']|count }} Children

+{% for child in disk['children'] %} +
+

Name: {{ child['name'] }}. Path: {{ child['path'] }}. {{ child['size'] }}. Block: {{ child['subsystems'] }} {{ child['maj:min'] }} {{ child['type'] }}

+

Fstype: {{ child['fstype'] }}. Label: {{ child['label'] }}. Rota: {{ child['rota'] }}

+

Parttypename: {{ child['parttypename'] }} +
+{% endfor %} +
+{% endfor %} + + + +



@@ -151,7 +128,6 @@
-
{% endblock %} diff --git a/src/applets/disks/routes.py b/src/applets/disks/routes.py index c9062ee..2022747 100644 --- a/src/applets/disks/routes.py +++ b/src/applets/disks/routes.py @@ -3,7 +3,7 @@ from flask import Flask, request, session, redirect, \ url_for, render_template, flash, Blueprint import dmm.lsblk as lsblk -@bp.route('/disks/') +@bp.route('/disks') def disks(): """ Disks screen for the webui. diff --git a/src/applets/software/software.html b/src/applets/software/software.html index 980d834..3dcfb7a 100644 --- a/src/applets/software/software.html +++ b/src/applets/software/software.html @@ -1,24 +1,9 @@ {% extends "layout.html" %} {% block body %} -

Select Software

+
-
- - -
- -
- -
- -

Would you like fries with that?

+

Would you like fries with that?


diff --git a/src/applets/summary/summary.html b/src/applets/summary/summary.html index ead12cf..ba1b1c0 100644 --- a/src/applets/summary/summary.html +++ b/src/applets/summary/summary.html @@ -1,36 +1,9 @@ - - - - - - - - - +{% extends "layout.html" %} +{% block body %} -
+
-
-
- -

Summary

- -
- - -
- -
- -
- -

Ready to install.

+

Ready to install! Please review all changes.


@@ -41,8 +14,8 @@
+
- - +{% endblock %} diff --git a/src/applets/users/users.html b/src/applets/users/users.html index 312b47d..994fc00 100644 --- a/src/applets/users/users.html +++ b/src/applets/users/users.html @@ -1,43 +1,18 @@ - - - - - - - - - +{% extends "layout.html" %} +{% block body %} -
+
-
-
- -

Configure User

+

Let's set up an initial user.


+ -
- -
- -
- -

Let's set up an initial user.

- -
+
- -
- +
@@ -69,6 +44,8 @@
+
+

@@ -79,5 +56,6 @@
- - +
+ +{% endblock %} diff --git a/src/applets/welcome/welcome.html b/src/applets/welcome/welcome.html index 5c6c0ad..51caef9 100644 --- a/src/applets/welcome/welcome.html +++ b/src/applets/welcome/welcome.html @@ -1,47 +1,19 @@ - - - - - - - - - +{% extends "layout.html" %} +{% block body %} -
+
- -
-
- -

Welcome to System Installer

+

Welcome! This setup program will install Debian on to your system.


- -
- -
- -
- -

Welcome! This setup program will install Debian on to your system.

- -
- -
+
- -
+ +
- @@ -55,7 +27,7 @@
- @@ -69,7 +41,7 @@
- @@ -79,7 +51,7 @@
-





+





@@ -89,5 +61,4 @@
- - +{% endblock %} diff --git a/src/static/welcome.css b/src/static/welcome.css index de8fac7..69a3ff1 100644 --- a/src/static/welcome.css +++ b/src/static/welcome.css @@ -1,21 +1,13 @@ -@mixin glassmorphism() { - background: rgba(255,255,255,0.05); - backdrop-filter: blur(10px); -} - -.bg { - position: absolute; - z-index:-1; - top:0; - right:0; - bottom:0; - left:0; - -background-image: radial-gradient(circle at 30% 86%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 8%,transparent 8%, transparent 92%),radial-gradient(circle at 55% 100%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 8%,transparent 8%, transparent 92%),radial-gradient(circle at 40% 75%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 6%,transparent 6%, transparent 94%),radial-gradient(circle at 7% 99%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 6%,transparent 6%, transparent 94%),radial-gradient(circle at 69% 76%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 6%,transparent 6%, transparent 94%),radial-gradient(circle at 2% 35%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 6%,transparent 6%, transparent 94%),radial-gradient(circle at 14% 48%, rgba(255,255,255,0.03) 0%, rgba(255,255,255,0.03) 6%,transparent 6%, transparent 94%),radial-gradient(circle at 28% 87%, rgba(255,255,255,0.04) 0%, rgba(255,255,255,0.04) 4%,transparent 4%, transparent 96%),radial-gradient(circle at 65% 14%, rgba(255,255,255,0.04) 0%, rgba(255,255,255,0.04) 4%,transparent 4%, transparent 96%),radial-gradient(circle at 51% 36%, rgba(255,255,255,0.04) 0%, rgba(255,255,255,0.04) 4%,transparent 4%, transparent 96%),radial-gradient(circle at 6% 93%, rgba(255,255,255,0.04) 0%, rgba(255,255,255,0.04) 4%,transparent 4%, transparent 96%),linear-gradient(135deg, rgb(23, 233, 173),rgb(29, 24, 208)); -} - body { - display: flex; - border-radius: 15px; + display: flex; + font-family: Noto Sans; + min-width: 1150px; + min-height: 600px; + overflow: hidden; } + +html { + /* Overwrite the white that is set by bulma.css */ + background-color: transparent; +} diff --git a/src/system-installer-daemon.py b/src/system-installer-daemon.py index dd50f3e..81c4c74 100755 --- a/src/system-installer-daemon.py +++ b/src/system-installer-daemon.py @@ -1,10 +1,8 @@ #!/usr/bin/env python3 - """ Welcome to SID - The System Installer Daemon! """ - from flask import Flask, request, session, redirect, \ url_for, render_template, flash, Blueprint from waitress import serve @@ -15,33 +13,28 @@ import importlib # configuration VERSION = "0.00" SECRET_KEY = "exampls" -DEV_MODE = 1 +DEV_MODE = True APPS = "main welcome users disks software summary" -if DEV_MODE == 1: +if DEV_MODE: print("Note: Starting in devmode!") DEBUG = True - + tracebacks = True # create our application in flask app = Flask(__name__) app.config.from_object(__name__) - # Register blueprints here for APP in APPS.split(" "): print(f"Loading applet: {APP} ") - # Dynamically import the blueprint module module = importlib.import_module(f"applets.{APP}") - # Get the blueprint (bp) from the imported module bp = getattr(module, "bp") - # Register the blueprint with the app app.register_blueprint(bp) - # configure logs # logging.basicConfig() logger = logging.getLogger('waitress') @@ -49,22 +42,9 @@ if DEV_MODE == "1": logger.setLevel(logging.DEBUG) logger.debug("logger set to DEBUG") - -# Justtry doing something with dmm -lsblk.list_scsi_devices() - - if __name__ == '__main__': - if DEV_MODE: - serve(app, - host='0.0.0.0', - port=8080, - url_scheme='http', - expose_tracebacks=True) - else: - serve(app, - host='0.0.0.0', - port=8080, - url_scheme='https', - expose_tracebacks=False) - + serve(app, + host='0.0.0.0', + port=8080, + url_scheme='http', + expose_tracebacks=DEV_MODE) diff --git a/src/templates/header.html b/src/templates/header.html new file mode 100644 index 0000000..b83296e --- /dev/null +++ b/src/templates/header.html @@ -0,0 +1,15 @@ + +
+ + + + + + + + + + +
+
+ diff --git a/src/templates/layout.html b/src/templates/layout.html index 887e3fb..6a5b4a9 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -7,13 +7,11 @@ - + - - - -
+
+{% include "header.html" %} {% block body %} {% endblock %}