diff --git a/.gitignore b/.gitignore
index b35fbfb..0dd8b19 100755
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
html/svc/BU-commander
private.txt
vendor/
-logs/
\ No newline at end of file
+logs/
+data/*
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 0998495..75055dd 100644
--- a/composer.lock
+++ b/composer.lock
@@ -228,11 +228,11 @@
},
{
"name": "johnpearcey/amara",
- "version": "v0.9.11",
+ "version": "v0.9.12",
"source": {
"type": "git",
"url": "http://johnpearcey:325bfbed42068584ee2d850e1934c79677e0d296@pearcey.net:8080/johnpearcey/Amara.git",
- "reference": "f0dccdf4236edf0656b841d70bfbdddc36ce622c"
+ "reference": "b97c2e4d1a98634acebdda34f44ffe2e9b7329d0"
},
"require": {
"delight-im/auth": "^8.3",
@@ -258,7 +258,7 @@
}
],
"description": "Home grown web navigation framework complete with login",
- "time": "2025-01-24T21:00:30+00:00"
+ "time": "2025-01-31T11:04:40+00:00"
},
{
"name": "katzgrau/klogger",
diff --git a/notes.txt b/notes.txt
index 1223052..39efa73 100755
--- a/notes.txt
+++ b/notes.txt
@@ -1,4 +1,5 @@
+
Service
-------
diff --git a/src/bu-command-local-conf.json b/src/bu-command-local-conf.json
index 1bae8fa..0f685c6 100644
--- a/src/bu-command-local-conf.json
+++ b/src/bu-command-local-conf.json
@@ -6,7 +6,12 @@
"Username" : "john@pearcey.net",
"Password" : "N0M0r3M4sk5",
"SMTPSecure" : "tls",
- "Port" : 587
+ "Port" : 587,
+ "EmailBody_Invite" : "Please click on the link to accept the invitation."
+ },
+
+ "Paths" : {
+ "invite_secrets" : "../data/invite_secret.txt"
}
}
diff --git a/src/bu-command-nav.json b/src/bu-command-nav.json
index 4ff4d54..ae3dac2 100644
--- a/src/bu-command-nav.json
+++ b/src/bu-command-nav.json
@@ -5,14 +5,14 @@
"author":"John Pearcey",
"desription":"WebUI backup manager for web servers"
},
+ "version":"0.9.12",
"icon":"/img/uk-green.png",
- "style": [ "/css/main.css" ]
-
+ "style": [ "/css-amara/glob.css", "/css/main.css" ]
},
"Handlers":{
"Johnpearcey\\Amara\\Router\\RqHandlerCls_login" : {
- "style":[ "/css/login.css" ],
+ "style": [ "/css-amara/login.css", "/css/login.css" ],
"page_builder" : {
"name" : "login_page",
"data" : {
@@ -25,7 +25,7 @@
},
"Johnpearcey\\Amara\\Router\\RqHandlerCls_register" : {
- "style":[ "/css/login.css" ],
+ "style": [ "/css-amara/login.css", "/css/login.css" ],
"page_builder" : {
"name" : "register_page",
"data" : {
@@ -38,7 +38,7 @@
},
"Johnpearcey\\Amara\\Router\\RqHandlerCls_logintok" : {
- "style":[ "/css/login.css" ],
+ "style": [ "/css-amara/login.css", "/css/login.css" ],
"page_builder" : {
"name" : "tok_entry_page",
"data" : {
@@ -51,7 +51,7 @@
},
"Johnpearcey\\Amara\\Router\\RqHandlerCls_lostpwd" : {
- "style":[ "/css/login.css" ],
+ "style": [ "/css-amara/login.css", "/css/login.css" ],
"page_builder" : {
"name" : "reset_pwd",
"data" : {
@@ -64,7 +64,7 @@
},
"Johnpearcey\\Amara\\Router\\RqHandlerCls_setpwd" : {
- "style":[ "/css/login.css" ],
+ "style": [ "/css-amara/login.css", "/css/login.css" ],
"page_builder" : {
"name" : "newpwd_page",
"data" : {
@@ -103,14 +103,12 @@
"submit_reg":"/register/auth"
}
},
-
- "/mainpage": {
+
+ "/invite": {
+ "class-handler": "Johnpearcey\\Amara\\Router\\RqHandlerCls_invite",
"secure":1,
- "class-handler": "Johnpearcey\\Amara\\Router\\RqHandlerCls_mainpage",
- "page_builder" : "main_page",
- "class_props":{
- "logout_link" : "/logout"
- }
+ "success":"/html-old/index.php",
+ "email_invite_msg" : "Backup Commander Invitation"
}
}
diff --git a/src/css-amara b/src/css-amara
new file mode 120000
index 0000000..184ce00
--- /dev/null
+++ b/src/css-amara
@@ -0,0 +1 @@
+../vendor/johnpearcey/amara/src/css-amara
\ No newline at end of file
diff --git a/src/css/login.css b/src/css/login.css
index 5e7dca8..7b1dbab 100644
--- a/src/css/login.css
+++ b/src/css/login.css
@@ -1,57 +1,4 @@
-/* admin_layout contains general administrative layout on forms*/
-.admin_layout {
- display: grid;
- margin: auto;
- margin-top: 10px;
- padding: 10px;
- padding-left: 20px;
-}
-
-.admin_layout input[type=text], .admin_layout input[type=password] {
- max-width: 300px;
-}
.frm_tail {
padding: 15px;
}
-
-.frm2col {
- grid-template-columns: 30% 1fr;
- grid-template-rows: 25px 25px 1fr;
- column-gap: 5px;
- row-gap: 5px;
-}
-
-.admin_layout label {
- align-self: center;
- justify-self: end;
- margin-right: 15px;
-}
-
-/*Btn placement on 2nd row*/
-.frm2col.frm_lostpwd input[type=submit] {
- grid-column: 2;
- grid-row: 2;
- justify-self: start;
- padding: 3px;
- min-width: 80px
-}
-
-/*Btn placement on 3rd row*/
-.frm2col.frm_login input[type=submit], .frm2col.frm_tok input[type=submit] {
- grid-column: 2;
- grid-row: 3;
- justify-self: start;
- padding: 3px;
- min-width: 80px
-}
-
-/*Btn placement on 4th row*/
-.frm2col.frm_register input[type=submit] {
- grid-column: 2;
- grid-row: 4;
- justify-self: start;
- padding: 3px;
- min-width: 80px
-}
-
diff --git a/src/css/main.css b/src/css/main.css
index 4e537e7..4d81ea1 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -14,12 +14,6 @@
input[type=text], input[type=password], input[type=submit] {
font-size: 11pt;
}
-
-.errcls{
- margin: 20px;
- padding: 5px;
- background-color: salmon;
-}
.content_area{
min-height:350px;
diff --git a/src/info.php b/src/info.php
new file mode 100644
index 0000000..968c8df
--- /dev/null
+++ b/src/info.php
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/src/templates/body_o.tp b/src/templates/body_o.tp
index f29f87c..971266a 100644
--- a/src/templates/body_o.tp
+++ b/src/templates/body_o.tp
@@ -13,7 +13,7 @@
Backup CommanderVersion 0.9.11
+