add new file
This commit is contained in:
@@ -13,4 +13,6 @@
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require turbolinks
|
||||
//= require bootstrap.v4a2.min
|
||||
//= require bootstrap-multiselect
|
||||
//= require_tree .
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
/*
|
||||
* 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, vendor/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 .
|
||||
*= require_self
|
||||
*/
|
||||
@@ -1,3 +1,21 @@
|
||||
class ApplicationController < ActionController::Base
|
||||
protect_from_forgery with: :exception
|
||||
protect_from_forgery with: :exception
|
||||
helper_method :current_member, :logged_in?, :resource_name, :resource, :devise_mapping
|
||||
|
||||
def logged_in?
|
||||
current_member
|
||||
end
|
||||
def after_sign_in_path_for(resource)
|
||||
dashboard_path
|
||||
end
|
||||
def resource_name
|
||||
:member
|
||||
end
|
||||
def resource
|
||||
@resource ||= Member.new
|
||||
end
|
||||
|
||||
def devise_mapping
|
||||
@devise_mapping ||= Devise.mappings[:member]
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,14 +1,20 @@
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
<html ang="en">
|
||||
<head>
|
||||
<title>NemoEncoder</title>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="x-ua-compatible" content="ie=edge">
|
||||
<title><%= content_for?(:title) ? yield(:title) : "Nemo Encoder" %></title>
|
||||
<%= csrf_meta_tags %>
|
||||
|
||||
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
|
||||
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
|
||||
<%= stylesheet_link_tag 'application', media: 'all' %>
|
||||
<%= javascript_include_tag 'application', 'data-turbolinks-eval' => true %>
|
||||
<link href="/assets/style.css" rel="stylesheet" type="text/css" />
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<%= yield %>
|
||||
<%= render "layouts/navigation" %>
|
||||
<div style="margin-top: 80px;"></div>
|
||||
<div class="container">
|
||||
<%= yield %>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
Reference in New Issue
Block a user