From 4bc89c5d2bdbebfc65567b4d87ad896a99220f87 Mon Sep 17 00:00:00 2001 From: Jonathan Carter Date: Sun, 8 Dec 2024 16:55:03 +0200 Subject: [PATCH] Some more initial changes --- README.md | 14 +++++ .../__pycache__/__init__.cpython-312.pyc | Bin 353 -> 353 bytes .../disks/__pycache__/routes.cpython-312.pyc | Bin 1205 -> 1205 bytes .../main/__pycache__/__init__.cpython-312.pyc | Bin 350 -> 350 bytes .../main/__pycache__/routes.cpython-312.pyc | Bin 828 -> 828 bytes .../__pycache__/__init__.cpython-312.pyc | Bin 362 -> 362 bytes .../__pycache__/routes.cpython-312.pyc | Bin 696 -> 696 bytes src/applets/software/software.html | 9 +--- .../__pycache__/__init__.cpython-312.pyc | Bin 359 -> 359 bytes .../__pycache__/routes.cpython-312.pyc | Bin 772 -> 772 bytes src/applets/summary/summary.html | 11 ---- .../__pycache__/__init__.cpython-312.pyc | Bin 353 -> 353 bytes .../users/__pycache__/routes.cpython-312.pyc | Bin 680 -> 680 bytes src/applets/users/users.html | 11 ---- .../__pycache__/__init__.cpython-312.pyc | Bin 359 -> 359 bytes .../__pycache__/routes.cpython-312.pyc | Bin 1129 -> 1803 bytes src/applets/welcome/routes.py | 24 ++++++--- src/applets/welcome/welcome.html | 31 +++-------- .../{welcome.css => system-installer.css} | 0 src/system-installer-daemon | 4 ++ src/system-installer-daemon.py | 50 ------------------ src/system-installer-web-client | 2 +- src/templates/header.html | 3 +- src/templates/layout.html | 11 ++-- 24 files changed, 53 insertions(+), 117 deletions(-) rename src/static/{welcome.css => system-installer.css} (100%) delete mode 100755 src/system-installer-daemon.py diff --git a/README.md b/README.md index 9b47b44..8b37084 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,20 @@ Dependencies - flask + - flask-babel - pytest - coverage - libjs-htmx - libjs-material-design-lite + - xapp-gtk3-module + + +## Development + +### Translations + +Upstream PyBabel documentation: +https://python-babel.github.io/flask-babel/index.html#translating-applications + +in the ./daemon directory, run the following to regenerate the translations file: + +```pybabel extract -F babel.cfg -o messages.pot .``` diff --git a/src/applets/disks/__pycache__/__init__.cpython-312.pyc b/src/applets/disks/__pycache__/__init__.cpython-312.pyc index a050941adac603b9cf83a6af2a3ffcb9e1a930a0..bc1729043d8897c8e2a6a5db64a8572a3649d5ea 100644 GIT binary patch delta 13 UcmaFJ^pI(T8YAPa$?A+&03-bbZU6uP delta 13 UcmaFJ^pI(T8YAPc$?A+&03@9RjsO4v diff --git a/src/applets/disks/__pycache__/routes.cpython-312.pyc b/src/applets/disks/__pycache__/routes.cpython-312.pyc index 08259fe560d91afcf4c57efb5b919bda95673db8..12ba9b56027fddc3bb2b4ace65615725e313cc1d 100644 GIT binary patch delta 13 UcmdnWxs`K+BMalL$xbZA03q}QnE(I) delta 13 UcmdnWxs`K+BMalN$xbZA03wtGxc~qF diff --git a/src/applets/main/__pycache__/__init__.cpython-312.pyc b/src/applets/main/__pycache__/__init__.cpython-312.pyc index 406caeb32c3bad95e8990ed051ebb6354ab7614e..edf656d01c50be2de9f7f0f963a208ce7a6baf2a 100644 GIT binary patch delta 13 Ucmcb|bdPC+G9%-y$tsLi03(zHVgLXD delta 13 Ucmcb|bdPC+G9%-!$tsLi030C}4Uq5uE@ delta 24 gcmdnPwuf!Pa^_!*`jcNXDsDW@&&2p^@@=L>0DM~s;s5{u diff --git a/src/applets/software/__pycache__/__init__.cpython-312.pyc b/src/applets/software/__pycache__/__init__.cpython-312.pyc index 5429afdb84be108711e6f8409e2dadc075e125de..34974b69f70e31fc9023fa44b56d4d155df69ebc 100644 GIT binary patch delta 13 UcmaFG^onVNJ|p9;$p(y803|pCk^lez delta 13 UcmaFG^onVNJ|p9=$p(y8043N2vH$=8 diff --git a/src/applets/software/__pycache__/routes.cpython-312.pyc b/src/applets/software/__pycache__/routes.cpython-312.pyc index 7c50dff10009f223d8bb937984282f109b097342..ea3eeb4b9fc92dd724167c3cd96d1659291e8baa 100644 GIT binary patch delta 13 UcmdnNx`TB?Dih -

