+
-
-
-
- 👋
-
- - Completa tu información -
-- Crea un mundo, construye tu futuro -
- -
-
-
-
+
+
+
+
-
-
-
diff --git a/public/app.css b/public/app.css
index b7f53d9..5084bee 100644
--- a/public/app.css
+++ b/public/app.css
@@ -279,6 +279,8 @@ ul {
.rooms-list {
padding: 0;
gap: 0;
+ height: fit-content;
+ min-height: 78px;
}
.list {
@@ -416,10 +418,26 @@ ul {
}
}
+@keyframes fade-in-left {
+ 0% {
+ opacity: 0;
+ transform: translate(0, 0);
+ }
+
+ 100% {
+ opacity: 1;
+ transform: translate(0, 0);
+ }
+}
+
.fade-in {
animation: fade-in 0.5s;
}
+.fade-in-left {
+ animation: fade-in-left 0.2s;
+}
+
@keyframes fade-in {
0% {
opacity: 0;
@@ -491,6 +509,10 @@ ul {
right: 10px;
}
+.hover-menu--show {
+ display: block !important;
+}
+
.hover-menu__option {
border: 1px solid transparent;
width: 100%;
@@ -837,6 +859,15 @@ ul {
}
.nav {
+ display: flex;
+ align-items: center;
+ width: 100%;
+ padding: 1rem 0;
+ background: var(--background);
+ justify-content: space-around;
+}
+
+.nav-wrapper {
color: var(--text-1);
display: flex;
gap: 0.5rem;
@@ -865,8 +896,7 @@ ul {
}
.helper {
- width: fit-content;
- height: fit-content;
+ width: 100%;
min-height: 100px;
min-width: 150px;
max-width: 390px;
@@ -874,17 +904,29 @@ ul {
border-radius: var(--size-1);
padding: var(--size-3);
transition: opacity 0.2s ease-out, background-color 0.2s ease-out;
- background: var(--background-button);
+ background: var(--background-modal);
text-align: left;
border: 1px solid transparent;
+ cursor: pointer;
+ display: flex;
+ flex-direction: column;
+ gap: var(--size-0)
}
.helper__title {
- padding-top: var(--size-2);
+ font-size: 1.15em;
}
.helper__description {
- padding-top: var(--size-0);
+ font-size: 1em;
+}
+
+.helper__subtitle {
+ padding-top: var(--size-2);
+}
+
+.helper__example {
+ font-size: 1em;
}
.loading__title {
@@ -1462,4 +1504,148 @@ ul {
.room-view-wrapper--skeleton {
width: 100%;
-}
\ No newline at end of file
+}
+
+.room-view--wrap {
+ flex-direction: column;
+ align-items: center;
+ max-width: 200px;
+ box-shadow: 0px 2px 4px 1px rgba(0, 0, 0, 0.05);
+ margin: 5px;
+ border-radius: 12px;
+}
+
+.room-list--wrap {
+ justify-content: center;
+ align-items: flex-start;
+ flex-direction: row;
+ flex-wrap: wrap;
+ max-width: 660px;
+ margin: auto;
+}
+
+.room-menu {
+ width: 200px;
+ background: var(--background);
+ box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.18);
+ padding: 12px 6px;
+ position: absolute;
+ right: 0;
+ top: 64px;
+ border-radius: 8px;
+}
+
+.room-menu__item {
+ display: flex;
+ align-items: center;
+ gap: 0.25rem;
+}
+
+.room-menu__cta {
+ border: none;
+ color: var(--text-1);
+ border-radius: 0;
+ padding: 0 8px;
+ display: flex;
+ cursor: pointer;
+ align-items: center;
+ gap: 4px;
+}
+
+.preview-room {
+ display: flex;
+ flex-direction: column;
+ gap: 24px;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+}
+
+.preview-room__title {
+ margin-top: 24px;
+ color: var(--text-1);
+ text-align: center;
+}
+
+.preview-room__content {
+ display: flex;
+ flex-direction: column;
+ gap: 12px;
+ justify-content: center;
+ width: 60%;
+}
+
+.chat-list__static {
+ display: flex;
+ flex-grow: 1;
+ align-items: center;
+ justify-content: center;
+}
+
+.chat-list__content {
+ display: flex;
+ flex-grow: 1;
+ align-items: center;
+ justify-content: center;
+}
+
+.guest {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ box-shadow: 0px 2px 4px 1px rgba(0, 0, 0, 0.15);
+ padding: 12px 24px;
+ position: absolute;
+ width: 100%;
+ bottom: 24px;
+ border-radius: 8px;
+ gap: 24px;
+}
+
+.guest__cta {
+ width: 160px;
+}
+
+
+@media only screen and (max-width: 576px) {
+ .page {
+ overflow: hidden;
+ }
+
+ .chat-list {
+ width: fit-content;
+ margin-right: 16px;
+ }
+
+ .chat-list__rooms {
+ width: 70vw;
+ border: 1px solid transparent;
+ background: var(--background-modal);
+ border-radius: 16px;
+ }
+
+ .chat-list__static {
+ width: calc(100vw - 32px);
+ margin: 0 16px;
+ }
+
+ .chat-list__active-room {
+ width: calc(100vw - 32px);
+ margin: 0 16px;
+ }
+
+ .header {
+ position: relative;
+ z-index: 10;
+ }
+
+ .chat-list-wrapper {
+ width: 100vw;
+ overflow-x: auto;
+ scroll-behavior: smooth;
+ }
+
+ .menu {
+ width: 100vw;
+ }
+}
diff --git a/public/login.css b/public/login.css
index 284e59e..6cf3d60 100644
--- a/public/login.css
+++ b/public/login.css
@@ -33,6 +33,9 @@
opacity: 0.8;
}
+.button--skeleton {
+ height: 44px;
+}
.input-wrapper {
height: 2.625rem;
@@ -174,6 +177,10 @@
margin: auto;
}
+.login-form__title--skeleton {
+ height: 32px;
+}
+
.login-form__description {
color: var(--text-subdued);
text-align: center;
@@ -186,6 +193,10 @@
margin: auto;
}
+.login-form__description--skeleton {
+ height: 24px;
+}
+
.login-form__form__head {
display: flex;
gap: 16px;
@@ -236,4 +247,118 @@
.login-form {
width: 100%;
}
+}
+
+.welcome__content {
+ margin-top: 60px;
+}
+
+.communities {
+ column-count: 3;
+ gap: 1em;
+ margin: auto;
+ position: relative;
+ z-index: 10;
+ max-width: fit-content;
+}
+
+.communities-container {
+ position: relative;
+}
+
+.communities-background {
+ position: absolute;
+ z-index: 1;
+ height: 100%;
+ width: 100%;
+ background: transparent;
+ box-shadow: 0px 0px 12px -4px rgba(0, 0, 0, 0.2);
+}
+
+.community {
+ border: 1px solid var(--border);
+ background: var(--background-modal);
+ border-radius: 24px;
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ padding: 32px 12px;
+ gap: 20px;
+ margin: 0 0 1em;
+ max-width: 150px;
+}
+
+.community__blanck {
+ height: 40px;
+}
+
+.community--center::before {
+ content: "";
+ position: absolute;
+ height: 80%;
+ width: 80%;
+ border-radius: 100px;
+ background: transparent;
+ border: 1px solid var(--border);
+ z-index: -1;
+}
+
+.community--center::after {
+ content: "";
+ position: absolute;
+ height: 65%;
+ width: 65%;
+ border-radius: 100px;
+ background: transparent;
+ border: 1px solid var(--border);
+ z-index: -1;
+}
+
+.community__content {
+ border-radius: 24px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+
+.community__content--purple {
+ background: var(--gradient-purple);
+}
+
+.community__content--gray {
+ background: var(--gradient-gray);
+}
+
+.community__content--yellow {
+ background: var(--gradient-yellow);
+}
+
+.community__content--blue {
+ background: var(--gradient-blue);
+}
+
+.community__content--pink {
+ background: var(--gradient-pink);
+}
+
+.community__content--green {
+ background: var(--gradient-green);
+}
+
+.community__icon {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ font-size: var(--font-size-3);
+ padding: 12px;
+}
+
+.community__title {
+ font-size: var(--font-size-1);
+ color: #898A90
+}
+
+.community__title--skeleton {
+ height: var(--font-size-1);
}
\ No newline at end of file
diff --git a/src/components/atoms/community.rs b/src/components/atoms/community.rs
new file mode 100644
index 0000000..f72bf88
--- /dev/null
+++ b/src/components/atoms/community.rs
@@ -0,0 +1,31 @@
+use dioxus::prelude::*;
+
+#[derive(PartialEq, Props)]
+pub struct CommunityProps<'a> {
+ class: Option<&'a str>,
+ title: &'a str,
+ icon: &'a str,
+ background: &'a str,
+}
+
+pub fn Community<'a>(cx: Scope<'a, CommunityProps<'a>>) -> Element<'a> {
+ let content__background = format!("community__content--{}", cx.props.background);
+ let class_content = cx.props.class.unwrap_or("");
+
+ render!(rsx!(
+ section {
+ class: "community {class_content}",
+ div{
+ class: "community__content {content__background}",
+ div {
+ class: "community__icon",
+ "{cx.props.icon}"
+ }
+ }
+ span {
+ class: "community__title",
+ "{cx.props.title}"
+ }
+ }
+ ))
+}
diff --git a/src/components/atoms/mod.rs b/src/components/atoms/mod.rs
index 66d1587..918bdeb 100644
--- a/src/components/atoms/mod.rs
+++ b/src/components/atoms/mod.rs
@@ -2,6 +2,7 @@ pub mod attach;
pub mod avatar;
pub mod button;
pub mod card;
+pub mod community;
pub mod header;
pub mod header_main;
pub mod helper;
@@ -23,6 +24,7 @@ pub use attach::Attach;
pub use avatar::Avatar;
pub use button::Button;
pub use card::Card;
+pub use community::Community;
pub use header::Header;
pub use header_main::HeaderMain;
pub use helper::Helper;
diff --git a/src/components/molecules/menu.rs b/src/components/molecules/menu.rs
index 8f0c874..f291eb0 100644
--- a/src/components/molecules/menu.rs
+++ b/src/components/molecules/menu.rs
@@ -8,6 +8,7 @@ use crate::hooks::use_auth::LogoutError;
use crate::hooks::use_notification::use_notification;
use crate::hooks::use_auth::use_auth;
use crate::hooks::use_client::use_client;
+use crate::hooks::use_session::use_session;
use crate::pages::route::Route;
#[derive(Props)]
@@ -20,6 +21,7 @@ pub fn Menu<'a>(cx: Scope<'a, MenuProps<'a>>) -> Element<'a> {
let nav = use_navigator(cx);
let client = use_client(cx);
let auth = use_auth(cx);
+ let session = use_session(cx);
let notification = use_notification(cx);
let key_profile = translate!(i18, "menu.profile");
@@ -30,10 +32,10 @@ pub fn Menu<'a>(cx: Scope<'a, MenuProps<'a>>) -> Element<'a> {
let log_out = move || {
cx.spawn({
- to_owned![client, auth, notification, key_logout_error_server, key_chat_common_error_default_server];
+ to_owned![client, auth, session, notification, key_logout_error_server, key_chat_common_error_default_server];
async move {
- auth.logout(&client).await
+ auth.logout(&client, session.is_guest()).await
}.unwrap_or_else(move |e: LogoutError| {
let message = match e {
LogoutError::Failed |LogoutError::DefaultClient => key_logout_error_server,
@@ -47,20 +49,24 @@ pub fn Menu<'a>(cx: Scope<'a, MenuProps<'a>>) -> Element<'a> {
cx.render(rsx! {
div {
- class: "menu",
+ class: "menu fade-in-left",
div {
class: "menu__content",
ul {
- li {
- MenuItem {
- title: "{key_profile}",
- icon: cx.render(rsx!(Icon {height: 24, width: 24, stroke: "var(--text-1)", icon: UserCircle})),
- on_click: move |event| {
- cx.props.on_click.call(event);
- nav.push(Route::Profile {});
- }
- }
- }
+ if !session.is_guest() {
+ rsx!(
+ li {
+ MenuItem {
+ title: "{key_profile}",
+ icon: cx.render(rsx!(Icon {height: 24, width: 24, stroke: "var(--text-1)", icon: UserCircle})),
+ on_click: move |event| {
+ cx.props.on_click.call(event);
+ nav.push(Route::Profile {});
+ }
+ }
+ }
+ )
+ }
li {
MenuItem {
diff --git a/src/components/organisms/login_form.rs b/src/components/organisms/login_form.rs
index 7a2c185..d743f50 100644
--- a/src/components/organisms/login_form.rs
+++ b/src/components/organisms/login_form.rs
@@ -11,6 +11,7 @@ pub enum FormLoginEvent {
Login,
FilledForm,
ClearData,
+ Guest,
}
#[derive(Props)]
@@ -119,6 +120,17 @@ pub fn LoginForm<'a>(cx: Scope<'a, LoginFormProps<'a>>) -> Element<'a> {
},
translate!(i18, "onboard.signup.cta"),
}
+ p {
+ class: "login-form__cta--another",
+ translate!(i18, "onboard.guest.description")
+ button {
+ class: "login-form__form__text login__form__text--color button button--tertiary",
+ onclick: move |_| {
+ cx.props.on_handle.call(FormLoginEvent::Guest)
+ },
+ translate!(i18, "onboard.guest.cta")
+ }
+ }
),
BeforeSession::Signup => rsx!(
translate!(i18, "onboard.login.description")
@@ -129,6 +141,38 @@ pub fn LoginForm<'a>(cx: Scope<'a, LoginFormProps<'a>>) -> Element<'a> {
},
translate!(i18, "onboard.login.cta"),
}
+ p {
+ class: "login-form__cta--another",
+ translate!(i18, "onboard.guest.description")
+ button {
+ class: "login-form__form__text login__form__text--color button button--tertiary",
+ onclick: move |_| {
+ cx.props.on_handle.call(FormLoginEvent::Guest)
+ },
+ translate!(i18, "onboard.guest.cta")
+ }
+ }
+ ),
+ BeforeSession::Guest => rsx!(
+ translate!(i18, "onboard.login.description")
+ button {
+ class: "login-form__form__text login__form__text--color button button--tertiary",
+ onclick: move |_| {
+ cx.props.on_handle.call(FormLoginEvent::Login)
+ },
+ translate!(i18, "onboard.login.cta"),
+ }
+ p {
+ class: "login-form__cta--another",
+ translate!(i18, "onboard.signup.description")
+ button {
+ class: "login-form__form__text login__form__text--color button button--tertiary",
+ onclick: move |_| {
+ cx.props.on_handle.call(FormLoginEvent::CreateAccount)
+ },
+ translate!(i18, "onboard.signup.cta"),
+ }
+ }
)
}
}
diff --git a/src/hooks/use_auth.rs b/src/hooks/use_auth.rs
index e27b29d..5ed003f 100644
--- a/src/hooks/use_auth.rs
+++ b/src/hooks/use_auth.rs
@@ -249,12 +249,15 @@ impl UseAuthState {
*self.logged_in.write() = LoggedIn(option);
}
- pub async fn logout(&self, client: &UseClientState) -> Result<(), LogoutError> {
- client
- .get()
- .logout()
- .await
- .map_err(|_| LogoutError::Failed)?;
+ pub async fn logout(&self, client: &UseClientState, is_guest: bool) -> Result<(), LogoutError> {
+ if !is_guest {
+ client
+ .get()
+ .logout()
+ .await
+ .map_err(|_| LogoutError::Failed)?;
+ }
+
::delete("session_file");
client
diff --git a/src/hooks/use_init_app.rs b/src/hooks/use_init_app.rs
index 2584716..e9e0cc8 100644
--- a/src/hooks/use_init_app.rs
+++ b/src/hooks/use_init_app.rs
@@ -21,6 +21,7 @@ use super::{use_attach::AttachFile, use_modal::ModalState};
pub enum BeforeSession {
Login,
Signup,
+ Guest,
}
#[derive(Clone, Debug)]
@@ -49,7 +50,7 @@ pub fn use_init_app(cx: &ScopeState) {
use_shared_state_provider::>(cx, || None);
use_shared_state_provider::>(cx, || None);
- use_shared_state_provider::(cx, || BeforeSession::Login);
+ use_shared_state_provider::(cx, || BeforeSession::Guest);
use_shared_state_provider::>(cx, || None);
use_shared_state_provider::>(cx, || vec![]);
diff --git a/src/hooks/use_session.rs b/src/hooks/use_session.rs
index de9bbe1..8459021 100644
--- a/src/hooks/use_session.rs
+++ b/src/hooks/use_session.rs
@@ -26,6 +26,7 @@ pub struct UseSessionState {
pub struct UserSession {
pub user_id: String,
pub device_id: Option,
+ pub is_guest: bool,
}
pub enum SessionError {
@@ -44,6 +45,10 @@ impl UseSessionState {
self.data.read().clone()
}
+ pub fn is_guest(&self) -> bool {
+ self.get().is_some_and(|s|s.is_guest)
+ }
+
pub async fn whoami(&self, client: Client) -> Result {
let user_id = client.user_id();
let device_id = client.device_id();
@@ -52,12 +57,23 @@ impl UseSessionState {
UserSession {
user_id: user_id.to_string(),
device_id: device_id.map(|id| id.to_string()),
+ is_guest: device_id
+ .map(|id| {
+ if id.to_string().contains("guest") {
+ Some(())
+ } else {
+ None
+ }
+ })
+ .flatten()
+ .is_some(),
}
} else {
let user = client.whoami().await?;
UserSession {
user_id: user.user_id.to_string(),
device_id: user.device_id.map(|id| id.to_string()),
+ is_guest: user.is_guest,
}
};
diff --git a/src/lib.rs b/src/lib.rs
index da15878..4c6b925 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -51,6 +51,7 @@ pub mod pages {
pub mod profile;
pub mod route;
pub mod signup;
+ pub mod welcome;
}
#[derive(Clone)]
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index a1e89cb..3f6ea00 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -1,6 +1,25 @@
{
"id": "en-US",
"texts": {
+ "welcome": {
+ "communities": {
+ "1": "Democracy",
+ "2": "Foundations",
+ "3": "Events",
+ "4": "Web3",
+ "5": "Gamers",
+ "6": "Real State"
+ },
+ "title": "Welcome",
+ "description": "See how you can create a community and learn more about Virto",
+ "cta": {
+ "try": "Try for free",
+ "login": {
+ "message": "If you already have an account",
+ "call": "Login"
+ }
+ }
+ },
"main": {
"loading": {
"title": "Searching for sessions to restore",
@@ -115,6 +134,10 @@
"signup": {
"description": "Don't have an account?",
"cta": "Register"
+ },
+ "guest": {
+ "description": "If you just want to look",
+ "cta": "Enter as a guest"
}
},
"chat": {
@@ -123,6 +146,11 @@
"title": "Join a room",
"description": "With this command, you can join a room by indicating the id",
"subtitle": "Example"
+ },
+ "rooms": {
+ "title": "View public rooms",
+ "description": "With this command, you can view the public rooms on the server",
+ "subtitle": "Example"
}
},
"inputs": {
@@ -164,7 +192,8 @@
"server": "Unexpected error: (Server)",
"sync": "Failed to sync, reload browser",
"default_server": "Could not connect to the default server",
- "persist": "Failed to persist session"
+ "persist": "Failed to persist session",
+ "room_not_found": "Room not found"
}
},
"listen": {
@@ -194,7 +223,9 @@
},
"list": {
"home": "Home",
- "search": "Search"
+ "search": "Search",
+ "invitate": "Invitate",
+ "rooms": "Rooms"
},
"menu": {
"reply": "Reply",
@@ -214,6 +245,42 @@
"request_failed": "Request failed"
}
}
+ },
+ "room-menu": {
+ "leave": "Leave room"
+ },
+ "actions": {
+ "leave": "Could not leave the room"
+ },
+ "preview": {
+ "invited": {
+ "title": "Do you want to join the room",
+ "cta": {
+ "accept": "Start chatting",
+ "reject": "Reject invitation"
+ }
+ },
+ "join": {
+ "title": "To interact with this room you must join",
+ "cta": {
+ "accept": "Join the conversation",
+ "back": "Back"
+ }
+ },
+ "error": {
+ "not_found": "Invitation not found",
+ "accept": "Could not accept the invitation",
+ "join": "Could not join the room"
+ }
+ },
+ "public": {
+ "title": "Public rooms"
+ },
+ "guest": {
+ "signup": {
+ "description": "To create a room, you must sign up",
+ "cta": "Sign Up"
+ }
}
},
"menu": {
diff --git a/src/locales/es-ES.json b/src/locales/es-ES.json
index 09cc6af..83bef47 100644
--- a/src/locales/es-ES.json
+++ b/src/locales/es-ES.json
@@ -1,6 +1,25 @@
{
"id": "es-ES",
"texts": {
+ "welcome": {
+ "communities": {
+ "1": "Democracia",
+ "2": "Fundaciones",
+ "3": "Eventos",
+ "4": "Web3",
+ "5": "Gamers",
+ "6": "Finca raíz"
+ },
+ "title": "Te damos la bienvenida",
+ "description": "Mira cómo puedes crear una comunidad y aprender más sobre Virto",
+ "cta": {
+ "try": "Probar gratis",
+ "login": {
+ "message": "Si ya tienes una cuenta",
+ "call": "Iniciar sesión"
+ }
+ }
+ },
"main": {
"loading": {
"title": "Buscando sesiones para restaurar",
@@ -115,13 +134,22 @@
"signup": {
"description": "¿Si no tienes una cuenta?",
"cta": "Registrate"
+ },
+ "guest": {
+ "description": "Si solo quieres mirar",
+ "cta": "Entrar como invitado"
}
},
"chat": {
"helpers": {
"join": {
- "title": "Unirse a un room",
- "description": "Con este comando puedes unirte a un room indicando el id",
+ "title": "Unirse a una sala",
+ "description": "Con este comando puedes unirte a una sala indicando el id",
+ "subtitle": "Ejemplo"
+ },
+ "rooms": {
+ "title": "Ver salas públicos",
+ "description": "Con este comando puedes ver las salas públicas en el servidor",
"subtitle": "Ejemplo"
}
},
@@ -164,7 +192,8 @@
"server": "Error inesperado: (Servidor)",
"sync": "No se ha podido sincronizar, recarga el navegador",
"default_server": "No se ha podido conectar al servidor por defecto",
- "persist": "No se ha podido persistir la sesión"
+ "persist": "No se ha podido persistir la sesión",
+ "room_not_found": "Sala no disponible"
}
},
"listen": {
@@ -194,7 +223,13 @@
},
"list": {
"home": "Inicio",
- "search": "Buscar"
+ "search": "Buscar",
+ "invitate": "Invitaciones",
+ "rooms": "Salas",
+ "errors": {
+ "public_rooms": "No se ha podido mostrar las salas publicas",
+ "invited_rooms": "No se ha podido mostrar las invitaciones a salas"
+ }
},
"menu": {
"reply": "Responder",
@@ -214,6 +249,42 @@
"request_failed": "Solicitud no procesada"
}
}
+ },
+ "room-menu": {
+ "leave": "Salir del chat"
+ },
+ "actions": {
+ "leave": "No se ha podido abandonar la sala"
+ },
+ "preview": {
+ "invited": {
+ "title": "Quieres unirte a la sala",
+ "cta": {
+ "accept": "Empezar a chatear",
+ "reject": "Rechazar invitación"
+ }
+ },
+ "join": {
+ "title": "Para interactuar con este room debes unirte",
+ "cta": {
+ "accept": "Unirme a la conversación",
+ "back": "Volver"
+ }
+ },
+ "error": {
+ "not_found": "No se ha encontrado la invitación",
+ "accept": "No se ha podido aceptar la invitación",
+ "join": "No se ha podido unir a la sala"
+ }
+ },
+ "public": {
+ "title": "Salas públicas"
+ },
+ "guest": {
+ "signup": {
+ "description": "Para crear una sala debes registrarte",
+ "cta": "Registrarme"
+ }
}
},
"menu": {
diff --git a/src/main.rs b/src/main.rs
index d1d323d..652a1fc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,4 +1,5 @@
#![allow(non_snake_case)]
+use chat::pages::welcome::Welcome;
use dioxus::prelude::*;
use dioxus_router::prelude::Router;
use dioxus_std::{i18n::*, translate};
@@ -192,6 +193,12 @@ fn App(cx: Scope) -> Element {
class: "login",
Signup {}
}
+ ),
+ BeforeSession::Guest => rsx!(
+ section {
+ class: "login",
+ Welcome {}
+ }
)
}
}
diff --git a/src/pages/login.rs b/src/pages/login.rs
index 6361cb0..8dd1f62 100644
--- a/src/pages/login.rs
+++ b/src/pages/login.rs
@@ -262,7 +262,8 @@ pub fn Login(cx: Scope) -> Element {
FormLoginEvent::FilledForm => on_handle_login_clone(),
FormLoginEvent::Login => *before_session.write() = BeforeSession::Login,
FormLoginEvent::CreateAccount => *before_session.write() = BeforeSession::Signup,
- FormLoginEvent::ClearData => on_handle_clear_clone()
+ FormLoginEvent::Guest => *before_session.write() = BeforeSession::Guest,
+ FormLoginEvent::ClearData => on_handle_clear_clone(),
};
render!(
diff --git a/src/pages/signup.rs b/src/pages/signup.rs
index d05f7f8..d8a8fd8 100644
--- a/src/pages/signup.rs
+++ b/src/pages/signup.rs
@@ -369,6 +369,7 @@ pub fn Signup(cx: Scope) -> Element {
FormLoginEvent::FilledForm => on_update_homeserver(),
FormLoginEvent::Login => *before_session.write() = BeforeSession::Login,
FormLoginEvent::CreateAccount => *before_session.write() = BeforeSession::Signup,
+ FormLoginEvent::Guest => *before_session.write() = BeforeSession::Guest,
FormLoginEvent::ClearData => on_handle_clear(),
},
body: render!(rsx!(
@@ -405,6 +406,7 @@ pub fn Signup(cx: Scope) -> Element {
FormLoginEvent::FilledForm => on_handle_login(),
FormLoginEvent::Login => *before_session.write() = BeforeSession::Login,
FormLoginEvent::CreateAccount => *before_session.write() = BeforeSession::Signup,
+ FormLoginEvent::Guest => *before_session.write() = BeforeSession::Guest,
FormLoginEvent::ClearData => on_handle_clear(),
},
body: render!(rsx!(
@@ -471,6 +473,7 @@ pub fn Signup(cx: Scope) -> Element {
FormLoginEvent::FilledForm => on_handle_captcha(),
FormLoginEvent::Login => *before_session.write() = BeforeSession::Login,
FormLoginEvent::CreateAccount => *before_session.write() = BeforeSession::Signup,
+ FormLoginEvent::Guest => *before_session.write() = BeforeSession::Guest,
FormLoginEvent::ClearData => on_handle_clear()
},
diff --git a/src/pages/welcome.rs b/src/pages/welcome.rs
new file mode 100644
index 0000000..d27cdd3
--- /dev/null
+++ b/src/pages/welcome.rs
@@ -0,0 +1,183 @@
+use dioxus::prelude::*;
+use dioxus_std::{i18n::use_i18, translate};
+use gloo::storage::{errors::StorageError, LocalStorage};
+use ruma::api::{
+ client::discovery::discover_homeserver::Response as WellKnownResponse, IncomingResponse,
+};
+use url::Url;
+
+use crate::{
+ components::atoms::{Button, Community},
+ hooks::{
+ use_auth::{use_auth, AuthError},
+ use_client::use_client,
+ use_init_app::BeforeSession,
+ use_notification::use_notification,
+ use_session::use_session,
+ },
+ services::matrix::matrix::register_as_guest,
+ MatrixClientState,
+};
+
+pub fn Welcome(cx: Scope) -> Element {
+ let i18 = use_i18(cx);
+
+ let auth = use_auth(cx);
+ let client = use_client(cx);
+ let session = use_session(cx);
+ let notification = use_notification(cx);
+
+ let key_welcome_communities_1 = translate!(i18, "welcome.communities.1");
+ let key_welcome_communities_2 = translate!(i18, "welcome.communities.2");
+ let key_welcome_communities_3 = translate!(i18, "welcome.communities.3");
+ let key_welcome_communities_4 = translate!(i18, "welcome.communities.4");
+ let key_welcome_communities_5 = translate!(i18, "welcome.communities.5");
+ let key_welcome_communities_6 = translate!(i18, "welcome.communities.6");
+ let key_welcome_cta_try = translate!(i18, "welcome.cta.try");
+
+ let key_chat_common_error_sync = translate!(i18, "chat.common.error.sync");
+ let key_chat_common_error_persist = translate!(i18, "chat.common.error.persist");
+
+ let before_session =
+ use_shared_state::(cx).expect("Unable to use before session");
+
+ use_coroutine(cx, |_: UnboundedReceiver<()>| {
+ to_owned![auth, session];
+ async move {
+ if session.is_guest() {
+ let serialized_session: Result =
+ ::get("session_file");
+
+ if serialized_session.is_ok() {
+ auth.set_logged_in(true)
+ }
+ }
+ }
+ });
+
+ render!(div {
+ class: "page--clamp",
+ section {
+ class: "login-form",
+ div {
+ class: "communities",
+ div {
+ class: "community__blanck"
+ }
+ Community {
+ title: "{key_welcome_communities_1}",
+ icon: "🗳️",
+ background: "purple",
+ }
+
+ Community {
+ title: "{key_welcome_communities_2}",
+ icon: "💡",
+ background: "gray",
+ }
+
+ Community {
+ title: "{key_welcome_communities_3}",
+ icon: "🪩",
+ background: "yellow",
+ }
+ Community {
+ class: "community--center",
+ title: "{key_welcome_communities_4}",
+ icon: "🎡",
+ background: "green",
+ }
+ div {
+ class: "community__blanck"
+ }
+ div {
+ class: "community__blanck"
+ }
+ Community {
+ title: "{key_welcome_communities_5}",
+ icon: "🕹️",
+ background: "pink",
+ }
+ Community {
+ title: "{key_welcome_communities_6}",
+ icon: "🏡",
+ background: "blue",
+ }
+ }
+ div {
+ class: "welcome__content",
+ h2 {
+ class: "login-form__title",
+ translate!(i18, "welcome.title")
+ }
+ p {
+ class: "login-form__description",
+ translate!(i18, "welcome.description")
+ }
+ }
+
+ div {
+ class: "login-form__cta--filled",
+ Button {
+ text: "{key_welcome_cta_try}",
+ status: None,
+ on_click: move |_| {
+ cx.spawn({
+ to_owned![client, session, notification, auth, key_chat_common_error_persist, key_chat_common_error_sync];
+ async move {
+ let homeserver = client.get().homeserver().await;
+
+ let request_url = format!("{}.well-known/matrix/client", homeserver.to_string());
+
+ let res = reqwest::Client::new()
+ .get(&request_url)
+ .send()
+ .await
+ .map_err(|_| AuthError::InvalidHomeserver).unwrap();
+
+ let body = res.text().await.map_err(|_| AuthError::InvalidHomeserver).unwrap();
+
+ let well_response = WellKnownResponse::try_from_http_response(http::Response::new(body))
+ .map_err(|_| AuthError::InvalidHomeserver).unwrap();
+
+ let url_base = Url::parse(&well_response.homeserver.base_url)
+ .map_err(|_| AuthError::InvalidHomeserver).unwrap();
+
+ let Ok((c, serialized_session)) = register_as_guest(&url_base.to_string()).await else {
+ return;
+ };
+
+ if let Err(_) = session.persist_session_file(&serialized_session) {
+ notification.handle_error(&key_chat_common_error_persist);
+ };
+
+ if let Err(_) = session.sync(c.clone(), None).await {
+ notification.handle_error(&key_chat_common_error_sync);
+ };
+
+ client.set(MatrixClientState { client: Some(c.clone()) });
+
+ auth.set_logged_in(true);
+ }
+ })
+ }
+ }
+ }
+
+ div {
+ class: "login-form__cta--action",
+ small {
+ class: "login-form__form__text",
+ translate!(i18, "welcome.cta.login.message")
+ button {
+ class: "login-form__form__text login__form__text--color button button--tertiary",
+ onclick: move |_| {
+ *before_session.write() = BeforeSession::Login
+ },
+ translate!(i18, "welcome.cta.login.call")
+ }
+ }
+ }
+ }
+ })
+}
diff --git a/src/services/matrix.rs b/src/services/matrix.rs
index 5d3f139..4db81da 100644
--- a/src/services/matrix.rs
+++ b/src/services/matrix.rs
@@ -1,6 +1,7 @@
pub mod matrix {
use std::{
collections::HashMap,
+ ops::Deref,
time::{Duration, UNIX_EPOCH},
};
@@ -8,11 +9,11 @@ pub mod matrix {
use log::info;
use matrix_sdk::{
- self,
attachment::AttachmentConfig,
+ config::RequestConfig,
deserialized_responses::{SyncTimelineEvent, TimelineSlice},
media::{MediaFormat, MediaRequest, MediaThumbnailSize},
- room::{MessagesOptions, Room},
+ room::{Invited, MessagesOptions, Room},
ruma::{
api::{
self,
@@ -45,18 +46,22 @@ pub mod matrix {
};
use mime::Mime;
use ruma::{
- api::client::message::send_message_event::v3::Response, events::room::message::Thread,
- OwnedMxcUri, OwnedRoomId,
+ api::client::{
+ account::register::RegistrationKind, directory::get_public_rooms,
+ message::send_message_event::v3::Response,
+ },
+ events::room::message::Thread,
+ OwnedMxcUri, OwnedRoomId, UserId,
};
use url::Url;
use crate::{
components::atoms::room::RoomItem,
hooks::{use_send_message::SendMessageError, use_session::UserSession},
+ pages::chat::room::group::Profile,
utils::matrix::{mxc_to_download_uri, mxc_to_thumbnail_uri, ImageMethod, ImageSize},
};
- use matrix_sdk::ruma::exports::serde_json;
use matrix_sdk::Session;
use serde::{Deserialize, Serialize};
@@ -216,14 +221,124 @@ pub mod matrix {
pub spaces: HashMap>,
}
+ pub async fn invited_rooms(client: &Client) -> Result, String> {
+ let mut rooms = Vec::new();
+
+ for room in client.invited_rooms() {
+ let Ok(item) = format_invited_room(&client, room).await else {
+ continue;
+ };
+
+ rooms.push(item);
+ }
+
+ Ok(rooms)
+ }
+
+ pub async fn format_invited_room(client: &Client, room: Invited) -> Result {
+ let avatar_uri: Option = room
+ .avatar_url()
+ .and_then(|uri| mxc_to_thumbnail_uri(&uri, ImageSize::default(), ImageMethod::CROP));
+
+ let Some(content) = room.create_content() else {
+ return Err(String::from("Content not found"));
+ };
+ log::info!("{:?}", content.creator);
+
+ let Ok(room_creator) = find_user_by_id(content.creator.as_str(), &client).await else {
+ return Err(String::from("User not found"));
+ };
+
+ let room = RoomItem {
+ avatar_uri: avatar_uri,
+ id: room.room_id().to_string(),
+ name: room.name().unwrap_or(room_creator.displayname),
+ is_public: true,
+ is_direct: false,
+ };
+
+ Ok(room)
+ }
+
+ pub async fn public_rooms_and_spaces(
+ client: &Client,
+ limit: Option,
+ since: Option<&str>,
+ server: Option<&str>,
+ ) -> Result {
+ let mut rooms = Vec::new();
+ let mut spaces: HashMap> = HashMap::new();
+
+ let limit = limit.map(UInt::from);
+ let server = server.map(|s| s.try_into().ok()).flatten();
+
+ let request = assign!(get_public_rooms::v3::Request::new(), {
+ limit,
+ since,
+ server,
+ });
+
+ let response = client
+ .send(request, Some(RequestConfig::default().force_auth()))
+ .await
+ .map_err(|_| String::from("ServerError"))?;
+
+ for room in response.chunk {
+ let avatar_uri: Option = room.avatar_url.and_then(|uri| {
+ mxc_to_thumbnail_uri(&uri, ImageSize::default(), ImageMethod::CROP)
+ });
+
+ let room = RoomItem {
+ avatar_uri: avatar_uri,
+ id: room.room_id.to_string(),
+ name: room.name.unwrap_or(String::from("Unnamed")),
+ is_public: true,
+ is_direct: false,
+ };
+
+ rooms.push(room);
+ }
+
+ let mut to_list_rooms = vec![];
+
+ for (key, value) in spaces.iter_mut() {
+ rooms.iter().for_each(|room| {
+ let room_homeserver = room.id.split(":").collect::>()[1];
+ let space_homeserver = key.id.split(":").collect::>()[1];
+
+ if room_homeserver.eq(space_homeserver) && !room.is_direct && !room.id.eq(&key.id) {
+ value.push(room.clone());
+ } else {
+ to_list_rooms.push(room.clone());
+ }
+ });
+ }
+
+ if spaces.len() == 0 {
+ to_list_rooms = rooms;
+ }
+
+ Ok(Conversations {
+ rooms: to_list_rooms,
+ spaces: spaces,
+ })
+ }
+
pub async fn list_rooms_and_spaces(
client: &Client,
session_data: UserSession,
) -> Conversations {
let mut rooms = Vec::new();
let mut spaces = HashMap::new();
+ let rooms_response = client.rooms();
+
+ for room in rooms_response {
+ if let Room::Left(r) = &room {
+ if !r.is_space() {
+ continue;
+ }
+ }
- for room in client.rooms() {
let is_direct = room.is_direct();
let is_space = room.is_space();
@@ -314,6 +429,21 @@ pub mod matrix {
}
}
+ pub enum LeaveRoomError {
+ InvalidRoomId,
+ RoomNotFound,
+ Failed,
+ }
+
+ pub async fn leave_room(client: &Client, id: &str) -> Result<(), LeaveRoomError> {
+ let room_id = RoomId::parse(id).map_err(|_| LeaveRoomError::InvalidRoomId)?;
+ let room = client
+ .get_joined_room(&room_id)
+ .ok_or(LeaveRoomError::RoomNotFound)?;
+
+ room.leave().await.map_err(|_| LeaveRoomError::Failed)
+ }
+
#[derive(PartialEq, Debug, Clone)]
pub struct RoomMember {
pub id: String,
@@ -325,6 +455,50 @@ pub mod matrix {
NotFound,
}
+ #[derive(Clone, Debug)]
+ pub enum FindUserError {
+ InvalidUserId,
+ UserNotFound,
+ InvalidUsername,
+ }
+
+ pub async fn find_user_by_id(id: &str, client: &Client) -> Result {
+ let u = UserId::parse(&id).map_err(|_| FindUserError::InvalidUserId)?;
+
+ let u = u.deref();
+
+ let request = matrix_sdk::ruma::api::client::profile::get_profile::v3::Request::new(u);
+
+ let response = client
+ .send(request, None)
+ .await
+ .map_err(|_| FindUserError::UserNotFound)?;
+
+ let displayname = response.displayname.ok_or(FindUserError::InvalidUsername)?;
+
+ let avatar_uri = response
+ .avatar_url
+ .map(|uri| {
+ mxc_to_thumbnail_uri(
+ &uri,
+ ImageSize {
+ width: 48,
+ height: 48,
+ },
+ ImageMethod::CROP,
+ )
+ })
+ .flatten();
+
+ let profile = Profile {
+ displayname,
+ avatar_uri,
+ id: id.to_string(),
+ };
+
+ Ok(profile)
+ }
+
pub async fn room_member(
member_id: OwnedUserId,
room: &Room,
@@ -369,6 +543,7 @@ pub mod matrix {
AccountInfo { name, avatar_uri }
}
+ #[derive(Debug)]
pub enum CreateRoomError {
RequestFailed,
InvalidMedia,
@@ -420,10 +595,10 @@ pub mod matrix {
request.preset = Some(RoomPreset::PrivateChat);
}
- client
- .create_room(request)
- .await
- .map_err(|_| CreateRoomError::RequestFailed)
+ client.create_room(request).await.map_err(|e| {
+ log::error!("{:?}", e);
+ CreateRoomError::RequestFailed
+ })
}
#[derive(PartialEq, Debug, Clone)]
@@ -491,6 +666,7 @@ pub mod matrix {
Thread(TimelineMessageThread),
}
+ #[derive(PartialEq, Debug, Clone)]
pub enum TimelineError {
RoomNotFound,
InvalidLimit,
@@ -655,6 +831,7 @@ pub mod matrix {
logged_user_id: &str,
client: &Client,
) -> Option {
+ log::info!("{:?}", event);
let AnySyncTimelineEvent::MessageLike(AnySyncMessageLikeEvent::RoomMessage(
SyncMessageLikeEvent::Original(original),
)) = event
@@ -1201,6 +1378,56 @@ pub mod matrix {
}
}
+ pub async fn register_as_guest(homeserver: &str) -> Result<(Client, String), String> {
+ let mut request = RegistrationRequest::new();
+ request.kind = RegistrationKind::Guest;
+
+ let uiaa_dummy = uiaa::Dummy::new();
+ request.auth = Some(uiaa::AuthData::Dummy(uiaa_dummy));
+ log::info!("{:?}", request);
+
+ let client = Client::builder()
+ .homeserver_url(&homeserver)
+ .build()
+ .await
+ .map_err(|_| String::from("Error"))?;
+
+ let Ok(info) = client.register(request.clone()).await else {
+ return Err(String::from("Signup Failed"));
+ };
+
+ log::info!("signup guest result {:?}", info);
+
+ let (Some(access_token), Some(device_id)) = (info.access_token, info.device_id) else {
+ return Err(String::from("Access token or device_id not found"));
+ };
+
+ let (client, client_session) = build_client(homeserver, &info.user_id.to_string())
+ .await
+ .map_err(|_| String::from("Error"))?;
+
+ let user_session = Session {
+ access_token: access_token,
+ refresh_token: info.refresh_token,
+ user_id: info.user_id,
+ device_id: device_id,
+ };
+
+ let serialized_session = serde_json::to_string(&FullSession {
+ client_session,
+ user_session: user_session.clone(),
+ sync_token: None,
+ })
+ .map_err(|_| String::from("Serialization failed"))?;
+
+ client
+ .restore_login(user_session.clone())
+ .await
+ .map_err(|_| String::from("Restore failed"))?;
+
+ Ok((client, serialized_session))
+ }
+
pub async fn login(
homeserver: &str,
username: &str,
+
+ Democracia
+ 🗳️
+
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+ Fundaciones
+
+ 💡
+
+
+
+ Eventos
+
+ 🪩
+
+
+
+ Web3
+
+ 🎡
+
+
+ Gamers
+
+ 🕹️
+
+
+
+ Finca raíz
+ 🏡
+
+
+
+ Te damos la bienvenida +
++ Mira cómo puedes crear una comunidad y aprender más sobre Virto +
+
-
+
-
- ¿Si no tienes una cuenta?
+ Si ya tienes una cuenta