Adjust some button stylings and prepare for deployment

Author: maybethee

.github/workflows/fly-deploy.yml

@@ -0,0 +1,18 @@
+# See https://fly.io/docs/app-guides/continuous-deployment-with-github-actions/
+
+name: Fly Deploy
+on:
+  push:
+    branches:
+      - main
+jobs:
+  deploy:
+    name: Deploy app
+    runs-on: ubuntu-latest
+    concurrency: deploy-group    # optional: ensure only one action runs at a time
+    steps:
+      - uses: actions/checkout@v4
+      - uses: superfly/flyctl-actions/setup-flyctl@master
+      - run: flyctl deploy --remote-only
+        env:
+          FLY_API_TOKEN: ${{ secrets.FLY_API_TOKEN }}

Dockerfile

@@ -42,7 +42,13 @@ FROM base
 
 # Install packages needed for deployment
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y curl libvips postgresql-client && \
+    apt-get install --no-install-recommends -y \
+      curl \
+      libvips \
+      postgresql-client \
+      libjemalloc2 \
+      libffi-dev \
+      libyaml-dev && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
 # Copy built artifacts: gems, application

Gemfile

@@ -76,3 +76,5 @@ group :test do
 end
 
 gem "devise", "~> 4.9"
+
+gem "dockerfile-rails", ">= 1.7", :group => :development

Gemfile.lock

@@ -113,6 +113,8 @@ GEM
       responders
       warden (~> 1.2.3)
     diff-lcs (1.5.1)
+    dockerfile-rails (1.7.3)
+      rails (>= 3.0.0)
     drb (2.2.1)
     erubi (1.12.0)
     factory_bot (6.4.6)
@@ -330,6 +332,7 @@ DEPENDENCIES
   database_cleaner-active_record
   debug
   devise (~> 4.9)
+  dockerfile-rails (>= 1.7)
   factory_bot_rails
   guard
   guard-rspec

app/assets/stylesheets/global.css

