O01eg/freeorion-test-web - Change HZDCKIXQ3LCD7YPL7ZZBCRMD7YMKDJ2QAALETTG3FYMBF4TNFUBAC

Use constants for templates

Created by O01eg on February 2, 2022

HZDCKIXQ3LCD7YPL7ZZBCRMD7YMKDJ2QAALETTG3FYMBF4TNFUBAC

Dependencies

In channels

main

Change contents

File addition: query-reset-game-pwd.html (----------)

[4.12]

<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<link rel="stylesheet" type="text/css" href="static/style.css" />
<title>Reset game password</title>
</head>
<body>
<div class="navi">
</div>
<div class="content">
<p><em>Thank you for playing FreeOrion with us.</em><br/>
<em>Donates are welcome <u>BTC: bc1q04qnmql47zkha6p4edl86hm0wgk90dmsfnl3vl</u></em></p>
</div>
</body>
</html>

Insertion in src/pages/reset_game_pwd.rs at line 4 [5.597]
[5.664]
[6.0]
```
use crate::pages::templates::RESET_GAME_PWD;
```
Replacement in src/pages/reset_game_pwd.rs at line 79 [5.597]
B:BD[7.2422] → [7.2422:2448]
```
        "reset-game-pwd",
```
[7.2422]
[7.2448]
```
        RESET_GAME_PWD,
```

File addition: query_reset_game_pwd.rs (----------)

[8.17]

use actix_web::{web, HttpResponse};
use crate::pages::templates::QUERY_RESET_GAME_PWD;
use crate::WebData;
pub async fn query_reset_game_pwd(data: web::Data<WebData<'_>>) -> HttpResponse {
    let body = match data.handlebars.render(QUERY_RESET_GAME_PWD, &()) {
        Ok(b) => b,
        Err(e) => {
            log::error!("Render index error: {}", e);
            return HttpResponse::ServiceUnavailable().body(actix_web::body::None::new());
        }
    };
    HttpResponse::Ok().body(body)
}

Insertion in src/pages/mod.rs at line 8 [8.50]
[8.66]
[5.1067]
```
pub mod query_reset_game_pwd;
```

Insertion in src/pages/mod.rs at line 11 [8.50]

[6.414]

pub mod templates {
    pub const INDEX: &str = "index";
    pub const RESET_GAME_PWD: &str = "reset-game-pwd";
    pub const QUERY_RESET_GAME_PWD: &str = "query-reset-game-pwd";
    pub const ATOM_TURNS: &str = "atom-turns";
    pub const ATOM_GAMES: &str = "atom-games";
}

Insertion in src/pages/index.rs at line 3 [8.100]
[8.138]
[6.562]
```
use crate::pages::templates::INDEX;
```

Replacement in src/pages/index.rs at line 7 [8.100]

