my_forum 0.0.1.beta27 → 0.0.1.beta28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85befe5d26e8e5dd2cdd6c60b72b8603447b9c5d
-  data.tar.gz: 0edfd26fa58e9b16ec5cbf13210352d732adb120
+  metadata.gz: 9e9c4dc6e1fd0e4d60d78d975bec3ed7a6a27946
+  data.tar.gz: c45c52e592f918069fa6879d4a391da75a75e0ae
 SHA512:
-  metadata.gz: 55a8479d2f36b42a31b41f686c69a9dd17fdb5ce98e65480c156f88a6d7085770f612b8b8077dfe04c1dafb8b97c6d9af425b328ea6ce1bb1fd77d0cc75e0a28
-  data.tar.gz: a9583685f8dc25443eddd20846f9e35aed13a0323ce27c0ccdba6d06c4410c5e82783631e490a98d1057bbf555304a6d4dbbe0fbb2d93a6d691db657b41ce441
+  metadata.gz: 829a37be49a60d7a44676e195ab285cb8004c926d208c003d1cb010cce148ecd6866173c16dc11855afd03ddb63e0c833cca5177fdfc0deed6a22e6ce42e5db8
+  data.tar.gz: d3cad5b3c19c147d2e48d61279a99fcf8120b2e625eb940d605daa21c2328e7f67e47d836263a45f5d51e170c27371a5398e8178cb02a946983da022c3311417

data/app/assets/stylesheets/my_forum/users.css.scss

@@ -0,0 +1,3 @@
+.submit_update_avatar {
+  margin-top: 10px;
+}

data/app/controllers/my_forum/users_controller.rb

@@ -77,8 +77,23 @@ module MyForum
       end
     end
 
+    def avatar_update
+      if params[:user][:avatar]
+        avatar = upload_avatar(params[:user][:avatar])
+        current_user.update(avatar_url: File.join(Avatar::URL, current_user.id.to_s, avatar.file_name)) if avatar
+      elsif params[:user][:avatar_url]
+        current_user.update_columns(avatar_params)
+      end
+
+      redirect_to edit_user_path(current_user)
+    end
+
     private
 
+    def avatar_params
+      params.require(:user).permit(:avatar_url)
+    end
+
     def user_params
       params.require(:user).permit(:login, :email, :password)
     end
@@ -96,5 +111,28 @@ module MyForum
       current_user.update_attributes(password: new_password)
     end
 
+    def upload_avatar(avatar_param)
+      return false unless Avatar::ALLOWED_FILE_EXTENSIONS.include? File.extname(avatar_param.original_filename)
+
+      current_avatar  = current_user.avatar
+      upload_path     = File.join(Avatar::UPLOAD_PATH, current_user.id.to_s)
+
+      # Create dir of not exists
+      FileUtils::mkdir_p upload_path
+
+      File.open(File.join(upload_path, avatar_param.original_filename), 'wb') do |file|
+        file.write(avatar_param.read)
+      end
+
+      new_avatar = Avatar.create(user_id: current_user.id, file_name: avatar_param.original_filename)
+
+      if current_avatar and new_avatar
+        FileUtils.rm File.join(upload_path, current_avatar.file_name) rescue nil
+        current_avatar.destroy
+      end
+
+      new_avatar
+    end
+
   end
 end

data/app/helpers/my_forum/users_helper.rb

@@ -8,7 +8,7 @@ module MyForum
 
     # Display user avatar
     def user_avatar(user)
-      return image_tag(user.avatar, class: 'user-avatar') unless user.avatar.blank?
+      return image_tag(user.avatar_url, class: 'user-avatar') unless user.avatar_url.blank?
 
       image_tag('blank_avatar.png', class: 'user-avatar')
     end

data/app/models/my_forum/attachment.rb

@@ -6,6 +6,6 @@ module MyForum
     UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'attachments')
     URL  = File.join('/uploads', 'attachments')
 
-    ALLOWED_FILE_EXTENSIONS = %w(.jpg .png .gif)
+    ALLOWED_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif)
   end
 end

data/app/models/my_forum/avatar.rb

@@ -1,5 +1,10 @@
 module MyForum
   class Avatar < Image
     belongs_to :user
+
+    UPLOAD_PATH = File.join(Rails.public_path, 'uploads', 'avatars')
+    URL  = File.join('/uploads', 'avatars')
+
+    ALLOWED_FILE_EXTENSIONS = %w(.jpg .jpeg .png .gif)
   end
 end

data/app/models/my_forum/user.rb

@@ -11,6 +11,7 @@ module MyForum
 
     has_one :avatar
 
+    default_scope { where(is_deleted: false) }
     scope :online, -> { where("updated_at > ?", 10.minutes.ago) }
     scope :today_visited, -> { where("updated_at > ?", Time.now.beginning_of_day) }
 

data/app/views/my_forum/shared/_upload_photo.haml

