localtower 1.0.0 → 2.0.1

data/app/views/localtower/pages/new_migration.html.erb

@@ -1,103 +1,40 @@
 <% content_for :title do %>New Migration<% end %>
-<div class="row">
-  <div class="col-md-12">
-    <div class="card">
-      <div class="header">
-        <% if @models.empty? %>
-          <%= render partial: 'alert_no_models' %>
-        <% end %>
-        <div class="alert alert-warning">
-          <span>Remember, you can always edit your migration files manually before running "rails db:migrate"</span>
+<div>
+  <div>
+    <% if @models.empty? %>
+      <%= render partial: 'alert_no_models' %>
+    <% end %>
+  </div>
+  <% if @models.any? %>
+    <%= form_tag migrations_path, class: "pb-10" do %>
+      <input type="hidden" id="form_attributes" name="migrations">
+      <div class="flex flex-col gap-2 pb-4">
+        <div class="block text-localtower-100">Migration name <span class="text-localtower-400">(optionnal)</span></div>
+        <div class="w-80">
+          <input autocomplete="off" type="text" data-selector="modelName" name="migration_name" class="px-2 py-1.5 rounded bg-localtower-600 border border-localtower-500 inline-block w-full outline-none focus:border-localtower-400 transition-colors text-localtower-100 placeholder:italic placeholder:text-localtower-450 focus:placeholder:text-localtower-600 disabled:cursor-not-allowed" placeholder="Ex: AddFieldsToUser" <%= @migrations.any? ? 'disabled' : '' %>>
         </div>
       </div>
-      <div class="content">
-        <%= form_tag migrations_path, class: "form" do %>
-          <div class="row">
-            <div class="container-table" data-selector="table">
-              <table class="table table-hover table-striped">
-                <thead>
-                  <th> <span data-selector=''>On Model</span></th>
-                  <th> <span data-selector=''>Action</span></th>
-                  <th> <span data-selector='belongs_to_label'>Belongs To</span></th>
-                  <th> <span data-selector='column_label'>Column</span></th>
-                  <th> <span data-selector='default_label'>Default</span></th>
-                  <th> <span data-selector='new_column_name_label'>New Column Name</span></th>
-                  <th> <span data-selector='column_type_label'>Type</span></th>
-                  <th> <span data-selector='index_options_label'>Index Options</span></th>
-                  <th> <span data-selector='nullable_label'>Can be null?</span></th>
-                  <th> <span data-selector=''></span></th>
-                </thead>
-                <tbody data-selector="tbody">
-                  <tr data-selector="tr">
-                    <td style='width: 300px;'>
-                      <%= select_tag "migrations[][table_name]", options_for_select(Localtower::Tools.models.collect {|p| [ p, p.table_name ] }), class: "form-control" %>
-                    </td>
-                    <td style='width: 220px;'>
-                      <%= select_tag "migrations[][action]", options_for_select(::Localtower::Generators::Migration::ACTIONS), class: "form-control", "data-selector" => "action" %>
-                    </td>
-                    <td>
-                      <%= select_tag "migrations[][belongs_to]", options_for_select(Localtower::Tools.models.collect {|p| [ p, p.table_name ] }), class: "form-control", "data-selector" => "belongs_to" %>
-                    </td>
-                    <td class="text-center">
-                      <input type="text" name="migrations[][column]" class="form-control" data-selector="column_text">
-                      <%= select_tag "migrations[][column_list]", options_for_select(::Localtower::Tools.all_columns), class: "form-control", include_blank: true, "data-selector" => "column_list" %>
-                    </td>
-                    <td>
-                      <%= select_tag "migrations[][default]", options_for_select(::Localtower::Generators::ServiceObjects::InsertDefaults::DEFAULTS), class: "form-control", include_blank: true, "data-selector" => "default_input" %>
-                    </td>
-                    <td>
-                      <input type="text" name="migrations[][new_column_name]" class="form-control" data-selector="new_column_name">
-                    </td>
-                    <td>
-                      <%= select_tag "migrations[][column_type]", options_for_select(::Localtower::Generators::Migration::TYPES), class: "form-control", "data-selector" => "column_type" %>
-                    </td>
-                    <td>
-                      <div data-selector="index_options">
-                        <div class="row">
-                          <div class="col-md-4">
-                            index: <br>
-                            <%= select_tag "migrations[][index][using]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::USING - ['none']), class: "form-control" %>
-                          </div>
-                          <div class="col-md-4">
-                            unique:
-                            <br>
-                            <%= select_tag "migrations[][index][unique]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::UNIQUE), class: "form-control" %>
-                          </div>
-                          <div class="col-md-4">
-                            algorithm
-                            <br>
-                            <%= select_tag "migrations[][index][algorithm]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::ALGO), class: "form-control" %>
-                          </div>
-                        </div>
-                      </div>
-                    </td>
-                    <td>
-                      <input data-selector="nullable_input" type="checkbox" value="true" name="migrations[][nullable]" class="form-control" checked>
-                    </td>
-                    <td>
-                      <div class="pull-right">
-                        <button class="btn btn-danger btn-xs pointer" data-selector="removeLineMigration">Remove line</button>
-                      </div>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-md-12 text-center">
-              <i class="pe-7s-plus pointer" data-selector="duplicateLineNewMigration" style="font-size: 3em;"></i>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-md-12 text-right">
-              <button type="submit" value="true" class="btn btn-success btn-fill" data-selector="submitNewMigration">
-                Generate the migration
-              </button>
-            </div>
-          </div>
+      <div class="py-4 flex flex-col gap-4">
+        <label class="block text-localtower-100">Actions</label>
+        <div id="react-container-new-migration"></div>
+      </div>
+      <div>
+        <button type="submit" value="true" class="px-3 py-1.5 rounded-md bg-green-800 text-localtower-100 border border-green-700 inline-block outline-none hover:border-green-500 hover:bg-green-700 hover:text-white active:opacity-60 transition-colors text-md">
+          <%= @migrations.any? ? 'Add to Migration' : 'Generate Migration' %>
+        </button>
+      </div>
+    <% end %>
+  <% end %>
+  <% if @migrations.any? %>
+    <div class="py-10 border-t border-localtower-500 flex flex-col gap-4">
+      <h4 class="text-localtower-300">
+        There is a pending migration. All new actions will be added to this one:
+      </h4>
+      <div>
+        <% @migrations.take(1).each do |entry| %>
+          <%= render partial: 'localtower/migration', locals: { entry: entry } %>
         <% end %>
       </div>
     </div>
