🧛🏻‍♂️🐦 ↝ Fixing merge conflicts in #47

Signal-K · Jun 11, 2023 · d68321a · d68321a
2 parents dc33f5b + a09b028
commit d68321a
Show file tree

Hide file tree

Showing 79 changed files with 846 additions and 65 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/components/Gameplay/Planets/Unity/StreamingAssets/UnityServicesProjectConfiguration.json b/components/Gameplay/Planets/Unity/StreamingAssets/UnityServicesProjectConfiguration.json
@@ -0,0 +1 @@
+{"Keys":["com.unity.services.core.version"],"Values":[{"m_Value":"1.4.0","m_IsReadOnly":true}]}
diff --git a/components/Gameplay/Planets/Unity/TemplateData/favicon.ico b/components/Gameplay/Planets/Unity/TemplateData/favicon.ico
diff --git a/components/Gameplay/Planets/Unity/TemplateData/fullscreen-button.png b/components/Gameplay/Planets/Unity/TemplateData/fullscreen-button.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/progress-bar-empty-dark.png b/components/Gameplay/Planets/Unity/TemplateData/progress-bar-empty-dark.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/progress-bar-empty-light.png b/components/Gameplay/Planets/Unity/TemplateData/progress-bar-empty-light.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/progress-bar-full-dark.png b/components/Gameplay/Planets/Unity/TemplateData/progress-bar-full-dark.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/progress-bar-full-light.png b/components/Gameplay/Planets/Unity/TemplateData/progress-bar-full-light.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/style.css b/components/Gameplay/Planets/Unity/TemplateData/style.css
@@ -0,0 +1,16 @@
+body { padding: 0; margin: 0 }
+#unity-container { position: absolute }
+#unity-container.unity-desktop { left: 50%; top: 50%; transform: translate(-50%, -50%) }
+#unity-container.unity-mobile { width: 100%; height: 100% }
+#unity-canvas { background: #231F20 }
+.unity-mobile #unity-canvas { width: 100%; height: 100% }
+#unity-loading-bar { position: absolute; left: 50%; top: 50%; transform: translate(-50%, -50%); display: none }
+#unity-logo { width: 154px; height: 130px; background: url('unity-logo-dark.png') no-repeat center }
+#unity-progress-bar-empty { width: 141px; height: 18px; margin-top: 10px; margin-left: 6.5px; background: url('progress-bar-empty-dark.png') no-repeat center }
+#unity-progress-bar-full { width: 0%; height: 18px; margin-top: 10px; background: url('progress-bar-full-dark.png') no-repeat center }
+#unity-footer { position: relative }
+.unity-mobile #unity-footer { display: none }
+#unity-webgl-logo { float:left; width: 204px; height: 38px; background: url('webgl-logo.png') no-repeat center }
+#unity-build-title { float: right; margin-right: 10px; line-height: 38px; font-family: arial; font-size: 18px }
+#unity-fullscreen-button { float: right; width: 38px; height: 38px; background: url('fullscreen-button.png') no-repeat center }
+#unity-warning { position: absolute; left: 50%; top: 5%; transform: translate(-50%); background: white; padding: 10px; display: none }
diff --git a/components/Gameplay/Planets/Unity/TemplateData/unity-logo-dark.png b/components/Gameplay/Planets/Unity/TemplateData/unity-logo-dark.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/unity-logo-light.png b/components/Gameplay/Planets/Unity/TemplateData/unity-logo-light.png
diff --git a/components/Gameplay/Planets/Unity/TemplateData/webgl-logo.png b/components/Gameplay/Planets/Unity/TemplateData/webgl-logo.png
diff --git a/components/Gameplay/Planets/Unity/index.html b/components/Gameplay/Planets/Unity/index.html
@@ -0,0 +1,121 @@
+<!DOCTYPE html>
+<html lang="en-us">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+    <title>Unity WebGL Player | Low Poly Procedural Planets</title>
+    <link rel="shortcut icon" href="TemplateData/favicon.ico">
+    <link rel="stylesheet" href="TemplateData/style.css">
+  </head>
+  <body>
+    <div id="unity-container" class="unity-desktop">
+      <canvas id="unity-canvas" width=960 height=600></canvas>
+      <div id="unity-loading-bar">
+        <div id="unity-logo"></div>
+        <div id="unity-progress-bar-empty">
+          <div id="unity-progress-bar-full"></div>
+        </div>
+      </div>
+      <div id="unity-warning"> </div>
+      <div id="unity-footer">
+        <div id="unity-webgl-logo"></div>
+        <div id="unity-fullscreen-button"></div>
+        <div id="unity-build-title">Low Poly Procedural Planets</div>
+      </div>
+    </div>
+    <script>
+      var container = document.querySelector("#unity-container");
+      var canvas = document.querySelector("#unity-canvas");
+      var loadingBar = document.querySelector("#unity-loading-bar");
+      var progressBarFull = document.querySelector("#unity-progress-bar-full");
+      var fullscreenButton = document.querySelector("#unity-fullscreen-button");
+      var warningBanner = document.querySelector("#unity-warning");
+
+      // Shows a temporary message banner/ribbon for a few seconds, or
+      // a permanent error message on top of the canvas if type=='error'.
+      // If type=='warning', a yellow highlight color is used.
+      // Modify or remove this function to customize the visually presented
+      // way that non-critical warnings and error messages are presented to the
+      // user.
+      function unityShowBanner(msg, type) {
+        function updateBannerVisibility() {
+          warningBanner.style.display = warningBanner.children.length ? 'block' : 'none';
+        }
+        var div = document.createElement('div');
+        div.innerHTML = msg;
+        warningBanner.appendChild(div);
+        if (type == 'error') div.style = 'background: red; padding: 10px;';
+        else {
+          if (type == 'warning') div.style = 'background: yellow; padding: 10px;';
+          setTimeout(function() {
+            warningBanner.removeChild(div);
+            updateBannerVisibility();
+          }, 5000);
+        }
+        updateBannerVisibility();
+      }
+
+      var buildUrl = "Build";
+      var loaderUrl = buildUrl + "/Webgl2.loader.js";
+      var config = {
+        dataUrl: buildUrl + "/Webgl2.data.gz",
+        frameworkUrl: buildUrl + "/Webgl2.framework.js.gz",
+        codeUrl: buildUrl + "/Webgl2.wasm.gz",
+        streamingAssetsUrl: "StreamingAssets",
+        companyName: "DefaultCompany",
+        productName: "Low Poly Procedural Planets",
+        productVersion: "0.1",
+        showBanner: unityShowBanner,
+      };
+
+      // By default Unity keeps WebGL canvas render target size matched with
+      // the DOM size of the canvas element (scaled by window.devicePixelRatio)
+      // Set this to false if you want to decouple this synchronization from
+      // happening inside the engine, and you would instead like to size up
+      // the canvas DOM size and WebGL render target sizes yourself.
+      // config.matchWebGLToCanvasSize = false;
+
+      if (/iPhone|iPad|iPod|Android/i.test(navigator.userAgent)) {
+        // Mobile device style: fill the whole browser client area with the game canvas:
+
+        var meta = document.createElement('meta');
+        meta.name = 'viewport';
+        meta.content = 'width=device-width, height=device-height, initial-scale=1.0, user-scalable=no, shrink-to-fit=yes';
+        document.getElementsByTagName('head')[0].appendChild(meta);
+        container.className = "unity-mobile";
+
+        // To lower canvas resolution on mobile devices to gain some
+        // performance, uncomment the following line:
+        // config.devicePixelRatio = 1;
+
+        canvas.style.width = window.innerWidth + 'px';
+        canvas.style.height = window.innerHeight + 'px';
+
+        unityShowBanner('WebGL builds are not supported on mobile devices.');
+      } else {
+        // Desktop style: Render the game canvas in a window that can be maximized to fullscreen:
+
+        canvas.style.width = "960px";
+        canvas.style.height = "600px";
+      }
+
+      loadingBar.style.display = "block";
+
+      var script = document.createElement("script");
+      script.src = loaderUrl;
+      script.onload = () => {
+        createUnityInstance(canvas, config, (progress) => {
+          progressBarFull.style.width = 100 * progress + "%";
+        }).then((unityInstance) => {
+          loadingBar.style.display = "none";
+          fullscreenButton.onclick = () => {
+            unityInstance.SetFullscreen(1);
+          };
+        }).catch((message) => {
+          alert(message);
+        });
+      };
+      document.body.appendChild(script);
+    </script>
+  </body>
+</html>
diff --git a/components/Gameplay/Planets/Unity/lod1/Build.tsx b/components/Gameplay/Planets/Unity/lod1/Build.tsx
@@ -0,0 +1,20 @@
+import React from "react";
+import { Unity, useUnityContext } from 'react-unity-webgl';
+
+export default function UnityBuildLod1 () {
+    const { unityProvider } = useUnityContext({
+        // loaderUrl: '/Unity/LOD1/Build/Webgl.loader.js',
+        // dataUrl: '/Unity/LOD1/Build/Webgl.data.gz',
+        // frameworkUrl: '/Unity/LOD1/Build/Webgl.framework.js.gz',
+        // codeUrl: '/Unity/LOD1/Build/Webgl.wasm.gz',
+        loaderUrl: "/assets/LOD2.loader.js",
+        dataUrl: "/assets/LOD2.data",
+        frameworkUrl: "/assets/LOD2.framework.js",
+        codeUrl: "/assets/LOD2.wasm",
+    });
+
+    return <Unity unityProvider={unityProvider} />
+    // return (
+    //     <iframe src='Unity/index.html' height='1000px' width='1000px' />
+    // )
+}
diff --git a/components/Planet/PlanetCard.tsx b/components/Planet/PlanetCard.tsx
@@ -0,0 +1,49 @@
+import React, { useEffect, useState } from "react";
+import Card from "../Card";
+import { useSupabaseClient } from "@supabase/auth-helpers-react";
+import SocialGraphHomeNoSidebar from "../../pages/posts";
+
+export default function PlanetContent ({ activeTab, planetId }) {
+    const supabase = useSupabaseClient();
+
+    const [planetPosts, setPlanetPosts] = useState([]);
+    const [planet, setPlanet] = useState(null);
+
+    useEffect(() => {
+        if (!planetId) { return; };
+        getPlanetData(planetId);
+        console.log(planetId);
+    })
+
+    async function loadPlanet () {
+        //
+    }
+
+    async function getPlanetPosts ( planetId ) {
+        const { data, error } = await supabase.from('posts_duplicate')
+            .select('*')
+            .order('created_at', { ascending: false })
+            .eq('planets2', planetId)
+        return data;
+
+        if (error) {
+            console.error(error);
+            return [];
+        }
+    };
+
+    async function getPlanetData ( planetId ) {
+        const { data } = await supabase.from('planetsss')
+            .select()
+            .eq('id', planetId);
+        return data[0];
+    };
+
+    return (
+        <div>
+            { planetPosts?.length > 0 && planetPosts.map(planetPost => (
+                <SocialGraphHomeNoSidebar key = { planetPost.id } {...planetPost} planets2 = {planetId} />
+            ))}
+        </div>
+    )
+}
diff --git a/components/Posts/ProfileCard.jsx b/components/Posts/ProfileCard.jsx
@@ -73,9 +73,9 @@ export function ProfileContent ({ activeTab, userId }) {
             {activeTab === 'about' && (
                 <div>
                     <Card noPadding={false}>
-                    <h2 className="text-3xl mb-2">About me</h2>
-                    <p className="mb-2 text-sm">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aut doloremque harum maxime mollitia perferendis praesentium quaerat. Adipisci, delectus eum fugiat incidunt iusto molestiae nesciunt odio porro quae quaerat, reprehenderit, sed.</p>
-                    <p className="mb-2 text-sm">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet assumenda error necessitatibus nesciunt quas quidem quisquam reiciendis, similique. Amet consequuntur facilis iste iure minima nisi non praesentium ratione voluptas voluptatem?</p>
+                        <h2 className="text-3xl mb-2">About me</h2>
+                        <p className="mb-2 text-sm">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Aut doloremque harum maxime mollitia perferendis praesentium quaerat. Adipisci, delectus eum fugiat incidunt iusto molestiae nesciunt odio porro quae quaerat, reprehenderit, sed.</p>
+                        <p className="mb-2 text-sm">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Amet assumenda error necessitatibus nesciunt quas quidem quisquam reiciendis, similique. Amet consequuntur facilis iste iure minima nisi non praesentium ratione voluptas voluptatem?</p>
                     </Card>
                 </div>
             )}

diff --git a/package.json b/package.json
@@ -139,4 +139,4 @@
     "typechain": "8.1.1",
     "typescript": "4.9.4"
   }
