Merge pull request #220 from DanielBrierton/ui-refresh/manage-dojo

Added user-profile view so we can get profile info with user_id

Author: Wardormeur

scripts/database/pg/migrations/020.do.add-cd_user_profile-view.sql

@@ -0,0 +1,81 @@
+DO $$
+    BEGIN
+        CREATE OR REPLACE VIEW cd_user_profile AS SELECT
+            cd_profiles.id AS profile_id,
+            cd_profiles.name AS profile_name,
+            cd_profiles.user_id,
+            cd_profiles.alias,
+            cd_profiles.dob,
+            cd_profiles.country,
+            cd_profiles.city,
+            cd_profiles.private,
+            cd_profiles.place,
+            cd_profiles.gender,
+            cd_profiles.address,
+            cd_profiles.last_edited,
+            cd_profiles.email AS profile_email,
+            cd_profiles.phone AS profile_phone,
+            cd_profiles.parents,
+            cd_profiles.children,
+            cd_profiles.linkedin,
+            cd_profiles.twitter,
+            cd_profiles.languages_spoken,
+            cd_profiles.programming_languages,
+            cd_profiles.notes,
+            cd_profiles.projects,
+            cd_profiles.badges,
+            cd_profiles.countryname,
+            cd_profiles.countrynumber,
+            cd_profiles.continent,
+            cd_profiles.alpha2,
+            cd_profiles.alpha3,
+            cd_profiles.admin1_code,
+            cd_profiles.admin1_name,
+            cd_profiles.admin2_code,
+            cd_profiles.admin2_name,
+            cd_profiles.admin3_code,
+            cd_profiles.admin3_name,
+            cd_profiles.admin4_code,
+            cd_profiles.admin4_name,
+            cd_profiles.state,
+            cd_profiles.county,
+            cd_profiles.place_geoname_id,
+            cd_profiles.place_name,
+            cd_profiles.user_type,
+            cd_profiles.optional_hidden_fields,
+            cd_profiles.avatar,
+            cd_profiles.required_fields_complete,
+            cd_profiles.ninja_invites,
+            cd_profiles.parent_invites,
+            sys_user.id,
+            sys_user.nick,
+            sys_user.email,
+            sys_user.name,
+            sys_user.username,
+            sys_user.activated,
+            sys_user.level,
+            sys_user.mysql_user_id,
+            sys_user.first_name,
+            sys_user.last_name,
+            sys_user.roles,
+            sys_user.active,
+            sys_user.phone,
+            sys_user.mailing_list,
+            sys_user.terms_conditions_accepted,
+            sys_user.when,
+            sys_user.confirmed,
+            sys_user.confirmcode,
+            sys_user.salt,
+            sys_user.pass,
+            sys_user.admin,
+            sys_user.modified,
+            sys_user.accounts,
+            sys_user.locale,
+            sys_user.banned,
+            sys_user.ban_reason,
+            sys_user.init_user_type,
+            sys_user.join_requests,
+            sys_user.last_login
+        FROM sys_user JOIN cd_profiles ON sys_user.id=cd_profiles.user_id;
+    END;
+$$

service.js

@@ -44,6 +44,10 @@ require('./migrate-psql-db.js')(function (err) {
               'users': config['users'],
               'logger': log.logger
             });
