Merge pull request #14 from anewman15/main

Main

README.md

@@ -22,7 +22,7 @@ This is an activity logger app that helps a user create daily activities and cat
 ![Entity Relational Diagram](./erd.png)
 
 ## Live Version
-Live on Heroku [here](https://murmuring-wave-07875.herokuapp.com/)
+Live on Heroku [here](https://fathomless-shore-76470.herokuapp.com/)
 
 ## Deployment
 

bin/rails

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 APP_PATH = File.expand_path('../config/application', __dir__)
 require_relative '../config/boot'
 require 'rails/commands'

bin/rake

@@ -1,9 +1,4 @@
 #!/usr/bin/env ruby
-begin
-  load File.expand_path('../spring', __FILE__)
-rescue LoadError => e
-  raise unless e.message.include?('spring')
-end
 require_relative '../config/boot'
 require 'rake'
 Rake.application.run

config/application.rb

@@ -15,5 +15,6 @@ class Application < Rails::Application
     # Application configuration can go into files in config/initializers
     # -- all .rb files in that directory are automatically loaded after loading
     # the framework and any gems in your application.
+    config.assets.initialize_on_precompile = false
   end
 end

package.json

@@ -1,13 +1,17 @@
 {
-  "name": "activize",
-  "version": "1.0.0",
+  "name": "random_practice",
+  "private": true,
   "engines": {
-    "node": "15.2.0",
     "yarn": "1.22.5"
   },
-  "description": "This is an activity logger app that helps a user create daily activities and categorize them according to various categories they have in mind. They are able to name and create those groups according to their convenience.",
-  "main": "index.js",
-  "repository": "git@github.com:anewman15/activize.git",
-  "author": "Abdullah Numan <anewman15@hotmail.com>",
-  "license": "UNLICENSED"
+  "dependencies": {
+    "@rails/actioncable": "^6.0.0",
+    "@rails/activestorage": "^6.0.0",
+    "@rails/ujs": "^6.0.0",
+    "turbolinks": "^5.2.0"
+  },
+  "version": "0.1.0",
+  "devDependencies": {
+    "webpack-dev-server": "^3.11.0"
+  }
 }