Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions .angular-cli.json

This file was deleted.

111 changes: 111 additions & 0 deletions .angular.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,111 @@
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"defaultProject": "compose-teams",
"cli": {
"packageManager": "yarn"
},
"projects": {
"compose-teams": {
"root": "",
"sourceRoot": "src",
"projectType": "application",
"prefix": "app",
"schematics": {},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/compose-teams",
"index": "src/index.html",
"main": "src/main.ts",
"tsConfig": "src/tsconfig.app.json",
"polyfills": "src/polyfills.ts",
"assets": [
"src/assets",
"src/favicon.ico",
{
"glob": "**/*",
"input": "node_modules/compose-teams/assets/",
"output": "./assets/"
}
],
"styles": [
"node_modules/material-design-icons-iconfont/dist/material-design-icons.css",
"src/styles.scss"
],
"scripts": []
},
"polyfills": "src/polyfills.ts",
"optimization": false,
"outputHashing": "all",
"sourceMap": false,
"extractCss": true,
"namedChunks": false,
"aot": false,
"extractLicenses": false,
"vendorChunk": false,
"buildOptimizer": false,
"progress": true
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "compose-teams:build"
},
"configurations": {
"production": {
"browserTarget": "compose-teams:build:production"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "compose-teams:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"karmaConfig": "src/karma.conf.js",
"polyfills": "src/polyfills.ts",
"tsConfig": "src/tsconfig.spec.json",
"scripts": [],
"styles": ["src/styles.scss"],
"assets": ["src/assets", "src/favicon.ico"]
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": ["src/tsconfig.app.json", "src/tsconfig.spec.json"],
"exclude": ["**/node_modules/**"]
}
}
}
},
"compose-teams-e2e": {
"root": "e2e/",
"projectType": "application",
"architect": {
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"webdriverUpdate": false,
"devServerTarget": "compose-teams:serve"
}
},
"lint": {
"builder": "@angular-devkit/build-angular:tslint",
"options": {
"tsConfig": "e2e/tsconfig.e2e.json",
"exclude": ["**/node_modules/**"]
}
}
}
}
}
}
1 change: 1 addition & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ root = true
charset = utf-8
indent_style = space
indent_size = 2
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true

Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
.history

# IDE - VSCode
.vscode
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
Expand All @@ -33,6 +34,7 @@
npm-debug.log
testem.log
/typings
package-lock.json

# e2e
/e2e/*.js
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sudo: false

language: node_js
node_js: 8
node_js: 10.15.2

cache: yarn

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ComposeTeams

This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.2.0.
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.2.0 and updated to 8.0.0.

## Development server

Expand Down
115 changes: 61 additions & 54 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
{
"name": "compose-teams",
"version": "0.0.0",
"version": "0.0.1",
"description": "Angular app to help you generate optimized teams for a sport (ex football).",
"keywords": [
"angular",
"rxjs",
"material"
],
"repository": "https://github.com/maxime1992/compose-teams",
"license": "MIT",
"scripts": {
"ng": "ng",
Expand All @@ -11,66 +18,66 @@
"check": "yarn run lint:check && yarn run prettier:check",
"check:fix": "yarn run lint:fix && yarn run prettier:fix",
"lint:check": "ng lint --type-check",
"lint:fix": "yarn run lint:check -- --fix",
"build:prod": "ng build --prod --build-optimizer --no-sourcemap",
"prettier:base": "yarn run prettier -- --single-quote --trailing-comma es5",
"prettier:base-files": "yarn run prettier:base -- './{e2e,src}/**/*.{scss,ts}'",
"prettier:fix": "yarn run prettier:base-files -- --write",
"prettier:check": "yarn run prettier:base-files -- -l",
"precommit": "lint-staged",
"lint:fix": "yarn run lint:check --fix",
"dist": "ng build",
"prod": "ng build --prod",
"prod:src": "ng build --prod --sourcemaps",
"prettier:base": "yarn run prettier --single-quote --trailing-comma es5",
"prettier:base-files": "yarn run prettier:base './{e2e,src}/**/*.{scss,ts}'",
"prettier:fix": "yarn run prettier:base-files --write",
"prettier:check": "yarn run prettier:base-files -l",
"prepush": "yarn run lint:check"
},
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm fine removing lint-staged and the pre-commit hook.
But why have you removed prettier? The linting commands too?

Copy link
Author

@christophechevalier christophechevalier Jul 12, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maxime1992 Updated but as I say, team.component.scss and need-10-players.component.ts seems cause problem with Prettier. And I can't push without validation.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you mean that you haven't been able to push those files or that it will fail on CI?
Push them using --no-verify (from memory) and I'll take a look

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I pushed with --no-verify.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@maxime1992 Did you take a look for prettier?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really and to be honest I don't have much time for this project.
I think you should just work on your own fork =) !

