oonyeje/Pearlception_Website_RoR
1
0
Fork 0
mirror of https://github.com/oonyeje/Pearlception_Website_RoR.git synced 2025-12-25 11:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged branch master into User-Sign-In-Sign-Up

Browse Source
This commit is contained in:
Okechi Onyeje 2017-01-20 02:47:16 -05:00
commit 36c641d236
28 changed files with 578 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Pearlception/.pryrc Normal file
View File

@ -0,0 +1,4 @@
if Rails.env.development? || Rails.env.test?
# This introduces the `table` statement
extend Hirb::Console
end

16
Pearlception/Gemfile
View File

@ -36,6 +36,8 @@ gem 'bcrypt', '~> 3.1.7'
# gem 'capistrano-rails', group: :development
# for sign in sign up
gem 'devise'
#for pagination
gem 'kaminari'
group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
@ -49,7 +51,21 @@ group :development do
# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
gem 'spring-watcher-listen', '~> 2.0.0'
gem 'awesome_rails_console'
gem 'hirb'
end
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
# Please clean up duplicated gems if any.
# Feel free to remove gems that you don't want to use or if they conflict with other gem dependencies. (you might need to update .pryrc also)
group :development, :test do
gem 'hirb'
gem 'hirb-unicode'
gem 'pry-byebug'
gem 'pry-stack_explorer'
end
group :development, :test do
end

44
Pearlception/Gemfile.lock
View File

@ -39,9 +39,17 @@ GEM
minitest (~> 5.1)
tzinfo (~> 1.1)
arel (7.1.4)
awesome_print (1.7.0)
awesome_rails_console (0.4.0)
awesome_print
pry-rails
railties
bcrypt (3.1.11)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (9.0.6)
coderay (1.1.1)
coffee-rails (4.2.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.2.x)
@ -62,6 +70,10 @@ GEM
ffi (1.9.14)
globalid (0.3.7)
activesupport (>= 4.1.0)
hirb (0.7.3)
hirb-unicode (0.0.5)
hirb (~> 0.5)
unicode-display_width (~> 0.1.1)
i18n (0.7.0)
jbuilder (2.6.1)
activesupport (>= 3.0.0, < 5.1)
@ -70,6 +82,18 @@ GEM
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
kaminari (1.0.1)
activesupport (>= 4.1.0)
kaminari-actionview (= 1.0.1)
kaminari-activerecord (= 1.0.1)
kaminari-core (= 1.0.1)
kaminari-actionview (1.0.1)
actionview
kaminari-core (= 1.0.1)
kaminari-activerecord (1.0.1)
activerecord
kaminari-core (= 1.0.1)
kaminari-core (1.0.1)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
@ -89,6 +113,18 @@ GEM
nokogiri (1.7.0)
mini_portile2 (~> 2.1.0)
orm_adapter (0.5.0)
pry (0.10.4)
coderay (~> 1.1.0)
method_source (~> 0.8.1)
slop (~> 3.4)
pry-byebug (3.4.2)
byebug (~> 9.0)
pry (~> 0.10)
pry-rails (0.3.4)
pry (>= 0.9.10)
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
puma (3.6.2)
rack (2.0.1)
rack-test (0.6.3)
@ -129,6 +165,7 @@ GEM
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
slop (3.6.0)
spring (2.0.0)
activesupport (>= 4.2)
spring-watcher-listen (2.0.1)
@ -151,6 +188,7 @@ GEM
thread_safe (~> 0.1)
uglifier (3.0.4)
execjs (>= 0.3.0, < 3)
unicode-display_width (0.1.1)
warden (1.2.6)
rack (>= 1.0)
web-console (3.4.0)
@ -166,14 +204,20 @@ PLATFORMS
ruby
DEPENDENCIES
awesome_rails_console
bcrypt (~> 3.1.7)
byebug
coffee-rails (~> 4.2)
devise
hirb
hirb-unicode
jbuilder (~> 2.5)
jquery-rails
kaminari
listen (~> 3.0.5)
mysql2 (>= 0.3.18, < 0.5)
pry-byebug
pry-stack_explorer
puma (~> 3.0)
rails (~> 5.0.1)
sass-rails (~> 5.0)

