mirror of
https://github.com/fergalmoran/podnoms.git
synced 2025-12-22 09:18:08 +00:00
Merge branch 'develop' into feature/chat_popup
This commit is contained in:
Fergal Moran
@@ -1,68 +0,0 @@
|
|||||||
{
|
|
||||||
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
|
||||||
"project": {
|
|
||||||
"name": "pod-noms.web"
|
|
||||||
},
|
|
||||||
"apps": [
|
|
||||||
{
|
|
||||||
"root": "src",
|
|
||||||
"outDir": "dist",
|
|
||||||
"assets": [
|
|
||||||
"assets",
|
|
||||||
"favicon.ico",
|
|
||||||
"firebase-messaging-sw.js",
|
|
||||||
"facebook-auth.html",
|
|
||||||
"manifest.json"
|
|
||||||
],
|
|
||||||
"index": "index.html",
|
|
||||||
"main": "main.ts",
|
|
||||||
"polyfills": "polyfills.ts",
|
|
||||||
"test": "test.ts",
|
|
||||||
"tsconfig": "tsconfig.app.json",
|
|
||||||
"testTsconfig": "tsconfig.spec.json",
|
|
||||||
"prefix": "app",
|
|
||||||
"styles": [
|
|
||||||
"styles.css"
|
|
||||||
],
|
|
||||||
"scripts": [
|
|
||||||
"../node_modules/jquery/dist/jquery.js",
|
|
||||||
"../node_modules/cookieconsent/build/cookieconsent.min.js",
|
|
||||||
"../node_modules/tether/dist/js/tether.js",
|
|
||||||
"../node_modules/popper.js/dist/umd/popper.min.js",
|
|
||||||
"../node_modules/bootstrap/dist/js/bootstrap.js",
|
|
||||||
"../node_modules/quill/dist/quill.js",
|
|
||||||
"../node_modules/howler/dist/howler.js"
|
|
||||||
],
|
|
||||||
"environmentSource": "environments/environment.ts",
|
|
||||||
"environments": {
|
|
||||||
"dev": "environments/environment.ts",
|
|
||||||
"prod": "environments/environment.prod.ts"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"e2e": {
|
|
||||||
"protractor": {
|
|
||||||
"config": "./protractor.conf.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"lint": [
|
|
||||||
{
|
|
||||||
"project": "src/tsconfig.app.json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"project": "src/tsconfig.spec.json"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"project": "e2e/tsconfig.e2e.json"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"test": {
|
|
||||||
"karma": {
|
|
||||||
"config": "./karma.conf.js"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"defaults": {
|
|
||||||
"styleExt": "css",
|
|
||||||
"component": {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
146
client/angular.json
Normal file
146
client/angular.json
Normal file
@@ -0,0 +1,146 @@
|
|||||||
|
{
|
||||||
|
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
|
||||||
|
"version": 1,
|
||||||
|
"newProjectRoot": "projects",
|
||||||
|
"projects": {
|
||||||
|
"podnoms-web": {
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "src",
|
||||||
|
"projectType": "application",
|
||||||
|
"architect": {
|
||||||
|
"build": {
|
||||||
|
"builder": "@angular-devkit/build-angular:browser",
|
||||||
|
"options": {
|
||||||
|
"outputPath": "dist",
|
||||||
|
"index": "src/index.html",
|
||||||
|
"main": "src/main.ts",
|
||||||
|
"tsConfig": "src/tsconfig.app.json",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"assets": [
|
||||||
|
"src/assets",
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/firebase-messaging-sw.js",
|
||||||
|
"src/facebook-auth.html",
|
||||||
|
"src/manifest.json"
|
||||||
|
],
|
||||||
|
"styles": ["src/styles.css"],
|
||||||
|
"scripts": [
|
||||||
|
"node_modules/jquery/dist/jquery.js",
|
||||||
|
"node_modules/cookieconsent/build/cookieconsent.min.js",
|
||||||
|
"node_modules/tether/dist/js/tether.js",
|
||||||
|
"node_modules/popper.js/dist/umd/popper.min.js",
|
||||||
|
"node_modules/bootstrap/dist/js/bootstrap.js",
|
||||||
|
"node_modules/quill/dist/quill.js",
|
||||||
|
"node_modules/howler/dist/howler.js"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"optimization": true,
|
||||||
|
"outputHashing": "all",
|
||||||
|
"sourceMap": false,
|
||||||
|
"extractCss": true,
|
||||||
|
"namedChunks": false,
|
||||||
|
"aot": true,
|
||||||
|
"extractLicenses": true,
|
||||||
|
"vendorChunk": false,
|
||||||
|
"buildOptimizer": false,
|
||||||
|
"fileReplacements": [
|
||||||
|
{
|
||||||
|
"replace":
|
||||||
|
"src/environments/environment.ts",
|
||||||
|
"with":
|
||||||
|
"src/environments/environment.prod.ts"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"serve": {
|
||||||
|
"builder": "@angular-devkit/build-angular:dev-server",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "podnoms-web:build"
|
||||||
|
},
|
||||||
|
"configurations": {
|
||||||
|
"production": {
|
||||||
|
"browserTarget": "podnoms-web:build:production"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"extract-i18n": {
|
||||||
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
|
"options": {
|
||||||
|
"browserTarget": "podnoms-web:build"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"test": {
|
||||||
|
"builder": "@angular-devkit/build-angular:karma",
|
||||||
|
"options": {
|
||||||
|
"main": "src/test.ts",
|
||||||
|
"karmaConfig": "./karma.conf.js",
|
||||||
|
"polyfills": "src/polyfills.ts",
|
||||||
|
"tsConfig": "src/tsconfig.spec.json",
|
||||||
|
"scripts": [
|
||||||
|
"node_modules/jquery/dist/jquery.js",
|
||||||
|
"node_modules/cookieconsent/build/cookieconsent.min.js",
|
||||||
|
"node_modules/tether/dist/js/tether.js",
|
||||||
|
"node_modules/popper.js/dist/umd/popper.min.js",
|
||||||
|
"node_modules/bootstrap/dist/js/bootstrap.js",
|
||||||
|
"node_modules/quill/dist/quill.js",
|
||||||
|
"node_modules/howler/dist/howler.js"
|
||||||
|
],
|
||||||
|
"styles": ["src/styles.css"],
|
||||||
|
"assets": [
|
||||||
|
"src/assets",
|
||||||
|
"src/favicon.ico",
|
||||||
|
"src/firebase-messaging-sw.js",
|
||||||
|
"src/facebook-auth.html",
|
||||||
|
"src/manifest.json"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": [
|
||||||
|
"src/tsconfig.app.json",
|
||||||
|
"src/tsconfig.spec.json"
|
||||||
|
],
|
||||||
|
"exclude": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"podnoms-web-e2e": {
|
||||||
|
"root": "",
|
||||||
|
"sourceRoot": "",
|
||||||
|
"projectType": "application",
|
||||||
|
"architect": {
|
||||||
|
"e2e": {
|
||||||
|
"builder": "@angular-devkit/build-angular:protractor",
|
||||||
|
"options": {
|
||||||
|
"protractorConfig": "./protractor.conf.js",
|
||||||
|
"devServerTarget": "podnoms-web:serve"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"lint": {
|
||||||
|
"builder": "@angular-devkit/build-angular:tslint",
|
||||||
|
"options": {
|
||||||
|
"tsConfig": ["e2e/tsconfig.e2e.json"],
|
||||||
|
"exclude": []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"defaultProject": "podnoms-web",
|
||||||
|
"schematics": {
|
||||||
|
"@schematics/angular:component": {
|
||||||
|
"prefix": "app",
|
||||||
|
"styleext": "css"
|
||||||
|
},
|
||||||
|
"@schematics/angular:directive": {
|
||||||
|
"prefix": "app"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -15,16 +15,15 @@
|
|||||||
},
|
},
|
||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular/animations": "^5.2.10",
|
"@angular/animations": "6.0.0",
|
||||||
"@angular/common": "^5.2.10",
|
"@angular/common": "6.0.0",
|
||||||
"@angular/compiler": "^5.2.10",
|
"@angular/compiler": "6.0.0",
|
||||||
"@angular/core": "^5.2.10",
|
"@angular/core": "6.0.0",
|
||||||
"@angular/forms": "^5.2.10",
|
"@angular/forms": "6.0.0",
|
||||||
"@angular/http": "^5.2.10",
|
"@angular/http": "6.0.0",
|
||||||
"@angular/platform-browser": "^5.2.10",
|
"@angular/platform-browser": "6.0.0",
|
||||||
"@angular/platform-browser-dynamic": "^5.2.10",
|
"@angular/platform-browser-dynamic": "6.0.0",
|
||||||
"@angular/router": "^5.2.10",
|
"@angular/router": "6.0.0",
|
||||||
"@aspnet/signalr": "^1.0.0-rc1-30631",
|
|
||||||
"@ngrx/effects": "^5.1.0",
|
"@ngrx/effects": "^5.1.0",
|
||||||
"@ngrx/store": "^5.1.0",
|
"@ngrx/store": "^5.1.0",
|
||||||
"@ngrx/store-devtools": "^5.1.0",
|
"@ngrx/store-devtools": "^5.1.0",
|
||||||
@@ -50,15 +49,17 @@
|
|||||||
"ngx-moment": "^2.0.0-rc.0",
|
"ngx-moment": "^2.0.0-rc.0",
|
||||||
"ngx-quill": "^3.0.0",
|
"ngx-quill": "^3.0.0",
|
||||||
"popper.js": "^1.13.0",
|
"popper.js": "^1.13.0",
|
||||||
"rxjs": "5.5.6",
|
"rxjs": "^6.1.0",
|
||||||
|
"rxjs-compat": "^6.1.0",
|
||||||
|
"simple-line-icons": "^2.4.1",
|
||||||
"tether": "^1.4.3",
|
"tether": "^1.4.3",
|
||||||
"uglify-es": "^3.3.10",
|
"uglify-es": "^3.3.10",
|
||||||
"zone.js": "^0.8.20"
|
"zone.js": "^0.8.26"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular/cli": "1.7.4",
|
"@angular/cli": "6.0.0",
|
||||||
"@angular/compiler-cli": "^5.2.6",
|
"@angular/compiler-cli": "6.0.0",
|
||||||
"@angular/language-service": "^5.2.6",
|
"@angular/language-service": "6.0.0",
|
||||||
"@types/applicationinsights-js": "^1.0.5",
|
"@types/applicationinsights-js": "^1.0.5",
|
||||||
"@types/jasmine": "^2.8.6",
|
"@types/jasmine": "^2.8.6",
|
||||||
"@types/node": "~9.4.6",
|
"@types/node": "~9.4.6",
|
||||||
@@ -74,6 +75,7 @@
|
|||||||
"protractor": "~5.3.0",
|
"protractor": "~5.3.0",
|
||||||
"ts-node": "^5.0.1",
|
"ts-node": "^5.0.1",
|
||||||
"tslint": "~5.9.1",
|
"tslint": "~5.9.1",
|
||||||
"typescript": "~2.5.3"
|
"typescript": "2.7.2",
|
||||||
|
"@angular-devkit/build-angular": "~0.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,6 @@ import { Component } from '@angular/core';
|
|||||||
import { PodcastModel, PodcastEntryModel } from 'app/models/podcasts.models';
|
import { PodcastModel, PodcastEntryModel } from 'app/models/podcasts.models';
|
||||||
import { ToastyService } from 'ng2-toasty';
|
import { ToastyService } from 'ng2-toasty';
|
||||||
import { PodcastService } from 'app/services/podcast.service';
|
import { PodcastService } from 'app/services/podcast.service';
|
||||||
import { MessagingService } from 'app/services/messaging.service';
|
|
||||||
import { AppComponent } from 'app/app.component';
|
import { AppComponent } from 'app/app.component';
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
import { ApplicationState } from 'app/store';
|
import { ApplicationState } from 'app/store';
|
||||||
|
|||||||
@@ -32,6 +32,9 @@
|
|||||||
ga('send', 'pageview');
|
ga('send', 'pageview');
|
||||||
</script>
|
</script>
|
||||||
<!-- End Google Analytics -->
|
<!-- End Google Analytics -->
|
||||||
|
<!-- Begin Crisp -->
|
||||||
|
<script type="text/javascript">window.$crisp = []; window.CRISP_WEBSITE_ID = "af7d6aa7-0cb8-4f74-89aa-7f3742058e85"; (function () { d = document; s = d.createElement("script"); s.src = "https://client.crisp.chat/l.js"; s.async = 1; d.getElementsByTagName("head")[0].appendChild(s); })();</script>
|
||||||
|
<!-- End Crisp -->
|
||||||
</body>
|
</body>
|
||||||
|
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
"curly": false,
|
"curly": false,
|
||||||
"eofline": true,
|
"eofline": true,
|
||||||
"forin": true,
|
"forin": true,
|
||||||
"import-blacklist": [true, "rxjs"],
|
"import-blacklist": [true],
|
||||||
"import-spacing": true,
|
"import-spacing": true,
|
||||||
"indent": [true, "spaces"],
|
"indent": [true, "spaces"],
|
||||||
"interface-over-type-literal": true,
|
"interface-over-type-literal": true,
|
||||||
|
|||||||
Reference in New Issue
Block a user