@@ -0,0 +1,44 @@
+#add_photo.modal.fade
+  .modal-dialog
+    .modal-content
+      .modal-header
+        %button.close{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
+          %span{ aria_hidden: "true" }
+            ×
+        %h4.modal-title
+          = t('.add_new_photo')
+      .modal-body
+        %p= t('my_forum.attachments.allowed_extensions', ext: upload_allowed_extensions.join(', '))
+        = form_for MyForum::Attachment.new, url: attachments_path, multipart: true, remote: true do |f|
+          = f.file_field 'file[]', multiple: true, id: 'attachment_files'
+
+        #loaded-content
+
+      .modal-footer
+        %button.btn.btn-default{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
+          Close
+
+      :coffee
+        $('#attachment_files').change ->
+          form_data = new FormData()
+
+          files_count = $('#attachment_files').prop('files').length
+          form_data.append('files[]', $('#attachment_files').prop('files')[c]) for c in [0...files_count]
+
+          $.ajax({
+            url: "#{attachments_path}"
+            dataType: 'html'
+            cache: false
+            contentType: false
+            processData: false
+            data: form_data
+            type: 'post',
+            success: (data, textStatus, jqXHR) ->
+              response = $.parseJSON(data)
+              bbcode_attachments = ''
+              bbcode_attachments += ('[attachment=' + id + '] \n') for id in response.attachments
+              $('##{textarea}').append(bbcode_attachments)
+              $('#loaded-content').html('#{t('my_forum.successfull_aploaded')}')
+              $('#add_photo').modal('hide')
+              $('#attachment_files').val('')
+          })

data/app/views/my_forum/topics/_quick_answer.haml

@@ -11,25 +11,10 @@
         =link_to '#', class: 'btn btn-default btn-sm' do
           %i{ class: 'fa fa-underline' }
 
-      -# %div.btn-group
-      -#   =link_to '#', class: 'btn btn-default btn-sm' do
-      -#     %i{ class: 'fa fa-align-left' }
-      -#   =link_to '#', class: 'btn btn-default btn-sm' do
-      -#     %i{ class: 'fa fa-align-center' }
-      -#   =link_to '#', class: 'btn btn-default btn-sm' do
-      -#     %i{ class: 'fa fa-align-right' }
-      -#   =link_to '#', class: 'btn btn-default btn-sm' do
-      -#     %i{ class: 'fa fa-align-justify' }
-
       %div.btn-group
         =link_to '#', class: 'btn btn-default btn-sm', data: { toggle: 'modal' } do
           %i{ class: 'fa fa-camera-retro' }
 
-        -# =link_to '#', class: 'btn btn-default btn-sm' do
-        -#   %i{ class: 'fa fa-video-camera' }
-        -# =link_to '#', class: 'btn btn-default btn-sm' do
-        -#   %i{ class: 'fa fa-link' }
-
       %div.btn-group.smiles
         - emoticons_list.each do |code, path|
           =link_to '#', class: 'btn btn-default btn-sm smile-past' do
@@ -43,51 +28,5 @@
 
       .pull-right
         = form.submit t('.quick_answer'), class: 'btn btn-primary'
-        =# link_to t('.advanced_answer'), '#', class: 'btn btn-primary'
-
-
-#add_photo.modal.fade
-  .modal-dialog
-    .modal-content
-      .modal-header
-        %button.close{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
-          %span{ aria_hidden: "true" }
-            ×
-        %h4.modal-title
-          = t('.add_new_photo')
-      .modal-body
-        %p= t('my_forum.attachments.allowed_extensions', ext: upload_allowed_extensions.join(', '))
-        = form_for MyForum::Attachment.new, url: attachments_path, multipart: true, remote: true do |f|
-          = f.file_field 'file[]', multiple: true, id: 'attachment_files'
-
-        #loaded-content
-
-        :coffee
-          $('#attachment_files').change ->
-            form_data = new FormData()
-
-            files_count = $('#attachment_files').prop('files').length
-            form_data.append('files[]', $('#attachment_files').prop('files')[c]) for c in [0...files_count]
-
-            $.ajax({
-              url: "#{attachments_path}"
-              dataType: 'html'
-              cache: false
-              contentType: false
-              processData: false
-              data: form_data
-              type: 'post',
-              success: (data, textStatus, jqXHR) ->
-                response = $.parseJSON(data)
-                bbcode_attachments = ''
-                bbcode_attachments += ('[attachment=' + id + '] \n') for id in response.attachments
-                $('#quick_answer_textarea').append(bbcode_attachments)
-                $('#loaded-content').html('#{t('my_forum.successfull_aploaded')}')
-                $('#add_photo').modal('hide')
-                $('#attachment_files').val('')
-            })
-
 
-      .modal-footer
-        %button.btn.btn-default{ type: 'button', aria_label: 'Close', data: { dismiss: 'modal' } }
-          Close
+        = render partial: 'my_forum/shared/upload_photo', locals: { textarea: 'quick_answer_textarea' }

data/app/views/my_forum/topics/new.haml

@@ -1,12 +1,38 @@
 %h2= t('.create_new_topic_in', topic_name: @forum.name)
 
+
+
 = form_for @topic, url: forum_topics_path, role: 'form' do |form|
   .form-group= form.text_field :name, class: 'name form-control', placeholder: t('.name')
   .form-group= form.text_field :description, class: 'description form-control', placeholder: t('.description')
 
   %br
 
-  = fields_for :post do |post_form|
-    .form-group= post_form.text_area :text, placeholder: t('.post_text'), class: 'form-control', rows: 10
+  .row
+    .col-md-12
+      .text-editor-buttons{ data: { apply_to: 'post_text' } }
+        %div.btn-group
+          =link_to '#', class: 'btn btn-default btn-sm' do
+            %i{ class: 'fa fa-bold' }
+          =link_to '#', class: 'btn btn-default btn-sm' do
+            %i{ class: 'fa fa-italic' }
+          =link_to '#', class: 'btn btn-default btn-sm' do
+            %i{ class: 'fa fa-strikethrough' }
+          =link_to '#', class: 'btn btn-default btn-sm' do
+            %i{ class: 'fa fa-underline' }
+
+        %div.btn-group
+          =link_to '#', class: 'btn btn-default btn-sm', data: { toggle: 'modal' } do
+            %i{ class: 'fa fa-camera-retro' }
+
+        %div.btn-group.smiles
+          - emoticons_list.each do |code, path|
+            =link_to '#', class: 'btn btn-default btn-sm smile-past' do
+              %img{ src: path, class: 'smile', data: { code: code } }
+
+      = fields_for :post do |post_form|
+        .form-group= post_form.text_area :text, placeholder: t('.post_text'), class: 'form-control', rows: 10
 
   = form.submit class: 'btn '
+
+  = render partial: 'my_forum/shared/upload_photo', locals: { textarea: 'post_text' }

data/app/views/my_forum/users/edit.haml

@@ -10,11 +10,18 @@
       .form-group= form.password_field :password, value: '', class: 'description form-control', placeholder: t('.current_password')
       .form-group= form.text_field :new_password, value: '', class: 'description form-control', placeholder: t('.new_password')
 
-      = form.submit class: 'btn btn-primary btn-sm'
+      = form.submit t('.update'), class: 'btn btn-primary btn-sm'
 
-  .col-md-4
+  .col-md-5.col-md-offset-1
     .row.col-sm-4
       .thumbnail
         = user_avatar(current_user)
-    .row.col-sm-4
-      upload
+    .row.col-sm-7.col-sm-offset-1
+      .row
+        %strong=t('.avatar')
+      = form_for current_user, url: user_avatar_update_path(current_user), role: 'form', multipart: true do |form|
+        .row
+          %p= t('.avatar_upload_description')
+        .row= form.file_field :avatar
+        .row= form.text_field :avatar_url, placeholder: 'http://...'
+        .row= form.submit t('.update_avatar'), class: 'btn btn-primary btn-sm submit_update_avatar'

data/config/locales/ru.yml

@@ -103,6 +103,10 @@ ru:
         email: 'Электронная почта'
         current_password: 'Текущий пароль'
         new_password: 'Новый пароль'
+        avatar: 'Аватар'
+        avatar_upload_description: 'Загрузите свой аватар или укажите ссылку'
+        update: 'Обновить'
+        update_avatar: 'Обновить аватар'
 
 
     private_messages:

data/config/routes.rb

@@ -15,6 +15,7 @@ MyForum::Engine.routes.draw do
   resources :attachments
 
   resources :users do
+    patch :avatar_update
     collection do
       get :autocomplete
     end

data/db/migrate/20151221203243_my_forum_rename_user_avatar.rb

@@ -0,0 +1,5 @@
+class MyForumRenameUserAvatar < ActiveRecord::Migration
+  def change
+    rename_column :my_forum_users, :avatar, :avatar_url
+  end
+end

data/db/migrate/20151221205045_my_forum_change_user_avatar.rb

@@ -0,0 +1,5 @@
+class MyForumChangeUserAvatar < ActiveRecord::Migration
+  def change
+    change_column :my_forum_users, :avatar_url, :text, length: 350
+  end
+end

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta27"
+  VERSION = "0.0.1.beta28"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta27
+  version: 0.0.1.beta28
 platform: ruby
 authors:
 - Vitaly Omelchenko
@@ -252,6 +252,7 @@ files:
 - app/views/my_forum/private_messages/inbox.haml
 - app/views/my_forum/private_messages/new.haml
 - app/views/my_forum/private_messages/show.haml
+- app/views/my_forum/shared/_upload_photo.haml
 - app/views/my_forum/topics/_post.haml
 - app/views/my_forum/topics/_quick_answer.haml
 - app/views/my_forum/topics/_topic_header.haml
@@ -287,6 +288,8 @@ files:
 - db/migrate/20151012095554_create_my_forum_images.rb
 - db/migrate/20151218135729_add_is_deleted.rb
 - db/migrate/20151220121140_create_my_forum_emoticons.rb
+- db/migrate/20151221203243_my_forum_rename_user_avatar.rb
+- db/migrate/20151221205045_my_forum_change_user_avatar.rb
 - lib/my_forum.rb
 - lib/my_forum/engine.rb
 - lib/my_forum/version.rb