From 11edeef488e8307c0acbb2c7be5c354fc6094b92 Mon Sep 17 00:00:00 2001
From: Alexander Horbunov <31066977+hornetDC@users.noreply.github.com>
Date: Fri, 2 Apr 2021 01:04:39 +0300
Subject: [PATCH 1/3] Added markdown editor (#94)

---
 apps/blueprints/src/components/MDEditor.tsx   | 41 +++++++++++++
 .../src/pages/user/blueprint-create.tsx       |  6 +-
 .../pages/user/blueprint/[blueprintId].tsx    |  6 +-
 package.json                                  |  1 +
 yarn.lock                                     | 59 +++++++++++++++++++
 5 files changed, 111 insertions(+), 2 deletions(-)
 create mode 100644 apps/blueprints/src/components/MDEditor.tsx

diff --git a/apps/blueprints/src/components/MDEditor.tsx b/apps/blueprints/src/components/MDEditor.tsx
new file mode 100644
index 0000000..bd2370d
--- /dev/null
+++ b/apps/blueprints/src/components/MDEditor.tsx
@@ -0,0 +1,41 @@
+import React from "react";
+import styled from "@emotion/styled";
+import SimpleMDE, { SimpleMDEEditorProps } from "react-simplemde-editor";
+import "easymde/dist/easymde.min.css";
+
+const StyledSimpleMDE = styled(SimpleMDE)`
+  .editor-toolbar {
+    button.active,
+    button:hover {
+      background: #5d5d5d;
+    }
+
+    &.fullscreen {
+      background: #414040;
+    }
+  }
+
+  .editor-preview {
+    background: #414040;
+  }
+
+  .CodeMirror {
+    background: #414040;
+    color: white;
+  }
+
+  .CodeMirror-cursor {
+    border-color: white;
+  }
+
+  .EasyMDEContainer .CodeMirror-fullscreen {
+    border-left: none !important;
+    border-bottom: none !important;
+  }
+`;
+
+export const MDEditor: React.FC<SimpleMDEEditorProps> = (props) => {
+  return (
+    <StyledSimpleMDE options={{ spellChecker: false, sideBySideFullscreen: false }} {...props} />
+  );
+};
diff --git a/apps/blueprints/src/pages/user/blueprint-create.tsx b/apps/blueprints/src/pages/user/blueprint-create.tsx
index 79818ba..83faec0 100644
--- a/apps/blueprints/src/pages/user/blueprint-create.tsx
+++ b/apps/blueprints/src/pages/user/blueprint-create.tsx
@@ -20,6 +20,7 @@ import { validateCreateBlueprintForm } from "../../utils/validate";
 import { ImageEditor } from "../../components/ImageEditor";
 import { Select } from "../../components/Select";
 import { Button } from "../../components/Button";
+import { MDEditor } from "../../components/MDEditor";
 import { pageHandler } from "../../utils/page-handler";
 
 const FieldStyle = css`
@@ -90,7 +91,10 @@ export const UserBlueprintCreate: NextPage = () => {
                     css={FieldStyle}
                   >
                     <FormLabel>Description</FormLabel>
-                    <Textarea {...field} />
+                    <MDEditor
+                      value={field.value}
+                      onChange={(value) => setFieldValue("description", value)}
+                    />
                     <FormErrorMessage>{meta.error}</FormErrorMessage>
                   </FormControl>
                 )}
diff --git a/apps/blueprints/src/pages/user/blueprint/[blueprintId].tsx b/apps/blueprints/src/pages/user/blueprint/[blueprintId].tsx
index 2db0bcb..c239bf3 100644
--- a/apps/blueprints/src/pages/user/blueprint/[blueprintId].tsx
+++ b/apps/blueprints/src/pages/user/blueprint/[blueprintId].tsx
@@ -28,6 +28,7 @@ import { validateBlueprintString, validateRequired } from "../../../utils/valida
 import { ImageEditor } from "../../../components/ImageEditor";
 import { Select } from "../../../components/Select";
 import { Button } from "../../../components/Button";
+import { MDEditor } from "../../../components/MDEditor";
 
 const FieldStyle = css`
   margin-bottom: 1rem;
@@ -123,7 +124,10 @@ const FormContent: React.FC<{ initialString: string }> = ({ initialString }) =>
                 css={FieldStyle}
               >
                 <FormLabel>Description</FormLabel>
-                <Textarea {...field} />
+                <MDEditor
+                  value={field.value}
+                  onChange={(value) => setFieldValue("description", value)}
+                />
                 <FormErrorMessage>{meta.error}</FormErrorMessage>
               </FormControl>
             )}