"lint-staged": {
"linters": {
"*.{ts,scss}": [
"npm run prettier:base -- -l"
]
}
"engines": {
"node": "10.15.2"
},
"private": true,
"dependencies": {
"@angular/animations": "4.4.0-RC.0",
"@angular/cdk": "2.0.0-beta.10",
"@angular/common": "4.4.0-RC.0",
"@angular/compiler": "4.4.0-RC.0",
"@angular/core": "4.4.0-RC.0",
"@angular/flex-layout": "2.0.0-beta.9",
"@angular/forms": "4.4.0-RC.0",
"@angular/http": "4.4.0-RC.0",
"@angular/material": "2.0.0-beta.10",
"@angular/platform-browser": "4.4.0-RC.0",
"@angular/platform-browser-dynamic": "4.4.0-RC.0",
"@angular/router": "4.4.0-RC.0",
"core-js": "2.5.1",
"js-combinatorics": "0.5.2",
"material-design-icons-iconfont": "3.0.3",
"ngx-webstorage": "1.8.0",
"rxjs": "5.4.3",
"zone.js": "0.8.17"
"@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",
"@angular/flex-layout": "8.0.0-beta.26",
"@angular/forms": "8.0.0",
"@angular/material": "8.0.0",
"@angular/platform-browser": "8.0.0",
"@angular/platform-browser-dynamic": "8.0.0",
"@angular/platform-server": "8.0.0",
"@angular/router": "8.0.0",
"core-js": "3.1.3",
"hammerjs": "2.0.8",
"js-combinatorics": "0.5.4",
"material-design-icons-iconfont": "5.0.1",
"ngx-webstorage": "4.0.1",
"rxjs": "6.5.0",
"zone.js": "0.9.1"
},
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ngx-webstorage is a dependency, not a dev one

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated.

"devDependencies": {
"@angular/cli": "1.3.2",
"@angular/compiler-cli": "4.4.0-RC.0",
"@angular/language-service": "4.4.0-RC.0",
"@types/jasmine": "2.5.54",
"@types/jasminewd2": "2.0.3",
"@types/node": "8.0.26",
"codelyzer": "3.1.2",
"husky": "0.14.3",
"jasmine-core": "2.8.0",
"@angular-devkit/build-angular": "0.800.2",
"@angular/cli": "8.0.0",
"@angular/compiler-cli": "8.0.0",
"@angular/language-service": "8.0.0",
"@types/jasmine": "3.3.13",
"@types/js-combinatorics": "0.5.31",
"@types/node": "12.0.8",
"codelyzer": "5.1.0",
"husky": "2.4.1",
"jasmine-core": "3.4.0",
"jasmine-spec-reporter": "4.2.1",
"karma": "1.7.1",
"karma": "4.1.0",
"karma-chrome-launcher": "2.2.0",
"karma-cli": "1.0.1",
"karma-coverage-istanbul-reporter": "1.3.0",
"karma-jasmine": "1.1.0",
"karma-jasmine-html-reporter": "0.2.2",
"lint-staged": "4.0.4",
"prettier": "1.6.1",
"protractor": "5.1.2",
"ts-node": "3.3.0",
"tslint": "5.7.0",
"tslint-config-prettier": "1.5.0",
"typescript": "2.5.2"
"karma-cli": "2.0.0",
"karma-jasmine": "2.0.1",
"karma-jasmine-html-reporter": "1.4.2",
"lint-staged": "8.0.0",
"node-sass": "4.9.4",
"prettier": "1.18.2",
"protractor": "5.4.2",
"rxjs-tslint": "0.1.7",
"ts-node": "7.0.1",
"tslint": "5.13.1",
"tslint-config-prettier": "1.18.0",
"typescript": "3.4.5",
"webpack": "4.34.0"
}
}
16 changes: 8 additions & 8 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div fxLayout="column" fxFill>
<md-toolbar color="primary">
<button md-icon-button (click)="toggleSidenav()">
<md-icon>menu</md-icon>
<mat-toolbar color="primary">
<button mat-icon-button type="button" (click)="toggleSidenav()">
<mat-icon>menu</mat-icon>
</button>

<span class="bold">Compose teams</span>
Expand All @@ -12,12 +12,12 @@
{{ nbGames }} games available
</span>
</span>
</md-toolbar>
</mat-toolbar>

<md-sidenav-container fxFlex>
<md-sidenav #sidenav [mode]="sidenavType" [opened]="isSidenavOpened">
<mat-sidenav-container fxFlex>
<mat-sidenav #sidenav [mode]="sidenavType" [opened]="isSidenavOpened">
<app-players></app-players>
</md-sidenav>
</mat-sidenav>

<div *ngIf="selectedPlayers$ | async as selectedPlayers" fxFill>
<app-games *ngIf="selectedPlayers.length === 10; else need10Players"></app-games>
Expand All @@ -26,5 +26,5 @@
<app-need-10-players [selectedPlayers]="selectedPlayers"></app-need-10-players>
</ng-template>
</div>
</md-sidenav-container>
</mat-sidenav-container>
</div>
4 changes: 2 additions & 2 deletions src/app/app.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ a {
text-transform: uppercase;
}

md-sidenav-container {
md-sidenav {
mat-sidenav-container {
mat-sidenav {
width: 350px;
}
}
Loading