Merge pull request #11 from Stewartarmbrecht/fix404

Fix 404 for Web App After Deployment

Author: priyaananthasankar

.gitignore

@@ -290,3 +290,11 @@ __pycache__/
 *.xsd.cs
 src/Web/content-reactor/wwwroot/dist/bundle.js
 /web/src/signalr-web/SignalRMiddleware/EventApp/.vscode/launch.json
+/.azure
+/.config/configstore
+/proxy/proxies/proxies.zip
+/.nuget/NuGet
+/.npm
+/.node-gyp/8.11.3
+/.dotnet
+/web/src/signalr-web/SignalRMiddleware/SignalRMiddleware/wwwroot

setup.md

@@ -354,7 +354,7 @@ The web app is deployed into its own resource group. It has its own ARM template
 
  2. **Deploy ARM Template:** Use the _Azure Resource Group Deployment_ task, with the _Action_ set to `Create or update resource group`. Set the _Template_ to the location of the `template.json` file, e.g. `$(System.DefaultWorkingDirectory)/web/deploy/template.json`. Set the _Overridable template parameters_ to the following: `-functionAppProxyName {function-app-proxy-name}`
 
- 3. **Deploy API:** Use the _Azure App Service Deploy_ task, with the _App type_ set to `Function app`. Set the _App Service name_ to `contentreactor$(UniqueResourceNameSuffix)`. Set the _Package or folder_ to the relative location of the `.zip` file for the front-end API, e.g. `$(System.DefaultWorkingDirectory)/Web-CI/webapp/*.zip`.
+ 3. **Deploy API:** Use the _Azure App Service Deploy_ task, with the _App type_ set to `Web App`. Set the _App Service name_ to `crweb$(UniqueResourceNameSuffix)`. Set the _Package or folder_ to the relative location of the `.zip` file for the front-end API, e.g. `$(System.DefaultWorkingDirectory)/Web-CI/webapp/*.zip`.
 
  4. **Deploy Event Subscriptions ARM Template:** Use the _Azure Resource Group Deployment_ task, with the _Action_ set to `Create or update resource group`. Set the _Template_ to the location of the `eventGridSubscriptions.json` file, e.g. `$(System.DefaultWorkingDirectory)/web/deploy/eventGridSubscriptions.json`. Set the _Overridable template parameters_ to the following: `eventGridTopicName={event-grid-topic-name}  appServiceName={app-service-name}`
 
@@ -374,4 +374,4 @@ The web app is deployed into its own resource group. It has its own ARM template
 
 3. Deploy the Event Grid subscription ARM Template:
 
-    `az group deployment create -g ContentReactor-Events --template-file web/deploy/eventGridSubscriptions.json --parameters eventGridTopicName={event-grid-topic-name}  appServiceName={app-service-name}`
+    `az group deployment create -g ContentReactor-Events --template-file web/deploy/eventGridSubscriptions.json --parameters eventGridTopicName={event-grid-topic-name}  appServiceName={app-service-name}`

web/build/build.yaml

@@ -3,18 +3,25 @@
 resources:
 - repo: self
 queue:
-  name: ContentReactor-Web-CI
   demands: 
   - npm
   - msbuild
 
 steps:
 
-# Build Angular App
+# Install Angular App Dependencies
 - task: Npm@1
+  name: InstallNpmPackages
+  displayName: Install Angular App Dependencies
   inputs:
+    command: install
     workingDir: 'web/src/signalr-web/SignalRMiddleware/EventApp'
-    verbose: false
+    verbose: true
+
+# Package Angular App
+- script: npm run dist
+  displayName: Package Angular App
+  workingDirectory: 'web/src/signalr-web/SignalRMiddleware/EventApp'
 
 # Build the SignalR ASP.NET WebApp
 - task: DotNetCoreCLI@2
@@ -43,4 +50,4 @@ steps:
   inputs:
     pathToPublish: web/deploy
     artifactName: deploy
-    artifactType: container
+    artifactType: container

web/src/signalr-web/SignalRMiddleware/EventApp/src/app/components/items/item.component.ts

@@ -562,7 +562,7 @@ export class ItemComponent {
 
     }
 
-    openSubmitTextModal(content,textId:string) {
+    openSubmitTextModal(content) {
         this.inputText = ""
         this.modalService.open(content).result.then((result) => {        
             this.closeResult = `Closed with: ${result}`;

web/src/signalr-web/SignalRMiddleware/EventApp/src/environments/environment.prod.ts

@@ -1,3 +1,6 @@
 export const environment = {
-  production: true
+  production: true,
+  appInsights: { 
+    instrumentationKey: "%INSTRUMENTATION_KEY%" 
+  }
 };