Skip to content

Commit 498a687

Browse files
pyhoonpyhoon
committed
v6.00beta3
1 parent 4fca068 commit 498a687

File tree

8 files changed

+67
-11
lines changed

8 files changed

+67
-11
lines changed

‎release/Pakai Server (6.00beta).b4xtemplate‎

-27.9 KB
Binary file not shown.

‎release/Pakai Server (6.00beta3).b4xtemplate‎

17.5 KB
Binary file not shown.

‎source/$APPNAME$.b4j‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ Version=10.3
4343
#End If
4444
#Region Macros
4545
#Macro: Title, GetLibraries, ide://run?file=%JAVABIN%\java.exe&args=-jar&args=%ADDITIONAL%\..\B4X\libget.jar&args=%PROJECT%&args=false
46-
#Macro: Title, Backup, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&Args=-cMf&Args=%PROJECT_NAME%_2025-11-06_0233.zip&args=Files&args=Objects\www&args=Objects\config.*&args=Objects\LICENSE&args=*.bas&args=*.b4j&args=*.b4j.meta&args=libs.json
47-
#Macro: Title, Objects, ide://run?file=%WINDIR%\SysWOW64\explorer.exe&args=%PROJECT%\Objects
48-
#Macro: Title, Distribute, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=../Objects&args=-cMf&args=Dist.zip&args=www&args=*.jar&args=*.ini
46+
#Macro: Title, GetResources, ide://run?file=%JAVABIN%\java.exe&args=-jar&args=%ADDITIONAL%\..\B4X\resget.jar&args=%PROJECT%&args=true
47+
'#Macro: Title, Backup, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&Args=-cMf&Args=%PROJECT_NAME%_2025-11-06_1245.zip&args=Files&args=Objects\www&args=Objects\config.*&args=Objects\LICENSE&args=*.bas&args=*.b4j&args=*.b4j.meta&args=libs.json
48+
'#Macro: Title, Objects, ide://run?file=%WINDIR%\SysWOW64\explorer.exe&args=%PROJECT%\Objects
49+
'#Macro: Title, Distribute, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=../Objects&args=-cMf&args=Dist.zip&args=www&args=*.jar&args=*.ini
4950
#End Region
5051
Sub Process_Globals
5152
Public DB As Database

‎source/$APPNAME$.b4j.meta‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ ModuleClosedNodes2=
1616
ModuleClosedNodes3=
1717
ModuleClosedNodes4=
1818
ModuleClosedNodes5=
19-
NavigationStack=Main,AppStart,31,0
19+
NavigationStack=Main,AppStart,33,1
2020
SelectedBuild=0
2121
VisibleModules=

‎source/CategoriesHandler.bas‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@ Private Sub RenderPage
5454
doc.Initialize
5555
doc.AppendDocType
5656
doc.Append(page1.build)
57+
58+
Response.ContentType = "text/html"
5759
Response.Write(App.ReplaceMap(doc.ToString, App.ctx))
5860
End Sub
5961

@@ -120,6 +122,7 @@ End Sub
120122

121123
' Return table HTML
122124
Private Sub HandleTable
125+
Response.ContentType = "text/html"
123126
Response.Write(GenerateCategoriesTable.Build)
124127
End Sub
125128

@@ -140,6 +143,8 @@ Private Sub HandleList
140143
Option.valueOf(id).text(name).up(select1)
141144
Next
142145
DB.Close
146+
147+
Response.ContentType = "text/html"
143148
Response.Write(select1.Build)
144149
End Sub
145150

@@ -165,6 +170,7 @@ Private Sub HandleAddModal
165170
Button.typeOf("submit").cls("btn btn-success px-3").text("Create").up(modalFooter)
166171
Button.typeOf("button").cls("btn btn-secondary px-3").data("bs-dismiss", "modal").text("Cancel").up(modalFooter)
167172

173+
Response.ContentType = "text/html"
168174
Response.Write(form1.Build)
169175
End Sub
170176

@@ -201,6 +207,8 @@ Private Sub HandleEditModal
201207
Button.typeOf("button").cls("btn btn-secondary px-3").data("bs-dismiss", "modal").text("Cancel").up(modalFooter)
202208
End If
203209
DB.Close
210+
211+
Response.ContentType = "text/html"
204212
Response.Write(form1.Build)
205213
End Sub
206214

@@ -234,6 +242,8 @@ Private Sub HandleDeleteModal
234242
Button.typeOf("button").cls("btn btn-secondary px-3").data("bs-dismiss", "modal").text("Cancel").up(modalFooter)
235243
End If
236244
DB.Close
245+
246+
Response.ContentType = "text/html"
237247
Response.Write(form1.Build)
238248
End Sub
239249

