Merge branch 'main' into bp-postgres-db

Author: bpurinton

.devcontainer/devcontainer.json

@@ -3,7 +3,7 @@
 {
   "name": "Container",
   // Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
-  "image": "jelaniwoods/appdev2023-rails-template",
+  "image": "firstdraft/appdev-rails-template",
 
   // Features to add to the dev container. More info: https://containers.dev/features.
   // "features": {},
@@ -34,7 +34,8 @@
       "extensions": ["vortizhe.simple-ruby-erb",
                      "mbessey.vscode-rufo",
                      "aliariff.vscode-erb-beautify",
-                     "eamodio.gitlens"]
+                     "eamodio.gitlens",
+                     "setobiralo.erb-commenter"]
     }
   }
 

.gitpod.yml

@@ -1,11 +1,11 @@
-image: jelaniwoods/appdev2023-rails-template
+image: firstdraft/appdev-rails-7-1-template
 
 tasks:
-  - env:
-      DATABASE_URL: "postgresql://gitpod@localhost"
-    before: |
-      sudo echo 'export DATABASE_URL="postgresql://gitpod@localhost"' | sudo tee -a ~/.bashrc
-      sudo cp -r /home/student /home/gitpod && sudo chmod 777 /home/gitpod && chown -R gitpod /home/gitpod
+  - before: |
+      sudo cp -r /home/student /home/gitpod
+      (cd /home/gitpod/student; sudo find . -maxdepth 1 -exec mv {} .. \;)
+      source ~/.bashrc
+      sudo chmod 777 /home/gitpod && sudo chown -R gitpod /home/gitpod /home/student
       export GEM_HOME=/workspace/.rvm
       export GEM_PATH=$GEM_HOME:$GEM_PATH
       export PATH=/workspace/.rvm/bin:$PATH
@@ -29,3 +29,4 @@ vscode:
     - mbessey.vscode-rufo
     - aliariff.vscode-erb-beautify
     - eamodio.gitlens
+    - setobiralo.erb-commenter

.rspec

@@ -1,4 +1,3 @@
 --color
 --format documentation
---order default
 --require spec_helper

.vscode/settings.json

@@ -8,7 +8,6 @@
   "editor.linkedEditing": true,
   "editor.minimap.enabled": false,
   "editor.smoothScrolling": false,
-  "editor.wordBasedSuggestionsMode": "allDocuments",
   "editor.wordWrap": "on",
   "editor.wrappingIndent": "deepIndent",
   "workbench.editor.closeOnFileDelete": true,
@@ -20,41 +19,27 @@
     "**/.git": true,
     ".vscode": true,
     ".bundle": true,
-    ".gitignore": false,
-    ".gitpod.yml": false,
-    ".rspec": false,
-    ".devcontainer/": false,
-    "config.ru": false,
-    "Dockerfile": false,
-    "Gemfile": false,
-    "Gemfile.lock": false,
-    "tmp/": false,
-    "install-packages": false,
-    "main.rb": false,
-    "README.md": false,
-    "app.rb": false,
-    "environment.rb": false,
-    "bin/": false,
-    "spec/": false,
-    "examples.txt": false,
-    "config/": false
   },
   "files.insertFinalNewline": true,
   "files.trimFinalNewlines": true,
-  "screencastMode.onlyKeyboardShortcuts": true,
+  "screencastMode.keyboardOptions": {
+    "showKeys": false,
+    "showKeybindings": true,
+    "showCommands": false,
+    "showCommandGroups": false,
+    "showSingleEditorCursorMoves": true
+  },
   "screencastMode.verticalOffset": 10,
   "explorer.compactFolders": false,
   "explorer.incrementalNaming": "smart",
-  "html.format.endWithNewline": true,
   "html.format.preserveNewLines": true,
   "html.format.templating": true,
   "terminal.integrated.altClickMovesCursor": true,
+  "terminal.integrated.defaultProfile.linux": "bash",
   "vscode-erb-beautify.keepBlankLines": 1,
-  "ruby.intellisense": false,
   "gitpod.openInStable.neverPrompt": true,
   "gitlens.showWelcomeOnInstall": false,
   "gitlens.currentLine.enabled": false,
-  "redhat.telemetry.enabled": false,
   "emmet.includeLanguages": {
     "erb": "html"
   },
@@ -64,7 +49,8 @@
   },
   "[erb]": {
     "editor.defaultFormatter": "aliariff.vscode-erb-beautify",
-    "editor.formatOnSave": false
+    "editor.formatOnSave": false,
+    "editor.autoClosingBrackets": "beforeWhitespace"
   },
   "files.associations": {
     "*.html.erb": "erb"

Gemfile

@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby "3.2.1"
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem "rails", "~> 7.0.4", ">= 7.0.4.3"
+gem "rails", "~> 7.1.3", ">= 7.1.3.2"
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem "sprockets-rails"
@@ -13,7 +13,7 @@ gem "sprockets-rails"
 gem "pg", "~> 1.1"
 
 # Use the Puma web server [https://github.com/puma/puma]
-gem "puma", "~> 5.0"
+gem "puma"
 
 # Use JavaScript with ESM import maps [https://github.com/rails/importmap-rails]
 gem "importmap-rails"
@@ -75,7 +75,7 @@ end
 # ===========
 gem "appdev_support"
 gem "awesome_print"
-gem "devise"       # to be removed
+gem "devise"
 gem "dotenv-rails"
 gem "faker"
 gem "htmlbeautifier"
@@ -94,16 +94,14 @@ group :development do
   gem "rails-erd"
   gem "rufo"
   gem "specs_to_readme"
-  gem "web_git"
 end
 
 group :development, :test do
   gem "rspec-rails", "~> 6.0.0"
 end
 
 group :test do
-  gem "draft_matchers"#, "0.0.2"#path: "../../my_stuff/draft_matchers"
-  # gem "draft_matchers"
+  gem "draft_matchers"
   gem "rspec-html-matchers"
   gem "webmock"
 end