Skip to content
Open
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
23 changes: 0 additions & 23 deletions .dockerignore

This file was deleted.

2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GOOGLE_PALM_API_KEY="AIzaSyCE9-_0b12Lr97jhWMgevpvTgbvdEfDEPo"
GOOGLE_PALM_API_KEY="AIzaSyBpYe3p5V76NoQmucOiaq1Ns5HgFJAdKM8"
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
# Ignore all SQLite databases
/db/*.sqlite3*

# Ignore database.yml file
/config/database.yml

# Ignore all logfiles
/log/*
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12
18.18.2
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.12
18.18.2
50 changes: 0 additions & 50 deletions Dockerfile.dev

This file was deleted.

4 changes: 1 addition & 3 deletions Procfile
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
web: bundle exec puma -C config/puma.rb
worker: bundle exec sidekiq -C config/sidekiq.yml
release: bundle exec rake db:migrate && bundle exec rake reset_and_populate_sample_data
web: rake db:migrate && bin/rails server -b 0.0.0.0 -p $PORT
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "wheel",
"name": "doc-mate",
"scripts": {
"postdeploy": "bundle exec rake db:migrate"
},
Expand Down
Empty file added app/assets/javascripts/.keep
Empty file.
10 changes: 5 additions & 5 deletions bin/setup
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ FileUtils.chdir APP_ROOT do
puts "\n== Executing yarn =="
system!("bin/yarn")

puts "\n== Creating config/database.yml file =="
if !ENV["DOCKER_ENV"]
system! "rm -f config/database.yml"
system! "cp config/database.yml.postgresql config/database.yml"
end
# puts "\n== Creating config/database.yml file =="
# if !ENV["DOCKER_ENV"]
# system! "rm -f config/database.yml"
# system! "cp config/database.yml.postgresql config/database.yml"
# end

puts "\n== Executing rake setup =="
system! "bundle exec rake setup"
Expand Down
24 changes: 24 additions & 0 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
default: &default
adapter: postgresql
encoding: unicode
host: <%= ENV['PG_HOST'] %>
pool: 5
username: <%= ENV['PG_USER'] %>
password: <%= ENV['PG_PASSWORD'] %>

development:
<<: *default
database: "doc-mate-developmemt"

test:
<<: *default
database: "doc-mate-test"

production:
<<: *default
url: <%= ENV["DATABASE_URL"] %>
host: <%= ENV["PGHOST"] %>
database: <%= ENV["PGDATABASE"] %>
username: <%= ENV["PGUSER"] %>
password: <%= ENV["PGPASSWORD"] %>
port: <%= ENV["PGPORT"] %>
2 changes: 1 addition & 1 deletion config/database.yml.docker
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ staging:

production:
<<: *default
database: <%= "#{repository_name}_production" %>
database: <%= "#{repository_name}_production" %>
1 change: 1 addition & 0 deletions config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,4 +69,5 @@

# Uncomment if you wish to allow Action Cable access from any origin.
# config.action_cable.disable_request_forgery_protection = true
config.hosts << ENV["DEVELOPMENT_HOSTS"]
end
2 changes: 2 additions & 0 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -95,4 +95,6 @@

# Do not dump schema after migrations.
config.active_record.dump_schema_after_migration = false

config.hosts << ENV["DEVELOPMENT_HOSTS"]
end
15 changes: 0 additions & 15 deletions docker-entrypoint.sh

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "doc-mate",
"version": "1.0.0",
"engines": {
"node": "18.12",
"node": "18.18.2",
"npm": "7.x",
"yarn": "1.22.x"
},
Expand Down