removed uncommitted and unready parts of site
This commit is contained in:
parent
ec0e33db7c
commit
2b4a0fdef6
17263
package-lock.json
generated
17263
package-lock.json
generated
File diff suppressed because it is too large
Load diff
|
@ -12,18 +12,18 @@ import UptimeCard from "./components/UptimeCard";
|
||||||
import Footer from "./components/Footer";
|
import Footer from "./components/Footer";
|
||||||
import {Nav, Navbar, NavbarBrand, NavDropdown} from "react-bootstrap";
|
import {Nav, Navbar, NavbarBrand, NavDropdown} from "react-bootstrap";
|
||||||
import NWSLogo from "./static/images/NWS_Logo.png";
|
import NWSLogo from "./static/images/NWS_Logo.png";
|
||||||
import Blogs from "./components/Blogs";
|
//import Blogs from "./components/Blogs";
|
||||||
//import NotFoundPage from "./components/NotFoundPage";
|
//import NotFoundPage from "./components/NotFoundPage";
|
||||||
import LoginPage from "./components/LoginPage";
|
//import LoginPage from "./components/LoginPage";
|
||||||
import RegisterPage from "./components/RegisterPage";
|
//import RegisterPage from "./components/RegisterPage";
|
||||||
import VerifyPage from "./components/VerifyPage";
|
//import VerifyPage from "./components/VerifyPage";
|
||||||
import DashboardPage from "./components/DashboardPage";
|
//import DashboardPage from "./components/DashboardPage";
|
||||||
import CreateCruisePage from "./components/CreateCruisePage";
|
//import CreateCruisePage from "./components/CreateCruisePage";
|
||||||
|
|
||||||
function Layout (props: {children: any}) {
|
function Layout (props: {children: any}) {
|
||||||
return (
|
return (
|
||||||
<div>
|
<div>
|
||||||
<Navbar sticky={"top"} style={{backgroundColor: "#eee", paddingLeft: 100, paddingRight: 100}} className={"row"}>
|
{/* <Navbar sticky={"top"} style={{backgroundColor: "#eee", paddingLeft: 100, paddingRight: 100}} className={"row"}>
|
||||||
<div className={"col-10"}>
|
<div className={"col-10"}>
|
||||||
<NavbarBrand>
|
<NavbarBrand>
|
||||||
<img src={NWSLogo} alt="nws-logo" style={{width: 120}}/>
|
<img src={NWSLogo} alt="nws-logo" style={{width: 120}}/>
|
||||||
|
@ -35,9 +35,6 @@ function Layout (props: {children: any}) {
|
||||||
Status
|
Status
|
||||||
</NavLink>
|
</NavLink>
|
||||||
</div>
|
</div>
|
||||||
{/*<NavLink className={"nav-lnk"} to={"/blogs"}>*/}
|
|
||||||
{/* Blog*/}
|
|
||||||
{/*</NavLink>*/}
|
|
||||||
<div className={"col-2"}>
|
<div className={"col-2"}>
|
||||||
{ localStorage.getItem("session_key") === null &&
|
{ localStorage.getItem("session_key") === null &&
|
||||||
(
|
(
|
||||||
|
@ -61,7 +58,7 @@ function Layout (props: {children: any}) {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
</div>
|
</div>
|
||||||
</Navbar>
|
</Navbar> */}
|
||||||
{props.children}
|
{props.children}
|
||||||
<Footer/>
|
<Footer/>
|
||||||
</div>
|
</div>
|
||||||
|
@ -83,55 +80,6 @@ const router = createBrowserRouter([
|
||||||
<StatusPage/>
|
<StatusPage/>
|
||||||
</Layout>
|
</Layout>
|
||||||
},
|
},
|
||||||
{
|
|
||||||
path: "blog",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<Blogs/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "blogs",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<Blogs/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "login",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<LoginPage/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "verify",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<VerifyPage/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "dashboard",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<DashboardPage/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "register",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<RegisterPage/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
|
||||||
path: "cruise/new",
|
|
||||||
element:
|
|
||||||
<Layout>
|
|
||||||
<CreateCruisePage/>
|
|
||||||
</Layout>
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
path: "*",
|
path: "*",
|
||||||
element:
|
element:
|
||||||
|
|
Loading…
Reference in a new issue