From 755dc56bb290671cd4585885c3a52e03463f74ac Mon Sep 17 00:00:00 2001 From: Russell Day Date: Wed, 16 Apr 2025 20:30:57 +0100 Subject: [PATCH 1/4] Update year references to use current year --- .../PocketDDD.BlazorClient/Features/Home/Components/Home.razor | 2 +- .../Features/Security/Components/Login.razor | 2 +- terraform/locals.tf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor index 93425e4..9f9531d 100644 --- a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor +++ b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor @@ -40,7 +40,7 @@ @code { protected override void OnInitialized() { - Dispatcher.Dispatch(new SetHeaderBarTitleAction("DDDSW 2024")); + Dispatcher.Dispatch(new SetHeaderBarTitleAction($"DDDSW {DateTime.UtcNow.Year}")); if(State.Value.Loading) Dispatcher.Dispatch(new LoadDataAction()); diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Security/Components/Login.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Security/Components/Login.razor index 8e4545a..f10dc52 100644 --- a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Security/Components/Login.razor +++ b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Security/Components/Login.razor @@ -6,7 +6,7 @@ @inject IDispatcher Dispatcher -

Welcome to DDD South West 2024

 +

Welcome to DDD South West @DateTime.UtcNow.Year

 diff --git a/terraform/locals.tf b/terraform/locals.tf index c442b7a..1752fe5 100644 --- a/terraform/locals.tf +++ b/terraform/locals.tf @@ -1,5 +1,5 @@ locals { resource_prefix = "pocketddd-${var.env}" sql_server_name = "${local.resource_prefix}-sql-server" - subdomain = var.env == "production" ? "pocket2024" : "pocket-${var.env}" + subdomain = var.env == "production" ? "pocket2025" : "pocket-${var.env}" } \ No newline at end of file From 7fc7255da6ad43d3bc606ce36c86d8ea87d75524 Mon Sep 17 00:00:00 2001 From: Russell Day Date: Wed, 16 Apr 2025 20:38:02 +0100 Subject: [PATCH 2/4] Update layout title --- .../PocketDDD.BlazorClient/wwwroot/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/index.html b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/index.html index 5e86f46..b394390 100644 --- a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/index.html +++ b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/wwwroot/index.html @@ -4,7 +4,7 @@ - PocketDDD.BlazorClient + Pocket DDD South West 2025 From d890f6b12874c24d9b2d2c8857954cbe7fa04653 Mon Sep 17 00:00:00 2001 From: Russell Day Date: Wed, 16 Apr 2025 20:46:52 +0100 Subject: [PATCH 3/4] Expand name on homepage --- .../PocketDDD.BlazorClient/Features/Home/Components/Home.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor index 9f9531d..030a4f9 100644 --- a/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor +++ b/PocketDDD.BlazorClient/PocketDDD.BlazorClient/Features/Home/Components/Home.razor @@ -40,7 +40,7 @@ @code { protected override void OnInitialized() { - Dispatcher.Dispatch(new SetHeaderBarTitleAction($"DDDSW {DateTime.UtcNow.Year}")); + Dispatcher.Dispatch(new SetHeaderBarTitleAction($"DDD South West {DateTime.UtcNow.Year}")); if(State.Value.Loading) Dispatcher.Dispatch(new LoadDataAction()); From 30ca72de9244e3af26f7c89482e1a075f3c7813a Mon Sep 17 00:00:00 2001 From: Russell Day Date: Wed, 16 Apr 2025 20:51:06 +0100 Subject: [PATCH 4/4] tf fmt --- terraform/blazor_client.tf | 6 +++--- terraform/locals.tf | 2 +- terraform/main.tf | 4 ++-- terraform/variables.tf | 2 +- tfvars/Production.tfvars | 12 ++++++------ tfvars/Test2.tfvars | 12 ++++++------ tfvars/dev.tfvars | 12 ++++++------ 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/terraform/blazor_client.tf b/terraform/blazor_client.tf index e14041e..a1ccf03 100644 --- a/terraform/blazor_client.tf +++ b/terraform/blazor_client.tf @@ -7,8 +7,8 @@ resource "azurerm_static_web_app" "blazor-client" { sku_size = var.client_sku_size app_settings = { - "apiUrl": "https://pocketddd-${ var.env }-api-server-web-app.azurewebsites.net/api/" - "fakeBackend": "false" + "apiUrl" : "https://pocketddd-${var.env}-api-server-web-app.azurewebsites.net/api/" + "fakeBackend" : "false" } preview_environments_enabled = false @@ -35,6 +35,6 @@ resource "cloudflare_record" "cname_record" { resource "azurerm_static_web_app_custom_domain" "custom_domain" { static_web_app_id = azurerm_static_web_app.blazor-client.id - domain_name = "${cloudflare_record.cname_record.hostname}" + domain_name = cloudflare_record.cname_record.hostname validation_type = "cname-delegation" } diff --git a/terraform/locals.tf b/terraform/locals.tf index 1752fe5..99a498c 100644 --- a/terraform/locals.tf +++ b/terraform/locals.tf @@ -1,5 +1,5 @@ locals { resource_prefix = "pocketddd-${var.env}" sql_server_name = "${local.resource_prefix}-sql-server" - subdomain = var.env == "production" ? "pocket2025" : "pocket-${var.env}" + subdomain = var.env == "production" ? "pocket2025" : "pocket-${var.env}" } \ No newline at end of file diff --git a/terraform/main.tf b/terraform/main.tf index 3ddb7f7..ca2735b 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -60,7 +60,7 @@ resource "azurerm_key_vault" "key_vault" { tenant_id = data.azurerm_client_config.current.tenant_id object_id = "4a9cec89-cee2-44fb-978f-6ded96b60d31" - key_permissions = [ ] + key_permissions = [] secret_permissions = [ "Get", @@ -68,6 +68,6 @@ resource "azurerm_key_vault" "key_vault" { "Purge", ] - storage_permissions = [ ] + storage_permissions = [] } } diff --git a/terraform/variables.tf b/terraform/variables.tf index 4548969..b1d148d 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -42,5 +42,5 @@ variable "client_sku_size" { variable "cloudflare_account_id" { nullable = false - type = string + type = string } diff --git a/tfvars/Production.tfvars b/tfvars/Production.tfvars index 27cedef..07aaa71 100644 --- a/tfvars/Production.tfvars +++ b/tfvars/Production.tfvars @@ -1,10 +1,10 @@ -env = "production" -sql_db_sku = "Basic" -sql_max_storage = "2" +env = "production" +sql_db_sku = "Basic" +sql_max_storage = "2" api_app_service_sku = "B1" -api_always_on = false -client_sku_tier = "Free" -client_sku_size = "Free" +api_always_on = false +client_sku_tier = "Free" +client_sku_size = "Free" # Real prod values # env = "prod" diff --git a/tfvars/Test2.tfvars b/tfvars/Test2.tfvars index 34a80f3..8aee7bb 100644 --- a/tfvars/Test2.tfvars +++ b/tfvars/Test2.tfvars @@ -1,7 +1,7 @@ -env = "test2" -sql_db_sku = "Basic" -sql_max_storage = "2" +env = "test2" +sql_db_sku = "Basic" +sql_max_storage = "2" api_app_service_sku = "B1" -api_always_on = false -client_sku_tier = "Free" -client_sku_size = "Free" \ No newline at end of file +api_always_on = false +client_sku_tier = "Free" +client_sku_size = "Free" \ No newline at end of file diff --git a/tfvars/dev.tfvars b/tfvars/dev.tfvars index 52b2019..b8d02d4 100644 --- a/tfvars/dev.tfvars +++ b/tfvars/dev.tfvars @@ -1,7 +1,7 @@ -env = "dev" -sql_db_sku = "Basic" -sql_max_storage = "2" +env = "dev" +sql_db_sku = "Basic" +sql_max_storage = "2" api_app_service_sku = "F1" -api_always_on = false -client_sku_tier = "Free" -client_sku_size = "Free" \ No newline at end of file +api_always_on = false +client_sku_tier = "Free" +client_sku_size = "Free" \ No newline at end of file