Merge branch 'main' into 64-undo-functionality-in-flash-messages

.env.template

@@ -6,3 +6,4 @@ RSPEC_RETRY_RETRY_COUNT=0
 MAILER_SENDER="Rails World <hello@teloslabs.co>"
 REGISTRATION_ENABLED=true
 SESSION_REMINDERS_ENABLED=true
+ONLY_TESTER_REGISTRATION_ENABLED=false

Gemfile.lock

@@ -625,6 +625,7 @@ PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
   arm64-darwin-23
+  arm64-darwin-24
   x86_64-linux
 
 DEPENDENCIES

app/assets/stylesheets/actiontext.css

@@ -29,3 +29,9 @@
   padding: 0 !important;
   max-width: 100% !important;
 }
+
+.trix-content a {
+  color: #CB0C1C;
+  font-weight: 400;
+  text-decoration: underline;
+}

app/assets/stylesheets/application.tailwind.css

@@ -1,9 +1,9 @@
+@import 'actiontext.css';
+
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import 'actiontext.css';
-
 @layer base {
   ul, ol {
     @apply block ml-4
@@ -58,3 +58,40 @@ div.field_with_errors > input {
     @apply px-0;
   }
 }
+
+/* Utility classes for iOS PWA support */
+.pt-safe-area-6 {
+  padding-top: calc(env(safe-area-inset-top) + 24px)
+}
+
+.pt-safe-area-2 {
+  padding-top: calc(env(safe-area-inset-top) + 8px)
+}
+
+.pb-safe-area-1 {
+  padding-bottom: calc(env(safe-area-inset-bottom) + 4px);
+}
+
+.pt-safe-area-back-button {
+  padding-top: calc(env(safe-area-inset-top) + 40px);
+}
+
+.pt-safe-area-header {
+  padding-top: calc(env(safe-area-inset-top) + 79px);
+}
+
+.pb-safe-area-bottom-navbar {
+  padding-bottom: calc(env(safe-area-inset-bottom) + 54px);
+}
+
+.top-safe-area-header {
+  top: calc(env(safe-area-inset-top) + 79px);
+}
+
+.top-safe-area-with-filters {
+  top: calc(env(safe-area-inset-top) + 245px);
+}
+
+.top-safe-area-no-filters {
+  top: calc(env(safe-area-inset-top) + 212px);
+}

app/avo/resources/conference.rb

@@ -10,7 +10,7 @@ class Avo::Resources::Conference < Avo::BaseResource
 
   def fields
     field :id, as: :id
-    field :name, as: :text
+    field :name, as: :text, link_to_record: true
     field :locations, as: :has_many
     field :sessions, as: :has_many
   end

app/avo/resources/location.rb

@@ -10,7 +10,7 @@ class Avo::Resources::Location < Avo::BaseResource
 
   def fields
     field :id, as: :id
-    field :name, as: :text, sortable: true
+    field :name, as: :text, sortable: true, link_to_record: true
     field :conference, as: :belongs_to
     field :sessions, as: :has_many
   end

app/avo/resources/session.rb

@@ -18,9 +18,10 @@ class Avo::Resources::Session < Avo::BaseResource
 
   def fields
     field :id, as: :id
-    field :title, as: :text, sortable: true
+    field :title, as: :text, sortable: true, link_to_record: true
     field :slug, as: :text, hide_on: :new
     field :description, as: :trix
+    field :public, as: :boolean
     field :starts_at, as: :date_time,
       help: "The datetime field will use your browser's current timezone.", sortable: true,
       format: "FFFF"

app/avo/resources/speaker.rb

@@ -18,8 +18,8 @@ class Avo::Resources::Speaker < Avo::BaseResource
 
   def fields
     field :id, as: :id
+    field :name, as: :text, sortable: -> { query.order("profiles.name #{direction}") }, link_to_record: true
     field :slug, as: :text, hide_on: :new
-    field :name, as: :text, sortable: -> { query.order("profiles.name #{direction}") }
     field :image, as: :file, accept: "image/*", only_on: [:show, :forms]
     field :image_presence, name: "Image", as: :boolean, only_on: :index do
       record.image.attached?

app/avo/resources/tag.rb

@@ -10,7 +10,7 @@ class Avo::Resources::Tag < Avo::BaseResource
 
   def fields
     field :id, as: :id
-    field :name, as: :text, sortable: true
+    field :name, as: :text, sortable: true, link_to_record: true
     field :sessions, as: :has_and_belongs_to_many
   end
 end

app/avo/resources/user.rb

@@ -13,7 +13,7 @@ class Avo::Resources::User < Avo::BaseResource
 
   def fields
     field :id, as: :id
-    field :email, as: :text, sortable: true
+    field :email, as: :text, sortable: true, link_to_record: true
     field :role, as: :select, options: User.roles, include_blank: true, sortable: true, default: "user"
     field :password, as: :password, only_on: :new
     field :password_confirmation, as: :password, only_on: :new

app/constraints/authenticated_constraint.rb

@@ -0,0 +1,5 @@
+class AuthenticatedConstraint
+  def matches?(request)
+    request.session[:user_id].present?
+  end
+end

app/constraints/unauthenticated_constraint.rb

@@ -0,0 +1,5 @@
+class UnauthenticatedConstraint
+  def matches?(request)
+    request.session[:user_id].nil?
+  end
+end

app/controllers/abouts_controller.rb

@@ -1,4 +1,5 @@
 class AboutsController < ApplicationController
+  allow_unauthenticated_access
   def show
   end
 end

app/controllers/application_controller.rb

@@ -7,14 +7,24 @@ class ApplicationController < ActionController::Base
 
   helper_method :current_profile, :current_conference, :vapid_public_key
 
+  rescue_from ActionController::InvalidAuthenticityToken,
+    with: :after_invalid_authenticity_token
+
   private
 
   def current_profile = current_user&.profile
 
-  # TODO: Must change after implementing multi-conference support
-  def current_conference = Conference.last
+  def current_conference
+    @_current_conference ||= Conference.last
+  end
 
   def vapid_public_key
-    Base64.urlsafe_decode64(ENV["VAPID_PUBLIC_KEY"]).bytes.to_json
+    @_vapid_public_key ||= Base64.urlsafe_decode64(ENV["VAPID_PUBLIC_KEY"]).bytes.to_json
+  end
+
+  def after_invalid_authenticity_token
+    path_to_redirect = request.referer
+    path_to_redirect ||= user_signed_in? ? sessions_path : new_user_session_path
+    redirect_to path_to_redirect, alert: t("authorization.invalid_auth_token")
   end
 end

app/controllers/concerns/authentication.rb

@@ -27,6 +27,7 @@ def authenticate_user!
     authenticate_user
 
     if !user_signed_in?
+      flash[:notice] = I18n.t("authentication.unauthenticated")
       redirect_to new_user_session_path
     end
   end

app/controllers/schedules_controller.rb

@@ -3,12 +3,12 @@ def show
     @sessions = SessionQuery.new(
       relation: current_user.sessions.where(conference: current_conference),
       params: filter_params
-    ).call.includes(:attendees, :location, :speakers, :tags).order(:starts_at)
+    ).call.includes(:location, :tags, speakers: [profile: :image_attachment]).order(:starts_at)
   end
 
   private
 
   def filter_params
