Merge branch 'develop'

jmgasper · jmgasper · commit 1e02c6bc6662 · 2021-01-28T07:23:34.000+11:00
diff --git a/config/template.json b/config/template.json
@@ -25,7 +25,7 @@
                   "discussions": [
                     {
                       "title": "Challenge Overview",
-                      "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",
+                      "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",
                       "announce": 1,
                       "closed": 1
                     },
@@ -43,7 +43,7 @@
                   "discussions": [
                     {
                       "title": "Welcome!",
-                      "body": "Please read the requirements carefully.  If you have questions, please let me know, I'll be glad to help you.",
+                      "body": "Please read the requirements carefully. If you have questions, please let me know, I'll be glad to help you.",
                       "announce": 0,
                       "closed": 0
                     }
@@ -68,7 +68,7 @@
                   "discussions": [
                     {
                       "title": "Challenge Overview",
-                      "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",
+                      "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",
                       "announce": 1,
                       "closed": 1
                     },
@@ -131,7 +131,7 @@
                 },
                 {
                   "title": "Challenge Overview",
-                  "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",
+                  "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",
                   "announce": 1,
                   "closed": 1
                 }
@@ -160,7 +160,7 @@
                   "discussions": [
                     {
                       "title": "Challenge Overview",
-                      "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",
+                      "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",
                       "announce": 1,
                       "closed": 1
                     },
@@ -178,7 +178,7 @@
                   "discussions": [
                     {
                       "title": "Welcome!",
-                      "body": "Please read the requirements carefully.  If you have questions, please let me know, I'll be glad to help you.",
+                      "body": "Please read the requirements carefully. If you have questions, please let me know, I'll be glad to help you.",
                       "announce": 0,
                       "closed": 0
                     }
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/constants.js b/src/constants.js
@@ -66,12 +66,12 @@ module.exports = {
       'discussions.view': true
     },
     DISCUSSION_FORMAT: {
-      RICH: 'rich',
-      MARKDOWN: 'markdown',
-      TEXT: 'text',
-      TEXTEX: 'textex',
-      WYSIWYG: 'wysiwyg',
-      BBCODE: 'bbcode'
+      RICH: 'Rich',
+      MARKDOWN: 'Markdown',
+      TEXT: 'Text',
+      TEXTEX: 'Textex',
+      WYSIWYG: 'Wysiwyg',
+      BBCODE: 'Bbcode'
     },
     GROUP_PRIVACY: {
       SECRET: 'secret',
diff --git a/src/services/vanilla.js b/src/services/vanilla.js
@@ -315,7 +315,7 @@ async function createDiscussions (group, challenge, templateDiscussions, vanilla
       name: discussion.title,
       groupID: group.groupID,
       categoryID: vanillaCategory.categoryID,
-      format: constants.VANILLA.DISCUSSION_FORMAT.WYSIWYG,
+      format: constants.VANILLA.DISCUSSION_FORMAT.MARKDOWN,
       closed: discussion.closed,
       pinned: discussion.announce
     })
diff --git a/src/utils/vanilla-client.util.js b/src/utils/vanilla-client.util.js
@@ -140,7 +140,7 @@ function getVanillaClient () {
         .send(data)
     },
     removeUserFromGroup: (groupId, userId) => {
-      return request.delete(`${config.VANILLA.API_URL}/groups/${groupId}/members/${userId}`)
+      return request.delete(`${config.VANILLA.API_URL}/groups/${groupId}/member/${userId}`)
         .query({ access_token: config.VANILLA.ADMIN_ACCESS_TOKEN })
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"discussions": [`
`26`	`26`	`{`
`27`	`27`	`"title": "Challenge Overview",`
`28`		`- "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",`
	`28`	`+ "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",`
`29`	`29`	`"announce": 1,`
`30`	`30`	`"closed": 1`
`31`	`31`	`},`
`@@ -43,7 +43,7 @@`
`43`	`43`	`"discussions": [`
`44`	`44`	`{`
`45`	`45`	`"title": "Welcome!",`
`46`		`- "body": "Please read the requirements carefully. If you have questions, please let me know, I'll be glad to help you.",`
	`46`	`+ "body": "Please read the requirements carefully. If you have questions, please let me know, I'll be glad to help you.",`
`47`	`47`	`"announce": 0,`
`48`	`48`	`"closed": 0`
`49`	`49`	`}`
`@@ -68,7 +68,7 @@`
`68`	`68`	`"discussions": [`
`69`	`69`	`{`
`70`	`70`	`"title": "Challenge Overview",`
`71`		`- "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",`
	`71`	`+ "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",`
`72`	`72`	`"announce": 1,`
`73`	`73`	`"closed": 1`
`74`	`74`	`},`
`@@ -131,7 +131,7 @@`
`131`	`131`	`},`
`132`	`132`	`{`
`133`	`133`	`"title": "Challenge Overview",`
`134`		`- "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",`
	`134`	`+ "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",`
`135`	`135`	`"announce": 1,`
`136`	`136`	`"closed": 1`
`137`	`137`	`}`
`@@ -160,7 +160,7 @@`
`160`	`160`	`"discussions": [`
`161`	`161`	`{`
`162`	`162`	`"title": "Challenge Overview",`
`163`		`- "body": "<a href='<%- challenge.url %>'>Back to Challenge Details page</a><br/><ul><% _.forEach(challenge.prizeSets, function(prizeSet) { %><li><%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %></li> <% }); %></ul>",`
	`163`	`+ "body": "[Back to Challenge Details page](<%- challenge.url %>)\n<% _.forEach(challenge.prizeSets, function(prizeSet) { %>* <%- prizeSet.type %>: <% _.forEach(prizeSet.prizes, function(prize) { %><%- prize.value %>$ <% }) %>\n<% }); %>",`
`164`	`164`	`"announce": 1,`
`165`	`165`	`"closed": 1`
`166`	`166`	`},`
`@@ -178,7 +178,7 @@`
`178`	`178`	`"discussions": [`
`179`	`179`	`{`
`180`	`180`	`"title": "Welcome!",`
`181`		`- "body": "Please read the requirements carefully. If you have questions, please let me know, I'll be glad to help you.",`
	`181`	`+ "body": "Please read the requirements carefully. If you have questions, please let me know, I'll be glad to help you.",`
`182`	`182`	`"announce": 0,`
`183`	`183`	`"closed": 0`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ function getVanillaClient () {`
`140`	`140`	`.send(data)`
`141`	`141`	`},`
`142`	`142`	`removeUserFromGroup: (groupId, userId) => {`
`143`		- return request.delete(`${config.VANILLA.API_URL}/groups/${groupId}/members/${userId}`)
	`143`	+ return request.delete(`${config.VANILLA.API_URL}/groups/${groupId}/member/${userId}`)
`144`	`144`	`.query({ access_token: config.VANILLA.ADMIN_ACCESS_TOKEN })`
`145`	`145`	`}`
`146`	`146`	`}`