Tsumanu/oswilno
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better session, add layout

Browse Source
This commit is contained in:
Adrian Woźniak 2023-08-14 17:21:18 +02:00
parent f265d22b87
commit da10be1553
13 changed files with 682 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

441
assets/style.css
View File

@ -700,11 +700,53 @@ select {
--tw-backdrop-sepia: ;
}
.sr-only {
position: absolute;
width: 1px;
height: 1px;
padding: 0;
margin: -1px;
overflow: hidden;
clip: rect(0, 0, 0, 0);
white-space: nowrap;
border-width: 0;
}
.pointer-events-none {
pointer-events: none;
}
.absolute {
position: absolute;
}
.relative {
position: relative;
}
.inset-y-0 {
top: 0px;
bottom: 0px;
}
.left-0 {
left: 0px;
}
.z-50 {
z-index: 50;
}
.mx-auto {
margin-left: auto;
margin-right: auto;
}
.my-4 {
margin-top: 1rem;
margin-bottom: 1rem;
}
.mb-2 {
margin-bottom: 0.5rem;
}
@ -717,10 +759,22 @@ select {
margin-bottom: 1.5rem;
}
.mr-3 {
margin-right: 0.75rem;
}
.mt-2 {
margin-top: 0.5rem;
}
.mt-3 {
margin-top: 0.75rem;
}
.mt-4 {
margin-top: 1rem;
}
.block {
display: block;
}
@ -729,14 +783,54 @@ select {
display: flex;
}
.inline-flex {
display: inline-flex;
}
.hidden {
display: none;
}
.h-10 {
height: 2.5rem;
}
.h-4 {
height: 1rem;
}
.h-5 {
height: 1.25rem;
}
.h-8 {
height: 2rem;
}
.min-h-screen {
min-height: 100vh;
}
.w-10 {
width: 2.5rem;
}
.w-32 {
width: 8rem;
}
.w-4 {
width: 1rem;
}
.w-5 {
width: 1.25rem;
}
.w-8 {
width: 2rem;
}
.w-full {
width: 100%;
}
@ -745,6 +839,22 @@ select {
max-width: 28rem;
}
.max-w-screen-xl {
max-width: 1280px;
}
.list-none {
list-style-type: none;
}
.flex-col {
flex-direction: column;
}
.flex-wrap {
flex-wrap: wrap;
}
.items-center {
align-items: center;
}
@ -753,6 +863,43 @@ select {
justify-content: center;
}
.justify-between {
justify-content: space-between;
}
.divide-y > :not([hidden]) ~ :not([hidden]) {
--tw-divide-y-reverse: 0;
border-top-width: calc(1px * calc(1 - var(--tw-divide-y-reverse)));
border-bottom-width: calc(1px * var(--tw-divide-y-reverse));
}
.divide-gray-100 > :not([hidden]) ~ :not([hidden]) {
--tw-divide-opacity: 1;
border-color: rgb(243 244 246 / var(--tw-divide-opacity));
}
.self-center {
align-self: center;
}
.truncate {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.whitespace-nowrap {
white-space: nowrap;
}
.rounded {
border-radius: 0.25rem;
}
.rounded-full {
border-radius: 9999px;
}
.rounded-lg {
border-radius: 0.5rem;
}
@ -761,11 +908,41 @@ select {
border-width: 1px;
}
.border-gray-100 {
--tw-border-opacity: 1;
border-color: rgb(243 244 246 / var(--tw-border-opacity));
}
.border-gray-200 {
--tw-border-opacity: 1;
border-color: rgb(229 231 235 / var(--tw-border-opacity));
}
.border-gray-300 {
--tw-border-opacity: 1;
border-color: rgb(209 213 219 / var(--tw-border-opacity));
}
.bg-blue-700 {
--tw-bg-opacity: 1;
background-color: rgb(29 78 216 / var(--tw-bg-opacity));
}
.bg-cyan-600 {
--tw-bg-opacity: 1;
background-color: rgb(8 145 178 / var(--tw-bg-opacity));
}
.bg-gray-50 {
--tw-bg-opacity: 1;
background-color: rgb(249 250 251 / var(--tw-bg-opacity));
}
.bg-gray-800 {
--tw-bg-opacity: 1;
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
}
.bg-red-100 {
--tw-bg-opacity: 1;
background-color: rgb(254 226 226 / var(--tw-bg-opacity));
@ -776,6 +953,10 @@ select {
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}
.p-2 {
padding: 0.5rem;
}
.p-4 {
padding: 1rem;
}
@ -794,16 +975,66 @@ select {
padding-bottom: 0.5rem;
}
.py-3 {
padding-top: 0.75rem;
padding-bottom: 0.75rem;
}
.pl-10 {
padding-left: 2.5rem;
}
.pl-3 {
padding-left: 0.75rem;
}
.pr-4 {
padding-right: 1rem;
}
.text-2xl {
font-size: 1.5rem;
line-height: 2rem;
}
.text-base {
font-size: 1rem;
line-height: 1.5rem;
}
.text-sm {
font-size: 0.875rem;
line-height: 1.25rem;
}
.font-medium {
font-weight: 500;
}
.font-semibold {
font-weight: 600;
}
.text-gray-500 {
--tw-text-opacity: 1;
color: rgb(107 114 128 / var(--tw-text-opacity));
}
.text-gray-600 {
--tw-text-opacity: 1;
color: rgb(75 85 99 / var(--tw-text-opacity));
}
.text-gray-700 {
--tw-text-opacity: 1;
color: rgb(55 65 81 / var(--tw-text-opacity));
}
.text-gray-900 {
--tw-text-opacity: 1;
color: rgb(17 24 39 / var(--tw-text-opacity));
}
.text-red-700 {
--tw-text-opacity: 1;
color: rgb(185 28 28 / var(--tw-text-opacity));
@ -826,6 +1057,16 @@ select {
box-shadow: var(--tw-ring-offset-shadow, 0 0 #0000), var(--tw-ring-shadow, 0 0 #0000), var(--tw-shadow);
}
.hover\:bg-gray-100:hover {
--tw-bg-opacity: 1;
background-color: rgb(243 244 246 / var(--tw-bg-opacity));
}
.focus\:border-blue-500:focus {
--tw-border-opacity: 1;
border-color: rgb(59 130 246 / var(--tw-border-opacity));
}
.focus\:outline-none:focus {
outline: 2px solid transparent;
outline-offset: 2px;
@ -837,11 +1078,211 @@ select {
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
}
.focus\:ring-4:focus {
--tw-ring-offset-shadow: var(--tw-ring-inset) 0 0 0 var(--tw-ring-offset-width) var(--tw-ring-offset-color);
--tw-ring-shadow: var(--tw-ring-inset) 0 0 0 calc(4px + var(--tw-ring-offset-width)) var(--tw-ring-color);
box-shadow: var(--tw-ring-offset-shadow), var(--tw-ring-shadow), var(--tw-shadow, 0 0 #0000);
}
.focus\:ring-blue-500:focus {
--tw-ring-opacity: 1;
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
}
.focus\:ring-cyan-500:focus {
--tw-ring-opacity: 1;
--tw-ring-color: rgb(6 182 212 / var(--tw-ring-opacity));
}
.focus\:ring-gray-200:focus {
--tw-ring-opacity: 1;
--tw-ring-color: rgb(229 231 235 / var(--tw-ring-opacity));
}
.focus\:ring-gray-300:focus {
--tw-ring-opacity: 1;
--tw-ring-color: rgb(209 213 219 / var(--tw-ring-opacity));
}
.focus\:ring-offset-2:focus {
--tw-ring-offset-width: 2px;
}
@media (prefers-color-scheme: dark) {
.dark\:divide-gray-600 > :not([hidden]) ~ :not([hidden]) {
--tw-divide-opacity: 1;
border-color: rgb(75 85 99 / var(--tw-divide-opacity));
}
.dark\:border-gray-600 {
--tw-border-opacity: 1;
border-color: rgb(75 85 99 / var(--tw-border-opacity));
}
.dark\:border-gray-700 {
--tw-border-opacity: 1;
border-color: rgb(55 65 81 / var(--tw-border-opacity));
}
.dark\:bg-gray-700 {
--tw-bg-opacity: 1;
background-color: rgb(55 65 81 / var(--tw-bg-opacity));
}
.dark\:bg-gray-800 {
--tw-bg-opacity: 1;
background-color: rgb(31 41 55 / var(--tw-bg-opacity));
}
.dark\:bg-gray-900 {
--tw-bg-opacity: 1;
background-color: rgb(17 24 39 / var(--tw-bg-opacity));
}
.dark\:text-gray-200 {
--tw-text-opacity: 1;
color: rgb(229 231 235 / var(--tw-text-opacity));
}
.dark\:text-gray-400 {
--tw-text-opacity: 1;
color: rgb(156 163 175 / var(--tw-text-opacity));
}
.dark\:text-white {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
}
.dark\:placeholder-gray-400::-moz-placeholder {
--tw-placeholder-opacity: 1;
color: rgb(156 163 175 / var(--tw-placeholder-opacity));
}
.dark\:placeholder-gray-400::placeholder {
--tw-placeholder-opacity: 1;
color: rgb(156 163 175 / var(--tw-placeholder-opacity));
}
.dark\:hover\:bg-gray-600:hover {
--tw-bg-opacity: 1;
background-color: rgb(75 85 99 / var(--tw-bg-opacity));
}
.dark\:hover\:bg-gray-700:hover {
--tw-bg-opacity: 1;
background-color: rgb(55 65 81 / var(--tw-bg-opacity));
}
.dark\:hover\:text-white:hover {
--tw-text-opacity: 1;
color: rgb(255 255 255 / var(--tw-text-opacity));
}
.dark\:focus\:border-blue-500:focus {
--tw-border-opacity: 1;
border-color: rgb(59 130 246 / var(--tw-border-opacity));
}
.dark\:focus\:ring-blue-500:focus {
--tw-ring-opacity: 1;
--tw-ring-color: rgb(59 130 246 / var(--tw-ring-opacity));
}
.dark\:focus\:ring-gray-600:focus {
--tw-ring-opacity: 1;
--tw-ring-color: rgb(75 85 99 / var(--tw-ring-opacity));
}
}
@media (min-width: 768px) {
.md\:order-1 {
order: 1;
}
.md\:order-2 {
order: 2;
}
.md\:mr-0 {
margin-right: 0px;
}
.md\:mt-0 {
margin-top: 0px;
}
.md\:flex {
display: flex;
}
.md\:hidden {
display: none;
}
.md\:w-auto {
width: auto;
}
.md\:flex-row {
flex-direction: row;
}
.md\:space-x-8 > :not([hidden]) ~ :not([hidden]) {
--tw-space-x-reverse: 0;
margin-right: calc(2rem * var(--tw-space-x-reverse));
margin-left: calc(2rem * calc(1 - var(--tw-space-x-reverse)));
}
.md\:border-0 {
border-width: 0px;
}
.md\:bg-transparent {
background-color: transparent;
}
.md\:bg-white {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}
.md\:p-0 {
padding: 0px;
}
.md\:text-blue-700 {
--tw-text-opacity: 1;
color: rgb(29 78 216 / var(--tw-text-opacity));
}
.md\:hover\:bg-transparent:hover {
background-color: transparent;
}
.md\:hover\:text-blue-700:hover {
--tw-text-opacity: 1;
color: rgb(29 78 216 / var(--tw-text-opacity));
}
@media (prefers-color-scheme: dark) {
.md\:dark\:bg-gray-900 {
--tw-bg-opacity: 1;
background-color: rgb(17 24 39 / var(--tw-bg-opacity));
}
.md\:dark\:text-blue-500 {
--tw-text-opacity: 1;
color: rgb(59 130 246 / var(--tw-text-opacity));
}
.md\:dark\:hover\:bg-transparent:hover {
background-color: transparent;
}
.md\:dark\:hover\:text-blue-500:hover {
--tw-text-opacity: 1;
color: rgb(59 130 246 / var(--tw-text-opacity));
}
}
}

41
crates/actix-jwt-session/src/lib.rs
View File

@ -3,6 +3,7 @@ use actix_web::{FromRequest, HttpMessage};
use jsonwebtoken::{decode, encode, Algorithm, DecodingKey, EncodingKey, Validation};
use serde::{de::DeserializeOwned, Serialize};
use std::sync::Arc;
use uuid::Uuid;
pub trait Claims: PartialEq + DeserializeOwned + Serialize + Clone + Send + Sync + 'static {
fn jti(&self) -> uuid::Uuid;
@ -82,6 +83,38 @@ impl<T: Claims> FromRequest for Authenticated<T> {
}
}
pub struct MaybeAuthenticated<ClaimsType: Claims>(Option<Authenticated<ClaimsType>>);
impl<ClaimsType: Claims> MaybeAuthenticated<ClaimsType> {
pub fn is_authenticated(&self) -> bool {
self.0.is_some()
}
}
impl<ClaimsType: Claims> std::ops::Deref for MaybeAuthenticated<ClaimsType> {
type Target = Option<Authenticated<ClaimsType>>;
fn deref(&self) -> &Self::Target {
&self.0
}
}
impl<T: Claims> FromRequest for MaybeAuthenticated<T> {
type Error = actix_web::error::Error;
type Future = std::future::Ready<Result<Self, actix_web::Error>>;
fn from_request(
req: &actix_web::HttpRequest,
_payload: &mut actix_web::dev::Payload,
) -> Self::Future {
let value = req
.extensions_mut()
.get::<Authenticated<T>>()
.map(Clone::clone);
std::future::ready(Ok(MaybeAuthenticated(value)))
}
}
#[async_trait::async_trait(?Send)]
pub trait TokenStorage: Send + Sync {
type ClaimsType: Claims;
@ -93,7 +126,9 @@ pub trait TokenStorage: Send + Sync {
claims: Self::ClaimsType,
exp: std::time::Duration,
) -> Result<(), Error>;
async fn remove_by_jti(self: Arc<Self>, jti: Uuid) -> Result<(), Error>;
fn jwt_encoding_key(&self) -> Arc<EncodingKey>;
fn algorithm(&self) -> Algorithm;
@ -135,6 +170,10 @@ impl<ClaimsType: Claims> SessionStorage<ClaimsType> {
algorithm: self.algorithm(),
})
}
pub async fn erase(&self, jti: Uuid) -> Result<(), Error> {
self.0.clone().remove_by_jti(jti).await
}
}
struct Extractor;

9
crates/actix-jwt-session/src/redis_adapter.rs
View File

@ -61,6 +61,15 @@ where
Ok(())
}
async fn remove_by_jti(self: Arc<Self>, jti: Uuid) -> Result<(), Error> {
let pool = self.pool.clone();
let mut conn = pool.get().await.map_err(|_| Error::RedisConn)?;
conn.del(jti.as_bytes())
.await
.map_err(|_| Error::NotFound)?;
Ok(())
}
fn jwt_encoding_key(&self) -> Arc<EncodingKey> {
self.jwt_encoding_key.clone()
}

7
crates/oswilno-parking-space/src/lib.rs
View File

@ -10,7 +10,7 @@ use std::collections::HashMap;
use std::sync::Arc;
use oswilno_session::{Authenticated, Claims};
use oswilno_view::Layout;
use oswilno_view::{Layout, LayoutOptions};
pub fn mount(config: &mut ServiceConfig) {
config.service(
@ -36,7 +36,10 @@ async fn all_parking_spaces(
let db = db.into_inner();
let main = load_parking_spaces(db).await;
oswilno_view::Layout { main }
oswilno_view::Layout {
main,
opts: LayoutOptions::default(),
}
}
#[get("/all-partial")]

18
crates/oswilno-server/src/main.rs
View File

@ -21,14 +21,16 @@ async fn main() -> std::io::Result<()> {
.init();
}
let mut db_opts = ConnectOptions::new("postgres://postgres@localhost/oswilno".to_string());
db_opts
.max_connections(100)
.min_connections(5)
.connect_timeout(Duration::from_secs(8))
.idle_timeout(Duration::from_secs(8))
.sqlx_logging(true);
let conn: sea_orm::DatabaseConnection = sea_orm::Database::connect(db_opts).await.unwrap();
let conn: sea_orm::DatabaseConnection = {
let mut db_opts = ConnectOptions::new("postgres://postgres@localhost/oswilno".to_string());
db_opts
.max_connections(100)
.min_connections(5)
.connect_timeout(Duration::from_secs(8))
.idle_timeout(Duration::from_secs(8))
.sqlx_logging(true);
sea_orm::Database::connect(db_opts).await.unwrap()
};
let redis = {
use redis_async_pool::{RedisConnectionManager, RedisPool};

122
crates/oswilno-session/src/lib.rs
View File

@ -4,12 +4,12 @@ use std::sync::Arc;
use actix_jwt_session::SessionStorage;
pub use actix_jwt_session::{Authenticated, Error, RedisMiddlewareFactory};
use actix_web::web::{Data, Form, ServiceConfig};
use actix_web::{get, post, HttpResponse};
use actix_web::{get, post, HttpRequest, HttpResponse};
use askama_actix::Template;
use autometrics::autometrics;
use garde::Validate;
use jsonwebtoken::*;
use oswilno_view::{Errors, Lang, Layout, TranslationStorage};
use oswilno_view::{Errors, Lang, Layout, LayoutOptions, TranslationStorage};
use ring::rand::SystemRandom;
use ring::signature::{Ed25519KeyPair, KeyPair};
use sea_orm::DatabaseConnection;
@ -39,12 +39,15 @@ pub struct Claims {
expires_at: usize,
#[serde(rename = "iat")]
issues_at: usize,
/// Account login
#[serde(rename = "sub")]
subject: String,
#[serde(rename = "aud")]
audience: Audience,
#[serde(rename = "jti")]
jwt_id: uuid::Uuid,
#[serde(rename = "aci")]
account_id: i32,
}
impl actix_jwt_session::Claims for Claims {
@ -55,12 +58,7 @@ impl actix_jwt_session::Claims for Claims {
impl Claims {
pub fn account_id(&self) -> i32 {
self.subject
.split_once('-')
.filter(|(desc, _id)| *desc == "account")
.map(|(_d, id)| id)
.and_then(|id| id.parse().ok())
.unwrap_or_default()
self.account_id
}
}
@ -85,12 +83,10 @@ impl SessionConfigurator {
.app_data(self.jwt_ttl)
.service(login)
.service(login_view)
.service(login_partial_view)
.service(logout)
.service(session_info)
.service(register)
.service(register_view)
.service(register_partial_view);
.service(register_view);
}
pub fn factory(&self) -> RedisMiddlewareFactory<Claims> {
@ -158,24 +154,30 @@ pub struct SignInPayload {
}
#[get("/login")]
async fn login_view(t: Data<TranslationStorage>) -> Layout<SignInPartialTemplate> {
oswilno_view::Layout {
main: SignInPartialTemplate {
form: SignInPayload::default(),
lang: Lang::Pl,
t: t.into_inner(),
errors: Errors::default(),
},
}
}
#[get("/p/login")]
async fn login_partial_view(t: Data<TranslationStorage>) -> SignInPartialTemplate {
SignInPartialTemplate {
form: SignInPayload::default(),
lang: Lang::Pl,
t: t.into_inner(),
errors: Errors::default(),
}
async fn login_view(req: HttpRequest, t: Data<TranslationStorage>) -> HttpResponse {
HttpResponse::Ok().body(
if oswilno_view::is_partial(&req) {
SignInPartialTemplate {
form: SignInPayload::default(),
lang: Lang::Pl,
t: t.into_inner(),
errors: Errors::default(),
}
.render()
} else {
oswilno_view::Layout {
main: SignInPartialTemplate {
form: SignInPayload::default(),
lang: Lang::Pl,
t: t.into_inner(),
errors: Errors::default(),
},
opts: LayoutOptions { show: true, ..Default::default() },
}
.render()
}
.unwrap_or_default(),
)
}
#[autometrics]
@ -248,10 +250,11 @@ async fn login_inner(
let jwt_claims = Claims {
issues_at: iat,
subject: format!("account-{}", account.id),
subject: account.login.clone(),
expires_at: exp,
audience: Audience::Web,
jwt_id: uuid::Uuid::new_v4(),
account_id: account.id,
};
let jwt_token = match redis.store(jwt_claims.clone(), jwt_ttl.0).await {
Err(e) => {
@ -264,7 +267,7 @@ async fn login_inner(
let bearer_token = match jwt_token.encode() {
Ok(token) => token,
Err(e) => {
tracing::warn!("Failed to set sign-in claims in redis: {e}");
tracing::warn!("Failed to encode claims: {e}");
errors.push_global("Failed to sign in. Please try later");
return Err(payload);
}
@ -285,16 +288,13 @@ async fn session_info(authenticated: Authenticated<Claims>) -> Result<HttpRespon
#[get("/logout")]
async fn logout(
authenticated: Authenticated<Claims>,
redis: Data<redis_async_pool::RedisPool>,
redis: Data<SessionStorage<Claims>>,
) -> Result<HttpResponse, Error> {
{
use redis::AsyncCommands;
let jwt_id = authenticated.jwt_id;
if let Ok(mut conn) = redis.get().await {
if conn.del::<_, String>(jwt_id.as_bytes()).await.is_err() {}
}
}
Ok(HttpResponse::Ok().json(EmptyResponse {}))
let jwt_id = authenticated.jwt_id;
if let Err(_e) = redis.erase(jwt_id).await {};
Ok(HttpResponse::SeeOther()
.append_header(("Location", "/"))
.body(""))
}
#[derive(Debug, Default, Serialize, Deserialize, Clone, Eq, PartialEq, garde::Validate)]
@ -310,24 +310,30 @@ struct AccountInfo {
}
#[get("/register")]
async fn register_view(t: Data<TranslationStorage>) -> Layout<RegisterPartialTemplate> {
Layout {
main: RegisterPartialTemplate {
form: AccountInfo::default(),
t: t.into_inner(),
lang: Lang::Pl,
errors: oswilno_view::Errors::default(),
},
}
}
#[get("/p/register")]
async fn register_partial_view(t: Data<TranslationStorage>) -> RegisterPartialTemplate {
RegisterPartialTemplate {
form: AccountInfo::default(),
t: t.into_inner(),
lang: Lang::Pl,
errors: oswilno_view::Errors::default(),
}
async fn register_view(req: HttpRequest, t: Data<TranslationStorage>) -> HttpResponse {
HttpResponse::Ok().body(
if oswilno_view::is_partial(&req) {
RegisterPartialTemplate {
form: AccountInfo::default(),
t: t.into_inner(),
lang: Lang::Pl,
errors: oswilno_view::Errors::default(),
}
.render()
} else {
Layout {
main: RegisterPartialTemplate {
form: AccountInfo::default(),
t: t.into_inner(),
lang: Lang::Pl,
errors: oswilno_view::Errors::default(),
},
opts: LayoutOptions::default(),
}
.render()
}
.unwrap_or_default(),
)
}
#[derive(askama_actix::Template)]

4
crates/oswilno-session/templates/register/full.html
View File

@ -1,4 +0,0 @@
{% extends "base.html" %}
{% block body %}
{% include "partial.html" %}
{% endblock %}

2
crates/oswilno-session/templates/register/partial.html
View File

@ -54,7 +54,7 @@
</div>
</form>
<div>
<a href="/login" hx-get="/p/login" hx-replace-url="true" hx-target="#main-view">{{"Sign in"|t(lang,t)}}</a>
<a href="/login" hx-get="/login" hx-replace-url="true" hx-target="#main-view" hx-headers='{"Accept":"text/html-partial"}'>{{"Sign in"|t(lang,t)}}</a>
</div>
</section>
</section>

5
crates/oswilno-session/templates/sign-in/full.html
View File

@ -1,5 +0,0 @@
{% extends "base.html" %}
{% block body %}
{% include "./partial.html" %}
{% endblock %}

2
crates/oswilno-session/templates/sign-in/partial.html
View File

@ -26,7 +26,7 @@
</div>
</form>
<div>
<a href="/register" hx-get="/p/register" hx-replace-url="true" hx-target="#main-view">{{"Register"|t(lang,t)}}</a>
<a href="/register" hx-get="/register" hx-replace-url="true" hx-target="#main-view" hx-headers='{"Accept":"text/html-partial"}'>{{"Register"|t(lang,t)}}</a>
</div>
</section>
</section>

24
crates/oswilno-view/src/lib.rs
View File

@ -1,15 +1,39 @@
use std::collections::HashMap;
use std::sync::{Arc, RwLock};
use actix_web::HttpRequest;
pub use lang::*;
pub mod filters;
pub mod lang;
pub fn is_partial(req: &HttpRequest) -> bool {
req.headers()
.get("Accept")
.filter(|h| h.to_str().unwrap_or_default() == "text/html-partial")
.is_some()
}
#[derive(Debug, Default)]
pub struct SearchOptions {
pub target_url: String,
pub autocomplete: Vec<(String, String)>,
}
#[derive(Debug, Default)]
pub struct LayoutOptions {
pub show: bool,
pub search: Option<SearchOptions>,
pub is_logged: bool,
pub login: Option<String>,
pub profile_image_url: Option<String>,
}
#[derive(Debug, askama_actix::Template)]
#[template(path = "../templates/base.html")]
pub struct Layout<BodyTemplate: askama::Template> {
pub main: BodyTemplate,
pub opts: LayoutOptions,
}
#[derive(Debug, Clone, Default)]

1
crates/oswilno-view/templates/base.html
View File

@ -11,6 +11,7 @@
</head>
<body>
<base url="/" />
{% include "navbar.html" %}
<main>
{{ main|safe }}
</main>

86
crates/oswilno-view/templates/navbar.html Normal file
View File

@ -0,0 +1,86 @@
<nav class="bg-white border-gray-200 dark:bg-gray-900">
<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
<a href="https://flowbite.com/" class="flex items-center">
<img src="https://flowbite.com/docs/images/logo.svg" class="h-8 mr-3" alt="Flowbite Logo" />
<span class="self-center text-2xl font-semibold whitespace-nowrap dark:text-white">Flowbite</span>
</a>
<div class="flex items-center md:order-2">
<button type="button" class="flex mr-3 text-sm bg-gray-800 rounded-full md:mr-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600" id="user-menu-button" aria-expanded="false" data-dropdown-toggle="user-dropdown" data-dropdown-placement="bottom">
<span class="sr-only">Open user menu</span>
{% match opts.profile_image_url %}
{% when Some with (url) %}
<img class="w-8 h-8 rounded-full" src="{{ url }}" alt="user photo">
{% when None %}
{% match opts.login %}
{% when Some with (login) %}
<span>{{ login }}</span>
{% when None %}
{% endmatch %}
{% endmatch %}
</button>
<!-- Dropdown menu -->
<div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-dropdown">
<div class="px-4 py-3">
<span class="block text-sm text-gray-900 dark:text-white">Bonnie Green</span>
<span class="block text-sm text-gray-500 truncate dark:text-gray-400">name@flowbite.com</span>
</div>
<ul class="py-2" aria-labelledby="user-menu-button">
<li>
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Dashboard</a>
</li>
<li>
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Settings</a>
</li>
<li>
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Earnings</a>
</li>
<li>
<a href="#" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Sign out</a>
</li>
</ul>
</div>
<button data-collapse-toggle="navbar-user" type="button" class="inline-flex items-center p-2 w-10 h-10 justify-center text-sm text-gray-500 rounded-lg md:hidden hover:bg-gray-100 focus:outline-none focus:ring-2 focus:ring-gray-200 dark:text-gray-400 dark:hover:bg-gray-700 dark:focus:ring-gray-600" aria-controls="navbar-user" aria-expanded="false">
<span class="sr-only">Open main menu</span>
<svg class="w-5 h-5" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 17 14">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M1 1h15M1 7h15M1 13h15"/>
</svg>
</button>
</div>
<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="main-search">
<div class="relative mt-3 xs:hidden">
<div class="absolute inset-y-0 left-0 flex items-center pl-3 pointer-events-none">
<svg class="w-4 h-4 text-gray-500 dark:text-gray-400" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/>
</svg>
</div>
<input type="text" id="search-navbar" class="block w-full p-2 pl-10 text-sm text-gray-900 border border-gray-300 rounded-lg bg-gray-50 focus:ring-blue-500 focus:border-blue-500 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500" placeholder="Search...">
</div>
</div>
<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-user">
<ul class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:flex-row md:space-x-8 md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700">
<li>
<a href="#" class="block py-2 pl-3 pr-4 text-white bg-blue-700 rounded md:bg-transparent md:text-blue-700 md:p-0 md:dark:text-blue-500" aria-current="page">Home</a>
</li>
<li>
<a href="#" class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">About</a>
</li>
<li>
<a href="#" class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Services</a>
</li>
<li>
<a href="#" class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Pricing</a>
</li>
<li>
<a href="#" class="block py-2 pl-3 pr-4 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700">Contact</a>
</li>
</ul>
</div>
</div>
</nav>