-}
+}
diff --git a/pages/feed.tsx b/pages/feed.tsx
@@ -1,6 +1,6 @@
 import React from "react";
 import CoreLayout from "../components/Core/Layout";
-import { SocialGraphHomeNoSidebar } from "./posts";
+import SocialGraphHomeNoSidebar from "./posts";
 
 import { useSession } from "@supabase/auth-helpers-react";
 

diff --git a/pages/index.tsx b/pages/index.tsx
@@ -3,7 +3,7 @@ import Link from "next/link";
 import React, { useEffect, useState } from "react";
 import CoreLayout from "../components/Core/Layout";
 import UserOnboarding from "../components/onboarding";
-import { SocialGraphHomeModal, SocialGraphHomeNoSidebar } from "./posts";
+import SocialGraphHomeNoSidebar, { SocialGraphHomeModal } from "./posts";
 import Db from "./tests/db";
 import { Database } from "../utils/database.types";
 import AccountAvatar, { AccountAvatarV1, AccountAvatarV2 } from "../components/AccountAvatar";

diff --git a/pages/login/index.tsx b/pages/login/index.tsx
@@ -1,7 +1,7 @@
 import { Auth, ThemeSupa } from '@supabase/auth-ui-react';
 import React from 'react';
 import { useSession, useSupabaseClient } from '@supabase/auth-helpers-react';
