Merge branch 'master' of https://github.com/GenieFramework/Stipple.jl

GenieFramework · Oct 11, 2024 · 60ac830 · 60ac830 · hhaensel · Oct 11, 2024
2 parents 446ddab + d1291f4
commit 60ac830
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 22 deletions.
diff --git a/src/Layout.jl b/src/Layout.jl
@@ -10,7 +10,8 @@ using Genie, Stipple
 export layout, add_css, remove_css
 export page, app, row, column, cell, container, flexgrid_kwargs, htmldiv, @gutter
 
-export theme
+export theme, googlefonts_css, stipplecore_css, genie_footer
+
 const THEMES = Ref(Function[])
 
 const FLEXGRID_KWARGS = [:col, :xs, :sm, :md, :lg, :xl, :gutter, :xgutter, :ygutter]
@@ -122,6 +123,31 @@ function iscontainer(class)
     false
 end
 
+function genie_footer()
+  ParsedHTMLString("""
+  <style>
+    ._genie_logo {
+      background:url('https://genieframework.com/logos/genie/logo-simple-with-padding.svg') no-repeat;
+      background-size:40px;
+      padding-top:22px;
+      padding-right:10px;
+      color:transparent !important;
+      font-size:9pt;
+    }
+    ._genie .row .col-12 { width:50%; margin:auto; }
+  </style>
+  <footer class='_genie container'>
+    <div class='row'>
+      <div class='col-12'>
+        <p class='text-muted credit' style='text-align:center;color:#8d99ae;'>Built with
+          <a href='https://genieframework.com' target='_blank' class='_genie_logo' ref='nofollow'>Genie</a>
+        </p>
+      </div>
+    </div>
+  </footer>
+  """)
+end
+
 function flexgrid_class(tag::Symbol, value::Union{String,Int,Nothing,Symbol} = -1, container = false)
   gutter = container ? "q-col-gutter" : "q-gutter"
   (value == -1 || value === nothing) && return ""
@@ -507,6 +533,19 @@ function htmldiv(args...;
   Genie.Renderer.Html.div(args...; kwargs...)
 end
 
+function googlefonts_css()
+  (stylesheet("https://fonts.googleapis.com/css?family=Material+Icons"),)
+end
+
+function stipplecore_css()
+  (stylesheet(Genie.Assets.asset_path(Stipple.assets_config, :css, file="stipplecore")),)
+end
+
+function coretheme()
+    stylesheet("https://fonts.googleapis.com/css?family=Material+Icons"),
+    stylesheet(Genie.Assets.asset_path(Stipple.assets_config, :css, file="stipplecore"))
+end
+
 """
     function theme() :: String
 
@@ -528,20 +567,12 @@ julia> push!(Stipple.Layout.THEMES[], StippleUI.theme)
 function theme(; core_theme::Bool = true) :: Vector{String}
   output = String[]
 
-  if core_theme
-    push!(THEMES[], () -> begin
-        stylesheet("https://fonts.googleapis.com/css?family=Material+Icons"),
-        stylesheet(Genie.Assets.asset_path(Stipple.assets_config, :css, file="stipplecore"))
-      end
-    )
-  end
-
-  unique!(THEMES[])
+  core_theme && coretheme ∉ THEMES[] && push!(output, coretheme()...)
 
   for f in THEMES[]
     push!(output, f()...)
   end
-
+  
   output
 end
 

diff --git a/src/ReactiveTools.jl b/src/ReactiveTools.jl
@@ -42,7 +42,9 @@ const TYPES = LittleDict{Module,Union{<:DataType,Nothing}}()
 const HANDLERS_FUNCTIONS = LittleDict{Type{<:ReactiveModel},Function}()
 
 function DEFAULT_LAYOUT(; title::String = "Genie App",
-                          meta::D = Dict(), head_content::Union{AbstractString, Vector} = "") where {D <:AbstractDict}
+                          meta::D = Dict(),
+                          head_content::Union{AbstractString, Vector} = "",
+                          core_theme::Bool = true) where {D <:AbstractDict}
   tags = Genie.Renderers.Html.for_each(x -> """<meta name="$(string(x.first))" content="$(string(x.second))">\n""", meta)
   """
 <!DOCTYPE html>
@@ -73,7 +75,7 @@ function DEFAULT_LAYOUT(; title::String = "Genie App",
     <div class='container'>
       <div class='row'>
         <div class='col-12'>
-          <% Stipple.page(model, partial = true, v__cloak = true, [Stipple.Genie.Renderer.Html.@yield], Stipple.@if(:isready)) %>
+          <% Stipple.page(model, partial = true, v__cloak = true, [Stipple.Genie.Renderer.Html.@yield], Stipple.@if(:isready); core_theme = $core_theme) %>
         </div>
       </div>
     </div>

diff --git a/src/Stipple.jl b/src/Stipple.jl
@@ -1260,6 +1260,9 @@ using Stipple.ReactiveTools
   @compile_workload begin
       # all calls in this block will be precompiled, regardless of whether
       # they belong to your package or not (on Julia 1.8 and higher)
+      # set secret in order to avoid automatic generation of a new one,
+      # which would invalidate the precompiled file
+      Genie.Secrets.secret_token!(repeat("f", 64))
       ui() = [cell("hello"), row("world"), htmldiv("Hello World")]
 
       @app PrecompileApp begin
@@ -1277,15 +1280,20 @@ using Stipple.ReactiveTools
       end
       port = tryparse(Int, get(ENV, "STIPPLE_PRECOMPILE_PORT", ""))
       port === nothing && (port = rand(8081:8999))
-      up(port)
-
-      precompile_get = tryparse(Bool, get(ENV, "STIPPLE_PRECOMPILE_GET", "1"))
-      precompile_get === true && HTTP.get("http://localhost:$port")
-      # The following lines (still) produce an error although
-      # they pass at the repl. Not very important though.
-      # HTTP.get("http://localhost:$port$(Genie.Assets.asset_path(Genie.assets_config, :js, file = "channels"))")
-      # HTTP.get("http://localhost:$port$(Genie.Assets.asset_path(assets_config, :js, file = "stipplecore"))")
-      down()
+
+      Logging.with_logger(Logging.SimpleLogger(stdout, Logging.Error)) do
+        up(port)
+
+        precompile_get = tryparse(Bool, get(ENV, "STIPPLE_PRECOMPILE_GET", "1"))
+        precompile_get === true && HTTP.get("http://localhost:$port")
+        # The following lines (still) produce an error although
+        # they pass at the repl. Not very important though.
+        # HTTP.get("http://localhost:$port$(Genie.Assets.asset_path(Genie.assets_config, :js, file = "channels"))")
+        # HTTP.get("http://localhost:$port$(Genie.Assets.asset_path(assets_config, :js, file = "stipplecore"))")
+        down()
+      end
+      # reset secret back to empty string
+      Genie.Secrets.secret_token!("")
   end
   PRECOMPILE[] = false
 end