Commit: bfb19baeb0ba10b0f4cea26855675f2b5d6d5c6d - mmw_serv (git)

Commit MetaInfo

• Révision: bfb19baeb0ba10b0f4cea26855675f2b5d6d5c6d (tree)
• l'heure: 2017-09-05 23:25:21
• Auteur: HMML <hmml3939@gmai...>
• Commiter: HMML

Message de Log

Add user settings and profile page.

Change Summary

• modified: app/models/user.rb
• modified: app/views/layouts/_topnav.html.haml
• modified: app/views/themes/show.html.haml
• modified: app/views/users/_form.html.haml
• modified: app/views/users/edit.html.haml
• modified: app/views/users/show.html.haml
• modified: config/locales/en.yml
• modified: config/locales/ja.yml

Modification

--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -4,4 +4,21 @@ class User < ApplicationRecord
   # :database_authenticatable, :registerable,
   # :recoverable, :rememberable, :validatable,
   devise :trackable, :omniauthable
+
+  has_many :themes
+
+  def tw_url?
+    !tw_url.blank?
+  end
+
+  def tw_url
+    tw_nick or return nil
+    "https://twitter.com/#{tw_nick}"
+  end
+
+  def icon_tag(opts = {})
+    tw_img_url or return ''.html_safe
+    opts = {size: '20x20', class: 'user-icon d-inline-block'}.merge(opts)
+    ActionController::Base.helpers.image_tag tw_img_url, opts
+  end
 end

--- a/app/views/layouts/_topnav.html.haml
+++ b/app/views/layouts/_topnav.html.haml
@@ -21,10 +21,11 @@
       - if user_signed_in?
         %li.nav-item.dropdown
           %a.nav-link.dropdown-toggle{href: '#', data: {toggle: 'dropdown'}}
-            = image_tag current_user.tw_img_url, size: '20x20', class: 'd-inline-block'
+            = current_user.icon_tag
             = current_user.name
             %b.caret
           .dropdown-menu.dropdown-menu-right
+            = link_to t('user_profile'), user_path(current_user), class: 'dropdown-item'
             = link_to t('user_settings'), edit_user_path(current_user), class: 'dropdown-item'
             = link_to t('logout'), logout_path, class: 'dropdown-item'
       - else

--- a/app/views/themes/show.html.haml
+++ b/app/views/themes/show.html.haml
@@ -29,6 +29,11 @@
             orig_theme_path(@theme), class: 'btn btn-secondary', 'data-turbolinks' => 'false'
   .row
     .col-xl-3.col-lg-4.col-md-5
+      %h5= t 'registerd_by'
+      - if @theme.user.present?
+        %p= link_to @theme.user.icon_tag + @theme.user.name, @theme.user
+      - else
+        %p= t 'anonymous'
       %h5= t 'activerecord.attributes.theme.created_at'
       %p= l @theme.created_at
       %h5= t 'license'

--- a/app/views/users/_form.html.haml
+++ b/app/views/users/_form.html.haml
@@ -1,8 +1,8 @@
 = simple_form_for(@user) do |f|
   .form-inputs
     = f.input :name
-    = f.input :lang
-    = f.input :timezone
+    = f.input :lang, collection: Hash[Rails.configuration.i18n.available_locales.map {|l| [t("langs.#{l}"), l]}], include_blank: false
+    = f.input :timezone, collection: Hash[ActiveSupport::TimeZone.all.map{|z| [z.to_s, z.name] }], include_blank: false
 
   .form-actions
     = f.button :submit

--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -1,3 +1,3 @@
-%h1 Editing user
+%h1= t '.title'
 
 = render 'form'

--- a/app/views/users/show.html.haml
+++ b/app/views/users/show.html.haml
@@ -1,10 +1,27 @@
-%p#notice= notice
+- content_for(:title) { @user.name + ' - ' +  t('.title') }
 
-%p
-  %b Name:
+%h2
+  = @user.icon_tag size: '48x48'
   = @user.name
-%p
-  %b Lang:
-  = @user.lang
+  - if @user.tw_url?
+    = link_to fa_icon(:twitter) + ' Twitter', @user.tw_url, class: 'btn btn-sm btn-secondary'
 
-= link_to 'Edit', edit_user_path(@user)
+%h3= t '.registered_themes'
+
+- if @user.themes.size > 0
+  .card-columns.theme-index
+    - @user.themes.each do |theme|
+      .card{class: theme.day_frame_white? ? 'frame-white' : ''}
+        .card-block.p-1
+          .icons
+            - 3.times do |idx|
+              .day-frame.day-frame-80
+                = link_to image_tag(theme.public_send("preview#{idx+2}").url(:png100)), theme
+            .clearfix
+          %h4= link_to theme.name, theme
+          .author= link_to theme.author, theme
+          .short-desc
+            = theme.short_desc
+            .clip
+- else
+  .alert.alert-warning= t '.no_registered_themes'

--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,4 +1,10 @@
 en:
+  date:
+    formats:
+      default: "%d/%m/%Y"
+  time:
+    formats:
+      default: "%d/%m/%Y %H:%M:%S"
   activerecord:
     models:
       theme: Theme
@@ -19,6 +25,13 @@ en:
       title: Theme index
     new:
       title: Create new theme
+  users:
+    show:
+      title: User profile
+      registered_themes: Registerd themes
+      no_registered_themes: No themes are registered by this user.
+    edit:
+      title: User settings
 
   simple_formn:
     placeholders:
@@ -127,3 +140,10 @@ en:
     choose_license: Choose License
     publish: Publish
   no_themes_published: No themes has been published yet.
+  registerd_by: Registered by
+  anonymous: (anonymous)
+  langs:
+    en: English
+    ja: 日本語 (Japanese)
+  user_settings: User Settings
+  user_profile: Profile

--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2,6 +2,7 @@ ja:
   activerecord:
     models:
       theme: テーマ
+      user: ユーザ
     attributes:
       theme:
         name: 名称
@@ -9,6 +10,10 @@ ja:
         url: リンクURL
         short_desc: 短い説明
         created_at: 公開日時
+      user:
+        name: 表示名
+        lang: 言語
+        timezone: タイムゾーン
   drafts:
     show:
       title: テーマのプレビュー
@@ -19,6 +24,13 @@ ja:
       title: テーマ一覧
     new:
       title: 新規テーマの作成
+  users:
+    show:
+      title: ユーザプロフィール
+      registered_themes: 登録したテーマ
+      no_registered_themes: このユーザによって登録されたテーマはありません。
+    edit:
+      title: ユーザ設定
   
   simple_formn:
     placeholders:
@@ -129,4 +141,10 @@ ja:
     choose_license: ライセンス選択
     publish: 公開
   no_themes_published: まだ公開されたテーマはありません
-  
\ No newline at end of file
+  registerd_by: 登録ユーザ
+  anonymous: (匿名)
+  langs:
+    en: 英語 (English)
+    ja: 日本語
+  user_settings: ユーザ設定
+  user_profile: プロフィール