From 03bfd1bed364051c2efeb62d2a388a6d2fa35eaa Mon Sep 17 00:00:00 2001 From: William Brawner Date: Thu, 28 Jan 2021 20:17:30 -0700 Subject: [PATCH] Move angular code to src/client Signed-off-by: William Brawner --- angular.json | 54 +++++++++--------- e2e/protractor.conf.js | 2 +- src/{ => client}/.browserslistrc | 0 .../app/app-routing.module.spec.ts | 0 src/{ => client}/app/app-routing.module.ts | 0 src/{ => client}/app/app.component.css | 0 src/{ => client}/app/app.component.html | 0 src/{ => client}/app/app.component.spec.ts | 0 src/{ => client}/app/app.component.ts | 0 src/{ => client}/app/app.module.ts | 2 +- .../add-edit-budget.component.css | 0 .../add-edit-budget.component.html | 0 .../add-edit-budget.component.spec.ts | 0 .../add-edit-budget.component.ts | 6 +- .../budget-details.component.css | 0 .../budget-details.component.html | 0 .../budget-details.component.spec.ts | 0 .../budget-details.component.ts | 8 +-- .../app/budgets/budget.component.css | 0 .../app/budgets/budget.component.html | 0 .../app/budgets/budget.component.spec.ts | 0 .../app/budgets/budget.component.ts | 0 src/{ => client}/app/budgets/budget.ts | 0 .../edit-budget/edit-budget.component.css | 0 .../edit-budget/edit-budget.component.html | 0 .../edit-budget/edit-budget.component.spec.ts | 0 .../edit-budget/edit-budget.component.ts | 0 .../new-budget/new-budget.component.css | 0 .../new-budget/new-budget.component.html | 0 .../new-budget/new-budget.component.spec.ts | 0 .../new-budget/new-budget.component.ts | 0 .../app/categories/categories.component.css | 0 .../app/categories/categories.component.html | 0 .../categories/categories.component.spec.ts | 0 .../app/categories/categories.component.ts | 0 .../category-breakdown.component.css | 0 .../category-breakdown.component.html | 0 .../category-breakdown.component.spec.ts | 0 .../category-breakdown.component.ts | 0 .../category-details.component.css | 0 .../category-details.component.html | 0 .../category-details.component.spec.ts | 0 .../category-details.component.ts | 0 .../category-form/category-form.component.css | 0 .../category-form.component.html | 0 .../category-form.component.spec.ts | 0 .../category-form/category-form.component.ts | 4 +- .../category-list/category-list.component.css | 0 .../category-list.component.html | 0 .../category-list.component.spec.ts | 0 .../category-list/category-list.component.ts | 0 src/{ => client}/app/categories/category.ts | 0 .../edit-category/edit-category.component.css | 0 .../edit-category.component.html | 0 .../edit-category.component.spec.ts | 0 .../edit-category/edit-category.component.ts | 0 .../new-category/new-category.component.css | 0 .../new-category/new-category.component.html | 0 .../new-category.component.spec.ts | 0 .../new-category/new-category.component.ts | 0 src/{ => client}/app/shared/actionable.ts | 0 .../app/shared/auth.interceptor.ts | 0 .../app/shared/twigs.http.service.ts | 0 .../app/shared/twigs.local.service.ts | 0 src/{ => client}/app/shared/twigs.service.ts | 0 src/{ => client}/app/shared/utils.ts | 0 .../add-edit-transaction.component.css | 0 .../add-edit-transaction.component.html | 0 .../add-edit-transaction.component.spec.ts | 0 .../add-edit-transaction.component.ts | 6 +- .../new-transaction.component.css | 0 .../new-transaction.component.html | 0 .../new-transaction.component.spec.ts | 0 .../new-transaction.component.ts | 0 .../transaction-details.component.css | 0 .../transaction-details.component.html | 0 .../transaction-details.component.spec.ts | 0 .../transaction-details.component.ts | 2 +- .../transaction-list.component.css | 0 .../transaction-list.component.html | 0 .../transaction-list.component.spec.ts | 0 .../transaction-list.component.ts | 0 .../app/transactions/transaction.ts | 0 .../app/transactions/transaction.type.ts | 0 .../transactions/transactions.component.css | 0 .../transactions/transactions.component.html | 0 .../transactions.component.spec.ts | 0 .../transactions/transactions.component.ts | 0 .../edit-profile/edit-profile.component.css | 0 .../edit-profile/edit-profile.component.html | 0 .../edit-profile.component.spec.ts | 0 .../edit-profile/edit-profile.component.ts | 0 .../app/users/login/login.component.css | 0 .../app/users/login/login.component.html | 0 .../app/users/login/login.component.spec.ts | 0 .../app/users/login/login.component.ts | 2 +- .../app/users/register/register.component.css | 0 .../users/register/register.component.html | 0 .../users/register/register.component.spec.ts | 0 .../app/users/register/register.component.ts | 2 +- src/{ => client}/app/users/user.component.css | 0 .../app/users/user.component.html | 0 .../app/users/user.component.spec.ts | 0 src/{ => client}/app/users/user.component.ts | 0 src/{ => client}/app/users/user.ts | 0 .../assets/icons/icon-128x128.png | Bin .../assets/icons/icon-144x144.png | Bin .../assets/icons/icon-152x152.png | Bin .../assets/icons/icon-192x192.png | Bin .../assets/icons/icon-384x384.png | Bin .../assets/icons/icon-512x512.png | Bin src/{ => client}/assets/icons/icon-72x72.png | Bin src/{ => client}/assets/icons/icon-96x96.png | Bin .../assets/icons/icon-maskable-128x128.png | Bin .../assets/icons/icon-maskable-144x144.png | Bin .../assets/icons/icon-maskable-152x152.png | Bin .../assets/icons/icon-maskable-192x192.png | Bin .../assets/icons/icon-maskable-384x384.png | Bin .../assets/icons/icon-maskable-512x512.png | Bin .../assets/icons/icon-maskable-72x72.png | Bin .../assets/icons/icon-maskable-96x96.png | Bin src/{ => client}/assets/icons/touch-icon.png | Bin src/{ => client}/browserconfig.xml | 0 .../environments/environment.prod.ts | 0 src/{ => client}/environments/environment.ts | 0 src/{ => client}/favicon-16x16.png | Bin src/{ => client}/favicon-32x32.png | Bin src/{ => client}/favicon-96x96.png | Bin src/{ => client}/favicon.ico | Bin src/{ => client}/index.html | 0 src/{ => client}/karma.conf.js | 0 src/{ => client}/main.ts | 0 src/{ => client}/manifest.json | 0 src/{ => client}/polyfills.ts | 0 src/{ => client}/styles.css | 0 src/{ => client}/styles.scss | 0 src/{ => client}/test.ts | 0 src/{ => client}/tsconfig.app.json | 6 +- src/{ => client}/tsconfig.spec.json | 4 +- src/{ => client}/tslint.json | 2 +- tsconfig.json | 6 +- 141 files changed, 53 insertions(+), 53 deletions(-) rename src/{ => client}/.browserslistrc (100%) rename src/{ => client}/app/app-routing.module.spec.ts (100%) rename src/{ => client}/app/app-routing.module.ts (100%) rename src/{ => client}/app/app.component.css (100%) rename src/{ => client}/app/app.component.html (100%) rename src/{ => client}/app/app.component.spec.ts (100%) rename src/{ => client}/app/app.component.ts (100%) rename src/{ => client}/app/app.module.ts (98%) rename src/{ => client}/app/budgets/add-edit-budget/add-edit-budget.component.css (100%) rename src/{ => client}/app/budgets/add-edit-budget/add-edit-budget.component.html (100%) rename src/{ => client}/app/budgets/add-edit-budget/add-edit-budget.component.spec.ts (100%) rename src/{ => client}/app/budgets/add-edit-budget/add-edit-budget.component.ts (89%) rename src/{ => client}/app/budgets/budget-details/budget-details.component.css (100%) rename src/{ => client}/app/budgets/budget-details/budget-details.component.html (100%) rename src/{ => client}/app/budgets/budget-details/budget-details.component.spec.ts (100%) rename src/{ => client}/app/budgets/budget-details/budget-details.component.ts (95%) rename src/{ => client}/app/budgets/budget.component.css (100%) rename src/{ => client}/app/budgets/budget.component.html (100%) rename src/{ => client}/app/budgets/budget.component.spec.ts (100%) rename src/{ => client}/app/budgets/budget.component.ts (100%) rename src/{ => client}/app/budgets/budget.ts (100%) rename src/{ => client}/app/budgets/edit-budget/edit-budget.component.css (100%) rename src/{ => client}/app/budgets/edit-budget/edit-budget.component.html (100%) rename src/{ => client}/app/budgets/edit-budget/edit-budget.component.spec.ts (100%) rename src/{ => client}/app/budgets/edit-budget/edit-budget.component.ts (100%) rename src/{ => client}/app/budgets/new-budget/new-budget.component.css (100%) rename src/{ => client}/app/budgets/new-budget/new-budget.component.html (100%) rename src/{ => client}/app/budgets/new-budget/new-budget.component.spec.ts (100%) rename src/{ => client}/app/budgets/new-budget/new-budget.component.ts (100%) rename src/{ => client}/app/categories/categories.component.css (100%) rename src/{ => client}/app/categories/categories.component.html (100%) rename src/{ => client}/app/categories/categories.component.spec.ts (100%) rename src/{ => client}/app/categories/categories.component.ts (100%) rename src/{ => client}/app/categories/category-breakdown/category-breakdown.component.css (100%) rename src/{ => client}/app/categories/category-breakdown/category-breakdown.component.html (100%) rename src/{ => client}/app/categories/category-breakdown/category-breakdown.component.spec.ts (100%) rename src/{ => client}/app/categories/category-breakdown/category-breakdown.component.ts (100%) rename src/{ => client}/app/categories/category-details/category-details.component.css (100%) rename src/{ => client}/app/categories/category-details/category-details.component.html (100%) rename src/{ => client}/app/categories/category-details/category-details.component.spec.ts (100%) rename src/{ => client}/app/categories/category-details/category-details.component.ts (100%) rename src/{ => client}/app/categories/category-form/category-form.component.css (100%) rename src/{ => client}/app/categories/category-form/category-form.component.html (100%) rename src/{ => client}/app/categories/category-form/category-form.component.spec.ts (100%) rename src/{ => client}/app/categories/category-form/category-form.component.ts (92%) rename src/{ => client}/app/categories/category-list/category-list.component.css (100%) rename src/{ => client}/app/categories/category-list/category-list.component.html (100%) rename src/{ => client}/app/categories/category-list/category-list.component.spec.ts (100%) rename src/{ => client}/app/categories/category-list/category-list.component.ts (100%) rename src/{ => client}/app/categories/category.ts (100%) rename src/{ => client}/app/categories/edit-category/edit-category.component.css (100%) rename src/{ => client}/app/categories/edit-category/edit-category.component.html (100%) rename src/{ => client}/app/categories/edit-category/edit-category.component.spec.ts (100%) rename src/{ => client}/app/categories/edit-category/edit-category.component.ts (100%) rename src/{ => client}/app/categories/new-category/new-category.component.css (100%) rename src/{ => client}/app/categories/new-category/new-category.component.html (100%) rename src/{ => client}/app/categories/new-category/new-category.component.spec.ts (100%) rename src/{ => client}/app/categories/new-category/new-category.component.ts (100%) rename src/{ => client}/app/shared/actionable.ts (100%) rename src/{ => client}/app/shared/auth.interceptor.ts (100%) rename src/{ => client}/app/shared/twigs.http.service.ts (100%) rename src/{ => client}/app/shared/twigs.local.service.ts (100%) rename src/{ => client}/app/shared/twigs.service.ts (100%) rename src/{ => client}/app/shared/utils.ts (100%) rename src/{ => client}/app/transactions/add-edit-transaction/add-edit-transaction.component.css (100%) rename src/{ => client}/app/transactions/add-edit-transaction/add-edit-transaction.component.html (100%) rename src/{ => client}/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts (100%) rename src/{ => client}/app/transactions/add-edit-transaction/add-edit-transaction.component.ts (95%) rename src/{ => client}/app/transactions/new-transaction/new-transaction.component.css (100%) rename src/{ => client}/app/transactions/new-transaction/new-transaction.component.html (100%) rename src/{ => client}/app/transactions/new-transaction/new-transaction.component.spec.ts (100%) rename src/{ => client}/app/transactions/new-transaction/new-transaction.component.ts (100%) rename src/{ => client}/app/transactions/transaction-details/transaction-details.component.css (100%) rename src/{ => client}/app/transactions/transaction-details/transaction-details.component.html (100%) rename src/{ => client}/app/transactions/transaction-details/transaction-details.component.spec.ts (100%) rename src/{ => client}/app/transactions/transaction-details/transaction-details.component.ts (91%) rename src/{ => client}/app/transactions/transaction-list/transaction-list.component.css (100%) rename src/{ => client}/app/transactions/transaction-list/transaction-list.component.html (100%) rename src/{ => client}/app/transactions/transaction-list/transaction-list.component.spec.ts (100%) rename src/{ => client}/app/transactions/transaction-list/transaction-list.component.ts (100%) rename src/{ => client}/app/transactions/transaction.ts (100%) rename src/{ => client}/app/transactions/transaction.type.ts (100%) rename src/{ => client}/app/transactions/transactions.component.css (100%) rename src/{ => client}/app/transactions/transactions.component.html (100%) rename src/{ => client}/app/transactions/transactions.component.spec.ts (100%) rename src/{ => client}/app/transactions/transactions.component.ts (100%) rename src/{ => client}/app/users/edit-profile/edit-profile.component.css (100%) rename src/{ => client}/app/users/edit-profile/edit-profile.component.html (100%) rename src/{ => client}/app/users/edit-profile/edit-profile.component.spec.ts (100%) rename src/{ => client}/app/users/edit-profile/edit-profile.component.ts (100%) rename src/{ => client}/app/users/login/login.component.css (100%) rename src/{ => client}/app/users/login/login.component.html (100%) rename src/{ => client}/app/users/login/login.component.spec.ts (100%) rename src/{ => client}/app/users/login/login.component.ts (95%) rename src/{ => client}/app/users/register/register.component.css (100%) rename src/{ => client}/app/users/register/register.component.html (100%) rename src/{ => client}/app/users/register/register.component.spec.ts (100%) rename src/{ => client}/app/users/register/register.component.ts (95%) rename src/{ => client}/app/users/user.component.css (100%) rename src/{ => client}/app/users/user.component.html (100%) rename src/{ => client}/app/users/user.component.spec.ts (100%) rename src/{ => client}/app/users/user.component.ts (100%) rename src/{ => client}/app/users/user.ts (100%) rename src/{ => client}/assets/icons/icon-128x128.png (100%) rename src/{ => client}/assets/icons/icon-144x144.png (100%) rename src/{ => client}/assets/icons/icon-152x152.png (100%) rename src/{ => client}/assets/icons/icon-192x192.png (100%) rename src/{ => client}/assets/icons/icon-384x384.png (100%) rename src/{ => client}/assets/icons/icon-512x512.png (100%) rename src/{ => client}/assets/icons/icon-72x72.png (100%) rename src/{ => client}/assets/icons/icon-96x96.png (100%) rename src/{ => client}/assets/icons/icon-maskable-128x128.png (100%) rename src/{ => client}/assets/icons/icon-maskable-144x144.png (100%) rename src/{ => client}/assets/icons/icon-maskable-152x152.png (100%) rename src/{ => client}/assets/icons/icon-maskable-192x192.png (100%) rename src/{ => client}/assets/icons/icon-maskable-384x384.png (100%) rename src/{ => client}/assets/icons/icon-maskable-512x512.png (100%) rename src/{ => client}/assets/icons/icon-maskable-72x72.png (100%) rename src/{ => client}/assets/icons/icon-maskable-96x96.png (100%) rename src/{ => client}/assets/icons/touch-icon.png (100%) rename src/{ => client}/browserconfig.xml (100%) rename src/{ => client}/environments/environment.prod.ts (100%) rename src/{ => client}/environments/environment.ts (100%) rename src/{ => client}/favicon-16x16.png (100%) rename src/{ => client}/favicon-32x32.png (100%) rename src/{ => client}/favicon-96x96.png (100%) rename src/{ => client}/favicon.ico (100%) rename src/{ => client}/index.html (100%) rename src/{ => client}/karma.conf.js (100%) rename src/{ => client}/main.ts (100%) rename src/{ => client}/manifest.json (100%) rename src/{ => client}/polyfills.ts (100%) rename src/{ => client}/styles.css (100%) rename src/{ => client}/styles.scss (100%) rename src/{ => client}/test.ts (100%) rename src/{ => client}/tsconfig.app.json (53%) rename src/{ => client}/tsconfig.spec.json (71%) rename src/{ => client}/tslint.json (88%) diff --git a/angular.json b/angular.json index 1f1ade0..4d99da3 100644 --- a/angular.json +++ b/angular.json @@ -5,7 +5,7 @@ "projects": { "twigs": { "root": "", - "sourceRoot": "src", + "sourceRoot": "src/client", "projectType": "application", "prefix": "app", "schematics": {}, @@ -14,22 +14,22 @@ "builder": "@angular-devkit/build-angular:browser", "options": { "outputPath": "dist/twigs", - "index": "src/index.html", - "main": "src/main.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.app.json", + "index": "src/client/index.html", + "main": "src/client/main.ts", + "polyfills": "src/client/polyfills.ts", + "tsConfig": "src/client/tsconfig.app.json", "assets": [ - "src/browserconfig.xml", - "src/favicon-16x16.png", - "src/favicon-32x32.png", - "src/favicon-96x96.png", - "src/favicon.ico", - "src/assets", - "src/manifest.json" + "src/client/browserconfig.xml", + "src/client/favicon-16x16.png", + "src/client/favicon-32x32.png", + "src/client/favicon-96x96.png", + "src/client/favicon.ico", + "src/client/assets", + "src/client/manifest.json" ], "styles": [ - "src/styles.css", - "src/styles.scss" + "src/client/styles.css", + "src/client/styles.scss" ], "scripts": [], "vendorChunk": true, @@ -49,8 +49,8 @@ ], "fileReplacements": [ { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.prod.ts" + "replace": "src/client/environments/environment.ts", + "with": "src/client/environments/environment.prod.ts" } ], "optimization": true, @@ -71,8 +71,8 @@ ], "fileReplacements": [ { - "replace": "src/environments/environment.ts", - "with": "src/environments/environment.codeserver.ts" + "replace": "src/client/environments/environment.ts", + "with": "src/client/environments/environment.codeserver.ts" } ] } @@ -102,18 +102,18 @@ "test": { "builder": "@angular-devkit/build-angular:karma", "options": { - "main": "src/test.ts", - "polyfills": "src/polyfills.ts", - "tsConfig": "src/tsconfig.spec.json", - "karmaConfig": "src/karma.conf.js", + "main": "src/client/test.ts", + "polyfills": "src/client/polyfills.ts", + "tsConfig": "src/client/tsconfig.spec.json", + "karmaConfig": "src/client/karma.conf.js", "styles": [ - "src/styles.css" + "src/client/styles.css" ], "scripts": [], "assets": [ - "src/favicon.ico", - "src/assets", - "src/manifest.json" + "src/client/favicon.ico", + "src/client/assets", + "src/client/manifest.json" ] } } @@ -141,4 +141,4 @@ "cli": { "analytics": "b8304464-255e-47bb-976a-7ed81af63238" } -} \ No newline at end of file +} diff --git a/e2e/protractor.conf.js b/e2e/protractor.conf.js index 86776a3..b9e499f 100644 --- a/e2e/protractor.conf.js +++ b/e2e/protractor.conf.js @@ -6,7 +6,7 @@ const { SpecReporter } = require('jasmine-spec-reporter'); exports.config = { allScriptsTimeout: 11000, specs: [ - './src/**/*.e2e-spec.ts' + './src/client/**/*.e2e-spec.ts' ], capabilities: { 'browserName': 'chrome' diff --git a/src/.browserslistrc b/src/client/.browserslistrc similarity index 100% rename from src/.browserslistrc rename to src/client/.browserslistrc diff --git a/src/app/app-routing.module.spec.ts b/src/client/app/app-routing.module.spec.ts similarity index 100% rename from src/app/app-routing.module.spec.ts rename to src/client/app/app-routing.module.spec.ts diff --git a/src/app/app-routing.module.ts b/src/client/app/app-routing.module.ts similarity index 100% rename from src/app/app-routing.module.ts rename to src/client/app/app-routing.module.ts diff --git a/src/app/app.component.css b/src/client/app/app.component.css similarity index 100% rename from src/app/app.component.css rename to src/client/app/app.component.css diff --git a/src/app/app.component.html b/src/client/app/app.component.html similarity index 100% rename from src/app/app.component.html rename to src/client/app/app.component.html diff --git a/src/app/app.component.spec.ts b/src/client/app/app.component.spec.ts similarity index 100% rename from src/app/app.component.spec.ts rename to src/client/app/app.component.spec.ts diff --git a/src/app/app.component.ts b/src/client/app/app.component.ts similarity index 100% rename from src/app/app.component.ts rename to src/client/app/app.component.ts diff --git a/src/app/app.module.ts b/src/client/app/app.module.ts similarity index 98% rename from src/app/app.module.ts rename to src/client/app/app.module.ts index f18ea14..532ab03 100644 --- a/src/app/app.module.ts +++ b/src/client/app/app.module.ts @@ -36,7 +36,7 @@ import { EditProfileComponent } from './users/edit-profile/edit-profile.componen import { UserComponent } from './users/user.component'; import { NewBudgetComponent } from './budgets/new-budget/new-budget.component'; import { BudgetDetailsComponent } from './budgets/budget-details/budget-details.component'; -import { environment } from 'src/environments/environment'; +import { environment } from 'src/client/environments/environment'; import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http'; import { ServiceWorkerModule } from '@angular/service-worker'; import { CategoryBreakdownComponent } from './categories/category-breakdown/category-breakdown.component'; diff --git a/src/app/budgets/add-edit-budget/add-edit-budget.component.css b/src/client/app/budgets/add-edit-budget/add-edit-budget.component.css similarity index 100% rename from src/app/budgets/add-edit-budget/add-edit-budget.component.css rename to src/client/app/budgets/add-edit-budget/add-edit-budget.component.css diff --git a/src/app/budgets/add-edit-budget/add-edit-budget.component.html b/src/client/app/budgets/add-edit-budget/add-edit-budget.component.html similarity index 100% rename from src/app/budgets/add-edit-budget/add-edit-budget.component.html rename to src/client/app/budgets/add-edit-budget/add-edit-budget.component.html diff --git a/src/app/budgets/add-edit-budget/add-edit-budget.component.spec.ts b/src/client/app/budgets/add-edit-budget/add-edit-budget.component.spec.ts similarity index 100% rename from src/app/budgets/add-edit-budget/add-edit-budget.component.spec.ts rename to src/client/app/budgets/add-edit-budget/add-edit-budget.component.spec.ts diff --git a/src/app/budgets/add-edit-budget/add-edit-budget.component.ts b/src/client/app/budgets/add-edit-budget/add-edit-budget.component.ts similarity index 89% rename from src/app/budgets/add-edit-budget/add-edit-budget.component.ts rename to src/client/app/budgets/add-edit-budget/add-edit-budget.component.ts index 957e5ab..a83566d 100644 --- a/src/app/budgets/add-edit-budget/add-edit-budget.component.ts +++ b/src/client/app/budgets/add-edit-budget/add-edit-budget.component.ts @@ -1,8 +1,8 @@ import { Component, OnInit, Input, Inject, OnDestroy } from '@angular/core'; import { Budget } from '../budget'; -import { AppComponent } from 'src/app/app.component'; -import { User, UserPermission, Permission } from 'src/app/users/user'; -import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service'; +import { AppComponent } from 'src/client/app/app.component'; +import { User, UserPermission, Permission } from 'src/client/app/users/user'; +import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service'; @Component({ selector: 'app-add-edit-budget', diff --git a/src/app/budgets/budget-details/budget-details.component.css b/src/client/app/budgets/budget-details/budget-details.component.css similarity index 100% rename from src/app/budgets/budget-details/budget-details.component.css rename to src/client/app/budgets/budget-details/budget-details.component.css diff --git a/src/app/budgets/budget-details/budget-details.component.html b/src/client/app/budgets/budget-details/budget-details.component.html similarity index 100% rename from src/app/budgets/budget-details/budget-details.component.html rename to src/client/app/budgets/budget-details/budget-details.component.html diff --git a/src/app/budgets/budget-details/budget-details.component.spec.ts b/src/client/app/budgets/budget-details/budget-details.component.spec.ts similarity index 100% rename from src/app/budgets/budget-details/budget-details.component.spec.ts rename to src/client/app/budgets/budget-details/budget-details.component.spec.ts diff --git a/src/app/budgets/budget-details/budget-details.component.ts b/src/client/app/budgets/budget-details/budget-details.component.ts similarity index 95% rename from src/app/budgets/budget-details/budget-details.component.ts rename to src/client/app/budgets/budget-details/budget-details.component.ts index 6987c14..9381596 100644 --- a/src/app/budgets/budget-details/budget-details.component.ts +++ b/src/client/app/budgets/budget-details/budget-details.component.ts @@ -1,13 +1,13 @@ import { Component, OnInit, Inject, OnDestroy } from '@angular/core'; import { Budget } from '../budget'; import { ActivatedRoute, Router } from '@angular/router'; -import { AppComponent } from 'src/app/app.component'; -import { Transaction } from 'src/app/transactions/transaction'; -import { Category } from 'src/app/categories/category'; +import { AppComponent } from 'src/client/app/app.component'; +import { Transaction } from 'src/client/app/transactions/transaction'; +import { Category } from 'src/client/app/categories/category'; import { Observable } from 'rxjs'; // import { Label } from 'ng2-charts'; import { ChartDataset } from 'chart.js'; -import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service'; +import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service'; import { Actionable } from '../../shared/actionable'; @Component({ diff --git a/src/app/budgets/budget.component.css b/src/client/app/budgets/budget.component.css similarity index 100% rename from src/app/budgets/budget.component.css rename to src/client/app/budgets/budget.component.css diff --git a/src/app/budgets/budget.component.html b/src/client/app/budgets/budget.component.html similarity index 100% rename from src/app/budgets/budget.component.html rename to src/client/app/budgets/budget.component.html diff --git a/src/app/budgets/budget.component.spec.ts b/src/client/app/budgets/budget.component.spec.ts similarity index 100% rename from src/app/budgets/budget.component.spec.ts rename to src/client/app/budgets/budget.component.spec.ts diff --git a/src/app/budgets/budget.component.ts b/src/client/app/budgets/budget.component.ts similarity index 100% rename from src/app/budgets/budget.component.ts rename to src/client/app/budgets/budget.component.ts diff --git a/src/app/budgets/budget.ts b/src/client/app/budgets/budget.ts similarity index 100% rename from src/app/budgets/budget.ts rename to src/client/app/budgets/budget.ts diff --git a/src/app/budgets/edit-budget/edit-budget.component.css b/src/client/app/budgets/edit-budget/edit-budget.component.css similarity index 100% rename from src/app/budgets/edit-budget/edit-budget.component.css rename to src/client/app/budgets/edit-budget/edit-budget.component.css diff --git a/src/app/budgets/edit-budget/edit-budget.component.html b/src/client/app/budgets/edit-budget/edit-budget.component.html similarity index 100% rename from src/app/budgets/edit-budget/edit-budget.component.html rename to src/client/app/budgets/edit-budget/edit-budget.component.html diff --git a/src/app/budgets/edit-budget/edit-budget.component.spec.ts b/src/client/app/budgets/edit-budget/edit-budget.component.spec.ts similarity index 100% rename from src/app/budgets/edit-budget/edit-budget.component.spec.ts rename to src/client/app/budgets/edit-budget/edit-budget.component.spec.ts diff --git a/src/app/budgets/edit-budget/edit-budget.component.ts b/src/client/app/budgets/edit-budget/edit-budget.component.ts similarity index 100% rename from src/app/budgets/edit-budget/edit-budget.component.ts rename to src/client/app/budgets/edit-budget/edit-budget.component.ts diff --git a/src/app/budgets/new-budget/new-budget.component.css b/src/client/app/budgets/new-budget/new-budget.component.css similarity index 100% rename from src/app/budgets/new-budget/new-budget.component.css rename to src/client/app/budgets/new-budget/new-budget.component.css diff --git a/src/app/budgets/new-budget/new-budget.component.html b/src/client/app/budgets/new-budget/new-budget.component.html similarity index 100% rename from src/app/budgets/new-budget/new-budget.component.html rename to src/client/app/budgets/new-budget/new-budget.component.html diff --git a/src/app/budgets/new-budget/new-budget.component.spec.ts b/src/client/app/budgets/new-budget/new-budget.component.spec.ts similarity index 100% rename from src/app/budgets/new-budget/new-budget.component.spec.ts rename to src/client/app/budgets/new-budget/new-budget.component.spec.ts diff --git a/src/app/budgets/new-budget/new-budget.component.ts b/src/client/app/budgets/new-budget/new-budget.component.ts similarity index 100% rename from src/app/budgets/new-budget/new-budget.component.ts rename to src/client/app/budgets/new-budget/new-budget.component.ts diff --git a/src/app/categories/categories.component.css b/src/client/app/categories/categories.component.css similarity index 100% rename from src/app/categories/categories.component.css rename to src/client/app/categories/categories.component.css diff --git a/src/app/categories/categories.component.html b/src/client/app/categories/categories.component.html similarity index 100% rename from src/app/categories/categories.component.html rename to src/client/app/categories/categories.component.html diff --git a/src/app/categories/categories.component.spec.ts b/src/client/app/categories/categories.component.spec.ts similarity index 100% rename from src/app/categories/categories.component.spec.ts rename to src/client/app/categories/categories.component.spec.ts diff --git a/src/app/categories/categories.component.ts b/src/client/app/categories/categories.component.ts similarity index 100% rename from src/app/categories/categories.component.ts rename to src/client/app/categories/categories.component.ts diff --git a/src/app/categories/category-breakdown/category-breakdown.component.css b/src/client/app/categories/category-breakdown/category-breakdown.component.css similarity index 100% rename from src/app/categories/category-breakdown/category-breakdown.component.css rename to src/client/app/categories/category-breakdown/category-breakdown.component.css diff --git a/src/app/categories/category-breakdown/category-breakdown.component.html b/src/client/app/categories/category-breakdown/category-breakdown.component.html similarity index 100% rename from src/app/categories/category-breakdown/category-breakdown.component.html rename to src/client/app/categories/category-breakdown/category-breakdown.component.html diff --git a/src/app/categories/category-breakdown/category-breakdown.component.spec.ts b/src/client/app/categories/category-breakdown/category-breakdown.component.spec.ts similarity index 100% rename from src/app/categories/category-breakdown/category-breakdown.component.spec.ts rename to src/client/app/categories/category-breakdown/category-breakdown.component.spec.ts diff --git a/src/app/categories/category-breakdown/category-breakdown.component.ts b/src/client/app/categories/category-breakdown/category-breakdown.component.ts similarity index 100% rename from src/app/categories/category-breakdown/category-breakdown.component.ts rename to src/client/app/categories/category-breakdown/category-breakdown.component.ts diff --git a/src/app/categories/category-details/category-details.component.css b/src/client/app/categories/category-details/category-details.component.css similarity index 100% rename from src/app/categories/category-details/category-details.component.css rename to src/client/app/categories/category-details/category-details.component.css diff --git a/src/app/categories/category-details/category-details.component.html b/src/client/app/categories/category-details/category-details.component.html similarity index 100% rename from src/app/categories/category-details/category-details.component.html rename to src/client/app/categories/category-details/category-details.component.html diff --git a/src/app/categories/category-details/category-details.component.spec.ts b/src/client/app/categories/category-details/category-details.component.spec.ts similarity index 100% rename from src/app/categories/category-details/category-details.component.spec.ts rename to src/client/app/categories/category-details/category-details.component.spec.ts diff --git a/src/app/categories/category-details/category-details.component.ts b/src/client/app/categories/category-details/category-details.component.ts similarity index 100% rename from src/app/categories/category-details/category-details.component.ts rename to src/client/app/categories/category-details/category-details.component.ts diff --git a/src/app/categories/category-form/category-form.component.css b/src/client/app/categories/category-form/category-form.component.css similarity index 100% rename from src/app/categories/category-form/category-form.component.css rename to src/client/app/categories/category-form/category-form.component.css diff --git a/src/app/categories/category-form/category-form.component.html b/src/client/app/categories/category-form/category-form.component.html similarity index 100% rename from src/app/categories/category-form/category-form.component.html rename to src/client/app/categories/category-form/category-form.component.html diff --git a/src/app/categories/category-form/category-form.component.spec.ts b/src/client/app/categories/category-form/category-form.component.spec.ts similarity index 100% rename from src/app/categories/category-form/category-form.component.spec.ts rename to src/client/app/categories/category-form/category-form.component.spec.ts diff --git a/src/app/categories/category-form/category-form.component.ts b/src/client/app/categories/category-form/category-form.component.ts similarity index 92% rename from src/app/categories/category-form/category-form.component.ts rename to src/client/app/categories/category-form/category-form.component.ts index 59542d0..9ce10bf 100644 --- a/src/app/categories/category-form/category-form.component.ts +++ b/src/client/app/categories/category-form/category-form.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input, OnDestroy, Inject } from '@angular/core'; import { Category } from '../category'; -import { AppComponent } from 'src/app/app.component'; -import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service'; +import { AppComponent } from 'src/client/app/app.component'; +import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service'; @Component({ selector: 'app-category-form', diff --git a/src/app/categories/category-list/category-list.component.css b/src/client/app/categories/category-list/category-list.component.css similarity index 100% rename from src/app/categories/category-list/category-list.component.css rename to src/client/app/categories/category-list/category-list.component.css diff --git a/src/app/categories/category-list/category-list.component.html b/src/client/app/categories/category-list/category-list.component.html similarity index 100% rename from src/app/categories/category-list/category-list.component.html rename to src/client/app/categories/category-list/category-list.component.html diff --git a/src/app/categories/category-list/category-list.component.spec.ts b/src/client/app/categories/category-list/category-list.component.spec.ts similarity index 100% rename from src/app/categories/category-list/category-list.component.spec.ts rename to src/client/app/categories/category-list/category-list.component.spec.ts diff --git a/src/app/categories/category-list/category-list.component.ts b/src/client/app/categories/category-list/category-list.component.ts similarity index 100% rename from src/app/categories/category-list/category-list.component.ts rename to src/client/app/categories/category-list/category-list.component.ts diff --git a/src/app/categories/category.ts b/src/client/app/categories/category.ts similarity index 100% rename from src/app/categories/category.ts rename to src/client/app/categories/category.ts diff --git a/src/app/categories/edit-category/edit-category.component.css b/src/client/app/categories/edit-category/edit-category.component.css similarity index 100% rename from src/app/categories/edit-category/edit-category.component.css rename to src/client/app/categories/edit-category/edit-category.component.css diff --git a/src/app/categories/edit-category/edit-category.component.html b/src/client/app/categories/edit-category/edit-category.component.html similarity index 100% rename from src/app/categories/edit-category/edit-category.component.html rename to src/client/app/categories/edit-category/edit-category.component.html diff --git a/src/app/categories/edit-category/edit-category.component.spec.ts b/src/client/app/categories/edit-category/edit-category.component.spec.ts similarity index 100% rename from src/app/categories/edit-category/edit-category.component.spec.ts rename to src/client/app/categories/edit-category/edit-category.component.spec.ts diff --git a/src/app/categories/edit-category/edit-category.component.ts b/src/client/app/categories/edit-category/edit-category.component.ts similarity index 100% rename from src/app/categories/edit-category/edit-category.component.ts rename to src/client/app/categories/edit-category/edit-category.component.ts diff --git a/src/app/categories/new-category/new-category.component.css b/src/client/app/categories/new-category/new-category.component.css similarity index 100% rename from src/app/categories/new-category/new-category.component.css rename to src/client/app/categories/new-category/new-category.component.css diff --git a/src/app/categories/new-category/new-category.component.html b/src/client/app/categories/new-category/new-category.component.html similarity index 100% rename from src/app/categories/new-category/new-category.component.html rename to src/client/app/categories/new-category/new-category.component.html diff --git a/src/app/categories/new-category/new-category.component.spec.ts b/src/client/app/categories/new-category/new-category.component.spec.ts similarity index 100% rename from src/app/categories/new-category/new-category.component.spec.ts rename to src/client/app/categories/new-category/new-category.component.spec.ts diff --git a/src/app/categories/new-category/new-category.component.ts b/src/client/app/categories/new-category/new-category.component.ts similarity index 100% rename from src/app/categories/new-category/new-category.component.ts rename to src/client/app/categories/new-category/new-category.component.ts diff --git a/src/app/shared/actionable.ts b/src/client/app/shared/actionable.ts similarity index 100% rename from src/app/shared/actionable.ts rename to src/client/app/shared/actionable.ts diff --git a/src/app/shared/auth.interceptor.ts b/src/client/app/shared/auth.interceptor.ts similarity index 100% rename from src/app/shared/auth.interceptor.ts rename to src/client/app/shared/auth.interceptor.ts diff --git a/src/app/shared/twigs.http.service.ts b/src/client/app/shared/twigs.http.service.ts similarity index 100% rename from src/app/shared/twigs.http.service.ts rename to src/client/app/shared/twigs.http.service.ts diff --git a/src/app/shared/twigs.local.service.ts b/src/client/app/shared/twigs.local.service.ts similarity index 100% rename from src/app/shared/twigs.local.service.ts rename to src/client/app/shared/twigs.local.service.ts diff --git a/src/app/shared/twigs.service.ts b/src/client/app/shared/twigs.service.ts similarity index 100% rename from src/app/shared/twigs.service.ts rename to src/client/app/shared/twigs.service.ts diff --git a/src/app/shared/utils.ts b/src/client/app/shared/utils.ts similarity index 100% rename from src/app/shared/utils.ts rename to src/client/app/shared/utils.ts diff --git a/src/app/transactions/add-edit-transaction/add-edit-transaction.component.css b/src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.css similarity index 100% rename from src/app/transactions/add-edit-transaction/add-edit-transaction.component.css rename to src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.css diff --git a/src/app/transactions/add-edit-transaction/add-edit-transaction.component.html b/src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.html similarity index 100% rename from src/app/transactions/add-edit-transaction/add-edit-transaction.component.html rename to src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.html diff --git a/src/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts b/src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts similarity index 100% rename from src/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts rename to src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.spec.ts diff --git a/src/app/transactions/add-edit-transaction/add-edit-transaction.component.ts b/src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.ts similarity index 95% rename from src/app/transactions/add-edit-transaction/add-edit-transaction.component.ts rename to src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.ts index 003dada..332b0cf 100644 --- a/src/app/transactions/add-edit-transaction/add-edit-transaction.component.ts +++ b/src/client/app/transactions/add-edit-transaction/add-edit-transaction.component.ts @@ -1,9 +1,9 @@ import { Component, OnInit, Input, OnChanges, OnDestroy, Inject, SimpleChanges } from '@angular/core'; import { Transaction } from '../transaction'; import { TransactionType } from '../transaction.type'; -import { Category } from 'src/app/categories/category'; -import { AppComponent } from 'src/app/app.component'; -import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service'; +import { Category } from 'src/client/app/categories/category'; +import { AppComponent } from 'src/client/app/app.component'; +import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service'; import { MatRadioChange } from '@angular/material/radio'; @Component({ diff --git a/src/app/transactions/new-transaction/new-transaction.component.css b/src/client/app/transactions/new-transaction/new-transaction.component.css similarity index 100% rename from src/app/transactions/new-transaction/new-transaction.component.css rename to src/client/app/transactions/new-transaction/new-transaction.component.css diff --git a/src/app/transactions/new-transaction/new-transaction.component.html b/src/client/app/transactions/new-transaction/new-transaction.component.html similarity index 100% rename from src/app/transactions/new-transaction/new-transaction.component.html rename to src/client/app/transactions/new-transaction/new-transaction.component.html diff --git a/src/app/transactions/new-transaction/new-transaction.component.spec.ts b/src/client/app/transactions/new-transaction/new-transaction.component.spec.ts similarity index 100% rename from src/app/transactions/new-transaction/new-transaction.component.spec.ts rename to src/client/app/transactions/new-transaction/new-transaction.component.spec.ts diff --git a/src/app/transactions/new-transaction/new-transaction.component.ts b/src/client/app/transactions/new-transaction/new-transaction.component.ts similarity index 100% rename from src/app/transactions/new-transaction/new-transaction.component.ts rename to src/client/app/transactions/new-transaction/new-transaction.component.ts diff --git a/src/app/transactions/transaction-details/transaction-details.component.css b/src/client/app/transactions/transaction-details/transaction-details.component.css similarity index 100% rename from src/app/transactions/transaction-details/transaction-details.component.css rename to src/client/app/transactions/transaction-details/transaction-details.component.css diff --git a/src/app/transactions/transaction-details/transaction-details.component.html b/src/client/app/transactions/transaction-details/transaction-details.component.html similarity index 100% rename from src/app/transactions/transaction-details/transaction-details.component.html rename to src/client/app/transactions/transaction-details/transaction-details.component.html diff --git a/src/app/transactions/transaction-details/transaction-details.component.spec.ts b/src/client/app/transactions/transaction-details/transaction-details.component.spec.ts similarity index 100% rename from src/app/transactions/transaction-details/transaction-details.component.spec.ts rename to src/client/app/transactions/transaction-details/transaction-details.component.spec.ts diff --git a/src/app/transactions/transaction-details/transaction-details.component.ts b/src/client/app/transactions/transaction-details/transaction-details.component.ts similarity index 91% rename from src/app/transactions/transaction-details/transaction-details.component.ts rename to src/client/app/transactions/transaction-details/transaction-details.component.ts index cb69186..abe5c44 100644 --- a/src/app/transactions/transaction-details/transaction-details.component.ts +++ b/src/client/app/transactions/transaction-details/transaction-details.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, Input, Inject } from '@angular/core'; import { ActivatedRoute } from '@angular/router'; import { Transaction } from '../transaction'; -import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service'; +import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service'; @Component({ selector: 'app-transaction-details', diff --git a/src/app/transactions/transaction-list/transaction-list.component.css b/src/client/app/transactions/transaction-list/transaction-list.component.css similarity index 100% rename from src/app/transactions/transaction-list/transaction-list.component.css rename to src/client/app/transactions/transaction-list/transaction-list.component.css diff --git a/src/app/transactions/transaction-list/transaction-list.component.html b/src/client/app/transactions/transaction-list/transaction-list.component.html similarity index 100% rename from src/app/transactions/transaction-list/transaction-list.component.html rename to src/client/app/transactions/transaction-list/transaction-list.component.html diff --git a/src/app/transactions/transaction-list/transaction-list.component.spec.ts b/src/client/app/transactions/transaction-list/transaction-list.component.spec.ts similarity index 100% rename from src/app/transactions/transaction-list/transaction-list.component.spec.ts rename to src/client/app/transactions/transaction-list/transaction-list.component.spec.ts diff --git a/src/app/transactions/transaction-list/transaction-list.component.ts b/src/client/app/transactions/transaction-list/transaction-list.component.ts similarity index 100% rename from src/app/transactions/transaction-list/transaction-list.component.ts rename to src/client/app/transactions/transaction-list/transaction-list.component.ts diff --git a/src/app/transactions/transaction.ts b/src/client/app/transactions/transaction.ts similarity index 100% rename from src/app/transactions/transaction.ts rename to src/client/app/transactions/transaction.ts diff --git a/src/app/transactions/transaction.type.ts b/src/client/app/transactions/transaction.type.ts similarity index 100% rename from src/app/transactions/transaction.type.ts rename to src/client/app/transactions/transaction.type.ts diff --git a/src/app/transactions/transactions.component.css b/src/client/app/transactions/transactions.component.css similarity index 100% rename from src/app/transactions/transactions.component.css rename to src/client/app/transactions/transactions.component.css diff --git a/src/app/transactions/transactions.component.html b/src/client/app/transactions/transactions.component.html similarity index 100% rename from src/app/transactions/transactions.component.html rename to src/client/app/transactions/transactions.component.html diff --git a/src/app/transactions/transactions.component.spec.ts b/src/client/app/transactions/transactions.component.spec.ts similarity index 100% rename from src/app/transactions/transactions.component.spec.ts rename to src/client/app/transactions/transactions.component.spec.ts diff --git a/src/app/transactions/transactions.component.ts b/src/client/app/transactions/transactions.component.ts similarity index 100% rename from src/app/transactions/transactions.component.ts rename to src/client/app/transactions/transactions.component.ts diff --git a/src/app/users/edit-profile/edit-profile.component.css b/src/client/app/users/edit-profile/edit-profile.component.css similarity index 100% rename from src/app/users/edit-profile/edit-profile.component.css rename to src/client/app/users/edit-profile/edit-profile.component.css diff --git a/src/app/users/edit-profile/edit-profile.component.html b/src/client/app/users/edit-profile/edit-profile.component.html similarity index 100% rename from src/app/users/edit-profile/edit-profile.component.html rename to src/client/app/users/edit-profile/edit-profile.component.html diff --git a/src/app/users/edit-profile/edit-profile.component.spec.ts b/src/client/app/users/edit-profile/edit-profile.component.spec.ts similarity index 100% rename from src/app/users/edit-profile/edit-profile.component.spec.ts rename to src/client/app/users/edit-profile/edit-profile.component.spec.ts diff --git a/src/app/users/edit-profile/edit-profile.component.ts b/src/client/app/users/edit-profile/edit-profile.component.ts similarity index 100% rename from src/app/users/edit-profile/edit-profile.component.ts rename to src/client/app/users/edit-profile/edit-profile.component.ts diff --git a/src/app/users/login/login.component.css b/src/client/app/users/login/login.component.css similarity index 100% rename from src/app/users/login/login.component.css rename to src/client/app/users/login/login.component.css diff --git a/src/app/users/login/login.component.html b/src/client/app/users/login/login.component.html similarity index 100% rename from src/app/users/login/login.component.html rename to src/client/app/users/login/login.component.html diff --git a/src/app/users/login/login.component.spec.ts b/src/client/app/users/login/login.component.spec.ts similarity index 100% rename from src/app/users/login/login.component.spec.ts rename to src/client/app/users/login/login.component.spec.ts diff --git a/src/app/users/login/login.component.ts b/src/client/app/users/login/login.component.ts similarity index 95% rename from src/app/users/login/login.component.ts rename to src/client/app/users/login/login.component.ts index 2863c1a..1d3293b 100644 --- a/src/app/users/login/login.component.ts +++ b/src/client/app/users/login/login.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit, OnDestroy, Inject, ChangeDetectorRef } from '@angular/core'; import { TwigsService, TWIGS_SERVICE } from '../../shared/twigs.service'; import { User } from '../user'; -import { AppComponent } from 'src/app/app.component'; +import { AppComponent } from 'src/client/app/app.component'; import { ActivatedRoute, Router } from '@angular/router'; @Component({ diff --git a/src/app/users/register/register.component.css b/src/client/app/users/register/register.component.css similarity index 100% rename from src/app/users/register/register.component.css rename to src/client/app/users/register/register.component.css diff --git a/src/app/users/register/register.component.html b/src/client/app/users/register/register.component.html similarity index 100% rename from src/app/users/register/register.component.html rename to src/client/app/users/register/register.component.html diff --git a/src/app/users/register/register.component.spec.ts b/src/client/app/users/register/register.component.spec.ts similarity index 100% rename from src/app/users/register/register.component.spec.ts rename to src/client/app/users/register/register.component.spec.ts diff --git a/src/app/users/register/register.component.ts b/src/client/app/users/register/register.component.ts similarity index 95% rename from src/app/users/register/register.component.ts rename to src/client/app/users/register/register.component.ts index 4f2e231..19db15e 100644 --- a/src/app/users/register/register.component.ts +++ b/src/client/app/users/register/register.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, OnDestroy, Inject } from '@angular/core'; import { TwigsService, TWIGS_SERVICE } from '../../shared/twigs.service'; -import { AppComponent } from 'src/app/app.component'; +import { AppComponent } from 'src/client/app/app.component'; import { Router } from '@angular/router'; @Component({ diff --git a/src/app/users/user.component.css b/src/client/app/users/user.component.css similarity index 100% rename from src/app/users/user.component.css rename to src/client/app/users/user.component.css diff --git a/src/app/users/user.component.html b/src/client/app/users/user.component.html similarity index 100% rename from src/app/users/user.component.html rename to src/client/app/users/user.component.html diff --git a/src/app/users/user.component.spec.ts b/src/client/app/users/user.component.spec.ts similarity index 100% rename from src/app/users/user.component.spec.ts rename to src/client/app/users/user.component.spec.ts diff --git a/src/app/users/user.component.ts b/src/client/app/users/user.component.ts similarity index 100% rename from src/app/users/user.component.ts rename to src/client/app/users/user.component.ts diff --git a/src/app/users/user.ts b/src/client/app/users/user.ts similarity index 100% rename from src/app/users/user.ts rename to src/client/app/users/user.ts diff --git a/src/assets/icons/icon-128x128.png b/src/client/assets/icons/icon-128x128.png similarity index 100% rename from src/assets/icons/icon-128x128.png rename to src/client/assets/icons/icon-128x128.png diff --git a/src/assets/icons/icon-144x144.png b/src/client/assets/icons/icon-144x144.png similarity index 100% rename from src/assets/icons/icon-144x144.png rename to src/client/assets/icons/icon-144x144.png diff --git a/src/assets/icons/icon-152x152.png b/src/client/assets/icons/icon-152x152.png similarity index 100% rename from src/assets/icons/icon-152x152.png rename to src/client/assets/icons/icon-152x152.png diff --git a/src/assets/icons/icon-192x192.png b/src/client/assets/icons/icon-192x192.png similarity index 100% rename from src/assets/icons/icon-192x192.png rename to src/client/assets/icons/icon-192x192.png diff --git a/src/assets/icons/icon-384x384.png b/src/client/assets/icons/icon-384x384.png similarity index 100% rename from src/assets/icons/icon-384x384.png rename to src/client/assets/icons/icon-384x384.png diff --git a/src/assets/icons/icon-512x512.png b/src/client/assets/icons/icon-512x512.png similarity index 100% rename from src/assets/icons/icon-512x512.png rename to src/client/assets/icons/icon-512x512.png diff --git a/src/assets/icons/icon-72x72.png b/src/client/assets/icons/icon-72x72.png similarity index 100% rename from src/assets/icons/icon-72x72.png rename to src/client/assets/icons/icon-72x72.png diff --git a/src/assets/icons/icon-96x96.png b/src/client/assets/icons/icon-96x96.png similarity index 100% rename from src/assets/icons/icon-96x96.png rename to src/client/assets/icons/icon-96x96.png diff --git a/src/assets/icons/icon-maskable-128x128.png b/src/client/assets/icons/icon-maskable-128x128.png similarity index 100% rename from src/assets/icons/icon-maskable-128x128.png rename to src/client/assets/icons/icon-maskable-128x128.png diff --git a/src/assets/icons/icon-maskable-144x144.png b/src/client/assets/icons/icon-maskable-144x144.png similarity index 100% rename from src/assets/icons/icon-maskable-144x144.png rename to src/client/assets/icons/icon-maskable-144x144.png diff --git a/src/assets/icons/icon-maskable-152x152.png b/src/client/assets/icons/icon-maskable-152x152.png similarity index 100% rename from src/assets/icons/icon-maskable-152x152.png rename to src/client/assets/icons/icon-maskable-152x152.png diff --git a/src/assets/icons/icon-maskable-192x192.png b/src/client/assets/icons/icon-maskable-192x192.png similarity index 100% rename from src/assets/icons/icon-maskable-192x192.png rename to src/client/assets/icons/icon-maskable-192x192.png diff --git a/src/assets/icons/icon-maskable-384x384.png b/src/client/assets/icons/icon-maskable-384x384.png similarity index 100% rename from src/assets/icons/icon-maskable-384x384.png rename to src/client/assets/icons/icon-maskable-384x384.png diff --git a/src/assets/icons/icon-maskable-512x512.png b/src/client/assets/icons/icon-maskable-512x512.png similarity index 100% rename from src/assets/icons/icon-maskable-512x512.png rename to src/client/assets/icons/icon-maskable-512x512.png diff --git a/src/assets/icons/icon-maskable-72x72.png b/src/client/assets/icons/icon-maskable-72x72.png similarity index 100% rename from src/assets/icons/icon-maskable-72x72.png rename to src/client/assets/icons/icon-maskable-72x72.png diff --git a/src/assets/icons/icon-maskable-96x96.png b/src/client/assets/icons/icon-maskable-96x96.png similarity index 100% rename from src/assets/icons/icon-maskable-96x96.png rename to src/client/assets/icons/icon-maskable-96x96.png diff --git a/src/assets/icons/touch-icon.png b/src/client/assets/icons/touch-icon.png similarity index 100% rename from src/assets/icons/touch-icon.png rename to src/client/assets/icons/touch-icon.png diff --git a/src/browserconfig.xml b/src/client/browserconfig.xml similarity index 100% rename from src/browserconfig.xml rename to src/client/browserconfig.xml diff --git a/src/environments/environment.prod.ts b/src/client/environments/environment.prod.ts similarity index 100% rename from src/environments/environment.prod.ts rename to src/client/environments/environment.prod.ts diff --git a/src/environments/environment.ts b/src/client/environments/environment.ts similarity index 100% rename from src/environments/environment.ts rename to src/client/environments/environment.ts diff --git a/src/favicon-16x16.png b/src/client/favicon-16x16.png similarity index 100% rename from src/favicon-16x16.png rename to src/client/favicon-16x16.png diff --git a/src/favicon-32x32.png b/src/client/favicon-32x32.png similarity index 100% rename from src/favicon-32x32.png rename to src/client/favicon-32x32.png diff --git a/src/favicon-96x96.png b/src/client/favicon-96x96.png similarity index 100% rename from src/favicon-96x96.png rename to src/client/favicon-96x96.png diff --git a/src/favicon.ico b/src/client/favicon.ico similarity index 100% rename from src/favicon.ico rename to src/client/favicon.ico diff --git a/src/index.html b/src/client/index.html similarity index 100% rename from src/index.html rename to src/client/index.html diff --git a/src/karma.conf.js b/src/client/karma.conf.js similarity index 100% rename from src/karma.conf.js rename to src/client/karma.conf.js diff --git a/src/main.ts b/src/client/main.ts similarity index 100% rename from src/main.ts rename to src/client/main.ts diff --git a/src/manifest.json b/src/client/manifest.json similarity index 100% rename from src/manifest.json rename to src/client/manifest.json diff --git a/src/polyfills.ts b/src/client/polyfills.ts similarity index 100% rename from src/polyfills.ts rename to src/client/polyfills.ts diff --git a/src/styles.css b/src/client/styles.css similarity index 100% rename from src/styles.css rename to src/client/styles.css diff --git a/src/styles.scss b/src/client/styles.scss similarity index 100% rename from src/styles.scss rename to src/client/styles.scss diff --git a/src/test.ts b/src/client/test.ts similarity index 100% rename from src/test.ts rename to src/client/test.ts diff --git a/src/tsconfig.app.json b/src/client/tsconfig.app.json similarity index 53% rename from src/tsconfig.app.json rename to src/client/tsconfig.app.json index 290dd30..3db6410 100644 --- a/src/tsconfig.app.json +++ b/src/client/tsconfig.app.json @@ -1,7 +1,7 @@ { - "extends": "../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "../out-tsc/app", + "outDir": "../../out-tsc/app", "types": [] }, "files": [ @@ -9,6 +9,6 @@ "polyfills.ts" ], "include": [ - "src/**/*.d.ts" + "src/client/**/*.d.ts" ] } diff --git a/src/tsconfig.spec.json b/src/client/tsconfig.spec.json similarity index 71% rename from src/tsconfig.spec.json rename to src/client/tsconfig.spec.json index 0c06d47..19118a4 100644 --- a/src/tsconfig.spec.json +++ b/src/client/tsconfig.spec.json @@ -1,7 +1,7 @@ { - "extends": "../tsconfig.base.json", + "extends": "../../tsconfig.base.json", "compilerOptions": { - "outDir": "../out-tsc/spec", + "outDir": "../../out-tsc/spec", "types": [ "jasmine", "node" diff --git a/src/tslint.json b/src/client/tslint.json similarity index 88% rename from src/tslint.json rename to src/client/tslint.json index 52e2c1a..0ad3cf4 100644 --- a/src/tslint.json +++ b/src/client/tslint.json @@ -1,5 +1,5 @@ { - "extends": "../tslint.json", + "extends": "../../tslint.json", "rules": { "directive-selector": [ true, diff --git a/tsconfig.json b/tsconfig.json index e8d90a7..a81bd71 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,13 +8,13 @@ "files": [], "references": [ { - "path": "./src/tsconfig.app.json" + "path": "./src/client/tsconfig.app.json" }, { - "path": "./src/tsconfig.spec.json" + "path": "./src/client/tsconfig.spec.json" }, { - "path": "./e2e/tsconfig.e2e.json" + "path": "./e2e/src/tsconfig.e2e.json" } ] } \ No newline at end of file