Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
@code {
protected override void OnInitialized()
{
Dispatcher.Dispatch(new SetHeaderBarTitleAction("DDDSW 2024"));
Dispatcher.Dispatch(new SetHeaderBarTitleAction($"DDD South West {DateTime.UtcNow.Year}"));

if(State.Value.Loading)
Dispatcher.Dispatch(new LoadDataAction());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
@inject IDispatcher Dispatcher

<MudDialog>
<TitleContent><h2 class="d-flex justify-center">Welcome to DDD South West 2024</h2> </TitleContent>
<TitleContent><h2 class="d-flex justify-center">Welcome to DDD South West @DateTime.UtcNow.Year</h2> </TitleContent>
<DialogContent>

<MudCard>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
<title>PocketDDD.BlazorClient</title>
<title>Pocket DDD South West 2025</title>
<base href="/" />
<link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500,700&display=swap" rel="stylesheet" />
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
Expand Down
6 changes: 3 additions & 3 deletions terraform/blazor_client.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
}
2 changes: 1 addition & 1 deletion terraform/locals.tf
Original file line number Diff line number Diff line change
@@ -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}"
}
4 changes: 2 additions & 2 deletions terraform/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ 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",
"List",
"Purge",
]

storage_permissions = [ ]
storage_permissions = []
}
}
2 changes: 1 addition & 1 deletion terraform/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ variable "client_sku_size" {

variable "cloudflare_account_id" {
nullable = false
type = string
type = string
}
12 changes: 6 additions & 6 deletions tfvars/Production.tfvars
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
12 changes: 6 additions & 6 deletions tfvars/Test2.tfvars
Original file line number Diff line number Diff line change
@@ -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"
api_always_on = false
client_sku_tier = "Free"
client_sku_size = "Free"
12 changes: 6 additions & 6 deletions tfvars/dev.tfvars
Original file line number Diff line number Diff line change
@@ -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"
api_always_on = false
client_sku_tier = "Free"
client_sku_size = "Free"
Loading