<% bubble.tags.each do |tag| %>
- <%= link_to "##{tag.title}", bucket_bubbles_path(bubble.bucket, tag_id: tag.id), style: "color: #{bubble.color}" %>
+ <%= link_to "##{tag.title}", bucket_bubbles_path(bubble.bucket, tag_ids: [ tag.id ]), style: "color: #{bubble.color}" %>
<% end %>
<%= tag.time bubble.created_at, class: "txt-nowrap flex-item-justify-end" do %>
diff --git a/app/views/buckets/_bucket.html.erb b/app/views/buckets/_bucket.html.erb
new file mode 100644
index 000000000..5d0b444e4
--- /dev/null
+++ b/app/views/buckets/_bucket.html.erb
@@ -0,0 +1,18 @@
+
+ <%= link_to bucket_bubbles_path(bucket), class: "windshield__container flex justify-center align-center position-relative" do %>
+
+ <% bucket.bubbles.not_popped.ordered_by_activity.limit(10).each do |bubble| %>
+
+ <% end %>
+
+ <%= link_to bucket.name, bucket_bubbles_path(bucket), class: "txt-x-large txt-ink" %>
+
+
diff --git a/app/views/buckets/_view.html.erb b/app/views/buckets/_view.html.erb
new file mode 100644
index 000000000..51a38cc3c
--- /dev/null
+++ b/app/views/buckets/_view.html.erb
@@ -0,0 +1,21 @@
+
+ <%= link_to bucket_bubbles_path(view.bucket, **view.to_bucket_params), class: "windshield__container flex justify-center align-center position-relative" do %>
+
+ <% view.bucket.bubbles.not_popped.ordered_by_activity.limit(10).each do |bubble| %>
+
+ <% end %>
+
+ <%= link_to bucket_bubbles_path(view.bucket, **view.to_bucket_params), class: "txt-ink" do %>
+
<%= view.bucket.name %>
+
<%= view.summary %>
+ <% end %>
+
- <%= form_with model: Comment.new, url: bucket_bubble_comments_path(bubble.bucket, bubble), class: "flex flex-column gap full-width" do |form| %>
+ <%= form_with model: Comment.new, url: bucket_bubble_comments_path(bubble.bucket, bubble), class: "flex flex-column gap full-width", data: { controller: "form", action: "keydown.meta+enter->form#submit" } do |form| %>
<%= form.text_area :body, class: "input", required: true, rows: 4,
placeholder: (bubble.comments.empty? && bubble.creator == Current.user) ? "Add some notes…" : "Type your comment…" %>
diff --git a/config/initializers/extensions.rb b/config/initializers/extensions.rb
new file mode 100644
index 000000000..6fa93d530
--- /dev/null
+++ b/config/initializers/extensions.rb
@@ -0,0 +1,3 @@
+%w[ rails_ext ].each do |extensions_dir|
+ Dir["#{Rails.root}/lib/#{extensions_dir}/*"].each { |path| require "#{extensions_dir}/#{File.basename(path)}" }
+end
diff --git a/config/routes.rb b/config/routes.rb
index 391c1c3e0..7465bc6db 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,31 +2,30 @@ Rails.application.routes.draw do
root "buckets#index"
resource :first_run
-
resource :session
resource :account do
- scope module: "accounts" do
+ scope module: :accounts do
resource :join_code
-
resources :users
end
end
- get "join/:join_code", to: "users#new", as: :join
- post "join/:join_code", to: "users#create"
-
resources :users do
- scope module: "users" do
+ scope module: :users do
resource :avatar
end
end
resources :buckets do
- resource :access, controller: "buckets/accesses"
+ resources :tags, only: :index
+
+ scope module: :buckets do
+ resources :views
+ end
resources :bubbles do
- scope module: "bubbles" do
+ scope module: :bubbles do
resource :image
resource :pop
end
@@ -36,9 +35,9 @@ Rails.application.routes.draw do
resources :comments
resources :tags, shallow: true
end
-
- resources :tags, only: :index
end
+ get "join/:join_code", to: "users#new", as: :join
+ post "join/:join_code", to: "users#create"
get "up", to: "rails/health#show", as: :rails_health_check
end
diff --git a/db/migrate/20241015224007_create_views.rb b/db/migrate/20241015224007_create_views.rb
new file mode 100644
index 000000000..2acea70cd
--- /dev/null
+++ b/db/migrate/20241015224007_create_views.rb
@@ -0,0 +1,11 @@
+class CreateViews < ActiveRecord::Migration[8.0]
+ def change
+ create_table :bucket_views do |t|
+ t.references :creator, null: false
+ t.references :bucket, null: false
+ t.json :filters, default: {}, null: false
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 0218e49b4..8ff1c6132 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
-ActiveRecord::Schema[8.0].define(version: 2024_10_09_211414) do
+ActiveRecord::Schema[8.0].define(version: 2024_10_15_224007) do
create_table "accesses", force: :cascade do |t|
t.integer "bucket_id", null: false
t.integer "user_id", null: false
@@ -80,6 +80,16 @@ ActiveRecord::Schema[8.0].define(version: 2024_10_09_211414) do
t.index ["bucket_id"], name: "index_bubbles_on_bucket_id"
end
+ create_table "bucket_views", force: :cascade do |t|
+ t.integer "creator_id", null: false
+ t.integer "bucket_id", null: false
+ t.json "filters", default: {}, null: false
+ t.datetime "created_at", null: false
+ t.datetime "updated_at", null: false
+ t.index ["bucket_id"], name: "index_bucket_views_on_bucket_id"
+ t.index ["creator_id"], name: "index_bucket_views_on_creator_id"
+ end
+
create_table "buckets", force: :cascade do |t|
t.integer "account_id", null: false
t.integer "creator_id", null: false
diff --git a/lib/rails_ext/active_support_array_conversions.rb b/lib/rails_ext/active_support_array_conversions.rb
new file mode 100644
index 000000000..1c41bee60
--- /dev/null
+++ b/lib/rails_ext/active_support_array_conversions.rb
@@ -0,0 +1,5 @@
+class Array
+ def to_choice_sentence
+ to_sentence two_words_connector: " or ", last_word_connector: ", or "
+ end
+end