From 137fce27cb8663143d7ed070671d249ac1fb1992 Mon Sep 17 00:00:00 2001 From: Em Klick Date: Thu, 10 Aug 2017 00:11:46 +0000 Subject: [PATCH 01/24] 1 --- Gemfile.lock | 52 ++-- app/controllers/comments_controller.rb | 69 +++++ app/controllers/likes_controller.rb | 67 +++++ app/controllers/photos_controller.rb | 71 +++++ app/models/comment.rb | 9 + app/models/like.rb | 8 + app/models/photo.rb | 12 + app/models/user.rb | 16 + app/views/comments/edit.html.erb | 55 ++++ app/views/comments/index.html.erb | 32 ++ app/views/comments/new.html.erb | 55 ++++ app/views/comments/show.html.erb | 31 ++ app/views/layouts/application.html.erb | 92 +++++- app/views/likes/edit.html.erb | 46 +++ app/views/likes/index.html.erb | 30 ++ app/views/likes/new.html.erb | 46 +++ app/views/likes/show.html.erb | 28 ++ app/views/photos/edit.html.erb | 55 ++++ app/views/photos/index.html.erb | 32 ++ app/views/photos/new.html.erb | 52 ++++ app/views/photos/show.html.erb | 31 ++ config/initializers/devise.rb | 277 ++++++++++++++++++ config/locales/devise.en.yml | 64 ++++ config/routes.rb | 55 ++++ .../20170809231517_devise_create_users.rb | 43 +++ db/migrate/20170809231601_create_photos.rb | 12 + db/migrate/20170809231607_create_likes.rb | 11 + db/migrate/20170809231615_create_comments.rb | 12 + db/schema.rb | 44 ++- 29 files changed, 1378 insertions(+), 29 deletions(-) create mode 100644 app/controllers/comments_controller.rb create mode 100644 app/controllers/likes_controller.rb create mode 100644 app/controllers/photos_controller.rb create mode 100644 app/models/comment.rb create mode 100644 app/models/like.rb create mode 100644 app/models/photo.rb create mode 100644 app/models/user.rb create mode 100644 app/views/comments/edit.html.erb create mode 100644 app/views/comments/index.html.erb create mode 100644 app/views/comments/new.html.erb create mode 100644 app/views/comments/show.html.erb create mode 100644 app/views/likes/edit.html.erb create mode 100644 app/views/likes/index.html.erb create mode 100644 app/views/likes/new.html.erb create mode 100644 app/views/likes/show.html.erb create mode 100644 app/views/photos/edit.html.erb create mode 100644 app/views/photos/index.html.erb create mode 100644 app/views/photos/new.html.erb create mode 100644 app/views/photos/show.html.erb create mode 100644 config/initializers/devise.rb create mode 100644 config/locales/devise.en.yml create mode 100644 db/migrate/20170809231517_devise_create_users.rb create mode 100644 db/migrate/20170809231601_create_photos.rb create mode 100644 db/migrate/20170809231607_create_likes.rb create mode 100644 db/migrate/20170809231615_create_comments.rb diff --git a/Gemfile.lock b/Gemfile.lock index 0999b18..e316fb3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,7 +6,7 @@ GIT GIT remote: git://github.com/firstdraft/grade_runner.git - revision: 1e212e50b3fd46ff5b22783d19e0e1aac7928915 + revision: b3664d1fe94177cd5c2943b9b3b08e4c81343e71 specs: grade_runner (0.0.1) @@ -74,13 +74,13 @@ GEM activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (7.1.4) - autoprefixer-rails (7.1.2.3) + autoprefixer-rails (7.1.2.4) execjs awesome_print (1.8.0) bcrypt (3.1.11) - better_errors (2.1.1) + better_errors (2.3.0) coderay (>= 1.0.0) - erubis (>= 2.6.6) + erubi (>= 1.0.0) rack (>= 0.9.0) bindex (0.5.0) binding_of_caller (0.7.2) @@ -91,9 +91,9 @@ GEM builder (3.2.3) byebug (9.0.6) callsite (0.0.11) - capybara (2.14.0) + capybara (2.15.1) addressable - mime-types (>= 1.16) + mini_mime (>= 0.1.3) nokogiri (>= 1.3.3) rack (>= 1.0.0) rack-test (>= 0.5.4) @@ -122,6 +122,7 @@ GEM dotenv-rails (2.2.1) dotenv (= 2.2.1) railties (>= 3.2, < 5.2) + erubi (1.6.1) erubis (2.7.0) execjs (2.7.0) factory_girl (4.8.0) @@ -136,10 +137,10 @@ GEM sass (>= 3.2) globalid (0.4.0) activesupport (>= 4.2.0) - hashdiff (0.3.4) - i18n (0.8.1) - jbuilder (2.6.4) - activesupport (>= 3.0.0) + hashdiff (0.3.5) + i18n (0.8.6) + jbuilder (2.7.0) + activesupport (>= 4.2.0) multi_json (>= 1.2) jquery-rails (4.3.1) rails-dom-testing (>= 1, < 3) @@ -155,7 +156,7 @@ GEM rb-inotify (~> 0.9, >= 0.9.7) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.5) + mail (2.6.6) mime-types (>= 1.16, < 4) meta_request (0.4.3) callsite (~> 0.0, >= 0.0.11) @@ -165,16 +166,17 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_portile2 (2.1.0) - minitest (5.10.2) + mini_mime (0.1.3) + mini_portile2 (2.2.0) + minitest (5.10.3) multi_json (1.12.1) - nio4r (2.0.0) - nokogiri (1.7.2) - mini_portile2 (~> 2.1.0) - octicons (3.0.1) + nio4r (2.1.0) + nokogiri (1.8.0) + mini_portile2 (~> 2.2.0) + octicons (4.0.1) nokogiri (>= 1.6.3.1) - octicons_helper (3.0.1) - octicons (~> 3.0) + octicons_helper (4.0.1) + octicons (~> 4.0) rails orm_adapter (0.5.0) pry (0.10.4) @@ -238,7 +240,11 @@ GEM rspec-support (~> 3.6.0) rspec-support (3.6.0) safe_yaml (1.0.4) - sass (3.4.23) + sass (3.5.1) + sass-listen (~> 4.0.0) + sass-listen (4.0.0) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) sass-rails (5.0.6) railties (>= 4.0.0, < 6) sass (~> 3.1) @@ -261,7 +267,7 @@ GEM rails (>= 3.1) thor (0.19.4) thread_safe (0.3.6) - tilt (2.0.7) + tilt (2.0.8) turbolinks (5.0.1) turbolinks-source (~> 5) turbolinks-source (5.0.3) @@ -285,7 +291,7 @@ GEM websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) - xpath (2.0.0) + xpath (2.1.0) nokogiri (~> 1.3) PLATFORMS @@ -327,4 +333,4 @@ DEPENDENCIES webmock BUNDLED WITH - 1.15.2 + 1.15.3 diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb new file mode 100644 index 0000000..9c5e80e --- /dev/null +++ b/app/controllers/comments_controller.rb @@ -0,0 +1,69 @@ +class CommentsController < ApplicationController + def index + @comments = Comment.all + + render("comments/index.html.erb") + end + + def show + @comment = Comment.find(params[:id]) + + render("comments/show.html.erb") + end + + def new + @comment = Comment.new + + render("comments/new.html.erb") + end + + def create + @comment = Comment.new + + @comment.photo_id = params[:photo_id] + @comment.body = params[:body] + @comment.user_id = params[:user_id] + + save_status = @comment.save + + if save_status == true + redirect_to("/comments/#{@comment.id}", :notice => "Comment created successfully.") + else + render("comments/new.html.erb") + end + end + + def edit + @comment = Comment.find(params[:id]) + + render("comments/edit.html.erb") + end + + def update + @comment = Comment.find(params[:id]) + + @comment.photo_id = params[:photo_id] + @comment.body = params[:body] + @comment.user_id = params[:user_id] + + save_status = @comment.save + + if save_status == true + redirect_to("/comments/#{@comment.id}", :notice => "Comment updated successfully.") + else + render("comments/edit.html.erb") + end + end + + def destroy + @comment = Comment.find(params[:id]) + + @comment.destroy + + if URI(request.referer).path == "/comments/#{@comment.id}" + redirect_to("/", :notice => "Comment deleted.") + else + redirect_to(:back, :notice => "Comment deleted.") + end + end +end diff --git a/app/controllers/likes_controller.rb b/app/controllers/likes_controller.rb new file mode 100644 index 0000000..23af04e --- /dev/null +++ b/app/controllers/likes_controller.rb @@ -0,0 +1,67 @@ +class LikesController < ApplicationController + def index + @likes = Like.all + + render("likes/index.html.erb") + end + + def show + @like = Like.find(params[:id]) + + render("likes/show.html.erb") + end + + def new + @like = Like.new + + render("likes/new.html.erb") + end + + def create + @like = Like.new + + @like.user_id = params[:user_id] + @like.photo_id = params[:photo_id] + + save_status = @like.save + + if save_status == true + redirect_to("/likes/#{@like.id}", :notice => "Like created successfully.") + else + render("likes/new.html.erb") + end + end + + def edit + @like = Like.find(params[:id]) + + render("likes/edit.html.erb") + end + + def update + @like = Like.find(params[:id]) + + @like.user_id = params[:user_id] + @like.photo_id = params[:photo_id] + + save_status = @like.save + + if save_status == true + redirect_to("/likes/#{@like.id}", :notice => "Like updated successfully.") + else + render("likes/edit.html.erb") + end + end + + def destroy + @like = Like.find(params[:id]) + + @like.destroy + + if URI(request.referer).path == "/likes/#{@like.id}" + redirect_to("/", :notice => "Like deleted.") + else + redirect_to(:back, :notice => "Like deleted.") + end + end +end diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb new file mode 100644 index 0000000..0be35b3 --- /dev/null +++ b/app/controllers/photos_controller.rb @@ -0,0 +1,71 @@ +class PhotosController < ApplicationController + skip_before_action :authenticate_user!, :only => [:index, :show] + + def index + @photos = Photo.all + + render("photos/index.html.erb") + end + + def show + @photo = Photo.find(params[:id]) + + render("photos/show.html.erb") + end + + def new + @photo = Photo.new + + render("photos/new.html.erb") + end + + def create + @photo = Photo.new + + @photo.caption = params[:caption] + @photo.image = params[:image] + @photo.user_id = params[:user_id] + + save_status = @photo.save + + if save_status == true + redirect_to("/photos/#{@photo.id}", :notice => "Photo created successfully.") + else + render("photos/new.html.erb") + end + end + + def edit + @photo = Photo.find(params[:id]) + + render("photos/edit.html.erb") + end + + def update + @photo = Photo.find(params[:id]) + + @photo.caption = params[:caption] + @photo.image = params[:image] + @photo.user_id = params[:user_id] + + save_status = @photo.save + + if save_status == true + redirect_to("/photos/#{@photo.id}", :notice => "Photo updated successfully.") + else + render("photos/edit.html.erb") + end + end + + def destroy + @photo = Photo.find(params[:id]) + + @photo.destroy + + if URI(request.referer).path == "/photos/#{@photo.id}" + redirect_to("/", :notice => "Photo deleted.") + else + redirect_to(:back, :notice => "Photo deleted.") + end + end +end diff --git a/app/models/comment.rb b/app/models/comment.rb new file mode 100644 index 0000000..ce255dc --- /dev/null +++ b/app/models/comment.rb @@ -0,0 +1,9 @@ +class Comment < ApplicationRecord + + belongs_to :user + belongs_to :photo + + validates :body, :presence => true + + +end diff --git a/app/models/like.rb b/app/models/like.rb new file mode 100644 index 0000000..e356f7d --- /dev/null +++ b/app/models/like.rb @@ -0,0 +1,8 @@ +class Like < ApplicationRecord + + belongs_to :user + belongs_to :photo + + validates :user_id, :uniqueness => {:scope => :photo_id} + +end diff --git a/app/models/photo.rb b/app/models/photo.rb new file mode 100644 index 0000000..db8f222 --- /dev/null +++ b/app/models/photo.rb @@ -0,0 +1,12 @@ +class Photo < ApplicationRecord + + belongs_to :user #:required => true + has_many :comments + has_many :likes + + has_many :fans, :through => :likes, :source => :user + +# validates :user_id, :presence => true + + +end diff --git a/app/models/user.rb b/app/models/user.rb new file mode 100644 index 0000000..1e45330 --- /dev/null +++ b/app/models/user.rb @@ -0,0 +1,16 @@ +class User < ApplicationRecord + # Include default devise modules. Others available are: + # :confirmable, :lockable, :timeoutable and :omniauthable + devise :database_authenticatable, :registerable, + :recoverable, :rememberable, :trackable, :validatable + + has_many :photos + has_many :comments + has_many :likes + + # has_may :liked_photos, :through => :likes, :source => :photo + # has_may :commented_photos, :through => :comments, :source => :photo + + validates :username, :presence => true, :uniqueness =>true + # validates :username, :presence => true, :uniqueness: true => { :case_seneitive: false} +end diff --git a/app/views/comments/edit.html.erb b/app/views/comments/edit.html.erb new file mode 100644 index 0000000..ccc5e5f --- /dev/null +++ b/app/views/comments/edit.html.erb @@ -0,0 +1,55 @@ + +<% if @comment.errors.any? %> + <% @comment.errors.full_messages.each do |message| %> +
+ + <%= message %> +
+ <% end %> +<% end %> + +
+

