From 2429b4984db24a2f07e9491e2aa34cad12220b62 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Fri, 19 Apr 2024 17:59:01 -0700 Subject: [PATCH 1/4] Fixing on-demand CSS assets compliation * Also several minor fixes to other files. --- Procfile.dev | 8 ++++++++ app/assets/stylesheets/global.css.scss | 13 ++++++++++++- app/views/events/_form.html.haml | 2 +- config/database.yml | 1 - config/environments/development.rb | 3 +-- package.json | 1 + 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/Procfile.dev b/Procfile.dev index 12e6ec56..90d71c94 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,5 +1,13 @@ +<<<<<<< Updated upstream web: env RUBY_DEBUG_OPEN=true bin/rails server js: yarn build --watch css: yarn watch:css browser: sleep 10 && open http://localhost:5000/ && while true; do sleep 100; echo .; done css: yarn watch:css +======= +# vim: ft=yaml +web: env RUBY_DEBUG_OPEN=true bin/rails server -p 3000 +js: yarn watch:js +css: yarn watch:css +browser: sleep 10 && open http://localhost:3000/ && while true; do sleep 100; echo .; done +>>>>>>> Stashed changes diff --git a/app/assets/stylesheets/global.css.scss b/app/assets/stylesheets/global.css.scss index 3c94c60f..534118ee 100644 --- a/app/assets/stylesheets/global.css.scss +++ b/app/assets/stylesheets/global.css.scss @@ -151,11 +151,22 @@ form { max-width: 80%; } + input[type=text]#event_name { + width: 400px !important; + min-width: 400px !important; + font-size: 14pt; + background-color: green !important; + } + input[type=text] { min-width: 100px; + width: 300px; text-align: left; padding-left: 10px; - width: 300px; + } + + input[name="event[name]"] { + width: 500px !important; } input[type=submit] { diff --git a/app/views/events/_form.html.haml b/app/views/events/_form.html.haml index 368d08cb..36360fb7 100644 --- a/app/views/events/_form.html.haml +++ b/app/views/events/_form.html.haml @@ -4,7 +4,7 @@ %fieldset %legend Event Details = f.label :name, 'Event Name' - = f.text_field :name, class: 'input-large', required: true, maxlength: Event::MAX_NAME_LENGTH + = f.text_field :name, class: 'event-name', required: true, maxlength: Event::MAX_NAME_LENGTH = f.label :start_time, 'Start Time' = render partial: 'shared/datetime_field', locals: {form: f, name: "start_time", datetime: (@event.start_time || 1.day.from_now.beginning_of_day) } diff --git a/config/database.yml b/config/database.yml index fe82298d..e2e41b9b 100644 --- a/config/database.yml +++ b/config/database.yml @@ -23,7 +23,6 @@ production: encoding: utf8 host: localhost port: 5432 - pool: 5 username: postgres password: postgres database: ticketing_app_production diff --git a/config/environments/development.rb b/config/environments/development.rb index fc8c823b..569624f5 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -29,7 +29,6 @@ config.public_file_server.headers = { 'Cache-Control' => "public, max-age=#{2.days.to_i}" } else config.action_controller.perform_caching = false - config.cache_store = :null_store end @@ -59,7 +58,7 @@ config.active_job.verbose_enqueue_logs = true # Suppress logger output for asset requests. - config.assets.quiet = true + config.assets.quiet = false # Raises error for missing translations. # config.i18n.raise_on_missing_translations = true diff --git a/package.json b/package.json index 16770d5c..fafb6f44 100644 --- a/package.json +++ b/package.json @@ -50,6 +50,7 @@ "dev": "tsc-watch --noClear -p tsconfig.json --onSuccess \"yarn build:js\" --onFailure \"yarn failure:js\"", "failure:js": "rm ./app/assets/builds/application.js && rm ./app/assets/builds/application.js.map", "watch:css": "nodemon --watch ./app/assets/stylesheets/ --ext scss --exec \"yarn build:css\"", + "watch:js": "nodemon --watch ./app/assets/javascript/ --ext js --exec \"yarn build:js\"", "eslint:check": "yarn eslint .", "prettier:check": "yarn prettier --check ." }, From 37583433bb2d7b56efb9d6580f381d683ff4d2de Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Fri, 19 Apr 2024 18:11:06 -0700 Subject: [PATCH 2/4] Update Procfile.dev --- Procfile.dev | 8 -------- 1 file changed, 8 deletions(-) diff --git a/Procfile.dev b/Procfile.dev index 90d71c94..3ea92e5c 100644 --- a/Procfile.dev +++ b/Procfile.dev @@ -1,13 +1,5 @@ -<<<<<<< Updated upstream -web: env RUBY_DEBUG_OPEN=true bin/rails server -js: yarn build --watch -css: yarn watch:css -browser: sleep 10 && open http://localhost:5000/ && while true; do sleep 100; echo .; done -css: yarn watch:css -======= # vim: ft=yaml web: env RUBY_DEBUG_OPEN=true bin/rails server -p 3000 js: yarn watch:js css: yarn watch:css browser: sleep 10 && open http://localhost:3000/ && while true; do sleep 100; echo .; done ->>>>>>> Stashed changes From e74060d2267d467b5ba7bdbdd919a80bc2d8e87c Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Fri, 19 Apr 2024 18:12:29 -0700 Subject: [PATCH 3/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fafb6f44..5fb1067a 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,7 @@ "dev": "tsc-watch --noClear -p tsconfig.json --onSuccess \"yarn build:js\" --onFailure \"yarn failure:js\"", "failure:js": "rm ./app/assets/builds/application.js && rm ./app/assets/builds/application.js.map", "watch:css": "nodemon --watch ./app/assets/stylesheets/ --ext scss --exec \"yarn build:css\"", - "watch:js": "nodemon --watch ./app/assets/javascript/ --ext js --exec \"yarn build:js\"", + "watch:js": "nodemon --watch ./app/javascript/ --ext js --exec \"yarn build:js\"", "eslint:check": "yarn eslint .", "prettier:check": "yarn prettier --check ." }, From 5600e73db58aa405442880ac88e2c9b0eb135272 Mon Sep 17 00:00:00 2001 From: Konstantin Gredeskoul Date: Sat, 20 Apr 2024 12:09:10 -0700 Subject: [PATCH 4/4] Update global.css.scss --- app/assets/stylesheets/global.css.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/stylesheets/global.css.scss b/app/assets/stylesheets/global.css.scss index 534118ee..1ac43546 100644 --- a/app/assets/stylesheets/global.css.scss +++ b/app/assets/stylesheets/global.css.scss @@ -155,7 +155,7 @@ form { width: 400px !important; min-width: 400px !important; font-size: 14pt; - background-color: green !important; + background-color: #FB9 !important; } input[type=text] {