Browse Source

Merge branch 'master' of git.indy.io:indy/civil

master
Inderjit Gill 7 months ago
parent
commit
9f84f2de96
15 changed files with 2062 additions and 1341 deletions
  1. BIN
      misc/assets/favicon_package_v0.16.zip
  2. BIN
      misc/assets/socrates.png
  3. +3
    -1
      server/Cargo.toml
  4. +1
    -1
      server/src/handler/users.rs
  5. BIN
      www/android-chrome-192x192.png
  6. BIN
      www/android-chrome-512x512.png
  7. BIN
      www/apple-touch-icon.png
  8. +1
    -1
      www/browserconfig.xml
  9. BIN
      www/favicon-16x16.png
  10. BIN
      www/favicon-32x32.png
  11. BIN
      www/favicon.ico
  12. +17
    -8
      www/index.html
  13. BIN
      www/mstile-150x150.png
  14. +2038
    -1328
      www/safari-pinned-tab.svg
  15. +2
    -2
      www/site.webmanifest

BIN
misc/assets/favicon_package_v0.16.zip View File


BIN
misc/assets/socrates.png View File

Before After
Width: 503  |  Height: 640  |  Size: 154 KiB

+ 3
- 1
server/Cargo.toml View File

@ -9,7 +9,9 @@ edition = "2018"
actix-files = "0.3.0"
actix-multipart = "0.3.0"
actix-rt = "1.1.1"
actix-session = "0.4.0"
# replace actix-session with official version once https://github.com/actix/actix-extras/issues/87 is merged in
# this is required for logout to actually work and remove the session cookie
actix-session = { git = "https://github.com/qkniep/actix-extras" }
actix-threadpool = "0.3.3"
actix-web = "3.0.1"
chrono = { version = "0.4", features = ["serde"] }


+ 1
- 1
server/src/handler/users.rs View File

@ -62,7 +62,7 @@ pub async fn login(
}
pub async fn logout(_db_pool: Data<Pool>, session: actix_session::Session) -> Result<HttpResponse> {
session.clear();
session.purge();
// todo: what to return when logging out???
Ok(HttpResponse::Ok().json(true))
}


BIN
www/android-chrome-192x192.png View File

Before After
Width: 192  |  Height: 192  |  Size: 30 KiB Width: 192  |  Height: 192  |  Size: 20 KiB

BIN
www/android-chrome-512x512.png View File

Before After
Width: 512  |  Height: 512  |  Size: 160 KiB Width: 512  |  Height: 512  |  Size: 113 KiB

BIN
www/apple-touch-icon.png View File

Before After
Width: 180  |  Height: 180  |  Size: 28 KiB Width: 180  |  Height: 180  |  Size: 30 KiB

+ 1
- 1
www/browserconfig.xml View File

@ -3,7 +3,7 @@
<msapplication>
<tile>
<square150x150logo src="/mstile-150x150.png"/>
<TileColor>#fffff8</TileColor>
<TileColor>#f5f2f0</TileColor>
</tile>
</msapplication>
</browserconfig>

BIN
www/favicon-16x16.png View File

Before After
Width: 16  |  Height: 16  |  Size: 986 B Width: 16  |  Height: 16  |  Size: 636 B

BIN
www/favicon-32x32.png View File

Before After
Width: 32  |  Height: 32  |  Size: 2.0 KiB Width: 32  |  Height: 32  |  Size: 1.2 KiB

BIN
www/favicon.ico View File

Before After

+ 17
- 8
www/index.html View File

@ -4,14 +4,23 @@
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="mask-icon" href="safari-pinned-tab.svg" color="#111111">
<meta name="msapplication-TileColor" content="#fffff8">
<meta name="theme-color" content="#fffff8">
<link rel="manifest" href="/manifest.json">
<link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
<link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
<link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
<link rel="manifest" href="/site.webmanifest">
<link rel="mask-icon" href="/safari-pinned-tab.svg" color="#494949">
<meta name="apple-mobile-web-app-title" content="Civil">
<meta name="application-name" content="Civil">
<meta name="msapplication-TileColor" content="#f5f2f0">
<meta name="theme-color" content="#f5f2f0">
<link type="text/css" rel="stylesheet" href="/civil-base.css" media="all" />
<link type="text/css" rel="stylesheet" href="/tufte.css" media="all" />
<link type="text/css" rel="stylesheet" href="/civil-form.css" media="all" />


BIN
www/mstile-150x150.png View File

Before After
Width: 270  |  Height: 270  |  Size: 10 KiB Width: 270  |  Height: 270  |  Size: 10 KiB

+ 2038
- 1328
www/safari-pinned-tab.svg
File diff suppressed because it is too large
View File


www/manifest.json → www/site.webmanifest View File


Loading…
Cancel
Save