@@ -60,7 +60,8 @@ body {
 
 a {
   text-decoration: none;
-  color: inherit;
+  font-size: 0.8rem;
+  color: gray;
   transition: color 0.2s;
 }
 

app/assets/stylesheets/post.css

@@ -79,6 +79,13 @@ article section button {
   color: white;
 }
 
+article section button:nth-child(2) {
+  background-color: #dc3545;
+  color: white;
+  border-radius: 4px;
+  padding: 8px 12px;
+}
+
 article section button:hover {
   background-color: #0056b3;
 }

app/assets/stylesheets/profile.css

@@ -35,13 +35,26 @@
 .delete-post-button {
   background-color: #dc3545;
   color: white;
+  border-radius: 4px;
+  padding: 8px 12px;
+}
+
+.post-likes button {
+  padding: 4px 7px;
+}
+
+.post-comments-comments button {
+  background-color: #dc3545;
+  color: white;
+  border-radius: 4px;
+  padding: 6px 8px;
 }
 
 .delete-post-button:hover {
   background-color: #c82333;
 }
 
-/* Edit form styling */
+/* edit form styling */
 .profile-form {
   max-width: 600px;
   margin: 0 auto;

app/assets/stylesheets/users.css

@@ -56,6 +56,16 @@
   margin-top: 15px;
 }
 
+.user-actions button {
+  padding: 8px 12px;
+  border-radius: 4px;
+  transition: background-color 0.2s;
+}
+
+.user-actions button:hover {
+  background-color: #dedede;
+}
+
 .user-stats {
   display: flex;
   flex-direction: column;

app/views/posts/index.html.erb

@@ -1,6 +1,3 @@
-
-
-
 <h1>Dashboard</h1>
 
 <div class="new-post-button">
@@ -38,8 +35,5 @@
       <h4>Comments:</h4>
       <%= render "comments", post: post %>
     </section>
-
-    <!-- Divider -->
-    <hr class="post-divider">
   </article>
 <% end %>

app/views/posts/show.html.erb

@@ -1,5 +1,3 @@
-
-<%# Posts should always display the post content, author, comments, and likes. %>
 <article class="user-post">
   <header>
     <h4>

app/views/profiles/_follow_button.html.erb

@@ -1,4 +1,3 @@
-
 <%= turbo_frame_tag(dom_id(user)) do %>
   <% if following?(user) %>
       <%= button_to 'Unfollow', unfollow_user_profile_path(user_id: user.id), method: :delete %>

app/views/profiles/_follower_count.html.erb

@@ -1,4 +1,3 @@
-
 <%= turbo_frame_tag "#{user.id}-follower-count" do  %>
   <div>
     <%= pluralize(user.passive_relationships.count, "follower") %>

app/views/profiles/show.html.erb

@@ -1,5 +1,3 @@
-
-
 <% if @user == current_user %>
   <div class="profile-actions">
     <%= link_to "Edit Profile", edit_user_profile_path(current_user), class: "button-link" %>
@@ -45,8 +43,10 @@
 
       <div class="post-comments">
         <%= render "posts/comment_form", post: post, source_view: 'index' %>
-        <h4>Comments:</h4>
-        <%= render "posts/comments", post: post %>
+        <div class="post-comments-comments">
+          <h4>Comments:</h4>
+          <%= render "posts/comments", post: post %>
+        </div>
       </div>
     </div>
     <hr>

config/dockerfile.yml

@@ -0,0 +1,8 @@
+# generated by dockerfile-rails
+
+---
+options:
+  label:
+    fly_launch_runtime: rails
+  postgresql: true
+  prepare: false

config/environments/production.rb

@@ -1,4 +1,4 @@
-require "active_support/core_ext/integer/time"
+require 'active_support/core_ext/integer/time'
 
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
@@ -53,16 +53,16 @@
 
   # Log to STDOUT by default
   config.logger = ActiveSupport::Logger.new(STDOUT)
-    .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
-    .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
+                                       .tap  { |logger| logger.formatter = ::Logger::Formatter.new }
+                                       .then { |logger| ActiveSupport::TaggedLogging.new(logger) }
 
   # Prepend all log lines with the following tags.
-  config.log_tags = [ :request_id ]
+  config.log_tags = [:request_id]
 
   # "info" includes generic and useful information about system operation, but avoids logging too much
   # information to avoid inadvertent exposure of personally identifiable information (PII). If you
   # want to log everything, set the level to "debug".
-  config.log_level = ENV.fetch("RAILS_LOG_LEVEL", "info")
+  config.log_level = ENV.fetch('RAILS_LOG_LEVEL', 'info')
 
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
@@ -72,6 +72,8 @@
   # config.active_job.queue_name_prefix = "odinbook_production"
 
   config.action_mailer.perform_caching = false
+  config.action_mailer.perform_deliveries = false
+  config.action_mailer.delivery_method = :test
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.

fly.toml

@@ -0,0 +1,42 @@
+# fly.toml app configuration file generated for frendo on 2025-01-31T08:47:28-05:00
+#
+# See https://fly.io/docs/reference/configuration/ for information about how to use this file.
+#
+
+app = 'frendo'
+primary_region = 'ewr'
+console_command = '/rails/bin/rails console'
+
+[build]
+
+[deploy]
+  release_command = './bin/rails db:prepare'
+
+[http_service]
+  internal_port = 3000
+  force_https = true
+  auto_stop_machines = 'stop'
+  auto_start_machines = true
+  min_machines_running = 0
+  processes = ['app']
+
+  [[http_service.checks]]
+    interval = '10s'
+    timeout = '2s'
+    grace_period = '5s'
+    method = 'GET'
+    path = '/up'
+    protocol = 'http'
+    tls_skip_verify = false
+
+    [http_service.checks.headers]
+      X-Forwarded-Proto = 'https'
+
+[[vm]]
+  memory = '1gb'
+  cpu_kind = 'shared'
+  cpus = 1
+
+[[statics]]
+  guest_path = '/rails/public'
+  url_prefix = '/'