Skip to content

Commit

Permalink
Version 3.16
Browse files Browse the repository at this point in the history
  • Loading branch information
Mashiane committed Feb 10, 2021
1 parent 5ffe25a commit 7c33c83
Show file tree
Hide file tree
Showing 62 changed files with 16,202 additions and 20,106 deletions.
Binary file modified External Libraries/BANanoFireStore.b4xlib
Binary file not shown.
Binary file modified External Libraries/BANanoVuetifyAD3.b4xlib
Binary file not shown.
2 changes: 1 addition & 1 deletion Library/BANanoVuetifyAD3.b4j
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ Version=8.8

Sub Process_Globals
Private BANano As BANano 'ignore
Public Version As String = "3.15"
Public Version As String = "3.16"
Public AppName As String = "BANanoVuetifyAD3"
End Sub

Expand Down
2 changes: 1 addition & 1 deletion Library/BANanoVuetifyAD3.b4j.meta
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes9=
NavigationStack=VueComponent,GetElementByData,435,0,VueComponent,AddElement,464,0,VueElement,AddBtn,6509,0,VueElement,AddComponent,6519,4,VueElement,AddButtonWithIcon,6508,0,VuetifyApp,ModuleExist,1325,0,VuetifyApp,AddRoute,1369,0,VuetifyApp,AddSlot,2759,0,VuetifyApp,AddComponent,2776,1,VuetifyApp,AddAnchor,2767,0,Main,Process_Globals,11,0
NavigationStack=VueElement,SetData,1403,0,VueElement,setDataSource,2084,0,VueElement,BindVueElement,1700,0,VueElement,setVModel,2122,0,VueElement,setRules,2822,0,VueElement,setItems,4271,0,VueElement,ClearItems,4700,0,VueElement,AddListViewTemplate,5179,0,VueElement,Class_Globals,183,0,VueElement,DesignerCreateView,957,1,Main,Process_Globals,9,0
SelectedBuild=0
VisibleModules=
150 changes: 118 additions & 32 deletions Library/VueElement.bas
Original file line number Diff line number Diff line change
Expand Up @@ -745,9 +745,6 @@ Sub getBold As Boolean
Return bBold
End Sub




Sub setFloat(varValue As String)
If BANano.IsNull(varValue) Then varValue = ""
stFloat = varValue
Expand Down Expand Up @@ -965,8 +962,8 @@ Public Sub DesignerCreateView (Target As BANanoElement, Props As Map)
AddAttr("v-html", stVHtml)
AddAttr("v-if", stVIf)
AddAttr("label", stLabel)
AddAttr("v-model", stVModel)
AddAttr("v-show", stVShow)
setVModel(stVModel)
setVShow(stVShow)
AddAttr("v-text", stVText)
AddStyle("background-color", stBackgroundColor)
AddStyle("background-image", stBackgroundImage)
Expand Down Expand Up @@ -1016,7 +1013,9 @@ Public Sub DesignerCreateView (Target As BANanoElement, Props As Map)
setFitScreen(bFitScreen)

'
If BANano.IsNull(bBuildGrid) Or BANano.IsUndefined(bBuildGrid) Then bBuildGrid = False
If BANano.IsNull(bBuildGrid) Or BANano.IsUndefined(bBuildGrid) Then
bBuildGrid = False
End If
If bBuildGrid = False Then
setOffsets(stOffSets)
setSizes(stSizes)
Expand Down Expand Up @@ -1760,9 +1759,9 @@ Public Sub AddAttr(varProp As String, varValue As String)
attributeList.put(varProp, varValue)
End If
End If
' '
'
' Select Case varProp
' Case "v-model", "v-show", "v-if", "v-else-if", "required", "disabled", "readonly"
' Case "v-model", "v-show", "v-if", "v-else-if", "required", "disabled", "readonly"
' If varValue <> "" Then
' bindings.Put(varValue, Null)
' End If
Expand Down Expand Up @@ -2126,6 +2125,9 @@ public Sub setVModel(varVModel As String)
If varVModel = "" Then Return
AddAttr("v-model", varVModel)
stVModel = varVModel
If stVModel.StartsWith("!") = False Then
SetData(stVModel, Null)
End If
End Sub

