From 66e37c24aa7b525b83711f3ae788c16c88ec5e28 Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Tue, 16 Apr 2024 17:41:54 +0000 Subject: [PATCH 1/9] mississippi eit --- haiku-src/haikus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-src/haikus.json b/haiku-src/haikus.json index 2e8f99d..8840015 100644 --- a/haiku-src/haikus.json +++ b/haiku-src/haikus.json @@ -1,6 +1,6 @@ [ { - "text": "rain in tupelo,\ndon't forget an umbrella,\nor it will be gloom", + "text": "rain in mississippi,\ndon't forget an umbrella,\nor it will be gloom", "image": "puddle_jumper_octodex.jpg" }, { From 2708d111a70119912ecf369d78a4f310ba31117b Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Tue, 16 Apr 2024 19:22:28 +0000 Subject: [PATCH 2/9] fixed the test I am awesome --- haiku-src/haiku-tests.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-src/haiku-tests.js b/haiku-src/haiku-tests.js index 77d88d3..cea9903 100644 --- a/haiku-src/haiku-tests.js +++ b/haiku-src/haiku-tests.js @@ -38,7 +38,7 @@ describe('GET /nonexistent', () => { request(app) .get('/nonexistent') .expect('Content-Type', /html/) - .expect(400) + .expect(404) .end((err, res) => { if (err) return done(err); expect(res.status).to.equal(404); From 4f6c23dea93994df373adc9eae85d84ca9d59ad7 Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Thu, 27 Jun 2024 21:38:57 -0400 Subject: [PATCH 3/9] Update haikus.json --- haiku-src/haikus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-src/haikus.json b/haiku-src/haikus.json index 8840015..ae07d84 100644 --- a/haiku-src/haikus.json +++ b/haiku-src/haikus.json @@ -1,6 +1,6 @@ [ { - "text": "rain in mississippi,\ndon't forget an umbrella,\nor it will be gloom", + "text": "rain in mississippii,\ndon't forget an umbrella,\nor it will be gloom", "image": "puddle_jumper_octodex.jpg" }, { From 420d974f38d5db08ad5fac6709861a47fe43acd8 Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Thu, 27 Jun 2024 21:59:34 -0400 Subject: [PATCH 4/9] Update haiku-push-main-cd.yml --- .github/workflows/haiku-push-main-cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haiku-push-main-cd.yml b/.github/workflows/haiku-push-main-cd.yml index f86c45f..c2ebaf0 100644 --- a/.github/workflows/haiku-push-main-cd.yml +++ b/.github/workflows/haiku-push-main-cd.yml @@ -88,7 +88,7 @@ jobs: environment: name: 'DEV' - url: 'https://gapdemodev.azurewebsites.net' + url: 'https://github-actions-demo-dev-2024.azurewebsites.net' steps: @@ -126,7 +126,7 @@ jobs: environment: name: 'STAGING' - url: 'https://gapdemostaging.azurewebsites.net' + url: 'https://github-actions-demo-staging-2024.azurewebsites.net' steps: @@ -163,7 +163,7 @@ jobs: environment: name: 'PROD' - url: 'https://gapdemoprod.azurewebsites.net' + url: 'https://github-actions-demo-prod-2024.azurewebsites.net' steps: From e5507b7212916c60b09a2ad894780c525a10a0c6 Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Thu, 27 Jun 2024 22:03:33 -0400 Subject: [PATCH 5/9] Update haiku-push-main-cd.yml --- .github/workflows/haiku-push-main-cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/haiku-push-main-cd.yml b/.github/workflows/haiku-push-main-cd.yml index c2ebaf0..d38da88 100644 --- a/.github/workflows/haiku-push-main-cd.yml +++ b/.github/workflows/haiku-push-main-cd.yml @@ -111,7 +111,7 @@ jobs: - name: 'Deploy to DEV Azure webapp using OIDC' uses: azure/webapps-deploy@v2.2.10 with: - app-name: gapdemodev # Replace with your app name + app-name: github-actions-demo-dev-2024 # Replace with your app name package: deployment-package @@ -148,7 +148,7 @@ jobs: - name: 'Deploy to STAGING Azure webapp using OIDC' uses: azure/webapps-deploy@v2.2.10 with: - app-name: gapdemostaging # Replace with your app name + app-name: github-actions-demo-staging-2024 # Replace with your app name package: deployment-package deploy-to-prod: @@ -185,6 +185,6 @@ jobs: - name: 'Deploy to PROD Azure webapp using OIDC' uses: azure/webapps-deploy@v2.2.10 with: - app-name: gapdemoprod # Replace with your app name + app-name: github-actions-demo-prod-2024 # Replace with your app name package: deployment-package From 0759bc584e161acfbaadc79adfea758b32cc27f0 Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Fri, 28 Jun 2024 15:47:53 -0400 Subject: [PATCH 6/9] SCS Please work --- haiku-src/haikus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-src/haikus.json b/haiku-src/haikus.json index ae07d84..6c5028d 100644 --- a/haiku-src/haikus.json +++ b/haiku-src/haikus.json @@ -1,6 +1,6 @@ [ { - "text": "rain in mississippii,\ndon't forget an umbrella,\nor it will be gloom", + "text": "rain in SCS,\ndon't forget an umbrella,\nor it will be gloom", "image": "puddle_jumper_octodex.jpg" }, { From f38c888042f784b0f1c10194701240501361f41e Mon Sep 17 00:00:00 2001 From: Mickey Gousset Date: Fri, 28 Jun 2024 15:49:10 -0400 Subject: [PATCH 7/9] Please work again --- haiku-src/haikus.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-src/haikus.json b/haiku-src/haikus.json index 6c5028d..473e949 100644 --- a/haiku-src/haikus.json +++ b/haiku-src/haikus.json @@ -1,6 +1,6 @@ [ { - "text": "rain in SCS,\ndon't forget an umbrella,\nor it will be gloom", + "text": "rain in SCS ,\ndon't forget an umbrella,\nor it will be gloom", "image": "puddle_jumper_octodex.jpg" }, { From c436e5752b648e16d7160b6027eb3461d568a99b Mon Sep 17 00:00:00 2001 From: "William H. Salazar" Date: Tue, 23 Jul 2024 11:08:02 -0700 Subject: [PATCH 8/9] Update index.js --- haiku-src/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haiku-src/index.js b/haiku-src/index.js index 82f1577..8fdf43a 100644 --- a/haiku-src/index.js +++ b/haiku-src/index.js @@ -1,7 +1,7 @@ let express = require('express'); let app = express(); let ejs = require('ejs'); -/* +/* * const haikus = require('./haikus.json'); const port = process.env.PORT || 3000; From 807ba80b788fe2e90a3e0e2b834d7c57f3401b86 Mon Sep 17 00:00:00 2001 From: "William H. Salazar" Date: Tue, 6 Aug 2024 09:13:07 -0700 Subject: [PATCH 9/9] Update index.js --- haiku-src/index.js | 1 + 1 file changed, 1 insertion(+) diff --git a/haiku-src/index.js b/haiku-src/index.js index 8fdf43a..8b88b0b 100644 --- a/haiku-src/index.js +++ b/haiku-src/index.js @@ -17,6 +17,7 @@ app.listen(port); const haikus = require('./haikus.json'); //const express = require('express'); //const app = express(); +//added a comment app.use(express.static('public')) app.set('view engine', 'ejs');