V1

.github/workflows/main.yml

@@ -7,6 +7,7 @@ on:
   push:
     branches:
       - main
+      - v1
 
 jobs:
   scan:
@@ -85,7 +86,7 @@ jobs:
           heroku_email: "[email protected]"
 
   fly-deploy:
-    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
+    if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/v1' }}
     needs: [lint, test]
     name: Deploy app
     runs-on: ubuntu-latest

.gitignore

@@ -35,4 +35,6 @@
 
 /node_modules
 
-.env* 
+.env* 
+
+.tool-versions

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.3.4"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.2.0.beta3"
+gem "rails", "7.2.0"
 # The modern asset pipeline for Rails [https://github.com/rails/propshaft]
 gem "propshaft", "0.9.0"
 # Use sqlite3 as the database for Active Record
@@ -64,6 +64,7 @@ group :development do
   # Speed up commands on slow machines / big apps [https://github.com/rails/spring]
   # gem "spring"
   gem "standard"
+  gem "dockerfile-rails", ">= 1.6"
 end
 
 group :test do
@@ -73,7 +74,8 @@ group :test do
 end
 
 gem "phlex-rails"
-gem "phlex_ui", github: "PhlexUI/phlex_ui", branch: "main"
-# gem "phlex_ui", path: "../phlex_ui"
 
-gem "dockerfile-rails", ">= 1.6", group: :development
+gem "rbui", github: "rbui-labs/rbui"
+# gem "rbui", path: "../rbui"
+
+gem "pry"

Gemfile.lock

@@ -1,77 +1,75 @@
 GIT
-  remote: https://github.com/PhlexUI/phlex_ui.git
-  revision: ba2cc503725ea8a9dd25648201dbd79a27a44691
-  branch: main
+  remote: https://github.com/rbui-labs/rbui.git
+  revision: 19a1b5df2db0e000a21b9b2c5a573179c07506be
   specs:
-    phlex_ui (0.1.10)
-      activesupport (>= 6.0)
-      phlex (~> 1.11)
+    rbui (0.2.0)
+      phlex (~> 1.10)
       rouge (~> 4.2.0)
-      zeitwerk (~> 2.6)
+      tailwind_merge (>= 0.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actioncable (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activestorage (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actionmailbox (7.2.0)
+      actionpack (= 7.2.0)
+      activejob (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
       mail (>= 2.8.0)
-    actionmailer (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      actionview (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actionmailer (7.2.0)
+      actionpack (= 7.2.0)
+      actionview (= 7.2.0)
+      activejob (= 7.2.0)
+      activesupport (= 7.2.0)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.0.beta3)
-      actionview (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actionpack (7.2.0)
+      actionview (= 7.2.0)
+      activesupport (= 7.2.0)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actiontext (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activestorage (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actiontext (7.2.0)
+      actionpack (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    actionview (7.2.0)
+      activesupport (= 7.2.0)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    activejob (7.2.0)
+      activesupport (= 7.2.0)
       globalid (>= 0.3.6)
-    activemodel (7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
-    activerecord (7.2.0.beta3)
-      activemodel (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    activemodel (7.2.0)
+      activesupport (= 7.2.0)
+    activerecord (7.2.0)
+      activemodel (= 7.2.0)
+      activesupport (= 7.2.0)
       timeout (>= 0.4.0)
-    activestorage (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    activestorage (7.2.0)
+      actionpack (= 7.2.0)
+      activejob (= 7.2.0)
+      activerecord (= 7.2.0)
+      activesupport (= 7.2.0)
       marcel (~> 1.0)
-    activesupport (7.2.0.beta3)
+    activesupport (7.2.0)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -80,6 +78,7 @@ GEM
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
+      securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -99,6 +98,7 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
+    coderay (1.1.3)
     concurrent-ruby (1.3.3)
     connection_pool (2.4.1)
     crass (1.0.6)
@@ -145,6 +145,7 @@ GEM
       view_component (>= 2.0)
       yard (~> 0.9)
       zeitwerk (~> 2.5)
+    lru_redux (1.1.0)
     lucide-rails (0.4.0)
       railties (>= 4.1.0)
     mail (2.8.1)
@@ -194,6 +195,9 @@ GEM
       activesupport (>= 7.0.0)
       rack
       railties (>= 7.0.0)
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
     psych (5.1.2)
       stringio
     public_suffix (6.0.1)
@@ -208,30 +212,30 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.2.0.beta3)
-      actioncable (= 7.2.0.beta3)
-      actionmailbox (= 7.2.0.beta3)
-      actionmailer (= 7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      actiontext (= 7.2.0.beta3)
-      actionview (= 7.2.0.beta3)
-      activejob (= 7.2.0.beta3)
-      activemodel (= 7.2.0.beta3)
-      activerecord (= 7.2.0.beta3)
-      activestorage (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    rails (7.2.0)
+      actioncable (= 7.2.0)
+      actionmailbox (= 7.2.0)
+      actionmailer (= 7.2.0)
+      actionpack (= 7.2.0)
+      actiontext (= 7.2.0)
+      actionview (= 7.2.0)
+      activejob (= 7.2.0)
+      activemodel (= 7.2.0)
+      activerecord (= 7.2.0)
+      activestorage (= 7.2.0)
+      activesupport (= 7.2.0)
       bundler (>= 1.15.0)
-      railties (= 7.2.0.beta3)
+      railties (= 7.2.0)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.2.0.beta3)
-      actionpack (= 7.2.0.beta3)
-      activesupport (= 7.2.0.beta3)
+    railties (7.2.0)
+      actionpack (= 7.2.0)
+      activesupport (= 7.2.0)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -266,6 +270,7 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
+    securerandom (0.3.1)
     selenium-webdriver (4.23.0)
       base64 (~> 0.2)
       logger (~> 1.4)
@@ -294,6 +299,8 @@ GEM
       railties (>= 6.0.0)
     stringio (3.1.1)
     strscan (3.1.0)
+    tailwind_merge (0.13.0)
+      lru_redux (~> 1.1)
     thor (1.3.1)
     timeout (0.4.1)
     turbo-rails (2.0.6)
@@ -341,10 +348,11 @@ DEPENDENCIES
   lookbook (= 2.3.2)
   lucide-rails (= 0.4.0)
   phlex-rails
-  phlex_ui!
   propshaft (= 0.9.0)
+  pry
   puma (= 6.4.2)
-  rails (~> 7.2.0.beta3)
+  rails (= 7.2.0)
+  rbui!
   selenium-webdriver
   sqlite3 (>= 1.4)
   standard