Merge pull request #64 from scriptified/make-code-snippet-optional

🐛 Make tip of the week snippet optional
scriptified · Aug 16, 2021 · 9dfd5ef · 9dfd5ef
2 parents 79c3391 + bf42217
commit 9dfd5ef
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 23 deletions.
diff --git a/interfaces/api.ts b/interfaces/api.ts
@@ -28,7 +28,7 @@ export interface TipOfTheWeek {
   published_at: string;
   created_at: string;
   updated_at: string;
-  codeSnippet: CodeSnippet;
+  codeSnippet?: CodeSnippet;
 }
 export interface CodeSnippet {
   id: number;

diff --git a/interfaces/tipOfTheWeek.ts b/interfaces/tipOfTheWeek.ts
@@ -1,7 +1,7 @@
 import CodeSnippet from './codeSnippet';
 
 export default interface TipOfTheWeek {
-  snippet: CodeSnippet;
+  snippet?: CodeSnippet;
   desc: string;
   sourceName: string;
   sourceURL: string;

diff --git a/lib/issues.ts b/lib/issues.ts
@@ -92,7 +92,7 @@ export function mapToIssue(issue: IssueAPIResponse): Issue {
   const tipOfTheWeek =
     issue.tipOfTheWeek !== null
       ? {
-          snippet: issue.tipOfTheWeek.codeSnippet,
+          snippet: issue.tipOfTheWeek.codeSnippet ?? null,
           desc: issue.tipOfTheWeek.description,
           sourceName: issue.tipOfTheWeek.sourceName,
           sourceURL: issue.tipOfTheWeek.sourceURL,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scriptified",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "private": true,
   "license": "(MIT OR Apache-2.0)",
   "scripts": {

diff --git a/pages/issues/[id].tsx b/pages/issues/[id].tsx
@@ -76,7 +76,7 @@ export default function IssueComponent({ issueData }: { issueData: Issue }): JSX
             <Text type="base" additionalStyles="py-4 relative z-10">
               <Markdown>{issueData.tipOfTheWeek.desc}</Markdown>
             </Text>
-            <CodeSnippet snippet={issueData.tipOfTheWeek.snippet} />
+            {issueData.tipOfTheWeek.snippet ? <CodeSnippet snippet={issueData.tipOfTheWeek.snippet} /> : null}
           </IssueItem>
         ) : null}
         {issueData?.articles !== null ? (

diff --git a/scripts/issueEmailGenerator.js b/scripts/issueEmailGenerator.js
@@ -99,10 +99,14 @@ ${currentIssue.description}
 # Tip of the day
 ${currentIssue.tipOfTheWeek.description}
 
+${
+  currentIssue.tipOfTheWeek.codeSnippet &&
+  ` 
 \`\`\`${currentIssue.tipOfTheWeek.codeSnippet.language}
 ${currentIssue.tipOfTheWeek.codeSnippet.code}
 \`\`\`
-
+`
+}
 ___
 
 # Articles
@@ -121,6 +125,27 @@ ${article.description}
 
 ___
 
+${
+  currentIssue.devOfTheWeek
+    ? `# Dev of the Week 
+    
+<img alt="${currentIssue.devOfTheWeek.name}" src="${getAssetURL(
+        currentIssue.id,
+        currentIssue.devOfTheWeek.profileImg
+      )}" style="width:200px;"/> 
+  
+## ${currentIssue.devOfTheWeek.name} 
+${currentIssue.devOfTheWeek.bio} 
+  
+${Object.keys(currentIssue.devOfTheWeek)
+  .filter(key => PROFILE_KEYS.includes(key) && currentIssue.devOfTheWeek[key] !== null)
+  .map(profile => `[${PROFILE_TYPES[profile]}](${currentIssue.devOfTheWeek[profile]})`)
+  .join(' | ')}
+
+___`
+    : ''
+}
+
 # Tools
 
 ${currentIssue.tools
@@ -137,23 +162,6 @@ ${tool.description}
 
 ___
 
-# Dev of the Week
-
-<img alt="${currentIssue.devOfTheWeek.name}" src="${getAssetURL(
-    currentIssue.id,
-    currentIssue.devOfTheWeek.profileImg
-  )}" style="width:200px;"/>
-
-## ${currentIssue.devOfTheWeek.name}
-${currentIssue.devOfTheWeek.bio}
-
-${Object.keys(currentIssue.devOfTheWeek)
-  .filter(key => PROFILE_KEYS.includes(key) && currentIssue.devOfTheWeek[key] !== null)
-  .map(profile => `[${PROFILE_TYPES[profile]}](${currentIssue.devOfTheWeek[profile]})`)
-  .join(' | ')}
-
-___
-
 # Tech Talks
 
 [**${currentIssue.talks[0].title}**](${currentIssue.talks[0].url})