fix: suport yasapp oauth

diff --git a/app/assets/javascripts/controllers/user_sessions.js.coffee b/app/assets/javascripts/controllers/user_sessions.js.coffee
index 5295766..395aee7 100644 (file)
--- a/app/assets/javascripts/controllers/user_sessions.js.coffee
+++ b/app/assets/javascripts/controllers/user_sessions.js.coffee
@@ -6,3 +6,8 @@ class Pettanr.UserSessionsController extends Pettanr.AppController
     view.render()\r
     @trigger('ready', view)\r
   \r
+  end: () ->\r
+    view = new Pettanr.Views.UserSeeeion.End({})\r
+    view.render()\r
+    @trigger('ready', view)\r
+  \r

diff --git a/app/assets/javascripts/controllers/users.js.coffee b/app/assets/javascripts/controllers/users.js.coffee
index 154fc60..b875725 100644 (file)
--- a/app/assets/javascripts/controllers/users.js.coffee
+++ b/app/assets/javascripts/controllers/users.js.coffee
@@ -42,7 +42,7 @@ class Pettanr.UsersController extends Pettanr.AppController
   sign_out_success: (user, response) ->\r
     @trigger('success', user, response)\r
     @trigger('sign_out')\r
-    @trigger('redirect', 'user_sessions/new')\r
+    @trigger('redirect', 'user_sessions/end')\r
   \r
   sign_out_fail: (user, response) ->\r
     @trigger('fail', response)\r

diff --git a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee
index 567dd93..58e8b93 100644 (file)
--- a/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee
+++ b/app/assets/javascripts/locmare/filer/body/file_body/file_item/caption/default/link/url_column.js.coffee
@@ -10,9 +10,7 @@ class Locmare.FilerModule.BodyModule.FileBodyModule.FileItemModule.CaptionItemCo
   \r
   button: (caption, context) ->\r
     url = @url()\r