diff --git a/package.json b/package.json
index 1e1487c..a574e26 100644
--- a/package.json
+++ b/package.json
@@ -61,6 +61,7 @@
     "react-map-interaction": "file:.yalc/react-map-interaction",
     "react-markdown": "5.0.3",
     "react-multi-select-component": "4.0.0",
+    "react-simplemde-editor": "4.1.3",
     "sharp": "0.28.0",
     "ws": "7.4.4"
   },
diff --git a/yarn.lock b/yarn.lock
index 79c0745..6e405ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4225,6 +4225,13 @@
   resolved "https://registry.yarnpkg.com/@types/bcrypt/-/bcrypt-3.0.0.tgz#851489a9065a067cb7f3c9cbe4ce9bed8bba0876"
   integrity sha512-nohgNyv+1ViVcubKBh0+XiNJ3dO8nYu///9aJ4cgSqv70gBL+94SNy/iC2NLzKPT2Zt/QavrOkBVbZRLZmw6NQ==
 
+"@types/codemirror@^0.0.88":
+  version "0.0.88"
+  resolved "https://registry.yarnpkg.com/@types/codemirror/-/codemirror-0.0.88.tgz#429e3462ce22865dc40cc1cb27862edaeda0bbab"
+  integrity sha512-FI9BvlO+SIEmKoIdrS9uphasiHJ/JbeUsAbVTdklBOcmnr/bQpJ6QaCw540FY98LGdDNl1Nyn7erGxo0eD2gOg==
+  dependencies:
+    "@types/tern" "*"
+
 "@types/cookie@0.4.0":
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.0.tgz#14f854c0f93d326e39da6e3b6f34f7d37513d108"
@@ -4341,6 +4348,11 @@
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
   integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
 
+"@types/marked@^0.7.4":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.7.4.tgz#607685669bb1bbde2300bc58ba43486cbbee1f0a"
+  integrity sha512-fdg0NO4qpuHWtZk6dASgsrBggY+8N4dWthl1bAQG9ceKUNKFjqpHaDKCAhRUI6y8vavG7hLSJ4YBwJtZyZEXqw==
+
 "@types/mdast@^3.0.0", "@types/mdast@^3.0.3":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/mdast/-/mdast-3.0.3.tgz#2d7d671b1cd1ea3deb306ea75036c2a0407d2deb"
@@ -4488,6 +4500,13 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
   integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
 
+"@types/tern@*":
+  version "0.23.3"
+  resolved "https://registry.yarnpkg.com/@types/tern/-/tern-0.23.3.tgz#4b54538f04a88c9ff79de1f6f94f575a7f339460"
+  integrity sha512-imDtS4TAoTcXk0g7u4kkWqedB3E4qpjXzCpD2LU5M5NAXHzCDsypyvXSaG7mM8DKYkCRa7tFp4tS/lp/Wo7Q3w==
+  dependencies:
+    "@types/estree" "*"
+
 "@types/tinycolor2@1.4.2":
   version "1.4.2"
   resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.2.tgz#721ca5c5d1a2988b4a886e35c2ffc5735b6afbdf"
@@ -6416,6 +6435,18 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
+codemirror-spell-checker@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/codemirror-spell-checker/-/codemirror-spell-checker-1.1.2.tgz#1c660f9089483ccb5113b9ba9ca19c3f4993371e"
+  integrity sha1-HGYPkIlIPMtRE7m6nKGcP0mTNx4=
+  dependencies:
+    typo-js "*"
+
+codemirror@^5.59.2:
+  version "5.60.0"
+  resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.60.0.tgz#00a8cfd287d5d8737ceb73987f04aee2fe5860da"
+  integrity sha512-AEL7LhFOlxPlCL8IdTcJDblJm8yrAGib7I+DErJPdZd4l6imx8IMgKK3RblVgBQqz3TZJR4oknQ03bz+uNjBYA==
+
 collect-v8-coverage@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz#cc2c8e94fc18bbdffe64d6534570c8a673b27f59"
@@ -7553,6 +7584,15 @@ earcut@^2.2.2:
   resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.2.tgz#41b0bc35f63e0fe80da7cddff28511e7e2e80d11"
   integrity sha512-eZoZPPJcUHnfRZ0PjLvx2qBordSiO8ofC3vt+qACLM95u+4DovnbYNpQtJh0DNsWj8RnxrQytD4WA8gj5cRIaQ==
 