public Sub getVModel() As String
Expand All @@ -2152,6 +2154,9 @@ End Sub
public Sub setVShow(varVShow As String)
AddAttr("v-show", varVShow)
stVShow = varVShow
If stVShow.StartsWith("!") = False Then
SetData(stVShow, Null)
End If
End Sub

public Sub getVShow() As String
Expand Down Expand Up @@ -2723,7 +2728,7 @@ Sub setTrueValue(tv As Object)
AddAttr("true-value", tv)
End Sub

Sub setAbsolute(tv As object)
Sub setAbsolute(tv As Object)
AddAttr(":absolute", tv)
End Sub

Expand Down Expand Up @@ -4271,14 +4276,18 @@ Sub setDot(b As Boolean)
End Sub

Sub setItems(s As String)
If BANano.IsNull(s) Or BANano.IsNull(s) Then
Return
End If
s = s.ToLowerCase
s = s.Replace(":","")
stItems = s
AddAttr(":items", stItems)
SetData(stItems, NewList)
Try
If BANano.IsNull(s) Or BANano.IsUndefined(s) Then
Return
End If
s = s.ToLowerCase
s = s.Replace(":","")
stItems = s
AddAttr(":items", stItems)
SetData(stItems, NewList)
Catch
Log(LastException)
End Try
End Sub

Sub getItems As String
Expand Down Expand Up @@ -5385,56 +5394,56 @@ Sub AddStyleOnMouseOut(prop As String, value As String)
AddAttr("onMouseOut", sstyle)
End Sub

Sub setRoundedLG
Sub SetRoundedLG
AddClass("rounded-lg")
End Sub

Sub setRounded0
Sub SetRounded0
AddClass("rounded-0")
End Sub

Sub setRoundedSM
Sub SetRoundedSM
AddClass("rounded-sm")
End Sub

Sub setRoundedXL
Sub SetRoundedXL
AddClass("rounded-xl")
End Sub

Sub setRoundedPill
Sub SetRoundedPill
AddClass("rounded-pill")
End Sub

Sub setRoundedCircle
Sub SetRoundedCircle
AddClass("rounded-circle")
End Sub

Sub setTransitionSwing
Sub SetTransitionSwing
AddClass("transition-swing")
End Sub


Sub setDisplayBlock()
Sub SetDisplayBlock()
AddStyle("display", "block")
End Sub

Sub setResizeNone()
Sub SetResizeNone()
AddStyle("resize", "none")
End Sub

Sub setCursorPointer()
Sub SetCursorPointer()
AddStyle("cursor", "pointer")
End Sub

Sub setDisplayInlineBlock()
Sub SetDisplayInlineBlock()
AddStyle("display", "inline-block")
End Sub

Sub setBorderNone()
Sub SetBorderNone()
AddStyle("border", "none")
End Sub

Sub setFitBlock()
Sub SetFitBlock()
AddStyle("width", "100%")
End Sub

Expand Down Expand Up @@ -5565,6 +5574,18 @@ public Sub setBorderBottom(varBorder As String)
AddStyle("border-bottom", varBorder)
End Sub

public Sub setBorderTop(varBorder As String)
AddStyle("border-top", varBorder)
End Sub

public Sub setBorderLeft(varBorder As String)
AddStyle("border-left", varBorder)
End Sub

public Sub setBorderRight(varBorder As String)
AddStyle("border-right", varBorder)
End Sub

public Sub setOutlineNone()
AddStyle("outline", "none")
End Sub
Expand Down Expand Up @@ -5776,13 +5797,13 @@ Sub setLowerCase(b As Boolean)
End Sub

'set text decoration underline
Sub setUnderLine(b As Boolean)
Sub setUnderLine(b As Object)
If b = False Then Return
setTextDecoration("underline")
End Sub

