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

Space - Nora #37

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
5c979e4
Initial Rails setup
thenora May 14, 2020
a844493
update git ignore
thenora May 14, 2020
437ac78
setup seeds
thenora May 19, 2020
13df288
added works controller & home view
thenora May 19, 2020
71452a8
added sort and popular to work model
thenora May 20, 2020
eaf5e54
added methods to works controller
thenora May 20, 2020
b527c53
added routes
thenora May 20, 2020
0c3b7a6
added data types
thenora May 20, 2020
3560f77
added nav to application view
thenora May 20, 2020
cff85b8
added work test file
thenora May 20, 2020
85b381f
removed mention of pizza :(
thenora May 20, 2020
7a44fc2
seeded data again
thenora May 20, 2020
66a45bf
added movies to seeds
thenora May 20, 2020
d54636c
fake top 10 media displaying on home
thenora May 20, 2020
a05d888
added spotlight sample
thenora May 20, 2020
4d3ccda
added validation
thenora May 20, 2020
9157094
cleaned up spacing
thenora May 20, 2020
3939b93
added path links to nav
thenora May 20, 2020
79d3e84
added missing comma
thenora May 20, 2020
d911e81
index page setup
thenora May 20, 2020
2e713d8
created work form partial
thenora May 20, 2020
0e2283e
new form setup
thenora May 20, 2020
af5b42e
created works show
thenora May 20, 2020
e464cdb
fixed typo
thenora May 20, 2020
141f5eb
added edit work
thenora May 20, 2020
b0f600c
created works fixture
thenora May 20, 2020
ee88a69
added TODOs to test_helper
thenora May 20, 2020
0f3fe82
test helper TODO
thenora May 20, 2020
9bae139
added unique to title validations
thenora May 20, 2020
76439fa
v1 works tests
thenora May 20, 2020
3038323
fixed delete
thenora May 20, 2020
4170d95
test tweaks
thenora May 20, 2020
8558d99
Merge branch 'not-pizza'
thenora May 20, 2020
a9beb11
added more validation tests and fixed unique title
thenora May 20, 2020
409539b
added case sensitive title test
thenora May 21, 2020
6f5697c
added User controller & index and show view
thenora May 21, 2020
352ffec
updated routes - moved votes under workds
thenora May 21, 2020
dbbef9c
added controller methods
thenora May 21, 2020
3347797
added flash styling notes to application view
thenora May 21, 2020
405f567
copied user login from live site
thenora May 21, 2020
d8f82aa
added code to login form
thenora May 21, 2020
0d2c597
removed TODO from form
thenora May 21, 2020
1a0c307
added code to user index
thenora May 21, 2020
8121e1a
created user model
thenora May 21, 2020
6cc0a99
added has many and validates to user model
thenora May 21, 2020
360835f
oops. Missnamed controler user not users
thenora May 22, 2020
dca60e2
fixed login form not displaying
thenora May 22, 2020
d869695
fixed form
thenora May 22, 2020
ecdb12e
updated list of users
thenora May 22, 2020
8c25967
basic show user page setup
thenora May 22, 2020
16e30a6
add votes model
thenora May 22, 2020
649ed12
added has many to work
thenora May 22, 2020
da95390
add vote relations to users
thenora May 22, 2020
5d1ecc7
add votes relationship to works
thenora May 22, 2020
4c6c7a6
added votes controller
thenora May 22, 2020
bac2b9e
added require login to application controller
thenora May 22, 2020
d5bb847
created vote helper method
thenora May 22, 2020
f5492b7
added before actions for logins
thenora May 22, 2020
2d0038d
added belongs to and validation to vote model
thenora May 23, 2020
8431ede
added votes count to home
thenora May 23, 2020
04b3c45
added votes and description to spotlight
thenora May 23, 2020
8a31e1a
added votes and vote button to list of works
thenora May 23, 2020
8929b53
fixed wrong link in logged in button
thenora May 23, 2020
a7d03a1
add foreign key to users
thenora May 23, 2020
5ec0a70
add foreign key schema
thenora May 23, 2020
7b6f2fe
corrected added foreign key correctly to user
thenora May 23, 2020
092ca8f
VOTING IS WORKING!
thenora May 23, 2020
8baa6e1
fixed top movies & sort order & spotlight
thenora May 23, 2020
56d1893
added votes to works view
thenora May 23, 2020
9809412
added votes to users view
thenora May 23, 2020
e5e0930
added flash message to application view
thenora May 23, 2020
1890bec
added vote count to user index
thenora May 23, 2020
52a29cd
fixed date format
thenora May 23, 2020
b786d50
indentation change
thenora May 23, 2020
f481eeb
first take at css styling
thenora May 24, 2020
02f4814
added dependent destroy to has many votes
thenora May 24, 2020
0c3059c
added main tag to application surrounding yield
thenora May 24, 2020
6368d12
small css experiments
thenora May 24, 2020
f5d95c2
added user and vote fixtures
thenora May 24, 2020
769e841
added missing class to nav links
thenora May 24, 2020
231a0b3
added user tests
thenora May 24, 2020
7bc216f
tweaks to user test
thenora May 24, 2020
fe4140b
added validation tests & tweaked model validation
thenora May 25, 2020
c56a1b9
removed comments
thenora May 25, 2020
980e270
added votes relationships
thenora May 25, 2020
0fa2a18
clean up user model test spacing
thenora May 25, 2020
21bedef
deleted comments
thenora May 25, 2020
c7e0d0f
added more work tests
thenora May 25, 2020
984e056
added and tweaked error messaging
thenora May 25, 2020
b812c38
tweaked css styling
thenora May 25, 2020
894c044
styling tweaks to alerts
thenora May 25, 2020
5e5cce6
hiding all users list if not logged in
thenora May 25, 2020
c98a6f2
cleaned up old TODOs
thenora May 25, 2020
125f1ca
fixed date formatting
thenora May 25, 2020
973c013
added partials
thenora May 25, 2020
0819050
upload errors because of migrations - removing files
thenora May 25, 2020
09e137c
added edge case and if show to index works
thenora May 26, 2020
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
Binary file added .DS_Store
Binary file not shown.
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
40 changes: 40 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
# 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 pidfiles, but keep the directory.
/tmp/pids/*
!/tmp/pids/
!/tmp/pids/.keep

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

/public/assets
.byebug_history

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

/public/packs
/public/packs-test
/node_modules
/yarn-error.log
yarn-debug.log*
.yarn-integrity


# Ignore sample files
storage/
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
2.6.5
78 changes: 78 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
source 'https://rubygems.org'
git_source(:github) { |repo| "https://github.com/#{repo}.git" }

ruby '2.6.5'

# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '~> 6.0.3'
# Use postgresql as the database for Active Record
gem 'pg', '>= 0.18', '< 2.0'
# Use Puma as the app server
gem 'puma', '~> 4.1'
# Use SCSS for stylesheets
gem 'sass-rails', '>= 6'
# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
gem 'webpacker', '~> 4.0'
# 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.7'
# Use Redis adapter to run Action Cable in production
# gem 'redis', '~> 4.0'
# Use Active Model has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Active Storage variant
# gem 'image_processing', '~> 1.2'

# Reduces boot times through caching; required in config/boot.rb
gem 'bootsnap', '>= 1.4.2', 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.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 web drivers to run system tests with browsers
gem 'webdrivers'
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'
group :development, :test do
gem 'pry-rails'
end

group :development do
gem 'guard'
gem 'guard-minitest'
gem 'debase', '>= 0.2.4.1'
gem 'ruby-debug-ide', '>= 0.7.0'
end

group :development do
gem 'better_errors'
gem 'binding_of_caller'
end

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