Remove unnecessary gem and conflict one

.github/pull_request_template.md

@@ -0,0 +1,20 @@
+# General Info
+
+- [Pivotal Tracker Story](https://www.pivotaltracker.com/story/show/########)
+- [ ] Breaking?
+
+# Changes
+
+Explain your changes here (in such a way that you would understand why you made them a year from now).
+
+# Testing
+
+Explain how you tested your changes.  If testing is not necessary, explain why.
+
+# Documentation
+
+Does this PR require documentation.  If so, explain where it can be found.
+
+# Checklist
+
+- [ ] Name of branch corresponds to story

.github/workflows/main.yml

@@ -0,0 +1,18 @@
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: Install Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.3.0
+    - name: Build and test with RSpec
+      run: |
+        gem install bundler
+        bundle install --jobs 4 --retry 3
+        bundle exec rspec

Gemfile

@@ -41,7 +41,6 @@ gem "tzinfo-data", platforms: %i[ windows jruby ]
 # Reduces boot times through caching; required in config/boot.rb
 gem "bootsnap", require: false
 
-gem 'sassc-rails', '~> 2.1'
 gem "lms-api"
 
 
@@ -54,14 +53,19 @@ gem "lms-api"
 # Use Active Storage variants [https://guides.rubyonrails.org/active_storage_overview.html#transforming-images]
 # gem "image_processing", "~> 1.2"
 
+gem 'bootstrap', '~> 5.3.2'
+gem 'jquery-rails'
+gem 'sassc-rails', '~> 2.1'   #dependency for bootstrap
+
+
 group :development, :test do
   # See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
   gem "debug", platforms: %i[ mri windows ]
 end
 
 group :test do
     gem 'rspec-rails'
-    gem 'rails-controller-testing'
+    # gem 'rails-controller-testing'
     gem 'guard-rspec'
     gem 'simplecov', :require => false
     gem 'cucumber-rails', :require => false

Gemfile.lock

@@ -77,11 +77,16 @@ GEM
       tzinfo (~> 2.0)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
+    autoprefixer-rails (10.4.16.0)
+      execjs (~> 2)
     base64 (0.2.0)
     bigdecimal (3.1.6)
     bindex (0.8.1)
     bootsnap (1.18.3)
       msgpack (~> 1.2)
+    bootstrap (5.3.2)
+      autoprefixer-rails (>= 9.1.0)
+      popper_js (>= 2.11.8, < 3)
     builder (3.2.4)
     byebug (11.1.3)
     capybara (3.40.0)
@@ -142,6 +147,7 @@ GEM
     drb (2.2.0)
       ruby2_keywords
     erubi (1.12.0)
+    execjs (2.9.1)
     ffi (1.16.3)
     formatador (1.1.0)
     globalid (1.2.1)
@@ -176,6 +182,10 @@ GEM
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
+    jquery-rails (4.6.0)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
     listen (3.8.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -229,6 +239,7 @@ GEM
     notiffany (0.1.3)
       nenv (~> 0.1)
       shellany (~> 0.0)
+    popper_js (2.11.8)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -380,6 +391,7 @@ PLATFORMS
 
 DEPENDENCIES
   bootsnap
+  bootstrap (~> 5.3.2)
   byebug
   cucumber-rails
   cucumber-rails-training-wheels
@@ -388,6 +400,7 @@ DEPENDENCIES
   guard-rspec
   importmap-rails
   jbuilder
+  jquery-rails
   lms-api
   puma (>= 5.0)
   rails (~> 7.1.3)

README.md

@@ -1,2 +1,4 @@
 # flextensions
 Back end/API for UC Berkeley EECS "Flextensions" software
+
+[![Maintainability](https://api.codeclimate.com/v1/badges/8d99ec9a1784ddba34ac/maintainability)](https://codeclimate.com/github/cs169/flextensions/maintainability) [![Test Coverage](https://api.codeclimate.com/v1/badges/8d99ec9a1784ddba34ac/test_coverage)](https://codeclimate.com/github/cs169/flextensions/test_coverage)

app/assets/stylesheets/application.css → app/assets/stylesheets/application.scss

@@ -13,3 +13,5 @@
  *= require_tree .
  *= require_self
  */
+
+ @import "bootstrap";

config/application.rb

@@ -7,7 +7,7 @@
 require "active_record/railtie"
 require "active_storage/engine"
 require "action_controller/railtie"
-require "action_mailer/railtie"
+# require "action_mailer/railtie"
 require "action_mailbox/engine"
 require "action_text/engine"
 require "action_view/railtie"

config/environments/development.rb

@@ -41,9 +41,9 @@
   config.active_storage.service = :local
 
   # Don't care if the mailer can't send.
-  config.action_mailer.raise_delivery_errors = false
+  # config.action_mailer.raise_delivery_errors = false
 
-  config.action_mailer.perform_caching = false
+  # config.action_mailer.perform_caching = false
 
   # Print deprecation notices to the Rails logger.
   config.active_support.deprecation = :log

config/environments/production.rb

@@ -71,7 +71,7 @@
   # config.active_job.queue_adapter = :resque
   # config.active_job.queue_name_prefix = "flextentions_production"
 
-  config.action_mailer.perform_caching = false
+  # config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.

config/environments/test.rb

@@ -41,12 +41,12 @@
   # Store uploaded files on the local file system in a temporary directory.
   config.active_storage.service = :test
 
-  config.action_mailer.perform_caching = false
+  # config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  # config.action_mailer.delivery_method = :test
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr