# This is a combination of 2 commits.

# This is the 1st commit message:

feat: update how-to labels to library/project

# The commit message #2 will be skipped:

# fixup! feat: update how-to labels to library/project

Author: benfurber

README.md

@@ -28,7 +28,7 @@ This platform aims to tackle these problems by creating a strong unified communi
 
 ## ⚡️   What is this platform?
 
-Our community platform helps people to grow communities and make it easier to collaborate on environmental projects in one single place. A place where people can meet, help each other, ask and answer questions, share their innovative ways of fixing problems, discover people around them, connect locally and more. It aims to provide the tools to connect both online and offline. Amongst other features we have How-to and Maps.
+Our community platform helps people to grow communities and make it easier to collaborate on environmental projects in one single place. A place where people can meet, help each other, ask and answer questions, share their innovative ways of fixing problems, discover people around them, connect locally and more. It aims to provide the tools to connect both online and offline. Amongst other features we have a library of projects, research, questions, commenting and a map.
 
 ### Have a look on our [website](https://platform.onearmy.earth) to have a clear overview
 

functions/src/Integrations/firebase-discord.ts

@@ -1,12 +1,12 @@
 import axios from 'axios'
 import * as functions from 'firebase-functions'
-import { IResearchDB, ResearchUpdateStatus } from 'oa-shared/models/research'
 import { IModerationStatus } from 'oa-shared'
+import { IResearchDB, ResearchUpdateStatus } from 'oa-shared/models/research'
 
 import { CONFIG } from '../config/config'
 
 import type { AxiosError, AxiosResponse } from 'axios'
-import type { IResearch, IMapPin } from 'oa-shared/models'
+import type { IMapPin,IResearch } from 'oa-shared/models'
 
 const SITE_URL = CONFIG.deployment.site_url
 // e.g. https://dev.onearmy.world or https://community.preciousplastic.com
@@ -51,8 +51,8 @@ export const notifyHowtoPublished = functions
     const { _createdBy, title, slug } = info
     await axios
       .post(DISCORD_WEBHOOK_URL, {
-        content: `📓 Yeah! New How To **${title}** by *${_createdBy}*
-            check it out: <${SITE_URL}/how-to/${slug}>`,
+        content: `📓 Yeah! New library project **${title}** by *${_createdBy}*
+            check it out: <${SITE_URL}/library/${slug}>`,
       })
       .then(handleResponse, handleErr)
       .catch(handleErr)

functions/src/Integrations/firebase-slack.ts

@@ -1,8 +1,9 @@
-import { CONFIG } from '../config/config'
-import * as functions from 'firebase-functions'
 import axios from 'axios'
+import * as functions from 'firebase-functions'
 import { IModerationStatus } from 'oa-shared'
 
+import { CONFIG } from '../config/config'
+
 const SITE_URL = CONFIG.deployment.site_url
 // e.g. https://dev.onearmy.world or https://community.preciousplastic.com
 
