User code (fiddles) goes to src/ - address user's confusion

Electric-fiddle's code moved to src-contrib
hyperfiddle · Jan 23, 2024 · 7d52a11 · 7d52a11
1 parent ec58ff0
commit 7d52a11
Show file tree

Hide file tree

Showing 60 changed files with 44 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ At the REPL:
 ```
 
 1. Navigate to [http://localhost:8080](http://localhost:8080)
-2. Corresponding source code is in `src-fiddles/hello_world`
+2. Corresponding source code is in `src/hello_world`
 
 ## Load more fiddles
 
@@ -62,8 +62,8 @@ Optional:
 
 ## Roll your own
 
-1. `mkdir src-fiddles/my_fiddle`
-3. Add the following to `src-fiddles/my_fiddle/fiddles.cljc`:
+1. `mkdir src/my_fiddle`
+3. Add the following to `src/my_fiddle/fiddles.cljc`:
 ```clojure
 (ns my-fiddle.fiddles
   (:require [hyperfiddle.electric :as e]

diff --git a/deps.edn b/deps.edn
@@ -8,7 +8,7 @@
          ring-basic-authentication/ring-basic-authentication {:mvn/version "1.2.0"}
          }
 
- :paths ["src" "resources" "src-fiddles"]
+ :paths ["src" "resources" "src-contrib"]
 
  :aliases
  {:dev

diff --git a/src-build/build.clj b/src-build/build.clj
@@ -62,7 +62,7 @@ so do not use `clj -T`"
                    :optimize optimize, :debug debug, :verbose verbose}))
 
   (b/copy-dir {:target-dir class-dir :src-dirs ["src" "src-prod" "resources"]})
