diff --git a/.gitignore b/.gitignore index 8dea89d7..390a54ff 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,7 @@ doc/ .secret .env .DS_Store +.byebug_history vendor/postgresql # Elastic Beanstalk Files diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb new file mode 100644 index 00000000..dc55f64f --- /dev/null +++ b/app/views/devise/mailer/confirmation_instructions.html.erb @@ -0,0 +1,5 @@ +
Welcome <%= @email %>!
+ +You can confirm your account email through the link below:
+ +<%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token) %>
diff --git a/app/views/devise/mailer/email_changed.html.erb b/app/views/devise/mailer/email_changed.html.erb new file mode 100644 index 00000000..32f4ba80 --- /dev/null +++ b/app/views/devise/mailer/email_changed.html.erb @@ -0,0 +1,7 @@ +Hello <%= @email %>!
+ +<% if @resource.try(:unconfirmed_email?) %> +We're contacting you to notify you that your email is being changed to <%= @resource.unconfirmed_email %>.
+<% else %> +We're contacting you to notify you that your email has been changed to <%= @resource.email %>.
+<% end %> diff --git a/app/views/devise/mailer/password_change.html.erb b/app/views/devise/mailer/password_change.html.erb new file mode 100644 index 00000000..b41daf47 --- /dev/null +++ b/app/views/devise/mailer/password_change.html.erb @@ -0,0 +1,3 @@ +Hello <%= @resource.email %>!
+ +We're contacting you to notify you that your password has been changed.
diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.html.erb new file mode 100644 index 00000000..f667dc12 --- /dev/null +++ b/app/views/devise/mailer/reset_password_instructions.html.erb @@ -0,0 +1,8 @@ +Hello <%= @resource.email %>!
+ +Someone has requested a link to change your password. You can do this through the link below.
+ +<%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token) %>
+ +If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb new file mode 100644 index 00000000..41e148bf --- /dev/null +++ b/app/views/devise/mailer/unlock_instructions.html.erb @@ -0,0 +1,7 @@ +Hello <%= @resource.email %>!
+ +Your account has been locked due to an excessive number of unsuccessful sign in attempts.
+ +Click the link below to unlock your account:
+ +<%= link_to 'Unlock my account', unlock_url(@resource, unlock_token: @token) %>
diff --git a/app/views/message_mailer/new_message_email.html.erb b/app/views/message_mailer/new_message_email.html.erb new file mode 100644 index 00000000..c779e888 --- /dev/null +++ b/app/views/message_mailer/new_message_email.html.erb @@ -0,0 +1,20 @@ + + + + + + ++ You have received a new message: +
++++ <%= raw @message.body %> +
+
+ Visit <%= link_to root_url, root_url %> and go to your inbox for more info. +
+ + diff --git a/app/views/message_mailer/new_message_email.text.erb b/app/views/message_mailer/new_message_email.text.erb new file mode 100644 index 00000000..228ca58a --- /dev/null +++ b/app/views/message_mailer/new_message_email.text.erb @@ -0,0 +1,10 @@ +You have a new message: <%= @subject %> +=============================================== + +You have received a new message: + +----------------------------------------------- +<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %> +----------------------------------------------- + +Visit <%= root_url %> and go to your inbox for more info. diff --git a/app/views/message_mailer/reply_message_email.html.erb b/app/views/message_mailer/reply_message_email.html.erb new file mode 100644 index 00000000..fd1286c5 --- /dev/null +++ b/app/views/message_mailer/reply_message_email.html.erb @@ -0,0 +1,20 @@ + + + + + + ++ You have received a new reply: +
++++ <%= raw @message.body %> +
+
+ Visit <%= link_to root_url, root_url %> and go to your inbox for more info. +
+ + diff --git a/app/views/message_mailer/reply_message_email.text.erb b/app/views/message_mailer/reply_message_email.text.erb new file mode 100644 index 00000000..c56bfb5e --- /dev/null +++ b/app/views/message_mailer/reply_message_email.text.erb @@ -0,0 +1,10 @@ +You have a new reply: <%= @subject %> +=============================================== + +You have received a new reply: + +----------------------------------------------- +<%= @message.body.html_safe? ? @message.body : strip_tags(@message.body) %> +----------------------------------------------- + +Visit <%= root_url %> and go to your inbox for more info. diff --git a/app/views/notification_mailer/new_notification_email.html.erb b/app/views/notification_mailer/new_notification_email.html.erb new file mode 100644 index 00000000..b84f2a00 --- /dev/null +++ b/app/views/notification_mailer/new_notification_email.html.erb @@ -0,0 +1,20 @@ + + + + + + ++ <%= t('mailboxer.notifications.new.intro') %> +
++++ <%= raw @notification.body %> +
+
+ Visit <%= link_to root_url, root_url %> and go to your notifications for more info. +
+ + \ No newline at end of file diff --git a/app/views/notification_mailer/new_notification_email.text.erb b/app/views/notification_mailer/new_notification_email.text.erb new file mode 100644 index 00000000..e55639b5 --- /dev/null +++ b/app/views/notification_mailer/new_notification_email.text.erb @@ -0,0 +1,10 @@ +You have a new notification: <%= @notification.subject.html_safe? ? @notification.subject : strip_tags(@notification.subject) %> +=============================================== + +You have received a new notification: + +----------------------------------------------- +<%= @notification.body.html_safe? ? @notification.body : strip_tags(@notification.body) %> +----------------------------------------------- + +Visit <%= root_url %> and go to your notifications for more info. diff --git a/config/locales/en.yml b/config/locales/en.yml index 13a35fbb..809aa5d1 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -30,6 +30,7 @@ en: fr: "Français" time: ago: "%{time} ago" + community_offers: new_header: "Create a new Community Offer" name_label: "Title" @@ -278,6 +279,9 @@ en: user_updated: "Account updated successfully!" mailboxer: sent: "Message sent!" + notifications: + new: + intro: 'You have received a new notification:' currencies: cash: "Cash" cheque: "Cheque"