B:BD[6.650] → [6.650:710]

    let body = match data.handlebars.render("index", &()) {

[6.650]

[9.314]

    let body = match data.handlebars.render(INDEX, &()) {

Deletion in src/pages/atom_turns.rs at line 1 [10.86]
B:BD[10.86] → [10.87:107]
```
use crate::WebData;
```
Insertion in src/pages/atom_turns.rs at line 2 [10.86]
[10.143]
[10.143]
```
use crate::pages::templates::ATOM_TURNS;
use crate::WebData;
```
Replacement in src/pages/atom_turns.rs at line 87 [10.86]
B:BD[10.2726] → [3.0:22]
```
        "atom-turns",
```
[10.2726]
[10.2743]
```
        ATOM_TURNS,
```
Insertion in src/main.rs at line 14 [11.17]
[8.423]
[5.1092]
```
use pages::query_reset_game_pwd::query_reset_game_pwd;
```
Insertion in src/main.rs at line 17 [11.17]
[5.1187]
[6.744]
```
use pages::templates;
```

Replacement in src/main.rs at line 81 [11.17]

B:BD[4.384] → [4.384:465]

        .register_template_string("index", include_str!("templates/index.html"))

[4.384]

[5.1188]

        .register_template_string(templates::INDEX, include_str!("templates/index.html"))

Replacement in src/main.rs at line 85 [11.17]

B:BD[5.1273] → [5.1273:1303]

            "reset-game-pwd",

[5.1273]

[5.1303]

            templates::RESET_GAME_PWD,

Replacement in src/main.rs at line 88 [11.17]
∅:D[5.1372] → [4.465:500]
B:BD[4.465] → [4.465:500]
```
        .expect("index template");
```
[5.1372]
[10.3619]
```
        .expect("reset game pwd template");
```

Replacement in src/main.rs at line 90 [11.17]

B:BD[10.3634] → [10.3634:3719]

        .register_template_string("atom-games", include_str!("templates/games.xml"))

[10.3634]

[10.3719]

        .register_template_string(
            templates::QUERY_RESET_GAME_PWD,
            include_str!("templates/query-reset-game-pwd.html"),
        )
        .expect("query reset game pwd template");
    handlebars
        .register_template_string(templates::ATOM_GAMES, include_str!("templates/games.xml"))

Replacement in src/main.rs at line 99 [11.17]

B:BD[10.3774] → [10.3774:3859]

        .register_template_string("atom-turns", include_str!("templates/turns.xml"))

[10.3774]

[10.3859]

        .register_template_string(templates::ATOM_TURNS, include_str!("templates/turns.xml"))

Insertion in src/main.rs at line 110 [11.17]

[4.554]

[12.780]

    #[cfg(feature = "non-proxied")]
    log::info!("Listen {}", http);

Insertion in src/main.rs at line 121 [11.17]
[13.257]
[14.147]
```
        #[allow(clippy::let_and_return)]
```

Insertion in src/main.rs at line 128 [11.17]

[5.1429]

[6.1949]

            .route(
                "/query-reset-game-pwd.html",
                web::get().to(query_reset_game_pwd),
            )

Replacement in Cargo.lock at line 24 [12.8513]
B:BD[12.8970] → [15.18:44]
B:BD[12.8970] → [2.0:26]
```
version = "0.6.0-beta.15"
version = "0.6.0-beta.14"
```
[12.8970]
[12.8995]
```
version = "0.6.0-beta.16"
```

Replacement in Cargo.lock at line 26 [12.8513]

B:BD[12.9060] → [15.45:123]

B:BD[12.9060] → [2.27:105]

checksum = "66862400e0b79538bc52926dadd965d01c9320b0477eecedac2d3d6bda5e9b92"
checksum = "5e05214f6534259a690fcc710e47c044480458a3d050c9d803628de2ce052052"

[12.9060]

[12.9138]

checksum = "0b49f1b48724a52605ba40b67ede24f5a6cbc246817f9278d280d393a28e8b0e"

Replacement in Cargo.lock at line 47 [12.8513]
B:BD[12.9366] → [15.124:150]
```
version = "3.0.0-beta.19"
```
[12.9366]
[12.9391]
```
version = "3.0.0-rc.1"
```

Replacement in Cargo.lock at line 49 [12.8513]

B:BD[12.9456] → [15.151:229]

checksum = "ae58d21721388ea9b2cd0d4c11756b0f34424cdcd6e5cc74c3ce37b4641c8af0"

[12.9456]

[12.9534]

checksum = "08aac516b88cb8cfbfa834c76b58607ffac75946d947dcb6a9ffc5673e1e875d"

Replacement in Cargo.lock at line 94 [12.8513]
B:BD[12.10322] → [15.252:275]
B:BD[12.10322] → [2.106:129]
```
version = "0.5.0-rc.2"
version = "0.5.0-rc.1"
```
[12.10322]
[12.10340]
```
version = "0.5.0-rc.3"
```

Replacement in Cargo.lock at line 96 [12.8513]

B:BD[12.10405] → [15.276:354]

B:BD[12.10405] → [2.130:208]

checksum = "5e0b59ad08167ffbb686ddb495846707231e96908b829b1fc218198ec581e2ad"
checksum = "4bdca166b1041184e2108ef05bd9909ec18cc6abc41152d31d30224cebfaac75"

[12.10405]

[12.10483]

checksum = "cb6506dbef336634ff35d994d58daa0a412ea23751f15f9b4dcac4d594b1ed1f"

Deletion in Cargo.lock at line 112 [12.8513]
B:BD[12.10763] → [12.10763:10780]
```
 "actix-macros",
```
Deletion in Cargo.lock at line 118 [12.8513]
B:BD[12.10844] → [15.355:373]
```
version = "2.0.0"
```

Deletion in Cargo.lock at line 120 [12.8513]

B:BD[12.10934] → [15.374:452]

checksum = "d9e7472ac180abb0a8e592b653744345983a7a14f44691c8394a799d0df4dbbf"

Replacement in Cargo.lock at line 157 [12.8513]
B:BD[12.12130] → [15.453:479]
B:BD[12.12130] → [2.307:333]
```
version = "4.0.0-beta.21"
version = "4.0.0-beta.20"
```
[12.12130]
[12.12155]
```
version = "4.0.0-rc.2"
```

Replacement in Cargo.lock at line 159 [12.8513]

B:BD[12.12220] → [15.480:558]

B:BD[12.12220] → [2.334:412]

checksum = "606fc29a9bde2907243086ceb93ce56df7584276c2c46abc64a524f645c63c5e"
checksum = "aa8ba5081e9f8d0016cf34df516c699198158fd8c77990aa284115b055ead61b"

[12.12220]

[12.12298]

checksum = "73170d019de2d82c0d826c1f315c3106134bd764e9247505ba6f0d78d22dfe9e"

Replacement in Cargo.lock at line 196 [12.8513]
B:BD[12.12744] → [16.2831:2854]
```
version = "0.5.0-rc.1"
```
[12.12744]
[12.12769]
```
version = "0.5.0-rc.2"
```

Replacement in Cargo.lock at line 198 [12.8513]

B:BD[12.12834] → [16.2855:2933]

checksum = "98a793e4a7bd059e06e1bc1bd9943b57a47f806de3599d2437441682292c333e"

[12.12834]

[12.12912]

checksum = "4d0976042e6ddc82c7d0dedd64d39959bc26d9bba098b2f6c32a73fbef784eaf"

Replacement in Cargo.lock at line 401 [12.8513]
B:BD[12.17200] → [6.2918:2937]
B:BD[12.17200] → [2.413:432]
```
version = "3.0.13"
version = "3.0.10"
```
[12.17200]
[12.17219]
```
version = "3.0.14"
```

Replacement in Cargo.lock at line 403 [12.8513]

B:BD[12.17284] → [6.2938:3016]

B:BD[12.17284] → [2.433:511]

checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"
checksum = "7a30c3bf9ff12dfe5dae53f0a96e0febcd18420d1c0e7fad77796d9d5c4b5375"

[12.17284]

[12.17362]

checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"

Deletion in Cargo.lock at line 725 [12.8513]
B:BD[12.21964] → [15.1543:1561]
```
version = "0.2.4"
```

Deletion in Cargo.lock at line 727 [12.8513]

B:BD[12.22047] → [15.1562:1640]

checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"

Deletion in Cargo.lock at line 755 [12.8513]
B:BD[17.3277] → [15.1641:1659]
```
version = "4.2.1"
```

Deletion in Cargo.lock at line 757 [12.8513]

B:BD[17.3360] → [15.1660:1738]

checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8"

Replacement in Cargo.lock at line 885 [12.8513]
B:BD[12.24897] → [14.887:907]
```
version = "0.2.114"
```
[12.24897]
[16.8299]
```
version = "0.2.116"
```

Replacement in Cargo.lock at line 887 [12.8513]

B:BD[16.8364] → [14.908:986]

checksum = "b0005d08a8f7b65fb8073cb697aa0b12b631ed251ce73d862ce50eeb52ce3b50"

[16.8364]

[16.8442]

checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"

Replacement in Cargo.lock at line 915 [12.8513]
B:BD[12.25090] → [16.8857:8875]
```
version = "0.4.5"
```
[12.25090]
[12.25108]
```
version = "0.4.6"
```

Replacement in Cargo.lock at line 917 [12.8513]

B:BD[12.25173] → [16.8876:8954]

checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"

[12.25173]

[12.25251]

checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"

Deletion in Cargo.lock at line 1362 [12.8513]
∅:D[15.2271] → [12.33233:33269]
∅:D[6.7201] → [12.33233:33269]
∅:D[16.12007] → [12.33233:33269]
B:BD[12.33233] → [12.33233:33269]
```
dependencies = [
 "serde_derive",
]
```
Deletion in Cargo.lock at line 1377 [12.8513]
B:BD[12.33553] → [2.708:727]
```
version = "1.0.75"
```
Solving an order conflict in Cargo.lock at line 1377 [12.8513]
[15.2391]
[12.33572]

Deletion in Cargo.lock at line 1379 [12.8513]

B:BD[12.33637] → [2.728:806]

checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79"

Solving an order conflict in Cargo.lock at line 1379 [12.8513]
[15.2470]
[12.33715]
Deletion in Cargo.lock at line 1387 [12.8513]
B:BD[12.33800] → [15.2481:2499]
```
version = "0.7.1"
```

Deletion in Cargo.lock at line 1389 [12.8513]

B:BD[12.33883] → [15.2500:2578]

checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"

Deletion in Cargo.lock at line 1393 [12.8513]
B:BD[12.33998] → [2.905:920]
```
 "itoa 1.0.1",
```
Solving an order conflict in Cargo.lock at line 1393 [12.8513]
[15.2588]
[12.34007]
Deletion in Cargo.lock at line 1454 [12.8513]
B:BD[12.34945] → [15.2589:2607]
```
version = "1.8.0"
```

Deletion in Cargo.lock at line 1456 [12.8513]

B:BD[12.35028] → [15.2608:2686]

checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"

Replacement in Cargo.lock at line 1460 [12.8513]
B:BD[12.35136] → [15.2687:2705]
```
version = "0.4.3"
```
[12.35136]
[12.35155]
```
version = "0.4.4"
```

Replacement in Cargo.lock at line 1462 [12.8513]

B:BD[12.35220] → [15.2706:2784]

checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b"

[12.35220]

[12.35298]

checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"

Replacement in Cargo.lock at line 1561 [12.8513]
B:BD[12.39137] → [16.13390:13409]
```
version = "1.15.0"
```
[12.39137]
[12.39155]
```
version = "1.16.1"
```

Replacement in Cargo.lock at line 1563 [12.8513]

B:BD[12.39220] → [16.13410:13488]

checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"

[12.39220]

[12.39298]

checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"

Use constants for templates

Dependencies

In channels

Change contents

File addition: query-reset-game-pwd.html (----------)

Insertion in src/pages/reset_game_pwd.rs at line 4 [5.597]

Replacement in src/pages/reset_game_pwd.rs at line 79 [5.597]

File addition: query_reset_game_pwd.rs (----------)

Insertion in src/pages/mod.rs at line 8 [8.50]

Insertion in src/pages/mod.rs at line 11 [8.50]

Insertion in src/pages/index.rs at line 3 [8.100]

Replacement in src/pages/index.rs at line 7 [8.100]

Deletion in src/pages/atom_turns.rs at line 1 [10.86]

Insertion in src/pages/atom_turns.rs at line 2 [10.86]

Replacement in src/pages/atom_turns.rs at line 87 [10.86]

Insertion in src/main.rs at line 14 [11.17]

Insertion in src/main.rs at line 17 [11.17]

Replacement in src/main.rs at line 81 [11.17]

Replacement in src/main.rs at line 85 [11.17]

Replacement in src/main.rs at line 88 [11.17]

Replacement in src/main.rs at line 90 [11.17]

Replacement in src/main.rs at line 99 [11.17]

Insertion in src/main.rs at line 110 [11.17]

Insertion in src/main.rs at line 121 [11.17]

Insertion in src/main.rs at line 128 [11.17]

Replacement in Cargo.lock at line 24 [12.8513]

Replacement in Cargo.lock at line 26 [12.8513]

Replacement in Cargo.lock at line 47 [12.8513]

Replacement in Cargo.lock at line 49 [12.8513]

Replacement in Cargo.lock at line 94 [12.8513]

Replacement in Cargo.lock at line 96 [12.8513]

Deletion in Cargo.lock at line 112 [12.8513]

Deletion in Cargo.lock at line 118 [12.8513]

Deletion in Cargo.lock at line 120 [12.8513]

Replacement in Cargo.lock at line 157 [12.8513]

Replacement in Cargo.lock at line 159 [12.8513]

Replacement in Cargo.lock at line 196 [12.8513]

Replacement in Cargo.lock at line 198 [12.8513]

Replacement in Cargo.lock at line 401 [12.8513]

Replacement in Cargo.lock at line 403 [12.8513]

Deletion in Cargo.lock at line 725 [12.8513]

Deletion in Cargo.lock at line 727 [12.8513]

Deletion in Cargo.lock at line 755 [12.8513]

Deletion in Cargo.lock at line 757 [12.8513]

Replacement in Cargo.lock at line 885 [12.8513]

Replacement in Cargo.lock at line 887 [12.8513]

Replacement in Cargo.lock at line 915 [12.8513]

Replacement in Cargo.lock at line 917 [12.8513]

Deletion in Cargo.lock at line 1362 [12.8513]

Deletion in Cargo.lock at line 1377 [12.8513]

Solving an order conflict in Cargo.lock at line 1377 [12.8513]

Deletion in Cargo.lock at line 1379 [12.8513]

Solving an order conflict in Cargo.lock at line 1379 [12.8513]

Deletion in Cargo.lock at line 1387 [12.8513]

Deletion in Cargo.lock at line 1389 [12.8513]

Deletion in Cargo.lock at line 1393 [12.8513]

Solving an order conflict in Cargo.lock at line 1393 [12.8513]

Deletion in Cargo.lock at line 1454 [12.8513]

Deletion in Cargo.lock at line 1456 [12.8513]

Replacement in Cargo.lock at line 1460 [12.8513]

Replacement in Cargo.lock at line 1462 [12.8513]

Replacement in Cargo.lock at line 1561 [12.8513]

Replacement in Cargo.lock at line 1563 [12.8513]