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

Water - Kayla Johnson #40

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
b172a10
Initial Rails setup
Kaylaj89 Nov 10, 2020
7dbd1a7
Added models (User, Work, Vote) as well as updated seeds.rb file
Kaylaj89 Nov 11, 2020
cbb8a29
Ran first rails migration--schema updated
Kaylaj89 Nov 11, 2020
5f8640e
Added relationships between models (has_many and belongs_to and has_m…
Kaylaj89 Nov 11, 2020
2e33988
Seeded database
Kaylaj89 Nov 11, 2020
256d7fe
Added Works Controller
Kaylaj89 Nov 11, 2020
948a7cf
added homepage controller and works routes
Kaylaj89 Nov 11, 2020
b705f48
Fully implemented CRUD for work controller
Kaylaj89 Nov 11, 2020
343c16f
Added view pages to works (index,show,edit,new,form) and added index …
Kaylaj89 Nov 11, 2020
09f811d
Added basic html to homepage and application layouts
Kaylaj89 Nov 11, 2020
83095cb
Had to reseed database because I accidentally created wrong row in wo…
Kaylaj89 Nov 12, 2020
ec433e8
Added favicon. Still figuring out category separation
Kaylaj89 Nov 12, 2020
43a8b7f
Added styling to header and have first set of top ten logic on homepage
Kaylaj89 Nov 12, 2020
a76e4c3
Front-end stuff and set up view all media
Kaylaj89 Nov 13, 2020
806ab99
Added votes and users controller
Kaylaj89 Nov 13, 2020
c143b7a
Added form to new work page
Kaylaj89 Nov 13, 2020
10299fe
Added a create work form--can now add to the db from the website
Kaylaj89 Nov 13, 2020
0801ca1
Added buttons to work show page
Kaylaj89 Nov 13, 2020
2c8ce1c
Added upvote button to 'view all media'
Kaylaj89 Nov 13, 2020
bc653d0
Began working on user pages and functions
Kaylaj89 Nov 13, 2020
8dbe1a9
Created yaml file and started testing work model
Kaylaj89 Nov 13, 2020
366c421
Added validation to work title
Kaylaj89 Nov 13, 2020
7f8447a
Styled flash messages
Kaylaj89 Nov 13, 2020
53478b0
More styling to homepage
Kaylaj89 Nov 13, 2020
b4ed8d5
Changed column name in the user table from 'name' to 'username'
Kaylaj89 Nov 13, 2020
902117a
Created new user routes and began testing user controller
Kaylaj89 Nov 13, 2020
2a57307
Created login form and restyled homepage login button and added new l…
Kaylaj89 Nov 13, 2020
24cd002
Updated login controller for user and can now log into website
Kaylaj89 Nov 13, 2020
2ccc7c1
created test method for logout, created logout method, wrote login/lo…
Kaylaj89 Nov 14, 2020
c26e1f5
Worked on a 'logged in as ..' button. Not displaying username yet
Kaylaj89 Nov 14, 2020
60deda8
Added controller filter to works controller
Kaylaj89 Nov 14, 2020
549a370
Added before-action to votes controller
Kaylaj89 Nov 14, 2020
a931f42
added and deleted some tests from works_controller
Kaylaj89 Nov 14, 2020
70ff54e
change to test branches
Kaylaj89 Nov 14, 2020
9092f8f
Validation added to user model
Kaylaj89 Nov 14, 2020
509d004
Added instance variables to hompeages controller so that I can use th…
Kaylaj89 Nov 14, 2020
03bec69
Nested Route: Added vote path for posting votes to works
Kaylaj89 Nov 15, 2020
fc7b3f5
table of votes for work now showing with correct date format
Kaylaj89 Nov 15, 2020
b608a65
User Show page is showing votes
Kaylaj89 Nov 15, 2020
f3927a2
RESOLVED BUG--when item deleted from repository, user show page didn'…
Kaylaj89 Nov 16, 2020
9892358
Username displaying on 'logged in' button
Kaylaj89 Nov 16, 2020
2e14821
Spotlight Method added to homepages controller. Bootstrap styling add…
Kaylaj89 Nov 16, 2020
fd5d242
Homepage top ten method completed in homepages controller
Kaylaj89 Nov 16, 2020
11d1c0d
Works Index page sorting by top votes method complete. Added instance…
Kaylaj89 Nov 16, 2020
e29758a
Homepage styling css complete
Kaylaj89 Nov 16, 2020
1617717
Added some more small css changes
Kaylaj89 Nov 16, 2020
4185cf2
Redirect path changed for voting w/out logging in
Kaylaj89 Nov 16, 2020
4077d1d
css added to homepage and show page
Kaylaj89 Nov 16, 2020
4eccf0b
Added last-minute changes and procfile for heroku
Kaylaj89 Nov 16, 2020
4ee1022
init
Kaylaj89 Nov 16, 2020
d20cdf2
code
Kaylaj89 Nov 16, 2020
a6bef9a
heroku
Kaylaj89 Nov 16, 2020
34433fd
procfile
Kaylaj89 Nov 16, 2020
d6f01f2
added logic to spotlight method
Kaylaj89 Nov 16, 2020
ef551ca
heroku deletion>
Kaylaj89 Nov 16, 2020
ba95bf2
Deleted some issues with bootstrap
Kaylaj89 Nov 16, 2020
13d42df
More heroku cleanup
Kaylaj89 Nov 16, 2020
a6277f6
Deleted procfile
Kaylaj89 Nov 16, 2020
174f542
Added functionality in case no works
Kaylaj89 Nov 16, 2020
3b79aaf
init
Kaylaj89 Nov 16, 2020
4bbbac9
Removed favicon and homepages resources
Kaylaj89 Nov 16, 2020
e9ed886
Still working on heroku
Kaylaj89 Nov 16, 2020
f40bf08
Adding spotlight and top ten to model controller--late entry
Kaylaj89 Nov 17, 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
1 change: 1 addition & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
defaults
8 changes: 8 additions & 0 deletions .generators
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<Settings><!--This file was automatically generated by Ruby plugin.
You are allowed to:
1. Reorder generators
2. Remove generators
3. Add installed generators
To add new installed generators automatically delete this file and reload the project.
--><GeneratorsGroup><Generator name="active_record:application_record" /><Generator name="application_record" /><Generator name="assets" /><Generator name="channel" /><Generator name="controller" /><Generator name="generator" /><Generator name="helper" /><Generator name="integration_test" /><Generator name="jbuilder" /><Generator name="job" /><Generator name="mailbox" /><Generator name="mailer" /><Generator name="migration" /><Generator name="minitest:generator" /><Generator name="minitest:install" /><Generator name="minitest:plugin" /><Generator name="model" /><Generator name="resource" /><Generator name="scaffold" /><Generator name="scaffold_controller" /><Generator name="system_test" /><Generator name="task" /><Generator name="test_unit:channel" /><Generator name="test_unit:controller" /><Generator name="test_unit:generator" /><Generator name="test_unit:helper" /><Generator name="test_unit:integration" /><Generator name="test_unit:job" /><Generator name="test_unit:mailbox" /><Generator name="test_unit:mailer" /><Generator name="test_unit:model" /><Generator name="test_unit:plugin" /><Generator name="test_unit:scaffold" /><Generator name="test_unit:system" /></GeneratorsGroup></Settings>
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
7 changes: 7 additions & 0 deletions .rakeTasks

Large diffs are not rendered by default.

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