Compare commits

..

4 Commits

Author SHA1 Message Date
sercan
116721dd33 Updated Angular to 8.1.2, Angular Material to 8.1.1 and updated various other packages
Fixed: Fuse Navigation collapsable items don't collapse/expand correctly after certain level if used more than once within the same group
Fixed: Better dark mode support for Calendar App
2019-07-20 13:46:35 +03:00
sercan
b2f56fcd12 Disabled Angular compiler checks to disable the warnings until we fix them 2019-07-04 21:54:51 +03:00
sercan
72fd2dd22d Angular 8.1.0 compatibility update
Various small fixes
2019-07-04 18:11:05 +03:00
sercan
00e228ab5a Removed redundant mat-list checkbox fix 2019-06-01 12:39:27 +03:00
18 changed files with 903 additions and 618 deletions

View File

@@ -5,12 +5,8 @@
# You can see what browsers were selected by your queries by running:
# npx browserslist
# Googlebot uses an older version of Chrome
# For additional information see: https://developers.google.com/search/docs/guides/rendering
> 0.5%
last 2 versions
Firefox ESR
Chrome 41 # Support for Googlebot
not dead
not IE 9-11 # For IE 9-11 support, remove 'not'.

View File

@@ -1,8 +1,12 @@
// @ts-check
// Protractor configuration file, see link for more information
// https://github.com/angular/protractor/blob/master/lib/config.ts
const {SpecReporter} = require('jasmine-spec-reporter');
const { SpecReporter } = require('jasmine-spec-reporter');
/**
* @type { import("protractor").Config }
*/
exports.config = {
allScriptsTimeout: 11000,
specs : [
@@ -24,8 +28,8 @@ exports.config = {
onPrepare()
{
require('ts-node').register({
project: require('path').join(__dirname, './tsconfig.e2e.json')
project: require('path').join(__dirname, './tsconfig.json')
});
jasmine.getEnv().addReporter(new SpecReporter({spec: {displayStacktrace: true}}));
}
};
};

View File

@@ -1,4 +1,5 @@
import { FusePage } from './app.po';
import { browser, logging } from 'protractor';
describe('Fuse App', () => {
let page: FusePage;
@@ -11,4 +12,12 @@ describe('Fuse App', () => {
page.navigateTo();
expect(page.getParagraphText()).toEqual('Welcome to Fuse!');
});
afterEach(async () => {
// Assert that there are no errors emitted from the browser
const logs = await browser.manage().logs().get(logging.Type.BROWSER);
expect(logs).not.toContain(jasmine.objectContaining({
level: logging.Level.SEVERE
} as logging.Entry));
});
});

View File

@@ -1,11 +1,14 @@
import { browser, by, element } from 'protractor';
export class FusePage {
navigateTo(): any {
return browser.get('/');
export class FusePage
{
navigateTo(): Promise<any>
{
return browser.get('/') as Promise<any>;
}
getParagraphText(): any {
return element(by.css('app #main')).getText();
getParagraphText(): Promise<string>
{
return element(by.css('app #main')).getText() as Promise<string>;
}
}

View File

@@ -1,13 +1,13 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/app",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}

13
e2e/tsconfig.json Normal file
View File

@@ -0,0 +1,13 @@
{
"extends": "../tsconfig.json",
"compilerOptions": {
"outDir": "../out-tsc/e2e",
"module": "commonjs",
"target": "es5",
"types": [
"jasmine",
"jasminewd2",
"node"
]
}
}

1181
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "fuse",
"version": "8.0.0",
"version": "8.1.2",
"license": "https://themeforest.net/licenses/terms/regular",
"scripts": {
"ng": "ng",
@@ -18,59 +18,59 @@
},
"private": true,
"dependencies": {
"@agm/core": "1.0.0-beta.5",
"@angular/animations": "8.0.0",
"@angular/cdk": "8.0.0",
"@angular/common": "8.0.0",
"@angular/compiler": "8.0.0",
"@angular/core": "8.0.0",
"@agm/core": "1.0.0-beta.7",
"@angular/animations": "8.1.2",
"@angular/cdk": "8.1.1",
"@angular/common": "8.1.2",
"@angular/compiler": "8.1.2",
"@angular/core": "8.1.2",
"@angular/flex-layout": "8.0.0-beta.26",
"@angular/forms": "8.0.0",
"@angular/material": "8.0.0",
"@angular/material-moment-adapter": "8.0.0",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/router": "8.0.0",
"@ngrx/effects": "8.0.0-beta.2",
"@ngrx/router-store": "8.0.0-beta.2",
"@ngrx/store": "8.0.0-beta.2",
"@ngrx/store-devtools": "8.0.0-beta.2",
"@angular/forms": "8.1.2",
"@angular/material": "8.1.1",
"@angular/material-moment-adapter": "8.1.1",
"@angular/platform-browser": "8.1.2",
"@angular/platform-browser-dynamic": "8.1.2",
"@angular/router": "8.1.2",
"@ngrx/effects": "8.1.0",
"@ngrx/router-store": "8.1.0",
"@ngrx/store": "8.1.0",
"@ngrx/store-devtools": "8.1.0",
"@ngx-translate/core": "11.0.1",
"@swimlane/dragula": "3.8.0",
"@swimlane/ngx-charts": "11.1.0",
"@swimlane/ngx-datatable": "15.0.0",
"@swimlane/ngx-dnd": "7.0.0",
"@swimlane/ngx-charts": "12.0.1",
"@swimlane/ngx-datatable": "15.0.2",
"@swimlane/ngx-dnd": "8.0.0",
"@types/prismjs": "1.16.0",
"angular-calendar": "0.27.8",
"angular-calendar": "0.27.13",
"angular-in-memory-web-api": "0.8.0",
"chart.js": "2.8.0",
"classlist.js": "1.1.20150312",
"d3": "5.9.2",
"d3": "5.9.7",
"date-fns": "1.30.1",
"hammerjs": "2.0.8",
"lodash": "4.17.11",
"lodash": "4.17.15",
"moment": "2.24.0",
"ng2-charts": "2.2.4",
"ng2-charts": "2.3.0",
"ngrx-store-freeze": "0.2.4",
"ngx-color-picker": "7.5.0",
"ngx-color-picker": "8.1.0",
"ngx-cookie-service": "2.2.0",
"perfect-scrollbar": "1.4.0",
"prismjs": "1.16.0",
"rxjs": "6.5.2",
"web-animations-js": "github:angular/web-animations-js#release_pr208",
"web-animations-js": "2.3.2",
"zone.js": "0.9.1"
},
"devDependencies": {
"@angular/cli": "8.0.0",
"@angular/compiler-cli": "8.0.0",
"@angular/language-service": "8.0.0",
"@angular-devkit/build-angular": "0.800.0",
"@angular/cli": "8.1.2",
"@angular/compiler-cli": "8.1.2",
"@angular/language-service": "8.1.2",
"@angular-devkit/build-angular": "0.801.2",
"@angularclass/hmr": "2.1.3",
"@types/jasmine": "3.3.13",
"@types/jasmine": "3.3.14",
"@types/jasminewd2": "2.0.6",
"@types/lodash": "4.14.132",
"@types/lodash": "4.14.136",
"@types/node": "8.9.5",
"codelyzer": "5.0.1",
"codelyzer": "5.1.0",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "4.1.0",
@@ -80,7 +80,7 @@
"karma-jasmine-html-reporter": "1.4.2",
"protractor": "5.4.2",
"ts-node": "7.0.1",
"tslib": "1.9.3",
"tslib": "1.10.0",
"tslint": "5.15.0",
"typescript": "3.4.5",
"webpack-bundle-analyzer": "3.3.2"

View File

@@ -203,23 +203,30 @@ export class FuseNavVerticalCollapsableComponent implements OnInit, OnDestroy
*/
isChildrenOf(parent, item): boolean
{
if ( !parent.children )
const children = parent.children;
if ( !children )
{
return false;
}
if ( parent.children.indexOf(item) !== -1 )
if ( children.indexOf(item) > -1 )
{
return true;
}
for ( const children of parent.children )
for ( const child of children )
{
if ( children.children )
if ( child.children )
{
return this.isChildrenOf(children, item);
if ( this.isChildrenOf(child, item) )
{
return true;
}
}
}
return false;
}
/**
@@ -232,22 +239,24 @@ export class FuseNavVerticalCollapsableComponent implements OnInit, OnDestroy
*/
isUrlInChildren(parent, url): boolean
{
if ( !parent.children )
const children = parent.children;
if ( !children )
{
return false;
}
for ( let i = 0; i < parent.children.length; i++ )
for ( const child of children )
{
if ( parent.children[i].children )
if ( child.children )
{
if ( this.isUrlInChildren(parent.children[i], url) )
if ( this.isUrlInChildren(child, url) )
{
return true;
}
}
if ( parent.children[i].url === url || url.includes(parent.children[i].url) )
if ( child.url === url || url.includes(child.url) )
{
return true;
}

View File

@@ -48,11 +48,6 @@ button {
font-size: 16px;
}
.mat-pseudo-checkbox-checked:after {
width: 14px !important;
height: 7px !important;
}
// Fix: "Input underlines has wrong color opacity value"
.mat-form-field-underline {
background-color: rgba(0, 0, 0, 0.12);
@@ -118,4 +113,4 @@ mat-chip {
// Fix: Mat-card-image requires a bigger width than 100%
.mat-card-image {
max-width: none !important;
}
}

View File

@@ -144,7 +144,7 @@
.datatable-footer-inner {
padding: 0 24px;
@include media-breakpoint('sm') {
@include media-breakpoint('lt-md') {
flex-direction: column;
padding: 16px 0;
height: auto !important;
@@ -166,7 +166,18 @@
li {
a {
display: flex;
align-items: center;
justify-content: center;
text-decoration: none !important;
i {
width: 20px;
min-width: 20px;
height: 20px;
min-height: 20px;
padding: 0;
}
}
}
}

View File

@@ -7,6 +7,7 @@
// Month view
.cal-month-view {
background: transparent !important;
.cal-day-badge {
background: map-get($accent, default);
@@ -80,6 +81,7 @@
// Week view
.cal-week-view {
background: transparent !important;
.cal-event {
@@ -126,10 +128,58 @@
}
}
}
.cal-day-column {
border-left-color: map-get($foreground, divider);
}
.cal-all-day-events {
border-color: map-get($foreground, divider);
}
.cal-time-events {
border-color: map-get($foreground, divider);
.cal-day-columns:not(.cal-resize-active) .cal-hour-segment:hover {
background: map-get($background, hover);
}
}
.cal-hour {
.cal-hour-segment {
&:hover {
background: map-get($background, hover);
}
}
&.cal-hour-odd {
background: map-get($background, hover);
}
&:not(:last-child) {
.cal-hour-segment {
border-color: map-get($foreground, divider);
}
}
&:last-child {
:not(:last-child) {
.cal-hour-segment {
border-color: map-get($foreground, divider);
}
}
}
}
}
// Day view
.cal-day-view {
background: transparent !important;
.cal-hour-rows {
border-color: map-get($foreground, divider);
@@ -189,4 +239,4 @@
}
}
}
}
}

View File

@@ -19,6 +19,89 @@
<div class="changelog">
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v8.1.2 -->
<!-- --------------------------------------------------------------------------------------------- -->
<div class="entry">
<div class="title">
<span class="version">v8.1.2</span>
<span class="date">2019.07.20</span>
</div>
<div class="groups">
<div class="new">
<span class="title">New</span>
<ul>
<li>Updated Angular to 8.1.2</li>
<li>Updated Angular Material to 8.1.1</li>
<li>Updated various other packages to latest versions</li>
</ul>
</div>
<div class="fixed">
<span class="title">Fixed</span>
<ul>
<li>(Fuse Navigation) Multiple collapsable menu items within the same group don't expand/collapse correctly</li>
<li>(Calendar App) Better dark mode support</li>
</ul>
</div>
</div>
</div>
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v8.1.1 -->
<!-- --------------------------------------------------------------------------------------------- -->
<div class="entry">
<div class="title">
<span class="version">v8.1.1</span>
<span class="date">2019.07.04</span>
</div>
<div class="groups">
<div class="fixed">
<span class="title">Fixed</span>
<ul>
<li>Disabled Angular compiler checks until we fix the warnings</li>
</ul>
</div>
</div>
</div>
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v8.1.0 -->
<!-- --------------------------------------------------------------------------------------------- -->
<div class="entry">
<div class="title">
<span class="version">v8.1.0</span>
<span class="date">2019.07.04</span>
</div>
<div class="groups">
<div class="new">
<span class="title">New</span>
<ul>
<li>Updated Angular to 8.1.0</li>
<li>Updated Angular Material to 8.0.2</li>
<li>Use proper version on web-animations-js package</li>
<li>Updated various other packages to latest versions</li>
<li>Updated various AngularCLI related files</li>
<li>Updated various project related files</li>
</ul>
</div>
</div>
</div>
<!-- --------------------------------------------------------------------------------------------- -->
<!-- @ v8.0.0 -->
<!-- --------------------------------------------------------------------------------------------- -->

View File

@@ -869,7 +869,7 @@ export const navigation: FuseNavigation[] = [
icon : 'update',
url : '/documentation/changelog',
badge: {
title: '8.0.0',
title: '8.1.2',
bg : '#EC0C8E',
fg : '#FFFFFF'
}

View File

@@ -26,5 +26,5 @@ if ( environment.hmr )
}
else
{
bootstrap().catch(err => console.log(err));
bootstrap().catch(err => console.error(err));
}

View File

@@ -57,6 +57,7 @@ import 'web-animations-js'; // Run `npm install --save web-animations-js`.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
/***************************************************************************************************
* APPLICATION IMPORTS
*/

View File

@@ -5,10 +5,10 @@
"outDir": "./dist/out-tsc",
"sourceMap": true,
"declaration": false,
"downlevelIteration": true,
"experimentalDecorators": true,
"module": "esnext",
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"target": "es2015",
"typeRoots": [
@@ -23,5 +23,9 @@
"@fuse/"
]
}
},
"angularCompilerOptions": {
"fullTemplateTypeCheck": false,
"strictInjectionParameters": false
}
}

View File

@@ -4,7 +4,7 @@
"array-type": false,
"arrow-parens": false,
"deprecation": {
"severity": "warn"
"severity": "warning"
},
"component-class-suffix": true,
"contextual-lifecycle": true,