diff --git a/.ruby-version b/.ruby-version
index b0f2dcb..ff365e0 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.0.4
+3.1.3
diff --git a/Gemfile b/Gemfile
index 7f7ae9c..44163a9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,56 +1,29 @@
source "https://rubygems.org"
git_source(:github) { |repo| "https://github.com/#{repo}.git" }
-ruby "3.0.4"
+ruby "3.1.3"
-# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
gem "rails", "~> 7.0.8"
-# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
gem "sprockets-rails"
-# Use sqlite3 as the database for Active Record
gem "sqlite3", "~> 1.4"
-# Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
-
-# Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
gem "importmap-rails"
-
-# Hotwire's SPA-like page accelerator [https://turbo.hotwired.dev]
-gem "turbo-rails"
-
-# Hotwire's modest JavaScript framework [https://stimulus.hotwired.dev]
-gem "stimulus-rails"
-
-# Use Tailwind CSS [https://github.com/rails/tailwindcss-rails]
gem "tailwindcss-rails"
-# Build JSON APIs with ease [https://github.com/rails/jbuilder]
-gem "jbuilder"
-
-# Use Redis adapter to run Action Cable in production
-# gem "redis", "~> 4.0"
-
-# Use Kredis to get higher-level data types in Redis [https://github.com/rails/kredis]
-# gem "kredis"
-
-# Use Active Model has_secure_password [https://guides.rubyonrails.org/active_model_basics.html#securepassword]
-# gem "bcrypt", "~> 3.1.7"
-
-# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
-gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
-
-# Reduces boot times through caching; required in config/boot.rb
gem "bootsnap", require: false
# Use Sass to process CSS
-# gem "sassc-rails"
+gem "sassc-rails"
+gem "haml-rails", "~> 2.0"
+gem 'html2haml'
# Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
# gem "image_processing", "~> 1.2"
+gem "passenger" , "6.0.15" , require: "phusion_passenger/rack_handler"
+
group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
gem "debug", platforms: %i[ mri mingw x64_mingw ]
diff --git a/Gemfile.lock b/Gemfile.lock
index e3eb14b..e25bd79 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -88,8 +88,24 @@ GEM
irb (>= 1.5.0)
reline (>= 0.3.1)
erubi (1.12.0)
+ erubis (2.7.0)
+ ffi (1.16.3)
globalid (1.2.1)
activesupport (>= 6.1)
+ haml (6.2.3)
+ temple (>= 0.8.2)
+ thor
+ tilt
+ haml-rails (2.1.0)
+ actionpack (>= 5.1)
+ activesupport (>= 5.1)
+ haml (>= 4.0.6)
+ railties (>= 5.1)
+ html2haml (2.3.0)
+ erubis (~> 2.7.0)
+ haml (>= 4.0)
+ nokogiri (>= 1.6.0)
+ ruby_parser (~> 3.5)
i18n (1.14.1)
concurrent-ruby (~> 1.0)
importmap-rails (1.2.1)
@@ -99,9 +115,6 @@ GEM
irb (1.8.3)
rdoc
reline (>= 0.3.8)
- jbuilder (2.11.5)
- actionview (>= 5.0.0)
- activesupport (>= 5.0.0)
loofah (2.21.4)
crass (~> 1.0.2)
nokogiri (>= 1.12.0)
@@ -128,11 +141,12 @@ GEM
nio4r (2.5.9)
nokogiri (1.15.4-x86_64-linux)
racc (~> 1.4)
+ passenger (6.0.15)
+ rack
+ rake (>= 0.8.1)
psych (5.1.1.1)
stringio
public_suffix (5.0.3)
- puma (5.6.7)
- nio4r (~> 2.0)
racc (1.7.1)
rack (2.2.8)
rack-test (2.1.0)
@@ -172,11 +186,22 @@ GEM
reline (0.3.9)
io-console (~> 0.5)
rexml (3.2.6)
+ ruby_parser (3.20.3)
+ sexp_processor (~> 4.16)
rubyzip (2.3.2)
+ sassc (2.4.0)
+ ffi (~> 1.9)
+ sassc-rails (2.1.2)
+ railties (>= 4.0.0)
+ sassc (>= 2.0)
+ sprockets (> 3.0)
+ sprockets-rails
+ tilt
selenium-webdriver (4.14.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2, < 3.0)
websocket (~> 1.0)
+ sexp_processor (4.17.0)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
@@ -185,17 +210,13 @@ GEM
activesupport (>= 5.2)
sprockets (>= 3.0.0)
sqlite3 (1.6.7-x86_64-linux)
- stimulus-rails (1.3.0)
- railties (>= 6.0.0)
stringio (3.0.8)
tailwindcss-rails (2.0.31-x86_64-linux)
railties (>= 6.0.0)
+ temple (0.10.3)
thor (1.3.0)
+ tilt (2.3.0)
timeout (0.4.0)
- turbo-rails (1.5.0)
- actionpack (>= 6.0.0)
- activejob (>= 6.0.0)
- railties (>= 6.0.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
web-console (4.2.1)
@@ -218,21 +239,20 @@ DEPENDENCIES
bootsnap
capybara
debug
+ haml-rails (~> 2.0)
+ html2haml
importmap-rails
- jbuilder
- puma (~> 5.0)
+ passenger (= 6.0.15)
rails (~> 7.0.8)
+ sassc-rails
selenium-webdriver
sprockets-rails
sqlite3 (~> 1.4)
- stimulus-rails
tailwindcss-rails
- turbo-rails
- tzinfo-data
web-console
RUBY VERSION
- ruby 3.0.4p208
+ ruby 3.1.3p185
BUNDLED WITH
2.3.26
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
deleted file mode 100644
index 7cf3bf9..0000000
--- a/app/views/layouts/application.html.erb
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
- WonderOfLife
-
- <%= csrf_meta_tags %>
- <%= csp_meta_tag %>
- <%= stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload" %>
-
- <%= stylesheet_link_tag "application", "data-turbo-track": "reload" %>
- <%= javascript_importmap_tags %>
-
-
-
-
- <%= yield %>
-
-
-
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
new file mode 100644
index 0000000..3845419
--- /dev/null
+++ b/app/views/layouts/application.html.haml
@@ -0,0 +1,14 @@
+!!!
+%html
+ %head
+ %meta{:content => "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
+ %title WonderOfLife
+ %meta{:content => "width=device-width,initial-scale=1", :name => "viewport"}/
+ = csrf_meta_tags
+ = csp_meta_tag
+ = stylesheet_link_tag "tailwind", "inter-font", "data-turbo-track": "reload"
+ = stylesheet_link_tag "application", "data-turbo-track": "reload"
+ = javascript_importmap_tags
+ %body
+ %main.container.mx-auto.mt-28.px-5.flex
+ = yield