bk/2025-05-08-2310

Author: Cesar4D

WebClient/WebMainView.dfm

@@ -1,6 +1,7 @@
 object MainView: TMainView
   Width = 322
   Height = 432
+  Caption = 'lbUserID'
   Font.Charset = DEFAULT_CHARSET
   Font.Color = clWindowText
   Font.Height = -13
@@ -11,50 +12,54 @@ object MainView: TMainView
   OnCreate = WebFormCreate
   OnExit = WebFormExit
   object WebLabel1: TWebLabel
-    Left = 8
-    Top = 11
+    Left = 24
+    Top = 27
     Width = 43
     Height = 16
     Caption = 'UserID:'
+    ElementID = 'lbUserID'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
   end
-  object WebEdit1: TWebEdit
-    Left = 57
-    Top = 8
+  object edtUserID: TWebEdit
+    Left = 73
+    Top = 24
     Width = 216
     Height = 19
+    ElementID = 'edtUserID'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    OnChange = WebEdit1Change
+    OnChange = edtUserIDChange
   end
-  object WebButton1: TWebButton
-    Left = 8
-    Top = 33
+  object btnWebSubscribe: TWebButton
+    Left = 24
+    Top = 49
     Width = 265
     Height = 25
     Caption = 'Subscribe for push notifications'
     ChildOrder = 1
+    ElementID = 'btnSubscribe'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    OnClick = WebButton1Click
+    OnClick = btnWebSubscribeClick
   end
-  object WebButton2: TWebButton
-    Left = 8
-    Top = 64
+  object btnWebUnsubscribe: TWebButton
+    Left = 24
+    Top = 80
     Width = 265
     Height = 25
     Caption = 'Unsubscribe from push notifications'
     ChildOrder = 2
+    ElementID = 'btnUnsubscribe'
     HeightPercent = 100.000000000000000000
     WidthPercent = 100.000000000000000000
-    OnClick = WebButton2Click
+    OnClick = btnWebUnsubscribeClick
   end
   object WebPushNotifications1: TWebPushNotifications
     RegisterSubscriptionURL = 'http://localhost:8081/registerSubscription'
     UnregisterSubscriptionURL = 'http://localhost:8081/unregisterSubscription'
     VapidPublickeyURL = 'http://localhost:8081/vapidPublicKey'
-    Left = 168
-    Top = 120
+    Left = 184
+    Top = 136
   end
 end

WebClient/WebMainView.pas

@@ -3,28 +3,37 @@
 interface
 
 uses
-  System.SysUtils, System.Classes, JS, Web, WEBLib.Graphics, WEBLib.Controls,
-  WEBLib.StdCtrls, WEBLib.Forms, WEBLib.Dialogs, WEBLib.PushNotifications,
-  WEBLib.Storage, Vcl.StdCtrls, Vcl.Controls;
+  System.SysUtils,
+  System.Classes,
+  JS,
+  Web,
+  WEBLib.Graphics,
+  WEBLib.Controls,
+  WEBLib.StdCtrls,
+  WEBLib.Forms,
+  WEBLib.Dialogs,
+  WEBLib.PushNotifications,
+  WEBLib.Storage,
+  Vcl.StdCtrls,
+  Vcl.Controls;
 
 type
   TMainView = class(TWebForm)
-    WebEdit1: TWebEdit;
-    WebButton1: TWebButton;
-    WebButton2: TWebButton;
+    edtUserID: TWebEdit;
+    btnWebSubscribe: TWebButton;
+    btnWebUnsubscribe: TWebButton;
     WebLabel1: TWebLabel;
     WebPushNotifications1: TWebPushNotifications;
-    procedure WebButton1Click(Sender: TObject);
-    procedure WebButton2Click(Sender: TObject);
-    procedure WebEdit1Change(Sender: TObject);
+    procedure btnWebSubscribeClick(Sender: TObject);
+    procedure btnWebUnsubscribeClick(Sender: TObject);
+    procedure edtUserIDChange(Sender: TObject);
     procedure WebFormCreate(Sender: TObject);
     procedure WebFormExit(Sender: TObject);
   private
-    ls: TLocalStorage;
-    procedure DoAddToLocalStorage;
-    procedure DoRemoveFromLocalStorage;
+    LLocalStorage: TLocalStorage;
     procedure SetButtonState;
-    function ValidUserID: Boolean;
+    procedure ValidUserID;
+  public
   end;
 
 var
@@ -34,95 +43,80 @@ implementation
 
 {$R *.dfm}
 
