UNOV/mycontrolpanel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/mymirrorbe/mycontrolpanel/src/master

Browse Source
This commit is contained in:
youbertt 2019-07-09 23:31:16 +02:00
commit 61fc269006
7 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
angular.json
View File

@ -25,10 +25,11 @@
"styles": [
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
"src/styles.css",
"./node_modules/primeicons/primeicons.css",
"./node_modules/primeng/resources/themes/nova-light/theme.css",
"./node_modules/primeng/resources/primeng.min.css",
"src/styles.css"
"./node_modules/font-awesome/css/font-awesome.css"
],
"scripts": []
},
@ -86,7 +87,11 @@
"styles": [
"./node_modules/bootstrap/dist/css/bootstrap.min.css",
"./node_modules/ngx-bootstrap/datepicker/bs-datepicker.css",
"src/styles.css"
"src/styles.css",
"./node_modules/primeicons/primeicons.css",
"./node_modules/primeng/resources/themes/nova-light/theme.css",
"./node_modules/primeng/resources/primeng.min.css",
"./node_modules/font-awesome/css/font-awesome.css"
],
"scripts": [],
"assets": [

10
package-lock.json generated
View File

@ -1319,6 +1319,11 @@
"integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
"dev": true
},
"angular-font-awesome": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/angular-font-awesome/-/angular-font-awesome-3.1.2.tgz",
"integrity": "sha1-k3hzJhLY6MceDXwvqg+t3H+Fjsk="
},
"ansi-colors": {
"version": "3.2.4",
"resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
@ -4498,6 +4503,11 @@
}
}
},
"font-awesome": {
"version": "4.7.0",
"resolved": "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz",
"integrity": "sha1-j6jPBBGhoxr9B7BtKQK7n8gVoTM="
},
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",

2
package.json
View File

@ -20,8 +20,10 @@
"@angular/platform-browser": "~7.1.0",
"@angular/platform-browser-dynamic": "~7.1.0",
"@angular/router": "~7.1.0",
"angular-font-awesome": "^3.1.2",
"bootstrap": "^4.3.1",
"core-js": "^2.5.4",
"font-awesome": "^4.7.0",
"jquery": "^3.3.1",
"ngx-bootstrap": "^3.2.0",
"popper": "^1.0.1",

76
src/app/app.component.html
View File

@ -1,60 +1,20 @@
<!--<nav class="navbar navbar-dark bg-dark mb-5">
<a
class="navbar-brand" href="/">Angular & Bootstrap</a>
<div
class="navbar-expand mr-auto">
<div
class="navbar-nav">
<a
class="nav-item nav-link active" href="#">Home</a>
<a
class="nav-item nav-link" href="#">About</a>
<a
class="nav-item nav-link" href="#">Contact</a>
</div>
</div>
<div
class="navbar-expand ml-auto navbar-nav">
<div
class="navbar-nav">
<a
class="nav-item nav-link" href="https://github.com/beeman" target="_blank">
<i
class="fa fa-github"></i>
</a>
<a
class="nav-item nav-link" href="https://twitter.com/beeman_nl" target="_blank">
<i
class="fa fa-twitter"></i>
</a>
<a
class="nav-item nav-link" href="https://medium.com/@beeman" target="_blank">
<i
class="fa fa-medium"></i>
</a>
</div>
</div>
</nav>
-->
<p-toolbar id="Mytoolbar">
<p-toolbar id="Mytoolbar">
<div class="ui-toolbar-group-left">
<button pButton type="button" label="New" icon="pi pi-plus"></button>
<button pButton type="button" label="Upload" icon="pi pi-upload" class="ui-button-success"></button>
<i class="pi pi-bars"></i>
<div class="ui-toolbar-group-left">
<button pButton type="button" label="New" icon="pi pi-plus"></button>
<button pButton type="button" label="Upload" icon="pi pi-upload" class="ui-button-success"></button>
<i class="pi pi-bars"></i>
<p-splitButton label="Save" icon="pi pi-check" [model]="items" styleClass="ui-button-warning"></p-splitButton>
</div>
<div class="ui-toolbar-group-right">
<button pButton type="button" icon="pi pi-search"></button>
<button pButton type="button" icon="pi pi-calendar" class="ui-button-success"></button>
<button pButton type="button" icon="pi pi-times" class="ui-button-danger"></button>
</div>
</p-toolbar>
<router-outlet></router-outlet>
<p-splitButton label="Save" icon="pi pi-check" [model]="items" styleClass="ui-button-warning"></p-splitButton>
</div>
<div class="ui-toolbar-group-right">
<button pButton type="button" icon="fa fa fa-sign-in" label="Log in" iconPos="right" (click)="LogIn()"></button>
<button pButton type="button" icon="pi pi-calendar" class="ui-button-success"></button>
<button pButton type="button" icon="pi pi-times" class="ui-button-danger"></button>
</div>
</p-toolbar>
<router-outlet></router-outlet>

8
src/app/app.component.ts
View File

@ -11,7 +11,7 @@ export class AppComponent implements OnInit{
items : MenuItem[];
//constructor(){}
constructor(){}
ngOnInit(){
this.items = [
{label: 'Update', icon: 'pi pi-refresh'},
@ -21,4 +21,10 @@ export class AppComponent implements OnInit{
}
public LogIn()
{
console.log('helloooo');
// change route -> /login
}
}

1
src/app/app.module.ts
View File

@ -11,7 +11,6 @@ import { BsDatepickerModule } from 'ngx-bootstrap/datepicker';
import { BsDropdownModule } from 'ngx-bootstrap/dropdown';
import { CarouselModule } from 'ngx-bootstrap/carousel';
import { BorderCardDirective } from './directives/border-card.directive';
import { ToolbarModule } from 'primeng/toolbar';
import { ButtonModule } from 'primeng/button';
import { SplitButtonModule } from 'primeng/splitbutton';

2
src/app/home-page/home-page.component.ts
View File

@ -3,8 +3,6 @@ import { Router } from '@angular/router'
@Component({
selector: 'app-home-page',
templateUrl: './home-page.component.html',