There’s a whole lot more you can do in Fizzy. In the video below 37signals founder and CEO, Jason Fried, will walk you through the basics in just 8 minutes.
HTML
- playground.cards.create! creator: creator, title: "Grab the invite link to invite someone else", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Now, grab the invite link to invite someone else", status: "published", description: <<~HTML
Open Fizzy menu, select “+ Add people”, then copy the invite link. You can give this link to someone else so they can make an login for themselves in your account.
HTML
- playground.cards.create! creator: creator, title: "Head back home to check out activity", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Then, head back home to check out activity", status: "published", description: <<~HTML
Hit “1” or pull down the Fizzy menu and select “Home”.
HTML
- playground.cards.create! creator: creator, title: "Check out all cards assigned to you", status: "published", description: <<~HTML
-
Pull down the Fizzy menu at the top of the screen, and select “Assigned to me” or just hit “3” on your keyboard any time.
+ playground.cards.create! creator: creator, title: "Now,check out all cards assigned to you", status: "published", description: <<~HTML
+
Pull down the Fizzy menu at the top of the screen, and select “Assigned to me” or just hit “2” on your keyboard any time.
HTML
- playground.cards.create! creator: creator, title: "Open the Fizzy menu", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Then, open the Fizzy menu", status: "published", description: <<~HTML
The Fizzy menu is how you get around the app. Click “Fizzy” at the top of the screen or hit the “J” key on your keyboard to pop it open.
HTML
- playground.cards.create! creator: creator, title: "Assign this card to yourself", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Next, assign this card to yourself", status: "published", description: <<~HTML
Click the little head with the + next to it, pick yourself.
HTML
- playground.cards.create! creator: creator, title: "Tag this card “Design” then move it to YES", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Now, tag this card “Design” then move it to YES", status: "published", description: <<~HTML
Click the little Tag icon, type “design”, then “Create tag”. Then, move the card to the new “YES” column you created in the previous step.
HTML
- playground.cards.create! creator: creator, title: "Make two more columns", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Next, make two more columns", status: "published", description: <<~HTML
Make one called "Yes"
Make another called "Working on"
@@ -86,13 +86,13 @@ class Account::Seeder
HTML
- playground.cards.create! creator: creator, title: "Move this card to NOT NOW", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "Second, move this card to NOT NOW", status: "published", description: <<~HTML
You can either select “NOT NOW” over in the sidebar, or you can go back out to the board view and drag this card into the “NOT NOW” column on the left side.
HTML
- playground.cards.create! creator: creator, title: "Rename this card", status: "published", description: <<~HTML
+ playground.cards.create! creator: creator, title: "First, rename this card", status: "published", description: <<~HTML
Click the title and you can rename the card, change the description, or add more information to the card.
Then, hit "Mark as Done" at the bottom of the card.
diff --git a/app/models/board.rb b/app/models/board.rb
index 9e259d652..71ff693fb 100644
--- a/app/models/board.rb
+++ b/app/models/board.rb
@@ -1,5 +1,5 @@
class Board < ApplicationRecord
- include AutoPostponing, Accessible, Broadcastable, Cards, Entropic, Filterable, Publishable, Triageable
+ include Accessible, AutoPostponing, Broadcastable, Cards, Entropic, Filterable, Publishable, Triageable
belongs_to :creator, class_name: "User", default: -> { Current.user }
diff --git a/app/models/board/accessible.rb b/app/models/board/accessible.rb
index 6d62c0b21..75b2e982e 100644
--- a/app/models/board/accessible.rb
+++ b/app/models/board/accessible.rb
@@ -45,6 +45,7 @@ module Board::Accessible
mentions_for_user(user).destroy_all
notifications_for_user(user).destroy_all
+ watches_for(user).destroy_all
end
def watchers
@@ -89,4 +90,8 @@ module Board::Accessible
(notifications.source_type = 'Event' AND events.eventable_type = 'Comment' AND event_comment_cards.board_id = ?)",
id, id)
end
+
+ def watches_for(user)
+ Watch.where(card: cards, user: user)
+ end
end
diff --git a/app/models/card.rb b/app/models/card.rb
index 65c7cab18..859f4b1a7 100644
--- a/app/models/card.rb
+++ b/app/models/card.rb
@@ -1,6 +1,6 @@
class Card < ApplicationRecord
- include Assignable, Attachments, Broadcastable, Closeable, Colored, Entropic,
- Eventable, Golden, Mentions, Multistep, Pinnable, Postponable, Promptable,
+ include Assignable, Attachments, Closeable, Colored, Entropic, Eventable,
+ Golden, Mentions, Multistep, Pinnable, Postponable, Promptable,
Readable, Searchable, Stallable, Statuses, Taggable, Triageable, Watchable
belongs_to :board, touch: true
diff --git a/app/models/card/broadcastable.rb b/app/models/card/broadcastable.rb
deleted file mode 100644
index aa24b776c..000000000
--- a/app/models/card/broadcastable.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Card::Broadcastable
- extend ActiveSupport::Concern
-
- included do
- broadcasts_refreshes
- end
-end
diff --git a/app/models/card/mentions.rb b/app/models/card/mentions.rb
index cb3a34f17..3ce74726b 100644
--- a/app/models/card/mentions.rb
+++ b/app/models/card/mentions.rb
@@ -7,5 +7,9 @@ module Card::Mentions
def mentionable?
published?
end
+
+ def should_check_mentions?
+ saved_change_to_status? && published?
+ end
end
end
diff --git a/app/models/concerns/mentions.rb b/app/models/concerns/mentions.rb
index 055c114fc..df8563ba3 100644
--- a/app/models/concerns/mentions.rb
+++ b/app/models/concerns/mentions.rb
@@ -19,20 +19,6 @@ module Mentions
private
def scan_mentionees
- mentionees_from_plain_text | mentionees_from_rich_text
- end
-
- def mentionees_from_plain_text
- scan_mentioned_handles.filter_map do |mention|
- mentionable_users.find { |user| user.mentionable_handles.include?(mention) }
- end
- end
-
- def scan_mentioned_handles
- mentionable_content.scan(/(?(value) { value.strip.downcase }
+ normalizes :email_address, with: ->(value) { value.strip.downcase.presence }
def send_magic_link
magic_links.create!.tap do |magic_link|
diff --git a/app/models/notifier/card_event_notifier.rb b/app/models/notifier/card_event_notifier.rb
index 570989566..6179a4404 100644
--- a/app/models/notifier/card_event_notifier.rb
+++ b/app/models/notifier/card_event_notifier.rb
@@ -8,7 +8,7 @@ class Notifier::CardEventNotifier < Notifier
when "card_assigned"
source.assignees.excluding(creator)
when "card_published"
- board.watchers.without(creator, *card.mentionees)
+ board.watchers.without(creator, *card.mentionees).including(*card.assignees).uniq
when "comment_created"
card.watchers.without(creator, *source.eventable.mentionees)
else
diff --git a/app/models/user/day_timeline.rb b/app/models/user/day_timeline.rb
index 367eccdcb..a5f98cb8a 100644
--- a/app/models/user/day_timeline.rb
+++ b/app/models/user/day_timeline.rb
@@ -29,6 +29,18 @@ class User::DayTimeline
day.yesterday.beginning_of_day
end
+ def added_column
+ @added_column ||= build_column("Added", 1, events.where(action: %w[card_published card_reopened]))
+ end
+
+ def updated_column
+ @updated_column ||= build_column("Updated", 2, events.where.not(action: %w[card_published card_closed card_reopened]))
+ end
+
+ def closed_column
+ @closed_column ||= build_column("Closed", 3, events.where(action: "card_closed"))
+ end
+
def cache_key
ActiveSupport::Cache.expand_cache_key [ user, filter, day.to_date, events ], "day-timeline"
end
@@ -70,6 +82,10 @@ class User::DayTimeline
filtered_events.where(created_at: ...day.beginning_of_day).chronologically.last
end
+ def build_column(base_title, index, events)
+ Column.new(self, base_title, index, events)
+ end
+
def window
day.all_day
end
diff --git a/app/models/user/day_timeline/column.rb b/app/models/user/day_timeline/column.rb
new file mode 100644
index 000000000..fe42c68dc
--- /dev/null
+++ b/app/models/user/day_timeline/column.rb
@@ -0,0 +1,42 @@
+class User::DayTimeline::Column
+ include ActionView::Helpers::TagHelper, ActionView::Helpers::OutputSafetyHelper, TimeHelper
+
+ attr_reader :index
+
+ def initialize(day_timeline, base_title, index, events)
+ @day_timeline = day_timeline
+ @base_title = base_title
+ @index = index
+ @events = events
+ end
+
+ def title
+ date_tag = local_datetime_tag(day_timeline.day, style: :agoorweekday)
+ parts = [ base_title, date_tag ]
+ parts << tag.span("(#{full_events_count})", class: "font-weight-normal") if full_events_count > 0
+ safe_join(parts, " ")
+ end
+
+ def events_by_hour
+ limited_events.group_by { it.created_at.hour }
+ end
+
+ def has_more_events?
+ limited_events.count < full_events_count
+ end
+
+ def hidden_events_count
+ full_events_count - limited_events.count
+ end
+
+ private
+ attr_reader :base_title, :day_timeline, :events
+
+ def limited_events
+ @limited_events ||= events.limit(100).load
+ end
+
+ def full_events_count
+ @full_events_count ||= events.count
+ end
+end
diff --git a/app/models/user/role.rb b/app/models/user/role.rb
index a327ffcf6..e12bf0191 100644
--- a/app/models/user/role.rb
+++ b/app/models/user/role.rb
@@ -18,7 +18,7 @@ module User::Role
admin? || other == self
end
- def can_administer?(other = nil)
+ def can_administer?(other)
admin? && other != self
end
diff --git a/app/views/account/join_codes/edit.html.erb b/app/views/account/join_codes/edit.html.erb
index de53bf8c8..14958a44c 100644
--- a/app/views/account/join_codes/edit.html.erb
+++ b/app/views/account/join_codes/edit.html.erb
@@ -2,8 +2,11 @@
<% content_for :header do %>
- <%= link_to account_join_code_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
- ← Invite link
+ <%= link_to account_join_code_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+
+ Back to Invite link
+ ←
+
<% end %>
<% end %>
diff --git a/app/views/account/join_codes/show.html.erb b/app/views/account/join_codes/show.html.erb
index f3142b091..c528bb07d 100644
--- a/app/views/account/join_codes/show.html.erb
+++ b/app/views/account/join_codes/show.html.erb
@@ -2,8 +2,11 @@
<% content_for :header do %>
- <%= link_to account_settings_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.esc@document->hotkey#click" } do %>
- ← Account Settings
+ <%= link_to account_settings_path, class: "btn borderless txt-medium", data: { controller: "hotkey", action: "keydown.left@document->hotkey#click" } do %>
+
+ Back to Account Settings
+ ←
+
<% end %>
- <%= button_to account_join_code_path, method: :delete, class: "btn btn--circle txt-small", data: {
- turbo_confirm: "Are you sure you want to generate a new link? The previous code will stop working." } do %>
- <%= icon_tag "refresh" %>
- Generate a new code
+
+ <% if Current.user.admin? %>
+ <%= button_to account_join_code_path, method: :delete, class: "btn btn--circle txt-small", data: {
+ turbo_confirm: "Are you sure you want to generate a new link? The previous code will stop working." } do %>
+ <%= icon_tag "refresh" %>
+ Generate a new code
+ <% end %>
<% end %>
@@ -59,8 +65,10 @@
This code has been used <%= @join_code.usage_count %>/<%= @join_code.usage_limit %> times
(<%= @join_code.active? ? @join_code.usage_limit - @join_code.usage_count : "none" %> remaining)
- <%= link_to edit_account_join_code_path, class: @join_code.active? ? "txt-link" : "txt-negative txt-underline" do %>
- Change limit
+ <% if Current.user.admin? %>
+ <%= link_to edit_account_join_code_path, class: @join_code.active? ? "txt-link" : "txt-negative txt-underline" do %>
+ Change limit
+ <% end %>
<% end %>
diff --git a/app/views/account/settings/_entropy.html.erb b/app/views/account/settings/_entropy.html.erb
index f6056ab37..11ff9b326 100644
--- a/app/views/account/settings/_entropy.html.erb
+++ b/app/views/account/settings/_entropy.html.erb
@@ -4,5 +4,5 @@
Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not Now” without activity for specific period of time. This is the default, global setting — you can override it on each board.
<% end %>
@@ -19,10 +19,10 @@
controller: "form boards-form",
boards_form_self_removal_prompt_message_value: "Are you sure you want to remove yourself from this board? You won’t be able to get back in unless someone invites you.",
action: "turbo:submit-start->boards-form#submitWithWarning" } do |form| %>
- <%= render "boards/edit/name", form: form %>
+ <%= render "boards/edit/name", form: form, board: @board %>
<%= render "boards/edit/users", board: @board, selected_users: @selected_users, unselected_users: @unselected_users, form: form %>
-
diff --git a/app/views/boards/edit/_auto_close.html.erb b/app/views/boards/edit/_auto_close.html.erb
index d903ddacd..2e4dc55a2 100644
--- a/app/views/boards/edit/_auto_close.html.erb
+++ b/app/views/boards/edit/_auto_close.html.erb
@@ -2,6 +2,6 @@
Auto close
Fizzy doesn’t let stale cards stick around forever. Cards automatically close as “Not now” if no one updates, comments, or moves a card for…