Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
cancel-in-progress: true

env:
DATABASE_URL: postgres://postgres:postgres@localhost/ruby3_rails8_flowbite_render_development
DATABASE_URL: postgres://postgres:postgres@localhost/ruby4_rails8_flowbite_render_development
RAILS_ENV: test

services:
Expand Down
2 changes: 1 addition & 1 deletion .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins:

AllCops:
TargetRailsVersion: 8.1
TargetRubyVersion: 3.4
TargetRubyVersion: 4.0
NewCops: enable
DisplayStyleGuide: true
ExtraDetails: true
Expand Down
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-3.4.8
ruby-4.0.0
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# check=error=true

# This Dockerfile is designed for production, not development. Use with Kamal or build'n'run by hand:
# docker build -t ruby3_rails8_flowbite_render .
# docker run -d -p 80:80 -e RAILS_MASTER_KEY=<value from config/master.key> --name ruby3_rails8_flowbite_render ruby3_rails8_flowbite_render
# docker build -t ruby4_rails8_flowbite_render .
# docker run -d -p 80:80 -e RAILS_MASTER_KEY=<value from config/master.key> --name ruby4_rails8_flowbite_render ruby4_rails8_flowbite_render

# For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html

# Make sure RUBY_VERSION matches the Ruby version in .ruby-version
ARG RUBY_VERSION=3.4.8
ARG RUBY_VERSION=4.0.0
FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base

