Skip to content

Commit 995b091

Browse files
mrholekmrholek
authored
Merge pull request #74 from coreui/v2.0.0
V2.0.0
2 parents 2c616c2 + 8f001b1 commit 995b091

File tree

7 files changed

+108
-107
lines changed

7 files changed

+108
-107
lines changed

‎package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@coreui/coreui-free-angular-admin-template",
3-
"version": "2.0.0-beta.0",
3+
"version": "2.0.0-beta.1",
44
"description": "CoreUI Free Angular 2+ Admin Template",
55
"author": "Łukasz Holeczek",
66
"homepage": "https://coreui.io/angular",
@@ -26,7 +26,7 @@
2626
"@angular/platform-browser-dynamic": "5.2.10",
2727
"@angular/router": "5.2.10",
2828
"@coreui/angular": "^2.0.0-beta.2",
29-
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.0.0",
29+
"@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.1.0",
3030
"chart.js": "2.7.2",
3131
"core-js": "2.5.5",
3232
"flag-icon-css": "3.0.0",

‎src/app/views/dashboard/dashboard.component.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ <h4 class="mb-0">9.823</h4>
1818
<p>Members online</p>
1919
</div>
2020
<div class="chart-wrapper px-3" style="height:70px;">
21-
<canvas id="cardChart1" baseChart class="chart"
21+
<canvas baseChart class="chart"
2222
[datasets]="lineChart1Data"
2323
[labels]="lineChart1Labels"
2424
[options]="lineChart1Options"
@@ -38,7 +38,7 @@ <h4 class="mb-0">9.823</h4>
3838
<p>Members online</p>
3939
</div>
4040
<div class="chart-wrapper px-3" style="height:70px;">
41-
<canvas id="cardChart2" baseChart class="chart"
41+
<canvas baseChart class="chart"
4242
[datasets]="lineChart2Data"
4343
[labels]="lineChart2Labels"
4444
[options]="lineChart2Options"
@@ -65,7 +65,7 @@ <h4 class="mb-0">9.823</h4>
6565
<p>Members online</p>
6666
</div>
6767
<div class="chart-wrapper" style="height:70px;">
68-
<canvas id="cardChart3" baseChart class="chart"
68+
<canvas baseChart class="chart"
6969
[datasets]="lineChart3Data"
7070
[labels]="lineChart3Labels"
7171
[options]="lineChart3Options"
@@ -92,7 +92,7 @@ <h4 class="mb-0">9.823</h4>
9292
<p>Members online</p>
9393
</div>
9494
<div class="chart-wrapper px-3" style="height:70px;">
95-
<canvas id="cardChart4" baseChart class="chart"
95+
<canvas baseChart class="chart"
9696
[datasets]="barChart1Data"
9797
[labels]="barChart1Labels"
9898
[options]="barChart1Options"
@@ -120,7 +120,7 @@ <h4 class="card-title mb-0">Traffic</h4>
120120
</div><!--/.col-->
121121
</div><!--/.row-->
122122
<div class="chart-wrapper" style="height:300px;margin-top:40px;">
123-
<canvas id="mainChart" baseChart class="chart"
123+
<canvas baseChart class="chart"
124124
[datasets]="mainChartData"
125125
[labels]="mainChartLabels"
126126
[options]="mainChartOptions"
@@ -176,7 +176,7 @@ <h4 class="card-title mb-0">Traffic</h4>
176176
<div class="brand-card-header bg-facebook">
177177
<i class="fa fa-facebook"></i>
178178
<div class="chart-wrapper">
179-
<canvas id="brandBox1" baseChart class="chart"
179+
<canvas baseChart class="chart"
180180
[datasets]="brandBoxChartData1"
181181
[labels]="brandBoxChartLabels"
182182
[options]="brandBoxChartOptions"
@@ -202,7 +202,7 @@ <h4 class="card-title mb-0">Traffic</h4>
202202
<div class="brand-card-header bg-twitter">
203203
<i class="fa fa-twitter"></i>
204204
<div class="chart-wrapper">
205-
<canvas id="brandBox2" baseChart class="chart"
205+
<canvas baseChart class="chart"
206206
[datasets]="brandBoxChartData2"
207207
[labels]="brandBoxChartLabels"
208208
[options]="brandBoxChartOptions"
@@ -228,7 +228,7 @@ <h4 class="card-title mb-0">Traffic</h4>
228228
<div class="brand-card-header bg-linkedin">
229229
<i class="fa fa-linkedin"></i>
230230
<div class="chart-wrapper">
231-
<canvas id="brandBox3" baseChart class="chart"
231+
<canvas baseChart class="chart"
232232
[datasets]="brandBoxChartData3"
233233
[labels]="brandBoxChartLabels"
234234
[options]="brandBoxChartOptions"
@@ -254,7 +254,7 @@ <h4 class="card-title mb-0">Traffic</h4>
254254
<div class="brand-card-header bg-google-plus">
255255
<i class="fa fa-google-plus"></i>
256256
<div class="chart-wrapper">
257-
<canvas id="brandBox4" baseChart class="chart"
257+
<canvas baseChart class="chart"
258258
[datasets]="brandBoxChartData4"
259259
[labels]="brandBoxChartLabels"
260260
[options]="brandBoxChartOptions"

