Skip to content

Commit

Permalink
Merge branch 'app-naming' of github.com:TelosLabs/rails-world into ap…
Browse files Browse the repository at this point in the history
…p-naming
  • Loading branch information
andresag4 committed Sep 20, 2024
2 parents 599728b + 3efa127 commit c25a6a3
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +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
ONLY_TESTER_REGISTRATION_ENABLED=false
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

## About

- Ruby on Rails 7.1.x
- Ruby on Rails 7.2.x
- Ruby 3.3.x
- SQLite3
- SolidQueue
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/concerns/authentication.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ def authenticate_user
def authenticate_user!
authenticate_user

if !user_signed_in?
unless user_signed_in?
flash[:notice] = I18n.t("authentication.unauthenticated")
redirect_to new_user_session_path
redirect_to Rails.application.routes.url_helpers.new_user_session_path
end
end

Expand Down
2 changes: 1 addition & 1 deletion app/views/layouts/_flash_message.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%# locals: (message:) %>

<div class="flex flex-col items-center justify-center fixed bottom-[64px] w-full z-30 px-5">
<div class="flex flex-col items-center justify-center fixed bottom-[64px] pb-safe-area-1 w-full z-30 px-5">
<div data-controller="closable" class="bg-black/70 shadow-simple backdrop-blur-[25px] rounded-lg px-5 py-4 transition-all bottom-0 max-w-screen-sm text-white z-20 sticky">
<%= message %>
</div>
Expand Down
4 changes: 2 additions & 2 deletions app/views/profiles/edit.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
accept:"image/*,image/apng,image/avif,image/gif,image/gif,image/jpeg,image/png,image/svg+xml",
class: "text-white border-2 border-white bg-transparent rounded-sm hidden mb-6 focus:outline-none focus:outline-0 focus:ring-0 focus:border-2 focus:border-white active:border-2 active:border-white"
) %>
<% if @profile.image.present? %>
<% if @profile.image.present? && @profile.image.persisted? %>
<%= image_tag @profile.image, data: {image_previewer_target: "hideOnLoad"}, class: "absolute object-cover h-full w-full" %>
<% else %>
<%= image_tag url_for("camera.svg"), data: {image_previewer_target: "hideOnLoad"} %>
Expand All @@ -35,7 +35,7 @@
"icon_delete_photo.svg",
data: {action: "click->image-previewer#removeImage", image_previewer_target: "deleteIcon" },
class: "cursor-pointer absolute top-[5px] right-[5px] w-6 h-6",
style: @profile.image.present? ? "display:block;" : "display:none;"
style: @profile.image.present? && @profile.image.persisted? ? "display:block;" : "display:none;"
) %>
<div class="hidden" data-image-previewer-target="onRemoveImageContainer"></div>
<template data-image-previewer-target="onRemoveImagePlaceholderTemplate">
Expand Down

0 comments on commit c25a6a3

Please sign in to comment.