# Rails app lives here
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ group :development, :test do
gem 'pry'
gem 'pry-byebug'
gem 'pry-rails'
gem 'readline' # TODO: Remove when deivid-rodriguez/pry-byebug#460 will be fixed
gem 'rspec-rails'
gem 'rubocop', require: false
gem 'rubocop-capybara', require: false
Expand Down
15 changes: 9 additions & 6 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
action_text-trix (2.1.15)
action_text-trix (2.1.16)
railties
actioncable (8.1.1)
actionpack (= 8.1.1)
Expand Down Expand Up @@ -222,13 +222,13 @@ GEM
net-protocol
net-ssh (7.3.0)
nio4r (2.7.5)
nokogiri (1.18.10-aarch64-linux-gnu)
nokogiri (1.19.0-aarch64-linux-gnu)
racc (~> 1.4)
nokogiri (1.18.10-arm64-darwin)
nokogiri (1.19.0-arm64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-darwin)
nokogiri (1.19.0-x86_64-darwin)
racc (~> 1.4)
nokogiri (1.18.10-x86_64-linux-gnu)
nokogiri (1.19.0-x86_64-linux-gnu)
racc (~> 1.4)
openssl (4.0.0)
ostruct (0.6.3)
Expand Down Expand Up @@ -259,7 +259,7 @@ GEM
psych (5.3.1)
date
stringio
public_suffix (7.0.0)
public_suffix (7.0.2)
puma (7.1.0)
nio4r (~> 2.0)
raabro (1.4.0)
Expand Down Expand Up @@ -313,6 +313,8 @@ GEM
erb
psych (>= 4.0.0)
tsort
readline (0.0.4)
reline
regexp_parser (2.11.3)
reline (0.6.3)
io-console (~> 0.5)
Expand Down Expand Up @@ -489,6 +491,7 @@ DEPENDENCIES
puma
rack-mini-profiler
rails (= 8.1.1)
readline
rspec-rails
rubocop
rubocop-capybara
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Rails 8 Starter App
[![Build Status](https://github.com/diowa/ruby3-rails8-flowbite-render/actions/workflows/ci.yml/badge.svg)](https://github.com/diowa/ruby3-rails8-flowbite-render/actions)
[![Code Climate](https://codeclimate.com/github/diowa/ruby3-rails8-flowbite-render/badges/gpa.svg)](https://codeclimate.com/github/diowa/ruby3-rails8-flowbite-render)
[![Coverage Status](https://coveralls.io/repos/github/diowa/ruby3-rails8-flowbite-render/badge.svg?branch=main)](https://coveralls.io/github/diowa/ruby3-rails8-flowbite-render?branch=main)
[![Build Status](https://github.com/diowa/ruby4-rails8-flowbite-render/actions/workflows/ci.yml/badge.svg)](https://github.com/diowa/ruby4-rails8-flowbite-render/actions)
[![Code Climate](https://codeclimate.com/github/diowa/ruby4-rails8-flowbite-render/badges/gpa.svg)](https://codeclimate.com/github/diowa/ruby4-rails8-flowbite-render)
[![Coverage Status](https://coveralls.io/repos/github/diowa/ruby4-rails8-flowbite-render/badge.svg?branch=main)](https://coveralls.io/github/diowa/ruby4-rails8-flowbite-render?branch=main)

[![Deploy to Render](https://render.com/images/deploy-to-render-button.svg)](https://render.com/deploy)

This is an opinionated starter web application based on the following technology stack:

* [Ruby 3.4.8][:ruby-url]
* [Ruby 4.0.0][:ruby-url]
* [Rails 8.1.1][:ruby-on-rails-url]
* [Tailwind CSS 4.1.18][:tailwind-css-url]
* [Flowbite 3.1.2][:flowbite-url]
Expand All @@ -34,6 +34,6 @@ This is an opinionated starter web application based on the following technology
[:stylelint-url]: https://stylelint.io
[:tailwind-css-url]: https://tailwindcss.com/

Starter App is deployable on [Render](https://render.com/). Demo: https://ruby3-rails8-flowbite-render-app.onrender.com/
Starter App is deployable on [Render](https://render.com/). Demo: https://ruby4-rails8-flowbite-render-app.onrender.com/

```Gemfile``` also contains a set of useful gems for performance, security, api building...
4 changes: 2 additions & 2 deletions app/views/pages/home.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<ul class="text-xl flex flex-wrap space-x-2">
<li>
Ruby
<small class="text-gray-600 dark:text-gray-300">3.4.8</small>
<small class="text-gray-600 dark:text-gray-300">4.0.0</small>
</li>
<li>
Rails
<small class="text-gray-600 dark:text-gray-300">8.1.1</small>
</li>
<li>
Tailwind CSS
<small class="text-gray-600 dark:text-gray-300">4.1.16</small>
<small class="text-gray-600 dark:text-gray-300">4.1.18</small>
</li>
<li>
Flowbite
Expand Down
4 changes: 2 additions & 2 deletions app/views/shared/_footer.html.erb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<footer class="max-w-screen-xl mx-auto px-3 pb-3">
<hr class="h-px mb-3 bg-gray-200 border-0 dark:bg-gray-700">
<p>
<%= link_to 'https://github.com/diowa/ruby3-rails8-flowbite-render' do %>
<%= link_to 'https://github.com/diowa/ruby4-rails8-flowbite-render' do %>
<%= inline_svg_tag '@fortawesome--fontawesome-free--svgs--brands--github.svg', class: 'icon' %>
diowa/ruby3-rails8-flowbite-render
diowa/ruby4-rails8-flowbite-render
<%- end %>
</p>
</footer>
6 changes: 3 additions & 3 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ default: &default

development:
<<: *default
database: ruby3_rails8_flowbite_render_development
database: ruby4_rails8_flowbite_render_development

# The specified database role being used to connect to PostgreSQL.
# To create additional roles in PostgreSQL see `$ createuser --help`.
# When left blank, PostgreSQL will use the default role. This is
# the same name as the operating system user running Rails.
#username: ruby3_rails8_flowbite_render
#username: ruby4_rails8_flowbite_render

# The password associated with the PostgreSQL role (username).
#password:
Expand Down Expand Up @@ -56,7 +56,7 @@ development:
# Do not set this db to the same as development or production.
test:
<<: *default
database: ruby3_rails8_flowbite_render_test
database: ruby4_rails8_flowbite_render_test

# As with config/credentials.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is
Expand Down
10 changes: 5 additions & 5 deletions config/deploy.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Name of your application. Used to uniquely configure containers.
service: ruby3_rails8_flowbite_render
service: ruby4_rails8_flowbite_render

# Name of the container image.
image: your-user/ruby3_rails8_flowbite_render
image: your-user/ruby4_rails8_flowbite_render

# Deploy to these servers.
servers:
Expand Down Expand Up @@ -47,7 +47,7 @@ env:
# WEB_CONCURRENCY: 2

# Match this to any external database server to configure Active Record correctly
# Use ruby3_rails8_flowbite_render-db for a db accessory server on same machine via local kamal docker network.
# Use ruby4_rails8_flowbite_render-db for a db accessory server on same machine via local kamal docker network.
# DB_HOST: 192.168.0.2

# Log everything from Rails
Expand All @@ -65,7 +65,7 @@ aliases:
# Use a persistent storage volume for sqlite database files and local Active Storage files.
# Recommended to change this to a mounted volume path that is backed up off server.
volumes:
- "ruby3_rails8_flowbite_render_storage:/rails/storage"
- "ruby4_rails8_flowbite_render_storage:/rails/storage"


# Bridge fingerprinted assets, like JS and CSS, between versions to avoid
Expand All @@ -82,7 +82,7 @@ builder:
#
# # Pass arguments and secrets to the Docker build process
# args:
# RUBY_VERSION: ruby-3.4.8
# RUBY_VERSION: ruby-4.0.0
# secrets:
# - GITHUB_TOKEN
# - RAILS_MASTER_KEY
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
en:
app_name: Rails 8 Starter App
meta_description: An opinionated starter application based on Ruby 3.4, Rails 8.1, Tailwind CSS, and Flowbite
meta_description: An opinionated starter application based on Ruby 4.0, Rails 8.1, Tailwind CSS, and Flowbite
pages:
hello_world:
title: Hello World
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "ruby3_rails8_flowbite_render",
"name": "ruby4_rails8_flowbite_render",
"private": true,
"type": "module",
"version": "1.0.0",
"engines": {
"node": ">= 22.0",
"node": ">= 24.0",
"pnpm": "^10.15.0"
},
"packageManager": "pnpm@10.15.0",
Expand Down
Loading