Move angular code to src/client

Signed-off-by: William Brawner <me@wbrawner.com>

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",
+            "index": "src/client/index.html",
-            "main": "src/main.ts",
+            "main": "src/client/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": "src/client/polyfills.ts",
-            "tsConfig": "src/tsconfig.app.json",
+            "tsConfig": "src/client/tsconfig.app.json",
             "assets": [
-              "src/browserconfig.xml",
+              "src/client/browserconfig.xml",
-              "src/favicon-16x16.png",
+              "src/client/favicon-16x16.png",
-              "src/favicon-32x32.png",
+              "src/client/favicon-32x32.png",
-              "src/favicon-96x96.png",
+              "src/client/favicon-96x96.png",
-              "src/favicon.ico",
+              "src/client/favicon.ico",
-              "src/assets",
+              "src/client/assets",
-              "src/manifest.json"
+              "src/client/manifest.json"
             ],
             "styles": [
-              "src/styles.css",
+              "src/client/styles.css",
-              "src/styles.scss"
+              "src/client/styles.scss"
             ],
             "scripts": [],
             "vendorChunk": true,
@@ -49,8 +49,8 @@
               ],
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
+                  "replace": "src/client/environments/environment.ts",
-                  "with": "src/environments/environment.prod.ts"
+                  "with": "src/client/environments/environment.prod.ts"
                 }
               ],
               "optimization": true,
@@ -71,8 +71,8 @@
               ],
               "fileReplacements": [
                 {
-                  "replace": "src/environments/environment.ts",
+                  "replace": "src/client/environments/environment.ts",
-                  "with": "src/environments/environment.codeserver.ts"
+                  "with": "src/client/environments/environment.codeserver.ts"
                 }
               ]
             }
@@ -102,18 +102,18 @@
         "test": {
           "builder": "@angular-devkit/build-angular:karma",
           "options": {
-            "main": "src/test.ts",
+            "main": "src/client/test.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": "src/client/polyfills.ts",
-            "tsConfig": "src/tsconfig.spec.json",
+            "tsConfig": "src/client/tsconfig.spec.json",
-            "karmaConfig": "src/karma.conf.js",
+            "karmaConfig": "src/client/karma.conf.js",
             "styles": [
-              "src/styles.css"
+              "src/client/styles.css"
             ],
             "scripts": [],
             "assets": [
-              "src/favicon.ico",
+              "src/client/favicon.ico",
-              "src/assets",
+              "src/client/assets",
-              "src/manifest.json"
+              "src/client/manifest.json"
             ]
           }
         }
@@ -141,4 +141,4 @@
   "cli": {
     "analytics": "b8304464-255e-47bb-976a-7ed81af63238"
   }
-}
+}

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'

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';

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 { AppComponent } from 'src/client/app/app.component';
-import { User, UserPermission, Permission } from 'src/app/users/user';
+import { User, UserPermission, Permission } from 'src/client/app/users/user';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 
 @Component({
     selector: 'app-add-edit-budget',

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 { AppComponent } from 'src/client/app/app.component';
-import { Transaction } from 'src/app/transactions/transaction';
+import { Transaction } from 'src/client/app/transactions/transaction';
-import { Category } from 'src/app/categories/category';
+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({

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 { AppComponent } from 'src/client/app/app.component';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 
 @Component({
   selector: 'app-category-form',

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 { Category } from 'src/client/app/categories/category';
-import { AppComponent } from 'src/app/app.component';
+import { AppComponent } from 'src/client/app/app.component';
-import { TWIGS_SERVICE, TwigsService } from 'src/app/shared/twigs.service';
+import { TWIGS_SERVICE, TwigsService } from 'src/client/app/shared/twigs.service';
 import { MatRadioChange } from '@angular/material/radio';
 
 @Component({

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',

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({

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({