BIN
Pearlception/app/assets/images/ajax-loader.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

3
Pearlception/app/assets/javascripts/companies.coffee Normal file
View File

@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/

3
Pearlception/app/assets/stylesheets/companies.scss Normal file
View File

@ -0,0 +1,3 @@
// Place all the styles related to the Companies controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/

22
Pearlception/app/assets/stylesheets/custom.scss Normal file
View File

@ -0,0 +1,22 @@
//@import "bootstrap-sprockets";
@import "bootstrap";
/* mixins, variables, etc. */
$gray-medium-light: #eaeaea;
@mixin box_sizing {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
/* miscellaneous */
.debug_dump {
clear: both;
float: left;
width: 100%;
margin-top: 45px;
@include box_sizing;
}

32
Pearlception/app/controllers/companies_controller.rb Normal file
View File

@ -0,0 +1,32 @@
class CompaniesController < ApplicationController
require 'securerandom'
before_filter :deny_to_visitors
def new
@company = Company.new
end
def create
@company = Company.new(company_params)
@company.company_token = SecureRandom.uuid
if @company.save
redirect_to :action => 'index'
else
flash[:alert] = @company.errors.full_messages.to_sentence
redirect_to :action => 'new'
end
end
def index
@companies = Company.all
end
def deny_to_visitors
redirect_to "/signin" unless user_signed_in? && current_user.admin?
end
def company_params
params.require(:company).permit(:company_name, :company_token)
end
end

6
Pearlception/app/controllers/dashboard_controller.rb
View File

@ -1,7 +1,13 @@
class DashboardController < ApplicationController
before_filter :deny_to_visitors
def index
@results = Result.page(params[:page]).per(5)
end
def deny_to_visitors
redirect_to "/signin" unless user_signed_in?
end
end

20
Pearlception/app/controllers/registrations_controller.rb
View File

@ -1,7 +1,23 @@
class RegistrationsController < Devise::RegistrationsController
private
include ApplicationHelper
#protected
def create
binding.pry
@user = User.new(sign_up_params)
if !@user.admin?
#search by company token given by one of pearlception admins to the company
#and look up comany_id #
@user.company_id = 0
else
@user.company_id = -1
end
@user.save
sign_in @user
redirect_to "/"
end
def sign_up_params
params.require(:user).permit(:company_id, :email, :password, :password_confirmation)
params.require(:user).permit(:email, :password, :password_confirmation, :company_id)
end
end

11
Pearlception/app/helpers/application_helper.rb
View File

@ -1,2 +1,13 @@
module ApplicationHelper
def resource_name
:user
end
def resource
@resource ||= User.new
end
def devise_mapping
@devise_mapping ||= Devise.mappings[:user]
end
end

2
Pearlception/app/helpers/companies_helper.rb Normal file
View File

@ -0,0 +1,2 @@
module CompaniesHelper
end

3
Pearlception/app/models/company.rb
View File

@ -1,3 +1,4 @@
class Company < ApplicationRecord
belongs_to :user
has_many :users
has_many :runs
end

11
Pearlception/app/models/oyster.rb
View File

@ -1,6 +1,11 @@
class Oyster < ApplicationRecord
belongs_to :run
Oyster.establish_connection(:"stats_#{Rails.env}")
#Oyster.establish_connection(:"stats_#{Rails.env}")
Oyster.establish_connection(
:adapter => "mysql2",
:host => ENV['STATS_DB_URL'],
:username => ENV['STATS_DB_USER'],
:password => ENV['STATS_DB_PASS'],
:database => "main"
)
end

9
Pearlception/app/models/result.rb
View File

@ -1,3 +1,10 @@
class Result < ApplicationRecord
establish_connection(:"stats_#{Rails.env}")
#establish_connection(:"stats_#{Rails.env}")
Result.establish_connection(
:adapter => "mysql2",
:host => ENV['STATS_DB_URL'],
:username => ENV['STATS_DB_USER'],
:password => ENV['STATS_DB_PASS'],
:database => "main"
)
end

10
Pearlception/app/models/run.rb
View File

@ -1,4 +1,12 @@
class Run < ApplicationRecord
has_many :oysters
establish_connection(:"stats_#{Rails.env}")
belongs_to :companies
# establish_connection(:"stats_#{Rails.env}")
Run.establish_connection(
:adapter => "mysql2",
:host => ENV['STATS_DB_URL'],
:username => ENV['STATS_DB_USER'],
:password => ENV['STATS_DB_PASS'],
:database => "main"
)
end

2
Pearlception/app/models/user.rb
View File

@ -1,4 +1,6 @@
class User < ApplicationRecord
belongs_to :company
has_many :runs
# Include default devise modules. Others available are:
# :confirmable, :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,

111
Pearlception/app/views/companies/index.html.erb Normal file
View File

@ -0,0 +1,111 @@
<%= stylesheet_link_tag "dashboard" %>_
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Pearlception</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<!-- <li><a href="#">Dashboard</a></li> -->
<!-- <li><a href="#">Settings</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Help</a></li> -->
<li>
<%= link_to(destroy_user_session_path, class: 'logout-link', :method => :delete) do %>
<i class="fa fa-external-link"></i> Logout
<% end %>
</li>
</ul>
<!-- <form class="navbar-form navbar-right">
<input type="text" class="form-control" placeholder="Search...">
</form> -->
</div>
</div>
</nav>
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li><a href="/">Overview <span class="sr-only">(current)</span></a></li>
<% if current_user.admin? %>
<li class="active"><a href="companies#index">Companies</a></li>
<% else %>
<li><a href="#">Reports</a></li>
<li><a href="#">Analytics</a></li>
<li><a href="#">Export</a></li>
<% end %>
</ul>
<!-- <ul class="nav nav-sidebar">
<li><a href="">Nav item</a></li>
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
<li><a href="">More navigation</a></li>
</ul>
<ul class="nav nav-sidebar">
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
</ul> -->
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h1 class="page-header">Companies</h1>
<h2 class="sub-header">Registered Companies: <%= @companies.count %> </h2>
<div class="panel panel-primary table-responsive">
<%= link_to(new_company_path, :method => :get) do %>
<i class="fa fa-external-link"></i> Register a Company
<% end %>
<table class="table table-striped">
<thead>
<tr>
<th>Company ID</th>
<th>Company Name</th>
<th>Registration Serial Key</th>
</tr>
</thead>
<% if @companies.empty? %>
</table>
<div class="panel panel-primary">
<p>No Companies Registered</p>
</div>
<% else %>
<tbody>
<% @companies.each_slice(1) do |row| %>
<tr>
<% row.each do |company|%>
<!-- company id -->
<td>
<%= company.id %>
</td>
<!-- company_name -->
<td>
<%= company.company_name %>
</td>
<!-- company registration token -->
<td>
<%= company.company_token %>
</td>
<% end %>
</tr>
<% end %>
</tbody>
</table>
<% end %>
</div>
</div>
</div>
</div>
<%= javascript_include_tag "bootstrap.min" %>_
</body>

83
Pearlception/app/views/companies/new.html.erb Normal file
View File

@ -0,0 +1,83 @@
<%= stylesheet_link_tag "dashboard" %>_
</head>
<body>
<nav class="navbar navbar-inverse navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">Pearlception</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<!-- <li><a href="#">Dashboard</a></li> -->
<!-- <li><a href="#">Settings</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Help</a></li> -->
<li>
<%= link_to(destroy_user_session_path, class: 'logout-link', :method => :delete) do %>
<i class="fa fa-external-link"></i> Logout
<% end %>
</li>
</ul>
<!-- <form class="navbar-form navbar-right">
<input type="text" class="form-control" placeholder="Search...">
</form> -->
</div>
</div>
</nav>
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li><a href="/">Overview <span class="sr-only">(current)</span></a></li>
<% if current_user.admin? %>
<li class="active"><a href="companies#index">Companies</a></li>
<% else %>
<li><a href="#">Reports</a></li>
<li><a href="#">Analytics</a></li>
<li><a href="#">Export</a></li>
<% end %>
</ul>
<!-- <ul class="nav nav-sidebar">
<li><a href="">Nav item</a></li>
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
<li><a href="">More navigation</a></li>
</ul>
<ul class="nav nav-sidebar">
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
</ul> -->
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h1 class="page-header">Companies</h1>
<h2 class="sub-header">Register a New Company</h2>
<div class="panel panel-primary">
<%= link_to(companies_path, :method => :get) do %>
<i class="fa fa-external-link"></i> Back
<% end %>
<%= form_for @company, url: {action: "create"}, html: {class: "company_form"} do |f| %>
<div class="field form-group">
<%= f.text_field :company_name, class: 'form-control', placeholder: 'Company Name' %>
</div>
<div class="actions">
<%= f.submit "Create" %>
</div>
</div>
<% end %>
</div>
</div>
</div>
</div>
<%= javascript_include_tag "bootstrap.min" %>_
</body>

273
Pearlception/app/views/dashboard/index.html.erb
View File

@ -10,18 +10,23 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">Pearlception</a>
<a class="navbar-brand" href="/">Pearlception</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="#">Dashboard</a></li>
<li><a href="#">Settings</a></li>
<!-- <li><a href="#">Dashboard</a></li> -->
<!-- <li><a href="#">Settings</a></li>
<li><a href="#">Profile</a></li>
<li><a href="#">Help</a></li>
<li><a href="#">Help</a></li> -->
<li>
<%= link_to(destroy_user_session_path, class: 'logout-link', :method => :delete) do %>
<i class="fa fa-external-link"></i> Logout
<% end %>
</li>
</ul>
<form class="navbar-form navbar-right">
<!-- <form class="navbar-form navbar-right">
<input type="text" class="form-control" placeholder="Search...">
</form>
</form> -->
</div>
</div>
</nav>
@ -30,12 +35,17 @@
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar">
<li class="active"><a href="#">Overview <span class="sr-only">(current)</span></a></li>
<li><a href="#">Reports</a></li>
<li><a href="#">Analytics</a></li>
<li><a href="#">Export</a></li>
<li class="active"><a href="/">Overview <span class="sr-only">(current)</span></a></li>
<!-- This will be removed and placed with correct logic in corresponding controller -->
<% if current_user.admin? %>
<li><a href="companies#index">Companies</a></li>
<% else %>
<!-- <li><a>Reports</a></li>
<li><a>Analytics</a></li>
<li><a>Export</a></li> -->
<% end %>
</ul>
<ul class="nav nav-sidebar">
<!-- <ul class="nav nav-sidebar">
<li><a href="">Nav item</a></li>
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
@ -46,12 +56,12 @@
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
</ul>
</ul> -->
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h1 class="page-header">Pearlception Dashboard</h1>
<div class="row placeholders">
<!-- <div class="row placeholders">
<div class="col-xs-6 col-sm-3 placeholder">
<img src="data:image/gif;base64,R0lGODlhAQABAIAAAHd3dwAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==" width="200" height="200" class="img-responsive" alt="Generic placeholder thumbnail">
<h4>Label</h4>
@ -72,135 +82,134 @@
<h4>Label</h4>
<span class="text-muted">Something else</span>
</div>
</div>
</div> -->
<h2 class="sub-header">Recent Results</h2>
<% if current_user.admin? %>
<h2 class="sub-header">Recent Results From All Companies</h2>
<% else %>
<h2 class="sub-header">Recent Results</h2>
<% end %>
<div class="table-responsive">
<table class="table table-striped">
<thead>
<tr>
<th>#</th>
<th>Header</th>
<th>Header</th>
<th>Header</th>
<th>Header</th>
<% if current_user.admin? %>
<th>Company</th>
<% end %>
<th>Run Date</th>
<th>Location</th>
<th>Harvest Time</th>
<th>Supplier</th>
<th>Distributor</th>
<th>Total Processed</th>
<th>Other</th>
</tr>
</thead>
<tbody>
<tr>
<td>1,001</td>
<td>Lorem</td>
<td>ipsum</td>
<td>dolor</td>
<td>sit</td>
</tr>
<tr>
<td>1,002</td>
<td>amet</td>
<td>consectetur</td>
<td>adipiscing</td>
<td>elit</td>
</tr>
<tr>
<td>1,003</td>
<td>Integer</td>
<td>nec</td>
<td>odio</td>
<td>Praesent</td>
</tr>
<tr>
<td>1,003</td>
<td>libero</td>
<td>Sed</td>
<td>cursus</td>
<td>ante</td>
</tr>
<tr>
<td>1,004</td>
<td>dapibus</td>
<td>diam</td>
<td>Sed</td>
<td>nisi</td>
</tr>
<tr>
<td>1,005</td>
<td>Nulla</td>
<td>quis</td>
<td>sem</td>
<td>at</td>
</tr>
<tr>
<td>1,006</td>
<td>nibh</td>
<td>elementum</td>
<td>imperdiet</td>
<td>Duis</td>
</tr>
<tr>
<td>1,007</td>
<td>sagittis</td>
<td>ipsum</td>
<td>Praesent</td>
<td>mauris</td>
</tr>
<tr>
<td>1,008</td>
<td>Fusce</td>
<td>nec</td>
<td>tellus</td>
<td>sed</td>
</tr>
<tr>
<td>1,009</td>
<td>augue</td>
<td>semper</td>
<td>porta</td>
<td>Mauris</td>
</tr>
<tr>
<td>1,010</td>
<td>massa</td>
<td>Vestibulum</td>
<td>lacinia</td>
<td>arcu</td>
</tr>
<tr>
<td>1,011</td>
<td>eget</td>
<td>nulla</td>
<td>Class</td>
<td>aptent</td>
</tr>
<tr>
<td>1,012</td>
<td>taciti</td>
<td>sociosqu</td>
<td>ad</td>
<td>litora</td>
</tr>
<tr>
<td>1,013</td>
<td>torquent</td>
<td>per</td>
<td>conubia</td>
<td>nostra</td>
</tr>
<tr>
<td>1,014</td>
<td>per</td>
<td>inceptos</td>
<td>himenaeos</td>
<td>Curabitur</td>
</tr>
<tr>
<td>1,015</td>
<td>sodales</td>
<td>ligula</td>
<td>in</td>
<td>libero</td>
</tr>
<% if current_user.admin? %>
<% @results.each_slice(1) do |row| %>
<tr>
<% row.each do |result|
run = Run.find(result.id)
#company = Company.find(run.company_id)
%>
<!-- company name -->
<td>
<%= #company.company_name
"Fake Industries" %>
</td>
<!-- run date -->
<td>
<%= run.runDate %>
</td>
<!-- location -->
<td>
<%= run.location ? run.location : "" %>
</td>
<!-- harvest time -->
<td>
<%= "" %>
</td>
<!-- supplier -->
<td>
<%= run.supplier ? run.supplier : "" %>
</td>
<!-- distributor -->
<td>
<%= run.distributor ? run.distributor : "" %>
</td>
<!-- total processed -->
<td>
<%= result.total %>
</td>
<!-- other -->
<td>
<%= run.other ? run.other : "" %>
</td>
<% end %>
</tr>
<% end %>
<% else %>
<% @results.each_slice(1) do |row| %>
<tr>
<% row.each do |result|
run = Run.find(result.id) %>
<!-- run date -->
<td>
<%= run.runDate %>
</td>
<!-- location -->
<td>
<%= run.location ? run.location : "" %>
</td>
<!-- harvest time -->
<td>
<%= "" %>
</td>
<!-- supplier -->
<td>
<%= run.supplier ? run.supplier : "" %>
</td>
<!-- distributor -->
<td>
<%= run.distributor ? run.distributor : "" %>
</td>
<!-- total processed -->
<td>
<%= result.total %>
</td>
<!-- other -->
<td>
<%= run.other ? run.other : "" %>
</td>
<% end %>
</tr>
<% end %>
<% end %>
</tbody>
</table>
<div class="center-block">
<div class="col-sm-6 panel panel-primary" align="center">
<%= paginate @results %><br>
<%= page_entries_info @results %>
</div>
</div>
</div>
</div>
</div>

14
Pearlception/app/views/layouts/application.html.erb
View File

@ -6,17 +6,17 @@
<%= javascript_include_tag "application", "data-turbolinks-track" => false %>
<%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
<%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
<%= yield %>
<% if notice %>
<p class="alert alert-success" align="center"><%= notice %></p>
<% end %>
<% if alert %>
<p class="alert alert-danger" align="center"><%= alert %></p>
<% end %>
</head>
<body>
<% if notice %>
<p class="alert alert-success"><%= notice %></p>
<% end %>
<% if alert %>
<p class="alert alert-danger"><%= alert %></p>
<% end %>
<%= yield %>
<%= debug(params) if Rails.env.development? %>
</body>
</html>

2
Pearlception/app/views/users/registrations/new.html.erb
View File

@ -1,4 +1,4 @@
<h2>Sign up</h2>
<h2>Sign up!</h2>
<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>

2
Pearlception/app/views/users/sessions/new.html.erb
View File

@ -1,4 +1,4 @@
<h2>Log in</h2>
<h2>Log</h2>
<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
<div class="field">

12
Pearlception/config/database.yml
View File

@ -34,6 +34,12 @@ stats_test:
development:
<<: *default
database: Pearlception_development
username: <%= ENV['DEV_DB_USER'] %>
password: <%= ENV['DEV_DB_PASS'] %>
#host: <%= ENV['DEV_DB_URL'] %>
host: localhost
port: 3306
#database: main
# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
@ -41,6 +47,12 @@ development:
test:
<<: *default
database: Pearlception_test
username: <%= ENV['DEV_DB_USER'] %>
password: <%= ENV['DEV_DB_PASS'] %>
#host: <%= ENV['DEV_DB_URL'] %>
host: localhost
port: 3306
#database: main
# As with config/secrets.yml, you never want to store sensitive information,
# like your database password, in your source code. If your source code is

8
Pearlception/config/routes.rb
View File

@ -1,7 +1,13 @@
Rails.application.routes.draw do
devise_for :users, :controllers => { registrations: 'registrations' }
root "dashboard#index"
resources :runs
resources :companies
devise_for :users, :controllers => {:registrations => 'registrations'}
devise_scope :users do
get 'signin' => 'registrations#new'
post 'signin' => 'registrations#create'
end
# For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html
end

5
Pearlception/db/migrate/20170119161737_change_company_id_type_in_users.rb Normal file
View File

@ -0,0 +1,5 @@
class ChangeCompanyIdTypeInUsers < ActiveRecord::Migration[5.0]
def change
change_column :users, :company_id, :integer, default: -1
end
end

19
Pearlception/db/schema.rb
View File

@ -10,8 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
<<<<<<< HEAD
ActiveRecord::Schema.define(version: 20170109174008) do
ActiveRecord::Schema.define(version: 20170119161737) do
create_table "companies", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
t.string "company_name"
@ -21,24 +20,22 @@ ActiveRecord::Schema.define(version: 20170109174008) do
end
create_table "users", force: :cascade, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8" do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.integer "company_id", null: false
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
t.integer "company_id", null: false
t.boolean "admin", default: false, null: false
t.string "reset_password_token"
t.datetime "reset_password_sent_at"
t.datetime "remember_created_at"
t.integer "sign_in_count", default: 0, null: false
t.integer "sign_in_count", default: 0, null: false
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true, using: :btree
end
=======
ActiveRecord::Schema.define(version: 0) do
>>>>>>> master
end

7
Pearlception/test/controllers/companies_controller_test.rb Normal file
View File

@ -0,0 +1,7 @@
require 'test_helper'
class CompaniesControllerTest < ActionDispatch::IntegrationTest
# test "the truth" do
# assert true
# end
end