Edit Comment #<%= @comment.id %>

+
+ +
+
+
+ + + + +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ + + or + Cancel +
+
+
diff --git a/app/views/comments/index.html.erb b/app/views/comments/index.html.erb new file mode 100644 index 0000000..30cf6bf --- /dev/null +++ b/app/views/comments/index.html.erb @@ -0,0 +1,32 @@ +
+

+ Comments + New Comment +

+
+ +
+
+ + + + + + + + + <% @comments.each do |comment| %> + + + + + + + <% end %> +
PhotoBodyUserActions
<%= comment.photo_id %><%= comment.body %><%= comment.user_id %> + Show + Edit + Delete +
+
+
diff --git a/app/views/comments/new.html.erb b/app/views/comments/new.html.erb new file mode 100644 index 0000000..1b2440e --- /dev/null +++ b/app/views/comments/new.html.erb @@ -0,0 +1,55 @@ + +<% if @comment.errors.any? %> + <% @comment.errors.full_messages.each do |message| %> +
+ + <%= message %> +
+ <% end %> +<% end %> + +
+

Add Comment

+
+ +
+
+
+ + + + +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ + + or + Cancel +
+
+
diff --git a/app/views/comments/show.html.erb b/app/views/comments/show.html.erb new file mode 100644 index 0000000..e281c46 --- /dev/null +++ b/app/views/comments/show.html.erb @@ -0,0 +1,31 @@ +
+