-    new Tag.A_({\r
-      attr: {href: url}, \r
-      content: caption\r
+    new Pettanr.View.Link(url, caption, {\r
     })\r
   \r
   url: () ->\r

diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index 9798118..dc06e17 100644 (file)
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -24,8 +24,8 @@ $ ->
   loaded_manifest.init()\r
   loaded_local_manifest.init()\r
   \r
-  window.onbeforeunload = (e)->\r
-    return('leave?')\r
+  #window.onbeforeunload = (e)->\r
+  #  return('leave?')\r
   Backbone.history.start({silent: true, pushState: true, root: '/'})\r
   \r
   Pettanr.cache = new Pettanr.Cache({operators: new Pettanr.Operator({})})\r

diff --git a/app/assets/javascripts/view/credit.js.coffee b/app/assets/javascripts/view/credit.js.coffee
index dd83880..9a6769d 100644 (file)
--- a/app/assets/javascripts/view/credit.js.coffee
+++ b/app/assets/javascripts/view/credit.js.coffee
@@ -46,6 +46,9 @@ class Pettanr.View.Credit.Data extends Pettanr.View
   append_credit_data: () ->\r
     this.$el.html('')\r
     this.$el.append(@item.credit_data)\r
+    this.$el.map ->\r
+      $(@).click ->\r
+        confirm('leave?')\r
     @append_rb()\r
   \r
 class Pettanr.View.Credit.Icon extends Pettanr.View\r

diff --git a/app/assets/javascripts/view/layout.js.coffee b/app/assets/javascripts/view/layout.js.coffee
index 33052a5..24c1b84 100644 (file)
--- a/app/assets/javascripts/view/layout.js.coffee
+++ b/app/assets/javascripts/view/layout.js.coffee
@@ -54,7 +54,7 @@ class Pettanr.View.Layout.Sns extends Pettanr.View.Layout.Base
   \r
   test_ng: (response) ->\r
     @history.disable()\r
-    @head_http_get('users/guest')\r
+    # @head_http_get('users/guest')\r
     @body_http_get('user_sessions/new')\r
   \r
   test_redirect: (url) ->\r
@@ -70,8 +70,10 @@ class Pettanr.View.Layout.Sns extends Pettanr.View.Layout.Base
   \r
   sign_out: () ->\r
     @reset_operators()\r
-    @head_http_get('users/guest')\r
+    @header.remove()\r
+    #@head_http_get('user_sessions/end')\r
     @history.disable()\r
+    window.location='/'\r
   \r
   head_http_get: (url) ->\r
     proxy = new Pettanr.Proxy({})\r

diff --git a/app/assets/javascripts/view/link.js.coffee b/app/assets/javascripts/view/link.js.coffee
new file mode 100644 (file)
index 0000000..acbbef3
--- /dev/null
+++ b/app/assets/javascripts/view/link.js.coffee
@@ -0,0 +1,23 @@
+class Pettanr.View.Link extends Tag.A\r
+  \r
+  constructor: (@url, @content, options) ->\r
+    super(options)\r
+  \r
+  initialize: (options) ->\r
+    @class_name = options.class_name\r
+    super({\r
+      attr: {href: @url}, \r
+      class_name: @class_name,\r
+      content: @content\r
+    })\r
+  \r
+  render: () ->\r
+    super()\r
+    this\r
+  \r
+  click: () ->\r
+    if confirm('leave?')\r
+      return true\r
+    else\r
+      return false\r
+  \r

diff --git a/app/assets/javascripts/views/user_sessions/end.js.coffee b/app/assets/javascripts/views/user_sessions/end.js.coffee
new file mode 100644 (file)
index 0000000..60f25ee
--- /dev/null
+++ b/app/assets/javascripts/views/user_sessions/end.js.coffee
@@ -0,0 +1,9 @@
+class Pettanr.Views.UserSeeeion.End extends Pettanr.View\r
+  tagName: 'div'\r
+  \r
+  initialize: (options) ->\r
+  \r
+  render: () ->\r
+    this.$el.html('Sign out')\r
+    this\r
+  \r

diff --git a/app/assets/javascripts/views/users/account.js.coffee b/app/assets/javascripts/views/users/account.js.coffee
index 45801af..34f44a7 100644 (file)
--- a/app/assets/javascripts/views/users/account.js.coffee
+++ b/app/assets/javascripts/views/users/account.js.coffee
@@ -37,19 +37,15 @@ class Pettanr.Views.User.Account extends Pettanr.View
       @listenTo(@quick, 'click:mydoc', @click_mydoc)\r
       @listenTo(@quick, 'click:mynew', @click_mynew)\r
       this.$el.append(@quick.render().el)\r
-    sign_out = new Tag.A({\r
-      attr: {href: '/users/sign_out'}, \r
+    sign_out = new Pettanr.View.Button('/users/sign_out', 'sign out', {\r
+      context: this,\r
+      click: () =>\r
+        @trigger('http_post', 'users/sign_out')\r
       class_name: 'sign_out', \r
-      content: 'sign out'\r
     })\r
-    @listenTo(sign_out, 'click', @sign_out_click)\r
     this.$el.append(sign_out.render().el)\r
     this\r
   \r
-  sign_out_click: () ->\r
-    @trigger('http_post', 'users/sign_out')\r
-    return false\r
-  \r
   click_mydoc: (url) ->\r
     @trigger('http_get', url)\r
     return false\r

diff --git a/app/controllers/top_controller.rb b/app/controllers/top_controller.rb
index 14f8f15..9747cb6 100644 (file)
--- a/app/controllers/top_controller.rb
+++ b/app/controllers/top_controller.rb
@@ -3,7 +3,7 @@ class TopController < ApplicationController
     before_action :authenticate_user, :only => []
     before_action :authenticate_author, :only => []
   else
-    before_action :authenticate_reader, :only => []#[:index]
+    before_action :authenticate_reader, :only => [:index]
     before_action :authenticate_user, :only => []
     before_action :authenticate_author, :only => []
   end

diff --git a/app/models/picture.rb b/app/models/picture.rb
index 2371067..d147a1f 100644 (file)
--- a/app/models/picture.rb
+++ b/app/models/picture.rb
@@ -34,6 +34,7 @@ class Picture < Peta::Content
   
   scope :find_by_md5_without_original_picture, -> (md5, original_picture_id) do 
     self.find_by_md5(md5).where.not(original_picture_id: original_picture_id).order(updated_at: :desc)
+  end
   
   scope :find_by_original_picture, -> (original_picture_id) do 
     find_index.where(original_picture_id: original_picture_id)

diff --git a/app/views/layouts/yasapp.html.erb b/app/views/layouts/yasapp.html.erb
index 8e0c366..8d90e8a 100644 (file)
--- a/app/views/layouts/yasapp.html.erb
+++ b/app/views/layouts/yasapp.html.erb
@@ -24,7 +24,27 @@
   </span>\r
 </script>\r
 <script type="text/template" id="sign_in">\r
-  <h3><&= 'title' &></h3>\r
+  <h1>\r
+    <%= link_to h(manifest.magic_numbers['profile']['users']['caption']), root_path %>\r
+  </h1>\r
+  <h2>\r
+    <%= sanitize manifest.magic_numbers['profile']['users']['description'], :tags => %w(a p img br) %>\r
+  </h2>\r
+  <div>\r
+    <%= t('users.signin.notice') %>\r
+  </div>\r
+  <ul class="auth-servers">\r
+    <li class="twitter">\r
+      <%= link_to t('users.signin.twitter.caption'), user_omniauth_authorize_path(:twitter) %>\r
+      <%= link_to tag(:img, :src => '/images/twitter.png'), user_omniauth_authorize_path(:twitter) %>\r
+      <p><%= t('users.signin.twitter.notice') %></p>\r
+    </li>\r
+    <li class="google">\r
+      <%= link_to t('users.signin.google.caption'), user_omniauth_authorize_path(:google_oauth2) %>\r
+      <%= link_to tag(:img, :src => '/images/google.png'), user_omniauth_authorize_path(:google_oauth2) %>\r
+    </li>\r
+  </ul>\r
+  <div class="row_break"></div>\r
   <form method="post" action="/users/sign_in" accept-charset="UTF-8">\r
   <div>\r
     <label for="user_email">em</label><br>\r