Merge pull request #1 from jwklong/new-api-integration

just,,, ingetragte

Author: jwklong

src/components/menu-bar/share-button.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,7 +60,7 @@ class ShareButton extends React.Component {
         this.handleMessageEvent(e);
     }
     async handleMessageEvent(e) {
-        if (!e.origin.startsWith(`https://penguinmod.com`)) {
+        if (!e.origin.startsWith(`https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/`)) {
             return;
         }
 
@@ -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() {

src/components/tw-studioview/studioview.js

@@ -11,8 +11,7 @@ import classNames from 'classnames';
 /**
  * @class
  */
-var StudioView = function (studioId) {
-    this.studioId = studioId;
+var StudioView = function () {
     this.offset = 0;
     this.ended = false;
     this.loadingPage = false;
@@ -243,7 +242,7 @@ StudioView.prototype.loadNextPage = function () {
     var xhr = new XMLHttpRequest();
     xhr.responseType = 'json';
     xhr.onload = function () {
-        var rawProjects = xhr.response.projects;
+        var rawProjects = xhr.response;
         if (!Array.isArray(rawProjects)) {
             xhr.onerror();
             return;
@@ -253,7 +252,7 @@ StudioView.prototype.loadNextPage = function () {
             var p = rawProjects[i];
             projects.push({
                 id: p.id,
-                title: p.name,
+                title: p.title,
                 author: p.author.username,
                 featured: p.featured,
             });
@@ -287,7 +286,7 @@ StudioView.prototype.loadNextPage = function () {
         this.ended = true;
     }.bind(this);
 
-    var url = StudioView.STUDIO_API + "/pmWrapper/projects"
+    var url = StudioView.STUDIO_API + "/projects/getprojects"
     xhr.open('GET', url);
     xhr.send();
 };
@@ -300,11 +299,11 @@ StudioView.prototype.onselect = function (id, el) { };
 StudioView.prototype.onpageload = function () { };
 StudioView.prototype.onend = function () { };
 
-StudioView.STUDIO_API = 'https://projects.penguinmod.com/api';
+StudioView.STUDIO_API = 'https://projects.penguinmod.com/api/v1';
 
 // The URL to download thumbnails from.
 // $id is replaced with the project's ID.
-StudioView.THUMBNAIL_SRC = 'https://projects.penguinmod.com/api/pmWrapper/iconUrl?id=$id';
+StudioView.THUMBNAIL_SRC = 'https://projects.penguinmod.com/api/v1/projects/getproject?projectID=$id&requestType=thumbnail';
 
 // The URL for project pages.
 // $id is replaced with the project ID.

src/components/tw-studioview/studioview.jsx

@@ -34,7 +34,7 @@ class StudioViewComponent extends React.Component {
         ]);
     }
     componentDidMount () {
-        this.studioView = new StudioView(this.props.id);
+        this.studioView = new StudioView();
         this.studioView.messages.AUTHOR_ATTRIBUTION = this.props.intl.formatMessage(messages.authorAttribution, {
             // studioview uses $-based variables
             author: '$author'
@@ -77,7 +77,6 @@ class StudioViewComponent extends React.Component {
 }
 
 StudioViewComponent.propTypes = {
-    id: PropTypes.string.isRequired,
     intl: intlShape.isRequired,
     placeholder: PropTypes.bool,
     onSelect: PropTypes.func.isRequired

src/containers/home-communication.jsx

@@ -5,7 +5,7 @@ import {connect} from 'react-redux';
 import {setUsername, setUsernameInvalid, setUsernameLoggedIn} from '../reducers/tw';
 
 let origin = "https://penguinmod.com";
-// origin = 'http://localhost:5173';
+// origin = 'https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/';
 
 class HomeCommunication extends React.Component {
     constructor (props) {

src/containers/tw-security-manager.jsx

@@ -34,7 +34,7 @@ const isTrustedExtension = url => (
     url.startsWith('http://localhost:8000') ||
     url.startsWith('http://localhost:6000') || // Launcher Home
     url.startsWith('http://localhost:6001') || // Launcher Extensions
-    url.startsWith('http://localhost:5173') || // Local Home or Extensions
+    url.startsWith('https://penguinmod-home-git-new-backend-live-penguinmod.vercel.app/') || // Local Home or Extensions
     url.startsWith('http://localhost:5174') || // Local Home or Extensions
 
     extensionsTrustedByUser.has(url)