Skip to content

Commit

Permalink
Can Manage Users (#12)
Browse files Browse the repository at this point in the history
* can manage users
  • Loading branch information
CharlieIGG authored Dec 26, 2019
1 parent 8a18de3 commit b739dff
Show file tree
Hide file tree
Showing 76 changed files with 1,899 additions and 80 deletions.
91 changes: 91 additions & 0 deletions .bash_history
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,94 @@ rails db:migrate
clear
clear
rails db:migrate
rspec
rspec
rspec
rspec
rspec
rspec
spring stop
rspec
rspec
bundle
rspec
rspec
rspec
rspec
rspec
bundle
bundle exec guard init rspec
rails g rolify Role User
rails db:migrate
rails db:migrate
guard -c
rails c
rails g model Project name:string
rails g model EvaluationProgram name:string start_at:datetime end_at:datetime
rails g model ProjectProgramSummary average:float evaluation_program:references project:references program_start:date
rails db:migrate
guard -c
rails g model EvaluationCriteria name:string description:text
rails g model ProgramCriterium evaluation_program:references evaluation_criteria:references position:integer weight:float
rails db:migrate
guard -c
rails db:rollback
rails db:migrate
guard -c
rspec
bundle
rspec
bundle
gem uninstall sidekiq-scheduler
bundle
rspec
rails g controller Users index new edit create update destroy
bundle
bundle
rails generate devise_invitable:install
rails generate devise_invitable User
rails generate devise_invitable:views
rails g migration add_metadata_to_users name:string phone:string
rails g migration add_metadata_to_users name:string phone:string position:string
rails db:migrate
rails generate devise_invitable:views users
rails routes | grep invit
bundle
gem "select2-rails"
gem uninstall "select2-rails"
bundle
rails routes | grep invit
guard -c
rails c
guard -c
guard -c
rspec spec/system/
rspec spec/system/
rspec spec/system/
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
spring stop
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
clear
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec spec/system/session_spec.rb
rspec
rails g devise:views
rails g devise:views
rspec
rspec
rspec
rspec ./spec/system/manage_users_spec.rb
rspec
rails routes | grep user
rails c
guard -c
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@

/public/assets
.byebug_history
.bash_history

# Ignore master key for decrypting credentials and more.
/config/master.key
Expand Down
7 changes: 7 additions & 0 deletions .guard_history
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
all
+
all
Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| puts f}
rails c
rspec
all rspec
rspec
all rspec
all
9 changes: 9 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ group :development do
gem "annotate"
gem "rack-timeout", require:"rack/timeout/base"
gem "rails-erd"
gem "letter_opener"
gem 'letter_opener_web', '~> 1.0'
end

# Test gems
Expand Down Expand Up @@ -67,7 +69,14 @@ gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

gem "devise"
gem "rolify"
gem 'pundit', '~> 2.0', '>= 2.0.1'
gem "devise_invitable", "~> 1.7.0"
gem "kaminari"
gem "mini_magick"
gem "aws-sdk-s3", "~> 1.9", require: false

# Model instance decoration
gem 'draper'

