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

fire | sandy #39

Open
wants to merge 78 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
76d0d48
Initial Rails commit
Nov 10, 2020
d26933a
Css styling, favicon, sample method working for spotlight
Nov 12, 2020
f0a656c
Css styling, favicon, sample method working for spotlight
Nov 12, 2020
0917378
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
fd5d989
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
f647698
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
861eb74
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
1d5901c
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
2ff9260
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
19d942c
Troubleshooting favicon, adding favicon to index.html.erb
Nov 12, 2020
a95fce3
Favicon troubleshooting
Nov 13, 2020
0a46fa5
Favicon troubleshooting
Nov 13, 2020
1a5d6c4
Fixed paths, added user and work migrations and started logic for votes
Nov 16, 2020
16aa480
Fixed paths, added user and work migrations and started logic for votes
Nov 16, 2020
e01c958
Fixed routes, wrote partials tests, and created loops for all media page
Nov 16, 2020
ea7bce1
Wrote validation tests for models, created login for the user, fixed …
Nov 17, 2020
8f2dce0
Moved styling to application.html.erb to DRY up code
Nov 17, 2020
b84a366
wrote login action, and validation tests for models
Nov 18, 2020
fa18082
changed vote count in view
Nov 18, 2020
9e474ae
renamed method
Nov 18, 2020
8801f2f
renamed method
Nov 18, 2020
78b6551
adding tests for user_controller
Nov 19, 2020
215cca7
troubleshooting
Dec 2, 2020
e604f4e
added functionality for log out
Dec 2, 2020
d954a9e
fixed broken view and added resources route to work
Dec 2, 2020
7c61072
Added more specific error message when unable to create work
Dec 2, 2020
56b5047
working on relation testing for user and work model
Dec 2, 2020
22da3ea
Added top 10 method
Dec 4, 2020
bc2e6a6
removed gemfile.lock to fix bug
Dec 3, 2021
c6d3a40
first heroku deployment
Dec 3, 2021
330c24a
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
d795a68
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
d91480c
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
aed57f7
updating gemfile
Dec 3, 2021
29c4b72
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
537ec37
update ruby version
Dec 3, 2021
232497b
update ruby version
Dec 3, 2021
d671e95
update ruby version
Dec 3, 2021
54b7bb6
update ruby version
Dec 3, 2021
85a6d31
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
f03287f
update ruby version
Dec 3, 2021
9c1d636
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
3f90b73
update ruby version
Dec 3, 2021
acf2562
update ruby version
Dec 3, 2021
c7cf783
update ruby version
Dec 3, 2021
f2461f8
update ruby version
Dec 3, 2021
4f63447
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
0227f0d
update ruby version
Dec 3, 2021
d59fded
update ruby version
Dec 3, 2021
0a87591
update ruby version
Dec 3, 2021
2e73cfe
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
583d961
update ruby version
Dec 3, 2021
878a78e
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
056c71c
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
d2f4c9d
update ruby version
Dec 3, 2021
e285ad1
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
f124a55
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
e029021
update ruby version
Dec 3, 2021
3467060
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
53b865c
update ruby version
Dec 3, 2021
8f513cd
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
930c7cf
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
7caa60c
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
d33ef2b
Trigger Heroku deploy after enabling collectstatic
Dec 3, 2021
ab7c449
Upgrade to heroku-18
Dec 3, 2021
0a6d57e
Upgrade to heroku-20
Dec 3, 2021
87462b7
Upgrade to heroku-20
Dec 3, 2021
f10702f
Upgrade to heroku-20
Dec 3, 2021
4cefc61
empty
Dec 3, 2021
89342c0
Upgrade to heroku-20
Dec 3, 2021
44eab41
fixing extra space
Dec 3, 2021
7cab32c
Upgrade to heroku-20
Dec 3, 2021
9bba7e6
Upgrade to heroku-20
Dec 3, 2021
cf6e887
Upgrade to heroku-20
Dec 3, 2021
76ee532
Upgrade to heroku-20
Dec 3, 2021
11b8e0d
init
Dec 5, 2021
3f7cb44
chaning ruby v
Dec 5, 2021
164a92a
chaning ruby v
Dec 5, 2021
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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
Empty file modified .github/PULL_REQUEST_TEMPLATE
100644 → 100755
Empty file.
Empty file modified .github/workflows/tests.yml
100644 → 100755
Empty file.
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# 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
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', '>= 6.0.3.4'
# 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