Merge pull request #11 from GenieFramework/hh-rawelem

Components: Uploader and raw quasar and vue elements

src/API.jl

@@ -1,8 +1,9 @@
 module API
 
-using Stipple
+using Stipple, StippleUI
+import Genie.Renderer.Html: HTMLString, normal_element
 
-export attributes
+export attributes, quasar, vue, quasar_pure, vue_pure
 
 const ATTRIBUTES_MAPPINGS = Dict{String,String}(
   "autoclose" => "auto-close",
@@ -100,6 +101,36 @@ function attributes(kwargs::Vector{X},
   NamedTuple(attrs)
 end
 
+function q__elem(f::Function, elem::Symbol, args...; attrs...) :: HTMLString
+  normal_element(f, string(elem), [args...], Pair{Symbol,Any}[attrs...])
+end
+
+function q__elem(elem::Symbol, children::Union{String,Vector{String}} = "", args...; attrs...) :: HTMLString
+  normal_element(children, string(elem), [args...], Pair{Symbol,Any}[attrs...])
+end
+
+function q__elem(elem::Symbol, children::Any, args...; attrs...) :: HTMLString
+  normal_element(string(children), string(elem), [args...], Pair{Symbol,Any}[attrs...])
+end
+
+function quasar(elem::Symbol, args...;
+                wrap::Function = StippleUI.DEFAULT_WRAPPER,
+                kwargs...) where {T<:Stipple.ReactiveModel}
+  wrap() do
+    q__elem(Symbol("q-$elem"), args...; attributes([collect(kwargs)...], ATTRIBUTES_MAPPINGS)...)
+  end
+end
+
+function vue(elem::Symbol, args...;
+                wrap::Function = StippleUI.DEFAULT_WRAPPER,
+                kwargs...) where {T<:Stipple.ReactiveModel}
+  wrap() do
+    q__elem(Symbol("vue-$elem"), args...; attributes([collect(kwargs)...], ATTRIBUTES_MAPPINGS)...)
+  end
+end
+
+quasar_pure(args...; kwargs...) = quasar(args...; wrap=StippleUI.NO_WRAPPER, kwargs...)
+vue_pure(args...; kwargs...) = vue(args...; wrap=StippleUI.NO_WRAPPER, kwargs...)
 
 function __init__() :: Nothing
   Stipple.rendering_mappings(ATTRIBUTES_MAPPINGS)

src/Space.jl

@@ -5,11 +5,11 @@ import Genie.Renderer.Html: HTMLString, normal_element, template
 
 export space
 
-Genie.Renderer.Html.register_normal_element("q__separator", context = @__MODULE__)
+Genie.Renderer.Html.register_normal_element("q__space", context = @__MODULE__)
 
 function space(args...; wrap::Function = StippleUI.DEFAULT_WRAPPER, kwargs...)
   wrap() do
-    q__separator(args...; kwargs...)
+    q__space(args...; kwargs...)
   end
 end
 

src/StippleUI.jl

@@ -6,6 +6,7 @@ import Stipple
 using Stipple.Reexport
 
 const DEFAULT_WRAPPER = Genie.Renderer.Html.template
+const NO_WRAPPER = f->f()
 
 #===#
 
@@ -58,10 +59,13 @@ include("Toggle.jl")
 ############# new Elements ##################
 include("Layout.jl")
 include("Drawer.jl")
+include("Uploader.jl")
 
 
 #===#
 
+import .API: quasar, quasar_pure, vue, vue_pure
+export quasar, quasar_pure, vue, vue_pure
 @reexport using .Badge
 @reexport using .Banner
 @reexport using .BigNumber
@@ -83,6 +87,7 @@ include("Drawer.jl")
 @reexport using .Space
 @reexport using .Table
 @reexport using .Toggle
+@reexport using .Uploader
 
 #===#
 

src/Uploader.jl

@@ -0,0 +1,18 @@
+module Uploader
+
+using Genie, Stipple, StippleUI, StippleUI.API
+import Genie.Renderer.Html: HTMLString, normal_element
+
+export uploader
+
+Genie.Renderer.Html.register_normal_element("q__uploader", context = @__MODULE__)
+
+function uploader(args...;
+              wrap::Function = StippleUI.DEFAULT_WRAPPER,
+              kwargs...)
+  wrap() do
+    q__uploader(args...; kwargs...)
+  end
+end
+
+end