'set text decoration line through
Sub setLineThrough(b As Boolean)
Sub setLineThrough(b As Object)
If b = False Then Return
setTextDecoration("line-through")
End Sub
Expand Down Expand Up @@ -7602,6 +7623,71 @@ Sub setMXAuto(b As Boolean)
AddClass("mx-auto")
End Sub

Sub setPaddingA(v As String)
AddStyle("padding-top", v)
AddStyle("padding-bottom", v)
AddStyle("padding-left", v)
AddStyle("padding-right", v)
End Sub

Sub setPaddingX(v As String)
AddStyle("padding-left", v)
AddStyle("padding-right", v)
End Sub

Sub setPaddingY(v As String)
AddStyle("padding-top", v)
AddStyle("padding-bottom", v)
End Sub

Sub setPaddingT(v As String)
AddStyle("padding-top", v)
End Sub

Sub setPaddingB(v As String)
AddStyle("padding-bottom", v)
End Sub

Sub setPaddingR(v As String)
AddStyle("padding-right", v)
End Sub

Sub setPaddingL(v As String)
AddStyle("padding-left", v)
End Sub

Sub setMarginT(v As String)
AddStyle("margin-top", v)
End Sub

Sub setMarginB(v As String)
AddStyle("margin-bottom", v)
End Sub

Sub setMarginR(v As String)
AddStyle("margin-right", v)
End Sub

Sub setMarginL(v As String)
AddStyle("margin-left", v)
End Sub

Sub setMarginA(v As String)
AddStyle("margin-top", v)
AddStyle("margin-bottom", v)
AddStyle("margin-left", v)
AddStyle("margin-right", v)
End Sub

Sub setMarginX(v As String)
AddStyle("margin-left", v)
AddStyle("margin-right", v)
End Sub

Sub setMarginY(v As String)
AddStyle("margin-top", v)
AddStyle("margin-bottom", v)
End Sub

Sub setMarginTop(v As String)
AddStyle("margin-top", v)
Expand Down
1 change: 1 addition & 0 deletions Library/VuetifyApp.bas
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ Sub Class_Globals
leftswitch As String, showleftswitches As Boolean, _
rightswitch As String, showrightswitches As Boolean, switchinset As Boolean)
Public RouterViewName As String
Public DatabaseName As String
End Sub


Expand Down
53 changes: 37 additions & 16 deletions Tutorials/Part43/Files/alasql.min.js

Large diffs are not rendered by default.

Binary file modified Tutorials/Part43/Files/avatar1.bjl
Binary file not shown.
Binary file modified Tutorials/Part43/Files/vabout.bjl
Binary file not shown.
32 changes: 16 additions & 16 deletions Tutorials/Part43/Part43.b4j
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ Sub Process_Globals
Public AppTitle As String = "BANanoVuetify AD3"
Private Publish As String = "C:\laragon\www"
Public Version As String = "1.00"
Public ServerIP As String = "http://www.localhost:8080"
Public ServerIP As String = "http://www.localhost:80"
End Sub

Sub AppStart (Form1 As Form, Args() As String)
Expand All @@ -305,23 +305,23 @@ Sub AppStart (Form1 As Form, Args() As String)
'BANano.Header.SetMaskIcon("safari-pinned-tab.svg")
BANano.Header.AddManifestIcon("android-chrome-192x192.png", "192x192")
BANano.Header.AddManifestIcon("android-chrome-512x512.png", "512x512")
BANano.TranspilerOptions.UseServiceWorker = True
BANano.TranspilerOptions.MergeAllCSSFiles = True
BANano.TranspilerOptions.MergeAllJavascriptFiles = True
BANano.TranspilerOptions.UseServiceWorker = False
BANano.TranspilerOptions.MergeAllCSSFiles = False
BANano.TranspilerOptions.MergeAllJavascriptFiles = False
BANano.TranspilerOptions.MinifyOnline = False
BANano.TranspilerOptions.RemoveDeadCode = False
'BANano.TranspilerOptions.SetFireReadyWhenReadyStateComplete
'BANano.TranspilerOptions.GZipGeneratedWebsite(10)
#if release
BANano.TranspilerOptions.EnableLiveCodeSwapping = False
#end if
BANano.TranspilerOptions.RedirectOutput(File.DirApp, "log.txt")
'BANano.TranspilerOptions.RedirectOutput(File.DirApp, "log.txt")
'set php settings
BANano.PHP_NAME = $"${AppName}.php"$
#if release
'change to external host domain e.g http://www.google.com
'exclude the port address
ServerIP = "http://www.localhost:8080"
'ServerIP = "http://www.localhost:8080"
#end if
BANano.PHPHost = $"${ServerIP}/${AppName}/"$
BANano.PHPAddHeader("Access-Control-Allow-Origin: *")
Expand All @@ -343,14 +343,14 @@ importScripts("https://www.gstatic.com/firebasejs/8.2.1/firebase-messaging.js");
importScripts("https://www.gstatic.com/firebasejs/8.2.1/firebase-analytics.js");

