Skip to content
This repository has been archived by the owner on Nov 21, 2024. It is now read-only.

Commit

Permalink
Merge branch 'release/1.30.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
EndyKaufman committed Jan 12, 2018
2 parents f73ceb7 + e689ceb commit a5712af
Show file tree
Hide file tree
Showing 168 changed files with 9,586 additions and 6,730 deletions.
1 change: 0 additions & 1 deletion .angular-cli.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"tsconfig": "tsconfig.json",
"prefix": "app",
"styles": [
"../../../node_modules/ladda/css/ladda.scss",
"styles.scss"
],
"scripts": [],
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
.tmp
dist
tmp
.ng_pkg_build
out-tsc
*.tgz

Expand Down
27 changes: 27 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,30 @@
<a name="1.30.0"></a>
# [1.30.0](https://github.com/rucken/core/compare/1.29.1...1.30.0) (2018-01-10)


### Bug Fixes

* **base:** Add @Input to title for base page and frame ([3a6bd4f](https://github.com/rucken/core/commit/3a6bd4f))
* **base:** Remove interfaces change its to classes [#83](https://github.com/rucken/core/issues/83) ([aace802](https://github.com/rucken/core/commit/aace802))
* **base-resource-list:** If used mock items and not set perPage, set default to 10 items on per page ([22e4405](https://github.com/rucken/core/commit/22e4405))
* **deps:** Remove [@ngui](https://github.com/ngui)/auto-complete and angular2-ladda ([140abe6](https://github.com/rucken/core/commit/140abe6))
* **deps:** Update dependencies ([92b7850](https://github.com/rucken/core/commit/92b7850))
* **profile-frame:** Fix error in update profile [#82](https://github.com/rucken/core/issues/82) ([8eb1821](https://github.com/rucken/core/commit/8eb1821))
* **select-input:** Fix work typeahead and add async loading [#81](https://github.com/rucken/core/issues/81) ([bf2d031](https://github.com/rucken/core/commit/bf2d031))
* **styles:** Remove custom styles like "app-grid-...." and others [#101](https://github.com/rucken/core/issues/101) ([5ce1ee2](https://github.com/rucken/core/commit/5ce1ee2))
* **text-input:** Set null if date value is invalid ([9baed6d](https://github.com/rucken/core/commit/9baed6d))
* **user-components:** Add check userGroups before set/get values from its ([4bc7576](https://github.com/rucken/core/commit/4bc7576))
* Add update local items on change mock items ([6b55cbf](https://github.com/rucken/core/commit/6b55cbf))


### Features

* **base:** Add interfaces for service and model and implements all from its [#83](https://github.com/rucken/core/issues/83) ([f043bec](https://github.com/rucken/core/commit/f043bec))
* **text-input:** Change datepicker component for new ngx-bootstrap style [#81](https://github.com/rucken/core/issues/81) ([4272629](https://github.com/rucken/core/commit/4272629))
* **user.model:** Add checkGroups method ([7849399](https://github.com/rucken/core/commit/7849399))



<a name="1.29.1"></a>
## [1.29.1](https://github.com/rucken/core/compare/1.29.0...1.29.1) (2017-12-14)

Expand Down
Empty file.
8 changes: 3 additions & 5 deletions apps/demo/src/app/app.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, ComponentFactoryResolver, Injector, ViewContainerRef, ViewEncapsulation } from '@angular/core';
import { Component, ComponentFactoryResolver, Injector, ViewContainerRef } from '@angular/core';
import { NavigationEnd, Router } from '@angular/router';
import { RuckenCoreRuI18n, translate } from '@rucken/core';
import { AlertModalComponent, BaseAppComponent, RuckenWebRuI18n } from '@rucken/web';
import * as _ from 'lodash';
import * as lodashImported from 'lodash'; const _ = lodashImported;
import { defineLocale } from 'ngx-bootstrap/bs-moment';
import { enGb, ru } from 'ngx-bootstrap/locale';
import { takeUntil } from 'rxjs/operators';
Expand All @@ -15,9 +15,7 @@ defineLocale('en', enGb);
@Component({
selector: 'demo-root',
templateUrl: './app.component.html',
styleUrls: ['./app.component.scss'],
entryComponents: [AlertModalComponent],
encapsulation: ViewEncapsulation.None
entryComponents: [AlertModalComponent]
})
export class DemoAppComponent extends BaseAppComponent {

Expand Down
6 changes: 0 additions & 6 deletions apps/demo/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import {
WebThemesService,
WebTokenService,
} from '@rucken/web';
import { LaddaModule } from 'angular2-ladda';
import {
ComponentLoaderFactory,
PaginationConfig,
Expand All @@ -43,11 +42,6 @@ import { DemoHttpHelper } from './shared/helpers/http.helper';
BrowserModule,
FormsModule,
HttpClientModule,
LaddaModule.forRoot({
style: 'expand-left',
spinnerColor: 'white',
spinnerLines: 12
}),
TranslateModule.forRoot({
loader: { provide: TranslateLoader, useClass: TranslateFakeLoader }
}),
Expand Down
14 changes: 7 additions & 7 deletions apps/demo/src/app/controls/navbar/navbar.component.html
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
<!-- Fixed navbar -->
<nav class="app-navbar navbar navbar-default navbar-fixed-top">
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed pointer" data-toggle="collapse" data-target="#navbar" aria-expanded="false"
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false"
aria-controls="navbar" (click)="isCollapsed = !isCollapsed">
<span class="sr-only" translate>Menu</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand pointer">
<a class="navbar-brand" href="javascript:void(0)">
<span (click)="go(['/'])" translate>Rucken: Demo</span>
<span class="badge" (click)="showChangeLog()">{{version | customTranslate}}</span>
</a>
</div>
<div id="navbar" class="navbar-collapse collapse" [collapse]="isCollapsed">
<ul class="nav navbar-nav navbar-right">
<li *ngFor="let item of childrenRoutes" [class.active]="router.isActive(item.url)" class="pointer">
<li *ngFor="let item of childrenRoutes" [class.active]="router.isActive(item.url)">
<a [routerLink]="[item.name]">{{item.title | translate}}</a>
</li>
<li class="dropdown pointer">
<li class="dropdown">
<a (click)="languagesIsCollapsed = !languagesIsCollapsed" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
aria-expanded="false">{{languageTitle | translate}}
<span class="caret"></span>
Expand All @@ -30,10 +30,10 @@
</li>
</ul>
</li>
<li *ngIf="account" class="pointer">
<li *ngIf="account">
<a (click)="showLogoutModal()" translate>Logout</a>
</li>
<li *ngIf="!account" class="pointer">
<li *ngIf="!account">
<a (click)="showLoginModal()" translate>Login</a>
</li>
</ul>
Expand Down
Empty file.
1 change: 0 additions & 1 deletion apps/demo/src/app/controls/navbar/navbar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import { DemoRoutes } from './../../app.routes';
@Component({
selector: 'demo-navbar',
templateUrl: './navbar.component.html',
styleUrls: ['./navbar.component.scss'],
entryComponents: [ConfirmModalComponent, AuthModalComponent]
})

Expand Down
Empty file.
3 changes: 1 addition & 2 deletions apps/demo/src/app/pages/home-page/home-page.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import { BasePageComponent } from '@rucken/web';

@Component({
selector: 'demo-home-page',
templateUrl: './home-page.component.html',
styleUrls: ['./home-page.component.scss']
templateUrl: './home-page.component.html'
})
export class DemoHomePageComponent extends BasePageComponent {

Expand Down
2 changes: 1 addition & 1 deletion apps/demo/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<meta charset="utf-8">
<title>Rucken: Demo</title>
<base href="/">
<meta name="version" content="1.29.1">
<meta name="version" content="1.30.0">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="icon" type="image/x-icon" href="favicon.ico">
<link href="assets/css/please-wait.css" rel="stylesheet">
Expand Down
110 changes: 43 additions & 67 deletions apps/demo/src/styles.scss
Original file line number Diff line number Diff line change
@@ -1,113 +1,89 @@
body
{
//min-height: 2000px;
body {
padding-top: 70px;
}
.app-navbar
{
&__item
{
&.active
{
font-weight: 700;
}
}
}
.app-sidebar
{
&__item
{
&.active
{
font-weight: 700;
}
}
}
.app-grid
{
&__toolbar
{
&--header
{

@import '../../../node_modules/ngx-bootstrap/datepicker/bs-datepicker.css';

.grid {
&__toolbar {
&--header {
padding-bottom: 5px;
}
&--footer
{
&--footer {
padding-top: 5px;
}
}
&__table
{
&__table {
margin-bottom: 0px;

tr{
td{
cursor:pointer;
tr {
td {
cursor: pointer;
}
th{
th {
vertical-align: top!important;
position: relative;
padding-right: 18px !important;
button{
button {
position: absolute;
top: 6px;
right: -0px;
}
}
}
&__col-key
{
&__col-key {
width: 100px;

text-align: left;
}
&__col-id
{
&__col-id {
width: 70px;

text-align: right;
}
&__col-icon
{
&__col-icon {
width: 70px;

text-align: center;
}
&__col-action
{
&__col-action {
width: 100px;

text-align: center;
}
&__col-status-message
{
&__col-status-message {
text-align: center;
}
}
}
.input-group{
.dropdown-menu
{
>li{
>a{

.input-group {
.dropdown-menu {
>li {
>a {
line-height: 0;
}
}
.divider{
.divider {
margin: 0px 0;
}
}
}
.pointer{
cursor:pointer;
}
.page-header
{

.page-header {
margin: 0 0 20px;
}
tabset>.nav-tabs{
margin-bottom: 10px;
}
.pagination-compressed {
margin-top: 0px;
}
.error-tooltip{
.tooltip-inner{
background-color: #ff0039;
}
.tooltip-arrow.arrow{
border-bottom-color: #ff0039;
}
}
.success-tooltip{
.tooltip-inner {
background-color:#3fb618;
}
.tooltip-arrow.arrow {
border-bottom-color: #3fb618;
}
}
11 changes: 11 additions & 0 deletions libs/core/src/ng-package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"lib": {
"entryFile": "index.ts",
"umdModuleIds": {
"lodash": "_",
"moment": "moment"
}
},
"dest": "../dist",
"workingDirectory": "../.tmp"
}
23 changes: 0 additions & 23 deletions libs/core/src/package-lock.json

This file was deleted.

15 changes: 7 additions & 8 deletions libs/core/src/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "@rucken/core",
"main": "index.js",
"version": "1.29.1",
"version": "1.30.0",
"description": "Core with base class and admin entities for application maked on Angular5+",
"keywords": [
"ngx",
Expand All @@ -14,13 +13,13 @@
"core"
],
"peerDependencies": {
"@angular/common": "*",
"@angular/compiler": "*",
"@angular/core": "*"
"@angular/common": "5.2.0",
"@angular/compiler": "5.2.0",
"@angular/core": "5.2.0"
},
"dependencies": {
"@types/lodash": "*",
"lodash": "*",
"moment": "*"
"@types/lodash": "^4.14.92",
"lodash": "^4.17.4",
"moment": "^2.20.1"
}
}
Loading

0 comments on commit a5712af

Please sign in to comment.