# Dynamically add nested_fields to forms
gem "cocoon"
32 changes: 30 additions & 2 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ GEM
globalid (>= 0.3.6)
activemodel (6.0.1)
activesupport (= 6.0.1)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (6.0.1)
activemodel (= 6.0.1)
activesupport (= 6.0.1)
Expand Down Expand Up @@ -106,6 +110,7 @@ GEM
xpath (~> 3.2)
childprocess (3.0.0)
choice (0.2.0)
cocoon (1.2.14)
coderay (1.1.2)
concurrent-ruby (1.1.5)
connection_pool (2.2.2)
Expand All @@ -121,6 +126,12 @@ GEM
devise (>= 4.0.0)
diff-lcs (1.3)
docile (1.3.2)
draper (3.1.0)
actionpack (>= 5.0)
activemodel (>= 5.0)
activemodel-serializers-xml (>= 1.0)
activesupport (>= 5.0)
request_store (>= 1.0)
erubi (1.9.0)
execjs (2.7.0)
factory_bot (5.1.1)
Expand Down Expand Up @@ -171,6 +182,14 @@ GEM
activerecord
kaminari-core (= 1.1.1)
kaminari-core (1.1.1)
launchy (2.4.3)
addressable (~> 2.3)
letter_opener (1.7.0)
launchy (~> 2.2)
letter_opener_web (1.3.4)
actionmailer (>= 3.2)
letter_opener (~> 1.0)
railties (>= 3.2)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
Expand Down Expand Up @@ -209,8 +228,10 @@ GEM
coderay (~> 1.1.0)
method_source (~> 0.9.0)
public_suffix (4.0.1)
puma (3.12.2)
rack (2.0.8)
puma (3.12.1)
pundit (2.1.0)
activesupport (>= 3.0.0)
rack (2.0.7)
rack-canonical-host (0.2.3)
addressable (> 0, < 3)
rack (>= 1.0.0, < 3)
Expand Down Expand Up @@ -260,6 +281,8 @@ GEM
ffi (~> 1.0)
redis (4.1.3)
regexp_parser (1.6.0)
request_store (1.4.1)
rack (>= 1.4)
responders (3.0.0)
actionpack (>= 5.0)
railties (>= 5.0)
Expand Down Expand Up @@ -386,19 +409,24 @@ DEPENDENCIES
bundler-audit (>= 0.5.0)
byebug
capybara (>= 2.15)
cocoon
devise
devise_invitable (~> 1.7.0)
draper
factory_bot_rails
ffaker
guard-rspec
jquery-rails
kaminari
letter_opener
letter_opener_web (~> 1.0)
listen (>= 3.0.5, < 3.2)
mini_magick
normalize-rails
pg (>= 0.18, < 2.0)
pry
puma (~> 3.12)
pundit (~> 2.0, >= 2.0.1)
rack-canonical-host
rack-mini-profiler
rack-timeout
Expand Down
2 changes: 1 addition & 1 deletion Guardfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
# * zeus: 'zeus rspec' (requires the server to be started separately)
# * 'just' rspec: 'rspec'

guard :rspec, cmd: 'bundle exec rspec' do
guard :rspec, cmd: 'bundle exec rspec', failed_mode: :keep do
require 'guard/rspec/dsl'
dsl = Guard::RSpec::Dsl.new(self)

Expand Down
17 changes: 17 additions & 0 deletions app/assets/javascripts/sticky_button.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
$(document).on('turbolinks:load', function() {
var wrap = $(window);
var nav = $(".sticky-button");
if (nav.length == 0) return;

var navTop = nav.offset().top;
var stick = function(e) {
var scrollTop = wrap.scrollTop();
if (scrollTop >= navTop) {
nav.addClass("sticky");
} else {
nav.removeClass("sticky");
}
};

wrap.on("scroll", stick);
});
18 changes: 18 additions & 0 deletions app/assets/javascripts/sticky_nav.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
$(document).on('turbolinks:load', function() {
var wrap = $(window);
var header = $(".header--main");
var nav = $('.navbar--sticky')
var abort = ((header.length == 0) || (nav.length == 0))
if (abort) return;

var headerTop = header.offset().top;
var stick = function(e) {
var scrollTop = wrap.scrollTop();
if (scrollTop >= headerTop) {
nav.addClass("is-active");
} else {
nav.removeClass("is-active");
}
};
wrap.on("scroll", stick);
});
6 changes: 6 additions & 0 deletions app/assets/javascripts/tooltips.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
$(document).on("turbolinks:load", function () {
$('[data-toggle="tooltip"]').tooltip({
container: 'body',
boundary: 'window'
})
})
2 changes: 1 addition & 1 deletion app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
@import "normalize-rails";

@import "settings/variables";
@import "settings/mixins";
@import "settings/placeholders";
@import "settings/utilities";

@import "base";
@import "settings/variables";
@import "bootstrap";
Loading

0 comments on commit b739dff

Please sign in to comment.