Merge pull request #29 from jackyzha0/order-langs

order langs and fix export bug

2 files changed, 23 insertions, 22 deletions

diff --git a/frontend/src/components/PasteInfo.js b/frontend/src/components/PasteInfo.js
index b63eedb..28141ac 100644
--- a/frontend/src/components/PasteInfo.js
+++ b/frontend/src/components/PasteInfo.js
@@ -71,7 +71,7 @@ const PasteInfo = (props) => {
                     type="button"
                     onClick={() => exportComponentAsJPEG(props.compref, `paste-${props.hash}.png`)}
                 >
-                    save
+                    save png
                 </Button>
                 {renderable()}
                 <ThemeInput
diff --git a/frontend/src/components/renderers/Code.js b/frontend/src/components/renderers/Code.js
index 3d84adb..02c1cc6 100644
--- a/frontend/src/components/renderers/Code.js
+++ b/frontend/src/components/renderers/Code.js
@@ -11,26 +11,26 @@ export const THEMES = Object.freeze({
 })
 
 export const LANGS = Object.freeze({
-    'go': 'go',
-    'python': 'python',
-    'js': 'javascript',
-    'html': 'html',
-    'css': 'css',
+    'bash': 'bash',
     'c': 'c',
     'c++': 'cpp',
     'c#': 'cs',
-    'ruby': 'ruby',
+    'css': 'css',
     'docker': 'dockerfile',
-    'bash': 'bash',
-    'raw': 'text',
+    'go': 'go',
+    'haskell': 'haskell',
+    'html': 'html',
     'java': 'java',
+    'js': 'javascript',
+    'latex': 'latex',
     'lisp': 'lisp',
-    'haskell': 'haskell',
-    'scala': 'scala',
-    'markdown': 'markdown',
     'makefile': 'makefile',
+    'markdown': 'markdown',
     'php': 'php',
-    'latex': 'latex',
+    'python': 'python',
+    'raw': 'text',
+    'ruby': 'ruby',
+    'scala': 'scala',
     'yaml': 'yaml'
 })
 
@@ -43,15 +43,16 @@ const CodeRenderer = React.forwardRef((props, ref) => {
     }
 
     return (
-        <SyntaxHighlighter
-            className="codeBlock lt-shadow"
-            ref={ref}
-            language={props.lang}
-            style={THEMES[props.theme]}
-            showLineNumbers
-            PreTag={Pre}>
-            {props.content}
-        </SyntaxHighlighter>
+        <div className="lt-shadow codeBlock">
+            <SyntaxHighlighter
+                ref={ref}
+                language={props.lang}
+                style={THEMES[props.theme]}
+                showLineNumbers
+                PreTag={Pre}>
+                {props.content}
+            </SyntaxHighlighter>
+        </div>
     );
 });