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

ports - sav #36

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
2daf2e2
intial set up complete
qqdipps Apr 22, 2019
08dc471
rough start, 3ed attempt =)
qqdipps Apr 22, 2019
fbb52ff
created controllers Users, Works, updated routes
qqdipps Apr 22, 2019
d3560b9
deleted extra views (update/create)
qqdipps Apr 22, 2019
7d8e0ca
user model
qqdipps Apr 22, 2019
95fa21a
added works model and join table works_users
qqdipps Apr 22, 2019
3ebadb1
updated models with relationship has_and_belongs_to_many
qqdipps Apr 22, 2019
edb64d7
added fixtures
qqdipps Apr 22, 2019
90f1554
added tests for user model
qqdipps Apr 22, 2019
5c19ed4
created seed file
qqdipps Apr 23, 2019
4e0b1fb
dropped join table
qqdipps Apr 23, 2019
b45223f
added votes
qqdipps Apr 24, 2019
ee2dd06
added foriegn key ref to votes
qqdipps Apr 24, 2019
b775882
added votes table, and updated model testing
qqdipps Apr 27, 2019
df17a32
finished votes
qqdipps Apr 27, 2019
abe8a79
updated user controller
qqdipps Apr 27, 2019
f06fcd8
wrote scafalding for tests
qqdipps Apr 27, 2019
9f8bc0a
added routes for login, passed index, show
qqdipps Apr 27, 2019
437b1be
fixed schema users table column from name to username
qqdipps Apr 27, 2019
6cd7d65
login actiondone
qqdipps Apr 27, 2019
f9fc26b
added homepages
qqdipps Apr 27, 2019
ddd5888
logout funtion and tests
qqdipps Apr 27, 2019
3183316
removed extra generated by rails
qqdipps Apr 27, 2019
18070eb
all tests passing
qqdipps Apr 27, 2019
38b971b
updated hompages controller tests
qqdipps Apr 27, 2019
44539bb
fixed at b create
qqdipps Apr 27, 2019
2d1f939
removed tb lines
qqdipps Apr 27, 2019
35735c0
added edit and tests work
qqdipps Apr 27, 2019
a91ed96
all tests passing
qqdipps Apr 27, 2019
36faf19
votes done
qqdipps Apr 27, 2019
d7ccb68
finished model methods and started styling home page
qqdipps Apr 29, 2019
0cc771e
no tracking for extra database see
qqdipps Apr 29, 2019
0160e96
no tracking for extra database see
qqdipps Apr 29, 2019
e4af431
no tracking for extra database see
qqdipps Apr 29, 2019
bbb7e88
added temp
qqdipps Apr 29, 2019
f7dec30
added homepage and font
qqdipps Apr 29, 2019
6d4bd0a
index page for works done
qqdipps Apr 29, 2019
19777b8
index for users done
qqdipps Apr 29, 2019
0273b36
added show work page
qqdipps Apr 29, 2019
dd2cc5e
added user show page
qqdipps Apr 29, 2019
b84cb05
add error messages, fixed user loggin invlaid render and tests
qqdipps Apr 29, 2019
c092b30
votes added to
qqdipps Apr 29, 2019
2dac23d
trouble shooting deployment
qqdipps Apr 29, 2019
301c765
trouble shooting deployment
qqdipps Apr 29, 2019
37e2cd2
trouble shooting deployment
qqdipps Apr 29, 2019
05ef9cd
added form layout
qqdipps Apr 29, 2019
d5db252
adding bows
qqdipps Apr 29, 2019
a6e62dd
fixed font
qqdipps Apr 29, 2019
e3209af
added missing test for dependent validation work-vote destroy
qqdipps Apr 29, 2019
84eeb4c
missing /
qqdipps Apr 29, 2019
b757f82
added controller filter
qqdipps Apr 29, 2019
14da547
removed extra text
qqdipps Apr 29, 2019
1dc39fb
added travis yml
qqdipps May 15, 2019
2725d14
making changes to test travis ci
qqdipps May 15, 2019
fb03233
fixed file
qqdipps May 15, 2019
d7fea8a
adjusting tests to pass travis build
qqdipps May 15, 2019
553e284
Merge pull request #1 from qqdipps/testing-travis
qqdipps May 15, 2019
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
29 changes: 29 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore all logfiles and tempfiles.
/log/*
/tmp/*
!/log/.keep
!/tmp/.keep

# Ignore uploaded files in development
/storage/*
!/storage/.keep

/node_modules
/yarn-error.log

/public/assets
.byebug_history

# Ignore master key for decrypting credentials and more.
/config/master.key

temp.rb
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ruby-2.5.1
14 changes: 14 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
language: ruby

rvm:
- 2.5.1

services:
- postgresql

before_script:
- bin/rails db:create
- bin/rails db:migrate

script:
- bin/rails test
83 changes: 83 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.5.1'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 5.2.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 3.11'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'mini_racer', platforms: :ruby

# Use CoffeeScript for .coffee assets and views
# gem 'coffee-rails', '~> 4.2'
# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
gem 'turbolinks', '~> 5'
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.5'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use ActiveStorage variant
# gem 'mini_magick', '~> 4.8'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.1.0', require: false

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]
end

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

group :test do
# Adds support for Capybara system testing and selenium driver
gem 'capybara', '>= 2.15'
gem 'selenium-webdriver'
# Easy installation and use of chromedriver to run system tests with Chrome
gem 'chromedriver-helper'
end

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

gem 'jquery-rails'
gem 'jquery-turbolinks'
gem 'bootstrap', '~> 4.1.3'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
gem 'guard'
gem 'guard-minitest'
end

group :test do
gem 'minitest-rails'
gem 'minitest-reporters'
end

gem 'csv'
Loading