GenieFramework · hhaensel · Apr 26, 2023
diff --git a/AdvancedExamples/ContourPlots/heatlab.jl b/AdvancedExamples/ContourPlots/heatlab.jl
@@ -3,7 +3,7 @@ using DataFrames
 
 include("lib/solver.jl") # get_data from solver.jl
 
-@reactive mutable struct HeatPages <: ReactiveModel
+@vars HeatPages begin
     tableData::R{DataTable} = DataTable(DataFrame(1000 * ones(10, 10), ["$i" for i in 1:10]))
     credit_data_pagination::DataTablePagination = DataTablePagination(rows_per_page=10)
 

diff --git a/AdvancedExamples/ServerSideFiltering.jl b/AdvancedExamples/ServerSideFiltering.jl
@@ -9,7 +9,7 @@ import Stipple: js_methods
 
 using Random
 
-@reactive! mutable struct Example <: ReactiveModel
+@vars Example begin
     select::R{Vector{String}} = String[]
     options::R{Vector{String}} = ["Options 1", "Options 2", "Options 3"]
     filter::R{String} = ""

diff --git a/AdvancedExamples/Stipple2048.jl b/AdvancedExamples/Stipple2048.jl
@@ -44,7 +44,7 @@ css() = style(media="screen","""
     }
 """)
 
-@reactive! mutable struct G2048 <: ReactiveModel
+@vars G2048 begin
     score::R{Int} = 0
     bitboard::R{Bitboard} = G.initbboard()
     lastboard::R{Bitboard} = Bitboard(0), READONLY

diff --git a/AdvancedExamples/Stipple2048_animated.jl b/AdvancedExamples/Stipple2048_animated.jl
@@ -54,7 +54,7 @@ Stipple.@kwdef mutable struct Tile
     style::String = ""
 end
 
-@reactive! mutable struct G2048 <: ReactiveModel
+@vars G2048 begin
     score::R{Int} = 0
     bitboard::R{Bitboard} = G.initbboard()
     lastboard::R{Bitboard} = Bitboard(0), READONLY

diff --git a/BasicExamples/BubbleCharts/BubbleCharts.jl b/BasicExamples/BubbleCharts/BubbleCharts.jl
@@ -1,6 +1,6 @@
 using Stipple, StipplePlotly
 
-@reactive mutable struct Model <: ReactiveModel
+@vars Model begin
   marker::PlotDataMarker =
     PlotDataMarker(opacity = [1, 0.8, 0.6, 0.4], size = [40, 60, 80, 100])
 

diff --git a/BasicExamples/CSVUploadProcess/CSVUploadProcess.jl b/BasicExamples/CSVUploadProcess/CSVUploadProcess.jl
@@ -31,7 +31,7 @@ end
 const FILE_PATH = create_storage_dir("Backend_Upload")
 
 # Define reactive model
-@reactive mutable struct IrisModel <: ReactiveModel
+@vars IrisModel begin
     iris_data::R{DataTable} = DataTable(data)   
     credit_data_pagination::DataTablePagination =
       DataTablePagination(rows_per_page=50)     

diff --git a/BasicExamples/Card/Card.jl b/BasicExamples/Card/Card.jl
@@ -3,7 +3,7 @@ using StippleUI
 
 # CardDemo definition inheriting from ReactiveModel
 # Base.@kwdef: that defines keyword based contructor of mutable struct
