Setup assets

02e353f2 · kolosfed · 0297c67a · 02e353f2 · 02e353f2 · 02e353f2
Commit 02e353f2 authored Apr 01, 2020 by kolosfed
9 changed files
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'haml-rails'
 gem 'turbolinks', '~> 5'
 gem 'jquery-rails'
 gem 'bootstrap', '~> 4.4.1'
-gem 'font-awesome-rails'
+gem 'font-awesome-sass', '~> 5.12.0'
 gem 'bootstrap-will_paginate'



--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -76,8 +76,8 @@ GEM
    erubis (2.7.0)
    execjs (2.7.0)
    ffi (1.12.2)
-    font-awesome-rails (4.7.0.5)
-      railties (>= 3.2, < 6.1)
+    font-awesome-sass (5.12.0)
+      sassc (>= 1.11)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
    haml (5.1.2)
@@ -220,7 +220,7 @@ DEPENDENCIES
  coffee-rails (~> 4.2)
  devise
  devise-i18n
-  font-awesome-rails
+  font-awesome-sass (~> 5.12.0)
  haml-rails
  jbuilder (~> 2.5)
  jquery-rails

--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -12,4 +12,6 @@
 //
 //= require rails-ujs
 //= require turbolinks
+//= require jquery3
+//= require bootstrap
 //= require_tree ./application
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
 /*
- * This is a manifest file that'll be compiled into application.css, which will include all the files
- * listed below.
- *
- * Any CSS and SCSS file within this directory, lib/assets/stylesheets, or any plugin's
- * vendor/assets/stylesheets directory can be referenced here using a relative path.
- *
- * You're free to add application-wide styles to this file and they'll appear at the bottom of the
- * compiled file so the styles you add here take precedence over styles defined in any other CSS/SCSS
- * files in this directory. Styles in this file should be added after the last require_* statement.
- * It is generally better to create a new file per style scope.
- *
- *= require_tree ./application
- *= require_self
- */
+ *= require application/main
+ */
\ No newline at end of file
--- a/app/assets/stylesheets/application/main.scss
+++ b/app/assets/stylesheets/application/main.scss
+@import "bootstrap";
+
+@import "font-awesome-sprockets";
+@import "font-awesome";
+
+@import "template-styles";
--- a/app/assets/stylesheets/application/template-styles.scss
+++ b/app/assets/stylesheets/application/template-styles.scss
--- a/app/views/layouts/application.haml
+++ b/app/views/layouts/application.haml
+!!!
+%html
+  %head
+    %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}
+    %title Chicken Farm
+
+    = csrf_meta_tags
+    %meta{charset: "utf-8"}
+    %meta{"http-equiv": "X-UA-Compatible", content: "IE=edge"}
+    %meta{name: "viewport", content: "width=device-width, initial-scale=1, shrink-to-fit=no"}
+
+    = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' # TODO @kolosfed data-turbolinks-track?
+    = stylesheet_link_tag 'https://fonts.googleapis.com/css?family=Nunito:200,200i,300,300i,400,400i,600,600i,700,700i,800,800i,900,900i'
+    = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
+  %body
+    = yield
\ No newline at end of file
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>App</title>
-    <%= csrf_meta_tags %>
-
-    <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
-  </head>
-
-  <body>
-    <%= yield %>
-  </body>
-</html>
--- a/config/cable.yml
+++ b/config/cable.yml
-development:
-  adapter: async
-
-test:
-  adapter: async
-
-production:
-  adapter: redis
-  url: redis://localhost:6379/1
-  channel_prefix: app_production