From ae83113081a086aac0992a5dc752623451dcadf4 Mon Sep 17 00:00:00 2001
From: Maximilian Benner <maxibenner@gmail.com>
Date: Mon, 21 Jun 2021 14:28:06 +0200
Subject: [PATCH] added footer

---
 public/fotura_logo.jpg                        | Bin 0 -> 5122 bytes
 src/components/three/Viewer.js                |  14 ++---------
 .../canvasBackground/CanvasBackground.js      |   8 ------
 src/pages/studio/Studio.js                    |  13 ++++++++--
 src/pages/studio/studio.module.css            |  23 ++++++++++++++++++
 src/states/modelState.js                      |   3 ---
 6 files changed, 36 insertions(+), 25 deletions(-)
 create mode 100644 public/fotura_logo.jpg

diff --git a/public/fotura_logo.jpg b/public/fotura_logo.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..e05ae501b55541a4a4e5b0b1feacf038ed787fab
GIT binary patch
literal 5122
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

literal 0
HcmV?d00001

diff --git a/src/components/three/Viewer.js b/src/components/three/Viewer.js
index e6ed459..c870e95 100644
--- a/src/components/three/Viewer.js
+++ b/src/components/three/Viewer.js
@@ -1,4 +1,4 @@
-import { softShadows, useProgress } from "@react-three/drei"
+import { softShadows } from "@react-three/drei"
 import { Canvas, invalidate } from "@react-three/fiber"
 import { Suspense, useEffect, useState } from "react"
 import { useSpring } from "react-spring/three"
@@ -33,22 +33,12 @@ const Viewer = () => {
         decrementDecalSize,
         incrementDecalSize,
         setGl,
-        setLoadingFinished,
         set,
         backgroundImage,
     } = useStore()
     const { active, mode } = useRecorderStore()
-    const progress = useProgress()
-
-    // Set load progress
-    useEffect(() => {
-        if (progress.progress === 100) {
-            setTimeout(() => {
-                setLoadingFinished(true)
-            }, 500)
-        }
-    }, [progress])
 
+    useEffect(() => console.log(decalPath), [decalPath])
     // KEYDOWN
     useEffect(() => {
         function handlekeydownEvent(e) {
diff --git a/src/components/three/canvasBackground/CanvasBackground.js b/src/components/three/canvasBackground/CanvasBackground.js
index 1cbec47..119a086 100644
--- a/src/components/three/canvasBackground/CanvasBackground.js
+++ b/src/components/three/canvasBackground/CanvasBackground.js
@@ -1,16 +1,8 @@
 import styles from "./canvasBackground.module.css"
-import useStore from "../../../states/modelState"
 const CanvasBackground = ({ children }) => {
-    const { loadingFinished } = useStore()
     return (
         <div className={styles.white_backgdrop}>
             <div className={styles.inner}>{children}</div>
-            {!loadingFinished && (
-                <img
-                    className={styles.placeholder}
-                    src="/images/placeholder.jpg"
-                />
-            )}
         </div>
     )
 }
diff --git a/src/pages/studio/Studio.js b/src/pages/studio/Studio.js
index 07ee887..70ff868 100644
--- a/src/pages/studio/Studio.js
+++ b/src/pages/studio/Studio.js
@@ -15,11 +15,11 @@ export default function Studio() {
     return (
         <>
             <Navbar>
-                <Button
+                {/* <Button
                     text="Donate"
                     type="filled"
                     style={{ width: "150px" }}
-                />
+                /> */}
             </Navbar>
             <div className={styles.wrapper}>
                 <div className={styles.main}>
@@ -31,6 +31,15 @@ export default function Studio() {
                     <ControlPanel />
                 </div>
             </div>
+            <footer className={styles.footer}>
+                <img
+                    src="/fotura_logo.jpg"
+                    alt="Fotura Logo"
+                />
+                <div style={{ marginLeft: "10px" }}>
+                    Copyright © 2021 Fotura, Inc. All rights reserved.
+                </div>
+            </footer>
         </>
     )
 }
diff --git a/src/pages/studio/studio.module.css b/src/pages/studio/studio.module.css
index fd981fc..c62b7a6 100644
--- a/src/pages/studio/studio.module.css
+++ b/src/pages/studio/studio.module.css
@@ -12,3 +12,26 @@
     box-shadow: 0 2px 4px rgba(0, 0, 0, 0.3);
     height: fit-content;
 }
+.footer {
+    margin-top: 50px;
+    width: 100%;
+    height: 100px;
+    border-top: 1px solid #eaeaea;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: #8c8c8c;
+    font-size: 0.78em;
+}
+
+.footer a {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    flex-grow: 1;
+}
+
+.footer > img {
+    width: 25px;
+    height: 25px;
+}
diff --git a/src/states/modelState.js b/src/states/modelState.js
index 7866917..27f8337 100644
--- a/src/states/modelState.js
+++ b/src/states/modelState.js
@@ -21,7 +21,6 @@ const useStore = create((set) => ({
     modelColor: "#ffffff",
     props: null,
     modelRotation: 0,
-    loadingFinished: false,
     set: "bg_color",
     text: "TEXT",
     setAnimation: (animation) => set((state) => (state.animation = animation)),
@@ -72,8 +71,6 @@ const useStore = create((set) => ({
     setProps: (name) => set((state) => (state.props = name)),
     setModelRotation: (rotation) =>
         set((state) => (state.modelRotation = rotation)),
-    setLoadingFinished: (bool) =>
-        set((state) => (state.loadingFinished = bool)),
     setSet: (componentName) => set((state) => (state.set = componentName)),
     setText: (text) => set((state) => (state.text = `${text}`)),
 }))