From 6a7573da84d3e18582c37ddd61769065aa600751 Mon Sep 17 00:00:00 2001
From: lasjorg <28780271+lasjorg@users.noreply.github.com>
Date: Fri, 28 May 2021 22:06:27 +0200
Subject: [PATCH 1/2] fix(project): image link, update CSS, add code
 highlighter

---
 src/projects/markdown-previewer/index.html |  5 ++
 src/projects/markdown-previewer/index.jsx  | 45 ++++++-----
 src/projects/markdown-previewer/index.scss | 88 ++++++++++++----------
 3 files changed, 80 insertions(+), 58 deletions(-)

diff --git a/src/projects/markdown-previewer/index.html b/src/projects/markdown-previewer/index.html
index 16f80589..9422378f 100644
--- a/src/projects/markdown-previewer/index.html
+++ b/src/projects/markdown-previewer/index.html
@@ -2,9 +2,14 @@
   rel="stylesheet"
   href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
 />
+<link
+  rel="stylesheet"
+  href="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/themes/prism.min.css"
+/>
 
 <div id="app"></div>
 
 <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.1/react.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.1/react-dom.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.6/marked.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/prism.min.js"></script>
diff --git a/src/projects/markdown-previewer/index.jsx b/src/projects/markdown-previewer/index.jsx
index e76fdfd5..0a42c6a8 100644
--- a/src/projects/markdown-previewer/index.jsx
+++ b/src/projects/markdown-previewer/index.jsx
@@ -1,10 +1,10 @@
-/* globals marked, React, ReactDOM */
+/* globals marked, Prism, React, ReactDOM */
 /* eslint-disable react/prop-types, no-nested-ternary */
 
 // View a more complex version of this project with custom toolbar here:
 // https://codepen.io/no_stack_dub_sack/pen/JbPZvm?editors=0110
 
-// coded by @no-stack-dub-sack (github) / @no_stack_sub_sack (codepen)
+// coded by @no-stack-dub-sack (github) / @no_stack_sub_sack (Codepen)
 
 // eslint-disable-next-line no-unused-vars
 const projectName = 'markdown-previewer';
@@ -14,11 +14,15 @@ marked.setOptions({
   breaks: true
 });
 
-// INSERTS target="_blank" INTO HREF TAGS (required for codepen links)
+// INSERTS target="_blank" INTO HREF TAGS (required for Codepen links)
 const renderer = new marked.Renderer();