Would you like fries with that?


    +
  • Would you like to participate in popcon?
  • Desktop environment
  • Server software
-

- -
-
-
-
diff --git a/src/applets/summary/__pycache__/__init__.cpython-312.pyc b/src/applets/summary/__pycache__/__init__.cpython-312.pyc index 75da8f09e22875df975d061362281df048c7644f..7d1050b78513c2363f5b50263076637c132e3188 100644 GIT binary patch delta 13 UcmaFP^qgsf4kP2O$-0bI03^=@h5!Hn delta 13 UcmaFP^qgsf4kP2Q$-0bI03~k(rT_o{ diff --git a/src/applets/summary/__pycache__/routes.cpython-312.pyc b/src/applets/summary/__pycache__/routes.cpython-312.pyc index 7208e662985bd5396b5055d3aefa2fb6369d497f..7d838eb015966cbdb4113708d0ef46f63ff0a157 100644 GIT binary patch delta 13 UcmZo+Yhl~4j*0QsIU03n$K=>Px# delta 13 UcmZo+Yhl~4j*0QtIU03taB2><{9 diff --git a/src/applets/summary/summary.html b/src/applets/summary/summary.html index ba1b1c0..ac88fe1 100644 --- a/src/applets/summary/summary.html +++ b/src/applets/summary/summary.html @@ -1,19 +1,8 @@ {% extends "layout.html" %} {% block body %} -
-

Ready to install! Please review all changes.

-
- -

- -
-
-
-
-
diff --git a/src/applets/users/__pycache__/__init__.cpython-312.pyc b/src/applets/users/__pycache__/__init__.cpython-312.pyc index 3bcd7a8a74a0f2ba1c4c0bac8aa1a8619fe94d08..527cb290e8578b2e18673f0628c21e65ac757501 100644 GIT binary patch delta 13 UcmaFJ^pI(T8YAPa$?A+&03-bbZU6uP delta 13 UcmaFJ^pI(T8YAPc$?A+&03@9RjsO4v diff --git a/src/applets/users/__pycache__/routes.cpython-312.pyc b/src/applets/users/__pycache__/routes.cpython-312.pyc index a4708cffe2e797f8eb9b013ede06b3a1a3cab381..6f7cf214bd51b62fc6540ebb2dbf289329e1a672 100644 GIT binary patch delta 13 UcmZ3%x`K5>C==tY$ze=E03i(odH?_b delta 13 UcmZ3%x`K5>C==ta$ze=E03odeng9R* diff --git a/src/applets/users/users.html b/src/applets/users/users.html index 994fc00..c8aa0c6 100644 --- a/src/applets/users/users.html +++ b/src/applets/users/users.html @@ -1,8 +1,6 @@ {% extends "layout.html" %} {% block body %} -
-

Let's set up an initial user.


@@ -46,16 +44,7 @@
-

- -
-
-
- - - - {% endblock %} diff --git a/src/applets/welcome/__pycache__/__init__.cpython-312.pyc b/src/applets/welcome/__pycache__/__init__.cpython-312.pyc index 7d8c2c5e729c98d0e564c15cc9209af6957b0d87..ac1fc3aa1fd55fcc1cc1ed09c5f3acfa02dc0932 100644 GIT binary patch delta 13 UcmaFP^qgsf4kP2O$-0bI03^=@h5!Hn delta 13 UcmaFP^qgsf4kP2Q$-0bI03~k(rT_o{ diff --git a/src/applets/welcome/__pycache__/routes.cpython-312.pyc b/src/applets/welcome/__pycache__/routes.cpython-312.pyc index cf83579c2637d583270ecb959594d989f697d66a..f65f4b4f5e5d24dab8cb3155308112fa58afc121 100644 GIT binary patch literal 1803 zcmZ8i&2Jk;6rbI-v;K_Jw6vu(W%5O3By12Mm8uF-Kj4rE0yPCKm8`XQY;Q8VYi7nx zV}j&LmD(dG+6xk*7pg>pWB&vsE)I#*YLrSyJ#h;PQYB8j*^go}lHa~JzxU?j{oWh@ zRxIWajGw=+wU<%|JyS+9%vd>)pxi?aax{uO&C)cb>s0p)%kWZG%1c{mZ_FC=Ow05# zR>sR(SubbhLO+A%tvvV}wBQx3qK0%t@++s4P5%2jDJSiWIi{0o>s#4PIE@-siIi5R zBYjkE#zwfFwlXt{MY@w~BPai(wpG~FM>ex1x%J0@g2hIf_PnO3nJ4k2=2)2McN}> z=KA6zX|5643_Q}$R;n~;+LZ8`)a{nkiC@-bre#ywu$!wgOKrd1v)hFCGu1e#Y)Iq7 zD>a!~{`hK58q1&6;GCvML?>`~GrCqJRlW@P9ee@e9uitKjnGPb`@~k?Bn#glkxu4c z%xNNF9vI)yw)7-_S5evMf0Dy6Y8`^Ra8$e=^v*iCO$2sZ%D{HB3HibT99R$t9JIm! z(Q!GpyIt)1*v1VOtZ~9BA=EF#m#uV!M;~f3&jqBeU3c83D5qqa@&;X%N2tq1oj18# zcgPJFc99c}o=cs2;za`T_59ru2mgd*wvN5w?)VHtFQ*4)sEZl z+z6E>yxzHU+!o z)wX9r4A9>NRGfTVnB6YS?iA(+SN0}nb|&Wri+lM~_ZNQodN+S*n7VWTuIPVcDk4KN zzXRnSauE>qf>1}>jP(s@!wcXsf*B)N>JXM5!Nv|@<_MNKgk?vtoWeE`ltRA0kW;1b zDG@yeq*5A^9+9C6z=oROxW|d3NKXm?(pZ@Z1N#?0k2+%-$_YF{2~Dn&EVGX1Rl=TRCl!zv%=S4vf9jDm ziC=f$ItNP3olJ+l5;jJ7{f8(#R+tZ&x!?s(kCFveg{4%YxDR6A&@}BSI`drDv^Sq4 z5C=*;L*q};%ll&}f9CGl$GNHP+|+&dr&k_{;c{(w&H8m?H+OwtK0)T4(yh`iI`W5> n9ZcRidF$le*MFaSdslnsFWuBGYX=6>-`$VYV>#_ac%FX&<7C|3 delta 621 zcmeC?d&!}GnwOW00SN4Q9;cNtF)%y^abSQI%J{ryqPl&3E>9E>BLfpdDr1%uOa+2Y zVM%95VO_+yhHW*_7!XKdZ(&#sVKPMV;nc^mnh~NXg%e3VeX)bHB" - # "This is the Welcome Index") + string_dict = build_stringlist() + return render_template('welcome.html', string_dict=string_dict) -@bp.route('/welcome2') -def welcome2_index(): - return ("Changins some text in our htmx front-end") - +def build_stringlist(): + """ + Return all the strings that is used in this applet." + """ + string_dict = {} + string_dict['welcome_text'] = _("Welcome! This setup program will install Debian on to your system.") + string_dict['confirm_text'] = _("Please confirm the following details:") + string_dict['language_text'] = _("Language:") + string_dict['keylayout_text'] = _("Keyboard Layout:") + string_dict['timezone_text'] = _("Time Zone:") + return string_dict diff --git a/src/applets/welcome/welcome.html b/src/applets/welcome/welcome.html index 51caef9..f1ac5ce 100644 --- a/src/applets/welcome/welcome.html +++ b/src/applets/welcome/welcome.html @@ -1,16 +1,11 @@ {% extends "layout.html" %} {% block body %} -
+Debian Image banner +

{{ string_dict['welcome_text'] }}

+

{{ string_dict['confirm_text'] }}

-

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

- -
- -
- -
- + {{ string_dict['language_text'] }}
-
-
- + {{ string_dict['keylayout_text'] }}
-
-
+
-
- + {{ string_dict['timezone_text'] }}
-
-
-





- -
-
-
-
diff --git a/src/static/welcome.css b/src/static/system-installer.css similarity index 100% rename from src/static/welcome.css rename to src/static/system-installer.css diff --git a/src/system-installer-daemon b/src/system-installer-daemon index 81c4c74..5e14a43 100755 --- a/src/system-installer-daemon +++ b/src/system-installer-daemon @@ -12,6 +12,8 @@ import importlib # configuration VERSION = "0.00" +BABEL_TRANSLATION_DIRECTORIES="translations" +BABEL_DOMAIN="translations" SECRET_KEY = "exampls" DEV_MODE = True APPS = "main welcome users disks software summary" @@ -25,6 +27,7 @@ if DEV_MODE: app = Flask(__name__) app.config.from_object(__name__) + # Register blueprints here for APP in APPS.split(" "): print(f"Loading applet: {APP} ") @@ -48,3 +51,4 @@ if __name__ == '__main__': port=8080, url_scheme='http', expose_tracebacks=DEV_MODE) + diff --git a/src/system-installer-daemon.py b/src/system-installer-daemon.py deleted file mode 100755 index 81c4c74..0000000 --- a/src/system-installer-daemon.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/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 -import logging -import dmm.lsblk as lsblk -import importlib - -# configuration -VERSION = "0.00" -SECRET_KEY = "exampls" -DEV_MODE = True -APPS = "main welcome users disks software summary" - -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') -if DEV_MODE == "1": - logger.setLevel(logging.DEBUG) - logger.debug("logger set to DEBUG") - -if __name__ == '__main__': - serve(app, - host='0.0.0.0', - port=8080, - url_scheme='http', - expose_tracebacks=DEV_MODE) diff --git a/src/system-installer-web-client b/src/system-installer-web-client index 25ae0d0..8f832a4 100755 --- a/src/system-installer-web-client +++ b/src/system-installer-web-client @@ -13,7 +13,7 @@ def on_closed(): window = webview.create_window('System Installer', LOCATION, transparent=True, easy_drag=False, frameless=True, - width=1030, focus=True, zoomable=True, + width=1050, focus=True, zoomable=True, confirm_close=True) window.events.closed += on_closed diff --git a/src/templates/header.html b/src/templates/header.html index 59b4472..0958aa4 100644 --- a/src/templates/header.html +++ b/src/templates/header.html @@ -1,5 +1,5 @@ -
+
@@ -11,5 +11,4 @@
-
diff --git a/src/templates/layout.html b/src/templates/layout.html index 409a8a9..34f980a 100644 --- a/src/templates/layout.html +++ b/src/templates/layout.html @@ -4,16 +4,21 @@ - + - + -
+
{% include "header.html" %} + +
{% block body %} {% endblock %} +
+ +{% include "footer.html" %}