update

Author: nnunn

Gemfile

@@ -15,6 +15,11 @@ gem 'uglifier', '>= 1.3.0'
 # See https://github.com/rails/execjs#readme for more supported runtimes
 
 gem 'execjs'
+<<<<<<< HEAD
+=======
+#gem 'mini_racer', '<= 0.3'
+#gem 'libv8', '~> 7.3'
+>>>>>>> 3125925d5d1c092c93e9c5c05a03d596a38ee529
 
 # Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
 gem 'jbuilder', '~> 2.11'

README.md

@@ -1,3 +1,13 @@
 # library-cms
 
 This is the CMS for the University of Alberta Libraries website. It uses Comfy Mexican Sofa. This repository also contains the staff profiles application.
+
+## Applications 
+
++ MariaDB database for profiles application and CMS
+
+## Development environment
+
++ Ruby 2.7.5
++ Rails 7.0.2
++ MariaDB 5.5

app/webpacker/packs/application.js

@@ -19,7 +19,7 @@ import '../src/javascripts/jquery-migrate-3.1.0.min.js';
 import '../src/javascripts/jquery-ui.min.js';
 import '../src/javascripts/jquery.hoverIntent.minified.js';
 import '../src/javascripts/bootstrap.min.js';
-import '../src/javascripts/ualib-home.js';
+// import '../src/javascripts/ualib-home.js';
 import '../src/stylesheets/application.scss';