Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

removedSignup form #213

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions site/src/App.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import SignupForm from "./components/SignupForm";
import { Main } from './App.style.js';
import DiscussCallout from './components/Discuss-Callout';
import mesheryPlayground from "./assets/images/meshery-playground-meshmap.png";
import Footer from "./components/Footer";
import { ThemeProvider } from "styled-components";
Expand All @@ -8,23 +8,17 @@ import { useDarkMode } from "./components/useDarkMode";
import ReactPlayer from 'react-player/youtube'
import Navigation from "./components/Navigation";
import Faq from "./components/Faq";
import { useState } from "react";

const App = () => {

const [theme, toggleTheme] = useDarkMode();
const themeMode = theme === 'light' ? lightTheme : darkTheme;
const [showSignUpButton, setShowSignUpButton] = useState(true);

const handleSignUpFormSubmit = () => {
setShowSignUpButton(false);
};

return (
<>
<ThemeProvider theme={themeMode}>
<GlobalStyle />
<Navigation theme={theme} toggleTheme={toggleTheme} showSignUpButton={showSignUpButton} />
<Navigation theme={theme} toggleTheme={toggleTheme} />
<Main>
<section className="hero">
<h3 className="try-now-txt">Try it now!</h3>
Expand All @@ -43,11 +37,10 @@ const App = () => {
style={{ margin: "auto" }}
className="embedVideo"
/>

</section>
<section className="form" id="signup-form">
<SignupForm onSubmit={handleSignUpFormSubmit} />
</section>
<div className='desc-callout'>
<DiscussCallout />
</div>
<section className="faq">
<h1>Frequently Asked Questions</h1>
<Faq category={["Meshery Playground"]}/>
Expand Down
56 changes: 12 additions & 44 deletions site/src/App.style.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ export const Header = styled.header`
max-width: 400px;
height: auto;
}

.themeToggle {
margin: auto 0.5rem;
padding: auto 0.5rem;
Expand All @@ -35,36 +36,11 @@ export const Header = styled.header`
height: 40px;
}
}
.btn-container {
display: flex;
align-items: center;
justify-content: space-between;
}
.signup-btn,

.login-btn {
font-size: calc(16px + 6 * ((50vw - 320px) / 680));
transition: 0.2s ease-in-out;
margin: auto 0.5rem;
}
.signup-btn {
padding: 1rem 1.5rem;
text-align: center;
color: #fff;
background: rgba(235, 192, 23, 1);
border-radius: 16px;
box-shadow: 0 4px 30px rgba(0, 0, 0, 0.1);
backdrop-filter: blur(5px);
-webkit-backdrop-filter: blur(5px);
border: 1px solid rgba(235, 192, 23, 0.3);
white-space: nowrap;
}
.signup-btn:hover {
background-color: rgba(255, 208, 25, 1);
box-shadow: 0px 0px 15px rgba(235, 192, 23, 1);
color: #fff;
}

.login-btn {
margin: 0 0 0 1rem;
padding: 1rem 1.5rem;
text-align: center;
Expand All @@ -83,27 +59,20 @@ export const Header = styled.header`
box-shadow: 0px 0px 15px rgba(0, 179, 159, 1);
color: #fff;
}

@media screen and (max-width: 1400px) {
img.logo {
max-width: 320px;
}
}

@media screen and (max-width: 1100px) {
nav {
padding: 1.5em 2.5em;
}
}

@media screen and (max-width: 975px) {
.themeToggle {
// position: absolute;
}
nav {
// padding: 1.5rem 5rem;
}
// .themeToggle > svg {
// width: 32px;
// height: 32px;
// }
img.logo {
max-width: 320px;
}
Expand All @@ -113,14 +82,12 @@ export const Header = styled.header`
img.logo {
max-width: 250px;
}
.signup-btn {
padding: 0.7rem 1rem;
margin: auto 0.35rem;
}

.login-btn {
padding: 0.7rem 1rem;
margin: auto 0.35rem;
}

.themeToggle > svg {
width: 28px;
height: 28px;
Expand All @@ -136,6 +103,7 @@ export const Header = styled.header`
max-width: 200px;
}
}

@media screen and (max-width: 500px) {
img.logo {
max-width: 180px;
Expand All @@ -146,10 +114,11 @@ export const Header = styled.header`
.themeToggle {
position: static;
}
.signup-btn,

.login-btn {
padding: 5px 7px;
}

.themeToggle > svg {
width: 20px;
height: 20px;
Expand Down Expand Up @@ -233,9 +202,8 @@ export const Main = styled.main`
.byline {
margin-top: 2rem;
}

.form {
margin: 4rem auto;
.desc-callout {
margin-top: 4rem;
}

.join-community {
Expand Down
Loading
Loading