Skip to content

Commit cef1a97

Browse files
committed
Revert "Merge branch 'develop' into develop"
This reverts commit cc3bbb7, reversing changes made to 1565bdc.
1 parent cc3bbb7 commit cef1a97

29 files changed

+116
-1650
lines changed

.github/workflows/node.js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
deploy:
3737
environment:
3838
name: github-pages
39-
url: 'https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/project'
39+
url: 'https://penguinmod.com/project'
4040
runs-on: ubuntu-latest
4141
needs: build
4242
steps:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://jwklong.github.io/penguinmod.github.io) 😀
1+
scratch-gui modified for use in [TurboWarp](https://turbowarp.org/) then modified for use in [PenguinMod](https://studio.penguinmod.com) 😀
22
[![Open in Gitpod](https://gitpod.io/button/open-in-gitpod.svg)](https://gitpod.io/#https://github.com/PenguinMod/penguinmod.github.io/)
33
## Setup
44

package-lock.json

Lines changed: 3 additions & 207 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
},
3030
"dependencies": {
3131
"@turbowarp/scratch-l10n": "^3.1000.20230326022803",
32+
"PenguinMod-MarkDown": "github:PenguinMod/PenguinMod-MarkDown#master",
3233
"arraybuffer-loader": "^1.0.8",
3334
"autoprefixer": "^9.8.8",
3435
"base64-loader": "1.0.0",
@@ -55,17 +56,15 @@
5556
"minilog": "3.1.0",
5657
"omggif": "1.0.9",
5758
"papaparse": "5.3.0",
58-
"PenguinMod-MarkDown": "github:PenguinMod/PenguinMod-MarkDown#master",
5959
"postcss-import": "^12.0.1",
6060
"postcss-loader": "^3.0.0",
6161
"postcss-simple-vars": "^5.0.2",
6262
"prop-types": "^15.8.1",
63-
"protobufjs": "^7.3.2",
6463
"query-string": "^5.1.1",
6564
"raw-loader": "^0.5.1",
66-
"react": "^16.0.0",
65+
"react": "^16.14.0",
6766
"react-contextmenu": "2.9.4",
68-
"react-dom": "^16.0.0",
67+
"react-dom": "^16.14.0",
6968
"react-draggable": "3.0.5",
7069
"react-ga": "2.5.3",
7170
"react-intl": "2.9.0",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const manifest = {
1313
},
1414
{
1515
"name": "JeremyGamer13",
16-
"link": "https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/profile?user=JGamerTesting"
16+
"link": "https://penguinmod.com/profile?user=JGamerTesting"
1717
}
1818
],
1919
"dynamicDisable": true,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const ActualAuthorInfo = ({
3131
</h1>
3232
<div>
3333
<span className={styles.usernameLine}>
34-
<a style={{ color: "white" }} target="_blank" href={"https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/profile?user=" + username}>
34+
<a style={{ color: "white" }} target="_blank" href={"https://penguinmod.com/profile?user=" + username}>
3535
<FormattedMessage
3636
defaultMessage="by {username}"
3737
description="Shows that a project was created by this user"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -922,7 +922,7 @@ class MenuBar extends React.Component {
922922
<div className={styles.menuBarItem}>
923923
<a
924924
className={styles.feedbackLink}
925-
href="https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app"
925+
href="https://penguinmod.com"
926926
rel="noopener noreferrer"
927927
target="_blank"
928928
>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ const getProjectUri = () => new Promise(resolve => {
2828
const isUploadAvailable = async () => {
2929
let res = null;
3030
try {
31-
res = await fetch('https://projects.penguinmod.com/api/v1/projects/canuploadprojects').then(res => res.json());
31+
res = await fetch('https://projects.penguinmod.com/api');
3232
} catch {
3333
// failed to fetch entirely
3434
return false;
3535
}
36-
return res.canUpload;
36+
return res.ok;
3737
};
3838

3939
class ShareButton extends React.Component {
@@ -60,8 +60,8 @@ class ShareButton extends React.Component {
6060
this.handleMessageEvent(e);
6161
}
6262
async handleMessageEvent(e) {
63-
if (!e.origin.startsWith(`https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app`)) {
64-
//return; // BTODO: uncomment this line for prod (also change the link)
63+
if (!e.origin.startsWith(`https://penguinmod.com`)) {
64+
return;
6565
}
6666

6767
if (!e.data.p4) {
@@ -148,7 +148,7 @@ class ShareButton extends React.Component {
148148
}
149149

150150
const url = location.origin;
151-
window.open(`https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/${targetPage}?name=${this.props.projectTitle}${editPiece}${remixPiece}&external=${url}`, '_blank');
151+
window.open(`https://penguinmod.com/${targetPage}?name=${this.props.projectTitle}${editPiece}${remixPiece}&external=${url}`, '_blank');
152152
});
153153
}
154154
render() {

0 commit comments

Comments
 (0)