diff --git a/packages/fakeyou.com/public/images/header/fbx-to-gltf.png b/packages/fakeyou.com/public/images/header/fbx-to-gltf.png
new file mode 100644
index 0000000000..4cc7a65e6b
Binary files /dev/null and b/packages/fakeyou.com/public/images/header/fbx-to-gltf.png differ
diff --git a/packages/fakeyou.com/public/images/header/video-mocap.png b/packages/fakeyou.com/public/images/header/video-mocap.png
new file mode 100644
index 0000000000..86be27fdee
Binary files /dev/null and b/packages/fakeyou.com/public/images/header/video-mocap.png differ
diff --git a/packages/fakeyou.com/src/components/common/Container/Container.tsx b/packages/fakeyou.com/src/components/common/Container/Container.tsx
index 965c52dff4..ba3a1b05b2 100644
--- a/packages/fakeyou.com/src/components/common/Container/Container.tsx
+++ b/packages/fakeyou.com/src/components/common/Container/Container.tsx
@@ -29,7 +29,8 @@ export default function PageContainer({
}
// Merge the classNames
- const mergedClassNames = `${containerClass} ${className}`;
+ const mergedClassNames =
+ `${containerClass} ${className} min-height-100vh`.trim();
return
{children}
;
}
diff --git a/packages/fakeyou.com/src/components/common/FileInput/FileInput.tsx b/packages/fakeyou.com/src/components/common/FileInput/FileInput.tsx
new file mode 100644
index 0000000000..8003504eb9
--- /dev/null
+++ b/packages/fakeyou.com/src/components/common/FileInput/FileInput.tsx
@@ -0,0 +1,48 @@
+import React from "react";
+import { FileDetails, FileLabel, FileWrapper } from "components/common";
+import { faFileAudio } from "@fortawesome/pro-solid-svg-icons";
+
+interface Props {
+ label?: string;
+ blob?: string;
+ children?: any;
+ clear?: (file?: any) => void;
+ file?: any;
+ hideDetails?: boolean;
+ hideClearDetails?: boolean;
+ inputProps?: any;
+ [x: string]: any;
+ fileTypes?: string[];
+}
+
+const n = () => {};
+
+export default function FileInput({
+ label,
+ children,
+ clear = n,
+ file,
+ hideDetails,
+ hideClearDetails,
+ inputProps,
+ fileTypes = ["MP3"],
+ ...rest
+}: Props) {
+ return (
+
+ {label && }
+
+ {file ? (
+
+ ) : (
+
+ )}
+
+ {children}
+
+ );
+}
diff --git a/packages/fakeyou.com/src/components/common/FileInput/index.tsx b/packages/fakeyou.com/src/components/common/FileInput/index.tsx
new file mode 100644
index 0000000000..a7fb363370
--- /dev/null
+++ b/packages/fakeyou.com/src/components/common/FileInput/index.tsx
@@ -0,0 +1 @@
+export { default } from "./FileInput";
diff --git a/packages/fakeyou.com/src/components/common/FileWrapper/FileWrapper.scss b/packages/fakeyou.com/src/components/common/FileWrapper/FileWrapper.scss
index 8d9e467507..4ada0b0b67 100644
--- a/packages/fakeyou.com/src/components/common/FileWrapper/FileWrapper.scss
+++ b/packages/fakeyou.com/src/components/common/FileWrapper/FileWrapper.scss
@@ -24,6 +24,7 @@
.fy-uploader-layout {
display: flex;
align-items: center;
+ width: 100%;
.fy-uploader-layout-icon {
font-size: 2.625rem;
diff --git a/packages/fakeyou.com/src/components/common/VideoInput/VideoInput.tsx b/packages/fakeyou.com/src/components/common/VideoInput/VideoInput.tsx
index 1991fb28d7..fd49f6e3da 100644
--- a/packages/fakeyou.com/src/components/common/VideoInput/VideoInput.tsx
+++ b/packages/fakeyou.com/src/components/common/VideoInput/VideoInput.tsx
@@ -2,7 +2,6 @@ import React, { useEffect } from "react";
import { useSpring } from "@react-spring/web";
import { FileDetails, FileWrapper, FileLabel } from "components/common";
import { faFileVideo, faVideo } from "@fortawesome/pro-solid-svg-icons";
-import "./videoinput.scss";
import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
interface Props {
diff --git a/packages/fakeyou.com/src/components/common/VideoInput/videoinput.scss b/packages/fakeyou.com/src/components/common/VideoInput/videoinput.scss
deleted file mode 100644
index 37337a34d8..0000000000
--- a/packages/fakeyou.com/src/components/common/VideoInput/videoinput.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import "scss/colours.scss";
-
-.upload-details {
- background-color: rgba($panel, .85);
-}
\ No newline at end of file
diff --git a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
index 96b9bd2a99..30fb6d839c 100644
--- a/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
+++ b/packages/fakeyou.com/src/components/layout/PageHeader/PageHeader.tsx
@@ -144,6 +144,7 @@ export default function PageHeader({
alt="Header"
className="img-fluid my-3"
height="235"
+ loading="lazy"
/>
)}
diff --git a/packages/fakeyou.com/src/hooks/useMediaFileTypeInfo/useMediaFileTypeInfo.tsx b/packages/fakeyou.com/src/hooks/useMediaFileTypeInfo/useMediaFileTypeInfo.tsx
index 48faac532a..79a52d9f34 100644
--- a/packages/fakeyou.com/src/hooks/useMediaFileTypeInfo/useMediaFileTypeInfo.tsx
+++ b/packages/fakeyou.com/src/hooks/useMediaFileTypeInfo/useMediaFileTypeInfo.tsx
@@ -27,7 +27,7 @@ const mediaFileTypeInfo: MediaFileTypeInfo = {
},
[MediaFileType.FBX]: {
label: "FBX",
- color: "turquoise",
+ color: "lime",
},
[MediaFileType.None]: {
label: "None",
diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx
index 6f06292b19..a225a0934e 100644
--- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx
+++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx
@@ -106,6 +106,7 @@ import { SearchProvider } from "context/SearchContext";
import WeightEditPage from "./pages/weight/WeightEditPage";
import UploadSdWeightPage from "./pages/upload/UploadSdWeightPage";
import { FooterNav } from "./nav/FooterNav";
+import FbxToGltfPage from "./pages/fbx_to_gltf/FbxToGltfPage";
interface Props {
sessionWrapper: SessionWrapper;
@@ -676,6 +677,10 @@ class PageContainer extends React.Component<
/>
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
index 449a59002f..ad20d3bb6d 100644
--- a/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/media/MediaPage.tsx
@@ -141,10 +141,10 @@ export default function MediaPage() {
}
}
- const weightTypeInfo = useMediaFileTypeInfo(
+ const mediaTypeInfo = useMediaFileTypeInfo(
mediaFile?.media_type || MediaFileType.None
);
- const { label: mediaType, color: mediaTagColor } = weightTypeInfo;
+ const { label: mediaType, color: mediaTagColor } = mediaTypeInfo;
let audioLink = new BucketConfig().getGcsUrl(mediaFile?.public_bucket_path);
@@ -277,7 +277,10 @@ export default function MediaPage() {
];
const bvhDetails = [
- { property: "Type", value: mediaFile?.media_type || "" },
+ {
+ property: "Type",
+ value: mediaType || "",
+ },
{
property: "Visibility",
value: mediaFile?.creator_set_visibility.toString() || "",
@@ -286,7 +289,10 @@ export default function MediaPage() {
];
const gltfDetails = [
- { property: "Type", value: mediaFile?.media_type || "" },
+ {
+ property: "Type",
+ value: mediaType || "",
+ },
{
property: "Visibility",
value: mediaFile?.creator_set_visibility.toString() || "",
@@ -295,7 +301,10 @@ export default function MediaPage() {
];
const fbxDetails = [
- { property: "Type", value: mediaFile?.media_type || "" },
+ {
+ property: "Type",
+ value: mediaType || "",
+ },
{
property: "Visibility",
value: mediaFile?.creator_set_visibility.toString() || "",
diff --git a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx
index fc66a5b8a0..de0b896133 100644
--- a/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx
+++ b/packages/fakeyou.com/src/v2/view/pages/video_mocap/VideoMocap.tsx
@@ -78,11 +78,12 @@ export default function VideoMotionCapture(props: {
-
+
{pageState.status < FILE_UPLOADING && (
<>