Mistakenly overwritten files from merge of dev branch

This commit is contained in:
Michael Shamoon 2021-01-01 12:41:05 -08:00
parent a4e5d36a02
commit 6566e36141
2 changed files with 139 additions and 138 deletions

View File

@ -1,138 +1,139 @@
{ {
"$schema": "./node_modules/@angular/cli/lib/config/schema.json", "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1, "version": 1,
"newProjectRoot": "projects", "newProjectRoot": "projects",
"projects": { "projects": {
"paperless-ui": { "paperless-ui": {
"projectType": "application", "projectType": "application",
"schematics": { "schematics": {
"@schematics/angular:component": { "@schematics/angular:component": {
"style": "scss" "style": "scss"
} }
}, },
"root": "", "root": "",
"sourceRoot": "src", "sourceRoot": "src",
"prefix": "app", "prefix": "app",
"architect": { "architect": {
"build": { "build": {
"builder": "@angular-devkit/build-angular:browser", "builder": "@angular-devkit/build-angular:browser",
"options": { "options": {
"outputPath": "dist/paperless-ui", "outputPath": "dist/paperless-ui",
"outputHashing": "none", "outputHashing": "none",
"index": "src/index.html", "index": "src/index.html",
"main": "src/main.ts", "main": "src/main.ts",
"polyfills": "src/polyfills.ts", "polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json", "tsConfig": "tsconfig.app.json",
"aot": true, "aot": true,
"assets": [ "assets": [
"src/favicon.ico", "src/favicon.ico",
"src/assets", "src/assets",
"src/manifest.webmanifest" "src/manifest.webmanifest", {
], "glob": "pdf.worker.min.js",
"styles": [ "input": "node_modules/pdfjs-dist/build/",
"src/styles.scss" "output": "/assets/js/"
], }
"scripts": [], ],
"allowedCommonJsDependencies": [ "styles": [
"ng2-pdf-viewer" "src/styles.scss"
] ],
}, "scripts": [],
"configurations": { "allowedCommonJsDependencies": [
"production": { "ng2-pdf-viewer"
"fileReplacements": [ ]
{ },
"replace": "src/environments/environment.ts", "configurations": {
"with": "src/environments/environment.prod.ts" "production": {
} "fileReplacements": [
], {
"optimization": true, "replace": "src/environments/environment.ts",
"outputHashing": "none", "with": "src/environments/environment.prod.ts"
"sourceMap": false, }
"extractCss": true, ],
"namedChunks": false, "optimization": true,
"extractLicenses": true, "outputHashing": "none",
"vendorChunk": false, "sourceMap": false,
"buildOptimizer": true, "extractCss": true,
"budgets": [ "namedChunks": false,
{ "extractLicenses": true,
"type": "initial", "vendorChunk": false,
"maximumWarning": "2mb", "buildOptimizer": true,
"maximumError": "5mb" "budgets": [
}, {
{ "type": "initial",
"type": "anyComponentStyle", "maximumWarning": "2mb",
"maximumWarning": "6kb", "maximumError": "5mb"
"maximumError": "10kb" },
} {
] "type": "anyComponentStyle",
} "maximumWarning": "6kb",
} "maximumError": "10kb"
}, }
"serve": { ]
"builder": "@angular-devkit/build-angular:dev-server", }
"options": { }
"browserTarget": "paperless-ui:build" },
}, "serve": {
"configurations": { "builder": "@angular-devkit/build-angular:dev-server",
"production": { "options": {
"browserTarget": "paperless-ui:build:production" "browserTarget": "paperless-ui:build"
} },
} "configurations": {
}, "production": {
"extract-i18n": { "browserTarget": "paperless-ui:build:production"
"builder": "@angular-devkit/build-angular:extract-i18n", }
"options": { }
"browserTarget": "paperless-ui:build" },
} "extract-i18n": {
}, "builder": "@angular-devkit/build-angular:extract-i18n",
"test": { "options": {
"builder": "@angular-devkit/build-angular:karma", "browserTarget": "paperless-ui:build"
"options": { }
"main": "src/test.ts", },
"polyfills": "src/polyfills.ts", "test": {
"tsConfig": "tsconfig.spec.json", "builder": "@angular-devkit/build-angular:karma",
"karmaConfig": "karma.conf.js", "options": {
"assets": [ "main": "src/test.ts",
"src/favicon.ico", "polyfills": "src/polyfills.ts",
"src/assets", "tsConfig": "tsconfig.spec.json",
"src/manifest.webmanifest" "karmaConfig": "karma.conf.js",
], "assets": [
"styles": [ "src/favicon.ico",
"src/styles.scss" "src/assets",
], "src/manifest.webmanifest"
"scripts": [] ],
} "styles": [
}, "src/styles.scss"
"lint": { ],
"builder": "@angular-devkit/build-angular:tslint", "scripts": []
"options": { }
"tsConfig": [ },
"tsconfig.app.json", "lint": {
"tsconfig.spec.json", "builder": "@angular-devkit/build-angular:tslint",
"e2e/tsconfig.json" "options": {
], "tsConfig": [
"exclude": [ "tsconfig.app.json",
"**/node_modules/**" "tsconfig.spec.json",
] "e2e/tsconfig.json"
} ],
}, "exclude": [
"e2e": { "**/node_modules/**"
"builder": "@angular-devkit/build-angular:protractor", ]
"options": { }
"protractorConfig": "e2e/protractor.conf.js", },
"devServerTarget": "paperless-ui:serve" "e2e": {
}, "builder": "@angular-devkit/build-angular:protractor",
"configurations": { "options": {
"production": { "protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "paperless-ui:serve:production" "devServerTarget": "paperless-ui:serve"
} },
} "configurations": {
} "production": {
} "devServerTarget": "paperless-ui:serve:production"
} }
}, }
"defaultProject": "paperless-ui", }
"cli": { }
"analytics": "7c47c2bc-b97e-4014-85ae-b0c99b5750b4" }
} },
"defaultProject": "paperless-ui"
} }

View File

@ -4,7 +4,7 @@
export const environment = { export const environment = {
production: false, production: false,
apiBaseUrl: "http://10.0.1.26:8000/api/", apiBaseUrl: "http://localhost:8000/api/",
appTitle: "Paperless-ng", appTitle: "Paperless-ng",
version: "DEVELOPMENT" version: "DEVELOPMENT"
}; };