‎src/app/views/login/login.component.html‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,47 @@
1-
<div class="app flex-row align-items-center">
2-
<div class="container">
3-
<div class="row justify-content-center">
4-
<div class="col-md-8">
5-
<div class="card-group">
6-
<div class="card p-4">
7-
<div class="card-body">
8-
<h1>Login</h1>
9-
<p class="text-muted">Sign In to your account</p>
10-
<div class="input-group mb-3">
11-
<div class="input-group-prepend">
12-
<span class="input-group-text"><i class="icon-user"></i></span>
1+
<div class="app-body">
2+
<main class="main d-flex align-items-center">
3+
<div class="container">
4+
<div class="row">
5+
<div class="col-md-8 mx-auto">
6+
<div class="card-group">
7+
<div class="card p-4">
8+
<div class="card-body">
9+
<h1>Login</h1>
10+
<p class="text-muted">Sign In to your account</p>
11+
<div class="input-group mb-3">
12+
<div class="input-group-prepend">
13+
<span class="input-group-text"><i class="icon-user"></i></span>
14+
</div>
15+
<input type="text" class="form-control" placeholder="Username">
1316
</div>
14-
<input type="text" class="form-control" placeholder="Username">
15-
</div>
16-
<div class="input-group mb-4">
17-
<div class="input-group-prepend">
18-
<span class="input-group-text"><i class="icon-lock"></i></span>
19-
</div>
20-
<input type="password" class="form-control" placeholder="Password">
21-
</div>
22-
<div class="row">
23-
<div class="col-6">
24-
<button type="button" class="btn btn-primary px-4">Login</button>
17+
<div class="input-group mb-4">
18+
<div class="input-group-prepend">
19+
<span class="input-group-text"><i class="icon-lock"></i></span>
20+
</div>
21+
<input type="password" class="form-control" placeholder="Password">
2522
</div>
26-
<div class="col-6 text-right">
27-
<button type="button" class="btn btn-link px-0">Forgot password?</button>
23+
<div class="row">
24+
<div class="col-6">
25+
<button type="button" class="btn btn-primary px-4">Login</button>
26+
</div>
27+
<div class="col-6 text-right">
28+
<button type="button" class="btn btn-link px-0">Forgot password?</button>
29+
</div>
2830
</div>
2931
</div>
3032
</div>
31-
</div>
32-
<div class="card text-white bg-primary py-5 d-md-down-none" style="width:44%">
33-
<div class="card-body text-center">
34-
<div>
35-
<h2>Sign up</h2>
36-
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
37-
<button type="button" class="btn btn-primary active mt-3">Register Now!</button>
33+
<div class="card text-white bg-primary py-5 d-md-down-none" style="width:44%">
34+
<div class="card-body text-center">
35+
<div>
36+
<h2>Sign up</h2>
37+
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</p>
38+
<button type="button" class="btn btn-primary active mt-3">Register Now!</button>
39+
</div>
3840
</div>
3941
</div>
4042
</div>
4143
</div>
4244
</div>
4345
</div>
44-
</div>
46+
</main>
4547
</div>

