From 0fc18f66101853fe33c68fad0120c07d05ea9df0 Mon Sep 17 00:00:00 2001 From: BFlat Date: Mon, 29 Jan 2024 18:13:53 +0700 Subject: [PATCH] footer fixed to bottom --- packages/fakeyou.com/src/AppNew.scss | 33 - packages/fakeyou.com/src/scss/nav.scss | 4 + .../fakeyou.com/src/v2/view/PageContainer.tsx | 1295 +++++++++-------- .../fakeyou.com/src/v2/view/nav/FooterNav.tsx | 279 ++-- 4 files changed, 809 insertions(+), 802 deletions(-) diff --git a/packages/fakeyou.com/src/AppNew.scss b/packages/fakeyou.com/src/AppNew.scss index 07cef4f768..c7683717df 100644 --- a/packages/fakeyou.com/src/AppNew.scss +++ b/packages/fakeyou.com/src/AppNew.scss @@ -38,12 +38,6 @@ $headings-font-family: "Fira Sans", sans-serif; overflow-wrap: anywhere; } - //old wrapper - // .mainwrap { - // max-width: 800px; - // margin: auto; - // } - canvas#spectrogram { margin: 0.5em 0; transform: scaleY(-1); @@ -58,37 +52,10 @@ $headings-font-family: "Fira Sans", sans-serif; box-shadow: none; } - /*p { - a:link, - a:visited { - color: rgb(119, 165, 235); - font-weight: bold; - } - a:hover, - a:active{ - color: rgb(85, 133, 204); - font-weight: bold; - } - }*/ - - // p { - // a:before { - // content: " "; - // } - // } - #main { position: relative; // Footer attachment. min-height: 100vh; overflow: hidden; - - &.low-spec { - .animation-wrapper { - display: none; - visibility: hidden; - content-visibility: hidden; - } - } } .social { diff --git a/packages/fakeyou.com/src/scss/nav.scss b/packages/fakeyou.com/src/scss/nav.scss index 3d5ca0697a..33663dd2bd 100644 --- a/packages/fakeyou.com/src/scss/nav.scss +++ b/packages/fakeyou.com/src/scss/nav.scss @@ -52,6 +52,10 @@ $topbar-height: 66px; } #page-content-wrapper { + height: 100%; + margin: 0; + display: flex; + flex-direction: column; width: 100%; position: relative; padding-left: 260px; diff --git a/packages/fakeyou.com/src/v2/view/PageContainer.tsx b/packages/fakeyou.com/src/v2/view/PageContainer.tsx index a225a0934e..48c683e656 100644 --- a/packages/fakeyou.com/src/v2/view/PageContainer.tsx +++ b/packages/fakeyou.com/src/v2/view/PageContainer.tsx @@ -240,137 +240,544 @@ class PageContainer extends React.Component<
- - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {/* New Profile Page */} + + + + + + {}} + sessionWrapper={this.props.sessionWrapper} + /> + + + + + + + + {}} + sessionWrapper={this.props.sessionWrapper} + /> + + + {}} + sessionWrapper={this.props.sessionWrapper} + /> + + + {}} + sessionWrapper={this.props.sessionWrapper} + /> + + + + + + + + + + + + + + + + + + + ( + + )} /> - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - {/* New Profile Page */} - - - + + + - - {}} - sessionWrapper={this.props.sessionWrapper} - /> - + + + - - - + + + - - {}} - sessionWrapper={this.props.sessionWrapper} - /> - - - {}} - sessionWrapper={this.props.sessionWrapper} - /> - - - {}} - sessionWrapper={this.props.sessionWrapper} - /> - + + + - - - + + + - - - + + + - - - + + + - - - + + + - ( - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {/* Route for initial voice creation */} + + + + + {/* Route for editing the dataset details */} + + + + + {/* Route for handling dataset token for uploading samples */} + + + + + + + + + + - )} - /> + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {/* Route for initial voice creation */} - - - - - {/* Route for editing the dataset details */} - - - - - {/* Route for handling dataset token for uploading samples */} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + +
diff --git a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx index 97957e554a..b59d7614e3 100644 --- a/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx +++ b/packages/fakeyou.com/src/v2/view/nav/FooterNav.tsx @@ -18,6 +18,7 @@ import { GetServerInfoSuccessResponse, } from "@storyteller/components/src/api/server/GetServerInfo"; import { useLocalize } from "hooks"; +import { Container } from "components/common"; interface Props { sessionWrapper: SessionWrapper; @@ -77,152 +78,150 @@ function FooterNav(props: Props) { } return ( -
- ); }