-
+
diff --git a/jam-ui/src/components/public/JKDownloadsLegacy.js b/jam-ui/src/components/public/JKDownloadsLegacy.js
index 26019d3bf..329046167 100644
--- a/jam-ui/src/components/public/JKDownloadsLegacy.js
+++ b/jam-ui/src/components/public/JKDownloadsLegacy.js
@@ -72,8 +72,9 @@ const JKDownloadsLegacy = () => {
const downloadLink = React.useMemo(() => {
if (!currentOS) return null
- return downloads[`JamClient/${currentOS}`]
- }, [currentOS]);
+ if (!selectedPlatform) return null
+ return downloads[`JamClient/${selectedPlatform}`]
+ }, [currentOS, selectedPlatform]);
const selectPlatform = (platform) => {
setSelectedPlatform(platform)
@@ -126,7 +127,7 @@ const JKDownloadsLegacy = () => {
-
+
diff --git a/jam-ui/src/components/sessions/JKSession.js b/jam-ui/src/components/sessions/JKSession.js
index 8047de5c2..7fb01e064 100644
--- a/jam-ui/src/components/sessions/JKSession.js
+++ b/jam-ui/src/components/sessions/JKSession.js
@@ -13,7 +13,7 @@ import useNativeAppCheck from '../../hooks/useNativeAppCheck';
import { useNativeApp } from '../../context/NativeAppContext';
import EnterIcon from '../../icons/enter.svg';
import JKInstrumentIcon from '../profile/JKInstrumentIcon';
-import {useHistory} from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
import useSessionHelper from './JKUseSessionHelper';
import JKModalDialog from '../common/JKModalDialog';
import JKAppLaunch from '../page/JKAppLaunch';
@@ -25,10 +25,10 @@ function JKSession({ session }) {
const { greaterThan } = useResponsive();
const { setNativeAppUnavailable } = useNativeApp();
const { sessionDescription } = useSessionHelper(session);
-
+
useEffect(() => {
- const otherUserIds = session.participants.map(p => p.user.id);
+ const otherUserIds = session.active_music_session ? session.active_music_session.participants.map(p => p.user.id) : [];
const options = { currentUserId: currentUser.id, otherUserIds };
dispatch(fetchUserLatencies(options));
}, [session.id]);
@@ -40,7 +40,7 @@ function JKSession({ session }) {
};
const hasFriendNote = session => {
- if (session.participants.find(p => p.user.is_friend)) {
+ if (session.active_music_session && session.active_music_session.participants.find(p => p.user.is_friend)) {
return t('list.notes.has_friend', { ns: 'sessions' });
}
};
@@ -71,48 +71,62 @@ function JKSession({ session }) {
{sessionDescription}
+
- {session.participants.map(participant => (
-
+ {session.active_music_session && session.active_music_session.participants.length > 0 && (
+
+ {session.active_music_session.participants.map(participant => (
+
+ )}
-
- {
});
};
+export const getFriendsSessions = () => {
+ return new Promise((resolve, reject) => {
+ apiFetch(`/sessions/friends`)
+ .then(response => resolve(response))
+ .catch(error => reject(error));
+ });
+};
+
+export const getPublicSessions = () => {
+ return new Promise((resolve, reject) => {
+ apiFetch(`/sessions/public`)
+ .then(response => resolve(response))
+ .catch(error => reject(error));
+ });
+};
+
+export const getInactiveSessions = () => {
+ return new Promise((resolve, reject) => {
+ apiFetch(`/sessions/inactive`)
+ .then(response => resolve(response))
+ .catch(error => reject(error));
+ });
+};
+
export const getSessionsHistory = (options = {}) => {
return new Promise((resolve, reject) => {
apiFetch(`/sessions/history?${new URLSearchParams(options)}`)
diff --git a/jam-ui/src/i18n/locales/en/sessions.json b/jam-ui/src/i18n/locales/en/sessions.json
index 8ef477b49..abb9d056a 100644
--- a/jam-ui/src/i18n/locales/en/sessions.json
+++ b/jam-ui/src/i18n/locales/en/sessions.json
@@ -40,7 +40,8 @@
},
"no_records_1": "There are no public, open sessions currently available for you to join. We suggest you ",
"create_session": "create a session",
- "no_records_2": " that others can join now, or wait a bit and then refresh this page in your browser to see if new public sessions have been started."
+ "no_records_2": " that others can join now, or wait a bit and then refresh this page in your browser to see if new public sessions have been started.",
+ "error": "There was an error retrieving the session list. Please try again."
},
"lobby": {
"page_title": "Lobby",
diff --git a/jam-ui/src/store/features/sessionsSlice.js b/jam-ui/src/store/features/sessionsSlice.js
index e6b62209a..d238528cf 100644
--- a/jam-ui/src/store/features/sessionsSlice.js
+++ b/jam-ui/src/store/features/sessionsSlice.js
@@ -1,5 +1,5 @@
import { createSlice, createAsyncThunk } from "@reduxjs/toolkit";
-import { getSessions, getPersonById } from '../../helpers/rest'
+import { getSessions, getFriendsSessions, getPublicSessions, getInactiveSessions, getPersonById } from '../../helpers/rest'
const initialState = {
sessions: [],
@@ -9,27 +9,50 @@ const initialState = {
}
export const fetchSessions = createAsyncThunk(
- "session/fetchSessions",
+ "session/fetchSessions",
async (options, thunkAPI) => {
const response = await getSessions();
return response.json();
}
+)
+export const fetchFriendsSessions = createAsyncThunk(
+ "session/fetchFriendsSessions",
+ async (options, thunkAPI) => {
+ const response = await getFriendsSessions(options);
+ return response.json();
+ }
+)
+
+export const fetchPublicSessions = createAsyncThunk(
+ "session/fetchPublicSessions",
+ async (options, thunkAPI) => {
+ const response = await getPublicSessions(options);
+ return response.json();
+ }
+)
+
+export const fetchInactiveSessions = createAsyncThunk(
+ "session/fetchInactiveSessions",
+ async (options, thunkAPI) => {
+ const response = await getInactiveSessions(options);
+ return response.json();
+ }
)
export const fetchPerson = createAsyncThunk(
- 'session/fetchPerson',
+ 'session/fetchPerson',
async (options, thunkAPI) => {
- const {userId} = options
+ const { userId } = options
const response = await getPersonById(userId)
return response.json()
}
- ,{
- condition: (options, {getState, extra}) => {
- const {session} = getState()
- const {userId} = options
+ , {
+ condition: (options, { getState, extra }) => {
+ const { session } = getState()
+ const { userId } = options
const person = session.people.find(person => person.id === userId)
- if(person && person.website){
+ if (person && person.website) {
//only proceed if full data set for user has not been fetched. person.website is not included in the initial data fetching (i.e: in friends listing ).
return false;
}
@@ -41,9 +64,9 @@ export const SessionSlice = createSlice({
name: "session",
initialState,
reducers: {
- addSession: (state) => {},
- updateSession: (state) => {},
- deleteSession: (state) => {},
+ addSession: (state) => { },
+ updateSession: (state) => { },
+ deleteSession: (state) => { },
},
extraReducers: (builder) => {
builder
@@ -51,28 +74,68 @@ export const SessionSlice = createSlice({
state.status = "loading";
})
.addCase(fetchSessions.fulfilled, (state, action) => {
- console.log(action.payload);
+ // add unique sessions to the array
+ const records = new Set([...state.sessions, ...action.payload]);
+ const unique = [];
+ records.map(x => unique.filter(p => p.id === x.id).length > 0 ? null : unique.push(x))
+ state.sessions = unique;
+ state.error = null;
state.status = "succeeded";
- state.sessions = action.payload;
})
.addCase(fetchSessions.rejected, (state, action) => {
state.status = 'failed'
- state.error = action.error.message
+ state.error = action.error.message
+ })
+ .addCase(fetchFriendsSessions.pending, (state, action) => {
+ state.status = "loading";
+ })
+ .addCase(fetchFriendsSessions.fulfilled, (state, action) => {
+ // add unique sessions to the array
+ const records = new Set([...state.sessions, ...action.payload.sessions]);
+ const unique = [];
+ records.map(x => unique.filter(p => p.id === x.id).length > 0 ? null : unique.push(x))
+ state.sessions = unique;
+ state.error = null;
+ state.status = "succeeded";
+ })
+ .addCase(fetchPublicSessions.pending, (state, action) => {
+ state.status = "loading";
+ })
+ .addCase(fetchPublicSessions.fulfilled, (state, action) => {
+ // add unique sessions to the array
+ const records = new Set([...state.sessions, ...action.payload.sessions]);
+ const unique = [];
+ records.map(x => unique.filter(p => p.id === x.id).length > 0 ? null : unique.push(x))
+ state.sessions = unique;
+ state.error = null;
+ state.status = "succeeded";
+ })
+ .addCase(fetchInactiveSessions.pending, (state, action) => {
+ state.status = "loading";
+ })
+ .addCase(fetchInactiveSessions.fulfilled, (state, action) => {
+ // add unique sessions to the array
+ const records = new Set([...state.sessions, ...action.payload.sessions]);
+ const unique = [];
+ records.map(x => unique.filter(p => p.id === x.id).length > 0 ? null : unique.push(x))
+ state.sessions = unique;
+ state.error = null;
+ state.status = "succeeded";
})
.addCase(fetchPerson.fulfilled, (state, action) => {
const person = state.people.find(person => person.id === action.payload.id)
- if(person){
+ if (person) {
const updated = {
- ...person,
+ ...person,
...action.payload
}
const objIndex = state.people.findIndex((p => p.id === updated.id));
state.people[objIndex] = updated
- }else{
+ } else {
state.people.push(action.payload)
}
})
- }
+ }
})
export default SessionSlice.reducer;
\ No newline at end of file
diff --git a/ruby/db/migrate/20250227125441_add_profile_complete_columns_to_users.rb b/ruby/db/migrate/20250227125441_add_profile_complete_columns_to_users.rb
new file mode 100644
index 000000000..3d6a08c66
--- /dev/null
+++ b/ruby/db/migrate/20250227125441_add_profile_complete_columns_to_users.rb
@@ -0,0 +1,29 @@
+ class AddProfileCompleteColumnsToUsers < ActiveRecord::Migration
+ def self.up
+ execute "ALTER TABLE users ADD COLUMN profile_completed_at TIMESTAMP"
+ #add index on profile_completed_at
+ execute "CREATE INDEX index_users_on_profile_completed_at ON users USING btree (profile_completed_at)"
+ execute "ALTER TABLE users ADD COLUMN profile_complete_reminder1_sent_at TIMESTAMP"
+ execute "ALTER TABLE users ADD COLUMN profile_complete_reminder2_sent_at TIMESTAMP"
+ execute "ALTER TABLE users ADD COLUMN profile_complete_reminder3_sent_at TIMESTAMP"
+
+ User.find_each(batch_size:100) do |user|
+ User.where(id:user.id).update_all(profile_completed_at: Time.now)
+ end
+ #User.where('users.id IN (SELECT player_id FROM musicians_instruments) OR users.id IN (SELECT player_id FROM genre_players)').update_all(profile_completed_at: Time.now)
+ end
+ def self.down
+ execute "ALTER TABLE users DROP COLUMN profile_completed_at"
+ execute "ALTER TABLE users DROP COLUMN profile_complete_reminder1_sent_at"
+ execute "ALTER TABLE users DROP COLUMN profile_complete_reminder2_sent_at"
+ execute "ALTER TABLE users DROP COLUMN profile_complete_reminder3_sent_at"
+ end
+ end
+=begin
+ ALTER TABLE users ADD COLUMN profile_completed_at TIMESTAMP;
+ CREATE INDEX index_users_on_profile_completed_at ON users USING btree (profile_completed_at);
+ ALTER TABLE users ADD COLUMN profile_complete_reminder1_sent_at TIMESTAMP;
+ ALTER TABLE users ADD COLUMN profile_complete_reminder2_sent_at TIMESTAMP;
+ ALTER TABLE users ADD COLUMN profile_complete_reminder3_sent_at TIMESTAMP;
+ UPDATE users set profile_completed_at=NOW() WHERE users.id IN (SELECT player_id FROM musicians_instruments) OR users.id IN (SELECT player_id FROM genre_players);
+ end
\ No newline at end of file
diff --git a/ruby/db/migrate/20250511151844_add_gear_setup_reminder_columns_to_users.rb b/ruby/db/migrate/20250511151844_add_gear_setup_reminder_columns_to_users.rb
new file mode 100644
index 000000000..2af9c834e
--- /dev/null
+++ b/ruby/db/migrate/20250511151844_add_gear_setup_reminder_columns_to_users.rb
@@ -0,0 +1,20 @@
+ class AddGearSetupReminderColumnsToUsers < ActiveRecord::Migration
+ def self.up
+ execute "ALTER TABLE users ADD COLUMN gear_setup_reminder1_sent_at TIMESTAMP"
+ execute "ALTER TABLE users ADD COLUMN gear_setup_reminder2_sent_at TIMESTAMP"
+ execute "ALTER TABLE users ADD COLUMN gear_setup_reminder3_sent_at TIMESTAMP"
+ end
+
+ def self.down
+ execute "ALTER TABLE users DROP COLUMN gear_setup_reminder1_sent_at"
+ execute "ALTER TABLE users DROP COLUMN gear_setup_reminder2_sent_at"
+ execute "ALTER TABLE users DROP COLUMN gear_setup_reminder3_sent_at"
+ end
+ end
+
+
+=begin
+ ALTER TABLE users ADD COLUMN gear_setup_reminder1_sent_at TIMESTAMP;
+ALTER TABLE users ADD COLUMN gear_setup_reminder2_sent_at TIMESTAMP;
+ALTER TABLE users ADD COLUMN gear_setup_reminder3_sent_at TIMESTAMP;
+ end
\ No newline at end of file
diff --git a/ruby/db/migrate/20250605092511_add_signup_survey_sent_at_to_users.rb b/ruby/db/migrate/20250605092511_add_signup_survey_sent_at_to_users.rb
new file mode 100644
index 000000000..f8f271c99
--- /dev/null
+++ b/ruby/db/migrate/20250605092511_add_signup_survey_sent_at_to_users.rb
@@ -0,0 +1,19 @@
+ class AddSignupSurveySentAtToUsers < ActiveRecord::Migration
+ def self.up
+ execute "ALTER TABLE users ADD COLUMN signup_survey_sent_at TIMESTAMP"
+ User.find_each(batch_size:100) do |user|
+ User.where(id:user.id).update_all(signup_survey_sent_at: Time.now)
+ end
+ end
+ def self.down
+ execute "ALTER TABLE users DROP COLUMN signup_survey_sent_at"
+ end
+ end
+=begin
+ ALTER TABLE users ADD COLUMN signup_survey_sent_at TIMESTAMP;
+CREATE INDEX index_users_on_signup_survey_sent_at ON users USING btree (signup_survey_sent_at);
+
+ User.find_each(batch_size:100) do |user|
+ User.where(id:user.id).update_all(signup_survey_sent_at: Time.now)
+ end
+=end
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb
index 789a5e6cb..ea2654040 100755
--- a/ruby/lib/jam_ruby.rb
+++ b/ruby/lib/jam_ruby.rb
@@ -120,6 +120,9 @@ require "jam_ruby/lib/subscription_message"
require "jam_ruby/lib/stats.rb"
require "jam_ruby/lib/email_new_musician_match"
require "jam_ruby/lib/musician_filter"
+require "jam_ruby/lib/email_profile_reminder"
+require "jam_ruby/lib/email_signup_survey"
+require "jam_ruby/lib/gear_setup_reminder"
require "jam_ruby/amqp/amqp_connection_manager"
require "jam_ruby/database"
require "jam_ruby/message_factory"
diff --git a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
index 6cf4e7940..0f2020854 100644
--- a/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
+++ b/ruby/lib/jam_ruby/app/mailers/user_mailer.rb
@@ -418,6 +418,78 @@ module JamRuby
end
end
+ def profile_complete_reminder1(user)
+ @user = user
+ sendgrid_recipients([user.email])
+ sendgrid_substitute('@USERID', [user.id])
+ sendgrid_unique_args :type => "profile_complete_reminder1"
+
+ mail(:to => user.email, :subject => I18n.t('user_mailer.profile_complete_reminder1.subject')) do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
+ def profile_complete_reminder2(user)
+ @user = user
+ sendgrid_recipients([user.email])
+ sendgrid_substitute('@USERID', [user.id])
+ sendgrid_unique_args :type => "profile_complete_reminder2"
+
+ mail(:to => user.email, :subject => "Take 2 minutes to fill out your JamKazam profile now") do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
+ def profile_complete_reminder3(user)
+ @user = user
+ sendgrid_recipients([user.email])
+ sendgrid_substitute('@USERID', [user.id])
+ sendgrid_unique_args :type => "profile_complete_reminder3"
+
+ mail(:to => user.email, :subject => "Last reminder to update your JamKazam profile") do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
+
+ #################################### GEAR SETUP REMINDER EMAILS ####################################
+ def gear_setup_reminder1(user)
+ @user = user
+ mail(:to => user.email, :subject => I18n.t('user_mailer.gear_setup_reminder1.subject')) do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
+ def gear_setup_reminder2(user)
+ @user = user
+ mail(:to => user.email, :subject => I18n.t('user_mailer.gear_setup_reminder2.subject')) do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
+ def gear_setup_reminder3(user)
+ @user = user
+ mail(:to => user.email, :subject => I18n.t('user_mailer.gear_setup_reminder3.subject')) do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
+ def signup_survey(user)
+ @user = user
+ @subject = I18n.t('user_mailer.signup_survey.subject')
+ @survey_url = Rails.application.config.signup_survey_url
+ mail(:to => user.email, :subject => @subject) do |format|
+ format.text
+ format.html { render layout: "user_mailer_beta" }
+ end
+ end
+
#################################### NOTIFICATION EMAILS ####################################
def friend_request(user, msg, friend_request_id)
return if !user.subscribe_email
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/gear_setup_reminder1.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/gear_setup_reminder1.html.erb
new file mode 100644
index 000000000..4507228a2
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/gear_setup_reminder1.html.erb
@@ -0,0 +1,22 @@
+
-
- Join Session
-
+
-
+
+
-
+
+ Join Session
+
+
<%=I18n.t('user_mailer.gear_setup_reminder1.greeting') -%> <%= @user.first_name -%> -
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder1.paragraph1').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder1.paragraph2').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder1.paragraph3').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder1.paragraph4').html_safe -%> +
+ +
+ <%=I18n.t('user_mailer.gear_setup_reminder1.regards') -%>,
+ <%=I18n.t('user_mailer.gear_setup_reminder1.signature') -%>
+
<%=I18n.t('user_mailer.gear_setup_reminder2.greeting') -%> <%= @user.first_name -%> -
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder2.paragraph1').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder2.paragraph2').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder2.paragraph3').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder2.paragraph4').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder2.paragraph5').html_safe -%> +
+ +
+ <%=I18n.t('user_mailer.gear_setup_reminder2.regards') -%>,
+ <%=I18n.t('user_mailer.gear_setup_reminder2.signature') -%>
+
<%=I18n.t('user_mailer.gear_setup_reminder3.greeting') -%> <%= @user.first_name -%> -
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder3.paragraph1').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder3.paragraph2').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder3.paragraph3').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder3.paragraph4').html_safe -%> +
+ ++ <%=I18n.t('user_mailer.gear_setup_reminder3.paragraph5').html_safe -%> +
+ +
+ <%=I18n.t('user_mailer.gear_setup_reminder3.regards') -%>,
+ <%=I18n.t('user_mailer.gear_setup_reminder3.signature') -%>
+
<%=I18n.t('user_mailer.profile_complete_reminder1.greeting') -%> <%= @user.first_name -%> -
+ ++ <%=I18n.t('user_mailer.profile_complete_reminder1.paragraph1') -%> +
+ ++ + <%=I18n.t('user_mailer.profile_complete_reminder1.update_profile') -%> + +
+ ++<%=I18n.t('user_mailer.profile_complete_reminder1.paragraph2') -%> +
+ ++ <%=I18n.t('user_mailer.profile_complete_reminder1.paragraph3') -%> +
+ ++ + <%=I18n.t('user_mailer.profile_complete_reminder1.download_app') -%> + + + <%=I18n.t('user_mailer.profile_complete_reminder1.download_legacy_app') -%> + +
++ <%=I18n.t('user_mailer.profile_complete_reminder1.paragraph4') -%> +
+ +
+
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder1.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder1.text.erb
new file mode 100644
index 000000000..026906af5
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder1.text.erb
@@ -0,0 +1,17 @@
+<%=I18n.t('user_mailer.profile_complete_reminder1.greeting') -%> <%= @user.first_name -%> -
+
+<%=I18n.t('user_mailer.profile_complete_reminder1.paragraph1') -%>
+
+<%= APP_CONFIG.spa_origin_url %>/profile
+
+<%=I18n.t('user_mailer.profile_complete_reminder1.paragraph2') -%>
+
+<%=I18n.t('user_mailer.profile_complete_reminder1.paragraph3') -%>
+
+<%= APP_CONFIG.external_root_url %>/downloads
+
+<%=I18n.t('user_mailer.profile_complete_reminder1.paragraph4') -%>
+
+<%=I18n.t('user_mailer.profile_complete_reminder1.regards') -%>
+<%=I18n.t('user_mailer.profile_complete_reminder1.signature') -%>
+
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder2.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder2.html.erb
new file mode 100644
index 000000000..95a83fe17
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder2.html.erb
@@ -0,0 +1,34 @@
+
+ <%=I18n.t('user_mailer.profile_complete_reminder1.regards') -%>
+
+ <%=I18n.t('user_mailer.profile_complete_reminder1.signature') -%>
+
<%=I18n.t('user_mailer.profile_complete_reminder2.greeting') -%> <%= @user.first_name -%> -
+ ++ <%=I18n.t('user_mailer.profile_complete_reminder2.paragraph1') -%> +
+ ++ + <%=I18n.t('user_mailer.profile_complete_reminder2.update_profile') -%> + +
+ ++ <%=I18n.t('user_mailer.profile_complete_reminder2.paragraph2') -%> +
+ +
+
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder2.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder2.text.erb
new file mode 100644
index 000000000..0cda26fe7
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder2.text.erb
@@ -0,0 +1,11 @@
+<%=I18n.t('user_mailer.profile_complete_reminder2.greeting') -%> <%= @user.first_name -%> -
+
+<%=I18n.t('user_mailer.profile_complete_reminder2.paragraph1') -%>
+
+<%= APP_CONFIG.spa_origin_url %>/profile
+
+<%=I18n.t('user_mailer.profile_complete_reminder2.paragraph2') -%>
+
+<%=I18n.t('user_mailer.profile_complete_reminder2.regards') -%>
+
+<%=I18n.t('user_mailer.profile_complete_reminder2.signature') -%>
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder3.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder3.html.erb
new file mode 100644
index 000000000..b469fec07
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder3.html.erb
@@ -0,0 +1,29 @@
+
+ <%=I18n.t('user_mailer.profile_complete_reminder2.regards') -%>
+
+ <%=I18n.t('user_mailer.profile_complete_reminder2.signature') -%>
+
<%=I18n.t('user_mailer.profile_complete_reminder3.greeting') -%> <%= @user.first_name -%> -
+ +<%=I18n.t('user_mailer.profile_complete_reminder3.paragraph1') -%> +
+ ++ + <%=I18n.t('user_mailer.profile_complete_reminder3.update_profile') -%> + +
+ +
+
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder3.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder3.text.erb
new file mode 100644
index 000000000..d7632644c
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/profile_complete_reminder3.text.erb
@@ -0,0 +1,9 @@
+<%=I18n.t('user_mailer.profile_complete_reminder3.greeting') -%><%= @user.first_name -%> -
+
+<%=I18n.t('user_mailer.profile_complete_reminder3.paragraph1') -%>
+
+<%= APP_CONFIG.spa_origin_url %>/profile
+
+<%=I18n.t('user_mailer.profile_complete_reminder3.regards') -%>
+
+<%=I18n.t('user_mailer.profile_complete_reminder3.signature') -%>
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/signup_survey.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/signup_survey.html.erb
new file mode 100644
index 000000000..b3e216fa9
--- /dev/null
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/signup_survey.html.erb
@@ -0,0 +1,18 @@
+
+ <%=I18n.t('user_mailer.profile_complete_reminder3.regards') -%>
+
+ <%=I18n.t('user_mailer.profile_complete_reminder3.signature') -%>
+
<%= I18n.t 'user_mailer.signup_survey.greeting' -%> <%= @user.first_name -%> -
+ ++ <%= I18n.t 'user_mailer.signup_survey.paragraph1' -%> +
+ ++ <%= @survey_url %> +
++ <%= I18n.t 'user_mailer.signup_survey.ps' -%> + <%= I18n.t 'user_mailer.signup_survey.ps_text' -%> +
+ + +<%= I18n.t 'user_mailer.signup_survey.regards' -%>
+ <%= I18n.t 'user_mailer.signup_survey.signature' -%>
+