From d0f5cb9d93ed6f2cf94f94d4a4e2b99955a6607b Mon Sep 17 00:00:00 2001 From: ashoji Date: Mon, 4 Dec 2023 10:20:40 +0900 Subject: [PATCH 1/8] API Version to 2023-05-01 --- deploy/main.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/main.bicep b/deploy/main.bicep index e6aa879..04514e3 100644 --- a/deploy/main.bicep +++ b/deploy/main.bicep @@ -87,7 +87,7 @@ module pythonService 'container-http.bicep' = { } } -resource stateDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-01-01-preview' = { +resource stateDaprComponent 'Microsoft.App/managedEnvironments/daprComponents@2023-05-01' = { name: '${environmentName}/orders' dependsOn: [ environment From 0bec95fc35144cf4646bb72fcc966c9e8cd1a730 Mon Sep 17 00:00:00 2001 From: ashoji Date: Mon, 4 Dec 2023 11:04:44 +0900 Subject: [PATCH 2/8] delete --- node-service/views/index.jade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/node-service/views/index.jade b/node-service/views/index.jade index 7fd2806..789f791 100644 --- a/node-service/views/index.jade +++ b/node-service/views/index.jade @@ -42,12 +42,12 @@ block content input(type='submit', value='View') //- Uncomment below to enable order deletion - //- h2= 'Delete Order' - //- br - //- br - //- form(action='/order/delete', method='post') - //- div.input - //- span.label Id - //- input(type='text', name='id', placeholder='foo', required='required') - //- div.actions - //- input(type='submit', value='View') \ No newline at end of file + h2= 'Delete Order' + br + br + form(action='/order/delete', method='post') + div.input + span.label Id + input(type='text', name='id', placeholder='foo', required='required') + div.actions + input(type='submit', value='View') \ No newline at end of file From bf85b689b457fad2a20e1c20cbfa4b3b0574ea5a Mon Sep 17 00:00:00 2001 From: ashoji Date: Mon, 4 Dec 2023 11:12:59 +0900 Subject: [PATCH 3/8] delete view --- node-service/views/index.jade | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/node-service/views/index.jade b/node-service/views/index.jade index 789f791..570515e 100644 --- a/node-service/views/index.jade +++ b/node-service/views/index.jade @@ -42,12 +42,12 @@ block content input(type='submit', value='View') //- Uncomment below to enable order deletion - h2= 'Delete Order' - br - br - form(action='/order/delete', method='post') - div.input - span.label Id - input(type='text', name='id', placeholder='foo', required='required') - div.actions - input(type='submit', value='View') \ No newline at end of file + h2= 'Delete Order' + br + br + form(action='/order/delete', method='post') + div.input + span.label Id + input(type='text', name='id', placeholder='foo', required='required') + div.actions + input(type='submit', value='View') \ No newline at end of file From 5d9dbed1d67d2f36d5e90890bb4d14b66054d81f Mon Sep 17 00:00:00 2001 From: ashoji Date: Mon, 4 Dec 2023 11:19:18 +0900 Subject: [PATCH 4/8] br --- node-service/views/index.jade | 2 ++ 1 file changed, 2 insertions(+) diff --git a/node-service/views/index.jade b/node-service/views/index.jade index 570515e..b6e6a59 100644 --- a/node-service/views/index.jade +++ b/node-service/views/index.jade @@ -42,6 +42,8 @@ block content input(type='submit', value='View') //- Uncomment below to enable order deletion + br + br h2= 'Delete Order' br br From 4b6d8338060ac39712784b856e1f4f0e153e3ecf Mon Sep 17 00:00:00 2001 From: ashoji Date: Mon, 4 Dec 2023 11:34:24 +0900 Subject: [PATCH 5/8] APIM true --- .github/workflows/build-and-deploy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 5d71253..d43fca6 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -116,4 +116,4 @@ jobs: containerRegistry=${{ env.REGISTRY }} \ containerRegistryUsername=${{ github.actor }} \ containerRegistryPassword=${{ secrets.GITHUB_TOKEN }} \ - deployApim=false + deployApim=true From 7a9dcd711a4c12d62750dfdd901a18bd71ee1114 Mon Sep 17 00:00:00 2001 From: ashoji Date: Thu, 7 Dec 2023 11:50:59 +0900 Subject: [PATCH 6/8] end --- node-service/views/index.jade | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/node-service/views/index.jade b/node-service/views/index.jade index b6e6a59..ca9248d 100644 --- a/node-service/views/index.jade +++ b/node-service/views/index.jade @@ -52,4 +52,5 @@ block content span.label Id input(type='text', name='id', placeholder='foo', required='required') div.actions - input(type='submit', value='View') \ No newline at end of file + input(type='submit', value='View') + h2= 'End' From 4e5e637e28987531dc7a13bcc6e1669e968340ec Mon Sep 17 00:00:00 2001 From: ashoji Date: Thu, 7 Dec 2023 12:20:52 +0900 Subject: [PATCH 7/8] edit --- node-service/views/index.jade | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/node-service/views/index.jade b/node-service/views/index.jade index ca9248d..570515e 100644 --- a/node-service/views/index.jade +++ b/node-service/views/index.jade @@ -42,8 +42,6 @@ block content input(type='submit', value='View') //- Uncomment below to enable order deletion - br - br h2= 'Delete Order' br br @@ -52,5 +50,4 @@ block content span.label Id input(type='text', name='id', placeholder='foo', required='required') div.actions - input(type='submit', value='View') - h2= 'End' + input(type='submit', value='View') \ No newline at end of file From 99f7059dfc2c1d892e42f2c881eb1a05aac68d93 Mon Sep 17 00:00:00 2001 From: ashoji Date: Thu, 7 Dec 2023 14:46:06 +0900 Subject: [PATCH 8/8] 2 --- node-service/views/index.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/node-service/views/index.jade b/node-service/views/index.jade index 570515e..f342cc4 100644 --- a/node-service/views/index.jade +++ b/node-service/views/index.jade @@ -42,7 +42,7 @@ block content input(type='submit', value='View') //- Uncomment below to enable order deletion - h2= 'Delete Order' + h2= 'Delete Order2' br br form(action='/order/delete', method='post')