-import SocialGraphHome from '../posts';
+import { SocialGraphHomeModal } from '../posts';
 
 const Login = () => {
     const session = useSession();
@@ -13,7 +13,8 @@ const Login = () => {
                 // <><SocialGraphHome />
                 <div className='w-80%'><Auth supabaseClient={supabase} appearance={{ theme: ThemeSupa}} theme='dark' /></div>//</>
             ) : (
-                <SocialGraphHome />
+                // <SocialGraphHome />
+                <SocialGraphHomeModal />
             )}
         </div>
     );

diff --git a/pages/planet/[id].tsx b/pages/planet/[id].tsx
@@ -0,0 +1,6 @@
+import React from "react";
+import FreshPlanetPage from "./planet";
+
+export default function FreshPlanet () {
+    return <FreshPlanetPage />
+}
diff --git a/pages/planet/[id]/[...tab].tsx b/pages/planet/[id]/[...tab].tsx
@@ -0,0 +1,3 @@
+export default function PlanetFreshTab () {
+    return ('');
+}
diff --git a/pages/planet/planet.tsx b/pages/planet/planet.tsx
@@ -0,0 +1,62 @@
+import { useSession, useSupabaseClient } from "@supabase/auth-helpers-react";
+import { useRouter } from "next/router";
+import React, { useState } from "react";
+import { UserContextProvider } from "../../context/UserContext";
+import { GameplayLayout } from "../../components/Core/Layout";
+import Layout from "../../components/Layout";
+import Card from "../../components/Card";
+import PlanetAvatar from "../../components/Gameplay/Planets/PlanetAvatar";
+
+export default function FreshPlanetPage () {
+    const supabase = useSupabaseClient();
+    const session = useSession();
+
+    const [planet, setPlanet] = useState(null);
+    const router = useRouter();
+    // const tab = router?.query?.tab?.[0] || 'posts';
+    const planetId = router.query.id;
+
+    const [username, setUsername] = useState('');
+    const [temperature, setPlanetTemperature] = useState(null); // database types
+
+    function fetchPlanet () {
+        supabase.from('planetsss')
+            .select()
+            .eq('id', planetId)
+            .then(result => {
+                if (result.error) { throw result.error; };
+                if (result.data) { setPlanet(result.data[0]); };
+            }
+        )
+    }
+
+    function updatePlanet () { // Stub function -> to be added later (along with planet editor)
+        supabase.from('planetsss') // Set these values from the planet editor, then fill planet editor with these values
+        .update({
+            temperature,
+        })
+        .eq('id', planetId)
+        .then(result => {
+            if (!result.error) {
+                setPlanet(prev => ({ ...prev, temperature, }));
+            }
+        })
+    }
+
+    return (
+        <GameplayLayout>
+            <Layout hideNavigation={true}>
+                <Card noPadding={true}>
+                <div className="relative overflow-hidden rounded-md mb-5">
+                    <div className="absolute left-5">
+                        {planet && (<PlanetAvatar
+                            uid={''}
+                            url={planet?.avatar_url}
+                            size={120} /> )}
+                    </div>
+                </div>
+                </Card>
+            </Layout>
+        </GameplayLayout>
+    );
+}
diff --git a/pages/planets/planet.tsx b/pages/planets/planet.tsx
@@ -16,7 +16,7 @@ import { PlanetCard } from "../../components/Gameplay/Planets/PlanetCard";
 import { PostFormCardPlanetTag } from "../../components/PostFormCard";
 import { planetsImagesCdnAddress } from "../../constants/cdn";
 import PostCard, { PlanetPostCard } from "../../components/PostCard";
-import { SocialGraphHomeNoSidebarIndividualPlanet, SocialGraphHomeNoSidebarIndividualPlanetReturn } from "../posts";
+// import { SocialGraphHomeNoSidebarIndividualPlanet, SocialGraphHomeNoSidebarIndividualPlanetReturn } from "../posts";
 import UnityBuildLod1 from "../../components/Gameplay/Unity/Build/LOD-Rocky";
 // import PlanetEditor from "../generator/planet-editor";
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"Keys":["com.unity.services.core.version"],"Values":[{"m_Value":"1.4.0","m_IsReadOnly":true}]}
-Original file line number
+Diff line change
@@ Expand Up / @@ -139,4 +139,4 @@ @@
         "typechain": "8.1.1",
         "typescript": "4.9.4"
       }
-    }
+    }