Comment #<%= @comment.id %>

+
+ +
+
+
+
Photo
+
<%= @comment.photo_id %>
+ +
Body
+
<%= @comment.body %>
+ +
User
+
<%= @comment.user_id %>
+ +
+ +
+ + Back + + + Edit + + + Delete + +
+
+
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 54de11f..0a71b82 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -1,14 +1,98 @@ - + + PhotogramAuth - <%= stylesheet_link_tag 'application', media: 'all' %> - <%= javascript_include_tag 'application' %> + + + + + + + <%= stylesheet_link_tag "application", :media => "all" %> + <%= javascript_include_tag "application" %> <%= csrf_meta_tags %> + + + + + + + +
+ <% if notice.present? %> +
+ + <%= notice %> +
+ <% end %> -<%= yield %> + <% if alert.present? %> +
+ + <%= alert %> +
+ <% end %> + <%= yield %> +
diff --git a/app/views/likes/edit.html.erb b/app/views/likes/edit.html.erb new file mode 100644 index 0000000..dfe3177 --- /dev/null +++ b/app/views/likes/edit.html.erb @@ -0,0 +1,46 @@ + +<% if @like.errors.any? %> + <% @like.errors.full_messages.each do |message| %> +
+ + <%= message %> +
+ <% end %> +<% end %> + +
+

Edit Like #<%= @like.id %>

+
+ +
+
+
+ + + + +
+ + + +
+ + +
+ + + +
+ + + or + Cancel +
+
+
diff --git a/app/views/likes/index.html.erb b/app/views/likes/index.html.erb new file mode 100644 index 0000000..df57268 --- /dev/null +++ b/app/views/likes/index.html.erb @@ -0,0 +1,30 @@ +
+

+ Likes + New Like +

+
+ +
+
+ + + + + + + + <% @likes.each do |like| %> + + + + + + <% end %> +
UserPhotoActions
<%= like.user_id %><%= like.photo_id %> + Show + Edit + Delete +
+
+
diff --git a/app/views/likes/new.html.erb b/app/views/likes/new.html.erb new file mode 100644 index 0000000..e4dcfe7 --- /dev/null +++ b/app/views/likes/new.html.erb @@ -0,0 +1,46 @@ + +<% if @like.errors.any? %> + <% @like.errors.full_messages.each do |message| %> +
+ + <%= message %> +
+ <% end %> +<% end %> + +
+

Add Like

+
+ +
+
+
+ + + + +
+ + + +
+ + +
+ + + +
+ + + or + Cancel +
+
+
diff --git a/app/views/likes/show.html.erb b/app/views/likes/show.html.erb new file mode 100644 index 0000000..ebb7e17 --- /dev/null +++ b/app/views/likes/show.html.erb @@ -0,0 +1,28 @@ +
+

Like #<%= @like.id %>

+
+ +
+
+
+
User
+
<%= @like.user_id %>
+ +
Photo
+
<%= @like.photo_id %>
+ +
+ +
+ + Back + + + Edit + + + Delete + +
+
+
diff --git a/app/views/photos/edit.html.erb b/app/views/photos/edit.html.erb new file mode 100644 index 0000000..26108a0 --- /dev/null +++ b/app/views/photos/edit.html.erb @@ -0,0 +1,55 @@ + +<% if @photo.errors.any? %> + <% @photo.errors.full_messages.each do |message| %> +
+ + <%= message %> +
+ <% end %> +<% end %> + +
+

Edit Photo #<%= @photo.id %>

+
+ +
+
+
+ + + + +
+ + + +
+ + +
+ + + +
+ + +
+ + + +
+ + + or + Cancel +
+
+
diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb new file mode 100644 index 0000000..52f2779 --- /dev/null +++ b/app/views/photos/index.html.erb @@ -0,0 +1,32 @@ +
+

+ Photos + New Photo +

+
+ +
+
+ + + + + + + + + <% @photos.each do |photo| %> + + + + + + + <% end %> +
CaptionImageUserActions
<%= photo.caption %><%= photo.image %><%= photo.user_id %> + Show + Edit + Delete +
+
+
diff --git a/app/views/photos/new.html.erb b/app/views/photos/new.html.erb new file mode 100644 index 0000000..fa18232 --- /dev/null +++ b/app/views/photos/new.html.erb @@ -0,0 +1,52 @@ + +<% if @photo.errors.any? %> + <% @photo.errors.full_messages.each do |message| %> +
+ + <%= message %> +
+ <% end %> +<% end %> + +
+

Add Photo

+
+ +
+
+
+ + + + +
+ + + +
+ + +
+ + + +
+ + + + + +
+ + + or + Cancel + +
+ diff --git a/app/views/photos/show.html.erb b/app/views/photos/show.html.erb new file mode 100644 index 0000000..4b1004b --- /dev/null +++ b/app/views/photos/show.html.erb @@ -0,0 +1,31 @@ +
+

Photo #<%= @photo.id %>