+easymde@^2.10.1:
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/easymde/-/easymde-2.14.0.tgz#ba556954ec3a8084fc2984499f58945c81b689ec"
+  integrity sha512-yQh3EF1amknaxDhXE1L28kwknREU8S19o01ki0t6Q8ThECCipXTOM3E/LL32Ia5D3AsCBRbC1/fT5tpLniVGuw==
+  dependencies:
+    codemirror "^5.59.2"
+    codemirror-spell-checker "1.1.2"
+    marked "^2.0.0"
+
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -11371,6 +11411,11 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
+marked@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.1.tgz#5e7ed7009bfa5c95182e4eb696f85e948cefcee3"
+  integrity sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==
+
 maxrects-packer@^2.6.0:
   version "2.7.2"
   resolved "https://registry.yarnpkg.com/maxrects-packer/-/maxrects-packer-2.7.2.tgz#47405e62353af117bab24874896839ec4f4e48db"
@@ -13909,6 +13954,15 @@ react-remove-scroll@2.4.1:
     use-callback-ref "^1.2.3"
     use-sidecar "^1.0.1"
 
+react-simplemde-editor@4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/react-simplemde-editor/-/react-simplemde-editor-4.1.3.tgz#e3f5eba988817035c5aa1cae8f1a9d5dfec6081a"
+  integrity sha512-MJ3SDYfYsNnEcmLzQCqPERDaarllwbxR06oyOQ+jJn0517HYIcQCfFoOIT4uewRY14g05n/Ux1Nka88Bocrdcg==
+  dependencies:
+    "@types/codemirror" "^0.0.88"
+    "@types/marked" "^0.7.4"
+    easymde "^2.10.1"
+
 react-style-singleton@^2.1.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/react-style-singleton/-/react-style-singleton-2.1.1.tgz#ce7f90b67618be2b6b94902a30aaea152ce52e66"
@@ -16145,6 +16199,11 @@ typescript@4.2.3:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.3.tgz#39062d8019912d43726298f09493d598048c1ce3"
   integrity sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
 
+typo-js@*:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/typo-js/-/typo-js-1.2.0.tgz#dbe58de3a6dcbbe260b78bf290ee761b008a28e8"
+  integrity sha512-dELuLBVa2jvWdU/CHTKi2L/POYaRupv942k+vRsFXsM17acXesQGAiGCio82RW7fvcr7bkuD/Zj8XpUh6aPC2A==
+
 unbox-primitive@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"

From e8e88101ababdfd207d8e53253c9aad18b51564b Mon Sep 17 00:00:00 2001
From: Bart <barthuijgen@users.noreply.github.com>
Date: Fri, 2 Apr 2021 14:35:35 +0200
Subject: [PATCH 2/3] Add cloudflare web analytics

---
 .github/workflows/deploy_dev.yml   | 4 +++-
 apps/blueprints/next.config.js     | 3 ++-
 apps/blueprints/src/pages/_app.tsx | 9 ++++++++-
 apps/blueprints/src/utils/env.ts   | 3 ++-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/deploy_dev.yml b/.github/workflows/deploy_dev.yml
index c47b12b..f9bdcbb 100644
--- a/.github/workflows/deploy_dev.yml
+++ b/.github/workflows/deploy_dev.yml
@@ -27,6 +27,8 @@ jobs:
       - run: yarn
       - run: yarn db-gen
       - run: yarn nx build blueprints
+        env:
+          CF_WEB_ANALYTICS: 6c563c1e5db141129a5fc95d5c459722
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@master
         with:
@@ -42,4 +44,4 @@ jobs:
           push: true
           tags: eu.gcr.io/factorio-sites/blueprints:dev
       - run: gsutil -h "Cache-Control:public, max-age=31536000" -m rsync -r -d ./dist/apps/blueprints/.next/static gs://factorio-blueprints-assets/dev/_next/static
