Fix user registration + auto-hide error/notice messages from the UI

Makefile

@@ -59,7 +59,7 @@ staging: 	## Set RAILS_ENV=staging
 production: 	## Set RAILS_ENV=production
 		@echo 'export RAILS_ENV=production' > $(MAKE_ENV)
 
-boot: 		## Boots Rails sserver in the whatever RAILS_ENV is set to — eg: make production boot
+setup: 		## Boots Rails sserver in the whatever RAILS_ENV is set to — eg: make production boot
 		bash bin/boot-up
 
 docker-image:	## Builds a docker image named 'tickets'
@@ -71,24 +71,32 @@ shellcheck:	## Run shellcheck on the shell files
 dev-install:    ## Optional install of VIM configuration and other dev tools
 		$(CURRENT_DIR)/development/dev-install
 
-rebuild-dev-db: development ## Rebuild and re-seed the dev database
-		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Dropping dev database $(DEV_DB)...$(clear)\n"
+# Rails Commands Macros
+
+db-drop:  	## Drop current databases
+		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Dropping dev database [$(DEV_DB)]$(clear)\n"
 		@dropdb $(DEV_DB) || true
-		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Creating dev database...$(clear)\n"
-		@rails db:create
-		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Migrating dev database...$(clear)\n"
-		@rails db:migrate
-		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Seeding dev database...$(clear)\n"
-		rails db:seed
-
-assets:    	## Build JS & CSS assets
+
+db-create:  	node_modules ## Create if necessary, migrate and seed the database
+		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Creating Database:    [$(DEV_DB)]$(clear)\n"
+		@bin/rails db:create
+		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Migrating Databases:  [$(DEV_DB)]$(clear)\n"
+		@bin/rails db:migrate
+		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Seeding dev database: [$(DEV_DB)]$(clear)\n"
+		@bin/rails db:seed
+
+rebuild-dev-db: db-drop development db-create ## Rebuild and re-seed the dev database
+
+node_modules: 	## Install all Node Modules
 		@yarn install
+
+assets:    	node_modules ## Build JS & CSS assets
 		@yarn run build
 		@yarn run build:css
 
-dev:            development assets ## Start the development environment
-		@bash -c "source $(MAKE_ENV); bundle exec foreman start -f Procfile.dev"
-
+dev:          node_modules db-create ## Start the development environment
+		@printf "\n$(bg_purple)  👉  $(purple)$(clear)  $(yellow)Starting up Foreman in ENV=[$(MAKE_ENV)], db=[$(DEV_DB)]$(clear)\n"
+		@bash -c "source $(MAKE_ENV); foreman start -f Procfile.dev"
 
 ci: 		## Run all tests and linters as if on CI
 		bin/rails db:migrate

Procfile.dev

@@ -1,5 +1,5 @@
 # vim: ft=yaml
-web: env RUBY_DEBUG_OPEN=true bin/rails server -p 3000
+web: env RUBY_DEBUG_OPEN=true bin/rails server -p 5000
 js: yarn watch:js
 css: yarn watch:css
-browser: sleep 10 && open http://localhost:3000/ && while true; do sleep 100; echo .; done
+browser: sleep 10 && open http://localhost:5000/ && while true; do sleep 100; echo .; done

app/assets/stylesheets/global.css.scss

@@ -44,6 +44,23 @@ a.btn {
   }
 }
 