-procedure TMainView.DoAddToLocalStorage;
+const
+  STORAGE_KEY = 'pushUserID';
+
+procedure TMainView.WebFormCreate(Sender: TObject);
+begin
+  LLocalStorage := TLocalStorage.Create(Self);
+  if LLocalStorage.Count > 0 then
+    edtUserID.Text := TLocalStorage.GetValue(STORAGE_KEY);
+
+  Self.SetButtonState;
+end;
+
+procedure TMainView.WebFormExit(Sender: TObject);
 begin
-  TWebLocalStorage.SetValue('pushUserID', WebEdit1.Text);
-  SetButtonState;
+  LLocalStorage.Free;
 end;
 
-procedure TMainView.DoRemoveFromLocalStorage;
+procedure TMainView.edtUserIDChange(Sender: TObject);
 begin
-  TWebLocalStorage.RemoveKey('pushUserID');
-  SetButtonState;
+  Self.SetButtonState;
 end;
 
 procedure TMainView.SetButtonState;
 begin
-  if WebEdit1.Text = '' then
+  if edtUserID.Text = '' then
   begin
-    WebButton1.Enabled := False;
-    WebButton2.Enabled := False;
+    btnWebSubscribe.Enabled := False;
+    btnWebUnsubscribe.Enabled := False;
     Exit;
   end;
 
-  if TLocalStorage.GetValue('pushUserID') = WebEdit1.Text then
+  if TLocalStorage.GetValue(STORAGE_KEY) = edtUserID.Text then
   begin
-    WebButton1.Enabled := False;
-    WebButton2.Enabled := True;
+    btnWebSubscribe.Enabled := False;
+    btnWebUnsubscribe.Enabled := True;
   end
-  else if TLocalStorage.GetValue('pushUserID') <> '' then
+  else if not Trim(TLocalStorage.GetValue(STORAGE_KEY)).IsEmpty then
   begin
-    WebButton1.Enabled := False;
-    WebButton2.Enabled := False;
+    btnWebSubscribe.Enabled := False;
+    btnWebUnsubscribe.Enabled := False;
   end
   else
   begin
-    WebButton1.Enabled := True;
-    WebButton2.Enabled := False;
+    btnWebSubscribe.Enabled := True;
+    btnWebUnsubscribe.Enabled := False;
   end;
 end;
 
-function TMainView.ValidUserID: Boolean;
+procedure TMainView.ValidUserID;
 begin
-  Result := True;
-  if WebEdit1.Text = '' then
-  begin
-    Result := False;
-    ShowMessage('UserID cannot be empty!');
-  end;
+  if Trim(edtUserID.Text).IsEmpty then
+    raise Exception.Create('UserID cannot be empty!');
 end;
 
-procedure TMainView.WebButton1Click(Sender: TObject);
+procedure TMainView.btnWebSubscribeClick(Sender: TObject);
 begin
-  if ValidUserID then
-  begin
-    WebPushNotifications1.RegistrationUserID := WebEdit1.Text;
-    WebPushNotifications1.RegisterServiceWorker;
+  Self.ValidUserID;
 
-    DoAddToLocalStorage;
-  end;
-end;
+  WebPushNotifications1.RegistrationUserID := edtUserID.Text;
+  WebPushNotifications1.RegisterServiceWorker;
 
-procedure TMainView.WebButton2Click(Sender: TObject);
-begin
-  if ValidUserID then
-  begin
-    WebPushNotifications1.RegistrationUserID := WebEdit1.Text;
-    WebPushNotifications1.Unsubscribe;
-
-    DoRemoveFromLocalStorage;
-  end;
-end;
-
-procedure TMainView.WebEdit1Change(Sender: TObject);
-begin
-  SetButtonState;
+  TWebLocalStorage.SetValue(STORAGE_KEY, edtUserID.Text);
+  Self.SetButtonState;
 end;
 
-procedure TMainView.WebFormCreate(Sender: TObject);
+procedure TMainView.btnWebUnsubscribeClick(Sender: TObject);
 begin
-  ls := TLocalStorage.Create(Self);
-  if ls.Count > 0 then
-  begin
-    WebEdit1.Text := TLocalStorage.GetValue('pushUserID');
-  end;
+  Self.ValidUserID;
 
-  SetButtonState;
-end;
+  WebPushNotifications1.RegistrationUserID := edtUserID.Text;
+  WebPushNotifications1.Unsubscribe;
 
-procedure TMainView.WebFormExit(Sender: TObject);
-begin
-  ls.Free;
+  TWebLocalStorage.RemoveKey(STORAGE_KEY);
+  Self.SetButtonState;
 end;
 
 end.