Merge branch 'develop' into develop

Author: jwklong

.github/workflows/node.js.yml

@@ -36,7 +36,7 @@ jobs:
   deploy:
     environment:
       name: github-pages
-      url: 'https://penguinmod.com/project'
+      url: 'https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/project'
     runs-on: ubuntu-latest
     needs: build
     steps:

README.md

@@ -1,4 +1,4 @@
-scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://studio.penguinmod.com) 😀
+scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://jwklong.github.io/penguinmod.github.io) 😀
 [![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/PenguinMod/penguinmod.github.io/)
 ## Setup
 

package-lock.json

@@ -29,7 +29,6 @@
   },
   "dependencies": {
     "@turbowarp/scratch-l10n": "^3.1000.20230326022803",
-    "PenguinMod-MarkDown": "github:PenguinMod/PenguinMod-MarkDown#master",
     "arraybuffer-loader": "^1.0.8",
     "autoprefixer": "^9.8.8",
     "base64-loader": "1.0.0",
@@ -56,15 +55,17 @@
     "minilog": "3.1.0",
     "omggif": "1.0.9",
     "papaparse": "5.3.0",
+    "PenguinMod-MarkDown": "github:PenguinMod/PenguinMod-MarkDown#master",
     "postcss-import": "^12.0.1",
     "postcss-loader": "^3.0.0",
     "postcss-simple-vars": "^5.0.2",
     "prop-types": "^15.8.1",
+    "protobufjs": "^7.3.2",
     "query-string": "^5.1.1",
     "raw-loader": "^0.5.1",
-    "react": "^16.14.0",
+    "react": "^16.0.0",
     "react-contextmenu": "2.9.4",
-    "react-dom": "^16.14.0",
+    "react-dom": "^16.0.0",
     "react-draggable": "3.0.5",
     "react-ga": "2.5.3",
     "react-intl": "2.9.0",

package.json

@@ -13,7 +13,7 @@ const manifest = {
     },
     {
       "name": "JeremyGamer13",
-      "link": "https://penguinmod.com/profile?user=JGamerTesting"
+      "link": "https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/profile?user=JGamerTesting"
     }
   ],
   "dynamicDisable": true,

src/addons/addons/block-switching/_manifest_entry.js

@@ -31,7 +31,7 @@ const ActualAuthorInfo = ({
             </h1>
             <div>
                 <span className={styles.usernameLine}>
-                    <a style={{ color: "white" }} target="_blank" href={"https://penguinmod.com/profile?user=" + username}>
+                    <a style={{ color: "white" }} target="_blank" href={"https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/profile?user=" + username}>
                         <FormattedMessage
                             defaultMessage="by {username}"
                             description="Shows that a project was created by this user"

src/components/menu-bar/author-info.jsx

@@ -922,7 +922,7 @@ class MenuBar extends React.Component {
                     <div className={styles.menuBarItem}>
                         <a
                             className={styles.feedbackLink}
-                            href="https://penguinmod.com"
+                            href="https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app"
                             rel="noopener noreferrer"
                             target="_blank"
                         >

src/components/menu-bar/menu-bar.jsx

@@ -28,12 +28,12 @@ const getProjectUri = () => new Promise(resolve => {
 const isUploadAvailable = async () => {
     let res = null;
     try {
-        res = await fetch('https://projects.penguinmod.com/api');
+        res = await fetch('https://projects.penguinmod.com/api/v1/projects/canuploadprojects').then(res => res.json());
     } catch {
         // failed to fetch entirely
         return false;
     }
-    return res.ok;
+    return res.canUpload;
 };
 
 class ShareButton extends React.Component {
@@ -60,8 +60,8 @@ class ShareButton extends React.Component {
         this.handleMessageEvent(e);
     }
     async handleMessageEvent(e) {
-        if (!e.origin.startsWith(`https://penguinmod.com`)) {
-            return;
+        if (!e.origin.startsWith(`https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app`)) {
+            //return; // BTODO: uncomment this line for prod (also change the link)
         }
 
         if (!e.data.p4) {
@@ -148,7 +148,7 @@ class ShareButton extends React.Component {
             }
 
             const url = location.origin;
-            window.open(`https://penguinmod.com/${targetPage}?name=${this.props.projectTitle}${editPiece}${remixPiece}&external=${url}`, '_blank');
+            window.open(`https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/${targetPage}?name=${this.props.projectTitle}${editPiece}${remixPiece}&external=${url}`, '_blank');
         });
     }
     render() {