‎src/app/views/register/register.component.html‎

Lines changed: 39 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,51 @@
1-
<div class="app flex-row align-items-center">
2-
<div class="container">
3-
<div class="row justify-content-center">
4-
<div class="col-md-6">
5-
<div class="card mx-4">
6-
<div class="card-body p-4">
7-
<h1>Register</h1>
8-
<p class="text-muted">Create your account</p>
9-
<div class="input-group mb-3">
10-
<div class="input-group-prepend">
11-
<span class="input-group-text"><i class="icon-user"></i></span>
1+
<div class="app-body">
2+
<main class="main d-flex align-items-center">
3+
<div class="container">
4+
<div class="row">
5+
<div class="col-md-6 mx-auto">
6+
<div class="card mx-4">
7+
<div class="card-body p-4">
8+
<h1>Register</h1>
9+
<p class="text-muted">Create your account</p>
10+
<div class="input-group mb-3">
11+
<div class="input-group-prepend">
12+
<span class="input-group-text"><i class="icon-user"></i></span>
13+
</div>
14+
<input type="text" class="form-control" placeholder="Username">
1215
</div>
13-
<input type="text" class="form-control" placeholder="Username">
14-
</div>
15-
16-
<div class="input-group mb-3">
17-
<div class="input-group-prepend">
18-
<span class="input-group-text">@</span>
16+
<div class="input-group mb-3">
17+
<div class="input-group-prepend">
18+
<span class="input-group-text">@</span>
19+
</div>
20+
<input type="text" class="form-control" placeholder="Email">
1921
</div>
20-
<input type="text" class="form-control" placeholder="Email">
21-
</div>
22-
23-
<div class="input-group mb-3">
24-
<div class="input-group-prepend">
25-
<span class="input-group-text"><i class="icon-lock"></i></span>
22+
<div class="input-group mb-3">
23+
<div class="input-group-prepend">
24+
<span class="input-group-text"><i class="icon-lock"></i></span>
25+
</div>
26+
<input type="password" class="form-control" placeholder="Password">
2627
</div>
27-
<input type="password" class="form-control" placeholder="Password">
28-
</div>
29-
30-
<div class="input-group mb-4">
31-
<div class="input-group-prepend">
32-
<span class="input-group-text"><i class="icon-lock"></i></span>
28+
<div class="input-group mb-4">
29+
<div class="input-group-prepend">
30+
<span class="input-group-text"><i class="icon-lock"></i></span>
31+
</div>
32+
<input type="password" class="form-control" placeholder="Repeat password">
3333
</div>
34-
<input type="password" class="form-control" placeholder="Repeat password">
34+
<button type="button" class="btn btn-block btn-success">Create Account</button>
3535
</div>
36-
37-
<button type="button" class="btn btn-block btn-success">Create Account</button>
38-
</div>
39-
<div class="card-footer p-4">
40-
<div class="row">
41-
<div class="col-6">
42-
<button class="btn btn-block btn-facebook" type="button"><span>facebook</span></button>
43-
</div>
44-
<div class="col-6">
45-
<button class="btn btn-block btn-twitter" type="button"><span>twitter</span></button>
36+
<div class="card-footer p-4">
37+
<div class="row">
38+
<div class="col-6">
39+
<button class="btn btn-block btn-facebook" type="button"><span>facebook</span></button>
40+
</div>
41+
<div class="col-6">
42+
<button class="btn btn-block btn-twitter" type="button"><span>twitter</span></button>
43+
</div>
4644
</div>
4745
</div>
4846
</div>
4947
</div>
5048
</div>
5149
</div>
52-
</div>
50+
</main>
5351
</div>

‎src/app/views/register/register.component.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Component } from '@angular/core';
22

33
@Component({
4+
selector: 'app-dashboard',
45
templateUrl: 'register.component.html'
56
})
67
export class RegisterComponent {

0 commit comments

Comments
 (0)