diff --git a/.ruby-version b/.ruby-version
index bff6ce5c..ef538c28 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-ruby-2.7.1
+3.1.2
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 00000000..6da6866f
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1,2 @@
+ruby 3.1.2
+postgres 14.4
diff --git a/Gemfile b/Gemfile
index 0eb15ca0..513ca7fd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,23 +1,52 @@
source 'https://rubygems.org'
-ruby '2.7.1'
-gem 'byebug', platforms: [:mri, :mingw, :x64_mingw], group: [:development, :test]
-gem 'capybara', group: [:development, :test]
+ruby File.read('.ruby-version').chomp
+
+# gem 'byebug', platforms: [:mri, :mingw, :x64_mingw], group: [:development, :test]
+# gem 'capybara', group: [:development, :test]
gem 'coffee-rails'
gem 'devise'
-gem 'haml'
gem 'jbuilder'
gem 'listen', group: :development
gem 'pg'
gem 'pry-rails'
gem 'puma'
-gem 'rails'
+gem 'rails', '~> 7.0.3'
gem 'rspec-rails'
gem 'sass-rails'
gem 'selenium-webdriver', group: [:development, :test]
gem 'spring', group: :development
-gem 'spring-watcher-listen', group: :development
gem 'turbolinks'
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'uglifier'
gem 'web-console', group: :development
+gem 'rest-client'
+gem 'dotenv-rails'
+gem 'faraday'
+gem 'bcrypt'
+
+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]
+ # Adds support for Capybara system testing and webdrivers
+ gem 'capybara'
+ gem 'webdrivers'
+ gem 'better_errors'
+ gem 'binding_of_caller'
+ gem 'meta_request'
+ gem 'hirb'
+ gem 'faker'
+ gem 'populator'
+ gem 'factory_bot_rails'
+ gem 'simplecov'
+ gem 'shoulda'
+ gem 'shoulda-matchers', '2.8.0'
+ gem 'minitest'
+ gem 'minitest-rails'
+ gem 'minitest-reporters'
+ gem 'rails-controller-testing'
+ gem 'database_cleaner', '1.8.5'
+ gem 'launchy', '2.5.0'
+ gem 'bigdecimal', '1.3.0'
+ end
+
diff --git a/Gemfile.lock b/Gemfile.lock
index 677b6269..f3d291a9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,80 +1,94 @@
GEM
remote: https://rubygems.org/
specs:
- actioncable (6.1.4)
- actionpack (= 6.1.4)
- activesupport (= 6.1.4)
+ actioncable (7.0.5)
+ actionpack (= 7.0.5)
+ activesupport (= 7.0.5)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.1.4)
- actionpack (= 6.1.4)
- activejob (= 6.1.4)
- activerecord (= 6.1.4)
- activestorage (= 6.1.4)
- activesupport (= 6.1.4)
+ actionmailbox (7.0.5)
+ actionpack (= 7.0.5)
+ activejob (= 7.0.5)
+ activerecord (= 7.0.5)
+ activestorage (= 7.0.5)
+ activesupport (= 7.0.5)
mail (>= 2.7.1)
- actionmailer (6.1.4)
- actionpack (= 6.1.4)
- actionview (= 6.1.4)
- activejob (= 6.1.4)
- activesupport (= 6.1.4)
+ net-imap
+ net-pop
+ net-smtp
+ actionmailer (7.0.5)
+ actionpack (= 7.0.5)
+ actionview (= 7.0.5)
+ activejob (= 7.0.5)
+ activesupport (= 7.0.5)
mail (~> 2.5, >= 2.5.4)
+ net-imap
+ net-pop
+ net-smtp
rails-dom-testing (~> 2.0)
- actionpack (6.1.4)
- actionview (= 6.1.4)
- activesupport (= 6.1.4)
- rack (~> 2.0, >= 2.0.9)
+ actionpack (7.0.5)
+ actionview (= 7.0.5)
+ activesupport (= 7.0.5)
+ rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.1.4)
- actionpack (= 6.1.4)
- activerecord (= 6.1.4)
- activestorage (= 6.1.4)
- activesupport (= 6.1.4)
+ actiontext (7.0.5)
+ actionpack (= 7.0.5)
+ activerecord (= 7.0.5)
+ activestorage (= 7.0.5)
+ activesupport (= 7.0.5)
+ globalid (>= 0.6.0)
nokogiri (>= 1.8.5)
- actionview (6.1.4)
- activesupport (= 6.1.4)
+ actionview (7.0.5)
+ activesupport (= 7.0.5)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.1.4)
- activesupport (= 6.1.4)
+ activejob (7.0.5)
+ activesupport (= 7.0.5)
globalid (>= 0.3.6)
- activemodel (6.1.4)
- activesupport (= 6.1.4)
- activerecord (6.1.4)
- activemodel (= 6.1.4)
- activesupport (= 6.1.4)
- activestorage (6.1.4)
- actionpack (= 6.1.4)
- activejob (= 6.1.4)
- activerecord (= 6.1.4)
- activesupport (= 6.1.4)
- marcel (~> 1.0.0)
+ activemodel (7.0.5)
+ activesupport (= 7.0.5)
+ activerecord (7.0.5)
+ activemodel (= 7.0.5)
+ activesupport (= 7.0.5)
+ activestorage (7.0.5)
+ actionpack (= 7.0.5)
+ activejob (= 7.0.5)
+ activerecord (= 7.0.5)
+ activesupport (= 7.0.5)
+ marcel (~> 1.0)
mini_mime (>= 1.1.0)
- activesupport (6.1.4)
+ activesupport (7.0.5)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
tzinfo (~> 2.0)
- zeitwerk (~> 2.3)
- addressable (2.8.0)
- public_suffix (>= 2.0.2, < 5.0)
- bcrypt (3.1.16)
+ addressable (2.8.4)
+ public_suffix (>= 2.0.2, < 6.0)
+ ansi (1.5.0)
+ bcrypt (3.1.18)
+ better_errors (2.10.0)
+ erubi (>= 1.0.0)
+ rack (>= 0.9.0)
+ rouge (>= 1.0.0)
+ bigdecimal (1.3.0)
bindex (0.8.1)
+ binding_of_caller (1.0.0)
+ debug_inspector (>= 0.0.1)
builder (3.2.4)
byebug (11.1.3)
- capybara (3.35.3)
+ capybara (3.39.1)
addressable
+ matrix
mini_mime (>= 0.1.3)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (>= 1.5, < 3.0)
xpath (~> 3.2)
- childprocess (3.0.0)
coderay (1.1.3)
coffee-rails (5.0.0)
coffee-script (>= 2.2.0)
@@ -83,110 +97,179 @@ GEM
coffee-script-source
execjs
coffee-script-source (1.12.2)
- concurrent-ruby (1.1.9)
+ concurrent-ruby (1.2.2)
crass (1.0.6)
- devise (4.8.0)
+ database_cleaner (1.8.5)
+ date (3.3.3)
+ debug_inspector (1.1.0)
+ devise (4.9.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
responders
warden (~> 1.2.3)
- diff-lcs (1.4.4)
- erubi (1.10.0)
+ diff-lcs (1.5.0)
+ docile (1.4.0)
+ domain_name (0.5.20190701)
+ unf (>= 0.0.5, < 1.0.0)
+ dotenv (2.8.1)
+ dotenv-rails (2.8.1)
+ dotenv (= 2.8.1)
+ railties (>= 3.2)
+ erubi (1.12.0)
execjs (2.8.1)
- ffi (1.15.3)
- globalid (0.4.2)
- activesupport (>= 4.2.0)
- haml (5.2.1)
- temple (>= 0.8.0)
- tilt
- i18n (1.8.10)
+ factory_bot (6.2.1)
+ activesupport (>= 5.0.0)
+ factory_bot_rails (6.2.0)
+ factory_bot (~> 6.2.0)
+ railties (>= 5.0.0)
+ faker (3.2.0)
+ i18n (>= 1.8.11, < 2)
+ faraday (2.7.5)
+ faraday-net_http (>= 2.0, < 3.1)
+ ruby2_keywords (>= 0.0.4)
+ faraday-net_http (3.0.2)
+ ffi (1.15.5)
+ globalid (1.1.0)
+ activesupport (>= 5.0)
+ hirb (0.7.3)
+ http-accept (1.7.0)
+ http-cookie (1.0.5)
+ domain_name (~> 0.5)
+ i18n (1.13.0)
concurrent-ruby (~> 1.0)
- jbuilder (2.11.2)
+ jbuilder (2.11.5)
+ actionview (>= 5.0.0)
activesupport (>= 5.0.0)
- listen (3.5.1)
+ launchy (2.5.0)
+ addressable (~> 2.7)
+ listen (3.8.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
- loofah (2.10.0)
+ loofah (2.21.3)
crass (~> 1.0.2)
- nokogiri (>= 1.5.9)
- mail (2.7.1)
+ nokogiri (>= 1.12.0)
+ mail (2.8.1)
mini_mime (>= 0.1.1)
- marcel (1.0.1)
+ net-imap
+ net-pop
+ net-smtp
+ marcel (1.0.2)
+ matrix (0.4.2)
+ meta_request (0.7.4)
+ rack-contrib (>= 1.1, < 3)
+ railties (>= 3.0.0, < 7.1)
method_source (1.0.0)
- mini_mime (1.1.0)
- mini_portile2 (2.5.3)
- minitest (5.14.4)
- nio4r (2.5.8)
- nokogiri (1.11.7)
- mini_portile2 (~> 2.5.0)
+ mime-types (3.4.1)
+ mime-types-data (~> 3.2015)
+ mime-types-data (3.2023.0218.1)
+ mini_mime (1.1.2)
+ mini_portile2 (2.8.2)
+ minitest (5.18.0)
+ minitest-rails (7.0.0)
+ minitest (~> 5.10)
+ railties (~> 7.0.0)
+ minitest-reporters (1.6.0)
+ ansi
+ builder
+ minitest (>= 5.0)
+ ruby-progressbar
+ net-imap (0.3.4)
+ date
+ net-protocol
+ net-pop (0.1.2)
+ net-protocol
+ net-protocol (0.2.1)
+ timeout
+ net-smtp (0.3.3)
+ net-protocol
+ netrc (0.11.0)
+ nio4r (2.5.9)
+ nokogiri (1.15.2)
+ mini_portile2 (~> 2.8.2)
racc (~> 1.4)
orm_adapter (0.5.0)
- pg (1.2.3)
- pry (0.14.1)
+ pg (1.5.3)
+ populator (1.0.0)
+ pry (0.14.2)
coderay (~> 1.1)
method_source (~> 1.0)
pry-rails (0.3.9)
pry (>= 0.10.4)
- public_suffix (4.0.6)
- puma (5.6.2)
+ public_suffix (5.0.1)
+ puma (6.2.2)
nio4r (~> 2.0)
- racc (1.5.2)
- rack (2.2.3)
- rack-test (1.1.0)
- rack (>= 1.0, < 3)
- rails (6.1.4)
- actioncable (= 6.1.4)
- actionmailbox (= 6.1.4)
- actionmailer (= 6.1.4)
- actionpack (= 6.1.4)
- actiontext (= 6.1.4)
- actionview (= 6.1.4)
- activejob (= 6.1.4)
- activemodel (= 6.1.4)
- activerecord (= 6.1.4)
- activestorage (= 6.1.4)
- activesupport (= 6.1.4)
+ racc (1.6.2)
+ rack (2.2.7)
+ rack-contrib (2.3.0)
+ rack (~> 2.0)
+ rack-test (2.1.0)
+ rack (>= 1.3)
+ rails (7.0.5)
+ actioncable (= 7.0.5)
+ actionmailbox (= 7.0.5)
+ actionmailer (= 7.0.5)
+ actionpack (= 7.0.5)
+ actiontext (= 7.0.5)
+ actionview (= 7.0.5)
+ activejob (= 7.0.5)
+ activemodel (= 7.0.5)
+ activerecord (= 7.0.5)
+ activestorage (= 7.0.5)
+ activesupport (= 7.0.5)
bundler (>= 1.15.0)
- railties (= 6.1.4)
- sprockets-rails (>= 2.0.0)
+ railties (= 7.0.5)
+ rails-controller-testing (1.0.5)
+ actionpack (>= 5.0.1.rc1)
+ actionview (>= 5.0.1.rc1)
+ activesupport (>= 5.0.1.rc1)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
nokogiri (>= 1.6)
- rails-html-sanitizer (1.3.0)
- loofah (~> 2.3)
- railties (6.1.4)
- actionpack (= 6.1.4)
- activesupport (= 6.1.4)
+ rails-html-sanitizer (1.5.0)
+ loofah (~> 2.19, >= 2.19.1)
+ railties (7.0.5)
+ actionpack (= 7.0.5)
+ activesupport (= 7.0.5)
method_source
- rake (>= 0.13)
+ rake (>= 12.2)
thor (~> 1.0)
- rake (13.0.3)
- rb-fsevent (0.11.0)
+ zeitwerk (~> 2.5)
+ rake (13.0.6)
+ rb-fsevent (0.11.2)
rb-inotify (0.10.1)
ffi (~> 1.0)
- regexp_parser (2.1.1)
- responders (3.0.1)
- actionpack (>= 5.0)
- railties (>= 5.0)
- rspec-core (3.10.1)
- rspec-support (~> 3.10.0)
- rspec-expectations (3.10.1)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.10.0)
- rspec-mocks (3.10.2)
- diff-lcs (>= 1.2.0, < 2.0)
- rspec-support (~> 3.10.0)
- rspec-rails (5.0.1)
+ regexp_parser (2.8.0)
+ responders (3.1.0)
actionpack (>= 5.2)
- activesupport (>= 5.2)
railties (>= 5.2)
- rspec-core (~> 3.10)
- rspec-expectations (~> 3.10)
- rspec-mocks (~> 3.10)
- rspec-support (~> 3.10)
- rspec-support (3.10.2)
- rubyzip (2.3.0)
+ rest-client (2.1.0)
+ http-accept (>= 1.7.0, < 2.0)
+ http-cookie (>= 1.0.2, < 2.0)
+ mime-types (>= 1.16, < 4.0)
+ netrc (~> 0.8)
+ rexml (3.2.5)
+ rouge (4.1.1)
+ rspec-core (3.12.2)
+ rspec-support (~> 3.12.0)
+ rspec-expectations (3.12.3)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.12.0)
+ rspec-mocks (3.12.5)
+ diff-lcs (>= 1.2.0, < 2.0)
+ rspec-support (~> 3.12.0)
+ rspec-rails (6.0.2)
+ actionpack (>= 6.1)
+ activesupport (>= 6.1)
+ railties (>= 6.1)
+ rspec-core (~> 3.12)
+ rspec-expectations (~> 3.12)
+ rspec-mocks (~> 3.12)
+ rspec-support (~> 3.12)
+ rspec-support (3.12.0)
+ ruby-progressbar (1.13.0)
+ ruby2_keywords (0.0.5)
+ rubyzip (2.3.2)
sass-rails (6.0.0)
sassc-rails (~> 2.1, >= 2.1.1)
sassc (2.4.0)
@@ -197,71 +280,109 @@ GEM
sprockets (> 3.0)
sprockets-rails
tilt
- selenium-webdriver (3.142.7)
- childprocess (>= 0.5, < 4.0)
- rubyzip (>= 1.2.2)
- spring (2.1.1)
- spring-watcher-listen (2.0.1)
- listen (>= 2.7, < 4.0)
- spring (>= 1.2, < 3.0)
- sprockets (4.0.2)
+ selenium-webdriver (4.9.1)
+ rexml (~> 3.2, >= 3.2.5)
+ rubyzip (>= 1.2.2, < 3.0)
+ websocket (~> 1.0)
+ shoulda (3.5.0)
+ shoulda-context (~> 1.0, >= 1.0.1)
+ shoulda-matchers (>= 1.4.1, < 3.0)
+ shoulda-context (1.2.2)
+ shoulda-matchers (2.8.0)
+ activesupport (>= 3.0.0)
+ simplecov (0.22.0)
+ docile (~> 1.1)
+ simplecov-html (~> 0.11)
+ simplecov_json_formatter (~> 0.1)
+ simplecov-html (0.12.3)
+ simplecov_json_formatter (0.1.4)
+ spring (4.1.1)
+ sprockets (4.2.0)
concurrent-ruby (~> 1.0)
- rack (> 1, < 3)
- sprockets-rails (3.2.2)
- actionpack (>= 4.0)
- activesupport (>= 4.0)
+ rack (>= 2.2.4, < 4)
+ sprockets-rails (3.4.2)
+ actionpack (>= 5.2)
+ activesupport (>= 5.2)
sprockets (>= 3.0.0)
- temple (0.8.2)
- thor (1.1.0)
- tilt (2.0.10)
+ thor (1.2.2)
+ tilt (2.1.0)
+ timeout (0.3.2)
turbolinks (5.2.1)
turbolinks-source (~> 5.2)
turbolinks-source (5.2.0)
- tzinfo (2.0.4)
+ tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
uglifier (4.2.0)
execjs (>= 0.3.0, < 3)
+ unf (0.1.4)
+ unf_ext
+ unf_ext (0.0.8.2)
warden (1.2.9)
rack (>= 2.0.9)
- web-console (4.1.0)
+ web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
railties (>= 6.0.0)
+ webdrivers (5.2.0)
+ nokogiri (~> 1.6)
+ rubyzip (>= 1.3.0)
+ selenium-webdriver (~> 4.0)
+ websocket (1.2.9)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
xpath (3.2.0)
nokogiri (~> 1.8)
- zeitwerk (2.4.2)
+ zeitwerk (2.6.8)
PLATFORMS
ruby
DEPENDENCIES
+ bcrypt
+ better_errors
+ bigdecimal (= 1.3.0)
+ binding_of_caller
byebug
capybara
coffee-rails
+ database_cleaner (= 1.8.5)
devise
- haml
+ dotenv-rails
+ factory_bot_rails
+ faker
+ faraday
+ hirb
jbuilder
+ launchy (= 2.5.0)
listen
+ meta_request
+ minitest
+ minitest-rails
+ minitest-reporters
pg
+ populator
pry-rails
puma
- rails
+ rails (~> 7.0.3)
+ rails-controller-testing
+ rest-client
rspec-rails
sass-rails
selenium-webdriver
+ shoulda
+ shoulda-matchers (= 2.8.0)
+ simplecov
spring
- spring-watcher-listen
turbolinks
tzinfo-data
uglifier
web-console
+ webdrivers
RUBY VERSION
- ruby 2.7.1p83
+ ruby 3.1.2p20
BUNDLED WITH
- 2.2.16
+ 2.3.22
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 1c07694e..3f10acdb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -1,3 +1,19 @@
class ApplicationController < ActionController::Base
protect_from_forgery with: :exception
+
+ before_action :configure_permitted_parameters, if: :devise_controller?
+
+ protected
+
+ def configure_permitted_parameters
+ # registration_params = [:first_name, :last_name, :email, :password, ]
+
+ devise_parameter_sanitizer.permit(:sign_up, keys: [:first_name, :last_name, :email, :password])
+
+ # if params[:action] == 'create'
+ # devise_parameter_sanitizer.for(:sign_up) do
+ # |u| u.permit(registration_params)
+ # end
+ # end end
+ end
end
diff --git a/app/controllers/articles_controller.rb b/app/controllers/articles_controller.rb
new file mode 100644
index 00000000..db32eeb7
--- /dev/null
+++ b/app/controllers/articles_controller.rb
@@ -0,0 +1,39 @@
+class ArticlesController < ApplicationController
+
+ def index
+ @articles = Rails.cache.fetch(["top_stories_details"], expires_in: 4.hours) do
+ HackerNews.get_top_stories()
+ end
+
+ @liked_articles = (Article.has_likes.alphabetical.to_a).sort_by{|art| art.user_articles.count}.reverse
+ end
+
+ def liked_articles
+ # sort liked articles by how many likes they have
+ @articles = (Article.has_likes.alphabetical.to_a).sort_by{|art| art.user_articles.count}.reverse
+ end
+
+
+ def show
+ @article = Article.find_by(:article_id => params[:id])
+ if @article.nil? # the article has not been liked and therefore is not saved
+ @article = HackerNews.get_details(params[:id])
+ #raise "here"
+ else
+ #raise "here"
+ #@article = Article.find_by(:article_id => params[:id])
+ # set up @users_toggle for whether to show the like button to user (user cannot like same article multiple times)
+ if !@article.user_articles.empty?
+ @users_toggle = @article.user_articles.map{ |ua| ua.user }
+ end
+ end
+ end
+
+ def new
+ @article = Article.new
+ end
+
+ def edit
+ end
+
+end
\ No newline at end of file
diff --git a/app/controllers/services/base.rb b/app/controllers/services/base.rb
new file mode 100644
index 00000000..e3ee74fd
--- /dev/null
+++ b/app/controllers/services/base.rb
@@ -0,0 +1,7 @@
+class Article
+ attr_accessor :id, :title, :author
+
+ def initialize(id)
+ @id = id
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/user_articles_controller.rb b/app/controllers/user_articles_controller.rb
new file mode 100644
index 00000000..65c35da2
--- /dev/null
+++ b/app/controllers/user_articles_controller.rb
@@ -0,0 +1,45 @@
+class UserArticlesController < ApplicationController
+
+ def like
+ @user_article = UserArticle.new()
+
+ # only save article if it hasn't been liked before
+ @article = Article.find_by(:article_id => params[:id])
+
+ if @article.nil?
+ @article = HackerNews.get_details(params[:id])
+ if @article.save
+ #flash[:notice] = "Successfully liked the article"
+ @user_article.article = @article
+ @user_article.user = current_user
+ if @user_article.save
+ flash[:notice] = "Successfully liked the article"
+ redirect_to article_path(@article.article_id)
+ else
+ redirect_to action: "index"
+ end
+ end
+ else
+ # if the article already exists
+ @user_article.article = @article
+ @user_article.user = current_user
+ if @user_article.save
+ flash[:notice] = "Successfully liked the article"
+ redirect_to article_path(@article.article_id)
+ else
+ redirect_to action: "index"
+ end
+ end
+
+ end
+
+ def unlike
+ @article = Article.find_by(:article_id => params[:id])
+ @user_article = UserArticle.find_by(:user => current_user, :article => @article)
+ @user_article.destroy
+ flash[:notice] = "Successfully unliked article"
+ redirect_to article_path(@article.article_id)
+ end
+
+
+end
\ No newline at end of file
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
new file mode 100644
index 00000000..02205ace
--- /dev/null
+++ b/app/controllers/users_controller.rb
@@ -0,0 +1,16 @@
+# require 'dotenv'
+# require 'json'
+# Dotenv.load
+
+class UsersController < ApplicationController
+
+ def destroy
+ @user = User.find(params[:id])
+ @user.destroy
+
+ if @user.destroy
+ redirect_to root_url, notice: "User deleted."
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/app/models/article.rb b/app/models/article.rb
new file mode 100644
index 00000000..d9f59fbb
--- /dev/null
+++ b/app/models/article.rb
@@ -0,0 +1,19 @@
+class Article < ApplicationRecord
+ # Relationships
+ has_many :user_articles
+ has_many :users, through: :user_articles
+
+ # Scopes
+ scope :alphabetical, -> { order('title') }
+ scope :has_likes, -> { Article.includes(:user_articles).where.not(user_articles: { article_id: nil }) }
+
+ # Validations
+ validates_presence_of :article_id, :title, :author, :score, :url
+ validates_numericality_of :score
+
+ def to_sym
+ :read_only
+ end
+
+
+end
diff --git a/app/models/user.rb b/app/models/user.rb
index b2091f9a..e58523a8 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -3,4 +3,13 @@ class User < ApplicationRecord
# :confirmable, :lockable, :timeoutable and :omniauthable
devise :database_authenticatable, :registerable,
:recoverable, :rememberable, :trackable, :validatable
+
+ # Relationships
+ has_many :user_articles
+ has_many :articles, through: :user_articles
+
+ # Validations
+ validates_presence_of :first_name, :last_name, :email, :password
+
end
+
diff --git a/app/models/user_article.rb b/app/models/user_article.rb
new file mode 100644
index 00000000..feea1fb5
--- /dev/null
+++ b/app/models/user_article.rb
@@ -0,0 +1,6 @@
+class UserArticle < ApplicationRecord
+ belongs_to :user
+ belongs_to :article
+
+ validates_presence_of :user_id, :article_id, uniqueness: true
+end
diff --git a/app/services/hacker_news.rb b/app/services/hacker_news.rb
new file mode 100644
index 00000000..4b78011a
--- /dev/null
+++ b/app/services/hacker_news.rb
@@ -0,0 +1,25 @@
+require 'json'
+
+class HackerNews
+ def self.get_top_stories
+ url = "https://hacker-news.firebaseio.com/v0/topstories.json"
+ response = RestClient.get(url)
+ articles_ids = JSON.parse(RestClient.get("https://hacker-news.firebaseio.com/v0/topstories.json")).slice(0, 50)
+ res = articles_ids.map { |article_id| get_details(article_id) }.to_a
+ # sort top stories by score
+ res.sort_by {|art| art.score }.reverse
+ end
+
+ def self.get_details(article_id)
+ response = RestClient.get("https://hacker-news.firebaseio.com/v0/item/" + article_id.to_s + ".json")
+ @article = Article.new()
+ @article.title = JSON.parse(response)['title']
+ @article.author = JSON.parse(response)['by']
+ @article.score = JSON.parse(response)['score']
+ @article.url = JSON.parse(response)['url']
+ @article.article_id = article_id
+
+ return @article
+ end
+
+end
\ No newline at end of file
diff --git a/app/views/articles/_articles.html.erb b/app/views/articles/_articles.html.erb
new file mode 100644
index 00000000..92f53448
--- /dev/null
+++ b/app/views/articles/_articles.html.erb
@@ -0,0 +1,37 @@
+Welcome to Top News
+
+
+
+ Title
+ Author
+ Score
+ Like?
+
+
+<% for article in @articles %>
+
+
+
+ <%= link_to article.title, article_path(article.article_id) %>
+
+ <%= article.author %>
+
+ <%= article.score %>
+
+
+ <% if user_signed_in? %>
+ <%if !article.user_articles&.present?%>
+ <%= link_to 'like',like_path(id:article.article_id), method: :patch%>
+ <%else%>
+ <%= link_to 'unlike',unlike_path(id:article.article_id), method: :patch%>
+ <% end -%>
+ <%else%>
+ please sign in to like articles
+ <% end -%>
+
+
+
+
+
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/articles/_liked_articles.html.erb b/app/views/articles/_liked_articles.html.erb
new file mode 100644
index 00000000..8a489365
--- /dev/null
+++ b/app/views/articles/_liked_articles.html.erb
@@ -0,0 +1,32 @@
+Liked Articles
+
+
+
+ Title
+ Author
+ Score
+ Likes
+
+<% for article in @liked_articles %>
+
+
+
+ <%= link_to article.title, article_path(article.article_id) %>
+
+ <%= article.author %>
+
+ <%= article.score %>
+
+ <% article.user_articles %>
+ <%if !article.user_articles&.present?%>
+ <%= 0 %>
+ <%else%>
+ <%= article.user_articles.map { |ua| ua.user }.count %>
+ <% end -%>
+
+
+
+
+
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/articles/index.html.erb b/app/views/articles/index.html.erb
new file mode 100644
index 00000000..6fdc276e
--- /dev/null
+++ b/app/views/articles/index.html.erb
@@ -0,0 +1,6 @@
+<%= render partial: "partials/structure1", locals: {model_name: "article",
+ primary: "articles",
+ secondary: "liked_articles",
+ sidebar: nil} %>
+
+
diff --git a/app/views/articles/liked_articles.html.erb b/app/views/articles/liked_articles.html.erb
new file mode 100644
index 00000000..d2f177e9
--- /dev/null
+++ b/app/views/articles/liked_articles.html.erb
@@ -0,0 +1,35 @@
+Welcome to Top News
+Liked Articles
+
+<%= link_to "top stories", articles_url%>
+
+
+
+ Title \
+ Author
+ Score
+ Likes
+
+<% for article in @articles %>
+
+
+
+ <%= link_to article.title, article_path(article.article_id) %>
+
+ <%= article.author %>
+
+ <%= article.score %>
+
+ <% article.user_articles %>
+ <%if !article.user_articles&.present?%>
+ <%= 0 %>
+ <%else%>
+ <%= article.user_articles.map { |ua| ua.user }.count %>
+ <% end -%>
+
+
+
+
+
+ <% end %>
+
diff --git a/app/views/articles/show.html.erb b/app/views/articles/show.html.erb
new file mode 100644
index 00000000..5d689170
--- /dev/null
+++ b/app/views/articles/show.html.erb
@@ -0,0 +1,31 @@
+<%= @article.title %>
+
+
+<%= link_to 'read the article', @article.url%>
+
+<% if user_signed_in? %>
+ <% if !(@users_toggle.nil?) %>
+ <% if !(@users_toggle.include?(current_user)) %>
+ <%= link_to 'like',like_path(id:@article.article_id), method: :patch%>
+ <%else%>
+ <%= link_to 'unlike',unlike_path(id:@article.article_id), method: :patch%>
+ <% end %>
+ <%else%>
+ <%= link_to 'like',like_path(id:@article.article_id), method: :patch%>
+ <% end %>
+<%else%>
+ please sign in to like articles
+ <% end %>
+
+
+
+ <% if !@article.user_articles.empty? %>
+ Users who liked this article
+ <% for user_article in @article.user_articles %>
+ <%= user_article.user.first_name + " " + user_article.user.last_name%>
+ <% end %>
+ <%else%>
+ No Likes
+ <% end -%>
+
+
diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb
new file mode 100644
index 00000000..b12dd0cb
--- /dev/null
+++ b/app/views/devise/confirmations/new.html.erb
@@ -0,0 +1,16 @@
+Resend confirmation instructions
+
+<%= form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+
+
+ <%= f.label :email %>
+
+
+ <%= f.submit "Resend confirmation instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
new file mode 100644
index 00000000..dc55f64f
--- /dev/null
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -0,0 +1,5 @@
+Welcome <%= @email %>!
+
+You can confirm your account email through the link below:
+
+<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb
new file mode 100644
index 00000000..32f4ba80
--- /dev/null
+++ b/app/views/devise/mailer/email_changed.html.erb
@@ -0,0 +1,7 @@
+Hello <%= @email %>!
+
+<% if @resource.try(:unconfirmed_email?) %>
+ We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.
+<% else %>
+ We're contacting you to notify you that your email has been changed to <%= @resource.email %>.
+<% end %>
diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb
new file mode 100644
index 00000000..b41daf47
--- /dev/null
+++ b/app/views/devise/mailer/password_change.html.erb
@@ -0,0 +1,3 @@
+Hello <%= @resource.email %>!
+
+We're contacting you to notify you that your password has been changed.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb
new file mode 100644
index 00000000..f667dc12
--- /dev/null
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -0,0 +1,8 @@
+Hello <%= @resource.email %>!
+
+Someone has requested a link to change your password. You can do this through the link below.
+
+<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>
+
+If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
new file mode 100644
index 00000000..41e148bf
--- /dev/null
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -0,0 +1,7 @@
+Hello <%= @resource.email %>!
+
+Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+
+Click the link below to unlock your account:
+
+<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>
diff --git a/app/views/devise/passwords/edit.html.erb b/app/views/devise/passwords/edit.html.erb
new file mode 100644
index 00000000..5fbb9ff0
--- /dev/null
+++ b/app/views/devise/passwords/edit.html.erb
@@ -0,0 +1,25 @@
+Change your password
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+ <%= f.hidden_field :reset_password_token %>
+
+
+ <%= f.label :password, "New password" %>(<%= @minimum_password_length %> characters minimum)
+
+
+ <%= f.label :password_confirmation, "Confirm new password" %>
+
+
+ <%= f.submit "Change my password" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/passwords/new.html.erb b/app/views/devise/passwords/new.html.erb
new file mode 100644
index 00000000..9b486b81
--- /dev/null
+++ b/app/views/devise/passwords/new.html.erb
@@ -0,0 +1,16 @@
+Forgot your password?
+
+<%= form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+
+
+ <%= f.label :email %>
+
+
+ <%= f.submit "Send me reset password instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
new file mode 100644
index 00000000..b82e3365
--- /dev/null
+++ b/app/views/devise/registrations/edit.html.erb
@@ -0,0 +1,43 @@
+Edit <%= resource_name.to_s.humanize %>
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+
+
+ <%= f.label :email %>
+
+ <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+ Currently waiting confirmation for: <%= resource.unconfirmed_email %>
+ <% end %>
+
+
+ <%= f.label :password %> (leave blank if you don't want to change it) <%= @minimum_password_length %> characters minimum
+ <% end %>
+
+
+
+ <%= f.label :password_confirmation %>
+
+
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+
+
+ <%= f.submit "Update" %>
+
+<% end %>
+
+Cancel my account
+
+Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?", turbo_confirm: "Are you sure?" }, method: :delete %>
+
+<%= link_to "Back", :back %>
diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb
new file mode 100644
index 00000000..cf8e2ca7
--- /dev/null
+++ b/app/views/devise/registrations/new.html.erb
@@ -0,0 +1,39 @@
+Sign up
+
+<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+
+
+ <%= f.label :first_name %>
+
+
+ <%= f.label :last_name %>
+
+
+ <%= f.label :email %>
+
+
+ <%= f.label :password %>
+ <% if @minimum_password_length %>
+ (<%= @minimum_password_length %> characters minimum)
+ <% end %>
+
+
+ <%= f.label :password_confirmation %>
+
+
+ <%= f.submit "Sign up" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb
new file mode 100644
index 00000000..5ede9648
--- /dev/null
+++ b/app/views/devise/sessions/new.html.erb
@@ -0,0 +1,26 @@
+Log in
+
+<%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
+
+ <%= f.label :email %>
+
+
+ <%= f.label :password %>
+
+ <% if devise_mapping.rememberable? %>
+
+ <%= f.check_box :remember_me %>
+ <%= f.label :remember_me %>
+
+ <% end %>
+
+
+ <%= f.submit "Log in" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/devise/shared/_error_messages.html.erb b/app/views/devise/shared/_error_messages.html.erb
new file mode 100644
index 00000000..cabfe307
--- /dev/null
+++ b/app/views/devise/shared/_error_messages.html.erb
@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+
+
+ <%= I18n.t("errors.messages.not_saved",
+ count: resource.errors.count,
+ resource: resource.class.model_name.human.downcase)
+ %>
+
+
+ <% resource.errors.full_messages.each do |message| %>
+ <%= message %>
+ <% end %>
+
+
Resend unlock instructions
+
+<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %>
+ <%= render "devise/shared/error_messages", resource: resource %>
+
+
+ <%= f.label :email %>
+
+
+ <%= f.submit "Resend unlock instructions" %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
new file mode 100644
index 00000000..dee81226
--- /dev/null
+++ b/app/views/layouts/application.html.erb
@@ -0,0 +1,20 @@
+
+
+
+ Top News
+ <%= csrf_meta_tags %>
+ <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload' %>
+ <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %>
+
+
+ <%= render :partial => "partials/nav" %>
+
+ <%= notice %>
+
+
+ <%= alert %>
+
+ <%= yield %>
+
+
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
deleted file mode 100644
index bfdcda24..00000000
--- a/app/views/layouts/application.html.haml
+++ /dev/null
@@ -1,12 +0,0 @@
-!!!
-%html
- %head
- %meta{content: "text/html; charset=UTF-8", "http-equiv" => "Content-Type"}/
- %title Top News
- = csrf_meta_tags
- = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track': 'reload'
- = javascript_include_tag 'application', 'data-turbolinks-track': 'reload'
- %body
- %p.notice= notice
- %p.alert= alert
- = yield
diff --git a/app/views/liked_articles/index.html.erb b/app/views/liked_articles/index.html.erb
new file mode 100644
index 00000000..c79458db
--- /dev/null
+++ b/app/views/liked_articles/index.html.erb
@@ -0,0 +1,36 @@
+Welcome to Top News
+Liked Articles
+
+
+ Title \
+ Author
+ Likes
+ Like?
+
+<% for article in @articles %>
+
+
+
+ <%= link_to article.title, article_path(article.article_id) %>
+
+ <%= article.author %>
+
+ <% article.user_articles %>
+ <%if !article.user_articles&.present?%>
+ <%= 0 %>
+ <%else%>
+ <%= article.user_articles.map { |ua| ua.user }.count %>
+ <% end -%>
+
+ <%if !(current_user in article.user_articles)%>
+ <%= link_to 'like',like_path(id:article.article_id), method: :patch%>
+ <%else%>
+ <%= link_to 'deactivate',unlike_path(id:article.article_id), method: :patch%>
+ <% end -%>
+
+
+
+
+
+ <% end %>
+
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
new file mode 100644
index 00000000..0b409157
--- /dev/null
+++ b/app/views/pages/home.html.erb
@@ -0,0 +1,9 @@
+Welcome to Top News
+
+
+
+ <% for article in @articles %>
+ <%= article %>
+ <% end %>
+
+
diff --git a/app/views/pages/home.html.haml b/app/views/pages/home.html.haml
deleted file mode 100644
index dfe79e9b..00000000
--- a/app/views/pages/home.html.haml
+++ /dev/null
@@ -1 +0,0 @@
-%h1 Welcome to Top News
diff --git a/app/views/partials/_add_new_object.html.erb b/app/views/partials/_add_new_object.html.erb
new file mode 100644
index 00000000..20afd496
--- /dev/null
+++ b/app/views/partials/_add_new_object.html.erb
@@ -0,0 +1,4 @@
+
+<%= link_to(eval("new_#{model_name}_path"), class: "waves-effect waves-light btn") do %>
+ Add a New <%= model_name.capitalize %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/partials/_flash.html.erb b/app/views/partials/_flash.html.erb
new file mode 100644
index 00000000..c1ab49aa
--- /dev/null
+++ b/app/views/partials/_flash.html.erb
@@ -0,0 +1,6 @@
+<% flash.each do |name, msg| %>
+ ">
+
+ <%= msg %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/partials/_footer.html.erb b/app/views/partials/_footer.html.erb
new file mode 100644
index 00000000..c25773d9
--- /dev/null
+++ b/app/views/partials/_footer.html.erb
@@ -0,0 +1,15 @@
+
+
+
\ No newline at end of file
diff --git a/app/views/partials/_nav.html.erb b/app/views/partials/_nav.html.erb
new file mode 100644
index 00000000..64c7f856
--- /dev/null
+++ b/app/views/partials/_nav.html.erb
@@ -0,0 +1,20 @@
+
+
+
+ <%= link_to 'Top Stores', articles_url %>
+
+ <% if user_signed_in? %>
+
+ <%= link_to 'Sign Out', destroy_user_session_path, method: :delete, class: 'nav-link' %>
+
+ <% else %>
+
+ <%= link_to 'Sign In', new_user_session_path, class: 'nav-link' %>
+
+
+ <%= link_to 'Register', new_user_registration_path, class: 'nav-link' %>
+
+ <% end %>
+
+
\ No newline at end of file
diff --git a/app/views/partials/_object_options.html.erb b/app/views/partials/_object_options.html.erb
new file mode 100644
index 00000000..f6c6c3a3
--- /dev/null
+++ b/app/views/partials/_object_options.html.erb
@@ -0,0 +1,17 @@
+<% opt = "#{object.respond_to?(:name) ? object.name : model_name.capitalize }" %>
+
+
+ <%= link_to(eval("#{model_name.pluralize}_path"), class: 'waves-effect waves-light btn') do %>
+ Display All <%# model_name.pluralize.capitalize %>
+ <% end %>
+
+
+ <%= link_to(eval("edit_#{model_name}_path(object)"), class: 'waves-effect waves-light btn') do %>
+ <%= "Edit #{opt}" %>
+ <% end %>
+
+
+ <%= link_to(eval("#{model_name}_path(object)"), method: 'delete', data: {confirm: "Are you sure you want to permanently delete #{opt}"}, class: 'waves-effect waves-light btn btn-alert') do %>
+ <%= "Delete #{opt}" %>
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/partials/_quick_links.html.erb b/app/views/partials/_quick_links.html.erb
new file mode 100644
index 00000000..8be20268
--- /dev/null
+++ b/app/views/partials/_quick_links.html.erb
@@ -0,0 +1,11 @@
+
+
+
Quick Links
+
+ <%= link_to 'About', about_path, :class => "collection-item" %>
+ <%= link_to 'Contact', contracted_books_path, :class => "collection-item" %>
+ <%= link_to 'New Proposals', proposed_books_path, :class => "collection-item" %>
+ <%= link_to 'Add a New Book', new_book_path, :class => "collection-item" %>
+
+
+
+
+
+ <%= render partial: "#{primary}" %>
+
+ <% unless secondary.nil? %>
+
+ <%= render partial: "#{secondary}" %>
+ <% end %>
+
+
+
+ <%= render partial: "#{sidebar}" unless sidebar.blank? %>
+
+
+
+
+ <%= render partial: "#{primary}" %>
+
+ <% unless secondary.nil? %>
+
+ <%= render partial: "#{secondary}" %>
+ <% end %>
+
+
+
+ <%= render partial: "#{sidebar}" unless sidebar.blank? %>
+
+
+ <%= render :partial => "partials/object_options", locals: {model_name: model_name, object: object} %>
+
\ No newline at end of file
diff --git a/app/views/partials/_topbar.html.erb b/app/views/partials/_topbar.html.erb
new file mode 100644
index 00000000..12675bbe
--- /dev/null
+++ b/app/views/partials/_topbar.html.erb
@@ -0,0 +1,11 @@
+
+
+ <%= link_to(image_tag('logos/science_logo_3.png'), home_path) %>
+
+
+
ScienceQuiz
+
+
+
+
+
+
+ USERS DIRECTORY
+ <%= render @users %>
+
+
+
+ <%= will_paginate @users %>
+
+