+
+ +
+
+
+
Caption
+
<%= @photo.caption %>
+ +
Image
+
<%= @photo.image %>
+ +
User
+
<%= @photo.user_id %>
+ +
+ +
+ + Back + + + Edit + + + Delete + +
+
+
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb new file mode 100644 index 0000000..170b1c1 --- /dev/null +++ b/config/initializers/devise.rb @@ -0,0 +1,277 @@ +# Use this hook to configure devise mailer, warden hooks and so forth. +# Many of these configuration options can be set straight in your model. +Devise.setup do |config| + # The secret key used by Devise. Devise uses this key to generate + # random tokens. Changing this key will render invalid all existing + # confirmation, reset password and unlock tokens in the database. + # Devise will use the `secret_key_base` as its `secret_key` + # by default. You can change it below and use your own secret key. + # config.secret_key = '7eeebf9e76a6c406eef386d0bf3e40ce0c9e53329b688d4bd0720e2dee5180df17081abf94d677fd54609a79b8bc6f7a635489317e24e9e6a581837e3f79333c' + + # ==> Mailer Configuration + # Configure the e-mail address which will be shown in Devise::Mailer, + # note that it will be overwritten if you use your own mailer class + # with default "from" parameter. + config.mailer_sender = 'please-change-me-at-config-initializers-devise@example.com' + + # Configure the class responsible to send e-mails. + # config.mailer = 'Devise::Mailer' + + # Configure the parent class responsible to send e-mails. + # config.parent_mailer = 'ActionMailer::Base' + + # ==> ORM configuration + # Load and configure the ORM. Supports :active_record (default) and + # :mongoid (bson_ext recommended) by default. Other ORMs may be + # available as additional gems. + require 'devise/orm/active_record' + + # ==> Configuration for any authentication mechanism + # Configure which keys are used when authenticating a user. The default is + # just :email. You can configure it to use [:username, :subdomain], so for + # authenticating a user, both parameters are required. Remember that those + # parameters are used only when authenticating and not when retrieving from + # session. If you need permissions, you should implement that in a before filter. + # You can also supply a hash where the value is a boolean determining whether + # or not authentication should be aborted when the value is not present. + # config.authentication_keys = [:email] + + # Configure parameters from the request object used for authentication. Each entry + # given should be a request method and it will automatically be passed to the + # find_for_authentication method and considered in your model lookup. For instance, + # if you set :request_keys to [:subdomain], :subdomain will be used on authentication. + # The same considerations mentioned for authentication_keys also apply to request_keys. + # config.request_keys = [] + + # Configure which authentication keys should be case-insensitive. + # These keys will be downcased upon creating or modifying a user and when used + # to authenticate or find a user. Default is :email. + config.case_insensitive_keys = [:email] + + # Configure which authentication keys should have whitespace stripped. + # These keys will have whitespace before and after removed upon creating or + # modifying a user and when used to authenticate or find a user. Default is :email. + config.strip_whitespace_keys = [:email] + + # Tell if authentication through request.params is enabled. True by default. + # It can be set to an array that will enable params authentication only for the + # given strategies, for example, `config.params_authenticatable = [:database]` will + # enable it only for database (email + password) authentication. + # config.params_authenticatable = true + + # Tell if authentication through HTTP Auth is enabled. False by default. + # It can be set to an array that will enable http authentication only for the + # given strategies, for example, `config.http_authenticatable = [:database]` will + # enable it only for database authentication. The supported strategies are: + # :database = Support basic authentication with authentication key + password + # config.http_authenticatable = false + + # If 401 status code should be returned for AJAX requests. True by default. + # config.http_authenticatable_on_xhr = true + + # The realm used in Http Basic Authentication. 'Application' by default. + # config.http_authentication_realm = 'Application' + + # It will change confirmation, password recovery and other workflows + # to behave the same regardless if the e-mail provided was right or wrong. + # Does not affect registerable. + # config.paranoid = true + + # By default Devise will store the user in session. You can skip storage for + # particular strategies by setting this option. + # Notice that if you are skipping storage for all authentication paths, you + # may want to disable generating routes to Devise's sessions controller by + # passing skip: :sessions to `devise_for` in your config/routes.rb + config.skip_session_storage = [:http_auth] + + # By default, Devise cleans up the CSRF token on authentication to + # avoid CSRF token fixation attacks. This means that, when using AJAX + # requests for sign in and sign up, you need to get a new CSRF token + # from the server. You can disable this option at your own risk. + # config.clean_up_csrf_token_on_authentication = true + + # When false, Devise will not attempt to reload routes on eager load. + # This can reduce the time taken to boot the app but if your application + # requires the Devise mappings to be loaded during boot time the application + # won't boot properly. + # config.reload_routes = true + + # ==> Configuration for :database_authenticatable + # For bcrypt, this is the cost for hashing the password and defaults to 11. If + # using other algorithms, it sets how many times you want the password to be hashed. + # + # Limiting the stretches to just one in testing will increase the performance of + # your test suite dramatically. However, it is STRONGLY RECOMMENDED to not use + # a value less than 10 in other environments. Note that, for bcrypt (the default + # algorithm), the cost increases exponentially with the number of stretches (e.g. + # a value of 20 is already extremely slow: approx. 60 seconds for 1 calculation). + config.stretches = Rails.env.test? ? 1 : 11 + + # Set up a pepper to generate the hashed password. + # config.pepper = 'a33575aad3f06b0f6293bbc7d9a336548dd9f2e9feaffc332f3c774dfb510aec5598eed62cf6fdbedcc6777d65a305aa57c3e888b12115f05236ffced736be97' + + # Send a notification to the original email when the user's email is changed. + # config.send_email_changed_notification = false + + # Send a notification email when the user's password is changed. + # config.send_password_change_notification = false + + # ==> Configuration for :confirmable + # A period that the user is allowed to access the website even without + # confirming their account. For instance, if set to 2.days, the user will be + # able to access the website for two days without confirming their account, + # access will be blocked just in the third day. Default is 0.days, meaning + # the user cannot access the website without confirming their account. + # config.allow_unconfirmed_access_for = 2.days + + # A period that the user is allowed to confirm their account before their + # token becomes invalid. For example, if set to 3.days, the user can confirm + # their account within 3 days after the mail was sent, but on the fourth day + # their account can't be confirmed with the token any more. + # Default is nil, meaning there is no restriction on how long a user can take + # before confirming their account. + # config.confirm_within = 3.days + + # If true, requires any email changes to be confirmed (exactly the same way as + # initial account confirmation) to be applied. Requires additional unconfirmed_email + # db field (see migrations). Until confirmed, new email is stored in + # unconfirmed_email column, and copied to email column on successful confirmation. + config.reconfirmable = true + + # Defines which key will be used when confirming an account + # config.confirmation_keys = [:email] + + # ==> Configuration for :rememberable + # The time the user will be remembered without asking for credentials again. + # config.remember_for = 2.weeks + + # Invalidates all the remember me tokens when the user signs out. + config.expire_all_remember_me_on_sign_out = true + + # If true, extends the user's remember period when remembered via cookie. + # config.extend_remember_period = false + + # Options to be passed to the created cookie. For instance, you can set + # secure: true in order to force SSL only cookies. + # config.rememberable_options = {} + + # ==> Configuration for :validatable + # Range for password length. + config.password_length = 6..128 + + # Email regex used to validate email formats. It simply asserts that + # one (and only one) @ exists in the given string. This is mainly + # to give user feedback and not to assert the e-mail validity. + config.email_regexp = /\A[^@\s]+@[^@\s]+\z/ + + # ==> Configuration for :timeoutable + # The time you want to timeout the user session without activity. After this + # time the user will be asked for credentials again. Default is 30 minutes. + # config.timeout_in = 30.minutes + + # ==> Configuration for :lockable + # Defines which strategy will be used to lock an account. + # :failed_attempts = Locks an account after a number of failed attempts to sign in. + # :none = No lock strategy. You should handle locking by yourself. + # config.lock_strategy = :failed_attempts + + # Defines which key will be used when locking and unlocking an account + # config.unlock_keys = [:email] + + # Defines which strategy will be used to unlock an account. + # :email = Sends an unlock link to the user email + # :time = Re-enables login after a certain amount of time (see :unlock_in below) + # :both = Enables both strategies + # :none = No unlock strategy. You should handle unlocking by yourself. + # config.unlock_strategy = :both + + # Number of authentication tries before locking an account if lock_strategy + # is failed attempts. + # config.maximum_attempts = 20 + + # Time interval to unlock the account if :time is enabled as unlock_strategy. + # config.unlock_in = 1.hour + + # Warn on the last attempt before the account is locked. + # config.last_attempt_warning = true + + # ==> Configuration for :recoverable + # + # Defines which key will be used when recovering the password for an account + # config.reset_password_keys = [:email] + + # Time interval you can reset your password with a reset password key. + # Don't put a too small interval or your users won't have the time to + # change their passwords. + config.reset_password_within = 6.hours + + # When set to false, does not sign a user in automatically after their password is + # reset. Defaults to true, so a user is signed in automatically after a reset. + # config.sign_in_after_reset_password = true + + # ==> Configuration for :encryptable + # Allow you to use another hashing or encryption algorithm besides bcrypt (default). + # You can use :sha1, :sha512 or algorithms from others authentication tools as + # :clearance_sha1, :authlogic_sha512 (then you should set stretches above to 20 + # for default behavior) and :restful_authentication_sha1 (then you should set + # stretches to 10, and copy REST_AUTH_SITE_KEY to pepper). + # + # Require the `devise-encryptable` gem when using anything other than bcrypt + # config.encryptor = :sha512 + + # ==> Scopes configuration + # Turn scoped views on. Before rendering "sessions/new", it will first check for + # "users/sessions/new". It's turned off by default because it's slower if you + # are using only default views. + # config.scoped_views = false + + # Configure the default scope given to Warden. By default it's the first + # devise role declared in your routes (usually :user). + # config.default_scope = :user + + # Set this configuration to false if you want /users/sign_out to sign out + # only the current scope. By default, Devise signs out all scopes. + # config.sign_out_all_scopes = true + + # ==> Navigation configuration + # Lists the formats that should be treated as navigational. Formats like + # :html, should redirect to the sign in page when the user does not have + # access, but formats like :xml or :json, should return 401. + # + # If you have any extra navigational formats, like :iphone or :mobile, you + # should add them to the navigational formats lists. + # + # The "*/*" below is required to match Internet Explorer requests. + # config.navigational_formats = ['*/*', :html] + + # The default HTTP method used to sign out a resource. Default is :delete. + config.sign_out_via = :delete + + # ==> OmniAuth + # Add a new OmniAuth provider. Check the wiki for more information on setting + # up on your models and hooks. + # config.omniauth :github, 'APP_ID', 'APP_SECRET', scope: 'user,public_repo' + + # ==> Warden configuration + # If you want to use other strategies, that are not supported by Devise, or + # change the failure app, you can configure them inside the config.warden block. + # + # config.warden do |manager| + # manager.intercept_401 = false + # manager.default_strategies(scope: :user).unshift :some_external_strategy + # end + + # ==> Mountable engine configurations + # When using Devise inside an engine, let's call it `MyEngine`, and this engine + # is mountable, there are some extra configurations to be taken into account. + # The following options are available, assuming the engine is mounted as: + # + # mount MyEngine, at: '/my_engine' + # + # The router that invoked `devise_for`, in the example above, would be: + # config.router_name = :my_engine + # + # When using OmniAuth, Devise cannot automatically set OmniAuth path, + # so you need to do it manually. For the users scope, it would be: + # config.omniauth_path_prefix = '/my_engine/users/auth' +end diff --git a/config/locales/devise.en.yml b/config/locales/devise.en.yml new file mode 100644 index 0000000..0b8f130 --- /dev/null +++ b/config/locales/devise.en.yml @@ -0,0 +1,64 @@ +# Additional translations at https://github.com/plataformatec/devise/wiki/I18n + +en: + devise: + confirmations: + confirmed: "Your email address has been successfully confirmed." + send_instructions: "You will receive an email with instructions for how to confirm your email address in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive an email with instructions for how to confirm your email address in a few minutes." + failure: + already_authenticated: "You are already signed in." + inactive: "Your account is not activated yet." + invalid: "Invalid %{authentication_keys} or password." + locked: "Your account is locked." + last_attempt: "You have one more attempt before your account is locked." + not_found_in_database: "Invalid %{authentication_keys} or password." + timeout: "Your session expired. Please sign in again to continue." + unauthenticated: "You need to sign in or sign up before continuing." + unconfirmed: "You have to confirm your email address before continuing." + mailer: + confirmation_instructions: + subject: "Confirmation instructions" + reset_password_instructions: + subject: "Reset password instructions" + unlock_instructions: + subject: "Unlock instructions" + email_changed: + subject: "Email Changed" + password_change: + subject: "Password Changed" + omniauth_callbacks: + failure: "Could not authenticate you from %{kind} because \"%{reason}\"." + success: "Successfully authenticated from %{kind} account." + passwords: + no_token: "You can't access this page without coming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided." + send_instructions: "You will receive an email with instructions on how to reset your password in a few minutes." + send_paranoid_instructions: "If your email address exists in our database, you will receive a password recovery link at your email address in a few minutes." + updated: "Your password has been changed successfully. You are now signed in." + updated_not_active: "Your password has been changed successfully." + registrations: + destroyed: "Bye! Your account has been successfully cancelled. We hope to see you again soon." + signed_up: "Welcome! You have signed up successfully." + signed_up_but_inactive: "You have signed up successfully. However, we could not sign you in because your account is not yet activated." + signed_up_but_locked: "You have signed up successfully. However, we could not sign you in because your account is locked." + signed_up_but_unconfirmed: "A message with a confirmation link has been sent to your email address. Please follow the link to activate your account." + update_needs_confirmation: "You updated your account successfully, but we need to verify your new email address. Please check your email and follow the confirm link to confirm your new email address." + updated: "Your account has been updated successfully." + sessions: + signed_in: "Signed in successfully." + signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." + unlocks: + send_instructions: "You will receive an email with instructions for how to unlock your account in a few minutes." + send_paranoid_instructions: "If your account exists, you will receive an email with instructions for how to unlock it in a few minutes." + unlocked: "Your account has been unlocked successfully. Please sign in to continue." + errors: + messages: + already_confirmed: "was already confirmed, please try signing in" + confirmation_period_expired: "needs to be confirmed within %{period}, please request a new one" + expired: "has expired, please request a new one" + not_found: "not found" + not_locked: "was not locked" + not_saved: + one: "1 error prohibited this %{resource} from being saved:" + other: "%{count} errors prohibited this %{resource} from being saved:" diff --git a/config/routes.rb b/config/routes.rb index 8015e08..d549331 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,4 +1,59 @@ Rails.application.routes.draw do + + root "photos#index" + + # Routes for the Comment resource: + # CREATE + get "/comments/new", :controller => "comments", :action => "new" + post "/create_comment", :controller => "comments", :action => "create" + + # READ + get "/comments", :controller => "comments", :action => "index" + get "/comments/:id", :controller => "comments", :action => "show" + + # UPDATE + get "/comments/:id/edit", :controller => "comments", :action => "edit" + post "/update_comment/:id", :controller => "comments", :action => "update" + + # DELETE + get "/delete_comment/:id", :controller => "comments", :action => "destroy" + #------------------------------ + + # Routes for the Like resource: + # CREATE + get "/likes/new", :controller => "likes", :action => "new" + post "/create_like", :controller => "likes", :action => "create" + + # READ + get "/likes", :controller => "likes", :action => "index" + get "/likes/:id", :controller => "likes", :action => "show" + + # UPDATE + get "/likes/:id/edit", :controller => "likes", :action => "edit" + post "/update_like/:id", :controller => "likes", :action => "update" + + # DELETE + get "/delete_like/:id", :controller => "likes", :action => "destroy" + #------------------------------ + + # Routes for the Photo resource: + # CREATE + get "/photos/new", :controller => "photos", :action => "new" + post "/create_photo", :controller => "photos", :action => "create" + + # READ + get "/photos", :controller => "photos", :action => "index" + get "/photos/:id", :controller => "photos", :action => "show" + + # UPDATE + get "/photos/:id/edit", :controller => "photos", :action => "edit" + post "/update_photo/:id", :controller => "photos", :action => "update" + + # DELETE + get "/delete_photo/:id", :controller => "photos", :action => "destroy" + #------------------------------ + + devise_for :users # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html mount WebGit::Engine, at: "/rails/git" end diff --git a/db/migrate/20170809231517_devise_create_users.rb b/db/migrate/20170809231517_devise_create_users.rb new file mode 100644 index 0000000..1408832 --- /dev/null +++ b/db/migrate/20170809231517_devise_create_users.rb @@ -0,0 +1,43 @@ +class DeviseCreateUsers < ActiveRecord::Migration[5.0] + def change + create_table :users do |t| + ## Database authenticatable + t.string :email, null: false, default: "" + t.string :encrypted_password, null: false, default: "" + + ## Recoverable + t.string :reset_password_token + t.datetime :reset_password_sent_at + + ## Rememberable + t.datetime :remember_created_at + + ## Trackable + t.integer :sign_in_count, default: 0, null: false + t.datetime :current_sign_in_at + t.datetime :last_sign_in_at + t.string :current_sign_in_ip + t.string :last_sign_in_ip + + ## Confirmable + # t.string :confirmation_token + # t.datetime :confirmed_at + # t.datetime :confirmation_sent_at + # t.string :unconfirmed_email # Only if using reconfirmable + + ## Lockable + # t.integer :failed_attempts, default: 0, null: false # Only if lock strategy is :failed_attempts + # t.string :unlock_token # Only if unlock strategy is :email or :both + # t.datetime :locked_at + + t.string :username + + t.timestamps null: false + end + + add_index :users, :email, unique: true + add_index :users, :reset_password_token, unique: true + # add_index :users, :confirmation_token, unique: true + # add_index :users, :unlock_token, unique: true + end +end diff --git a/db/migrate/20170809231601_create_photos.rb b/db/migrate/20170809231601_create_photos.rb new file mode 100644 index 0000000..090e57c --- /dev/null +++ b/db/migrate/20170809231601_create_photos.rb @@ -0,0 +1,12 @@ +class CreatePhotos < ActiveRecord::Migration[5.0] + def change + create_table :photos do |t| + t.text :caption + t.string :image + t.integer :user_id + + t.timestamps + + end + end +end diff --git a/db/migrate/20170809231607_create_likes.rb b/db/migrate/20170809231607_create_likes.rb new file mode 100644 index 0000000..e9ed7f8 --- /dev/null +++ b/db/migrate/20170809231607_create_likes.rb @@ -0,0 +1,11 @@ +class CreateLikes < ActiveRecord::Migration[5.0] + def change + create_table :likes do |t| + t.integer :user_id + t.integer :photo_id + + t.timestamps + + end + end +end diff --git a/db/migrate/20170809231615_create_comments.rb b/db/migrate/20170809231615_create_comments.rb new file mode 100644 index 0000000..8db028b --- /dev/null +++ b/db/migrate/20170809231615_create_comments.rb @@ -0,0 +1,12 @@ +class CreateComments < ActiveRecord::Migration[5.0] + def change + create_table :comments do |t| + t.integer :photo_id + t.text :body + t.integer :user_id + + t.timestamps + + end + end +end diff --git a/db/schema.rb b/db/schema.rb index 4dfbb16..0855fc7 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1,4 +1,3 @@ -# encoding: UTF-8 # This file is auto-generated from the current state of the database. Instead # of editing this file, please use the migrations feature of Active Record to # incrementally modify your database, and then regenerate this schema definition. @@ -11,6 +10,47 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 0) do +ActiveRecord::Schema.define(version: 20170809231615) do + + create_table "comments", force: :cascade do |t| + t.integer "photo_id" + t.text "body" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "likes", force: :cascade do |t| + t.integer "user_id" + t.integer "photo_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "photos", force: :cascade do |t| + t.text "caption" + t.string "image" + t.integer "user_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + + create_table "users", force: :cascade do |t| + t.string "email", default: "", null: false + t.string "encrypted_password", default: "", null: false + t.string "reset_password_token" + t.datetime "reset_password_sent_at" + t.datetime "remember_created_at" + t.integer "sign_in_count", default: 0, null: false + t.datetime "current_sign_in_at" + t.datetime "last_sign_in_at" + t.string "current_sign_in_ip" + t.string "last_sign_in_ip" + t.string "username" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["email"], name: "index_users_on_email", unique: true + t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true + end end From 0d09e37d19878e3bb178d94fa3417f2e38a62d58 Mon Sep 17 00:00:00 2001 From: Em Klick Date: Thu, 10 Aug 2017 01:05:58 +0000 Subject: [PATCH 02/24] 2 --- app/controllers/application_controller.rb | 2 + app/controllers/photos_controller.rb | 10 ++++- app/controllers/users_controller.rb | 12 ++++++ app/views/devise/confirmations/new.html.erb | 16 +++++++ .../mailer/confirmation_instructions.html.erb | 5 +++ .../devise/mailer/email_changed.html.erb | 7 +++ .../devise/mailer/password_change.html.erb | 3 ++ .../reset_password_instructions.html.erb | 8 ++++ .../mailer/unlock_instructions.html.erb | 7 +++ app/views/devise/passwords/edit.html.erb | 25 +++++++++++ app/views/devise/passwords/new.html.erb | 16 +++++++ app/views/devise/registrations/edit.html.erb | 43 +++++++++++++++++++ app/views/devise/registrations/new.html.erb | 29 +++++++++++++ app/views/devise/sessions/new.html.erb | 26 +++++++++++ app/views/devise/shared/_links.html.erb | 25 +++++++++++ app/views/devise/unlocks/new.html.erb | 16 +++++++ app/views/layouts/application.html.erb | 3 +- app/views/photos/favorites.html.erb | 16 +++++++ app/views/photos/new.html.erb | 6 --- app/views/photos/show.html.erb | 15 ++++--- app/views/users/index.html.erb | 20 +++++++++ app/views/users/show.html.erb | 9 ++++ config/routes.rb | 9 +++- 23 files changed, 311 insertions(+), 17 deletions(-) create mode 100644 app/controllers/users_controller.rb create mode 100644 app/views/devise/confirmations/new.html.erb create mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb create mode 100644 app/views/devise/mailer/email_changed.html.erb create mode 100644 app/views/devise/mailer/password_change.html.erb create mode 100644 app/views/devise/mailer/reset_password_instructions.html.erb create mode 100644 app/views/devise/mailer/unlock_instructions.html.erb create mode 100644 app/views/devise/passwords/edit.html.erb create mode 100644 app/views/devise/passwords/new.html.erb create mode 100644 app/views/devise/registrations/edit.html.erb create mode 100644 app/views/devise/registrations/new.html.erb create mode 100644 app/views/devise/sessions/new.html.erb create mode 100644 app/views/devise/shared/_links.html.erb create mode 100644 app/views/devise/unlocks/new.html.erb create mode 100644 app/views/photos/favorites.html.erb create mode 100644 app/views/users/index.html.erb create mode 100644 app/views/users/show.html.erb diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index d83690e..239335a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -2,4 +2,6 @@ class ApplicationController < ActionController::Base # Prevent CSRF attacks by raising an exception. # For APIs, you may want to use :null_session instead. protect_from_forgery with: :exception + + before_action :authenticate_user! end diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index 0be35b3..35c35e9 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -1,6 +1,12 @@ class PhotosController < ApplicationController skip_before_action :authenticate_user!, :only => [:index, :show] + def favorites + @photos = current_user.liked_photos + + render("photos/favorites.html.erb") + end + def index @photos = Photo.all @@ -24,7 +30,7 @@ def create @photo.caption = params[:caption] @photo.image = params[:image] - @photo.user_id = params[:user_id] + @photo.user_id = current_user.id save_status = @photo.save @@ -46,7 +52,7 @@ def update @photo.caption = params[:caption] @photo.image = params[:image] - @photo.user_id = params[:user_id] + @photo.user_id = current_user.id save_status = @photo.save diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb new file mode 100644 index 0000000..5e81668 --- /dev/null +++ b/app/controllers/users_controller.rb @@ -0,0 +1,12 @@ +class UsersController < ApplicationController + def index + @users = User.all + end + + def show + @user = User.find(params[:id]) + + # @photos = Photo.where(:user_id => @user.id) + @photos = @user.photos + end +end \ No newline at end of file diff --git a/app/views/devise/confirmations/new.html.erb b/app/views/devise/confirmations/new.html.erb new file mode 100644 index 0000000..2dc668f --- /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| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true, value: (resource.pending_reconfirmation? ? resource.unconfirmed_email : resource.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 0000000..dc55f64 --- /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 0000000..32f4ba8 --- /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 0000000..b41daf4 --- /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 0000000..f667dc1 --- /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 0000000..41e148b --- /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 0000000..6a796b0 --- /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| %> + <%= devise_error_messages! %> + <%= f.hidden_field :reset_password_token %> + +
+ <%= f.label :password, "New password" %>
+ <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum)
+ <% end %> + <%= f.password_field :password, autofocus: true, autocomplete: "off" %> +
+ +
+ <%= f.label :password_confirmation, "Confirm new password" %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
+ +
+ <%= 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 0000000..3d6d11a --- /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| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= 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 0000000..1e66f3d --- /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| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ + <% 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)
+ <%= f.password_field :password, autocomplete: "off" %> + <% if @minimum_password_length %> +
+ <%= @minimum_password_length %> characters minimum + <% end %> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
+ +
+ <%= f.label :current_password %> (we need your current password to confirm your changes)
+ <%= f.password_field :current_password, autocomplete: "off" %> +
+ +
+ <%= f.submit "Update" %> +
+<% end %> + +

