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.

Sign up for GitHub

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

Signup #7

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
+630 −9
Open

Signup #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88b0db3
created the landing page
Ogenyi25 Jul 16, 2019
b3dcf4f
created the signup page and made some changes to the login page
Ogenyi25 Aug 8, 2019
a92a0a6
created the signup page and made some changes to the login page
Ogenyi25 Aug 9, 2019
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
Binary file added src/asset/icons/password.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/icons/username.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/imgs/cover.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/imgs/devc.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/imgs/devc1.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/imgs/devc2.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/imgs/devc3.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/asset/imgs/transparent.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion src/container/Full.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { bool } from 'prop-types'
// Home and Auth Pages
import Home from '../views/Home/HomeContainer'
import Login from '../views/Login/LoginContainer'

import Signup from '../views/Signup/SignupContainer'
// Private route
import { connect } from 'react-redux';
import PrivateRoute from './PrivateRoute';
Expand All @@ -25,6 +25,7 @@ class Full extends Component {
return (
<Switch>
<Route path="/login" component={Login} />
<Route path="/signup" component={Signup} />
<PrivateRoute path="/app" component={privateRoute} authState={auth} />
<Route exact path="/" component={Home} />
<Redirect from="*" to="/" />
Expand Down
136 changes: 136 additions & 0 deletions src/styles/Login.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
.login {
margin: 0;
display: flex;
min-height: 100vh;
justify-content: center;
align-items: center;
background: #E5E5E5;
font-family: "Poppins", sans-serif, 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
.carousel {
background-color: white;
background-size: cover;
width: 300px;
height: 300px;
align-content: center;
padding: 40px;
border-radius: 50%;
left: 90px;
z-index: 5;
}

.carousel div img {
width: 250px;
height: 220px;
border-radius: 50%;

}
.carousel-indicators li {
width: 10px;
height: 10px;
border-radius: 100%;
}
.carousel-indicators {
bottom: -80px;
}
.box {
padding: 50px;
background: #ffffff;
box-shadow: 0px 116.543px 327.368px rgba(0, 0, 0, 0.25);
border-radius: 20px;
min-width: 80%;
}

.column1 {
width: 100%;
background-color: transparent;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-image: url("../asset/imgs/transparent.png");
background-position: center;
background-repeat: no-repeat;
background-size: cover;
// z-index: 3;
}

.column2 {
flex: 1;
}

h1 {
font-weight: 600;
font-size: 30px;
text-align: center;
}

.login-form {
text-align: center;
.icon {
margin: 20px;
}
.input-group {
display: flex;
width: 100%;
height: 60px;
background: #e8f0fe;
opacity: 0.99;
border: 2px solid rgb(91, 116, 227);
box-sizing: border-box;
box-shadow: 0px 13.524px 27.048px rgba(0, 0, 0, 0.15);
border-radius: 56.3917px;
margin: 10px 0px 10px 0px;
align-content: center;
padding: 20px;
.input {
flex: 1;
padding-left: 10px;
border: none;
background-color: transparent !important;
}
input:focus,
textarea:focus,
select:focus {
outline: none;
background-color: transparent !important;
}
img {
height: 30px;
}
}
}

.button {
width: 100%;
background-color: rgba(83, 66, 235, 0.97);
color: white;
opacity: 0.99;
backdrop-filter: blur(210.981px);
border: 3.381px solid rgb(66, 88, 211);
box-sizing: border-box;
border-radius: 56.3917px;
margin: 10px 0px 10px 0px;
align-content: center;

padding: 20px;
}

.pass {
color: black;
}

.regain {
color: rgb(65, 44, 255);
}

.p1 {
float: inline-end;
color: black;
}

.p2 {
float: inline-end;
color: black;
}
}

1 change: 1 addition & 0 deletions src/styles/_fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
@import url('https://fonts.googleapis.com/css?family=Montserrat:400,600,700|Poppins:400,600,700,800&display=swap');
3 changes: 3 additions & 0 deletions src/styles/fonts.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
@import url('https://fonts.googleapis.com/css?family=Pacifico');
@import url('https://fonts.googleapis.com/css?family=Kaushan+Script');

83 changes: 83 additions & 0 deletions src/styles/landing.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
.nav {
width: 100%;
float: right;
padding: 0;
list-style: none;
padding: 0px 35px 0px 0px;
margin: 0px 30px 0px 0px;

}
#skin {
font-family: Source Sans Pro;
padding: 0px 0px 0px 70px;
margin: 0px 0px 0px 20px;
}
.nav li {
float: right;
text-align:right;
padding: 0px 0px 0px 5px;
margin: 0px 0px 0px 5px;
}
.nav li a {
display: block;
padding: 0px 0px 0px 5px;
margin: 0px 0px 0px 5px;
text-decoration: none;
text-align: right;
float: right;
}
.style {
font-family: Kaushan Script;
}
.polygon {
position: absolute;
width: 390px;
height: 517px;
left: 860px;
top: 80px;
background: rgb(96, 118, 192);
border-radius: 20px;
transform: rotate(-90deg);
}

.out {
padding: 50px;
font-style: normal;
font-weight: normal;
font-family: Kaushan Script;
font-size: 60px;
line-height: 116px;
color: #1A348D;
}

.text {
position: absolute;
width: 624px;
height: 100px;
left: 57px;
top: 508px;
font-family: Pacifico;
font-style: normal;
font-weight: normal;
font-size: 38px;
line-height: 146.28%;
color: #1A348D;
}
.button {
position: absolute;
width: 242px;
height: 86px;
left: 823px;
top: 613px;
background: #1A348D;
border-radius: 30px;
}

.practice {
color: red;
}
.mynav {
position: sticky;
top: 0;
background-color: #1A348D;
}
135 changes: 135 additions & 0 deletions src/styles/signup.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
.signup {
margin: 0;
display: flex;
min-height: 100vh;
justify-content: center;
align-items: center;
background: #E5E5E5;
font-family: "Poppins", sans-serif, 'Gill Sans', 'Gill Sans MT', Calibri, 'Trebuchet MS', sans-serif;
Ogenyi25 marked this conversation as resolved.
Show resolved Hide resolved
.carousel {
background-color: white;
background-size: cover;
width: 300px;
height: 300px;
align-content: center;
padding: 40px;
border-radius: 50%;
left: 90px;
z-index: 5;
}

.carousel div img {
width: 250px;
height: 220px;
border-radius: 50%;

}
.carousel-indicators li {
width: 10px;
height: 10px;
border-radius: 100%;
}
.carousel-indicators {
bottom: -80px;
}
.box {
padding: 50px;
background: #ffffff;
box-shadow: 0px 116.543px 327.368px rgba(0, 0, 0, 0.25);
border-radius: 20px;
min-width: 80%;
}

.column1 {
width: 100%;
background-color: transparent;
height: 100%;
position: absolute;
top: 0;
left: 0;
background-image: url("../asset/imgs/transparent.png");
background-position: center;
background-repeat: no-repeat;
background-size: cover;
// z-index: 3;
}

.column2 {
flex: 1;
}

h1 {
font-weight: 600;
font-size: 30px;
text-align: center;
}

.signup-form {
text-align: center;
.icon {
margin: 20px;
}
.input-group {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is also a kind of repetition, don't you think it's possible to move this common style definition into its own .scss file, inputs.scss for example?

display: flex;
width: 100%;
height: 60px;
background: #e8f0fe;
opacity: 0.99;
border: 2px solid rgb(91, 116, 227);
box-sizing: border-box;
box-shadow: 0px 13.524px 27.048px rgba(0, 0, 0, 0.15);
border-radius: 56.3917px;
margin: 10px 0px 10px 0px;
align-content: center;
padding: 20px;
.input {
flex: 1;
padding-left: 10px;
border: none;
background-color: transparent !important;
}
input:focus,
textarea:focus,
select:focus {
outline: none;
background-color: transparent !important;
}
img {
height: 30px;
}
}
}

.button {
width: 100%;
background-color: rgba(83, 66, 235, 0.97);
color: white;
opacity: 0.99;
backdrop-filter: blur(210.981px);
border: 3.381px solid rgb(66, 88, 211);
box-sizing: border-box;
border-radius: 56.3917px;
margin: 10px 0px 10px 0px;
align-content: center;

padding: 20px;
}

.pass {
color: black;
}

.regain {
color: rgb(65, 44, 255);
}

.p1 {
float: inline-end;
color: black;
}

.p2 {
float: inline-end;
color: black;
}
}
Loading