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

Feature/ele2 132 forms as per web app #38

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Feature/ele2 132 forms as per web app #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
11f323a
refactored login form plus created new scss file with styles
skorekm Feb 28, 2017
e1adf9e
refactored register form
skorekm Feb 28, 2017
f3cd8b9
refactored request reset password form
skorekm Feb 28, 2017
8cd85ef
refactored reset password form
skorekm Feb 28, 2017
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
3 changes: 2 additions & 1 deletion scss/components/_0_components.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@
"tabs",
"character-limit-warnings",
"search-container",
"logos";
"logos",
"forms";
28 changes: 28 additions & 0 deletions scss/components/_forms.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.form-wrapper{
max-width: 1030px;
min-width: 300px;
margin: 20px auto;
position: relative;
display: flex;
justify-content: center;

.form-container{
width: 360px;
margin: 20px auto;
padding: 5px;
}

.form-title{
font-size: 1.4rem;
padding: 1.6rem;
}

.form-addons{
padding: 20px;

.form-link{
display: block;
width: 100%;
}
}
}
26 changes: 20 additions & 6 deletions www/css/ionic.app.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9882,12 +9882,6 @@ img {
.list-inset.search-container {
margin: 15px 10px 5px; }

.side-menu-container {
position: absolute;
bottom: 0px;
left: 0px;
right: 0px; }

.small-label {
background-color: #444;
color: #fff;
Expand All @@ -9898,5 +9892,25 @@ img {
height: 15vh;
padding: 5px; }

.form-wrapper {
max-width: 1030px;
min-width: 300px;
margin: 20px auto;
position: relative;
display: flex;
justify-content: center; }
.form-wrapper .form-container {
width: 360px;
margin: 20px auto;
padding: 5px; }
.form-wrapper .form-title {
font-size: 1.4rem;
padding: 1.6rem; }
.form-wrapper .form-addons {
padding: 20px; }
.form-wrapper .form-addons .form-link {
display: block;
width: 100%; }

.main .grid-container {
padding-bottom: 55px; }
2 changes: 1 addition & 1 deletion www/css/ionic.app.min.css
View file
Open in desktop

Large diffs are not rendered by default.

60 changes: 28 additions & 32 deletions www/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,34 @@
<ion-view view-title="Login">
<ion-content overflow-scroll="false">
<div class="row">
<div class="col col-center text-center" style="padding-top:40px;padding-bottom:40px">
<h3>{{::loginMessage}}...</h3>
<div class="form-wrapper">
<div class="card form-container">
<div class="text-center col-center">
<h2 class="form-title">{{::loginMessage}}</h2>
</div>
<div class="list">
<label class="item item-input item-stacked-label">
<span class="input-label">LSBU email</span>
<input type="text" placeholder="[email protected]" id="login_email">
</label>
<label class="item item-input item-stacked-label">
<span class="item-label">elephant app password</span>
<input type="password" placeholder="Your elephant app password" id="login_pass">
</label>
<label class="item item-input item-stacked-label"></label>
</div>
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="loginUser()">
<a class="tab-item active" style="display: inline-block;">
<i class="icon ion-log-in"></i>
Login
</a>
</button>
</div>
<div class="form-addons text-center">
<p class="form-link">Do not have an account ? <a href="#/app/register">Register</a></p>
<p class="form-link">Forgot your password ? <a href="#/app/requestreset">Request password</a></p>
</div>
</div>
</div>
<div class="list list-inset">
<label class="item item-input item-stacked-label">
<span class="item-label">LSBU email</span>
<input type="text" placeholder="[email protected]" id="login_email">
</label>
<label class="item item-input item-stacked-label">
<span class="item-label">elephant app password</span>
<input type="password" placeholder="Your elephant app Password" id="login_pass">
</label>
</div>
<div class="row">
<div class="col col-center text-center" style="padding-left: 80px;">
<a href="#/app/register"><h5>Register</h5></a>
</div>
<div class="col col-center text-center">
<h5>|</h5>
</div>
<div class="col col-center text-center" style="padding-right: 80px;">
<a href="#/app/requestreset"><h5>Forgot</h5></a>
</div>
</div>
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="loginUser()">
<a class="tab-item active" ng-click="registerUser()" style="display: inline-block;">
<i class="icon ion-log-in"></i>
Login
</a>
</button>
</div>
</ion-content>
</ion-view>
55 changes: 33 additions & 22 deletions www/templates/register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
<ion-view view-title="Register">
<ion-content overflow-scroll="false">
<div class="list list-inset">
<label class="item item-input">
<input type="text" placeholder="Username" id="set_name">
</label>
<label class="item item-input">
<input type="text" placeholder="LSBU Email" id="set_email">
</label>
<label class="item item-input">
<input type="password" placeholder="Password (min 8 chars & 1 num)" id="set_pass">
</label>
<label class="item item-input">
<input type="password" placeholder="Re-type Password" id="set_pass2">
</label>
<ion-checkbox ng-model="isChecked.checkbox">Agree terms and condition</ion-checkbox>
<div class="row">
<div class="col col-center text-center">
<a href="#/app/terms"><h5>Terms and Conditions</h5></a>
<div class="form-wrapper">
<div class="card form-container">
<div class="text-center col-center">
<h2 class="form-title">Create your elephant account</h2>
</div>
<div class="list">
<label class="item item-input item-stacked-label">
<span class="input-label">Username</span>
<input type="text" placeholder="Username" id="set_name">
</label>
<label class="item item-input item-stacked-label">
<span class="input-label">LSBU email</span>
<input type="text" placeholder="[email protected]" id="set_email">
</label>
<label class="item item-input item-stacked-label">
<span class="item-label">elephant app password</span>
<input type="password" placeholder="Password (min 8 chars & 1 num)" id="set_pass">
</label>
<label class="item item-input item-stacked-label">
<span class="item-label">Retype password</span>
<input type="password" placeholder="Retype Password" id="set_pass2">
</label>
<label class="item item-input item-stacked-label">
<ion-checkbox style="margin-left: -15px;" ng-model="isChecked.checkbox">Agree terms and conditions</ion-checkbox>
</label>
<div class="form-addons">
<p class="form-link"><a href="#/app/terms">Terms and Conditions</a></p>
</div>
</div>
</div>
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="registerUser()">
<a class="tab-item active" ng-click="registerUser()" style="display: inline-block;">
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="registerUser()">
<a class="tab-item active" style="display: inline-block;">
<i class="icon ion-ios-compose-outline tabs-icon-top"></i>
Register
</a>
</button>
</button>
</div>
</div>
</div>
</ion-content>
Expand Down
30 changes: 18 additions & 12 deletions www/templates/requestreset.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,23 @@
<ion-view view-title="Request new password">
<ion-content overflow-scroll="false">
<div class="row">

</div>
<div class="list list-inset">
<label class="item item-input">
<input type="text" placeholder="LSBU Email" id="reset_email">
</label>
</div>
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="requestReset()">
Request new password
</button>
<div class="form-wrapper">
<div class="card form-container">
<div class="text-center col-center">
<h2 class="form-title">Type your email to request new password</h2>
</div>
<div class="list">
<label class="item item-input item-stacked-label">
<span class="input-label">LSBU email</span>
<input type="text" placeholder="[email protected]" id="reset_email">
</label>
<label class="item item-input item-stacked-label"></label>
</div>
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="requestReset()">
Request
</button>
</div>
</div>
</div>
</ion-content>
</ion-view>
30 changes: 19 additions & 11 deletions www/templates/resetpassword.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
<ion-view view-title="Enter your new password">
<ion-content overflow-scroll="false">
<div class="list list-inset">
<label class="item item-input">
<input type="password" placeholder="Password" id="reset_pass">
</label>
<label class="item item-input">
<input type="password" placeholder="Re-type Password" id="reset_pass2">
</label>
<ion-content>
<div class="form-wrapper">
<div class="card form-container">
<div class="text-center col-center">
<h2 class="form-title">Type your new password</h2>
</div>
<div class="list">
<label class="item item-input item-stacked-label">
<span class="input-label">New elephant app password</span>
<input type="password" placeholder="Password" id="reset_pass">
</label>
<label class="item item-input item-stacked-label"></label>
</div>
<div class="row">
<button class="button button-calm button-full tabs tabs-icon-top" ng-click="resetPassword()">
Submit your new password
</button>
</div>
</div>
</div>
</ion-content>
<div class="bar bar-footer bar-calm">
<div class="title" ng-click="resetPassword()">Submit your new password</div>
</div>
</ion-view>