Skip to content

Commit

Permalink
Merge pull request #17 from anewman15/main
Browse files Browse the repository at this point in the history
Fix deployment issues
  • Loading branch information
anewman15 authored Feb 3, 2021
2 parents d78c7f4 + efba092 commit 599eb04
Show file tree
Hide file tree
Showing 10 changed files with 6,523 additions and 10 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
# Ignore master key for decrypting credentials and more.
/config/master.key

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ This is an activity logger app that helps a user create daily activities and cat
![Entity Relational Diagram](./erd.png)

## Live Version
Live on Heroku [here](https://fathomless-shore-76470.herokuapp.com/)
Live on [Heroku](https://damp-river-37577.herokuapp.com/)

## Deployment

Expand Down
7 changes: 2 additions & 5 deletions config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@ test:

production:
<<: *default
database: <%= ENV['RDS_DB_NAME'] %>
username: <%= ENV['RDS_USERNAME'] %>
password: <%= ENV['RDS_PASSWORD'] %>
host: <%= ENV['RDS_HOSTNAME'] %>
host: <%= ENV['RDS_PORT'] %>
database: activize_production


2 changes: 1 addition & 1 deletion config/webpacker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ production:
<<: *default

# Production depends on precompilation of packs prior to booting for performance.
compile: false
compile: true

# Extract and emit a css file
extract_css: true
Expand Down
5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@
"@rails/ujs": "^6.0.0",
"@rails/webpacker": "4.3.0",
"node-sass": "^4.14.1",
"turbolinks": "^5.2.0"
"turbolinks": "^5.2.0",
"webpack": "^4.0.0"

},
"version": "0.1.0",
"devDependencies": {
"webpack": "^4.0.0",
"webpack-cli": "^4.4.0",
"webpack-dev-server": "^3.11.0"
}
Expand Down
Loading

0 comments on commit 599eb04

Please sign in to comment.