Files: Improved Anonymous Page with Info (#588)

* Improve the Files anon page

* Latest language strings

* Fix tests

Author: pglombardo

Diff for: app/controllers/file_pushes_controller.rb

@@ -4,7 +4,7 @@ class FilePushesController < ApplicationController
   helper FilePushesHelper
 
   # Authentication always except for :show
-  acts_as_token_authentication_handler_for User, except: [:show]
+  acts_as_token_authentication_handler_for User, except: [:show, :new]
 
   resource_description do
     name 'File Pushes'
@@ -70,10 +70,6 @@ def show
 
   # GET /file_pushes/new
   def new
-    # Require authentication if allow_anonymous is false
-    # See config/settings.yml
-    authenticate_user! if Settings.enable_logins && !Settings.allow_anonymous
-
     if user_signed_in?
       @push = FilePush.new
 
@@ -85,7 +81,6 @@ def new
         format.html { render template: 'file_pushes/new_anonymous' }
       end
     end
-
   end
 
   api :POST, '/f.json', 'Create a new file push.'

Diff for: app/views/file_pushes/new_anonymous.html.erb

@@ -2,9 +2,32 @@
 
 <div class='container'>
     <%= render partial: "shared/topnav" %>
-    <div class="d-flex flex-column mh-100 justify-content-center align-items-center" style="height: 300px;">
-        <p class="lead text-center">
-            <%= _('Please log in to use this feature.') %>
-        </p>
+    <div class="card text-center w-50 my-5 mx-auto">
+        <div class="card-header">
+            <em class="bi bi-info-circle"></em>
+            <%= _('This Feature is In BETA') %>
+        </div>
+        <div class="card-body">
+            <h5 class="card-title">
+                <%= _('Securely Send Files That Delete Automatically') %>
+                </h5>
+            <p class="card-text">
+                <%= _('Until stable, this feature is in beta and requires a log in.') %>
+            </p>
+            <% if ENV.key?('PWPUSH_COM') %>
+                <p class="card-text">
+                    <%= _('I would appreciate any feedback you have in the') %>
+                    <%= link_to _("feedback form"), new_feedback_path %>
+                    <%= _('or') %>
+                    <%= link_to _("in this Github Discussion"), "https://github.com/pglombardo/PasswordPusher/discussions/568" %>.
+                </p>
+                <p class="card-text">
+                    <%= _('See this') %>
+                    <%= link_to _("Twitter thread"), "https://twitter.com/pwpush/status/1608047208686821377" %>
+                    <%= _('for more information and screenshots.') %>
+                </p>
+            <% end %>
+            <a href="<%= new_user_session_path %>" class="btn btn-primary">Log In</a>
+        </div>
     </div>
 </div>

Diff for: app/views/layouts/login.html.erb

@@ -54,7 +54,7 @@
         <div class='my-3'>
           <em>
             <%= _("Some domains may inadvertently block emails.  If you are having trouble receiving emails, ") %>
-            <%= link_to "send a message", new_feedback_path %>
+            <%= link_to _("send a message"), new_feedback_path %>
             <%= _('and we can help out.') %>
           </em>
         </div>

Diff for: app/views/shared/_topnav.html.erb

@@ -1,11 +1,11 @@
 <% if Settings.enable_logins %>
   <ul class="nav nav-tabs mb-3">
     <li class="nav-item">
-      <a class="nav-link <%= current_controller?("passwords") ? 'active' : '' %>" aria-current="page" href="/">Passwords</a>
+      <a class="nav-link <%= current_controller?("passwords") ? 'active' : '' %>" aria-current="page" href="/"><%= _('Passwords') %></a>
     </li>
     <% if Settings.enable_file_pushes %>
       <li class="nav-item">
-        <a class="nav-link <%= current_controller?("file_pushes") ? 'active' : '' %>" href="<%= new_file_push_path %>">Files (beta)</a>
+        <a class="nav-link <%= current_controller?("file_pushes") ? 'active' : '' %>" href="<%= new_file_push_path %>"><%= _('Files') %></a>
       </li>
     <% end %>
   </ul>

Diff for: config/locales/.translation_io

@@ -5,4 +5,4 @@
 # ignore the conflicts and "sync" again, it will fix this file for you.
 
 ---
-timestamp: 1672183796
+timestamp: 1672223760

Diff for: config/locales/gettext/app.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pwpush 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-12-28 00:29+0100\n"
-"PO-Revision-Date: 2022-12-28 00:29+0100\n"
+"POT-Creation-Date: 2022-12-28 11:36+0100\n"
+"PO-Revision-Date: 2022-12-28 11:36+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: \n"
@@ -38,30 +38,30 @@ msgid ""
 "gain?"
 msgstr ""
 
-#: ../../../app/controllers/file_pushes_controller.rb:133
+#: ../../../app/controllers/file_pushes_controller.rb:128
 msgid ""
 "Only 10 active pushes allowed while in Beta and until things are stable. If it"
 "'s an option, you can manually expire existing pushes before creating new ones"
 "."
 msgstr ""
 
-#: ../../../app/controllers/file_pushes_controller.rb:225
+#: ../../../app/controllers/file_pushes_controller.rb:220
 #: ../../../app/controllers/passwords_controller.rb:202
 msgid "That push doesn't belong to you."
 msgstr ""
 
-#: ../../../app/controllers/file_pushes_controller.rb:253
+#: ../../../app/controllers/file_pushes_controller.rb:248
 #: ../../../app/controllers/passwords_controller.rb:230
 msgid "That push does not belong to you."
 msgstr ""
 
-#: ../../../app/controllers/file_pushes_controller.rb:258
+#: ../../../app/controllers/file_pushes_controller.rb:253
 #: ../../../app/controllers/passwords_controller.rb:235
 msgid "That push is not deletable by viewers."
 msgstr ""
 
-#: ../../../app/controllers/file_pushes_controller.rb:275
-#: ../../../app/controllers/file_pushes_controller.rb:278
+#: ../../../app/controllers/file_pushes_controller.rb:270
+#: ../../../app/controllers/file_pushes_controller.rb:273
 #: ../../../app/controllers/passwords_controller.rb:259
 #: ../../../app/controllers/passwords_controller.rb:262
 #: ../../../app/views/file_pushes/audit.html.erb:106
@@ -897,8 +897,52 @@ msgstr ""
 msgid "Pushing..."
 msgstr ""
 
-#: ../../../app/views/file_pushes/new_anonymous.html.erb:7
-msgid "Please log in to use this feature."
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:8
+msgid "This Feature is In BETA"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:12
+msgid "Securely Send Files That Delete Automatically"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:15
+msgid "Until stable, this feature is in beta and requires a log in."
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:19
+msgid "I would appreciate any feedback you have in the"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:20
+msgid "feedback form"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:21
+#: ../../../app/views/file_pushes/preview.html.erb:36
+#: ../../../app/views/file_pushes/show.html.erb:47
+#: ../../../app/views/file_pushes/show.html.erb:50
+#: ../../../app/views/pages/about.html.erb:28
+#: ../../../app/views/pages/about.html.erb:34
+#: ../../../app/views/passwords/preview.html.erb:36
+#: ../../../app/views/passwords/show.html.erb:31
+#: ../../../app/views/passwords/show.html.erb:34
+msgid "or"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:22
+msgid "in this Github Discussion"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:25
+msgid "See this"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:26
+msgid "Twitter thread"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:27
+msgid "for more information and screenshots."
 msgstr ""
 
 #: ../../../app/views/file_pushes/preliminary.html.erb:3
@@ -937,17 +981,6 @@ msgid_plural "days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../../app/views/file_pushes/preview.html.erb:36
-#: ../../../app/views/file_pushes/show.html.erb:47
-#: ../../../app/views/file_pushes/show.html.erb:50
-#: ../../../app/views/pages/about.html.erb:28
-#: ../../../app/views/pages/about.html.erb:34
-#: ../../../app/views/passwords/preview.html.erb:36
-#: ../../../app/views/passwords/show.html.erb:31
-#: ../../../app/views/passwords/show.html.erb:34
-msgid "or"
-msgstr ""
-
 #: ../../../app/views/file_pushes/preview.html.erb:37
 #: ../../../app/views/passwords/preview.html.erb:37
 msgid "view"
@@ -1130,6 +1163,10 @@ msgid ""
 "ing emails, "
 msgstr ""
 
+#: ../../../app/views/layouts/login.html.erb:57
+msgid "send a message"
+msgstr ""
+
 #: ../../../app/views/layouts/login.html.erb:58
 msgid "and we can help out."
 msgstr ""
@@ -2047,10 +2084,12 @@ msgid "Your password is blurred out.  Click below to reveal it."
 msgstr ""
 
 #: ../../../app/views/shared/_dashboard_header.html.erb:10
+#: ../../../app/views/shared/_topnav.html.erb:4
 msgid "Passwords"
 msgstr ""
 
 #: ../../../app/views/shared/_dashboard_header.html.erb:14
+#: ../../../app/views/shared/_topnav.html.erb:8
 msgid "Files"
 msgstr ""
 

Diff for: config/locales/gettext/ca/LC_MESSAGES/app.mo

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pwpush 1.0\n"
 "Report-Msgid-Bugs-To: [email protected]\n"
-"POT-Creation-Date: 2022-12-28 00:29+0100\n"
-"PO-Revision-Date: 2022-12-28 00:29+0100\n"
+"POT-Creation-Date: 2022-12-28 11:36+0100\n"
+"PO-Revision-Date: 2022-12-28 11:36+0100\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Catalan\n"
 "Language: ca\n"
@@ -42,30 +42,30 @@ msgstr ""
 "No s'han pogut enviar comentaris. Vas aprovar el Test d'Humanitat? Correu elec"
 "trònic vàlid? Torna-ho a provar?"
 
-#: ../../../app/controllers/file_pushes_controller.rb:133
+#: ../../../app/controllers/file_pushes_controller.rb:128
 msgid ""
 "Only 10 active pushes allowed while in Beta and until things are stable. If it"
 "'s an option, you can manually expire existing pushes before creating new ones"
 "."
 msgstr ""
 
-#: ../../../app/controllers/file_pushes_controller.rb:225
+#: ../../../app/controllers/file_pushes_controller.rb:220
 #: ../../../app/controllers/passwords_controller.rb:202
 msgid "That push doesn't belong to you."
 msgstr "Aquesta pujada no et pertany."
 
-#: ../../../app/controllers/file_pushes_controller.rb:253
+#: ../../../app/controllers/file_pushes_controller.rb:248
 #: ../../../app/controllers/passwords_controller.rb:230
 msgid "That push does not belong to you."
 msgstr "Aquesta pujada no et pertany."
 
-#: ../../../app/controllers/file_pushes_controller.rb:258
+#: ../../../app/controllers/file_pushes_controller.rb:253
 #: ../../../app/controllers/passwords_controller.rb:235
 msgid "That push is not deletable by viewers."
 msgstr "Aquesta pujada no es pot ser esborrada."
 
-#: ../../../app/controllers/file_pushes_controller.rb:275
-#: ../../../app/controllers/file_pushes_controller.rb:278
+#: ../../../app/controllers/file_pushes_controller.rb:270
+#: ../../../app/controllers/file_pushes_controller.rb:273
 #: ../../../app/controllers/passwords_controller.rb:259
 #: ../../../app/controllers/passwords_controller.rb:262
 #: ../../../app/views/file_pushes/audit.html.erb:106
@@ -931,8 +931,52 @@ msgstr "Puja-la!"
 msgid "Pushing..."
 msgstr "S'està pujant..."
 
-#: ../../../app/views/file_pushes/new_anonymous.html.erb:7
-msgid "Please log in to use this feature."
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:8
+msgid "This Feature is In BETA"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:12
+msgid "Securely Send Files That Delete Automatically"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:15
+msgid "Until stable, this feature is in beta and requires a log in."
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:19
+msgid "I would appreciate any feedback you have in the"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:20
+msgid "feedback form"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:21
+#: ../../../app/views/file_pushes/preview.html.erb:36
+#: ../../../app/views/file_pushes/show.html.erb:47
+#: ../../../app/views/file_pushes/show.html.erb:50
+#: ../../../app/views/pages/about.html.erb:28
+#: ../../../app/views/pages/about.html.erb:34
+#: ../../../app/views/passwords/preview.html.erb:36
+#: ../../../app/views/passwords/show.html.erb:31
+#: ../../../app/views/passwords/show.html.erb:34
+msgid "or"
+msgstr "o"
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:22
+msgid "in this Github Discussion"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:25
+msgid "See this"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:26
+msgid "Twitter thread"
+msgstr ""
+
+#: ../../../app/views/file_pushes/new_anonymous.html.erb:27
+msgid "for more information and screenshots."
 msgstr ""
 
 #: ../../../app/views/file_pushes/preliminary.html.erb:3
@@ -971,17 +1015,6 @@ msgid_plural "days"
 msgstr[0] "dia"
 msgstr[1] "dies"
 
-#: ../../../app/views/file_pushes/preview.html.erb:36
-#: ../../../app/views/file_pushes/show.html.erb:47
-#: ../../../app/views/file_pushes/show.html.erb:50
-#: ../../../app/views/pages/about.html.erb:28
-#: ../../../app/views/pages/about.html.erb:34
-#: ../../../app/views/passwords/preview.html.erb:36
-#: ../../../app/views/passwords/show.html.erb:31
-#: ../../../app/views/passwords/show.html.erb:34
-msgid "or"
-msgstr "o"
-
 #: ../../../app/views/file_pushes/preview.html.erb:37
 #: ../../../app/views/passwords/preview.html.erb:37
 msgid "view"
@@ -1171,6 +1204,10 @@ msgid ""
 "ing emails, "
 msgstr ""
 
+#: ../../../app/views/layouts/login.html.erb:57
+msgid "send a message"
+msgstr ""
+
 #: ../../../app/views/layouts/login.html.erb:58
 msgid "and we can help out."
 msgstr "i podem ajudar."
@@ -2250,10 +2287,12 @@ msgid "Your password is blurred out.  Click below to reveal it."
 msgstr "La teva contrasenya està borrosa. Feu clic a continuació per revelar-lo."
 
 #: ../../../app/views/shared/_dashboard_header.html.erb:10
+#: ../../../app/views/shared/_topnav.html.erb:4
 msgid "Passwords"
 msgstr ""
 
 #: ../../../app/views/shared/_dashboard_header.html.erb:14
+#: ../../../app/views/shared/_topnav.html.erb:8
 msgid "Files"
 msgstr ""