mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
feat: save icon into db
This commit is contained in:
parent
7fc9a085c5
commit
4eccdf3d28
@ -19,6 +19,7 @@ class UserService {
|
||||
String? name,
|
||||
String? password,
|
||||
String? email,
|
||||
String? icon,
|
||||
}) {
|
||||
var payload = UpdateUserProfilePayloadPB.create()..id = userId;
|
||||
|
||||
@ -34,6 +35,10 @@ class UserService {
|
||||
payload.email = email;
|
||||
}
|
||||
|
||||
if (icon != null) {
|
||||
payload.icon = icon;
|
||||
}
|
||||
|
||||
return UserEventUpdateUserProfile(payload).send();
|
||||
}
|
||||
|
||||
|
@ -36,7 +36,12 @@ class SettingsUserViewBloc extends Bloc<SettingsUserEvent, SettingsUserState> {
|
||||
});
|
||||
},
|
||||
updateUserIcon: (String icon) {
|
||||
emit(state.copyWith(icon: icon));
|
||||
_userService.updateUserProfile(icon: icon).then((result) {
|
||||
result.fold(
|
||||
(l) => null,
|
||||
(err) => Log.error(err),
|
||||
);
|
||||
});
|
||||
},
|
||||
);
|
||||
});
|
||||
@ -74,12 +79,10 @@ class SettingsUserState with _$SettingsUserState {
|
||||
const factory SettingsUserState({
|
||||
required UserProfilePB userProfile,
|
||||
required Either<Unit, String> successOrFailure,
|
||||
required String icon,
|
||||
}) = _SettingsUserState;
|
||||
|
||||
factory SettingsUserState.initial(UserProfilePB userProfile) => SettingsUserState(
|
||||
userProfile: userProfile,
|
||||
successOrFailure: left(unit),
|
||||
icon: 'page',
|
||||
);
|
||||
}
|
||||
|
@ -33,7 +33,7 @@ class SettingsUserView extends StatelessWidget {
|
||||
}
|
||||
|
||||
Widget _renderCurrentIcon(BuildContext context) {
|
||||
String icon = context.read<SettingsUserViewBloc>().state.icon;
|
||||
String icon = context.read<SettingsUserViewBloc>().state.userProfile.icon;
|
||||
return _CurrentIcon(icon);
|
||||
}
|
||||
}
|
||||
|
@ -87,6 +87,7 @@ table! {
|
||||
name -> Text,
|
||||
token -> Text,
|
||||
email -> Text,
|
||||
icon -> Text,
|
||||
workspace -> Text,
|
||||
}
|
||||
}
|
||||
|
@ -1,11 +1,13 @@
|
||||
// https://lexi-lambda.github.io/blog/2019/11/05/parse-don-t-validate/
|
||||
mod user_email;
|
||||
mod user_icon;
|
||||
mod user_id;
|
||||
mod user_name;
|
||||
mod user_password;
|
||||
mod user_workspace;
|
||||
|
||||
pub use user_email::*;
|
||||
pub use user_icon::*;
|
||||
pub use user_id::*;
|
||||
pub use user_name::*;
|
||||
pub use user_password::*;
|
||||
|
@ -0,0 +1,16 @@
|
||||
use crate::errors::ErrorCode;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct UserIcon(pub String);
|
||||
|
||||
impl UserIcon {
|
||||
pub fn parse(s: String) -> Result<UserIcon, ErrorCode> {
|
||||
Ok(Self(s))
|
||||
}
|
||||
}
|
||||
|
||||
impl AsRef<str> for UserIcon {
|
||||
fn as_ref(&self) -> &str {
|
||||
&self.0
|
||||
}
|
||||
}
|
@ -2,7 +2,7 @@ use flowy_derive::ProtoBuf;
|
||||
use std::convert::TryInto;
|
||||
|
||||
use crate::{
|
||||
entities::parser::{UserEmail, UserId, UserName, UserPassword},
|
||||
entities::parser::{UserEmail, UserIcon, UserId, UserName, UserPassword},
|
||||
errors::ErrorCode,
|
||||
};
|
||||
|
||||
@ -25,6 +25,9 @@ pub struct UserProfilePB {
|
||||
|
||||
#[pb(index = 4)]
|
||||
pub token: String,
|
||||
|
||||
#[pb(index = 5)]
|
||||
pub icon: String,
|
||||
}
|
||||
|
||||
#[derive(ProtoBuf, Default)]
|
||||
@ -40,6 +43,9 @@ pub struct UpdateUserProfilePayloadPB {
|
||||
|
||||
#[pb(index = 4, one_of)]
|
||||
pub password: Option<String>,
|
||||
|
||||
#[pb(index = 5, one_of)]
|
||||
pub icon: Option<String>,
|
||||
}
|
||||
|
||||
impl UpdateUserProfilePayloadPB {
|
||||
@ -64,6 +70,11 @@ impl UpdateUserProfilePayloadPB {
|
||||
self.password = Some(password.to_owned());
|
||||
self
|
||||
}
|
||||
|
||||
pub fn icon(mut self, icon: &str) -> Self {
|
||||
self.icon = Some(icon.to_owned());
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(ProtoBuf, Default, Clone, Debug)]
|
||||
@ -79,6 +90,9 @@ pub struct UpdateUserProfileParams {
|
||||
|
||||
#[pb(index = 4, one_of)]
|
||||
pub password: Option<String>,
|
||||
|
||||
#[pb(index = 5, one_of)]
|
||||
pub icon: Option<String>,
|
||||
}
|
||||
|
||||
impl UpdateUserProfileParams {
|
||||
@ -88,6 +102,7 @@ impl UpdateUserProfileParams {
|
||||
name: None,
|
||||
email: None,
|
||||
password: None,
|
||||
icon: None,
|
||||
}
|
||||
}
|
||||
|
||||
@ -105,6 +120,11 @@ impl UpdateUserProfileParams {
|
||||
self.password = Some(password.to_owned());
|
||||
self
|
||||
}
|
||||
|
||||
pub fn icon(mut self, icon: &str) -> Self {
|
||||
self.icon = Some(icon.to_owned());
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {
|
||||
@ -128,11 +148,17 @@ impl TryInto<UpdateUserProfileParams> for UpdateUserProfilePayloadPB {
|
||||
Some(password) => Some(UserPassword::parse(password)?.0),
|
||||
};
|
||||
|
||||
let icon = match self.icon {
|
||||
None => None,
|
||||
Some(icon) => Some(UserIcon::parse(icon)?.0),
|
||||
};
|
||||
|
||||
Ok(UpdateUserProfileParams {
|
||||
id,
|
||||
name,
|
||||
email,
|
||||
password,
|
||||
icon,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
@ -81,6 +81,7 @@ pub struct UserTable {
|
||||
pub(crate) name: String,
|
||||
pub(crate) token: String,
|
||||
pub(crate) email: String,
|
||||
pub(crate) icon: String,
|
||||
pub(crate) workspace: String, // deprecated
|
||||
}
|
||||
|
||||
@ -91,6 +92,7 @@ impl UserTable {
|
||||
name,
|
||||
email,
|
||||
token,
|
||||
icon: "".to_owned(),
|
||||
workspace: "".to_owned(),
|
||||
}
|
||||
}
|
||||
@ -120,6 +122,7 @@ impl std::convert::From<UserTable> for UserProfilePB {
|
||||
email: table.email,
|
||||
name: table.name,
|
||||
token: table.token,
|
||||
icon: table.icon,
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -131,6 +134,7 @@ pub struct UserTableChangeset {
|
||||
pub workspace: Option<String>, // deprecated
|
||||
pub name: Option<String>,
|
||||
pub email: Option<String>,
|
||||
pub icon: Option<String>,
|
||||
}
|
||||
|
||||
impl UserTableChangeset {
|
||||
@ -140,6 +144,7 @@ impl UserTableChangeset {
|
||||
workspace: None,
|
||||
name: params.name,
|
||||
email: params.email,
|
||||
icon: params.icon,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user