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

Earth - Ana #47

Open
wants to merge 47 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
47 commits
Select commit Hold shift + click to select a range
05bc37a
Initital Rails Setup
anakp07 Nov 9, 2020
9c6301d
created Works controller
anakp07 Nov 10, 2020
2e86f53
created a Work model
anakp07 Nov 10, 2020
7df1a18
create the database and migrated, I also added RESTful routes for Wor…
anakp07 Nov 11, 2020
d7eb37f
seeded data
anakp07 Nov 11, 2020
1760d3e
Work Controller Methods for : Index, Show, New, Create, Edit and Update
anakp07 Nov 11, 2020
0215fe2
updated the Works controller and attempted tests
anakp07 Nov 11, 2020
6a99000
created edit/index/new/show html.erb files for Works Views
Nov 11, 2020
6196120
created an User model/controller and updated the db
Nov 12, 2020
d22001c
CRUD for Works
Nov 12, 2020
5d120f5
Model tests for Works validation created and passing. Also updated W…
Nov 13, 2020
b004156
updated the Works views, Created methods for User Controller and tests
Nov 13, 2020
cb654b7
Login tests passing for Users controller
Nov 13, 2020
40f918d
created Vote model, added indirect relationships
Nov 13, 2020
73233d5
User controller login/logout methods and tests passing
Nov 13, 2020
ef801d1
updated the views for homepage and index
Nov 13, 2020
63726be
updated index view with buttons
Nov 13, 2020
4fa9406
updated the index view
Nov 14, 2020
d5b3b33
added methods to Votes controller for voting
Nov 14, 2020
4e80357
crated new Views for Users and updated them
Nov 14, 2020
44645bd
modified controllers
Nov 14, 2020
09259c6
updated index/show tables to include upvoting
Nov 14, 2020
ff051f7
updated the Works show page to include votes
Nov 14, 2020
fd9013e
I updated the layout view for application by adding navigation to spa…
Nov 15, 2020
7f95904
updated spolight medthod and implemented on homepage, and removed nav…
Nov 15, 2020
1efea25
fixed minor bugs for flash messages
Nov 15, 2020
306abf8
minor formatting in views
Nov 15, 2020
7ff234f
cleaned up the forms
Nov 15, 2020
e6575df
updated buttons for Works show page
Nov 15, 2020
7c1f5d0
cleaned up layout for Views
Nov 15, 2020
df403e5
updated the main homepage to include top ten
Nov 15, 2020
b3c6f62
created YML files for Works Model tests - validation tests passing fo…
Nov 16, 2020
137bdfb
adding some styling,updated homepage
Nov 16, 2020
1f5080d
updating styling
Nov 16, 2020
ec631ed
created spotlight tests and are passing
Nov 16, 2020
d088aef
updated fixtures and top_ten test for works passing
Nov 16, 2020
5661c63
created User Model tests, login passing
Nov 16, 2020
fb3df69
working on Votes/User tests
Nov 16, 2020
e5825d3
User validations/realtionships created and passing
Nov 16, 2020
abd7242
Vote Model tests passing
Nov 16, 2020
e9dcbfd
final tests created and passing
Nov 16, 2020
3d84423
cleaned up files, finished project minus deployment
Nov 17, 2020
e952a49
updated css styling
Nov 17, 2020
6a8ec75
Ignore .env file
Nov 28, 2020
bcf3e1d
working on OAuth
Nov 28, 2020
f046d33
updates
Nov 28, 2020
a96dce0
began oAuth but on wrong file
Nov 29, 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
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
6 changes: 6 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/.rakeTasks

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 116 additions & 0 deletions .idea/media-ranker.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

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