+#flash_container {
+  position: fixed;
+
+  width: auto;
+  top: 10px;
+  left: 500px;
+  right: 20%;
+
+  .alert {
+    width: 100%;
+    border-radius: 20px;
+    box-shadow: 10px 10px 10px #222;
+  }
+  .alert-danger {
+    h3 { color: #f55 !important; }
+  }
+}
 
 nav.navbar {
   width: 100%;

app/controllers/application_controller.rb

@@ -29,9 +29,9 @@ def require_logged_in_user
   end
 
   def configure_permitted_parameters
-    attributes = %i[name first last email avatar]
-    devise_parameter_sanitizer.permit(:sign_up, keys: attributes)
-    devise_parameter_sanitizer.permit(:account_update, keys: attributes)
+    permitted_attributes = %i[email password password_confirmation first last]
+    devise_parameter_sanitizer.permit(:sign_up) { |user| user.permit(*permitted_attributes) }
+    devise_parameter_sanitizer.permit(:account_update) { |user| user.permit(*permitted_attributes) }
   end
 
   def authenticate_user_from_token!
@@ -44,7 +44,12 @@ def authenticate_user_from_token!
     end
   end
 
-  def render_flash
-    render turbo_stream: turbo_stream.update('flash', partial: 'shared/flash')
+  def render_flash(flash)
+    # render turbo_stream: turbo_stream.update('flash_container', partial: 'shared/flash')
+    respond_to do |format|
+      format.turbo_stream do
+        render turbo_stream: [turbo_stream.replace(:flash, partial: 'shared/flash', locals: { flash: })]
+      end
+    end
   end
 end

app/controllers/events_controller.rb

@@ -43,8 +43,8 @@ def create
       redirect_to @event
     else
       Rails.logger.error("Can't create event: #{@event.errors.full_messages}")
-      flash.now[:error] = "There was a problem creating the event: #{@event.errors.full_messages.join('. ')}"
-      render_flash
+      flash.now[:error] = "There was a problem creating the event: #{@event.errors.full_messages.sort.uniq.join('. ')}"
+      render_flash flash
     end
   end
 

app/javascript/add_jquery.js

@@ -1,3 +1,14 @@
 import jquery from "jquery";
+
 window.jQuery = jquery;
 window.$ = jquery;
+
+// https://dev.to/nejremeslnici/how-to-use-view-transitions-in-hotwire-turbo-1kdi
+addEventListener("turbo:before-frame-render", (event) => {
+  if (document.startViewTransition) {
+    const originalRender = event.detail.render
+    event.detail.render = (currentElement, newElement) => {
+      document.startViewTransition(()=> originalRender(currentElement, newElement))
+    }
+  }
+})

app/javascript/controllers/flash_controller.js

@@ -0,0 +1,26 @@
+import {Controller} from "@hotwired/stimulus"
+
+// Connects to data-controller="flash"
+export default class flashController extends Controller {
+  static targets = [ "flash" ]
+
+  connect() {
+    addEventListener("turbo:render", (event) => {
+      this.hideFlash()
+    })
+    addEventListener("turbo:before-stream-render", (event) => {
+      this.hideFlash()
+    })
+  }
+
+  hideFlash() {
+    setTimeout(function () {
+      $('#flash_container').fadeOut('500');
+      setTimeout(function () {
+        $('#flash').html("");
+        $('#flash_container').show();
+      }, 500);
+
+    }, 5000);
+  }
+}

app/javascript/controllers/index.js

@@ -7,6 +7,9 @@ import { application } from "./application"
 import FlatpickrController from "./flatpickr_controller"
 application.register("flatpickr", FlatpickrController)
 
+import FlashController from "./flash_controller"
+application.register("flash", FlashController)
+
 import PaymentsController from "./payments_controller"
 application.register("payments", PaymentsController)
 

app/javascript/popovers.js

@@ -1,22 +1,22 @@
-import jQuery from 'jquery';
-
-(function ($) {
-  const popover = $('.help-popover');
-  popover({
-    trigger: 'manual'
-  }).on('click', function (e) {
-    const popoverClicked = $(this);
-    popoverClicked('toggle');
-    e.preventDefault();
-  });
-})(jQuery);
-
-(function () {
-  jQuery(function () {
-    $("a[rel~=popover], .has-popover").popover;
-    return $("a[rel~=tooltip], .has-tooltip").tooltip;
-  });
-
-}).call(this);
-
-$('.hover-tooltip').tooltip();
+// import jQuery from 'jquery';
+//
+// (function ($) {
+//   const popover = $('.help-popover');
+//   popover({
+//     trigger: 'manual'
+//   }).on('click', function (e) {
+//     const popoverClicked = $(this);
+//     popoverClicked('toggle');
+//     e.preventDefault();
+//   });
+// })(jQuery);
+//
+// (function () {
+//   jQuery(function () {
+//     $("a[rel~=popover], .has-popover").popover;
+//     return $("a[rel~=tooltip], .has-tooltip").tooltip;
+//   });
+//
+// }).call(this);
+//
+// $('.hover-tooltip').tooltip();

app/models/event.rb

@@ -44,7 +44,8 @@ class Event < ApplicationRecord
                   :max_kid_tickets_per_request, :max_cabins_per_request, :max_cabin_requests,
                   :photo, :photo_cache, :tickets_require_approval, :require_mailing_address,
                   :allow_financial_assistance, :allow_donations,
-                  :ticket_sales_start_time, :ticket_sales_end_time, :ticket_requests_end_time
+                  :ticket_sales_start_time, :ticket_sales_end_time,
+                  :ticket_requests_end_time
 
   mount_uploader :photo, PhotoUploader
 
@@ -71,19 +72,31 @@ class Event < ApplicationRecord
   validate :end_time_after_start_time, :sales_end_time_after_start_time,
            :ensure_prices_set_if_maximum_specified
 
-  DEFAULT_ATTRIBUTES = {
+  DEFAULT_EVENT_START_TIME = ->(delta = 0) { Date.current + 2.months + delta }
+  DEFAULT_ATTRIBUTES       = {
+    start_time: DEFAULT_EVENT_START_TIME[11.hours],
+    end_time: DEFAULT_EVENT_START_TIME[3.days + 14.hours],
+    ticket_requests_end_time: DEFAULT_EVENT_START_TIME[-14.days],
+    ticket_sales_start_time: DEFAULT_EVENT_START_TIME[-42.days],
+    ticket_sales_end_time: DEFAULT_EVENT_START_TIME[7.days],
+
     adult_ticket_price: 250,
-    early_arrival_price: 20,
+    early_arrival_price: 0,
     kid_ticket_price: 0,
-    late_departure_price: 20,
-    max_adult_tickets_per_request: 10,
+    late_departure_price: 25,
+
+    max_adult_tickets_per_request: 6,
     max_kid_tickets_per_request: 4,
-    max_cabins_per_request: 1,
-    max_cabin_requests: 2,
+
     tickets_require_approval: true,
-    require_mailing_address: false,
     allow_financial_assistance: true,
-    allow_donations: true
+    allow_donations: true,
+
+    require_mailing_address: false,
+
+    max_cabins_per_request: nil,
+    max_cabin_requests: nil,
+    cabin_price: nil
   }.freeze
 
   def admin?(user)

app/views/devise/registrations/_change_password.html.haml

@@ -4,7 +4,7 @@
     - if existing
       %small.nowrap NOTE: leave these fields blank if you don't want to change your password.
     - else
-      %h3 Please enter your new password, twice for confirmation.
+      %h5 Please enter your new password, twice for confirmation.
 
 .row
   .col-md-6.col-sm-12
@@ -15,6 +15,6 @@
         NOTE:
         = "#{@minimum_password_length} characters minimum"
 
-  .col-6
+  .col-md-6.col-sm-12
     %p= f.label :password_confirmation
     %p= f.password_field :password_confirmation, autocomplete: "new-password"

app/views/devise/registrations/_form.html.haml

@@ -1,6 +1,6 @@
 
 - http_method = existing ? :put : :post
-= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: http_method }) do |f|
+= form_for(resource, as: resource_name, url: user_registration_path, html: { method: http_method }) do |f|
 
   = render "devise/shared/error_messages", resource: resource
 