-    params.permit(:starts_at, :live, :past, :starting_soon)
+    params.permit(:starts_at, :live, :past, :starting_soon).merge(show_private: user_signed_in?)
   end
 end

app/controllers/service_worker_controller.rb

@@ -8,4 +8,7 @@ def service_worker
 
   def manifest
   end
+
+  def offline
+  end
 end

app/controllers/sessions_controller.rb

@@ -1,23 +1,30 @@
 class SessionsController < ApplicationController
+  allow_unauthenticated_access
+
   def index
-    @user_session_ids = current_user.sessions.pluck(:id)
+    @user_session_ids = current_user&.sessions&.pluck(:id)
     @sessions = SessionQuery.new(
       relation: sessions.joins(:location).distinct,
       params: filter_params
-    ).call.includes(:attendees, :tags).order(:starts_at)
+    ).call.includes(:location, :tags, speakers: [profile: :image_attachment]).order(:starts_at)
   end
 
   def show
-    @session = sessions.friendly.find(params[:id])
+    @user_session_ids = current_user&.sessions&.pluck(:id) || []
+    @session = if user_signed_in?
+      sessions.friendly.includes(:location, :tags, speakers: [profile: :image_attachment]).find(params[:id])
+    else
+      sessions.publics.friendly.includes(:location, :tags, speakers: [profile: :image_attachment]).find(params[:id])
+    end
   end
 
   private
 
   def sessions
-    current_conference&.sessions
+    Session.where(conference: current_conference)
   end
 
   def filter_params
-    params.permit(:starts_at, :live, :past, :starting_soon)
+    params.permit(:starts_at, :live, :past, :starting_soon).merge(show_private: user_signed_in?)
   end
 end

app/controllers/speakers_controller.rb

@@ -1,4 +1,5 @@
 class SpeakersController < ApplicationController
+  allow_unauthenticated_access only: [:show]
   def show
     @speaker = current_conference.speakers.friendly.find(params[:id])
     @profile = @speaker.profile.presence || Profile.new

app/controllers/users_controller.rb

@@ -0,0 +1,39 @@
+class UsersController < ApplicationController
+  def edit
+  end
+
+  def update
+    if Current.user.update(user_params)
+      redirect_to edit_user_path, notice: t("controllers.users.update.success")
+    else
+      render :edit, status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def permitted_params
+    params.require(:user).permit(
+      :email,
+      :password,
+      :password_confirmation,
+      :password_challenge
+    ).with_defaults(password_challenge: "")
+  end
+
+  def user_params
+    if password_params_blank?
+      {email: permitted_params[:email]}
+    else
+      permitted_params
+    end
+  end
+
+  def password_params_blank?
+    permitted_params.values_at(
+      :password,
+      :password_confirmation,
+      :password_challenge
+    ).all?(&:blank?)
+  end
+end