pijul nest
guest › [sign in] [explore]

Use constants for templates

O01eg
Feb 2, 2022, 6:38 AM
HZDCKIXQ3LCD7YPL7ZZBCRMD7YMKDJ2QAALETTG3FYMBF4TNFUBAC

Dependencies

  • [2] 72WRIXYS Update dependencies
  • [3] ED42QYMU Fix template name
  • [4] WW3KRXX6 Add page for reset game password
  • [5] IM5ZPD4N Update dependencies
  • [6] EVP2FSBH Split index page
  • [7] WVHXYKCV Add postgresql pools
  • [8] OJO4B4QO Add login form and empty handler
  • [9] XMUKNMKY Prepare for release
  • [10] CMA5SKJ3 Copy turns Atom generator
  • [11] 7R6HAATP Optional publish static files if use reverse-proxy
  • [12] HTYEGVBU Add data to reset password page
  • [13] QEK76JYT Process and log template render error
  • [14] BCXEUKX6 Add config, static files and web server
  • [15] ZE5UFPX4 Add TTL cache for CSRF
  • [16] 65A3LIWU Use handlebars to render index
  • [*] 4MZ4VIR7 Initial commit
  • [*] QPHRMBEP Get "Real IP" for proxied build

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>
  • edit in src/pages/reset_game_pwd.rs at line 4
    [4.664]
    [4.0]
    use crate::pages::templates::RESET_GAME_PWD;
  • replacement in src/pages/reset_game_pwd.rs at line 79
    [4.2422]→[4.2422:2448](∅→∅)
    "reset-game-pwd",
    [4.2422]
    [4.2448]
    RESET_GAME_PWD,
  • file addition: query_reset_game_pwd.rs (----------)
    [4.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)
    }
  • edit in src/pages/mod.rs at line 8
    [4.66]
    [4.1067]
    pub mod query_reset_game_pwd;
  • edit in src/pages/mod.rs at line 11
    [4.414]
    [4.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";
    }
  • edit in src/pages/index.rs at line 3
    [4.138]
    [4.562]
    use crate::pages::templates::INDEX;
  • replacement in src/pages/index.rs at line 7
    [4.650]→[4.650:710](∅→∅)
    let body = match data.handlebars.render("index", &()) {
    [4.650]
    [4.314]
    let body = match data.handlebars.render(INDEX, &()) {
  • edit in src/pages/atom_turns.rs at line 1
    [4.86]→[4.87:107](∅→∅)
    use crate::WebData;
  • edit in src/pages/atom_turns.rs at line 2
    [4.143]
    [4.143]
    use crate::pages::templates::ATOM_TURNS;
    use crate::WebData;
  • replacement in src/pages/atom_turns.rs at line 87
    [4.2726]→[3.0:22](∅→∅)
    "atom-turns",
    [4.2726]
    [4.2743]
    ATOM_TURNS,
  • edit in src/main.rs at line 14
    [4.423]
    [4.1092]
    use pages::query_reset_game_pwd::query_reset_game_pwd;
  • edit in src/main.rs at line 17
    [4.1187]
    [4.744]
    use pages::templates;
  • replacement in src/main.rs at line 81
    [4.384]→[4.384:465](∅→∅)
    .register_template_string("index", include_str!("templates/index.html"))
    [4.384]
    [4.1188]
    .register_template_string(templates::INDEX, include_str!("templates/index.html"))
  • replacement in src/main.rs at line 85
    [4.1273]→[4.1273:1303](∅→∅)
    "reset-game-pwd",
    [4.1273]
    [4.1303]
    templates::RESET_GAME_PWD,
  • replacement in src/main.rs at line 88
    [4.1372]→[4.465:500](∅→∅),[4.465]→[4.465:500](∅→∅)
    .expect("index template");
    [4.1372]
    [4.3619]
    .expect("reset game pwd template");
  • replacement in src/main.rs at line 90
    [4.3634]→[4.3634:3719](∅→∅)
    .register_template_string("atom-games", include_str!("templates/games.xml"))
    [4.3634]
    [4.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
    [4.3774]→[4.3774:3859](∅→∅)
    .register_template_string("atom-turns", include_str!("templates/turns.xml"))
    [4.3774]
    [4.3859]
    .register_template_string(templates::ATOM_TURNS, include_str!("templates/turns.xml"))
  • edit in src/main.rs at line 110
    [4.554]
    [4.780]
    #[cfg(feature = "non-proxied")]
    log::info!("Listen {}", http);
  • edit in src/main.rs at line 121
    [19.257]
    [4.147]
    #[allow(clippy::let_and_return)]
  • edit in src/main.rs at line 128
    [4.1429]
    [4.1949]
    .route(
    "/query-reset-game-pwd.html",
    web::get().to(query_reset_game_pwd),
    )
  • replacement in Cargo.lock at line 24
    [4.8970]→[4.18:44](∅→∅),[4.8970]→[2.0:26](∅→∅)
    version = "0.6.0-beta.15"
    version = "0.6.0-beta.14"
    [4.8970]
    [4.8995]
    version = "0.6.0-beta.16"
  • replacement in Cargo.lock at line 26
    [4.9060]→[4.45:123](∅→∅),[4.9060]→[2.27:105](∅→∅)
    checksum = "66862400e0b79538bc52926dadd965d01c9320b0477eecedac2d3d6bda5e9b92"
    checksum = "5e05214f6534259a690fcc710e47c044480458a3d050c9d803628de2ce052052"
    [4.9060]
    [4.9138]
    checksum = "0b49f1b48724a52605ba40b67ede24f5a6cbc246817f9278d280d393a28e8b0e"
  • replacement in Cargo.lock at line 47
    [4.9366]→[4.124:150](∅→∅)
    version = "3.0.0-beta.19"
    [4.9366]
    [4.9391]
    version = "3.0.0-rc.1"
  • replacement in Cargo.lock at line 49
    [4.9456]→[4.151:229](∅→∅)
    checksum = "ae58d21721388ea9b2cd0d4c11756b0f34424cdcd6e5cc74c3ce37b4641c8af0"
    [4.9456]
    [4.9534]
    checksum = "08aac516b88cb8cfbfa834c76b58607ffac75946d947dcb6a9ffc5673e1e875d"
  • replacement in Cargo.lock at line 94
    [4.10322]→[4.252:275](∅→∅),[4.10322]→[2.106:129](∅→∅)
    version = "0.5.0-rc.2"
    version = "0.5.0-rc.1"
    [4.10322]
    [4.10340]
    version = "0.5.0-rc.3"
  • replacement in Cargo.lock at line 96
    [4.10405]→[4.276:354](∅→∅),[4.10405]→[2.130:208](∅→∅)
    checksum = "5e0b59ad08167ffbb686ddb495846707231e96908b829b1fc218198ec581e2ad"
    checksum = "4bdca166b1041184e2108ef05bd9909ec18cc6abc41152d31d30224cebfaac75"
    [4.10405]
    [4.10483]
    checksum = "cb6506dbef336634ff35d994d58daa0a412ea23751f15f9b4dcac4d594b1ed1f"
  • edit in Cargo.lock at line 112
    [4.10763]→[4.10763:10780](∅→∅)
    "actix-macros",
  • edit in Cargo.lock at line 118
    [4.10844]→[4.355:373](∅→∅)
    version = "2.0.0"
  • edit in Cargo.lock at line 120
    [4.10934]→[4.374:452](∅→∅)
    checksum = "d9e7472ac180abb0a8e592b653744345983a7a14f44691c8394a799d0df4dbbf"
  • replacement in Cargo.lock at line 157
    [4.12130]→[4.453:479](∅→∅),[4.12130]→[2.307:333](∅→∅)
    version = "4.0.0-beta.21"
    version = "4.0.0-beta.20"
    [4.12130]
    [4.12155]
    version = "4.0.0-rc.2"
  • replacement in Cargo.lock at line 159
    [4.12220]→[4.480:558](∅→∅),[4.12220]→[2.334:412](∅→∅)
    checksum = "606fc29a9bde2907243086ceb93ce56df7584276c2c46abc64a524f645c63c5e"
    checksum = "aa8ba5081e9f8d0016cf34df516c699198158fd8c77990aa284115b055ead61b"
    [4.12220]
    [4.12298]
    checksum = "73170d019de2d82c0d826c1f315c3106134bd764e9247505ba6f0d78d22dfe9e"
  • replacement in Cargo.lock at line 196
    [4.12744]→[4.2831:2854](∅→∅)
    version = "0.5.0-rc.1"
    [4.12744]
    [4.12769]
    version = "0.5.0-rc.2"
  • replacement in Cargo.lock at line 198
    [4.12834]→[4.2855:2933](∅→∅)
    checksum = "98a793e4a7bd059e06e1bc1bd9943b57a47f806de3599d2437441682292c333e"
    [4.12834]
    [4.12912]
    checksum = "4d0976042e6ddc82c7d0dedd64d39959bc26d9bba098b2f6c32a73fbef784eaf"
  • replacement in Cargo.lock at line 401
    [4.17200]→[4.2918:2937](∅→∅),[4.17200]→[2.413:432](∅→∅)
    version = "3.0.13"
    version = "3.0.10"
    [4.17200]
    [4.17219]
    version = "3.0.14"
  • replacement in Cargo.lock at line 403
    [4.17284]→[4.2938:3016](∅→∅),[4.17284]→[2.433:511](∅→∅)
    checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e"
    checksum = "7a30c3bf9ff12dfe5dae53f0a96e0febcd18420d1c0e7fad77796d9d5c4b5375"
    [4.17284]
    [4.17362]
    checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62"
  • edit in Cargo.lock at line 725
    [4.21964]→[4.1543:1561](∅→∅)
    version = "0.2.4"
  • edit in Cargo.lock at line 727
    [4.22047]→[4.1562:1640](∅→∅)
    checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
  • edit in Cargo.lock at line 755
    [4.3277]→[4.1641:1659](∅→∅)
    version = "4.2.1"
  • edit in Cargo.lock at line 757
    [4.3360]→[4.1660:1738](∅→∅)
    checksum = "25546a65e5cf1f471f3438796fc634650b31d7fcde01d444c309aeb28b92e3a8"
  • replacement in Cargo.lock at line 885
    [4.24897]→[4.887:907](∅→∅)
    version = "0.2.114"
    [4.24897]
    [4.8299]
    version = "0.2.116"
  • replacement in Cargo.lock at line 887
    [4.8364]→[4.908:986](∅→∅)
    checksum = "b0005d08a8f7b65fb8073cb697aa0b12b631ed251ce73d862ce50eeb52ce3b50"
    [4.8364]
    [4.8442]
    checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
  • replacement in Cargo.lock at line 915
    [4.25090]→[4.8857:8875](∅→∅)
    version = "0.4.5"
    [4.25090]
    [4.25108]
    version = "0.4.6"
  • replacement in Cargo.lock at line 917
    [4.25173]→[4.8876:8954](∅→∅)
    checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109"
    [4.25173]
    [4.25251]
    checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b"
  • edit in Cargo.lock at line 1362
    [4.2271]→[4.33233:33269](∅→∅),[4.7201]→[4.33233:33269](∅→∅),[4.12007]→[4.33233:33269](∅→∅),[4.33233]→[4.33233:33269](∅→∅)
    dependencies = [
    "serde_derive",
    ]
  • edit in Cargo.lock at line 1377
    [4.33553]→[2.708:727](∅→∅)
    version = "1.0.75"
  • resolve order conflict in Cargo.lock at line 1377
    [4.2391]
    [4.33572]
  • edit in Cargo.lock at line 1379
    [4.33637]→[2.728:806](∅→∅)
    checksum = "c059c05b48c5c0067d4b4b2b4f0732dd65feb52daf7e0ea09cd87e7dadc1af79"
  • resolve order conflict in Cargo.lock at line 1379
    [4.2470]
    [4.33715]
  • edit in Cargo.lock at line 1387
    [4.33800]→[4.2481:2499](∅→∅)
    version = "0.7.1"
  • edit in Cargo.lock at line 1389
    [4.33883]→[4.2500:2578](∅→∅)
    checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
  • edit in Cargo.lock at line 1393
    [4.33998]→[2.905:920](∅→∅)
    "itoa 1.0.1",
  • resolve order conflict in Cargo.lock at line 1393
    [4.2588]
    [4.34007]
  • edit in Cargo.lock at line 1454
    [4.34945]→[4.2589:2607](∅→∅)
    version = "1.8.0"
  • edit in Cargo.lock at line 1456
    [4.35028]→[4.2608:2686](∅→∅)
    checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
  • replacement in Cargo.lock at line 1460
    [4.35136]→[4.2687:2705](∅→∅)
    version = "0.4.3"
    [4.35136]
    [4.35155]
    version = "0.4.4"
  • replacement in Cargo.lock at line 1462
    [4.35220]→[4.2706:2784](∅→∅)
    checksum = "0f82496b90c36d70af5fcd482edaa2e0bd16fade569de1330405fecbbdac736b"
    [4.35220]
    [4.35298]
    checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
  • replacement in Cargo.lock at line 1561
    [4.39137]→[4.13390:13409](∅→∅)
    version = "1.15.0"
    [4.39137]
    [4.39155]
    version = "1.16.1"
  • replacement in Cargo.lock at line 1563
    [4.39220]→[4.13410:13488](∅→∅)
    checksum = "fbbf1c778ec206785635ce8ad57fe52b3009ae9e0c9f574a728f3049d3e55838"
    [4.39220]
    [4.39298]
    checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a"