-renderer.link = function(href, title, text) {
+renderer.link = function (href, title, text) {
   return `<a target="_blank" href="${href}">${text}` + '</a>';
 };
+// Use Prism for code highlighting
+renderer.code = function (code) {
+  return `<pre><code class="language-javascript">${code}` + `</code></pre>\n`;
+};
 
 class App extends React.Component {
   constructor(props) {
@@ -47,28 +51,31 @@ class App extends React.Component {
       previewMaximized: !this.state.previewMaximized
     });
   }
+  componentDidUpdate() {
+    Prism.highlightAll();
+  }
   render() {
     const classes = this.state.editorMaximized
       ? ['editorWrap maximized', 'previewWrap hide', 'fa fa-compress']
       : this.state.previewMaximized
-        ? ['editorWrap hide', 'previewWrap maximized', 'fa fa-compress']
-        : ['editorWrap', 'previewWrap', 'fa fa-arrows-alt'];
+      ? ['editorWrap hide', 'previewWrap maximized', 'fa fa-compress']
+      : ['editorWrap', 'previewWrap', 'fa fa-arrows-alt'];
     return (
       <div>
         <div className={classes[0]}>
           <Toolbar
             icon={classes[2]}
             onClick={this.handleEditorMaximize}
-            text='Editor'
+            text="Editor"
           />
           <Editor markdown={this.state.markdown} onChange={this.handleChange} />
         </div>
-        <div className='converter' />
+        <div className="converter" />
         <div className={classes[1]}>
           <Toolbar
             icon={classes[2]}
             onClick={this.handlePreviewMaximize}
-            text='Previewer'
+            text="Previewer"
           />
           <Preview markdown={this.state.markdown} />
         </div>
@@ -77,34 +84,34 @@ class App extends React.Component {
   }
 }
 
-const Toolbar = props => {
+const Toolbar = (props) => {
   return (
-    <div className='toolbar'>
-      <i className='fa fa-free-code-camp' title='no-stack-dub-sack' />
+    <div className="toolbar">
+      <i className="fa fa-free-code-camp" title="no-stack-dub-sack" />
       {props.text}
       <i className={props.icon} onClick={props.onClick} />
     </div>
   );
 };
 
-const Editor = props => {
+const Editor = (props) => {
   return (
     <textarea
-      id='editor'
+      id="editor"
       onChange={props.onChange}
-      type='text'
+      type="text"
       value={props.markdown}
     />
   );
 };
 
-const Preview = props => {
+const Preview = (props) => {
   return (
     <div
       dangerouslySetInnerHTML={{
         __html: marked(props.markdown, { renderer: renderer })
       }}
-      id='preview'
+      id="preview"
     />
   );
 };
@@ -147,11 +154,11 @@ And here. | Okay. | I think we get it.
         - That look like this.
 
 
-1. And there are numbererd lists too.
+1. And there are numbered lists too.
 1. Use just 1s if you want!
 1. And last but not least, let's not forget embedded images:
 
-![React Logo w/ Text](https://goo.gl/Umyytc)
+![freeCodeCamp Logo](https://cdn.freecodecamp.org/testable-projects-fcc/images/fcc_secondary.svg)
 `;
 
 ReactDOM.render(<App />, document.getElementById('app'));
diff --git a/src/projects/markdown-previewer/index.scss b/src/projects/markdown-previewer/index.scss
index 19a5484d..5b3be890 100644
--- a/src/projects/markdown-previewer/index.scss
+++ b/src/projects/markdown-previewer/index.scss
@@ -6,16 +6,23 @@ $backgroundBase: #619e9e;
 $shadow: 1px 1px 10px 2px darken($backgroundBase, 20%);
 $default-border: 1px solid darken($backgroundBase, 35%);
 
+* {
+  box-sizing: border-box;
+}
+
 body {
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto,
+    'Helvetica Neue', Arial, 'Noto Sans', sans-serif, 'Apple Color Emoji',
+    'Segoe UI Emoji', 'Segoe UI Symbol', 'Noto Color Emoji';
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: #212529;
+  text-align: left;
   background: lighten($backgroundBase, 12%);
   margin: 10px 0;
 }
 
-#preview,
-.title {
-  display: inline-block;
-}
-
 .colorScheme {
   background-color: lighten($backgroundBase, 30%);
   border: $default-border;
@@ -24,22 +31,22 @@ body {
 }
 
 .toolbar {
-  position: relative;
+  display: flex;
+  align-items: center;
   background-color: lighten($darkAccent, 25%);
-  padding: 4px 4px 3px 3px;
+  padding: 0.3rem;
   border: $default-border;
   box-shadow: $shadow;
   font-family: Russo One;
-  font-size: 15px;
+  font-size: 1rem;
+  color: black;
   i {
     width: 25px;
-    color: black;
     margin-left: 5px;
   }
   .fa-arrows-alt,
   .fa-compress {
-    position: absolute;
-    right: -5px;
+    margin-left: auto;
   }
 }
 
@@ -57,8 +64,8 @@ body {
 }
 
 .editorWrap {
-  width: 600px;
-  margin: 18px auto;
+  max-width: 600px;
+  margin: 1.125rem auto;
   .toolbar {
     width: 99%;
   }
@@ -71,7 +78,7 @@ body {
     outline: none;
     padding-left: 5px;
     padding-top: 5px;
-    font-size: 12px;
+    font-size: 0.875rem;
   }
 }
 
@@ -84,29 +91,18 @@ body {
 
 .previewWrap {
   @extend .colorScheme;
-  width: 800px;
-  margin: 20px auto;
+  max-width: 800px;
+  margin: 1.25rem auto;
   min-height: 200px;
   overflow-wrap: break-word;
-  padding-right: 20px;
-  .toolbar {
-    left: -1px;
-    width: 100%;
-    padding-right: 17px;
-  }
-  #preview {
-    margin-left: 5px;
-    margin-top: -10px;
-    width: 100%;
-  }
 }
 
 @media screen and (max-width: 850px) {
   .previewWrap {
-    width: 630px;
+    max-width: 630px;
   }
   .editorWrap {
-    width: 550px;
+    max-width: 550px;
   }
 }
 
@@ -137,18 +133,14 @@ body {
     margin: auto;
   }
   .previewWrap {
-    width: 95vw;
-    #preview {
-      width: 100%;
-      img {
-        height: 200px;
-      }
-    }
+    width: 90vw;
   }
 }
 
 // MARKDOWN STYLES
 #preview {
+  padding: 0 1rem;
+
   blockquote {
     border-left: 3px solid #224b4b;
     color: #224b4b;
@@ -156,16 +148,22 @@ body {
     margin-left: 25px;
   }
 
+  > p > code {
+    padding: 3px;
+  }
+
   code {
     background: white;
-    padding: 1px 4px 2px 4px;
-    font-size: 12px;
+    font-size: 0.875rem;
     font-weight: bold;
   }
 
   pre {
+    display: block;
+    overflow: auto;
     background: white;
-    padding: 5px 0 5px 5px;
+    padding: 5px;
+    line-height: 1.2;
   }
 
   h1 {
@@ -186,4 +184,16 @@ body {
     padding-left: 5px;
     padding-right: 5px;
   }
+
+  img {
+    display: block;
+    max-width: 90%;
+    margin: 2rem auto;
+  }
+}
+
+@media screen and (max-width: 420px) {
+  body {
+    font-size: 0.875rem;
+  }
 }

From 15d1f220156559ea251ae1f258cc226608e3441d Mon Sep 17 00:00:00 2001
From: lasjorg <28780271+lasjorg@users.noreply.github.com>
Date: Tue, 1 Jun 2021 19:56:35 +0200
Subject: [PATCH 2/2] fix(project): highlighter, template string, fCC link,
 update libs

---
 src/projects/markdown-previewer/index.html | 12 +++++++++---
 src/projects/markdown-previewer/index.jsx  | 16 ++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/projects/markdown-previewer/index.html b/src/projects/markdown-previewer/index.html
index 9422378f..04e5d50c 100644
--- a/src/projects/markdown-previewer/index.html
+++ b/src/projects/markdown-previewer/index.html
@@ -9,7 +9,13 @@
 
 <div id="app"></div>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.1/react.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/react/15.3.1/react-dom.min.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/marked/0.3.6/marked.js"></script>
+<script
+  crossorigin
+  src="https://unpkg.com/react@17/umd/react.production.min.js"
+></script>
+<script
+  crossorigin
+  src="https://unpkg.com/react-dom@17/umd/react-dom.production.min.js"
+></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/marked/2.0.3/marked.min.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/prism.min.js"></script>
diff --git a/src/projects/markdown-previewer/index.jsx b/src/projects/markdown-previewer/index.jsx
index 0a42c6a8..4c82f55e 100644
--- a/src/projects/markdown-previewer/index.jsx
+++ b/src/projects/markdown-previewer/index.jsx
@@ -11,17 +11,16 @@ const projectName = 'markdown-previewer';
 
 // ALLOWS LINE BREAKS WITH RETURN BUTTON
 marked.setOptions({
-  breaks: true
+  breaks: true,
+  highlight: function (code) {
+    return Prism.highlight(code, Prism.languages.javascript, 'javascript');
+  }
 });
 
 // INSERTS target="_blank" INTO HREF TAGS (required for Codepen links)
 const renderer = new marked.Renderer();
 renderer.link = function (href, title, text) {
-  return `<a target="_blank" href="${href}">${text}` + '</a>';
-};
-// Use Prism for code highlighting
-renderer.code = function (code) {
-  return `<pre><code class="language-javascript">${code}` + `</code></pre>\n`;
+  return `<a target="_blank" href="${href}">${text}</a>`;
 };
 
 class App extends React.Component {
@@ -51,9 +50,6 @@ class App extends React.Component {
       previewMaximized: !this.state.previewMaximized
     });
   }
-  componentDidUpdate() {
-    Prism.highlightAll();
-  }
   render() {
     const classes = this.state.editorMaximized
       ? ['editorWrap maximized', 'previewWrap hide', 'fa fa-compress']
@@ -138,7 +134,7 @@ Or _italic_.
 Or... wait for it... **_both!_**
 And feel free to go crazy ~~crossing stuff out~~.
 
-There's also [links](https://www.freecodecamp.com), and
+There's also [links](https://www.freecodecamp.org), and
 > Block Quotes!
 
 And if you want to get really crazy, even tables: