my_forum 0.0.1.beta37 → 0.0.1.beta38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03b3cc40a791edfb4194434b71762812b81ef5fc
-  data.tar.gz: 71c82e4793168591520f86bedebabcf1d4946375
+  metadata.gz: 31f75c76f47fdee65be36da33f7542c0a3f23a0d
+  data.tar.gz: d01efedd20e6ff6d653562bc33c0622e6cc4f98d
 SHA512:
-  metadata.gz: 7dfdcc7b66f9443979596df63d8d0677ff9b53d55c9197d39d91324ddace3376cce45fe726ae82227dbfef917a1a0ed3d7100cfbbc4d050a4348ac8d3d231d2a
-  data.tar.gz: 6e7df886f252d316a6c6ca230f1dd9508bff78f009c1c2cec57c6a20a028c6df9bfb4ae18ca65a7eda24223bec4ae7ec45df6f52ccb9dd92159f4ded1e6bb1cd
+  metadata.gz: 35ffc2e59280e2be0621d15121ec332332239c6631dee21debc59a7c04f9cb8904c2255e6025a7f0306c8392879d4d89206d1c7b8e4824bc210cfdd9cc4019d5
+  data.tar.gz: dd15a84b6cea17291df8891de0551d9257d33c3f74f2fb34ba34c6a6646cb03b018f02d2da5c2413e57f6b682c0794a84046251764e04f5d8c72b44c39e2c8b0

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

@@ -19,6 +19,15 @@
 @import "font-awesome-sprockets";
 @import "font-awesome";
 
