diff --git a/src/applets/welcome/__pycache__/__init__.cpython-311.pyc b/src/applets/welcome/__pycache__/__init__.cpython-311.pyc deleted file mode 100644 index 909e5ab..0000000 Binary files a/src/applets/welcome/__pycache__/__init__.cpython-311.pyc and /dev/null differ diff --git a/src/applets/welcome/__pycache__/routes.cpython-311.pyc b/src/applets/welcome/__pycache__/routes.cpython-311.pyc deleted file mode 100644 index d1a8796..0000000 Binary files a/src/applets/welcome/__pycache__/routes.cpython-311.pyc and /dev/null differ diff --git a/src/applets/welcome/routes.py b/src/applets/welcome/routes.py index c649672..01587ca 100644 --- a/src/applets/welcome/routes.py +++ b/src/applets/welcome/routes.py @@ -1,4 +1,7 @@ from applets.welcome import bp +from flask import Flask, request, session, redirect, \ + url_for, render_template, flash, Blueprint +import dmm.lsblk as lsblk @bp.route('/welcome',methods=['GET', 'POST', 'PUT']) @@ -7,8 +10,10 @@ def welcome_index(): The page you'd get if you access the root of this app in a browser. """ - return ("Welcome to System Installer Daemon POC
" - "This is the Welcome Index") + blkid = lsblk.list_scsi_devices() + return render_template('welcome.html', blkid=blkid) + #return ("Welcome to System Installer Daemon POC
" + # "This is the Welcome Index") @bp.route('/welcome2') diff --git a/src/applets/welcome/static/welcome.css b/src/applets/welcome/static/welcome.css new file mode 100644 index 0000000..e901b4d --- /dev/null +++ b/src/applets/welcome/static/welcome.css @@ -0,0 +1 @@ +test: diff --git a/src/static/welcome.css b/src/static/welcome.css new file mode 100644 index 0000000..e901b4d --- /dev/null +++ b/src/static/welcome.css @@ -0,0 +1 @@ +test: diff --git a/src/system-installer-daemon.py b/src/system-installer-daemon.py index 20e8225..2d0eda5 100755 --- a/src/system-installer-daemon.py +++ b/src/system-installer-daemon.py @@ -9,6 +9,7 @@ from flask import Flask, request, session, redirect, \ url_for, render_template, flash, Blueprint from waitress import serve import logging +import dmm.lsblk as lsblk # configuration VERSION = "0.00" @@ -45,6 +46,10 @@ if DEV_MODE == "1": logger.debug("logger set to DEBUG") +# Justtry doing something with dmm +lsblk.list_scsi_devices() + + if __name__ == '__main__': if DEV_MODE: serve(app, diff --git a/src/templates/welcome.html b/src/templates/welcome.html new file mode 100644 index 0000000..4f5052d --- /dev/null +++ b/src/templates/welcome.html @@ -0,0 +1,33 @@ + + + + + + + + + + +
+
+

+ Hello world! +

+ +
+ Welcome to system installer daemon + BLK is {{ blkid }} +
+ + +