Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ gem "rails_admin", "~> 3.0"
gem "rake", "~> 13.0"
gem "puma", "~> 7.0"
gem "sprockets", "~> 4.0"
gem "importmap-rails"
gem "turbo-rails"

# noise dependencies:

Expand Down
18 changes: 11 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ GEM
drb (2.2.1)
erubi (1.13.1)
ffi (1.17.1)
ffi (1.17.1-aarch64-linux-gnu)
ffi (1.17.1-arm64-darwin)
ffi (1.17.1-x86_64-linux-gnu)
globalid (1.2.1)
Expand All @@ -110,6 +111,10 @@ GEM
icalendar (2.10.2)
ice_cube (~> 0.16)
ice_cube (0.17.0)
importmap-rails (2.2.2)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
io-console (0.8.0)
irb (1.15.0)
pp (>= 0.6.0)
Expand Down Expand Up @@ -139,7 +144,6 @@ GEM
marcel (1.0.4)
method_source (1.1.0)
mini_mime (1.1.5)
mini_portile2 (2.8.8)
minitest (5.26.2)
minitest-rails (8.0.0)
minitest (~> 5.20)
Expand All @@ -156,8 +160,7 @@ GEM
net-smtp (0.5.1)
net-protocol
nio4r (2.7.4)
nokogiri (1.18.9)
mini_portile2 (~> 2.8.2)
nokogiri (1.18.9-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.9-arm64-darwin)
racc (~> 1.4)
Expand Down Expand Up @@ -251,8 +254,7 @@ GEM
actionpack (>= 6.1)
activesupport (>= 6.1)
sprockets (>= 3.0.0)
sqlite3 (2.5.0)
mini_portile2 (~> 2.8.0)
sqlite3 (2.5.0-aarch64-linux-gnu)
sqlite3 (2.5.0-arm64-darwin)
sqlite3 (2.5.0-x86_64-linux-gnu)
stringio (3.1.2)
Expand All @@ -276,8 +278,8 @@ GEM
zeitwerk (2.7.3)

PLATFORMS
aarch64-linux
arm64-darwin
ruby
x86_64-linux

DEPENDENCIES
Expand All @@ -286,6 +288,7 @@ DEPENDENCIES
bootsnap (~> 1.11)
devise (~> 4.8)
icalendar (~> 2.10)
importmap-rails
minitest (~> 5.14)
minitest-rails (~> 8.0.0)
ostruct (~> 0.6)
Expand All @@ -299,9 +302,10 @@ DEPENDENCIES
sassc-rails (~> 2.1)
sprockets (~> 4.0)
sqlite3 (~> 2.0)
turbo-rails

RUBY VERSION
ruby 3.4.7p58

BUNDLED WITH
2.7.2
2.6.9
3 changes: 2 additions & 1 deletion app/assets/config/manifest.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//= link_tree ../images
//= link_directory ../javascripts .js
//= link_directory ../stylesheets .css
//= link_tree ../../javascript .js
//= link_tree ../../../vendor/javascript .js
Empty file removed app/assets/javascripts/about.js
Empty file.
7 changes: 0 additions & 7 deletions app/assets/javascripts/application.js

This file was deleted.

5 changes: 3 additions & 2 deletions app/helpers/application_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,9 @@ def twitter_link person
icon_link "icon-leaf", "@#{v}", v, "http://twitter.com/"
end

def nav_item_link link_label, link_path, method=nil
content_tag :li, link_to(link_label, link_path, method), :class => ('active' if current_page?(link_path))
def nav_item_link link_label, link_path, options={}
link_options = options.is_a?(Hash) ? options : (options ? { method: options } : {})
content_tag :li, link_to(link_label, link_path, link_options), :class => ('active' if current_page?(link_path))
end

def title_or_action
Expand Down
1 change: 1 addition & 0 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
import "@hotwired/turbo-rails"
5 changes: 3 additions & 2 deletions app/views/layouts/application.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
<meta name="description" content="">

<meta name="viewport" content="width=device-width,initial-scale=1">
<%= csrf_meta_tags %>
<%= javascript_importmap_tags %>
<%= stylesheet_link_tag "//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.min.css" %>
<%= stylesheet_link_tag "application", :media => "all" %>
</head>
Expand All @@ -32,7 +34,7 @@
<ul class="nav pull-right">
<% if signed_in? %>
<%= nav_item_link current_member.name, member_path(current_member) %>
<%= nav_item_link "Log out", destroy_member_session_path, method: :delete %>
<%= nav_item_link "Log out", destroy_member_session_path, data: { turbo_method: :delete } %>
<% else %>
<%= nav_item_link "Log in", new_member_session_path %>
<% end %>
Expand All @@ -52,7 +54,6 @@
Seattle Ruby Brigade: Growing the Ruby Community
<small> &nbsp; <a class="muted" href="https://github.com/seattlerb/seattlerb.org">(source code)</a></small>
</footer>
<%= javascript_include_tag 'application' %>
<%= javascript_include_tag '//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js' %>
<%= yield :javascript_footer %>
</body>
Expand Down
4 changes: 4 additions & 0 deletions bin/importmap
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/usr/bin/env ruby

require_relative "../config/application"
require "importmap/commands"
2 changes: 2 additions & 0 deletions config/importmap.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pin "application"
pin "@hotwired/turbo-rails", to: "turbo.min.js"
Loading