Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Subject editing #9

Merged
merged 48 commits into from
Apr 22, 2018
Merged
Show file tree
Hide file tree
Changes from 41 commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
3bbbaec
Implemented registration device with google omniauth
mantasavas Mar 28, 2018
6dcdece
added bootstrap and meniu
mantasavas Mar 28, 2018
fcad0c2
Finished registration form design
mantasavas Apr 2, 2018
481d9f8
Changed meniu color, added sign up and log in styling
mantasavas Apr 3, 2018
7cc85cd
Added image background
mantasavas Apr 3, 2018
d54dfef
Hided created subjects from unauthenticated users view, removed backg…
mantasavas Apr 3, 2018
7c117d8
Added pg and rails12 factor for heroku
mantasavas Apr 3, 2018
71736fe
Changed meniu color, added sign up and log in styling
mantasavas Apr 3, 2018
1c9bd45
Changed meniu color, added sign up and log in styling
mantasavas Apr 3, 2018
fa1966d
Changed meniu color, added sign up and log in styling
mantasavas Apr 3, 2018
b8519e9
fixing with robocop
mantasavas Apr 4, 2018
9545aed
Fixed code style: changed hash syntax, used single quotes there neces…
mantasavas Apr 4, 2018
dbcde58
Fixed code style: changed hash syntax, used single quotes there neces…
mantasavas Apr 4, 2018
9570e99
Added link to heroku hosted application in readme
mantasavas Apr 4, 2018
0d91b9c
Added application description
mantasavas Apr 4, 2018
0798f75
Subjects can be created in database
mantasavas Apr 5, 2018
5ea0d10
Added view all posts
mantasavas Apr 5, 2018
165b969
Created Trix editor, sanitized fields, added editing functionality of…
mantasavas Apr 5, 2018
0088945
Added delete subject
mantasavas Apr 5, 2018
d256ce8
Users cannot delete or edit subjects which they didn't created, added…
mantasavas Apr 5, 2018
e5e31d8
Added edit, navigation, index, new forms styling
mantasavas Apr 5, 2018
487eab1
Added restrictions on which actions can be accessed
mantasavas Apr 6, 2018
7616252
Fixed trix editor, didn't worked on heroku
mantasavas Apr 6, 2018
2c4180f
Rolled back changes for fix
mantasavas Apr 6, 2018
b5b39a1
Fixed background image on heroku
mantasavas Apr 6, 2018
c7274ba
Fixed header static text
mantasavas Apr 6, 2018
bb431fa
Merge branch 'subject-editing'
mantasavas Apr 6, 2018
115fac9
Took sqlite to development environment
mantasavas Apr 6, 2018
76b0ffa
Changed sqlite environment
mantasavas Apr 6, 2018
7225565
added rspec tests for user model
mantasavas Apr 9, 2018
191b2e2
Added rspec tests
mantasavas Apr 9, 2018
3b61ed9
Merge branch 'master' into user-authentication
mantasavas Apr 9, 2018
e5338ff
Removed .rubocop_todo.yml file, from now on used rubocop -a command
mantasavas Apr 11, 2018
957adaa
removed .rubocop_todo.yml, runned rubocop -a command
mantasavas Apr 11, 2018
56c5e6c
grouped factory, rspec, pry into test and development environments
mantasavas Apr 11, 2018
a471bfa
removed callback, subject, welcome javascript files
mantasavas Apr 11, 2018
233b7eb
fixed typo in user model method, removed unnecessary comments
mantasavas Apr 12, 2018
5a1d543
Renamed controller to subjects, fixed routing, removed locals, was un…
mantasavas Apr 12, 2018
6d32d51
removed unnecessary autogenerated test files from repo
mantasavas Apr 12, 2018
41c3843
Corrected user model rspec tests, added email uniqueness
mantasavas Apr 13, 2018
fb32cfe
Added subject controller tests with capybara and rspec
mantasavas Apr 15, 2018
3f323bb
added associations to factorybot, user has many subjects, added get i…
mantasavas Apr 15, 2018
eaca4d9
lint scss used to fix stylesheets, runneed rubocop
mantasavas Apr 15, 2018
404f93a
added hound file
mantasavas Apr 20, 2018
c7e2d9e
added let and before statements together
mantasavas Apr 22, 2018
f686312
added codeclimate
mantasavas Apr 22, 2018
7a3930a
add more readable subject controller tests
mantasavas Apr 22, 2018
604db97
added dependent on subject
mantasavas Apr 22, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,11 @@
/yarn-error.log

.byebug_history

# Ignore scaffold javascript files
/app/assets/javascripts/callbacks.coffee
/app/assets/javascripts/subject.coffee
/app/assets/javascripts/welcome.coffee

# Ignore scaffold scss files
/app/assets/stylesheets/callbacks.scss
3 changes: 3 additions & 0 deletions .rspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--color
--require spec_helper
--format doc
32 changes: 32 additions & 0 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
require: rubocop-rspec

Rails:
Enabled: true

RSpec/NestedGroups:
Enabled: false

Metrics/LineLength:
Enabled: true
Max: 120
Exclude:
- db/migrate/*

Metrics/BlockLength:
Exclude:
- spec/**/*.rb

Lint/AmbiguousBlockAssociation:
Exclude:
- spec/**/*.rb

Style/Documentation:
Exclude:
- app/helpers/**/*
- db/migrate/*

AllCops:
TargetRubyVersion: 2.4
Exclude:
- bin/*

45 changes: 37 additions & 8 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# frozen_string_literal: true

source 'https://rubygems.org'

git_source(:github) do |repo_name|
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
"https://github.com/#{repo_name}.git"
end


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.1.5'
# Use sqlite3 as the database for Active Record
gem 'sqlite3'

# Use Puma as the app server
gem 'puma', '~> 3.7'
# Use SCSS for stylesheets
Expand All @@ -35,20 +35,49 @@ gem 'jbuilder', '~> 2.5'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
gem 'byebug', platforms: %i[mri mingw x64_mingw]
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '~> 2.13'

gem 'selenium-webdriver'
end

group :development do
# Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
gem 'web-console', '>= 3.3.0'
gem 'listen', '>= 3.0.5', '< 3.2'
gem 'web-console', '>= 3.3.0'
# 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'
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'tzinfo-data', platforms: %i[mingw mswin x64_mingw jruby]

# ========== My Gems ==============
gem 'bootstrap', '~> 4.0.0'
gem 'database_cleaner'
gem 'devise'
gem 'jquery-rails'
gem 'omniauth-google-oauth2'
gem 'omniauth-twitter'
gem 'sqlite3'
gem 'trix'

# I'm going to use locally database sqlite
group :development, :test do
gem 'capybara', '~> 2.13'
gem 'factory_bot_rails'
gem 'pry'
gem 'rspec-rails', '~>3.0'
gem 'rubocop', require: false
gem 'rubocop-rspec', require: false
gem 'shoulda-matchers', git: 'https://github.com/thoughtbot/shoulda-matchers.git', branch: 'rails-5'
gem 'rails-controller-testing'

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think this gem should not belong to :development group

gem 'launchy'
end

# And for heroku postgress db
group :production do
gem 'pg'
gem 'rails_12factor'
end
Loading