var firebaseConfig = {
apiKey: "(redacted)",
authDomain: "(redacted)",
databaseURL: "(redacted)",
projectId: "(redacted)",
storageBucket: "(redacted)",
messagingSenderId: "(redacted)",
appId: "(redacted)",
measurementId: "(redacted)"
apiKey: "AIzaSyCMZcx29liQ9jDzU_fiXfTcd-Rcf_d4BSc",
authDomain: "robtrack-51a53.firebaseapp.com",
databaseURL: "https://robtrack-51a53-default-rtdb.firebaseio.com",
projectId: "robtrack-51a53",
storageBucket: "robtrack-51a53.appspot.com",
messagingSenderId: "521955206285",
appId: "1:521955206285:web:4371b85c9ea07c312deec4",
measurementId: "G-MRMG60W701"
};

firebase.initializeApp(firebaseConfig);
Expand All @@ -370,8 +370,8 @@ messaging.onBackgroundMessage(function(payload) {

'
Dim fx As JFX
Dim URL As String = File.GetUri(File.DirApp,"log.txt")
fx.ShowExternalDocument(URL)
'Dim URL As String = File.GetUri(File.DirApp,"log.txt")
'fx.ShowExternalDocument(URL)
'
Dim appPath As String = $"${ServerIP}/${AppName}/index.html"$
fx.ShowExternalDocument(appPath)
Expand Down
4 changes: 2 additions & 2 deletions Tutorials/Part43/Part43.b4j.meta
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,6 @@ ModuleClosedNodes6=
ModuleClosedNodes7=
ModuleClosedNodes8=
ModuleClosedNodes9=
NavigationStack=ViewContacts,ReadContact,68,0,ViewContacts,Loadgenders,455,0,ViewContacts,Initialize,34,0,ViewContacts,CreateDialog,408,6,ViewContacts,CreateContact,117,0,ViewContacts,CreateTable,190,0,ViewContacts,dlgContactsok_click,225,0,ViewCRUDBuilder,tablecont,614,0,ViewCRUDBuilder,btncrud_click,139,4,Main,AppStart,77,2,ViewFirebase,Initialize,30,4
NavigationStack=ViewContacts,UpdateContact,98,0,ViewFormControls,btnsave_Click,43,0,ViewFormControls,onmounted,50,0,ViewGrid,Initialize,21,0,ViewManualGrid,Initialize,82,0,ViewManualGrid,btn1_click,89,0,Visual Designer,vforms.bjl,-100,1,ViewFormControls,Initialize,17,6,ViewAvatars,Initialize,19,0,ViewCRUDBuilder,Initialize,66,0,ViewCRUDBuilder,btnRelationships1_click,533,0
SelectedBuild=0
VisibleModules=17
VisibleModules=12
2 changes: 1 addition & 1 deletion Tutorials/Part43/ViewContacts.bas
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
B4J=true
Group=Default Group
Group=Default Group\Views
ModulesStructureVersion=1
Type=StaticCode
Version=8.8
Expand Down
Loading

0 comments on commit 7c33c83

Please sign in to comment.