@@ -43,13 +43,6 @@
           .actions
             = f.submit "Register", class: 'btn btn-primary btn-large'
 
-      .row
-        .col-12
-          .actions
-            %h3
-              Close my accounts completely.
-            %div
-              Wanna go? #{button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, class: 'btn btn-secondary btn-large', method: :delete}
 
       .row
         .col-12

app/views/devise/registrations/edit.html.haml

@@ -1,4 +1,4 @@
 %h2
   Edit Your Account
 
-= render partial: 'form', locals: { existing: resource&.persisted?, resource: resource, resource_name: resource_name}
+= render partial: 'form', locals: { existing: resource&.id.nil? ? false : true, resource: resource, resource_name: resource_name}

app/views/devise/registrations/new.html.haml

@@ -1,3 +1,3 @@
 %h2 Register a New Account
 
-= render partial: 'form', locals: { existing: resource&.persisted?, resource: resource, resource_name: resource_name}
+= render partial: 'form', locals: { existing: resource&.id.nil? ? false : true, resource: resource, resource_name: resource_name}

app/views/layouts/application.html.haml

@@ -1,5 +1,5 @@
 !!!
-%html{ lang: 'en', 'data-bs-theme': 'dark' }
+%html{ lang: 'en', 'data-bs-theme': 'light' }
   %head
     %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
     %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
