From ee27b457ff526d2bd67f1d54a61008714c85f247 Mon Sep 17 00:00:00 2001 From: aysan Date: Tue, 25 Oct 2022 16:21:29 -0400 Subject: [PATCH 1/4] not committing --- .tool-versions | 1 + Gemfile.lock | 114 ++++++------ Gemfile.next.lock | 329 ---------------------------------- app/assets/config/manifest.js | 3 + db/schema.rb | 62 +++---- 5 files changed, 95 insertions(+), 414 deletions(-) create mode 100644 .tool-versions delete mode 100644 Gemfile.next.lock create mode 100644 app/assets/config/manifest.js diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..edfc689 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +ruby 2.5.8 diff --git a/Gemfile.lock b/Gemfile.lock index 08787e5..cab74ec 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,8 +38,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) + addressable (2.8.1) + public_suffix (>= 2.0.2, < 6.0) ansi (1.5.0) arel (8.0.0) builder (3.2.4) @@ -54,7 +54,7 @@ GEM coffee-script-source (1.12.2) colorize (0.8.1) commonjs (0.2.7) - concurrent-ruby (1.1.9) + concurrent-ruby (1.1.10) coveralls (0.7.2) multi_json (~> 1.3) rest-client (= 1.6.7) @@ -64,105 +64,109 @@ GEM crack (0.4.5) rexml crass (1.0.6) - diff-lcs (1.4.4) + diff-lcs (1.5.0) docile (1.4.0) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) + dotenv (2.8.1) + dotenv-rails (2.8.1) + dotenv (= 2.8.1) railties (>= 3.2) - email_spec (2.2.0) + email_spec (2.2.1) htmlentities (~> 4.3.3) launchy (~> 2.1) mail (~> 2.7) - erubi (1.10.0) + erubi (1.11.0) execjs (2.8.1) - factory_bot (6.2.0) + factory_bot (6.2.1) activesupport (>= 5.0.0) factory_bot_rails (6.2.0) factory_bot (~> 6.2.0) railties (>= 5.0.0) - faraday (1.8.0) + faraday (1.10.2) faraday-em_http (~> 1.0) faraday-em_synchrony (~> 1.0) faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) + faraday-net_http_persistent (~> 1.0) faraday-patron (~> 1.0) faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) + faraday-retry (~> 1.0) ruby2_keywords (>= 0.0.4) faraday-em_http (1.0.0) faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) faraday-rack (1.0.0) + faraday-retry (1.0.3) faraday_middleware (1.2.0) faraday (~> 1.0) - ffi (1.15.4) + ffi (1.15.5) gli (2.21.0) - globalid (0.5.2) + globalid (1.0.0) activesupport (>= 5.0) hashdiff (1.0.1) hashie (5.0.0) - holidays (8.4.1) + holidays (8.6.0) htmlentities (4.3.4) - i18n (1.8.10) + i18n (1.12.0) concurrent-ruby (~> 1.0) - jbuilder (2.11.2) + jbuilder (2.11.5) + actionview (>= 5.0.0) activesupport (>= 5.0.0) - jquery-rails (4.4.0) + jquery-rails (4.5.0) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.6) + json (2.6.2) launchy (2.5.0) addressable (~> 2.7) less (2.6.0) commonjs (~> 0.2.7) - less-rails (2.8.0) - actionpack (>= 4.0) + less-rails (4.0.0) + actionpack (>= 4) less (~> 2.6.0) - sprockets (> 2, < 4) - tilt - loofah (2.18.0) + sprockets (>= 2) + loofah (2.19.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.1) mini_mime (>= 0.1.1) method_source (1.0.0) - mime-types (3.3.1) + mime-types (3.4.1) mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) + mime-types-data (3.2022.0105) mini_mime (1.1.2) mini_portile2 (2.6.1) - minitest (5.14.4) + minitest (5.15.0) multi_json (1.15.0) - multipart-post (2.1.1) - next_rails (1.0.4) + multipart-post (2.2.3) + next_rails (1.2.1) colorize (>= 0.8.1) nio4r (2.5.8) noko (1.7.0) nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) - pg (1.2.3) + pg (1.4.4) pry (0.13.1) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.9.0) byebug (~> 11.0) pry (~> 0.13.0) - public_suffix (4.0.6) + public_suffix (4.0.7) racc (1.6.0) - rack (2.2.3.1) + rack (2.2.4) rack-mini-profiler (3.0.0) rack (>= 1.2.0) - rack-test (1.1.0) - rack (>= 1.0, < 3) + rack-test (2.0.2) + rack (>= 1.3) rails (5.1.7) actioncable (= 5.1.7) actionmailer (= 5.1.7) @@ -199,14 +203,14 @@ GEM rest-client (1.6.7) mime-types (>= 1.16) rexml (3.2.5) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) + rspec-core (3.11.0) + rspec-support (~> 3.11.0) + rspec-expectations (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) + rspec-support (~> 3.11.0) + rspec-mocks (3.11.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) + rspec-support (~> 3.11.0) rspec-rails (4.1.2) actionpack (>= 4.2) activesupport (>= 4.2) @@ -215,7 +219,7 @@ GEM rspec-expectations (~> 3.10) rspec-mocks (~> 3.10) rspec-support (~> 3.10) - rspec-support (3.10.2) + rspec-support (3.11.1) ruby2_keywords (0.0.5) sass-rails (6.0.0) sassc-rails (~> 2.1, >= 2.1.1) @@ -236,15 +240,15 @@ GEM simplecov terminal-table simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) + simplecov_json_formatter (0.1.4) slack-ruby-client (1.0.0) faraday (>= 1.0) faraday_middleware gli hashie websocket-driver - spring (3.0.0) - sprockets (3.7.2) + spring (3.1.1) + sprockets (4.1.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) sprockets-rails (3.2.2) @@ -258,23 +262,23 @@ GEM unicode-display_width (>= 1.1.1, < 3) thor (0.18.1) thread_safe (0.3.6) - tilt (2.0.10) + tilt (2.0.11) tins (0.13.2) turbolinks (5.2.1) turbolinks-source (~> 5.2) turbolinks-source (5.2.0) - twitter-bootstrap-rails (4.0.0) - actionpack (~> 5.0, >= 5.0.1) + twitter-bootstrap-rails (5.0.0) + actionpack (>= 5.0, < 8.0) execjs (~> 2.7) - less-rails (~> 2.8, >= 2.8.0) - railties (~> 5.0, >= 5.0.1) + less-rails (>= 3.0, < 5.0) + railties (>= 5.0, < 8.0) tzinfo (1.2.10) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) - unicode-display_width (2.1.0) + unicode-display_width (2.3.0) vcr (6.0.0) - webmock (3.14.0) + webmock (3.18.1) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -283,7 +287,7 @@ GEM websocket-extensions (0.1.5) PLATFORMS - ruby + -darwin-21 DEPENDENCIES byebug @@ -322,4 +326,4 @@ RUBY VERSION ruby 2.5.8p224 BUNDLED WITH - 2.2.29 + 2.3.24 diff --git a/Gemfile.next.lock b/Gemfile.next.lock deleted file mode 100644 index 3fcbc52..0000000 --- a/Gemfile.next.lock +++ /dev/null @@ -1,329 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - actioncable (5.2.6) - actionpack (= 5.2.6) - nio4r (~> 2.0) - websocket-driver (>= 0.6.1) - actionmailer (5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - mail (~> 2.5, >= 2.5.4) - rails-dom-testing (~> 2.0) - actionpack (5.2.6) - actionview (= 5.2.6) - activesupport (= 5.2.6) - rack (~> 2.0, >= 2.0.8) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.6) - activesupport (= 5.2.6) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (5.2.6) - activesupport (= 5.2.6) - globalid (>= 0.3.6) - activemodel (5.2.6) - activesupport (= 5.2.6) - activerecord (5.2.6) - activemodel (= 5.2.6) - activesupport (= 5.2.6) - arel (>= 9.0) - activestorage (5.2.6) - actionpack (= 5.2.6) - activerecord (= 5.2.6) - marcel (~> 1.0.0) - activesupport (5.2.6) - concurrent-ruby (~> 1.0, >= 1.0.2) - i18n (>= 0.7, < 2) - minitest (~> 5.1) - tzinfo (~> 1.1) - addressable (2.8.0) - public_suffix (>= 2.0.2, < 5.0) - ansi (1.5.0) - arel (9.0.0) - builder (3.2.4) - byebug (11.1.3) - coderay (1.1.3) - coffee-rails (5.0.0) - coffee-script (>= 2.2.0) - railties (>= 5.2.0) - coffee-script (2.4.1) - coffee-script-source - execjs - coffee-script-source (1.12.2) - colorize (0.8.1) - commonjs (0.2.7) - concurrent-ruby (1.1.9) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - crack (0.4.5) - rexml - crass (1.0.6) - diff-lcs (1.4.4) - docile (1.4.0) - domain_name (0.5.20190701) - unf (>= 0.0.5, < 1.0.0) - dotenv (2.7.6) - dotenv-rails (2.7.6) - dotenv (= 2.7.6) - railties (>= 3.2) - email_spec (2.2.0) - htmlentities (~> 4.3.3) - launchy (~> 2.1) - mail (~> 2.7) - erubi (1.10.0) - execjs (2.8.1) - factory_bot (6.2.0) - activesupport (>= 5.0.0) - factory_bot_rails (6.2.0) - factory_bot (~> 6.2.0) - railties (>= 5.0.0) - faraday (1.8.0) - faraday-em_http (~> 1.0) - faraday-em_synchrony (~> 1.0) - faraday-excon (~> 1.1) - faraday-httpclient (~> 1.0.1) - faraday-net_http (~> 1.0) - faraday-net_http_persistent (~> 1.1) - faraday-patron (~> 1.0) - faraday-rack (~> 1.0) - multipart-post (>= 1.2, < 3) - ruby2_keywords (>= 0.0.4) - faraday-em_http (1.0.0) - faraday-em_synchrony (1.0.0) - faraday-excon (1.1.0) - faraday-httpclient (1.0.1) - faraday-net_http (1.0.1) - faraday-net_http_persistent (1.2.0) - faraday-patron (1.0.0) - faraday-rack (1.0.0) - ffi (1.15.4) - globalid (0.5.2) - activesupport (>= 5.0) - hashdiff (1.0.1) - holidays (8.4.1) - htmlentities (4.3.4) - http-accept (1.7.0) - http-cookie (1.0.4) - domain_name (~> 0.5) - i18n (1.8.10) - concurrent-ruby (~> 1.0) - jbuilder (2.11.2) - activesupport (>= 5.0.0) - jquery-rails (4.4.0) - rails-dom-testing (>= 1, < 3) - railties (>= 4.2.0) - thor (>= 0.14, < 2.0) - json (1.8.6) - launchy (2.5.0) - addressable (~> 2.7) - less (2.6.0) - commonjs (~> 0.2.7) - less-rails (2.8.0) - actionpack (>= 4.0) - less (~> 2.6.0) - sprockets (> 2, < 4) - tilt - loofah (2.12.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - mail (2.7.1) - mini_mime (>= 0.1.1) - marcel (1.0.2) - method_source (1.0.0) - mime-types (3.3.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2021.0901) - mini_mime (1.1.2) - minitest (5.14.4) - multi_json (1.15.0) - multipart-post (2.1.1) - netrc (0.11.0) - next_rails (1.0.4) - colorize (>= 0.8.1) - nio4r (2.5.8) - noko (1.7.0) - nokogiri (1.12.5-x86_64-darwin) - racc (~> 1.4) - pg (0.20.0) - pry (0.13.1) - coderay (~> 1.1) - method_source (~> 1.0) - pry-byebug (3.9.0) - byebug (~> 11.0) - pry (~> 0.13.0) - public_suffix (4.0.6) - racc (1.6.0) - rack (2.2.3) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails (5.2.6) - actioncable (= 5.2.6) - actionmailer (= 5.2.6) - actionpack (= 5.2.6) - actionview (= 5.2.6) - activejob (= 5.2.6) - activemodel (= 5.2.6) - activerecord (= 5.2.6) - activestorage (= 5.2.6) - activesupport (= 5.2.6) - bundler (>= 1.3.0) - railties (= 5.2.6) - sprockets-rails (>= 2.0.0) - rails-controller-testing (1.0.5) - actionpack (>= 5.0.1.rc1) - actionview (>= 5.0.1.rc1) - activesupport (>= 5.0.1.rc1) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.4.2) - loofah (~> 2.3) - rails_12factor (0.0.3) - rails_serve_static_assets - rails_stdout_logging - rails_serve_static_assets (0.0.5) - rails_stdout_logging (0.0.5) - railties (5.2.6) - actionpack (= 5.2.6) - activesupport (= 5.2.6) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) - rake (13.0.6) - rest-client (2.1.0) - http-accept (>= 1.7.0, < 2.0) - http-cookie (>= 1.0.2, < 2.0) - mime-types (>= 1.16, < 4.0) - netrc (~> 0.8) - rexml (3.2.5) - rspec-core (3.10.1) - rspec-support (~> 3.10.0) - rspec-expectations (3.10.1) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-mocks (3.10.2) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.10.0) - rspec-rails (5.0.2) - actionpack (>= 5.2) - activesupport (>= 5.2) - railties (>= 5.2) - rspec-core (~> 3.10) - rspec-expectations (~> 3.10) - rspec-mocks (~> 3.10) - rspec-support (~> 3.10) - rspec-support (3.10.2) - ruby2_keywords (0.0.5) - sass-rails (6.0.0) - sassc-rails (~> 2.1, >= 2.1.1) - sassc (2.4.0) - ffi (~> 1.9) - sassc-rails (2.1.2) - railties (>= 4.0.0) - sassc (>= 2.0) - sprockets (> 3.0) - sprockets-rails - tilt - simplecov (0.21.2) - docile (~> 1.1) - simplecov-html (~> 0.11) - simplecov_json_formatter (~> 0.1) - simplecov-console (0.9.1) - ansi - simplecov - terminal-table - simplecov-html (0.12.3) - simplecov_json_formatter (0.1.3) - spring (3.0.0) - sprockets (3.7.2) - concurrent-ruby (~> 1.0) - rack (> 1, < 3) - sprockets-rails (3.2.2) - actionpack (>= 4.0) - activesupport (>= 4.0) - sprockets (>= 3.0.0) - sqlite3 (1.3.13) - sync (0.5.0) - term-ansicolor (1.7.1) - tins (~> 1.0) - terminal-table (3.0.2) - unicode-display_width (>= 1.1.1, < 3) - thor (1.1.0) - thread_safe (0.3.6) - tilt (2.0.10) - tins (1.29.1) - sync - turbolinks (5.2.1) - turbolinks-source (~> 5.2) - turbolinks-source (5.2.0) - twitter-bootstrap-rails (4.0.0) - actionpack (~> 5.0, >= 5.0.1) - execjs (~> 2.7) - less-rails (~> 2.8, >= 2.8.0) - railties (~> 5.0, >= 5.0.1) - tzinfo (1.2.9) - thread_safe (~> 0.1) - uglifier (4.2.0) - execjs (>= 0.3.0, < 3) - unf (0.1.4) - unf_ext - unf_ext (0.0.8) - unicode-display_width (2.1.0) - vcr (6.0.0) - webmock (3.14.0) - addressable (>= 2.8.0) - crack (>= 0.3.2) - hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.5) - websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.5) - -PLATFORMS - x86_64-darwin-20 - -DEPENDENCIES - byebug - coffee-rails - coveralls - dotenv-rails - email_spec - factory_bot_rails - faraday - holidays - jbuilder (~> 2.0) - jquery-rails - json - next_rails - noko - pg - pry-byebug - rails (~> 5.2.0) - rails-controller-testing - rails_12factor - rspec-rails - sass-rails - simplecov - simplecov-console - spring - sqlite3 (~> 1.3.6) - turbolinks - twitter-bootstrap-rails - uglifier (>= 1.3.0) - vcr - webmock - -RUBY VERSION - ruby 2.5.8p224 - -BUNDLED WITH - 2.2.29 diff --git a/app/assets/config/manifest.js b/app/assets/config/manifest.js new file mode 100644 index 0000000..5cc2c08 --- /dev/null +++ b/app/assets/config/manifest.js @@ -0,0 +1,3 @@ +//= link_tree ../images +//= link_directory ../javascripts .js +//= link_directory ../stylesheets .css \ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index b5f5309..9570365 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -13,47 +12,50 @@ ActiveRecord::Schema.define(version: 20160421164630) do - create_table "entries", force: :cascade do |t| - t.text "description" - t.integer "minutes" - t.integer "user_id" - t.integer "project_id" - t.date "date" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false + # These are extensions that must be enabled in order to support this database + enable_extension "plpgsql" + + create_table "entries", id: :serial, force: :cascade do |t| + t.text "description" + t.integer "minutes" + t.integer "user_id" + t.integer "project_id" + t.date "date" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false end - create_table "project_leaderboards", force: :cascade do |t| - t.integer "project_id" - t.integer "total_minutes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.date "start_date" - t.date "end_date" + create_table "project_leaderboards", id: :serial, force: :cascade do |t| + t.integer "project_id" + t.integer "total_minutes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.date "start_date" + t.date "end_date" end - create_table "projects", force: :cascade do |t| - t.string "name" + create_table "projects", id: :serial, force: :cascade do |t| + t.string "name" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.boolean "enabled" + t.boolean "enabled" end - create_table "user_leaderboards", force: :cascade do |t| - t.integer "user_id" - t.integer "total_minutes" - t.datetime "created_at", null: false - t.datetime "updated_at", null: false - t.date "start_date" - t.date "end_date" + create_table "user_leaderboards", id: :serial, force: :cascade do |t| + t.integer "user_id" + t.integer "total_minutes" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.date "start_date" + t.date "end_date" end - create_table "users", force: :cascade do |t| - t.string "name" + create_table "users", id: :serial, force: :cascade do |t| + t.string "name" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.string "email" - t.string "state" + t.string "email" + t.string "state" end end From 05620f157f270de264e739fef9497cd806c33620 Mon Sep 17 00:00:00 2001 From: aysan Date: Wed, 16 Nov 2022 16:19:08 -0500 Subject: [PATCH 2/4] testing heroku stack upgrade --- app.json | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 app.json diff --git a/app.json b/app.json new file mode 100644 index 0000000..50cb149 --- /dev/null +++ b/app.json @@ -0,0 +1,3 @@ +{ + "stack": "heroku-22" +} \ No newline at end of file From 8e2295e697fcdc18d4330eeb29e164b7ab0e46e7 Mon Sep 17 00:00:00 2001 From: aysan Date: Fri, 2 Dec 2022 13:56:08 -0500 Subject: [PATCH 3/4] Change heroku stack to v20 --- app.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app.json b/app.json index 50cb149..2713c14 100644 --- a/app.json +++ b/app.json @@ -1,3 +1,3 @@ { - "stack": "heroku-22" + "stack": "heroku-20" } \ No newline at end of file From a0fd517e74f8693ebf2a86d1e218a3cd0f183a4b Mon Sep 17 00:00:00 2001 From: aysan Date: Fri, 2 Dec 2022 14:47:39 -0500 Subject: [PATCH 4/4] add-platform x86_64-linux --- Gemfile.lock | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile.lock b/Gemfile.lock index cab74ec..6c91a54 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -153,6 +153,8 @@ GEM nokogiri (1.12.5) mini_portile2 (~> 2.6.1) racc (~> 1.4) + nokogiri (1.12.5-x86_64-linux) + racc (~> 1.4) pg (1.4.4) pry (0.13.1) coderay (~> 1.1) @@ -288,6 +290,7 @@ GEM PLATFORMS -darwin-21 + x86_64-linux DEPENDENCIES byebug