+  seneca.use(require('./user-profile.js'),
+            { postgresql: config['postgresql-store'],
+              logger: log.logger
+            });
   seneca.use(require('./nodebb-api.js'), config.nodebb);
   seneca.use(require('cp-permissions-plugin'), {
     config: __dirname + '/config/permissions'

user-profile.js

@@ -0,0 +1,27 @@
+'use strict';
+
+module.exports = function (options) {
+  var seneca = this;
+  var plugin = 'cd-user-profile';
+  var ENTITY_NS = 'cd_user_profile';
+
+  seneca.add({role: plugin, cmd: 'load'}, cmd_load);
+  seneca.add({role: plugin, cmd: 'list'}, cmd_list);
+
+  function cmd_load (args, done) {
+    var seneca = this;
+    var id = args.id;
+    seneca.make(ENTITY_NS).load$(id, done);
+  }
+
+  function cmd_list (args, done) {
+    var seneca = this;
+    var query = {};
+    if (args.ids) {
+      query.ids = args.ids;
+    } else if (args.query) {
+      query = args.query;
+    }
+    seneca.make(ENTITY_NS).list$(query, done);
+  }
+};

web/locale/en_US/messages.po

@@ -21,6 +21,9 @@ msgstr "Yes"
 msgid "No"
 msgstr "No"
 
+msgid "Loading ..."
+msgstr "Loading ..."
+
 msgid "Register a Dojo"
 msgstr "Register a Dojo"
 
@@ -54,6 +57,12 @@ msgstr "Name is empty"
 msgid "Name"
 msgstr "Name"
 
+msgid "Surname"
+msgstr "Surname"
+
+msgid "Surname is empty"
+msgstr "Surname is empty"
+
 msgid "Email is empty"
 msgstr "Email is empty"
 
@@ -78,6 +87,12 @@ msgstr "Select user type"
 msgid "Login"
 msgstr "Login"
 
+msgid "Reset"
+msgstr "Reset"
+
+msgid "Sign in"
+msgstr "Enter your email to sign in"
+
 msgid "Zen Terms of Service"
 msgstr "Zen Terms of Service"
 
@@ -447,6 +462,9 @@ msgstr "Languages Spoken"
 msgid "Projects"
 msgstr "Projects"
 
+msgid "No project yet"
+msgstr "No project yet"
+
 msgid "Prerequisites"
 msgstr "Prerequisites"
 
@@ -468,8 +486,8 @@ msgstr "Development Community"
 msgid "Events"
 msgstr "Events"
 
-msgid "There are no events currently listed for this Dojo. You may need to contact this Dojo to find out about upcoming events."
-msgstr "There are no events currently listed for this Dojo. You may need to contact this Dojo to find out about upcoming events."
+msgid "There are no events currently listed for this Dojo. Please contact the Dojo to find out about upcoming events."
+msgstr "There are no events currently listed for this Dojo. Please contact the Dojo to find out about upcoming events."
 
 msgid "Word of Mouth"
 msgstr "Word of Mouth"
@@ -699,6 +717,12 @@ msgstr "The Dojos listed here are all verified by the CoderDojo team."
 msgid "Learn more"
 msgstr "Learn more..."
 
+msgid "View more"
+msgstr "View more"
+
+msgid "View less"
+msgstr "View less"
+
 msgid "Search Results"
 msgstr "Search Results"
 
@@ -819,6 +843,9 @@ msgstr "Contact for more information"
 msgid "Inactive"
 msgstr "Inactive"
 
+msgid "Active Dojo"
+msgstr "Active Dojo"
+
 msgid "Uh-oh! Unfortunately this Dojo is no longer active. If you would like to set up a new Dojo at this location, please email us at [email protected]"
 msgstr "Uh-oh! Unfortunately this Dojo is no longer active. If you would like to set up a new Dojo at this location, please email us at [email protected]"
 
@@ -930,6 +957,9 @@ msgstr "Times"
 msgid "Tao verified"
 msgstr "Tao verified"
 
+msgid "Tao unverified"
+msgstr "Tao unverified"
+
 msgid "Join Mailing List"
 msgstr "Join Mailing List"
 
@@ -1392,6 +1422,9 @@ msgstr "Every"
 msgid "From"
 msgstr "From"
 
+msgid "Next date:"
+msgstr "Next date:"
+
 msgid "Close"
 msgstr "Close"
 
@@ -2317,6 +2350,9 @@ msgstr "No Dojos match your search query."
 msgid "Private Dojo"
 msgstr "Private Dojo"
 
+msgid "Public Dojo"
+msgstr "Public Dojo"
+
 msgid "This means this Dojo is only open to specific people (for example, students in a school). Please do not contact this Dojo."
 msgstr "This means this Dojo is only open to specific people (for example, students in a school). Please do not contact this Dojo."
 
@@ -2503,6 +2539,9 @@ msgstr "Check in"
 msgid "Book"
 msgstr "Book"
 
+msgid "Booking closed"
+msgstr "Booking closed"
+
 msgid "Session description"
 msgstr "Session description"
 
@@ -2530,6 +2569,9 @@ msgstr "Cancel Session"
 msgid "Cancelling a session will notify all of the attendees by email. Are you sure you want to continue?"
 msgstr "Cancelling a session will notify all of the attendees by email. Are you sure you want to continue?"
 
+msgid "Avatar"
+msgstr "Avatar"
+
 msgid "Your profile image is too large. Please resize to a maximum of 640/640 pixels."
 msgstr "Your profile image is too large. Please resize to a maximum of 640/640 pixels."
 
@@ -2735,17 +2777,29 @@ msgstr "No invites found"
 msgid "How do I choose?"
 msgstr "How do I choose?"
 
-msgid "Champion - A CoderDojo Champion is an individual who spearheads setting up and maintaining a Dojo. Champions do not necessarily have to have the ability to code but possess the skills required to bring together technical mentors and supporters to run a Dojo frequently!"
-msgstr "Champion - A CoderDojo Champion is an individual who spearheads setting up and maintaining a Dojo. Champions do not necessarily have to have the ability to code but possess the skills required to bring together technical mentors and supporters to run a Dojo frequently!"
+msgid "CoderDojo Champions are those who take the lead in organising a Dojo and ensure each session runs smoothly. Champions can be one person or it can be a few people who Co-Champion a Dojo to share the work. Champions should join their Dojo on Zen to set up events, award badges and to contribute to the CoderDojo Forums."
+msgstr "CoderDojo Champions are those who take the lead in organising a Dojo and ensure each session runs smoothly. Champions can be one person or it can be a few people who Co-Champion a Dojo to share the work. Champions should join their Dojo on Zen to set up events, award badges and to contribute to the CoderDojo Forums."
+
+msgid "Volunteers are the driving force behind Dojos around the world. Volunteers do everything from setting up the space, to mentoring during the Dojo, and to ensuring there is cool content for the Ninjas to do at each Dojo! Volunteers should join their Dojo on Zen to get updates on cool content, contribute to the CoderDojo Forums and to help administer the Dojo by awarding badges and setting up events!"
+msgstr "Volunteers are the driving force behind Dojos around the world. Volunteers do everything from setting up the space, to mentoring during the Dojo, and to ensuring there is cool content for the Ninjas to do at each Dojo! Volunteers should join their Dojo on Zen to get updates on cool content, contribute to the CoderDojo Forums and to help administer the Dojo by awarding badges and setting up events!"
+
+msgid "Attendees at CoderDojo are young people under 18 who attend and make CoderDojo cool. Often known as Ninjas, CoderDojo attendees come to the Dojo to have fun and bring their awesome ideas to life."
+msgstr "Attendees at CoderDojo are young people under 18 who attend and make CoderDojo cool. Often known as Ninjas, CoderDojo attendees come to the Dojo to have fun and bring their awesome ideas to life."
 
-msgid "Mentor/Volunteer - these volunteers power their local Dojos with their technical and organisational skills and inspire the next generation of coders, entrepreneurs and innovators!"
-msgstr "Mentor/Volunteer - these volunteers power their local Dojos with their technical and organisational skills and inspire the next generation of coders, entrepreneurs and innovators!"
+msgid "Parents/Guardians are super important in the CoderDojo journey as they encourage and inspire CoderDojo Ninjas on a daily basis. Parents should register and join a Dojo so the young people attached to their account can sign up to events and earn badges from their Champions and Mentors."
+msgstr "Parents/Guardians are super important in the CoderDojo journey as they encourage and inspire CoderDojo Ninjas on a daily basis. Parents should register and join a Dojo so the young people attached to their account can sign up to events and earn badges from their Champions and Mentors."
 
-msgid "Youth Over 13 - A Ninja is a young person who attends their local Dojo! Only Ninjas over 13 can have their own account, Ninjas under 13 must register under their Parent/Guardians account."
-msgstr "Youth Over 13 - A Ninja is a young person who attends their local Dojo! Only Ninjas over 13 can have their own account, Ninjas under 13 must register under their Parent/Guardians account."
+msgid "You will be joined to a Dojo as an adult, along with any young people added to your profile. We would like to know if you have any volunteering role in the Dojo too."
+msgstr "You will be joined to a Dojo as an adult, along with any young people added to your profile. We would like to know if you have any volunteering role in the Dojo too."
 
-msgid "Parent/Guardian - Parents/kids are super important in CoderDojo as they encourage and inspire CoderDojo Ninjas on a daily basis! Parents can sign up on the platform to register their kids (both aged under 13 and over 13) for their Local Dojos events and so their kids can earn badges for their profile!"
-msgstr "Parent/Guardian - Parents/kids are super important in CoderDojo as they encourage and inspire CoderDojo Ninjas on a daily basis! Parents can sign up on the platform to register their kids (both aged under 13 and over 13) for their Local Dojos events and so their kids can earn badges for their profile!"
+msgid "If you join the Dojo you will receive event updates from the Dojo and some newsletters from CoderDojo HQ! If you aren't a Dojo attendee and want to join as a volunteer or Champion please get in touch with the Dojo directly."
+msgstr "If you join the Dojo you will receive event updates from the Dojo and some newsletters from CoderDojo HQ! If you aren't a Dojo attendee and want to join as a volunteer or Champion please get in touch with the Dojo directly."
+
+msgid "Youths can be mentors too! If one of your Ninjas is regularly helping out others in your Dojo, give them recognition by giving them the Youth Volunteer title."
+msgstr "Youths can be mentors too! If one of your Ninjas is regularly helping out others in your Dojo, give them recognition by giving them the Youth Volunteer title."
+
+msgid "These young people are trailblazers who set an example and inspire other young people by organising and leading their local club. Young people should participate in the Dojo they Champion, meaning that Youth Champions improve their coding skills too!"
+msgstr "These young people are trailblazers who set an example and inspire other young people by organising and leading their local club. Young people should participate in the Dojo they Champion, meaning that Youth Champions improve their coding skills too!"
 
 msgid "Enabling this will require you or another admin with Ticketing Admin permissions to approve applications to attend this event."
 msgstr "Enabling this will require you or another admin with Ticketing Admin permissions to approve applications to attend this event."
@@ -2804,6 +2858,11 @@ msgstr "Not all information entered on your profile is viewable. You can choose
 msgid "Only your username and profile picture are publicly viewable. Other fields are for administration purposes only."
 msgstr "Only your username and profile picture are publicly viewable. Other fields are for administration purposes only."
 
+msgid "Click to view your public profile"
+msgstr "Click to view your public profile"
+
+msgid "Public profile"
+msgstr "Public profile"
 
 msgid "Registering an account does not guarantee you entry to a Dojo event. To gain entry to an event you must fill out your profile and book via the Dojo listing page. You will need your email confirmation to attend or direct permission from the Dojo administrators."
 msgstr "Registering an account does not guarantee you entry to a Dojo event. To gain entry to an event you must fill out your profile and book via the Dojo listing page. You will need your email confirmation to attend or direct permission from the Dojo administrators."
@@ -3039,6 +3098,12 @@ msgstr "An error has occurred while saving youth profile"
 msgid "Profile(s) have been saved successfully"
 msgstr "Profile(s) have been saved successfully"
 
+msgid "Your details"
+msgstr "Your details"
+
+msgid "About you"
+msgstr "About you"
+
 msgid "Got a child? Add them below"
 msgstr "Got a child? Add them below"
 
@@ -3051,5 +3116,35 @@ msgstr "Remove child"
 msgid "Are you sure you want to remove this child?"
 msgstr "Are you sure you want to remove this child?"
 
+msgid "You can view the"
+msgstr "You can view the"
+
+msgid "Zen roadmap"
+msgstr "Zen roadmap"
+
+msgid " and see what we are working on, as well as the latest features for Zen."
+msgstr " and see what we are working on, as well as the latest features for Zen."
+
+msgid "Access our e-learning module"
+msgstr "Access our e-learning module"
+
+msgid "By using this functionality, you allow us to share basic information with this provider (email, name, user type)"
+msgstr "By using this functionality, you allow us to share basic information with this provider (email, name, user type)"
+
+msgid "By clicking this button, you allow us to share basic information with this provider (email, name, user type)"
+msgstr "By clicking this button, you allow us to share basic information with this provider (email, name, user type)"
+
+msgid "Only modules for mentors and champions are available at the moment, come back later on to discover more!"
+msgstr "Only modules for mentors and champions are available at the moment, come back later on to discover more!"
+
+msgid "Do you agree?"
+msgstr "Do you agree?"
+
 msgid "A new dojo has been created"
-msgstr "A new dojo has been created!"
+msgstr "A new dojo has been created!"
+
+msgid "You have been invited to a Dojo session"
+msgstr "You have been invited to a Dojo session"
+
+msgid "Change Role"
+msgstr "Change Role"