-  (b/copy-dir {:target-dir (str class-dir "/" (domain->dir domain)) :src-dirs [(str "src-fiddles/" (domain->dir domain))]})
+  (b/copy-dir {:target-dir (str class-dir "/" (domain->dir domain)) :src-dirs [(str "src/" (domain->dir domain))]})
   (let [jar-name (or (some-> jar-name str) ; override for Dockerfile builds to avoid needing to reconstruct the name
                    (format "target/electricfiddle-%s-%s.jar" domain electric-user-version))
         aliases [:prod (keyword domain)]]

diff --git a/src/contrib/datafy_fs.clj → src-contrib/contrib/datafy_fs.clj b/src/contrib/datafy_fs.clj → src-contrib/contrib/datafy_fs.clj
diff --git a/src/contrib/template.cljc → src-contrib/contrib/template.cljc b/src/contrib/template.cljc → src-contrib/contrib/template.cljc
diff --git a/src/electric_fiddle/fiddle.cljc → src-contrib/electric_fiddle/fiddle.cljc b/src/electric_fiddle/fiddle.cljc → src-contrib/electric_fiddle/fiddle.cljc
diff --git a/src/electric_fiddle/fiddle_markdown.cljc → ...trib/electric_fiddle/fiddle_markdown.cljc b/src/electric_fiddle/fiddle_markdown.cljc → ...trib/electric_fiddle/fiddle_markdown.cljc
@@ -20,11 +20,11 @@
       (set! (.-innerHTML dom/node) html))))
 
 (def essays
-  {'electric-y-combinator "src-fiddles/dustingetz/electric_y_combinator.md"
-   'hfql-intro "src-fiddles/dustingetz/hfql_intro.md"
-   'hfql-teeshirt-orders "src-fiddles/dustingetz/hfql_teeshirt_orders.md"
+  {'electric-y-combinator "src/dustingetz/electric_y_combinator.md"
+   'hfql-intro "src/dustingetz/hfql_intro.md"
+   'hfql-teeshirt-orders "src/dustingetz/hfql_teeshirt_orders.md"
 
-   'demo_two_clocks "src-fiddles/electric_tutorial/demo_two_clocks.md"})
+   'demo_two_clocks "src/electric_tutorial/demo_two_clocks.md"})
 
 (defn parse-md-directive [s]
   (let [[_ extension alt-text arg arg2] (re-find #"!(.*?)\[(.*?)\]\((.*?)\)(?:\((.*?)\))?" s)]

diff --git a/src/electric_fiddle/index.cljc → src-contrib/electric_fiddle/index.cljc b/src/electric_fiddle/index.cljc → src-contrib/electric_fiddle/index.cljc
diff --git a/src/electric_fiddle/main.cljc → src-contrib/electric_fiddle/main.cljc b/src/electric_fiddle/main.cljc → src-contrib/electric_fiddle/main.cljc
diff --git a/src/electric_fiddle/read_src.clj → src-contrib/electric_fiddle/read_src.clj b/src/electric_fiddle/read_src.clj → src-contrib/electric_fiddle/read_src.clj
diff --git a/src/electric_fiddle/ring_middleware.clj → ...ntrib/electric_fiddle/ring_middleware.clj b/src/electric_fiddle/ring_middleware.clj → ...ntrib/electric_fiddle/ring_middleware.clj
diff --git a/src/electric_fiddle/server_httpkit.clj → ...ontrib/electric_fiddle/server_httpkit.clj b/src/electric_fiddle/server_httpkit.clj → ...ontrib/electric_fiddle/server_httpkit.clj
diff --git a/src/electric_fiddle/server_jetty.clj → src-contrib/electric_fiddle/server_jetty.clj b/src/electric_fiddle/server_jetty.clj → src-contrib/electric_fiddle/server_jetty.clj
diff --git a/src/hyperfiddle.cljc → src-contrib/hyperfiddle.cljc b/src/hyperfiddle.cljc → src-contrib/hyperfiddle.cljc
diff --git a/src/models/mbrainz.clj → src-contrib/models/mbrainz.clj b/src/models/mbrainz.clj → src-contrib/models/mbrainz.clj
diff --git a/src/models/person_model.clj → src-contrib/models/person_model.clj b/src/models/person_model.clj → src-contrib/models/person_model.clj
diff --git a/src/models/seattle.clj → src-contrib/models/seattle.clj b/src/models/seattle.clj → src-contrib/models/seattle.clj
diff --git a/src/models/teeshirt_orders_datascript.clj → ...rib/models/teeshirt_orders_datascript.clj b/src/models/teeshirt_orders_datascript.clj → ...rib/models/teeshirt_orders_datascript.clj
diff --git a/src/models/teeshirt_orders_datomic.clj → ...ontrib/models/teeshirt_orders_datomic.clj b/src/models/teeshirt_orders_datomic.clj → ...ontrib/models/teeshirt_orders_datomic.clj
diff --git a/src-dev/fiddle_manager.clj b/src-dev/fiddle_manager.clj
@@ -41,7 +41,7 @@
       "\nPossible causes:"
       "\n - this fiddle doesn’t exist"
       "\n   - is `" fiddle "` the right name?"
-      "\n   - is there a corresponding file named `src-fiddles/" (munge fiddle) "/fiddles.cljc`?"
+      "\n   - is there a corresponding file named `src/" (munge fiddle) "/fiddles.cljc`?"
       )
     (instance? java.io.FileNotFoundException (ex-cause error))
     (str

diff --git a/src-fiddles/hello_fiddle/fly.toml b/src-fiddles/hello_fiddle/fly.toml
diff --git a/...dles/datomic_browser/datomic_browser.cljc → src/datomic_browser/datomic_browser.cljc b/...dles/datomic_browser/datomic_browser.cljc → src/datomic_browser/datomic_browser.cljc
diff --git a/src-fiddles/datomic_browser/domain.cljc → src/datomic_browser/domain.cljc b/src-fiddles/datomic_browser/domain.cljc → src/datomic_browser/domain.cljc
diff --git a/src-fiddles/datomic_browser/fiddles.cljc → src/datomic_browser/fiddles.cljc b/src-fiddles/datomic_browser/fiddles.cljc → src/datomic_browser/fiddles.cljc
diff --git a/src-fiddles/electric_tutorial/demo_chat.cljc → src/electric_tutorial/demo_chat.cljc b/src-fiddles/electric_tutorial/demo_chat.cljc → src/electric_tutorial/demo_chat.cljc
diff --git a/src-fiddles/electric_tutorial/demo_chat.md → src/electric_tutorial/demo_chat.md b/src-fiddles/electric_tutorial/demo_chat.md → src/electric_tutorial/demo_chat.md
diff --git a/...electric_tutorial/demo_chat_extended.cljc → ...electric_tutorial/demo_chat_extended.cljc b/...electric_tutorial/demo_chat_extended.cljc → ...electric_tutorial/demo_chat_extended.cljc
diff --git a/...s/electric_tutorial/demo_chat_extended.md → src/electric_tutorial/demo_chat_extended.md b/...s/electric_tutorial/demo_chat_extended.md → src/electric_tutorial/demo_chat_extended.md
diff --git a/...fiddles/electric_tutorial/demo_color.cljc → src/electric_tutorial/demo_color.cljc b/...fiddles/electric_tutorial/demo_color.cljc → src/electric_tutorial/demo_color.cljc
diff --git a/...ectric_tutorial/demo_reagent_interop.cljc → ...ectric_tutorial/demo_reagent_interop.cljc b/...ectric_tutorial/demo_reagent_interop.cljc → ...ectric_tutorial/demo_reagent_interop.cljc
diff --git a/...electric_tutorial/demo_reagent_interop.md → ...electric_tutorial/demo_reagent_interop.md b/...electric_tutorial/demo_reagent_interop.md → ...electric_tutorial/demo_reagent_interop.md
diff --git a/src-fiddles/electric_tutorial/demo_svg.cljc → src/electric_tutorial/demo_svg.cljc b/src-fiddles/electric_tutorial/demo_svg.cljc → src/electric_tutorial/demo_svg.cljc
diff --git a/src-fiddles/electric_tutorial/demo_svg.md → src/electric_tutorial/demo_svg.md b/src-fiddles/electric_tutorial/demo_svg.md → src/electric_tutorial/demo_svg.md
diff --git a/...tric_tutorial/demo_system_properties.cljc → ...tric_tutorial/demo_system_properties.cljc b/...tric_tutorial/demo_system_properties.cljc → ...tric_tutorial/demo_system_properties.cljc
diff --git a/...ectric_tutorial/demo_system_properties.md → ...ectric_tutorial/demo_system_properties.md b/...ectric_tutorial/demo_system_properties.md → ...ectric_tutorial/demo_system_properties.md
diff --git a/.../electric_tutorial/demo_todos_simple.cljc → src/electric_tutorial/demo_todos_simple.cljc b/.../electric_tutorial/demo_todos_simple.cljc → src/electric_tutorial/demo_todos_simple.cljc
diff --git a/...es/electric_tutorial/demo_todos_simple.md → src/electric_tutorial/demo_todos_simple.md b/...es/electric_tutorial/demo_todos_simple.md → src/electric_tutorial/demo_todos_simple.md
diff --git a/...iddles/electric_tutorial/demo_toggle.cljc → src/electric_tutorial/demo_toggle.cljc b/...iddles/electric_tutorial/demo_toggle.cljc → src/electric_tutorial/demo_toggle.cljc
diff --git a/src-fiddles/electric_tutorial/demo_toggle.md → src/electric_tutorial/demo_toggle.md b/src-fiddles/electric_tutorial/demo_toggle.md → src/electric_tutorial/demo_toggle.md
diff --git a/...es/electric_tutorial/demo_two_clocks.cljc → src/electric_tutorial/demo_two_clocks.cljc b/...es/electric_tutorial/demo_two_clocks.cljc → src/electric_tutorial/demo_two_clocks.cljc
diff --git a/...dles/electric_tutorial/demo_two_clocks.md → src/electric_tutorial/demo_two_clocks.md b/...dles/electric_tutorial/demo_two_clocks.md → src/electric_tutorial/demo_two_clocks.md
diff --git a/...ddles/electric_tutorial/demo_webview.cljc → src/electric_tutorial/demo_webview.cljc b/...ddles/electric_tutorial/demo_webview.cljc → src/electric_tutorial/demo_webview.cljc
diff --git a/...fiddles/electric_tutorial/demo_webview.md → src/electric_tutorial/demo_webview.md b/...fiddles/electric_tutorial/demo_webview.md → src/electric_tutorial/demo_webview.md
diff --git a/src-fiddles/electric_tutorial/fiddles.cljc → src/electric_tutorial/fiddles.cljc b/src-fiddles/electric_tutorial/fiddles.cljc → src/electric_tutorial/fiddles.cljc
diff --git a/src-fiddles/electric_tutorial/fly.toml → src/electric_tutorial/fly.toml b/src-fiddles/electric_tutorial/fly.toml → src/electric_tutorial/fly.toml
diff --git a/src-fiddles/electric_tutorial/tutorial.cljc → src/electric_tutorial/tutorial.cljc b/src-fiddles/electric_tutorial/tutorial.cljc → src/electric_tutorial/tutorial.cljc
@@ -100,20 +100,20 @@
             (dom/text (str (title next) " >"))))))))
 
 (def tutorials2
-  {`electric-tutorial.demo-two-clocks/TwoClocks "src-fiddles/electric_tutorial/demo_two_clocks.md"
-   `electric-tutorial.demo-toggle/Toggle "src-fiddles/electric_tutorial/demo_toggle.md"
-   `electric-tutorial.demo-system-properties/SystemProperties "src-fiddles/electric_tutorial/demo_system_properties.md"
-   `electric-tutorial.demo-chat/Chat "src-fiddles/electric_tutorial/demo_chat.md"
-   `electric-tutorial.tutorial-backpressure/Backpressure "src-fiddles/electric_tutorial/tutorial_backpressure.md"
-   `electric-tutorial.tutorial-lifecycle/Lifecycle "src-fiddles/electric_tutorial/tutorial_lifecycle.md"
-   `electric-tutorial.demo-chat-extended/ChatExtended "src-fiddles/electric_tutorial/demo_chat_extended.md"
-   `electric-tutorial.demo-webview/Webview "src-fiddles/electric_tutorial/demo_webview.md"
-   `electric-tutorial.demo-todos-simple/TodoList "src-fiddles/electric_tutorial/demo_todos_simple.md"
-   `electric-tutorial.demo-svg/SVG "src-fiddles/electric_tutorial/demo_svg.md"
-   `electric-tutorial.tutorial-7guis-1-counter/Counter "src-fiddles/electric_tutorial/tutorial_7guis_1_counter.md"
-   `electric-tutorial.tutorial-7guis-2-temperature/TemperatureConverter "src-fiddles/electric_tutorial/tutorial_7guis_2_temperature.md"
-   `electric-tutorial.tutorial-7guis-4-timer/Timer "src-fiddles/electric_tutorial/tutorial_7guis_4_timer.md"
-   `electric-tutorial.tutorial-7guis-5-crud/CRUD "src-fiddles/electric_tutorial/tutorial_7guis_5_crud.md"
+  {`electric-tutorial.demo-two-clocks/TwoClocks "src/electric_tutorial/demo_two_clocks.md"
+   `electric-tutorial.demo-toggle/Toggle "src/electric_tutorial/demo_toggle.md"
+   `electric-tutorial.demo-system-properties/SystemProperties "src/electric_tutorial/demo_system_properties.md"
+   `electric-tutorial.demo-chat/Chat "src/electric_tutorial/demo_chat.md"
+   `electric-tutorial.tutorial-backpressure/Backpressure "src/electric_tutorial/tutorial_backpressure.md"
+   `electric-tutorial.tutorial-lifecycle/Lifecycle "src/electric_tutorial/tutorial_lifecycle.md"
+   `electric-tutorial.demo-chat-extended/ChatExtended "src/electric_tutorial/demo_chat_extended.md"
+   `electric-tutorial.demo-webview/Webview "src/electric_tutorial/demo_webview.md"
+   `electric-tutorial.demo-todos-simple/TodoList "src/electric_tutorial/demo_todos_simple.md"
+   `electric-tutorial.demo-svg/SVG "src/electric_tutorial/demo_svg.md"
+   `electric-tutorial.tutorial-7guis-1-counter/Counter "src/electric_tutorial/tutorial_7guis_1_counter.md"
+   `electric-tutorial.tutorial-7guis-2-temperature/TemperatureConverter "src/electric_tutorial/tutorial_7guis_2_temperature.md"
+   `electric-tutorial.tutorial-7guis-4-timer/Timer "src/electric_tutorial/tutorial_7guis_4_timer.md"
+   `electric-tutorial.tutorial-7guis-5-crud/CRUD "src/electric_tutorial/tutorial_7guis_5_crud.md"
    ;`electric-tutorial.demo-reagent-interop/ReagentInterop ""
    })
 

diff --git a/...ic_tutorial/tutorial_7guis_1_counter.cljc → ...ic_tutorial/tutorial_7guis_1_counter.cljc b/...ic_tutorial/tutorial_7guis_1_counter.cljc → ...ic_tutorial/tutorial_7guis_1_counter.cljc
diff --git a/...tric_tutorial/tutorial_7guis_1_counter.md → ...tric_tutorial/tutorial_7guis_1_counter.md b/...tric_tutorial/tutorial_7guis_1_counter.md → ...tric_tutorial/tutorial_7guis_1_counter.md
diff --git a/...utorial/tutorial_7guis_2_temperature.cljc → ...utorial/tutorial_7guis_2_temperature.cljc b/...utorial/tutorial_7guis_2_temperature.cljc → ...utorial/tutorial_7guis_2_temperature.cljc
diff --git a/..._tutorial/tutorial_7guis_2_temperature.md → ..._tutorial/tutorial_7guis_2_temperature.md b/..._tutorial/tutorial_7guis_2_temperature.md → ..._tutorial/tutorial_7guis_2_temperature.md
diff --git a/...tric_tutorial/tutorial_7guis_4_timer.cljc → ...tric_tutorial/tutorial_7guis_4_timer.cljc b/...tric_tutorial/tutorial_7guis_4_timer.cljc → ...tric_tutorial/tutorial_7guis_4_timer.cljc
diff --git a/...ectric_tutorial/tutorial_7guis_4_timer.md → ...ectric_tutorial/tutorial_7guis_4_timer.md b/...ectric_tutorial/tutorial_7guis_4_timer.md → ...ectric_tutorial/tutorial_7guis_4_timer.md
diff --git a/...ctric_tutorial/tutorial_7guis_5_crud.cljc → ...ctric_tutorial/tutorial_7guis_5_crud.cljc b/...ctric_tutorial/tutorial_7guis_5_crud.cljc → ...ctric_tutorial/tutorial_7guis_5_crud.cljc
diff --git a/...lectric_tutorial/tutorial_7guis_5_crud.md → ...lectric_tutorial/tutorial_7guis_5_crud.md b/...lectric_tutorial/tutorial_7guis_5_crud.md → ...lectric_tutorial/tutorial_7guis_5_crud.md
diff --git a/...ctric_tutorial/tutorial_backpressure.cljc → ...ctric_tutorial/tutorial_backpressure.cljc b/...ctric_tutorial/tutorial_backpressure.cljc → ...ctric_tutorial/tutorial_backpressure.cljc
diff --git a/...lectric_tutorial/tutorial_backpressure.md → ...lectric_tutorial/tutorial_backpressure.md b/...lectric_tutorial/tutorial_backpressure.md → ...lectric_tutorial/tutorial_backpressure.md
diff --git a/...electric_tutorial/tutorial_lifecycle.cljc → ...electric_tutorial/tutorial_lifecycle.cljc b/...electric_tutorial/tutorial_lifecycle.cljc → ...electric_tutorial/tutorial_lifecycle.cljc
diff --git a/...s/electric_tutorial/tutorial_lifecycle.md → src/electric_tutorial/tutorial_lifecycle.md b/...s/electric_tutorial/tutorial_lifecycle.md → src/electric_tutorial/tutorial_lifecycle.md
diff --git a/src-fiddles/hello_fiddle/fiddles.cljc → src/hello_fiddle/fiddles.cljc b/src-fiddles/hello_fiddle/fiddles.cljc → src/hello_fiddle/fiddles.cljc
diff --git a/src/hello_fiddle/fly.toml b/src/hello_fiddle/fly.toml
@@ -0,0 +1,20 @@
+app = "hello-fiddle"
+primary_region = "ewr"
+
+[http_service]
+  internal_port = 8080
+  force_https = true
+  auto_stop_machines = true
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ["app"]
+
+[build.args]
+  HYPERFIDDLE_DOMAIN="hello-fiddle"
+
+
+# NO_COLOR=1 fly deploy --config src/hello_fiddle/fly.toml --remote-only --build-only
+
+# fly scale vm shared-cpu-8x --config src/hello_fiddle/fly.toml
+# fly scale show  --config src/hello_fiddle/fly.toml
+# fly status --config src/hello_fiddle/fly.toml