Skip to content
Closed
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
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Node.js
uses: actions/setup-node@v4
Expand All @@ -36,7 +36,7 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -51,7 +51,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Ruby
uses: ruby/setup-ruby@v1
Expand All @@ -77,7 +77,7 @@ jobs:
run: sudo apt-get update && sudo apt-get install --no-install-recommends -y build-essential git node-gyp pkg-config python-is-python3 google-chrome-stable

- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Node.js
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
BUNDLE_ONLY: deploy
steps:
- name: Checkout code
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN apt-get update -qq && \
rm -rf /var/lib/apt/lists /var/cache/apt/archives

# Install JavaScript dependencies
ARG NODE_VERSION=22.13.1
ARG NODE_VERSION=22.18.0
ENV PATH=/usr/local/node/bin:$PATH
RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
/tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-ssr
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ RUN apt-get update -qq && \
rm -rf /var/lib/apt/lists /var/cache/apt/archives

# Install JavaScript dependencies
ARG NODE_VERSION=22.13.1
ARG NODE_VERSION=22.18.0
ENV PATH=/usr/local/node/bin:$PATH
RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
/tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
Expand Down
22 changes: 11 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ GEM
ed25519 (1.4.0)
erb (5.0.2)
erubi (1.13.1)
et-orbi (1.2.11)
et-orbi (1.3.0)
tzinfo
factory_bot (6.5.4)
activesupport (>= 6.1.0)
Expand All @@ -133,9 +133,9 @@ GEM
pp (>= 0.6.0)
rdoc (>= 4.0.0)
reline (>= 0.4.2)
jbuilder (2.13.0)
actionview (>= 5.0.0)
activesupport (>= 5.0.0)
jbuilder (2.14.0)
actionview (>= 7.0.0)
activesupport (>= 7.0.0)
js-routes (2.3.5)
railties (>= 5)
sorbet-runtime
Expand Down Expand Up @@ -268,7 +268,7 @@ GEM
rdoc (6.14.2)
erb
psych (>= 4.0.0)
regexp_parser (2.10.0)
regexp_parser (2.11.1)
reline (0.6.2)
io-console (~> 0.5)
rexml (3.4.1)
Expand All @@ -289,7 +289,7 @@ GEM
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.4)
rubocop (1.79.1)
rubocop (1.79.2)
json (~> 2.3)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.1.0)
Expand Down Expand Up @@ -342,7 +342,7 @@ GEM
fugit (~> 1.11.0)
railties (>= 7.1)
thor (>= 1.3.1)
sorbet-runtime (0.5.12368)
sorbet-runtime (0.5.12383)
sqlite3 (2.7.3-aarch64-linux-gnu)
sqlite3 (2.7.3-aarch64-linux-musl)
sqlite3 (2.7.3-arm-linux-gnu)
Expand All @@ -359,10 +359,10 @@ GEM
ostruct
stringio (3.1.7)
thor (1.4.0)
thruster (0.1.14)
thruster (0.1.14-aarch64-linux)
thruster (0.1.14-arm64-darwin)
thruster (0.1.14-x86_64-linux)
thruster (0.1.15)
thruster (0.1.15-aarch64-linux)
thruster (0.1.15-arm64-darwin)
thruster (0.1.15-x86_64-linux)
timeout (0.4.3)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
Expand Down
2 changes: 0 additions & 2 deletions app/controllers/application_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ class ApplicationController < ActionController::Base
# Only allow modern browsers supporting webp images, web push, badges, import maps, CSS nesting, and CSS :has.
allow_browser versions: :modern

inertia_share flash: -> { flash.to_hash }

before_action :set_current_request_details
before_action :authenticate

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/identity/email_verifications_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def create
def set_user
@user = User.find_by_token_for!(:email_verification, params[:sid])
rescue StandardError
redirect_to edit_identity_email_path, alert: "That email verification link is invalid"
redirect_to settings_email_path, alert: "That email verification link is invalid"
end

def send_email_verification
Expand Down
39 changes: 0 additions & 39 deletions app/controllers/identity/emails_controller.rb

This file was deleted.

9 changes: 0 additions & 9 deletions app/controllers/inertia_rails/static_controller.rb

This file was deleted.

4 changes: 0 additions & 4 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@ class SessionsController < InertiaController
before_action :require_no_authentication, only: %i[ new create ]
before_action :set_session, only: :destroy

def index
@sessions = Current.user.sessions.order(created_at: :desc)
end

def new
end

Expand Down
2 changes: 1 addition & 1 deletion app/controllers/users_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def destroy
Current.session = nil
redirect_to root_path, notice: "Your account has been deleted", inertia: {clear_history: true}
else
redirect_to settings_profile_path, inertia: {errors: {password_challenge: ["Password challenge is invalid"]}}
redirect_to settings_profile_path, inertia: {errors: {password_challenge: "Password challenge is invalid"}}
end
end

Expand Down
4 changes: 2 additions & 2 deletions app/frontend/components/AppHeader.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,12 +68,12 @@ const mainNavItems: NavItem[] = [
const rightNavItems: NavItem[] = [
{
title: "Repository",
href: "https://github.com/laravel/vue-starter-kit",
href: "https://github.com/inertia-rails/vue-starter-kit",
icon: Folder,
},
{
title: "Documentation",
href: "https://laravel.com/docs/starter-kits#vue",
href: "https://inertia-rails.dev",
icon: BookOpen,
},
]
Expand Down
34 changes: 0 additions & 34 deletions app/views/sessions/index.html.erb

This file was deleted.

13 changes: 1 addition & 12 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
resource :users, only: [:destroy]

namespace :identity do
resource :email, only: [:edit, :update] # => settings/profile
resource :email_verification, only: [:show, :create]
resource :password_reset, only: [:new, :edit, :create, :update]
end
Expand All @@ -22,26 +21,16 @@
resource :password, only: [:show, :update]
resource :email, only: [:show, :update]
resources :sessions, only: [:index]
# inertia :appearance
inertia :appearance
end
inertia "settings/appearance" => "settings/appearance"

# inertia 'settings/profile' => 'settings/profile' # name, delete account
# inertia 'settings/email' => 'settings/email' # email
# inertia 'settings/sessions' => 'settings/sessions' # sessions

root "home#index"

get "inertia-example", to: "inertia_example#index"
# Define your application routes per the DSL in https://guides.rubyonrails.org/routing.html

# Reveal health status on /up that returns 200 if the app boots with no exceptions, otherwise 500.
# Can be used by load balancers and uptime monitors to verify that the app is live.
get "up" => "rails/health#show", as: :rails_health_check

# Render dynamic PWA files from app/views/pwa/* (remember to link manifest in application.html.erb)
# get "manifest" => "rails/pwa#manifest", as: :pwa_manifest
# get "service-worker" => "rails/pwa#service_worker", as: :pwa_service_worker

# Defines the root path route ("/")
end
Loading