Skip to content

Commit

Permalink
Deployment tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
danivovich committed Jul 30, 2024
1 parent bdc2855 commit 35fbe74
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 27 deletions.
2 changes: 2 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ group :development do

# Speed up commands on slow machines / big apps [https://github.com/rails/spring]
# gem "spring"

gem 'foreman'
end

group :test do
Expand Down
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,7 @@ GEM
ffi (1.17.0-arm64-darwin)
ffi (1.17.0-x86_64-darwin)
ffi (1.17.0-x86_64-linux-gnu)
foreman (0.88.1)
globalid (1.2.1)
activesupport (>= 6.1)
i18n (1.14.5)
Expand Down Expand Up @@ -324,6 +325,7 @@ DEPENDENCIES
codeclimate-test-reporter
cssbundling-rails (~> 1.4)
debug
foreman
importmap-rails
jbuilder
pg
Expand Down
16 changes: 0 additions & 16 deletions app/assets/stylesheets/application.css

This file was deleted.

6 changes: 3 additions & 3 deletions app/assets/stylesheets/application.sass.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// Entry point for your Sass build
// 1. Load your project's USWDS settings configuration
@forward "../app/assets/uswds/_uswds-theme.scss";
@forward "../uswds/_uswds-theme.scss";

// 2. Load USWDS source code
@forward "../node_modules/@uswds/uswds/packages/uswds/_index.scss";
@forward "uswds/_index.scss";

// 3. Load theme customizations
@forward "../app/assets/uswds/_uswds-theme-custom-styles.scss"
@forward "../uswds/_uswds-theme-custom-styles.scss"
7 changes: 1 addition & 6 deletions bin/dev
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
#!/usr/bin/env sh

if gem list --no-installed --exact --silent foreman; then
echo "Installing foreman..."
gem install foreman
fi

# Default to port 3000 if not specified
export PORT="${PORT:-3000}"

exec foreman start -f Procfile.dev "$@"
exec bundle exec foreman start -f Procfile.dev "$@"
2 changes: 1 addition & 1 deletion config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# Defines the root path route ("/")
# root "posts#index"
if Rails.env.development?
if Rails.env.development? || Rails.env.dev?
get "/sandbox", to: "sandbox#index"
end
end
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"build:css": "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules"
"build:css": "sass ./app/assets/stylesheets/application.sass.scss:./app/assets/builds/application.css --no-source-map --load-path=node_modules/@uswds/uswds/packages"
},
"author": "",
"license": "ISC",
Expand Down

0 comments on commit 35fbe74

Please sign in to comment.