@@ -391,6 +401,7 @@ End Sub
391401

392402
Private Sub ShowAlert (message As String, status As String)
393403
Dim div1 As Tag = Div.cls("alert alert-" & status).text(message)
404+
Response.ContentType = "text/html"
394405
Response.Write(div1.Build)
395406
End Sub
396407

@@ -409,5 +420,7 @@ Private Sub ShowToast (entity As String, action As String, message As String, st
409420
Dim script1 As MiniJs
410421
script1.Initialize
411422
script1.AddCustomEventDispatch($"entity:changed"$, details)
423+
424+
Response.ContentType = "text/html"
412425
Response.Write(div1.Build & CRLF & script1.Generate)
413426
End Sub

‎source/Pakai.b4j‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,11 +44,13 @@ Version=10.3
4444
#Region Macros
4545
'For source
4646
'#Macro: Title, Create Template, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&args=-cMf&args=%PROJECT%\..\release\Pakai%20Server%20(6.00beta).b4xtemplate&args=Files&args=$APPNAME$.*&args=*.bas&args=libs.json&args=Objects\LICENSE&args=Objects\www\assets\css&args=Objects\www\assets\img&args=Objects\www\assets\js\*.min.js&args=Objects\www\assets\js\app.js
47-
#Macro: Title, Create Template, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&args=-cMf&args=%PROJECT%\..\release\Pakai%20Server%20(6.00beta).b4xtemplate&args=Files&args=$APPNAME$.*&args=*.bas&args=libs.json&args=Objects\LICENSE&args=Objects\www\assets\img&args=Objects\www\assets\css\main.css&args=Objects\www\assets\js\app.js
47+
'#Macro: Title, Create Template, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&args=-cMf&args=%PROJECT%\..\release\Pakai%20Server%20(6.00beta).b4xtemplate&args=Files&args=$APPNAME$.*&args=*.bas&args=libs.json&args=Objects\LICENSE&args=Objects\www\assets\img&args=Objects\www\assets\css\main.css&args=Objects\www\assets\js\app.js
48+
#Macro: Title, Create Template, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&args=-cMf&args=%PROJECT%\..\release\Pakai%20Server%20(6.00beta).b4xtemplate&args=Files&args=$APPNAME$.*&args=*.bas&args=libs.json&args=resources.json&args=Objects\LICENSE
4849
#Macro: Title, Release folder, ide://run?file=%WINDIR%\SysWOW64\explorer.exe&args=%PROJECT%\..\release
4950
#Macro: Title, Copy to AddLibs, ide://run?file=%COMSPEC%&args=/c&args=copy&args=%PROJECT%\..\release\*.b4xtemplate&args=%ADDITIONAL%
5051
'For release
5152
'#Macro: Title, GetLibraries, ide://run?file=%JAVABIN%\java.exe&args=-jar&args=%ADDITIONAL%\..\B4X\libget.jar&args=%PROJECT%&args=false
53+
'#Macro: Title, GetResources, ide://run?file=%JAVABIN%\java.exe&args=-jar&args=%ADDITIONAL%\..\B4X\resget.jar&args=%PROJECT%&args=true
5254
'#Macro: Title, Backup, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=..&Args=-cMf&Args=%PROJECT_NAME%_2025-11-05_1548.zip&args=Files&args=Objects\www&args=Objects\config.*&args=Objects\LICENSE&args=*.bas&args=*.b4j&args=*.b4j.meta&args=libs.json
5355
'#Macro: Title, Objects, ide://run?file=%WINDIR%\SysWOW64\explorer.exe&args=%PROJECT%\Objects
5456
'#Macro: Title, Distribute, ide://run?file=%JAVABIN%\jar.exe&WorkingDirectory=../Objects&args=-cMf&args=Dist.zip&args=www&args=*.jar&args=*.ini

‎source/ProductsHandler.bas‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ Private Sub RenderPage
5555
doc.Initialize
5656
doc.AppendDocType
5757
doc.Append(page1.build)
58+
59+
Response.ContentType = "text/html"
5860
Response.Write(App.ReplaceMap(doc.ToString, App.ctx))
5961
End Sub
6062

@@ -152,6 +154,7 @@ End Sub
152154

153155
' Return table HTML
154156
Private Sub HandleTable
157+
Response.ContentType = "text/html"
155158
Response.Write(GenerateProductsTable.Build)
156159
End Sub
157160

@@ -217,6 +220,7 @@ Private Sub HandleSearch
217220
Next
218221
DB.Close
219222

223+
Response.ContentType = "text/html"
220224
Response.Write(table1.Build)
221225
End Sub
222226

@@ -272,6 +276,7 @@ Private Sub HandleAddModal
272276
modalFooter.add(Button.typeOf("submit").cls("btn btn-success px-3").text("Create"))
273277
modalFooter.add(Input.typeOf("button").cls("btn btn-secondary px-3").data("bs-dismiss", "modal").attr("value", "Cancel"))
274278

279+
Response.ContentType = "text/html"
275280
Response.Write(form1.Build)
276281
End Sub
277282

@@ -346,6 +351,8 @@ Private Sub HandleEditModal
346351
modalFooter.add(Input.typeOf("button").cls("btn btn-secondary px-3").data("bs-dismiss", "modal").valueOf("Cancel"))
347352
End If
348353
DB.Close
354+
355+
Response.ContentType = "text/html"
349356
Response.Write(form1.Build)
350357
End Sub
351358

@@ -381,6 +388,8 @@ Private Sub HandleDeleteModal
381388
Input.typeOf("button").cls("btn btn-secondary px-3").data("bs-dismiss", "modal").valueOf("Cancel").up(modalFooter)
382389
End If
383390
DB.Close
391+
392+
Response.ContentType = "text/html"
384393
Response.Write(form1.Build)
385394
End Sub
386395

@@ -554,6 +563,7 @@ End Sub
554563

555564
Private Sub ShowAlert (message As String, status As String)
556565
Dim div1 As Tag = Div.cls("alert alert-" & status).text(message)
566+
Response.ContentType = "text/html"
557567
Response.Write(div1.Build)
558568
End Sub
559569

@@ -572,5 +582,7 @@ Private Sub ShowToast (entity As String, action As String, message As String, st
572582
Dim script1 As MiniJs
573583
script1.Initialize
574584
script1.AddCustomEventDispatch($"entity:changed"$, details)
585+
586+
Response.ContentType = "text/html"
575587
Response.Write(div1.Build & CRLF & script1.Generate)
576588
End Sub

‎source/resources.json‎

Lines changed: 34 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,51 @@
33
"Resources": [
44
{
55
"File": "www\\assets\\img\\coffee.png",
6-
"Link": "https://raw.githubusercontent.com/pyhoon/pakai-server-b4j/refs/heads/main/source/Objects/www/assets/img/coffee.png"
6+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/img/coffee.png"
77
},
88
{
99
"File": "www\\assets\\img\\favicon.png",
10-
"Link": "https://raw.githubusercontent.com/pyhoon/pakai-server-b4j/refs/heads/main/source/Objects/www/assets/img/favicon.png"
10+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/img/favicon.png"
1111
},
1212
{
1313
"File": "www\\assets\\img\\sponsor.png",
14-
"Link": "https://raw.githubusercontent.com/pyhoon/pakai-server-b4j/refs/heads/main/source/Objects/www/assets/img/sponsor.png"
14+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/img/sponsor.png"
15+
},
16+
{
17+
"File": "www\\assets\\css\\bootstrap.min.css",
18+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/css/bootstrap.min.css"
19+
},
20+
{
21+
"File": "www\\assets\\css\\bootstrap-icons.min.css",
22+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/css/bootstrap-icons.min.css"
1523
},
1624
{
1725
"File": "www\\assets\\css\\main.css",
18-
"Link": "https://raw.githubusercontent.com/pyhoon/pakai-server-b4j/refs/heads/main/source/Objects/www/assets/css/main.css"
26+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/css/main.css"
27+
},
28+
{
29+
"File": "www\\assets\\css\\fonts\\bootstrap-icons.woff",
30+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/css/fonts/bootstrap-icons.woff"
31+
},
32+
{
33+
"File": "www\\assets\\css\\fonts\\bootstrap-icons.woff2",
34+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/css/fonts/bootstrap-icons.woff2"
35+
},
36+
{
37+
"File": "www\\assets\\css\\LICENSE\\bootstrap\\LICENSE.txt",
38+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/css/LICENSE/bootstrap/LICENSE.txt"
39+
},
40+
{
41+
"File": "www\\assets\\js\\bootstrap.min.js",
42+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/js/bootstrap.min.js"
43+
},
44+
{
45+
"File": "www\\assets\\js\\htmx.min.js",
46+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/js/htmx.min.js"
1947
},
2048
{
21-
"File": "www\\assets\\js\\main.js",
22-
"Link": "https://raw.githubusercontent.com/pyhoon/pakai-server-b4j/refs/heads/main/source/Objects/www/assets/js/main.js"
49+
"File": "www\\assets\\js\\app.js",
50+
"Link": "https://github.com/pyhoon/pakai-server-b4j/raw/refs/heads/v6.00/source/Objects/www/assets/js/app.js"
2351
}
2452
]
2553
}

0 commit comments

Comments
 (0)