-  </div>
+  <% end %>
 </div>

data/app/views/localtower/pages/new_model.html.erb

@@ -1,87 +1,21 @@
 <% content_for :title do %>New Model<% end %>
-<div class="row">
-  <div class="col-md-12">
-    <div class="card">
-      <div class="header">
-        <div class="alert alert-warning">
-          <span>Remember, you can always edit your migration files manually before running "rails db:migrate"</span>
-        </div>
-      </div>
-      <div class="content">
-        <%= form_tag models_path, class: "form" do %>
-          <div class="row">
-            <div class="col-md-6">
-              <div class="form-group">
-                <label>Name of the Model</label>
-                <input type="text" data-selector="modelName" name="model[model_name]" class="form-control">
-              </div>
-            </div>
-          </div>
-          <div class="row">
-            <table class="table table-hover table-striped">
-              <thead>
-                <th>Type</th>
-                <th>Column Name</th>
-                <th>Default</th>
-                <th>Index Options</th>
-                <th>Can be null?</th>
-                <th></th>
-              </thead>
-              <tbody data-selector="tbody">
-                <tr data-selector="tr">
-                  <td>
-                    <%= select_tag "model[attributes][][attribute_type]", options_for_select(::Localtower::Generators::Migration::TYPES), class: "form-control" %>
-                  </td>
-                  <td>
-                    <input type="text" data-selector="attributeName" name="model[attributes][][attribute_name]" class="form-control">
-                  </td>
-                  <td>
-                    <%= select_tag "model[attributes][][default]", options_for_select(::Localtower::Generators::ServiceObjects::InsertDefaults::DEFAULTS), class: "form-control" %>
-                  </td>
-                  <td style='min-width: 240px'>
-                    <div class="row">
-                      <div class="col-md-4">
-                        index: <br>
-                        <%= select_tag "model[attributes][][index][using]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::USING), class: "form-control" %>
-                      </div>
-                      <div class="col-md-4">
-                        unique:
-                        <br>
-                        <%= select_tag "model[attributes][][index][unique]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::UNIQUE), class: "form-control" %>
-                      </div>
-                      <div class="col-md-4">
-                        algorithm
-                        <br>
-                        <%= select_tag "model[attributes][][index][algorithm]", options_for_select(::Localtower::Generators::ServiceObjects::InsertIndexes::ALGO), class: "form-control" %>
-                      </div>
-                    </div>
-                  </td>
-                  <td>
-                    <input type="checkbox" value="true" name="model[attributes][][nullable]" class="form-control" checked>
-                  </td>
-                  <td>
-                    <div class="pull-right">
-                      <button class="btn btn-danger btn-xs pointer" data-selector="removeLineModel">Remove line</button>
-                    </div>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
-          <div class="row">
-            <div class="col-md-12 text-center">
-              <i class="pe-7s-plus pointer" data-selector="duplicateLineNewModel" style="font-size: 3em;"></i>
-            </div>
-          </div>
-          <div class="row">
-            <div class="col-md-12 text-right">
-              <button type="submit" value="true" class="btn btn-success btn-fill" data-selector="submitNewModel">
-                Generate the migration (and the model)
-              </button>
-            </div>
-          </div>
-        <% end %>
+<div>
+  <%= form_tag models_path, class: "" do %>
+    <div class="flex flex-col gap-2">
+      <div class="block text-localtower-100">Model name <span class="text-localtower-400">(required)</span></div>
+      <div class="w-80">
+        <input autocomplete="off" type="text" data-selector="modelName" name="model[model_name]" class="px-2 py-1.5 rounded bg-localtower-600 border border-localtower-500 inline-block w-full outline-none focus:border-localtower-400 transition-colors text-localtower-100 placeholder:italic placeholder:text-localtower-450 focus:placeholder:text-localtower-600" placeholder="Ex: User" required>
       </div>