Cancel my account

+ +

Unhappy? <%= button_to "Cancel my account", registration_path(resource_name), data: { 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 0000000..5a238ce --- /dev/null +++ b/app/views/devise/registrations/new.html.erb @@ -0,0 +1,29 @@ +

Sign up

+ +<%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= f.label :password %> + <% if @minimum_password_length %> + (<%= @minimum_password_length %> characters minimum) + <% end %>
+ <%= f.password_field :password, autocomplete: "off" %> +
+ +
+ <%= f.label :password_confirmation %>
+ <%= f.password_field :password_confirmation, autocomplete: "off" %> +
+ +
+ <%= 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 0000000..b261cfd --- /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.email_field :email, autofocus: true %> +
+ +
+ <%= f.label :password %>
+ <%= f.password_field :password, autocomplete: "off" %> +
+ + <% 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/_links.html.erb b/app/views/devise/shared/_links.html.erb new file mode 100644 index 0000000..e6a3e41 --- /dev/null +++ b/app/views/devise/shared/_links.html.erb @@ -0,0 +1,25 @@ +<%- if controller_name != 'sessions' %> + <%= link_to "Log in", new_session_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.registerable? && controller_name != 'registrations' %> + <%= link_to "Sign up", new_registration_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> + <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> + <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %> + <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %>
+<% end -%> + +<%- if devise_mapping.omniauthable? %> + <%- resource_class.omniauth_providers.each do |provider| %> + <%= link_to "Sign in with #{OmniAuth::Utils.camelize(provider)}", omniauth_authorize_path(resource_name, provider) %>
+ <% end -%> +<% end -%> diff --git a/app/views/devise/unlocks/new.html.erb b/app/views/devise/unlocks/new.html.erb new file mode 100644 index 0000000..16586bc --- /dev/null +++ b/app/views/devise/unlocks/new.html.erb @@ -0,0 +1,16 @@ +

Resend unlock instructions

+ +<%= form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f| %> + <%= devise_error_messages! %> + +
+ <%= f.label :email %>
+ <%= f.email_field :email, autofocus: true %> +
+ +
+ <%= 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 index 0a71b82..4e717cd 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -43,7 +43,8 @@
  • Comments
  • Likes
  • Photos
    • -
  • Sitemap
    • +
  • Users
    • +
  • Git
    • - + <% end %> diff --git a/notes b/notes new file mode 100644 index 0000000..786df64 --- /dev/null +++ b/notes @@ -0,0 +1,14 @@ +
    + + Back + + + <% if current_user.id == @photo.user_id %> + + Edit + + + Delete + + <% end %> +
    \ No newline at end of file From 28cc4dfd2269c78d842a8470e96c8ecdf6c23ba6 Mon Sep 17 00:00:00 2001 From: Em Klick Date: Sat, 12 Aug 2017 20:06:10 +0000 Subject: [PATCH 16/24] 15 --- app/views/photos/index.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb index a59245e..7d73137 100644 --- a/app/views/photos/index.html.erb +++ b/app/views/photos/index.html.erb @@ -115,16 +115,19 @@ -
    +
    Back + + <% if current_user.id == photo.user_id %> Edit Delete + <% end %>
    From eed62b0e431c86daefac6250f616dad00c4529ec Mon Sep 17 00:00:00 2001 From: Em Klick Date: Sat, 12 Aug 2017 20:22:29 +0000 Subject: [PATCH 17/24] 16 --- app/controllers/photos_controller.rb | 4 ++- app/views/photos/index.html.erb | 41 ++++++++++++---------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/app/controllers/photos_controller.rb b/app/controllers/photos_controller.rb index a131c3e..1a601c3 100644 --- a/app/controllers/photos_controller.rb +++ b/app/controllers/photos_controller.rb @@ -10,7 +10,9 @@ def favorites def index @photo = Photo.all - @comments = Comment.all + @comment = Comment.all + + render("photos/index.html.erb") end diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb index 7d73137..d1b18a7 100644 --- a/app/views/photos/index.html.erb +++ b/app/views/photos/index.html.erb @@ -47,12 +47,10 @@

    - - - + - +
    + PhotogramAuth +
    + + + + + + +
    + + +
    +
    +
    +
    +

    Sign up

    +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    + +
    +
    + +
    + +
    + +

    +

    +
    +
    + +
    + +
    + +
    +
    + +
    +
    + +
    +
    + + +
    +
    + Log in
    + + + + + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + + diff --git a/config/routes.rb b/config/routes.rb index e68fcd8..a346f10 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -7,6 +7,7 @@ get "/users", :controller => "users", :action => "index" get "/users/:id", :controller => "users", :action => "show" + get "/users/sign_up", :controller => "users", :action => "crea" # Routes for the Comment resource: # CREATE From fe52354b8d8e65c2179cb546f5044039d76fe2da Mon Sep 17 00:00:00 2001 From: Em Klick Date: Wed, 16 Aug 2017 22:28:46 +0000 Subject: [PATCH 24/24] 25 --- Gemfile.lock | 12 +++++++----- app/views/photos/index.html.erb | 25 +++++++++++++++---------- app/views/users/new.html.erb | 2 +- 3 files changed, 23 insertions(+), 16 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5c604f1..08a5013 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -74,7 +74,7 @@ GEM activerecord (>= 3.2, < 6.0) rake (>= 10.4, < 13.0) arel (7.1.4) - autoprefixer-rails (7.1.2.4) + autoprefixer-rails (7.1.2.6) execjs awesome_print (1.8.0) bcrypt (3.1.11) @@ -85,8 +85,9 @@ GEM bindex (0.5.0) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) - bootstrap (4.0.0.alpha6) + bootstrap (4.0.0.beta) autoprefixer-rails (>= 6.0.3) + popper_js (~> 1.11.1) sass (>= 3.4.19) builder (3.2.3) byebug (9.0.6) @@ -170,19 +171,20 @@ GEM mime-types (3.1) mime-types-data (~> 3.2015) mime-types-data (3.2016.0521) - mini_mime (0.1.3) + mini_mime (0.1.4) mini_portile2 (2.2.0) minitest (5.10.3) multi_json (1.12.1) nio4r (2.1.0) nokogiri (1.8.0) mini_portile2 (~> 2.2.0) - octicons (4.0.1) + octicons (4.0.2) nokogiri (>= 1.6.3.1) octicons_helper (4.0.1) octicons (~> 4.0) rails orm_adapter (0.5.0) + popper_js (1.11.1) pry (0.10.4) coderay (~> 1.1.0) method_source (~> 0.8.1) @@ -234,7 +236,7 @@ GEM rspec-mocks (3.6.0) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.6.0) - rspec-rails (3.6.0) + rspec-rails (3.6.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) diff --git a/app/views/photos/index.html.erb b/app/views/photos/index.html.erb index c351988..1fe7d97 100644 --- a/app/views/photos/index.html.erb +++ b/app/views/photos/index.html.erb @@ -46,18 +46,23 @@

    + <% if Like.where(:photo_id => photo.id).where(:user_id => current_user.id).exists? %> +

    + + <%= photo.fans.pluck(:username).to_sentence %> like this +
    + <% else %>
    - - - - - - - - be the first to like this + + + + <%= photo.fans.pluck(:username).to_sentence %> like this
    + <% end %>

    diff --git a/app/views/users/new.html.erb b/app/views/users/new.html.erb index 56604ab..a3e2549 100644 --- a/app/views/users/new.html.erb +++ b/app/views/users/new.html.erb @@ -109,7 +109,7 @@
    - +