-@reactive mutable struct CardDemo <: ReactiveModel end
+@vars CardDemo begin
 
 function ui(model)
   [

diff --git a/BasicExamples/Checkboxes/Checkboxes.jl b/BasicExamples/Checkboxes/Checkboxes.jl
@@ -1,7 +1,7 @@
 using Stipple
 using StippleUI
 
-@reactive mutable struct Model <: ReactiveModel
+@vars Model begin
   valone::R{Bool} = false
   valtwo::R{Bool} = false
   valthree::R{Bool} = false

diff --git a/BasicExamples/Checkboxes/CheckboxesVector.jl b/BasicExamples/Checkboxes/CheckboxesVector.jl
@@ -1,7 +1,7 @@
 using Stipple, StippleUI
 using OffsetArrays
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     valone::R{Bool} = false
     valtwo::R{Bool} = false
     valthree::R{Bool} = false

diff --git a/BasicExamples/CsvUpload/CSVUpload.jl b/BasicExamples/CsvUpload/CSVUpload.jl
@@ -26,7 +26,7 @@ end
 # Generate file path
 const FILE_PATH = create_storage_dir("Backend_Upload")
 # Define react model
-@reactive mutable struct APP <: ReactiveModel end
+@vars APP begin
 
 function ui(model::APP)
   page(model, title="Dashboard",

diff --git a/BasicExamples/DatePickers/DatePickers.jl b/BasicExamples/DatePickers/DatePickers.jl
@@ -3,7 +3,7 @@ import Stipple.Html: div
 
 # R{Date}, R{Vector{DateRange}} etc are type Observable and you can listen for changes 
 # https://juliagizmos.github.io/Observables.jl/stable/
-@reactive mutable struct DatePickers <: ReactiveModel
+@vars DatePickers begin
   date::R{Date} = today() + Day(30)
   dates::R{Vector{Date}} = Date[today()+Day(10), today()+Day(20), today()+Day(30)]
   daterange::R{DateRange} = DateRange(today(), (today() + Day(3)))

diff --git a/BasicExamples/Editor/Editor.jl b/BasicExamples/Editor/Editor.jl
@@ -1,7 +1,7 @@
 using Stipple, StippleUI
 import Stipple.opts
 
-@reactive! mutable struct Test <: ReactiveModel
+@vars Test begin
     s_editor::R{String} = "What you see is <b>what</b> you get."
     myfont::R{Dict{Symbol, Any}} = opts(
         arial = "Arial",

diff --git a/BasicExamples/FileUpload/FileUpload.jl b/BasicExamples/FileUpload/FileUpload.jl
@@ -8,7 +8,7 @@ Genie.config.cors_allowed_origins = ["*"]
 
 const FILE_PATH = "upload/file.jpg"
 
-@reactive mutable struct Model <: ReactiveModel end
+@vars Model begin
 
 #== view ==#
 function ui(model)

diff --git a/BasicExamples/Form/Form.jl b/BasicExamples/Form/Form.jl
@@ -1,6 +1,6 @@
 using Stipple, StippleUI
 
-@reactive mutable struct FormComponent <: ReactiveModel
+@vars FormComponent begin
   name::R{String} = ""
   age::R{Int} = 0
   objects::R{Vector} = ["Dog", "Cat", "Beer"]

diff --git a/BasicExamples/HelloPie/HelloPie.jl b/BasicExamples/HelloPie/HelloPie.jl
@@ -1,7 +1,7 @@
 using Stipple
 using StippleCharts
 
-@reactive mutable struct HelloPie <: ReactiveModel
+@vars HelloPie begin
   plot_options::R{PlotOptions} = PlotOptions(
     chart_type = :pie,
     chart_width = 380,

diff --git a/BasicExamples/ImageGallery/ImageGallery.jl b/BasicExamples/ImageGallery/ImageGallery.jl
@@ -14,7 +14,7 @@ function handlers(model)
   model
 end
 
-@reactive mutable struct Model <: ReactiveModel
+@vars Model begin
   url::R{String} = "https://placeimg.com/500/300/nature"
   refresh::R{Bool} = false
 end

diff --git a/BasicExamples/StippleButtons/StippleButtons.jl b/BasicExamples/StippleButtons/StippleButtons.jl
@@ -1,7 +1,7 @@
 using Stipple
 using StippleUI
 
-@reactive! mutable struct SBModel <: ReactiveModel
+@vars SBModel begin
   clicks::R{Int} = 0
   value::R{Int} = 0
 end

diff --git a/BasicExamples/TableDownloadClipboard/TableDownloadClipboard.jl b/BasicExamples/TableDownloadClipboard/TableDownloadClipboard.jl
@@ -99,7 +99,7 @@ mycss() = [
 
 add_css(mycss)
 
-@reactive! mutable struct TableDemo <: ReactiveModel 
+@vars TableDemo begin
     table::R{DataTable} = DataTable()
 
     downloadbutton::R{Bool} = false

diff --git a/BasicExamples/Tree/EditableDict.jl b/BasicExamples/Tree/EditableDict.jl
@@ -61,7 +61,7 @@ function dict_tree(startfile; parent = "d", name = "d")
 end
 
 
-@reactive! mutable struct TreeDemo <: ReactiveModel
+@vars TreeDemo begin
     d::R{Dict{String, Any}} = deepcopy(testdict)
     tree::R{Vector{Dict{Symbol, Any}}} = [dict_tree(testdict)]
 

diff --git a/BasicExamples/Tree/Tree.jl b/BasicExamples/Tree/Tree.jl
@@ -24,7 +24,7 @@ end
 
 cd(dirname(@__DIR__))
 
-@reactive! mutable struct TreeDemo <: ReactiveModel
+@vars TreeDemo begin
     name::R{String} = ""
     files::R{Vector{Dict{Symbol, Any}}} = [filedict(pwd())]
     files_selected::R{String} = ""
@@ -37,7 +37,7 @@ end
 # this will work with StippleUI v0.19.3 or latest master
 
 register_mixin(@__MODULE__)
-@reactive! mutable struct TreeDemo <: ReactiveModel
+@vars TreeDemo begin
     name::R{String} = ""
     @mixin files::TreeSelectable([filedict(pwd())])
 end

diff --git a/GermanCredits/GermanCredits.jl b/GermanCredits/GermanCredits.jl
@@ -15,7 +15,7 @@ cd(@__DIR__)
 data = CSV.File("data/german_credit.csv") |> DataFrame
 
 # Defining a Stipple ReactiveModel of type observable 
-@reactive mutable struct Dashboard1 <: ReactiveModel
+@vars Dashboard1 begin
   credit_data::R{DataTable} = DataTable()
   credit_data_pagination::DataTablePagination = DataTablePagination(rows_per_page=100)
   credit_data_loading::R{Bool} = false

diff --git a/IrisClustering/IrisClustering.jl b/IrisClustering/IrisClustering.jl
@@ -8,7 +8,7 @@ import DataFrames
 
 data = DataFrames.insertcols!(dataset("datasets", "iris"), :Cluster => zeros(Int, 150))
 
-@reactive mutable struct IrisModel <: ReactiveModel
+@vars IrisModel begin
   iris_data::R{DataTable} = DataTable(data)   
   credit_data_pagination::DataTablePagination =
     DataTablePagination(rows_per_page=50)     

diff --git a/StipplePlotly/3DPlots/Plot3d.jl b/StipplePlotly/3DPlots/Plot3d.jl
@@ -12,7 +12,7 @@ pd1 = PlotData(
 
 plot_data = [pd1]
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{Vector{PlotData}} = plot_data, READONLY
     layout::R{PlotLayout} = PlotLayout(
         plot_bgcolor = "#999",

diff --git a/StipplePlotly/PlotData.jl b/StipplePlotly/PlotData.jl
@@ -20,7 +20,7 @@ pd(name) = PlotData(
     name = name,
 )
 
-@reactive mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{Vector{PlotData}} = [pd("Random 1"), pd("Random 2")]
     layout::R{PlotLayout} = PlotLayout(
         plot_bgcolor = "#333",

diff --git a/StipplePlotly/PlotData2.jl b/StipplePlotly/PlotData2.jl
@@ -9,7 +9,7 @@ pd(name) = PlotData(
   name = name
 )
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
   data::R{Vector{PlotData}} = [pd("Random 1"),pd("Random 2")]
   layout::R{PlotLayout} = PlotLayout(
       plot_bgcolor = "#333",

diff --git a/StipplePlotly/PlotlyBaseBar.jl b/StipplePlotly/PlotlyBaseBar.jl
@@ -11,7 +11,7 @@ trace2 = PlotlyBase.bar(x=["giraffes", "orangutans", "monkeys"],
                  y=[12, 18, 29],
                  name="LA Zoo")
 
-@reactive! mutable struct BarPlot <: ReactiveModel
+@vars BarPlot begin
     data::R{Vector{GenericTrace}} = [trace1, trace2]
 
     my_layout::R{PlotlyBase.Layout} = PlotlyBase.Layout(;barmode="stack")

diff --git a/StipplePlotly/PlotlyBaseDemo.jl b/StipplePlotly/PlotlyBaseDemo.jl
@@ -1,7 +1,7 @@
 using Stipple, StipplePlotly
 using PlotlyBase
 
-@reactive! mutable struct Example <: ReactiveModel
+@vars Example begin
     plot::R{Plot} = Plot()
 end
 

diff --git a/StipplePlotly/PlotlyBaseEvents.jl b/StipplePlotly/PlotlyBaseEvents.jl
@@ -1,7 +1,7 @@
 using Stipple, StipplePlotly
 using PlotlyBase
 
-@reactive! mutable struct Example <: ReactiveModel
+@vars Example begin
     plot1::R{Plot} = Plot()
     plot1_selected::R{Dict{String, Any}} = Dict{String, Any}()
     plot1_hover::R{Dict{String, Any}} = Dict{String, Any}()

diff --git a/StipplePlotly/example1.jl b/StipplePlotly/example1.jl
@@ -21,7 +21,7 @@ pd(name) = PlotData(
 
 #== reactive model ==#
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
   data::R{Vector{PlotData}} = [pd("Random 1"),pd("Random 2")]
   layout::R{PlotLayout} = PlotLayout(
       plot_bgcolor = "#333",

diff --git a/StipplePlotly/example2.jl b/StipplePlotly/example2.jl
@@ -9,7 +9,7 @@ pd(name) = PlotData(
   name = name
 )
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
   data::R{Vector{PlotData}} = [pd("Random 1"),pd("Random 2")]
   layout::R{PlotLayout} = PlotLayout(
       plot_bgcolor = "#333",

diff --git a/StipplePlotly/groupedbar1.jl b/StipplePlotly/groupedbar1.jl
@@ -49,7 +49,7 @@ layout = PlotLayout(barmode="group", font=Font(16),
     yaxis = [PlotLayoutAxis(xy = "y", index = 1, ticks = "outside", title="ratio (%)", font=Font(size=24), autorange=false, range=[70.0,100.0], showline = true, zeroline = false)]
 )
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
   data::R{Vector{PlotData}} = plotdata, READONLY
   layout::R{PlotLayout} = layout, READONLY
   config::R{PlotConfig} = PlotConfig(), READONLY

diff --git a/StipplePlotly/maps/CHOROPLETH.jl b/StipplePlotly/maps/CHOROPLETH.jl
@@ -4,7 +4,7 @@ using Stipple, StipplePlotly
 data = CSV.read(download("https://raw.githubusercontent.com/plotly/datasets/master/2010_alcohol_consumption_by_country.csv"), DataFrame)
 
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{PlotData} = PlotData(
         plot = StipplePlotly.Charts.PLOT_TYPE_CHOROPLETH,
         locationmode = "country names",

diff --git a/StipplePlotly/maps/lines.jl b/StipplePlotly/maps/lines.jl
@@ -30,7 +30,7 @@ for i in 1:length(scl)
     push!(data, current)
 end
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{Vector{PlotData}} = data
     layout::R{PlotLayout} = PlotLayout(
         geo = PlotLayoutGeo(

diff --git a/StipplePlotly/maps/mapbox_access_token.jl b/StipplePlotly/maps/mapbox_access_token.jl
@@ -1,7 +1,7 @@
 using Stipple, StipplePlotly 
 
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{PlotData} = PlotData(
         plot = StipplePlotly.Charts.PLOT_TYPE_CHOROPLETHMAPBOX,
        	name = "US States",

diff --git a/StipplePlotly/maps/scattermap.jl b/StipplePlotly/maps/scattermap.jl
@@ -1,7 +1,7 @@
 using Stipple, StipplePlotly
 
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{PlotData} = PlotData(
                             locations= ["FRA", "DEU", "RUS", "ESP"],
                             plot = StipplePlotly.Charts.PLOT_TYPE_SCATTERGEO,

diff --git a/StipplePlotly/maps/scattermapbox.jl b/StipplePlotly/maps/scattermapbox.jl
@@ -1,7 +1,7 @@
 using Stipple, StipplePlotly 
 
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{PlotData} = PlotData(
         plot = StipplePlotly.Charts.PLOT_TYPE_SCATTERMAPBOX,
         fill = "toself",

diff --git a/StipplePlotly/multitype1.jl b/StipplePlotly/multitype1.jl
@@ -54,7 +54,7 @@ pl() = PlotLayout(
   annotations = [PlotAnnotation(visible=true, x=xexperiment[6], y=yexperiment[6], text="possible outlier")]
 )
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
   data::R{Vector{PlotData}} = [pd_line("Sinus", xrange), pd_scatter("Experiment", xexperiment, dx, yexperiment, dy)]
   layout::R{PlotLayout} = pl()
   config::R{PlotConfig} = PlotConfig()

diff --git a/StipplePlotly/scatter_polar.jl b/StipplePlotly/scatter_polar.jl
@@ -8,7 +8,7 @@ pd(name) = PlotData(
     name = name,
 )
 
-@reactive mutable struct Model <: ReactiveModel
+@vars Model begin
     data::R{Vector{PlotData}} = [pd("Random 1"), pd("Random 2")]
     layout::R{PlotLayout} = PlotLayout(
         polar = PlotLayoutPolar(radialaxis= RadialAxis(true, [0, 50])),

diff --git a/StipplePlotly/subplots2x2.jl b/StipplePlotly/subplots2x2.jl
@@ -66,7 +66,7 @@ layout = PlotLayout(
     ],
 )
 
-@reactive! mutable struct Model <: ReactiveModel
+@vars Model begin
   data::R{Vector{PlotData}} = plotdata, READONLY
   layout::R{PlotLayout} = layout, READONLY
   config::R{PlotConfig} = PlotConfig(), READONLY

diff --git a/_broken_/MultiUserApp.jl b/_broken_/MultiUserApp.jl
@@ -67,7 +67,7 @@ const plot_options = OptDict(
 
 const xx = Base.range(0, 4π, length=200) |> collect
 
-@reactive mutable struct MyDashboard <: ReactiveModel
+@vars MyDashboard begin
     a::R{Float64} = 1.0
     b::R{Float64} = 0.0
     c::R{Float64} = 0.0

diff --git a/_broken_/WebCam.jl b/_broken_/WebCam.jl
@@ -104,7 +104,7 @@ function start_camera() # restart camera
     CAM_PROCESS[] = _start_camera()
 end
 
-@reactive! mutable struct WebCam <: ReactiveModel
+@vars WebCam begin
     cameraon::R{Bool} = true
     imageurl::String = ""
     cameratimer::Int = 0

diff --git a/_broken_/WebCam2.jl b/_broken_/WebCam2.jl
@@ -59,7 +59,7 @@ end
 # emergency break:
 # Base.throwto(cameraproc, InterruptException())
 
-@reactive! mutable struct WebCam <: ReactiveModel
+@vars WebCam begin
     cameraon::R{Bool} = true
     imageurl::String = ""
     cameratimer::Int = 0

diff --git a/_broken_/WebCam3.jl b/_broken_/WebCam3.jl
@@ -98,7 +98,7 @@ function stop_camera(camera::Camera)
     end
 end
 
-@reactive! mutable struct WebCam <: ReactiveModel
+@vars WebCam begin
     camera::R{String} = CAMERAS[first(VideoIO.CAMERA_DEVICES)].camera
     cameraon::R{Bool} = false
     cameratimer::Int = 0