From e4c39b8ea536ee7b6f8401be08e34480563ca55f Mon Sep 17 00:00:00 2001 From: John Sporn <70078012+JohnSporn@users.noreply.github.com> Date: Mon, 11 Jul 2022 11:31:37 -0400 Subject: [PATCH 1/7] Create Dockerfile --- Dockerfile | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..43cd3c5 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +# using Node v10 +FROM node:10 + +# Create app directory +WORKDIR /usr/src/lafs + +# Install app dependencies +# A wildcard is used to ensure both package.json AND package-lock.json are copied +# where available (npm@5+) +COPY package*.json ./ + +RUN npm install -g @angular/cli@v6-lts +RUN npm install +# If you are building your code for production +# RUN npm ci --only=production + +# Bundle app source +COPY . . + +# Expose port 3000 outside container +EXPOSE 4200 +# Command used to start application +CMD ng serve --host 0.0.0.0 From 1a044220bc119ee968bb349830618220a0d981b3 Mon Sep 17 00:00:00 2001 From: John Sporn <70078012+JohnSporn@users.noreply.github.com> Date: Mon, 11 Jul 2022 11:32:11 -0400 Subject: [PATCH 2/7] Create .dockerignore --- .dockerignore | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..f27c917 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.env +.git +.gitignore +node_modules +npm-debug.log From 66d2abade97d5e704d9f087b346923795320d3a8 Mon Sep 17 00:00:00 2001 From: John Sporn <70078012+JohnSporn@users.noreply.github.com> Date: Mon, 11 Jul 2022 11:45:35 -0400 Subject: [PATCH 3/7] Delete .dockerignore --- .dockerignore | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index f27c917..0000000 --- a/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -.env -.git -.gitignore -node_modules -npm-debug.log From 73d2ffee950d50bfefe2c522b50aa58c86a95850 Mon Sep 17 00:00:00 2001 From: John Sporn <70078012+JohnSporn@users.noreply.github.com> Date: Mon, 11 Jul 2022 11:45:43 -0400 Subject: [PATCH 4/7] Delete Dockerfile --- Dockerfile | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 43cd3c5..0000000 --- a/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# using Node v10 -FROM node:10 - -# Create app directory -WORKDIR /usr/src/lafs - -# Install app dependencies -# A wildcard is used to ensure both package.json AND package-lock.json are copied -# where available (npm@5+) -COPY package*.json ./ - -RUN npm install -g @angular/cli@v6-lts -RUN npm install -# If you are building your code for production -# RUN npm ci --only=production - -# Bundle app source -COPY . . - -# Expose port 3000 outside container -EXPOSE 4200 -# Command used to start application -CMD ng serve --host 0.0.0.0 From df30b0f2fb269f5415e4f6b781d382fe66e7813b Mon Sep 17 00:00:00 2001 From: jsporn1 Date: Mon, 11 Jul 2022 11:46:32 -0400 Subject: [PATCH 5/7] Docker files --- .dockerignore | 5 +++ Dockerfile | 23 ++++++++++++++ package-lock.json | 77 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 86 insertions(+), 19 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 0000000..f27c917 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,5 @@ +.env +.git +.gitignore +node_modules +npm-debug.log diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..bfa1af0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,23 @@ +# Using Node v10 +FROM node:10 + +# Create app directory +WORKDIR /usr/src/lafs + +# Install app dependencies +# A wildcard is used to ensure both package.json AND package-lock.json are copied +# where available (npm@5+) +COPY package*.json ./ + +RUN npm install -g @angular/cli@v6-lts +RUN npm install +# If you are building your code for production +# RUN npm ci --only=production + +# Bundle app source +COPY . . + +# Expose port 3000 outside container +EXPOSE 4200 +# Command used to start application +CMD ng serve --host 0.0.0.0 diff --git a/package-lock.json b/package-lock.json index 8131439..19b7373 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1099,6 +1099,7 @@ "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz", "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==", "dev": true, + "optional": true, "requires": { "delegates": "^1.0.0", "readable-stream": "^2.0.6" @@ -2299,7 +2300,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "constants-browserify": { "version": "1.0.0", @@ -2695,7 +2697,8 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=", - "dev": true + "dev": true, + "optional": true }, "depd": { "version": "1.1.2", @@ -3644,7 +3647,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -3665,12 +3669,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3685,17 +3691,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -3812,7 +3821,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -3824,6 +3834,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -3838,6 +3849,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -3845,12 +3857,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -3869,6 +3883,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -3949,7 +3964,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -3961,6 +3977,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -4046,7 +4063,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -4082,6 +4100,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -4101,6 +4120,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -4144,12 +4164,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -4158,6 +4180,7 @@ "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "inherits": "~2.0.0", @@ -4170,6 +4193,7 @@ "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz", "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=", "dev": true, + "optional": true, "requires": { "aproba": "^1.0.3", "console-control-strings": "^1.0.0", @@ -4207,7 +4231,8 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true + "dev": true, + "optional": true }, "get-stream": { "version": "3.0.0", @@ -4392,7 +4417,8 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz", "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=", - "dev": true + "dev": true, + "optional": true }, "has-value": { "version": "1.0.0", @@ -5112,7 +5138,8 @@ "version": "0.2.1", "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true + "dev": true, + "optional": true }, "is-windows": { "version": "1.0.2", @@ -5740,6 +5767,7 @@ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "parse-json": "^2.2.0", @@ -5752,7 +5780,8 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "dev": true, + "optional": true } } }, @@ -6027,7 +6056,8 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true + "dev": true, + "optional": true }, "map-visit": { "version": "1.0.0", @@ -6648,6 +6678,7 @@ "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz", "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==", "dev": true, + "optional": true, "requires": { "are-we-there-yet": "~1.1.2", "console-control-strings": "~1.1.0", @@ -7659,6 +7690,7 @@ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", "dev": true, + "optional": true, "requires": { "load-json-file": "^1.0.0", "normalize-package-data": "^2.3.2", @@ -7670,6 +7702,7 @@ "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", "dev": true, + "optional": true, "requires": { "graceful-fs": "^4.1.2", "pify": "^2.0.0", @@ -7680,7 +7713,8 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true + "dev": true, + "optional": true } } }, @@ -7689,6 +7723,7 @@ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", "dev": true, + "optional": true, "requires": { "find-up": "^1.0.0", "read-pkg": "^1.0.0" @@ -7699,6 +7734,7 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", "dev": true, + "optional": true, "requires": { "path-exists": "^2.0.0", "pinkie-promise": "^2.0.0" @@ -7709,6 +7745,7 @@ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", "dev": true, + "optional": true, "requires": { "pinkie-promise": "^2.0.0" } @@ -9006,6 +9043,7 @@ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", "dev": true, + "optional": true, "requires": { "is-utf8": "^0.2.0" } @@ -10342,6 +10380,7 @@ "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz", "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==", "dev": true, + "optional": true, "requires": { "string-width": "^1.0.2 || 2" } From e4b03cbcc416b9305f8b063ac63364ad9edafe94 Mon Sep 17 00:00:00 2001 From: jsporn1 Date: Thu, 14 Jul 2022 19:09:55 -0400 Subject: [PATCH 6/7] Docker Compose --- docker-compose.yml | 16 ++++++++++++++++ src/environments/environment.ts | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..7613960 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,16 @@ +version: '3.7' +services: +# Angular frontend application + app: + container_name: lafs-web + restart: always + build: . + ports: + - '4200:4200' + command: > + bash -c "npm install && ng serve --host 0.0.0.0 --port 4200" +# Attach the external network to these containers +networks: + default: + external: + name: lafs-net diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 11b2a01..2a4ffef 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -4,7 +4,7 @@ export const environment = { production: false, - api_url: 'https://q-a-example-loopback-api.herokuapp.com' + api_url: 'http://localhost:3000' }; /* From 221b044af32b19cb31aa4197b4d9d22007ac1d8d Mon Sep 17 00:00:00 2001 From: jsporn1 Date: Wed, 10 Aug 2022 08:45:49 -0400 Subject: [PATCH 7/7] final commit --- src/environments/environment.prod.ts | 2 +- src/main.ts | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 025b15c..3556cda 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { production: true, - api_url: 'https://q-a-example-loopback-api.herokuapp.com' + api_url: 'https://rv6r38urd6.execute-api.us-east-1.amazonaws.com' }; diff --git a/src/main.ts b/src/main.ts index b3709ab..2f68d25 100644 --- a/src/main.ts +++ b/src/main.ts @@ -14,3 +14,5 @@ platformBrowserDynamic().bootstrapModule(AppModule) .catch(err => console.error(err)); LoopBackConfig.setBaseURL(environment.api_url); + +LoopBackConfig.filterOnUrl();