Skip to content

Commit f96e189

Browse files
Cesar4DCesar4D
committed
refactor/web
1 parent 9b5240c commit f96e189

22 files changed

Lines changed: 482 additions & 292 deletions

‎PushNotificationsGroup.groupproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Projects Include="Server\Server.dproj">
77
<Dependencies/>
88
</Projects>
9-
<Projects Include="WebClient\WebClient.dproj">
9+
<Projects Include="WebClient\WebPushClient.dproj">
1010
<Dependencies/>
1111
</Projects>
1212
</ItemGroup>
@@ -26,23 +26,23 @@
2626
<Target Name="Server:Make">
2727
<MSBuild Projects="Server\Server.dproj" Targets="Make"/>
2828
</Target>
29-
<Target Name="WebClient">
30-
<MSBuild Projects="WebClient\WebClient.dproj"/>
29+
<Target Name="WebPushClient">
30+
<MSBuild Projects="WebClient\WebPushClient.dproj"/>
3131
</Target>
32-
<Target Name="WebClient:Clean">
33-
<MSBuild Projects="WebClient\WebClient.dproj" Targets="Clean"/>
32+
<Target Name="WebPushClient:Clean">
33+
<MSBuild Projects="WebClient\WebPushClient.dproj" Targets="Clean"/>
3434
</Target>
35-
<Target Name="WebClient:Make">
36-
<MSBuild Projects="WebClient\WebClient.dproj" Targets="Make"/>
35+
<Target Name="WebPushClient:Make">
36+
<MSBuild Projects="WebClient\WebPushClient.dproj" Targets="Make"/>
3737
</Target>
3838
<Target Name="Build">
39-
<CallTarget Targets="Server;WebClient"/>
39+
<CallTarget Targets="Server;WebPushClient"/>
4040
</Target>
4141
<Target Name="Clean">
42-
<CallTarget Targets="Server:Clean;WebClient:Clean"/>
42+
<CallTarget Targets="Server:Clean;WebPushClient:Clean"/>
4343
</Target>
4444
<Target Name="Make">
45-
<CallTarget Targets="Server:Make;WebClient:Make"/>
45+
<CallTarget Targets="Server:Make;WebPushClient:Make"/>
4646
</Target>
4747
<Import Project="$(BDS)\Bin\CodeGear.Group.Targets" Condition="Exists('$(BDS)\Bin\CodeGear.Group.Targets')"/>
4848
</Project>

‎Server/Bin/dataset.xml‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎Server/Src/Main.View.dfm‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -253,8 +253,6 @@ object MainForm: TMainForm
253253
Columns = 3
254254
ItemHeight = 15
255255
TabOrder = 0
256-
ExplicitLeft = 3
257-
ExplicitTop = 13
258256
end
259257
object Panel2: TPanel
260258
Left = 4
@@ -285,8 +283,6 @@ object MainForm: TMainForm
285283
Caption = 'Delete UserID selected'
286284
TabOrder = 1
287285
OnClick = btnDeleteUserIDSelectedClick
288-
ExplicitLeft = 139
289-
ExplicitTop = 5
290286
end
291287
object BitBtn2: TBitBtn
292288
Left = 290
@@ -296,8 +292,6 @@ object MainForm: TMainForm
296292
Align = alLeft
297293
Caption = 'Enable send to selected'
298294
TabOrder = 2
299-
ExplicitLeft = 296
300-
ExplicitTop = 5
301295
end
302296
end
303297
end

‎Server/Src/Main.View.pas‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ implementation
8282

8383
procedure TMainForm.FormCreate(Sender: TObject);
8484
begin
85+
SetWindowPos(Handle, HWND_TOPMOST, Left, Top, Width, Height, SWP_NOACTIVATE or SWP_NOMOVE or SWP_NOSIZE);
86+
8587
//AO NAO E OBRIGATORIO, MAS O FIREFOX E O SAFARI NAO ACEITARAO SE NAO ESTIVEREM PRESENTES
8688
TMSFNCWebPushSender1.Claims.Subject := 'mailto:admin@example.com';
8789

‎WebClient/Src/Main.View.html‎

Lines changed: 0 additions & 57 deletions
This file was deleted.

‎WebClient/Src/Main.View.pas‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

