diff --git a/packages/storyteller-stream/package.json b/packages/storyteller-stream/package.json index e088de14c7..95fc2f1671 100644 --- a/packages/storyteller-stream/package.json +++ b/packages/storyteller-stream/package.json @@ -5,10 +5,10 @@ "dependencies": { "@storyteller/components": "0.1.0", "@craco/craco": "^6.4.3", - "@fortawesome/fontawesome-svg-core": "^1.2.36", - "@fortawesome/free-brands-svg-icons": "^5.15.4", - "@fortawesome/free-solid-svg-icons": "^5.15.4", - "@fortawesome/react-fontawesome": "^0.1.15", + "@fortawesome/fontawesome-svg-core": "^6.1.1", + "@fortawesome/free-brands-svg-icons": "^6.1.1", + "@fortawesome/free-solid-svg-icons": "^6.1.1", + "@fortawesome/react-fontawesome": "^0.2.0", "@testing-library/jest-dom": "^5.16.1", "@testing-library/react": "^9.5.0", "@testing-library/user-event": "^13.5.0", diff --git a/packages/storyteller-stream/public/assets/storyteller-logo.png b/packages/storyteller-stream/public/assets/storyteller-logo.png new file mode 100644 index 0000000000..6504997d28 Binary files /dev/null and b/packages/storyteller-stream/public/assets/storyteller-logo.png differ diff --git a/packages/storyteller-stream/src/App.scss b/packages/storyteller-stream/src/App.scss index 98c232fd31..b1dcc05e03 100644 --- a/packages/storyteller-stream/src/App.scss +++ b/packages/storyteller-stream/src/App.scss @@ -1,7 +1,8 @@ //@import-normalize; /* bring in normalize.css styles */ // $page-width: 700px; - +$primary: #fc6b68; +$white: #fff; $light-text-color: #777; $button-text-color: #666; @@ -156,12 +157,44 @@ p { border: none; } -.nav-bg-dark { - background-color: #17101c !important; +// .nav-bg-dark { +// background-color: #17101c !important; +// } + +.nav-pills .nav-link.active, +.nav-pills .show > .nav-link { + color: #fff; + background-color: $primary; + + &:hover { + background-color: $primary; + } } -.m-page-top { - margin-top: 100px; +.nav-pills .nav-link { + border-radius: 5px; + color: rgba(#fff, 0.7); + transition: 0.2s; + padding: 12px 14px !important; + + &:hover { + background-color: rgba($white, 0.1); + } +} + +.icon { + content: ""; + width: 20px; + margin-right: 16px; +} + +.p-page-top { + padding-top: 110px; +} + +.p-page { + padding-top: 100px; + padding-bottom: 100px; } .offcanvas { @@ -223,12 +256,6 @@ span.word:after { min-height: 100%; } -.bg-title { - background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' version='1.1' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:svgjs='http://svgjs.com/svgjs' width='1920' height='300' preserveAspectRatio='none' viewBox='0 0 1920 300'%3e%3cg mask='url(%26quot%3b%23SvgjsMask1028%26quot%3b)' fill='none'%3e%3cpath d='M1170 175L183 174' stroke-width='8' stroke='url(%23SvgjsLinearGradient1029)' stroke-linecap='round' class='Left'%3e%3c/path%3e%3cpath d='M1456 93L968 92' stroke-width='10' stroke='url(%23SvgjsLinearGradient1029)' stroke-linecap='round' class='Left'%3e%3c/path%3e%3cpath d='M1459 102L2490 101' stroke-width='6' stroke='url(%23SvgjsLinearGradient1029)' stroke-linecap='round' class='Left'%3e%3c/path%3e%3cpath d='M766 41L192 40' stroke-width='6' stroke='url(%23SvgjsLinearGradient1030)' stroke-linecap='round' class='Right'%3e%3c/path%3e%3cpath d='M261 212L-475 211' stroke-width='10' stroke='url(%23SvgjsLinearGradient1030)' stroke-linecap='round' class='Right'%3e%3c/path%3e%3cpath d='M251 192L1533 191' stroke-width='6' stroke='url(%23SvgjsLinearGradient1029)' stroke-linecap='round' class='Left'%3e%3c/path%3e%3cpath d='M172 211L936 210' stroke-width='8' stroke='url(%23SvgjsLinearGradient1030)' stroke-linecap='round' class='Right'%3e%3c/path%3e%3cpath d='M1070 207L1854 206' stroke-width='10' stroke='url(%23SvgjsLinearGradient1029)' stroke-linecap='round' class='Left'%3e%3c/path%3e%3c/g%3e%3cdefs%3e%3cmask id='SvgjsMask1028'%3e%3crect width='1920' height='300' fill='white'%3e%3c/rect%3e%3c/mask%3e%3clinearGradient x1='100%25' y1='0%25' x2='0%25' y2='0%25' id='SvgjsLinearGradient1029'%3e%3cstop stop-color='rgba(247%2c 84%2c 92%2c 0)' offset='0'%3e%3c/stop%3e%3cstop stop-color='rgba(247%2c 84%2c 92%2c 0.05 )' offset='1'%3e%3c/stop%3e%3c/linearGradient%3e%3clinearGradient x1='0%25' y1='0%25' x2='100%25' y2='0%25' id='SvgjsLinearGradient1030'%3e%3cstop stop-color='rgba(247%2c 84%2c 92%2c 0)' offset='0'%3e%3c/stop%3e%3cstop stop-color='rgba(247%2c 84%2c 92%2c 0.05)' offset='1'%3e%3c/stop%3e%3c/linearGradient%3e%3c/defs%3e%3c/svg%3e"); - background-size: auto; - background-repeat: no-repeat; -} - .bg-hero { background: rgb(18, 14, 26); background: linear-gradient( diff --git a/packages/storyteller-stream/src/App.tsx b/packages/storyteller-stream/src/App.tsx index cc6e1182fc..4fe7fed01c 100644 --- a/packages/storyteller-stream/src/App.tsx +++ b/packages/storyteller-stream/src/App.tsx @@ -28,6 +28,7 @@ import { TtsConfigsDeleteRulePage } from "./pages/tts_configs/TtsConfigsDeleteRu import { TtsConfigsEditRulePage } from "./pages/tts_configs/TtsConfigsEditRulePage"; import { TtsConfigsReorderPage } from "./pages/tts_configs/TtsConfigsReorderPage"; import { ObsConfigsPage } from "./pages/obs_configs/ObsConfigsPage"; +import { Dashboard } from "./pages/dashboard/Dashboard"; i18n .use(initReactI18next) // passes i18n down to react-i18next @@ -120,7 +121,7 @@ class App extends React.Component { public render() { return ( -
+
{ allTtsModelsByToken={this.state.allTtsModelsByToken} /> + + + + { -
+ {/*

Copyright © 2022 Storyteller

-
+
*/}
diff --git a/packages/storyteller-stream/src/layout/TopNav.tsx b/packages/storyteller-stream/src/layout/TopNav.tsx index 9dbab62ff1..7cb5304f19 100644 --- a/packages/storyteller-stream/src/layout/TopNav.tsx +++ b/packages/storyteller-stream/src/layout/TopNav.tsx @@ -16,13 +16,13 @@ function TopNav(props: Props) { aria-label="Offcanvas navbar large" >
- + Fake You Logo - + +
+ ); +} + +export { DashboardPage }; diff --git a/packages/storyteller-stream/src/pages/dashboard/Sidebar.tsx b/packages/storyteller-stream/src/pages/dashboard/Sidebar.tsx new file mode 100644 index 0000000000..ec045d9d51 --- /dev/null +++ b/packages/storyteller-stream/src/pages/dashboard/Sidebar.tsx @@ -0,0 +1,71 @@ +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { + faCog, + faHome, + faVideo, + faVolumeUp, +} from "@fortawesome/free-solid-svg-icons"; +import { Link } from "react-router-dom"; + +function Sidebar(props: Props) { + // if (!props.sessionWrapper.isLoggedIn()) { + // return ( + //
+ //
+ //

Must Log In

+ //
+ //
+ // ); + // } + + return ( +
+
+ +
+
+ ); +} + +export { Sidebar }; diff --git a/packages/storyteller-stream/src/pages/dashboard/Test.tsx b/packages/storyteller-stream/src/pages/dashboard/Test.tsx new file mode 100644 index 0000000000..fa9799ac71 --- /dev/null +++ b/packages/storyteller-stream/src/pages/dashboard/Test.tsx @@ -0,0 +1,32 @@ +import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"; +import { + faCog, + faHome, + faVideo, + faVolumeUp, +} from "@fortawesome/free-solid-svg-icons"; + +function Test(props: Props) { + // if (!props.sessionWrapper.isLoggedIn()) { + // return ( + //
+ //
+ //

Must Log In

+ //
+ //
+ // ); + // } + + return ( +
+

+ TESTY TEST +

+ +
+ ); +} + +export { Test };