+.popover {
+  min-width: 540px !important;
+}
+
+.popover-title {
+  font-weight: bold;
+  color: #000;
+}
+
 .modal-dialog {
   .post_attachment {
     max-width: 200px;

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

@@ -1,10 +1,13 @@
 .profile-popover {
-  width: 360px;
   font-size: 11px;
   color: #000;
 
+  .second_row {
+    margin-left: 10px;
+  }
+
   .pm {
-    margin-top: 10px;
+    margin: 16px 0;
   }
 }
 
@@ -29,6 +32,12 @@
     }
 
     .post_from_user_login {
+      .user_profile_popover {
+        position: relative;
+        z-index: 100;
+        padding: 5px;
+      }
+
       font-weight: bold;
       color: #c1ccf5;
     }

data/app/controllers/my_forum/users_controller.rb

@@ -14,7 +14,13 @@ module MyForum
 
     def update
       update_password
-      current_user.update_columns(user_update_params)
+
+      current_user.update!(user_update_params)
+
+      User::ADDITIONAL_INFO_ATTRS.each do |attr|
+        current_user.update(attr => params[:user][attr]) if params[:user][attr]
+      end
+
       redirect_to edit_user_path(current_user)
     end
 

data/app/controllers/my_forum/welcome_controller.rb

@@ -20,7 +20,7 @@ module MyForum
                           SELECT posts.id, posts.user_id, posts.text, posts.topic_id, posts.updated_at, topics.name as topic_name, topics.forum_id, topics.deleted FROM my_forum_posts AS posts
                           LEFT JOIN my_forum_topics AS topics ON posts.topic_id = topics.id
                           LEFT JOIN my_forum_forums AS forums ON forums.id = topics.forum_id
-                          WHERE posts.id IN (SELECT MAX(id) FROM my_forum_posts GROUP BY topic_id) AND posts.is_deleted IS FALSE AND topics.deleted IS FALSE
+                          WHERE posts.id IN (SELECT MAX(id) FROM my_forum_posts GROUP BY topic_id) AND posts.is_deleted IS FALSE AND topics.deleted IS FALSE AND forums.id IN (#{available_forum_ids.join(',')})
                           ORDER BY posts.id DESC LIMIT 10
                         ")
                       end

data/app/helpers/my_forum/users_helper.rb

@@ -25,5 +25,9 @@ module MyForum
       return unless User.online.pluck(:login).include?(user_login)
       content_tag :div, ' '.html_safe, class: 'label label-success'
     end
+
+    def additional_info_attrs
+      MyForum::User::ADDITIONAL_INFO_ATTRS
+    end
   end
 end

data/app/models/my_forum/user.rb

@@ -18,11 +18,32 @@ module MyForum
     enum gender: [:female, :male, :alien]
     serialize :additional_info
 
-
     validates_uniqueness_of :login, :email
 
     before_save :encrypt_password
 
+    ADDITIONAL_INFO_ATTRS = [:real_name, :phone, :car_info]
+    #, :website_url, :personal_text
+
+    def self.serialized_attr_accessor(*args)
+      ADDITIONAL_INFO_ATTRS.each do |attr|
+        eval "
+          def #{attr}
+            (self.additional_info || {})[:#{attr}]
+          end
+
+          def #{attr}=(value)
+            self.additional_info ||= {}
+            self.additional_info[:#{attr}] = value
+          end
+          "
+      end
+    end
+
+    # TODO should be stored in DB for editin from admin panel
+    #serialized_attr_accessor :real_name, :phone, :website_url, :personal_text
+    serialized_attr_accessor
+
     def valid_password?(submitted_password)
       password == encrypt(submitted_password)
     end

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

@@ -1,22 +1,45 @@
 .profile-popover
-  .row
-    .col-sm-5= t('my_forum.profile_popover.posts_count')
-    .col-sm-4= user.posts_count
+  .row.col-md-12
+    .row.col-md-6
+      .row
+        .col-sm-6
+          %strong= t('my_forum.profile_popover.posts_count')
+        .col-sm-6
+          = user.posts_count
+      .row
+        .col-sm-6
+          %strong= t('my_forum.profile_popover.registered_at')
+        .col-sm-6
+          = time(user.created_at)
+      .row
+        .col-sm-6
+          %strong= t('my_forum.profile_popover.status')
+        .col-sm-6
+          - is_online = is_online_user?(user.login)
+          = is_online ? t('my_forum.profile_popover.online') : t('my_forum.profile_popover.offline')
+      - unless is_online
+        .row
+          .col-sm-6
+            %strong= t('my_forum.profile_popover.last_online')
+          .col-sm-6
+            = time(user.updated_at)
+      .row.pm
+        .col-sm-12= link_to t('my_forum.profile_popover.write_pm'), new_private_message_path(to: user.login), class: 'btn btn-xs btn-warning'
 
-  .row
-    .col-sm-5= t('my_forum.profile_popover.registered_at')
-    .col-sm-4= time(user.created_at)
+    .row.col-md-6.second_row
+      .row
+        .col-sm-5
+          %strong= t('my_forum.profile_popover.user_name')
+        .col-sm-7
+          = user.phone || '-'
+      .row
+        .col-sm-5
+          %strong= t('my_forum.profile_popover.phone')
+        .col-sm-7
+          = user.real_name || '-'
+      .row
+        .col-sm-5
+          %strong= t('my_forum.profile_popover.car_info')
+        .col-sm-7
+          = user.car_info || '-'
 
-  .row
-    .col-sm-5= t('my_forum.profile_popover.status')
-    .col-sm-4
-      - is_online = is_online_user?(user.login)
-      = is_online ? t('my_forum.profile_popover.online') : t('my_forum.profile_popover.offline')
-
-  - unless
-    .row
-      .col-sm-5= t('my_forum.profile_popover.last_online')
-      .col-sm-4= time(user.updated_at)
-
-  .row.pm
-    .col-sm-12= link_to t('my_forum.profile_popover.write_pm'), new_private_message_path(to: user.login), class: 'btn btn-xs btn-warning'

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

@@ -25,3 +25,12 @@
         .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'
+%br
+%h2= t('.edit_additional_info')
+.row
+  .col-md-4
+    = form_for current_user, url: user_path(current_user), role: 'form' do |form|
+      - additional_info_attrs.each do |attr|
+        .form-group= form.text_field attr, class: 'name form-control', placeholder: t("my_forum.additional_info.#{attr.to_s}")
+
+      = form.submit t('.update'), class: 'btn btn-primary btn-sm'

data/config/locales/ru.yml

@@ -8,14 +8,23 @@ ru:
     shared:
       post_preview:
         preview: 'Предпросмотр сообщения'
+    additional_info:
+      real_name: 'Ваше имя'
+      phone: 'Контактный телефон'
+      website_url: 'Ваш сайт'
+      personal_text: 'Подпись'
+      car_info: 'Марка и модель авто'
 
     profile_popover:
-      posts_count: 'Сообщений на форуме: '
-      registered_at: 'Дата регистрации: '
-      status: 'Текущий статус:'
+      posts_count: 'Сообщений: '
+      registered_at: 'Регистрация: '
+      status: 'Статус:'
       online: 'на форуме'
       offline: 'не на форуме'
-      last_online: 'Был на форуме'
+      last_online: 'Был на форуме:'
+      user_name: 'Имя'
+      phone: 'Телефон'
+      car_info: 'Марка авто'
       write_pm: 'Написать ЛС'
 
     today: "Сегодня в %{hhmm}"
@@ -130,6 +139,7 @@ ru:
         avatar_upload_description: 'Загрузите свой аватар или укажите ссылку'
         update: 'Обновить'
         update_avatar: 'Обновить аватар'
+        edit_additional_info: 'Дополнительная информация'
 
 
     private_messages:

data/lib/my_forum/version.rb

@@ -1,3 +1,3 @@
 module MyForum
-  VERSION = "0.0.1.beta37"
+  VERSION = "0.0.1.beta38"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: my_forum
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta37
+  version: 0.0.1.beta38
 platform: ruby
 authors:
 - Vitaly Omelchenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-25 00:00:00.000000000 Z
+date: 2016-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -323,12 +323,10 @@ files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
-- spec/dummy/test.db
 - spec/helpers/my_forum/posts_helper_spec.rb
 - spec/helpers/my_forum/private_messages_helper_spec.rb
 - spec/models/my_forum/emoticon_spec.rb
@@ -395,14 +393,12 @@ test_files:
 - spec/dummy/db/development.sqlite3
 - spec/dummy/db/schema.rb
 - spec/dummy/db/test.sqlite3
-- spec/dummy/log/test.log
 - spec/dummy/public/404.html
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
 - spec/dummy/Rakefile
 - spec/dummy/README.rdoc
-- spec/dummy/test.db
 - spec/helpers/my_forum/posts_helper_spec.rb
 - spec/helpers/my_forum/private_messages_helper_spec.rb
 - spec/models/my_forum/emoticon_spec.rb