Skip to content

Commit

Permalink
Merge pull request #103 from coreui/fix-basic-forms
Browse files Browse the repository at this point in the history
fix: basic forms
  • Loading branch information
xidedix authored Aug 14, 2018
2 parents 6d7fe8f + 6407d87 commit 544f9a5
Show file tree
Hide file tree
Showing 6 changed files with 80 additions and 65 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
## [angular](./README.md) version `changelog`

###### `v2.0.0-rc.4`
- fix(forms): validation classes example closes #95
- fix(forms): card-header-actions example
- fix(forms): autocomplete
- fix(login): form, autocomplete
- fix(register): form, autocomplete
- update: `@types/node` to `10.7.0`",`
- update: `codelyzer` to `4.4.4`
- update: `karma-jasmine-html-reporter` to `1.3.0`
- update: `typescript` to `2.9.2`

###### `v2.0.0-rc.3`
- fix(carousels): move to `loremflickr` image placeholders
- refactor: code cleanup
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@coreui/coreui-free-angular-admin-template",
"version": "2.0.0-rc.3",
"version": "2.0.0-rc.4",
"description": "CoreUI Free Angular 2+ Admin Template",
"author": {
"name": "Łukasz Holeczek",
Expand Down Expand Up @@ -63,19 +63,19 @@
"@angular/language-service": "^6.1.2",
"@types/jasmine": "^2.8.8",
"@types/jasminewd2": "^2.0.3",
"@types/node": "^10.5.8",
"codelyzer": "^4.4.3",
"@types/node": "^10.7.0",
"codelyzer": "^4.4.4",
"jasmine-core": "^3.2.0",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^3.0.0",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^2.0.1",
"karma-jasmine": "^1.1.2",
"karma-jasmine-html-reporter": "^1.2.0",
"karma-jasmine-html-reporter": "^1.3.0",
"protractor": "5.4.0",
"ts-node": "^7.0.1",
"tslint": "^5.11.0",
"typescript": "^2.7.2"
"typescript": "^2.9.2"
},
"engines": {
"node": ">= 8.9.4",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.component.spec.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { RouterTestingModule } from '@angular/router/testing'
import { RouterTestingModule } from '@angular/router/testing';
import { TestBed, async } from '@angular/core/testing';
import { AppComponent } from './app.component';
describe('AppComponent', () => {
Expand Down
34 changes: 17 additions & 17 deletions src/app/views/base/forms.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@
<div class="form-group row">
<label class="col-md-3 col-form-label" for="email-input">Email Input</label>
<div class="col-md-9">
<input type="email" id="email-input" name="email-input" class="form-control" placeholder="Enter Email">
<input type="email" id="email-input" name="email-input" class="form-control" placeholder="Enter Email" autocomplete="email">
<span class="help-block">Please enter your email</span>
</div>
</div>
<div class="form-group row">
<label class="col-md-3 col-form-label" for="password-input">Password</label>
<div class="col-md-9">
<input type="password" id="password-input" name="password-input" class="form-control" placeholder="Password">
<input type="password" id="password-input" name="password-input" class="form-control" placeholder="Password" autocomplete="current-password">
<span class="help-block">Please enter a complex password</span>
</div>
</div>
Expand Down Expand Up @@ -320,11 +320,11 @@
<form action="" method="post" class="form-inline">
<div class="form-group">
<label class="sr-only" for="if-email">Email</label>
<input type="email" id="if-email" name="if-email" class="form-control" placeholder="Enter Email..">
<input type="email" id="if-email" name="if-email" class="form-control" placeholder="Enter Email.." autocomplete="email">
</div>
<div class="form-group">
<label class="sr-only" for="if-password">Password</label>
<input type="password" id="if-password" name="if-password" class="form-control" placeholder="Enter Password..">
<input type="password" id="if-password" name="if-password" class="form-control" placeholder="Enter Password.." autocomplete="current-password">
</div>
</form>
</div>
Expand All @@ -344,14 +344,14 @@
<div class="form-group row">
<label class="col-md-3 col-form-label" for="hf-email">Email</label>
<div class="col-md-9">
<input type="email" id="hf-email" name="hf-email" class="form-control" placeholder="Enter Email..">
<input type="email" id="hf-email" name="hf-email" class="form-control" placeholder="Enter Email.." autocomplete="email">
<span class="help-block">Please enter your email</span>
</div>
</div>
<div class="form-group row">
<label class="col-md-3 col-form-label" for="hf-password">Password</label>
<div class="col-md-9">
<input type="password" id="hf-password" name="hf-password" class="form-control" placeholder="Enter Password..">
<input type="password" id="hf-password" name="hf-password" class="form-control" placeholder="Enter Password.." autocomplete="current-password">
<span class="help-block">Please enter your password</span>
</div>
</div>
Expand All @@ -370,12 +370,12 @@
<form action="" method="post">
<div class="form-group">
<label for="nf-email">Email</label>
<input type="email" id="nf-email" name="nf-email" class="form-control" placeholder="Enter Email..">
<input type="email" id="nf-email" name="nf-email" class="form-control" placeholder="Enter Email.." autocomplete="email">
<span class="help-block">Please enter your email</span>
</div>
<div class="form-group">
<label for="nf-password">Password</label>
<input type="password" id="nf-password" name="nf-password" class="form-control" placeholder="Enter Password..">
<input type="password" id="nf-password" name="nf-password" class="form-control" placeholder="Enter Password.." autocomplete="current-password">
<span class="help-block">Please enter your password</span>
</div>
</form>
Expand Down Expand Up @@ -559,7 +559,7 @@
<div class="form-group row">
<div class="col-md-12">
<div class="input-group">
<input type="email" id="input2-group1" name="input2-group1" class="form-control" placeholder="Email">
<input type="email" id="input2-group1" name="input2-group1" class="form-control" placeholder="Email" autocomplete="email">
<div class="input-group-append">
<span class="input-group-text"><i class="fa fa-envelope-o"></i></span>
</div>
Expand Down Expand Up @@ -607,7 +607,7 @@
<div class="form-group row">
<div class="col-md-12">
<div class="input-group">
<input type="email" id="input2-group2" name="input2-group2" class="form-control" placeholder="Email">
<input type="email" id="input2-group2" name="input2-group2" class="form-control" placeholder="Email" autocomplete="email">
<span class="input-group-append">
<button type="button" class="btn btn-primary">Submit</button>
</span>
Expand Down Expand Up @@ -665,7 +665,7 @@
<div class="form-group row">
<div class="col-md-12">
<div class="input-group">
<input type="email" id="input2-group3" name="input2-group3" class="form-control" placeholder="Email">
<input type="email" id="input2-group3" name="input2-group3" class="form-control" placeholder="Email" autocomplete="email">
<div class="input-group-append" dropdown>
<button type="button" class="btn btn-primary dropdown-toggle" dropdownToggle>Action
<span class="caret"></span>
Expand Down Expand Up @@ -873,7 +873,7 @@
<div class="input-group-prepend">
<span class="input-group-text">Email</span>
</div>
<input type="email" id="email3" name="email3" class="form-control">
<input type="email" id="email3" name="email3" class="form-control" autocomplete="email">
<div class="input-group-append">
<span class="input-group-text"><i class="fa fa-envelope"></i></span>
</div>
Expand All @@ -884,7 +884,7 @@
<div class="input-group-prepend">
<span class="input-group-text">Password</span>
</div>
<input type="password" id="password3" name="password3" class="form-control">
<input type="password" id="password3" name="password3" class="form-control" autocomplete="current-password">
<div class="input-group-append">
<span class="input-group-text"><i class="fa fa-asterisk"></i></span>
</div>
Expand Down Expand Up @@ -914,15 +914,15 @@
</div>
<div class="form-group">
<div class="input-group">
<input type="email" id="email2" name="email2" class="form-control" placeholder="Email">
<input type="email" id="email2" name="email2" class="form-control" placeholder="Email" autocomplete="email">
<div class="input-group-append">
<span class="input-group-text"><i class="fa fa-envelope"></i></span>
</div>
</div>
</div>
<div class="form-group">
<div class="input-group">
<input type="password" id="password2" name="password2" class="form-control" placeholder="Password">
<input type="password" id="password2" name="password2" class="form-control" placeholder="Password" autocomplete="current-password">
<div class="input-group-append">
<span class="input-group-text"><i class="fa fa-asterisk"></i></span>
</div>
Expand Down Expand Up @@ -955,15 +955,15 @@
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-envelope"></i></span>
</div>
<input type="email" id="email" name="email" class="form-control" placeholder="Email">
<input type="email" id="email" name="email" class="form-control" placeholder="Email" autocomplete="email">
</div>
</div>
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-asterisk"></i></span>
</div>
<input type="password" id="password" name="password" class="form-control" placeholder="Password">
<input type="password" id="password" name="password" class="form-control" placeholder="Password" autocomplete="current-password">
</div>
</div>
<div class="form-group form-actions">
Expand Down
40 changes: 21 additions & 19 deletions src/app/views/login/login.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,28 +6,30 @@
<div class="card-group">
<div class="card p-4">
<div class="card-body">
<h1>Login</h1>
<p class="text-muted">Sign In to your account</p>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-user"></i></span>
<form>
<h1>Login</h1>
<p class="text-muted">Sign In to your account</p>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-user"></i></span>
</div>
<input type="text" class="form-control" placeholder="Username" autocomplete="username" required>
</div>
<input type="text" class="form-control" placeholder="Username">
</div>
<div class="input-group mb-4">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-lock"></i></span>
</div>
<input type="password" class="form-control" placeholder="Password">
</div>
<div class="row">
<div class="col-6">
<button type="button" class="btn btn-primary px-4">Login</button>
<div class="input-group mb-4">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-lock"></i></span>
</div>
<input type="password" class="form-control" placeholder="Password" autocomplete="current-password" required>
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-link px-0">Forgot password?</button>
<div class="row">
<div class="col-6">
<button type="button" class="btn btn-primary px-4">Login</button>
</div>
<div class="col-6 text-right">
<button type="button" class="btn btn-link px-0">Forgot password?</button>
</div>
</div>
</div>
</form>
</div>
</div>
<div class="card text-white bg-primary py-5 d-md-down-none" style="width:44%">
Expand Down
48 changes: 25 additions & 23 deletions src/app/views/register/register.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,35 @@
<div class="col-md-6 mx-auto">
<div class="card mx-4">
<div class="card-body p-4">
<h1>Register</h1>
<p class="text-muted">Create your account</p>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-user"></i></span>
<form>
<h1>Register</h1>
<p class="text-muted">Create your account</p>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-user"></i></span>
</div>
<input type="text" class="form-control" placeholder="Username" autocomplete="username" required>
</div>
<input type="text" class="form-control" placeholder="Username">
</div>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text">@</span>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text">@</span>
</div>
<input type="text" class="form-control" placeholder="Email" autocomplete="email" required>
</div>
<input type="text" class="form-control" placeholder="Email">
</div>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-lock"></i></span>
<div class="input-group mb-3">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-lock"></i></span>
</div>
<input type="password" class="form-control" placeholder="Password" autocomplete="new-password" required>
</div>
<input type="password" class="form-control" placeholder="Password">
</div>
<div class="input-group mb-4">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-lock"></i></span>
<div class="input-group mb-4">
<div class="input-group-prepend">
<span class="input-group-text"><i class="icon-lock"></i></span>
</div>
<input type="password" class="form-control" placeholder="Repeat password" autocomplete="new-password" required>
</div>
<input type="password" class="form-control" placeholder="Repeat password">
</div>
<button type="button" class="btn btn-block btn-success">Create Account</button>
<button type="button" class="btn btn-block btn-success">Create Account</button>
</form>
</div>
<div class="card-footer p-4">
<div class="row">
Expand Down

0 comments on commit 544f9a5

Please sign in to comment.