-      - run: gcloud run deploy factorio-blueprints-dev --image=eu.gcr.io/factorio-sites/blueprints:dev --platform managed --region=europe-west4 --remove-env-vars PUBLIC_URL --update-env-vars ASSET_PREFIX=https://storage.googleapis.com/factorio-blueprints-assets/dev
+      - run: gcloud run deploy factorio-blueprints-dev --image=eu.gcr.io/factorio-sites/blueprints:dev --platform managed --region=europe-west4 --remove-env-vars PUBLIC_URL --update-env-vars ASSET_PREFIX=https://storage.googleapis.com/factorio-blueprints-assets/dev,CF_WEB_ANALYTICS=6c563c1e5db141129a5fc95d5c459722
diff --git a/apps/blueprints/next.config.js b/apps/blueprints/next.config.js
index 52da61d..8c43b8c 100644
--- a/apps/blueprints/next.config.js
+++ b/apps/blueprints/next.config.js
@@ -8,7 +8,8 @@ module.exports = {
   reactStrictMode: true,
   assetPrefix: process.env.ASSET_PREFIX ? process.env.ASSET_PREFIX : "",
   publicRuntimeConfig: {
-    PUBLIC_URL: process.env.PUBLIC_URL || "",
+    PUBLIC_URL: process.env.PUBLIC_URL,
+    CF_WEB_ANALYTICS: process.env.CF_WEB_ANALYTICS,
   },
   webpack(config, options) {
     const { dev, isServer } = options;
diff --git a/apps/blueprints/src/pages/_app.tsx b/apps/blueprints/src/pages/_app.tsx
index 76d0a04..13a92f1 100644
--- a/apps/blueprints/src/pages/_app.tsx
+++ b/apps/blueprints/src/pages/_app.tsx
@@ -9,7 +9,7 @@ import { getSessionToken } from "@factorio-sites/node-utils";
 import { Header } from "../components/Header";
 import { AuthContext, AuthContextProps } from "../providers/auth";
 import { useFetch } from "../hooks/fetch";
-import { PUBLIC_URL } from "../utils/env";
+import { CF_WEB_ANALYTICS, PUBLIC_URL } from "../utils/env";
 
 const globalStyles = css`
   @font-face {
@@ -95,6 +95,13 @@ const BlueprintsApp = ({
               </main>
             </>
           )}
+          {CF_WEB_ANALYTICS && (
+            <script
+              defer
+              src="https://static.cloudflareinsights.com/beacon.min.js"
+              data-cf-beacon={`{"token": "${CF_WEB_ANALYTICS}"}`}
+            ></script>
+          )}
         </AuthContext.Provider>
       </CookiesProvider>
     </ChakraProvider>
diff --git a/apps/blueprints/src/utils/env.ts b/apps/blueprints/src/utils/env.ts
index aee97a3..e7c92bd 100644
--- a/apps/blueprints/src/utils/env.ts
+++ b/apps/blueprints/src/utils/env.ts
@@ -1,4 +1,5 @@
 import getConfig from "next/config";
 const { publicRuntimeConfig } = getConfig();
 
-export const PUBLIC_URL = publicRuntimeConfig.PUBLIC_URL as string;
+export const PUBLIC_URL = (publicRuntimeConfig.PUBLIC_URL as string) || "";
+export const CF_WEB_ANALYTICS = (publicRuntimeConfig.CF_WEB_ANALYTICS as string) || null;

From 71a3d6a887719ca237f6bc9e993080d21d44fbd9 Mon Sep 17 00:00:00 2001
From: Bart <barthuijgen@users.noreply.github.com>
Date: Fri, 2 Apr 2021 15:17:44 +0200
Subject: [PATCH 3/3] Add cloudflare web analytics for prd

---
 .github/workflows/deploy_prd.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/deploy_prd.yml b/.github/workflows/deploy_prd.yml
index 783aefb..0b6f8de 100644
--- a/.github/workflows/deploy_prd.yml
+++ b/.github/workflows/deploy_prd.yml
@@ -29,6 +29,7 @@ jobs:
       - run: yarn nx build blueprints
         env:
           PUBLIC_URL: https://storage.googleapis.com/factorio-blueprints-assets/public
+          CF_WEB_ANALYTICS: 4a7b06ea5bdb4d328a1baea602aea295
       - name: Set up Cloud SDK
         uses: google-github-actions/setup-gcloud@master
         with:
@@ -45,4 +46,4 @@ jobs:
           tags: eu.gcr.io/factorio-sites/blueprints
       - run: gsutil -h "Cache-Control:public, max-age=31536000" -m rsync -r -d ./dist/apps/blueprints/.next/static gs://factorio-blueprints-assets/_next/static
       - run: gsutil -h "Cache-Control:public, max-age=31536000" -m rsync -r -d ./dist/apps/blueprints/public gs://factorio-blueprints-assets/public
-      - run: gcloud run deploy factorio-blueprints --image=eu.gcr.io/factorio-sites/blueprints --platform managed --region=europe-west4 --update-env-vars PUBLIC_URL=https://storage.googleapis.com/factorio-blueprints-assets/public,ASSET_PREFIX=https://storage.googleapis.com/factorio-blueprints-assets
+      - run: gcloud run deploy factorio-blueprints --image=eu.gcr.io/factorio-sites/blueprints --platform managed --region=europe-west4 --update-env-vars PUBLIC_URL=https://storage.googleapis.com/factorio-blueprints-assets/public,ASSET_PREFIX=https://storage.googleapis.com/factorio-blueprints-assets,CF_WEB_ANALYTICS=4a7b06ea5bdb4d328a1baea602aea295