@@ -28,11 +28,11 @@
   %body
     = render partial: "shared/navigation"
     .container
+      %turbo-frame#flash_container{"data-controller": "flash", "data-flash-target": "flash"}
+        = render "shared/flash"
       .row
         .col-3.col-md-3
         .col-6.col-md-6
-          .turbo-frame#flash
-            = render 'shared/flash'
         .col-3.col-md-3
 
       .row

app/views/layouts/application.turbo_stream.erb

@@ -0,0 +1,3 @@
+<%= turbo_stream.prepend :flash_container, partial: "shared/flash" %>
+
+<%= yield %>

app/views/shared/_flash.html.haml

@@ -1,11 +1,12 @@
-- flash.each do |type, msg|
-  .alert{ class: alert_class(type), role: "alert"}
-    - main, rest = msg.split(/:/)
-    %h3
-      = main
-    - if rest != main && rest.present?
-      %hr
-      - rest.gsub(/.*:/, '').gsub(/["\[\]]/, '').split(', ').each do |message|
-        %ul
-          %li
-            = message
+#flash{"data-flash-target": "flash"}
+  - flash.each do |type, msg|
+    .alert{ class: alert_class(type), role: "alert"}
+      - main, rest = msg.split(/:/)
+      %h3
+        = main
+      - if rest != main && rest.present?
+        %hr
+        - rest.gsub(/.*:/, '').gsub(/["\[\]]/, '').split(', ').each do |message|
+          %ul
+            %li
+              = message

app/views/shared/_navigation.html.haml

@@ -1,4 +1,4 @@
-%nav.navbar.navbar-expand-lg.border-bottom.border-body.navbar-dark
+%nav.navbar.navbar-expand-lg.border-bottom.border-body.navbar-dark.bg-primary-subtle
   %a.navbar-brand{ href: root_path }
     = image_tag "/icons/nav-bar-logo.png", size: "80x80"
   %button.navbar-toggler{"aria-controls" => "navbarSupportedContent", "aria-expanded" => "false", "aria-label" => "Toggle navigation", "data-bs-target" => "#navbarSupportedContent", "data-bs-toggle" => "collapse", :type => "button"}

bin/boot-up

@@ -56,9 +56,4 @@ run "bin/rails db:migrate"
 run "bin/rails db:seed"
 run "bundle exec rake db:test:prepare"
 
-h1 "Starting Rails Server..."
-run.set-next show-output-on
-run "sleep 5 && open http://0.0.0.0:3000/" 2>/dev/null 1>&2 &
-run "make dev"
-
-
+success "Your server should be ready to roll. Run ${txtgrn}make dev${clr} to start it."

config/credentials.yml.enc

@@ -1 +1 @@
-VCDth9rl7xBy5IepxdQ4sH5s9sCi39B8/Gwzw+zqFaq+iuFENS/9JyMcHqA12VJ/vL0/jc57iQ7AtappjIRs1YvNc2XCvPC6JIUpMWKh4jdKjfpU9kWR7V/a53DDNfSQiXgmyZbBL+8opPYPAGgJnnQGSzmWP9yZQBY95JD04qMfgFI+YZk7tv7jRsOc6QNq7BniHl7LqsgqubieqNzzwfZq2CHyyaArEZ/pj7mWgoC9MpqhYSVrnnyh1OZs8VZjdOoeybXV6eSgBSnJQ8SO5VRPXFTNw4C/rTbhsQS0XRIxSFA7vFdcpUrXbE32Cu8tNWg08sFwhOhiX6DEjUdhVJX7zDRcxDeXEkTKVDXIxAZST+FFSf0acst1xxtVP2npH1RomEjOYxevliAX6XptllS385TECuUWQBobJQ3uxhaberM6217Uzld3rMER73fhfvwRfxiYuZSRnp0nd3bOQr1pPhQHJu0EzX6dVo2cVw9POZyzUM1C0l2S8ePGGmiHZJMab1TIvXwY1XdwQ9jImhe61EboHkmIvoVaB8XSWSLVb1RJhad684WLwJy5icxZdkU+eM4qHktQF8KdpqafTIqtdQtO16B1PX+iDDgCVa5ZqUYdWpOt9B6R2G3jEvs6mvKgUm5ozT8pYnRhLQvh4ZbjEkKQD7ZkG6fg4LdRDT7J7+SzcxCUBEyqdZ/dDkbjuZRmwsIebDBRlepy0XVV0PDnjlv/E7za+q1d5ETZ6ujPr9qDKdIYoaRCRLmiBDkQrn3SO3HrL7f8bcW0DjxkeGP7jQEdidNVCuPPRStaiPkceBd+B2sStoBjpqqpC5sHMW431ft3J16yLCz0rKYKoSjoxgS7ghBcsXRKog+zxpaOoWmsMK2gyViuy/9lhj+lLxlGCWqjcEuNRKMvv88j1mNbpJrqqSHygjNCNFQmD70j19mIicdoKTqXVIPJMrm83N9+9kyaQw8QfiBc+iiYEH0Wzw08KlzXCzswK37aeQ==--0okqjz1XA5ID2l+o--EncVmFHba3Wz1T1m3UHqoA==
+ZWWtVk+4GEPw3cFJG9I/GJW/IhdcKOuVZEr+NidRlym90tgBBT7hTvUMvF9sj28vCVLRT2BdF/XquhkJPwa/WpgifyPRoP3Ch5hMj0LdCKtfFSRsueQGDB8N4J6cCAuOgW96kBHFjCQ5lO3pBhf19CoaZz7IvhUr0bIy5vnhyma7HdVDshAlvOAbMYv++Ua1wqqtzWp7mb20k+n3lAsIsWLSPVpZ+U0/WN2h6oGrgX8gZB81RhnzQh7KUL4Yw/qQkttPrVNam/dWc0l2WYsjWlGUd/k8xNyZQ+8BkisfreDJGvwrwTkxvyDvKAckC9yudpNTSDKFH3EWx3SOL670lNTzK3kyMRqyFod9BDtP8Oxl3MPUyvvGZOVNfqm/+cMgEQPNmYTMO9mI8mvKPuRXSiSGG8N0/j/d/xmXJPBCP3LioTT8ndEtQMSU7i6Di6+9WPrjwyO/oUsPU0AueP1Lz1P2FoyEdUELOusyekJqfPJAqkyGdoHCWjyJSj/MknDIXDNTUOM2wfS0yaXDg+cKV+QecmScwV2ES+kuTuNGEIxqCYSamWwjPE7Q52EQeM+KejWAr90Wo+PxsmHCERHO4vWise2Mi8z7wKZIJn8mhSOt/Rmu1iqJmZkqwWaIeG8uAhjw6L4w2AEV+8N7kleJogmjXRBLI7K/4tPRvL2hqgIYdLbMmHYyEGjgYEFTIiUGakKovf9ygF3JrmJ5s3IOGrIbrpBQ4/yE1oXy2JiTqad4rfPAy6mP/2imhwk6u1XemdrhZalm/GQ4h6l5AufTU5b77zvg66WHMDybzY4hFQ8PdzkQmo9xsUnbiEvzACnhoyJHCEQOqDHMdAnl+7EyRM4xZnIlOTkYEbu+Ah2u44g9+svG5xcE6bZ2L43DhUDZNmjmEn+DmjCXjMP8AGRGNbRplEnr5MluD93SrFL0V3ZbwlSFDJZXWi93DVeHYmURnvDUp8I4aqHkTwg759UUzUVHVcCnJ2kb0VQvWfPOBjIHCUaQwe/OLRtQMotkEUnD8N6OPOH7tX498hUNheoA2s/Wsjxz9IX0xBISoa6lwVJ+NnX4evwtEtNeiZzoathvBs91eTDCV9s5OLlCMjt/az+0+umUxK/XcZsvFEBUGA==--66+ryGVyib21rESb--zV4MhpvtIzu6kgxB9cfr6g==