+      <input type="hidden" id="form_attributes" name="model[attributes]">
+    </div>
+    <div class="py-4 flex flex-col gap-2">
+      <label class="block text-localtower-100">Columns</label>
+      <div id="react-container-new-model"></div>
+    </div>
+    <div>
+      <button type="submit" value="true" class="px-3 py-1.5 rounded-md bg-green-800 text-localtower-100 border border-green-700 inline-block outline-none hover:border-green-500 hover:bg-green-700 hover:text-white active:opacity-60 transition-colors text-md">
+        Generate Model
+      </button>
     </div>
-  </div>
+  <% end %>
 </div>

data/config/routes.rb

@@ -4,10 +4,10 @@ Localtower::Engine.routes.draw do
   post 'migrations', to: 'pages#post_migrations'
 
   get 'models/new', to: 'pages#new_model', as: :new_model
-  get 'models', to: 'pages#models', as: :models
   post 'models', to: 'pages#post_models'
 
   post 'actions', to: 'pages#post_actions', as: :actions
+  post 'rm_file', to: 'pages#rm_file', as: :rm_file
 
   root :to => redirect('models/new')
 end

data/lib/localtower/engine.rb

@@ -2,8 +2,15 @@ module Localtower
   class Engine < ::Rails::Engine
     isolate_namespace Localtower
 
-    initializer 'static assets' do |app|
-      app.middleware.use ::ActionDispatch::Static, "#{root}/public"
+    initializer 'localtower.add_static_assets', before: :build_middleware_stack do |app|
+      app.config.middleware.use Rack::Deflater
+      app.config.middleware.use ::ActionDispatch::Static, "#{root}/public"
+      # Later: have a better assets pipeline to be able to version and cache assets forever
+      # app.config.middleware.use ::ActionDispatch::Static, "#{root}/public", headers: { "Cache-Control" => "public, max-age=31536000" }
+    end
+
+    initializer "localtower.assets.precompile" do |app|
+      app.config.assets.precompile += ["localtower/application.css", "localtower/application.js"]
     end
   end
 end