@@ -39,8 +40,8 @@ export const notifyHowtoAwaitingModeration = functions
 
     return await axios
       .post(SLACK_WEBHOOK_URL, {
-        text: `📓 Yeah! New How To *${title}* by _${user}_ awaiting moderation,
-            check it out: ${SITE_URL}/how-to/${slug}`,
+        text: `📓 Yeah! New library project *${title}* by _${user}_ awaiting moderation,
+            check it out: ${SITE_URL}/library/${slug}`,
       })
       .catch((err) => {
         console.error(err)

functions/src/emailNotifications/createModerationEmails.ts

@@ -1,15 +1,18 @@
 import * as functions from 'firebase-functions'
-import { QueryDocumentSnapshot } from 'firebase-admin/firestore'
-import { IModerationStatus, IModerable } from 'oa-shared'
+import { IModerationStatus } from 'oa-shared'
+
+import { withErrorAlerting } from '../alerting/errorAlerting'
+import { MEMORY_LIMIT_512_MB } from '../consts'
 import { db } from '../Firebase/firestoreDB'
 import { DB_ENDPOINTS } from '../models'
 import * as templates from './templateHelpers'
 import { getUserAndEmail } from './utils'
-import { Change } from 'firebase-functions/v1'
-import { withErrorAlerting } from '../alerting/errorAlerting'
-import { MEMORY_LIMIT_512_MB } from '../consts'
-import { IHowtoDB } from 'oa-shared/models/howto'
-import { IMapPin } from 'oa-shared/models/maps'
+
+import type { QueryDocumentSnapshot } from 'firebase-admin/firestore'
+import type { Change } from 'firebase-functions/v1'
+import type { IModerable } from 'oa-shared'
+import type { IHowtoDB } from 'oa-shared/models/howto'
+import type { IMapPin } from 'oa-shared/models/maps'
 
 export async function handleModerationUpdate<T extends IModerable>(
   change: Change<QueryDocumentSnapshot<T>>,
@@ -33,7 +36,7 @@ export async function createHowtoModerationEmail(howto: IHowtoDB) {
       message: templates.getHowToApprovalEmail(toUser, howto),
     })
   } else if (howto.moderation === IModerationStatus.AWAITING_MODERATION) {
-    // If a how to is resumbitted, send another submission confirmation email.
+    // If a library project is resumbitted, send another submission confirmation email.
     await db.collection(DB_ENDPOINTS.emails).add({
       to: toUserEmail,
       message: templates.getHowToSubmissionEmail(toUser, howto),

functions/src/emailNotifications/createNotificationEmails.spec.ts

@@ -102,7 +102,7 @@ describe('create email test', () => {
           userId: 'user_1',
         },
         relevantUrl: '/test',
-        title: 'Test how-to',
+        title: 'Test project',
         type: 'new_comment_discussion',
       }),
       notificationFactory('user_2', 'notification_2', {
@@ -139,7 +139,7 @@ describe('create email test', () => {
           userId: 'user_1',
         },
         relevantUrl: '/test',
-        title: 'Test how-to',
+        title: 'Test project',
         type: 'new_comment_discussion',
       }),
     ]
@@ -218,8 +218,8 @@ describe('create email test', () => {
         to,
       } = doc.data()
       expect(html).toContain('https://community.preciousplastic.com/test')
-      // 1st notification: how-to
-      expect(html).toContain('how-to')
+      // 1st notification: project
+      expect(html).toContain('project')
       expect(html).toContain('https://community.preciousplastic.com/u/user_2')
       // 2nd notification: new comment
       expect(html).toContain('New comment')
@@ -263,7 +263,7 @@ describe('create email test', () => {
       // 1st notification: new comment
       expect(html).toContain('New comment')
       expect(html).toContain('https://community.preciousplastic.com/u/user_1')
-      expect(html).toContain('Test how-to')
+      expect(html).toContain('Test project')
       // 2nd notification: new comment
       expect(html).toContain('https://community.preciousplastic.com/u/user_3')
       expect(html).toContain('Test research')

functions/src/emailNotifications/createSubmissionEmails.spec.ts

@@ -85,7 +85,7 @@ describe('Create howto submission emails', () => {
     })
   })
 
-  it('Does not create email for draft how tos', async () => {
+  it('Does not create email for draft projects', async () => {
     const howto = getMockHowto('user_1', IModerationStatus.DRAFT)
     await createHowtoSubmissionEmail(howto)
 

functions/src/emailNotifications/templateHelpers.ts

@@ -134,7 +134,7 @@ export const getNotificationEmail = (
   }
 }
 
-export const HOW_TO_APPROVAL_SUBJECT = 'Your how-to has been approved!'
+export const HOW_TO_APPROVAL_SUBJECT = 'Your project has been approved!'
 export const getHowToApprovalEmail = (
   user: IUserDB,
   howto: IHowtoDB,
@@ -183,7 +183,7 @@ export const getSenderMessageEmail = ({
   }
 }
 
-export const HOW_TO_SUBMISSION_SUBJECT = 'Your how-to has been submitted'
+export const HOW_TO_SUBMISSION_SUBJECT = 'Your project has been submitted'
 export const getHowToSubmissionEmail = (
   user: IUserDB,
   howto: IHowtoDB,
@@ -234,7 +234,7 @@ export const getUserVerifiedBadgeAddedEmail = (user: IUserDB): Email => ({
   html: getEmailHtml('verified-badge-added', { user, site }),
 })
 
-export const HOW_TO_REJECTED_SUBJECT = 'Your how-to has been rejected'
+export const HOW_TO_REJECTED_SUBJECT = 'Your project has been rejected'
 export const getHowToRejectedEmail = (
   user: IUserDB,
   howto: IHowtoDB,
@@ -257,7 +257,7 @@ export const getMapPinRejectedEmail = (user: IUserDB): Email => ({
 })
 
 export const HOW_TO_NEEDS_IMPROVEMENTS_SUBJECT =
-  'Your how-to needs improvements'
+  'Your project needs improvements'
 export const getHowToNeedsImprovementsEmail = (
   user: IUserDB,
   howto: IHowtoDB,

functions/src/emailNotifications/templates/how-to-approval.html

@@ -1,7 +1,7 @@
 {{#> layout}}
 
 <p>Hey {{user.displayName}},</p>
-<p>Huzzah! Your How-To {{howto.title}} has been approved.</p>
+<p>Huzzah! Your project {{howto.title}} has been approved.</p>
 
 <p>
   It is visible on the community platform

functions/src/emailNotifications/templates/how-to-needs-improvements.html

@@ -3,23 +3,23 @@
 <p>Hey {{user.displayName}},</p>
 
 <p>
-  Your How-to, <a href="{{site.url}}/how-to/{{howto.slug}}">{{howto.title}}</a>,
+  Your project, <a href="{{site.url}}/how-to/{{howto.slug}}">{{howto.title}}</a>,
   needs more work before we can publish it.
 </p>
 
 {{#if howto.moderatorFeedback}}
-<p>Please review the following & re-submit your How-to:</p>
+<p>Please review the following & re-submit your project:</p>
 <b>{{howto.moderatorFeedback}}</b>
 {{/if}}
 
 <p>
   Check the
   <a href="https://community.preciousplastic.com/academy/create/howto">
-    How-to guidelines</a
+    guidelines</a
   >
-  to review our requirements. Until you update your information, your How-to
+  to review our requirements. Until you update your information, your project
   will remain hidden from the community platform. We hope to see your edits
-  soon, so we can get your How-to online as soon as possible 🙂
+  soon, so we can get it online as soon as possible. 🙂
 </p>
 
 <p>We look forward to hearing back from you.</p>

functions/src/emailNotifications/templates/how-to-rejected.html

@@ -3,7 +3,7 @@
 <p>Hey {{user.displayName}},</p>
 
 <p>
-  Thank you for submitting your How-To,
+  Thank you for submitting your project,
   <a href="{{site.url}}/how-to/{{howto.slug}}">{{howto.title}}</a>. We
   appreciate your contribution and the time and effort you put into creating it.
 </p>