diff --git a/site/package.json b/site/package.json index b870492..c40000e 100644 --- a/site/package.json +++ b/site/package.json @@ -15,6 +15,7 @@ }, "dependencies": { "@auth0/auth0-react": "^1.8.0", + "bootstrap": "^5.1.3", "normalize.css": "^8.0.1" } } diff --git a/site/src/components/Header.astro b/site/src/components/Header.astro new file mode 100644 index 0000000..9eb7363 --- /dev/null +++ b/site/src/components/Header.astro @@ -0,0 +1,6 @@ +--- +import HeaderNav from "./HeaderNav.astro"; +--- +
+ +
\ No newline at end of file diff --git a/site/src/components/Header/index.jsx b/site/src/components/Header/index.jsx deleted file mode 100644 index 101addb..0000000 --- a/site/src/components/Header/index.jsx +++ /dev/null @@ -1,25 +0,0 @@ -import React from "react"; -import { Auth0Provider } from "@auth0/auth0-react"; -import LoginButton from "../LoginButton"; -import LogoutButton from "../LogoutButton"; -import config from "../../config"; -import Styles from "./styles.module.scss"; - -const Header = () => { - return ( -
- - - - -
- ); -}; - -export default Header; diff --git a/site/src/components/Header/styles.module.scss b/site/src/components/Header/styles.module.scss deleted file mode 100644 index 2e33995..0000000 --- a/site/src/components/Header/styles.module.scss +++ /dev/null @@ -1,4 +0,0 @@ -header { - display: flex; - justify-content: flex-end; -} \ No newline at end of file diff --git a/site/src/components/HeaderAuth.jsx b/site/src/components/HeaderAuth.jsx new file mode 100644 index 0000000..86b10d8 --- /dev/null +++ b/site/src/components/HeaderAuth.jsx @@ -0,0 +1,23 @@ +import React from "react"; +import { Auth0Provider } from "@auth0/auth0-react"; +import config from "../config"; +import LoginButton from "./LoginButton"; +import LogoutButton from "./LogoutButton"; + +const HeaderAuth = () => { + return ( +
+ + + + +
+ ); +}; + +export default HeaderAuth; \ No newline at end of file diff --git a/site/src/components/HeaderNav.astro b/site/src/components/HeaderNav.astro new file mode 100644 index 0000000..d558363 --- /dev/null +++ b/site/src/components/HeaderNav.astro @@ -0,0 +1,10 @@ +--- +import HeaderAuth from "./HeaderAuth.jsx"; +--- + \ No newline at end of file diff --git a/site/src/components/LoginButton.jsx b/site/src/components/LoginButton.jsx index 7e79ae9..ed41744 100644 --- a/site/src/components/LoginButton.jsx +++ b/site/src/components/LoginButton.jsx @@ -5,7 +5,12 @@ const LoginButton = () => { const { loginWithRedirect, isAuthenticated } = useAuth0(); return ( - !isAuthenticated && + !isAuthenticated && + ); }; diff --git a/site/src/components/LogoutButton.jsx b/site/src/components/LogoutButton.jsx index d2f8d2b..0386a5f 100644 --- a/site/src/components/LogoutButton.jsx +++ b/site/src/components/LogoutButton.jsx @@ -5,12 +5,12 @@ const LogoutButton = () => { const { logout, isAuthenticated } = useAuth0(); return ( - ( - isAuthenticated && - - ) + ); }; diff --git a/site/src/layouts/BaseLayout.astro b/site/src/layouts/BaseLayout.astro index a213476..9802d81 100644 --- a/site/src/layouts/BaseLayout.astro +++ b/site/src/layouts/BaseLayout.astro @@ -1,14 +1,35 @@ --- -import Header from "../components/Header/index.jsx"; +import Header from "../components/Header.astro"; let { title } = Astro.props; --- - @@ -16,13 +37,13 @@ let { title } = Astro.props; - + {title} -
-
+
+
diff --git a/site/src/styles/_base.scss b/site/src/styles/_base.scss deleted file mode 100644 index b21d63d..0000000 --- a/site/src/styles/_base.scss +++ /dev/null @@ -1 +0,0 @@ -$bg-color: #fff; \ No newline at end of file diff --git a/site/src/styles/_tokens.scss b/site/src/styles/_tokens.scss deleted file mode 100644 index e69de29..0000000 diff --git a/site/src/styles/_utils.scss b/site/src/styles/_utils.scss deleted file mode 100644 index e69de29..0000000 diff --git a/site/src/styles/global.scss b/site/src/styles/global.scss deleted file mode 100644 index 74cb987..0000000 --- a/site/src/styles/global.scss +++ /dev/null @@ -1,8 +0,0 @@ -@use "normalize.css/normalize.css"; -@use "base"; -@use "tokens"; -@use "typography"; -@use "utils"; - -body { -} \ No newline at end of file