WebClient/Src/Main.View.dfm renamed to WebClient/Unit1.dfm

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
object MainView: TMainView
2-
Width = 315
1+
object Form2: TForm2
2+
Width = 640
33
Height = 480
44
Font.Charset = DEFAULT_CHARSET
55
Font.Color = clWindowText
@@ -16,43 +16,59 @@ object MainView: TMainView
1616
Width = 43
1717
Height = 16
1818
Caption = 'UserID:'
19-
ElementID = 'lbUserID'
2019
HeightPercent = 100.000000000000000000
2120
WidthPercent = 100.000000000000000000
2221
end
23-
object edtUserID: TWebEdit
22+
object WebLabel3: TWebLabel
23+
Left = 312
24+
Top = 33
25+
Width = 130
26+
Height = 16
27+
Caption = 'Push Notification demo'
28+
ElementID = 'title'
29+
HeightPercent = 100.000000000000000000
30+
WidthPercent = 100.000000000000000000
31+
end
32+
object WebLabel4: TWebLabel
33+
Left = 312
34+
Top = 65
35+
Width = 184
36+
Height = 16
37+
Caption = 'Usage of TWebPushNotifications'
38+
ElementID = 'description'
39+
HeightPercent = 100.000000000000000000
40+
WidthPercent = 100.000000000000000000
41+
end
42+
object WebEdit1: TWebEdit
2443
Left = 57
2544
Top = 8
2645
Width = 216
2746
Height = 19
28-
ElementID = 'edtUserID'
2947
HeightPercent = 100.000000000000000000
3048
WidthPercent = 100.000000000000000000
31-
OnChange = edtUserIDChange
49+
OnChange = WebEdit1Change
3250
end
33-
object btnSubscribe: TWebButton
51+
object WebButton1: TWebButton
3452
Left = 8
3553
Top = 33
3654
Width = 265
3755
Height = 25
3856
Caption = 'Subscribe for push notifications'
3957
ChildOrder = 1
40-
ElementID = 'btnSubscribe'
4158
HeightPercent = 100.000000000000000000
4259
WidthPercent = 100.000000000000000000
43-
OnClick = btnSubscribeClick
60+
OnClick = WebButton1Click
4461
end
45-
object btnUnsubscribe: TWebButton
62+
object WebButton2: TWebButton
4663
Left = 8
4764
Top = 64
4865
Width = 265
4966
Height = 25
5067
Caption = 'Unsubscribe from push notifications'
5168
ChildOrder = 2
52-
ElementID = 'btnUnsubscribe'
5369
HeightPercent = 100.000000000000000000
5470
WidthPercent = 100.000000000000000000
55-
OnClick = btnUnsubscribeClick
71+
OnClick = WebButton2Click
5672
end
5773
object WebPushNotifications1: TWebPushNotifications
5874
RegisterSubscriptionURL = 'http://localhost:8081/registerSubscription'

‎WebClient/Unit1.html‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<html>
2+
<head>
3+
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
4+
<title>TMS Web Project</title>
5+
</head>
6+
<body>
7+
<header>
8+
<img src="https://www.tmssoftware.com/site/img/logos/loper.svg" class="background-image">
9+
<div class="top-title top-title-small">
10+
<a href="https://www.tmssoftware.com/" target="_blank" title="Visit tmssoftware">
11+
<img class="large" src="https://www.tmssoftware.com/site/img/logo_tms_software.png">
12+
<img class="small" src="https://www.tmssoftware.com/site/img/logo_tms_software_small.png">
13+
</a>
14+
</div>
15+
<div class="top-title top-title-small">
16+
<a href="http://web.tmssoftware.com/" target="_blank" title="Visit TMS Web Core page">
17+
<div class="tms-panel-thumb">WEB</div>
18+
<div class="tms-thumb-text">TMS WEB Core</div>
19+
</a>
20+
</div>
21+
<div class="bg-webgreen top-title top-title-detail" id="title">Title</div>
22+
<div class="bg-webgreen top-title top-title-description">
23+
<table>
24+
<tr><td class="icon">
25+
<i class="icon material-icons">info</i>
26+
</td><td>
27+
<span id="description">Description</span>
28+
</td></tr>
29+
</table>
30+
</div>
31+
</header>
32+
<div id="appcontent" class="appcontent">
33+
</div>
34+
</body>
35+
</html>
36+

0 commit comments

Comments
 (0)