Rust 2018! (#726)
This commit is contained in:
@@ -1,8 +1,9 @@
|
||||
@use plume_models::CONFIG;
|
||||
@use plume_models::instance::Instance;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use std::path::Path;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, title: String, head: Content, header: Content, content: Content)
|
||||
|
||||
<!DOCTYPE html>
|
||||
|
||||
@@ -2,10 +2,10 @@
|
||||
@use plume_models::instance::Instance;
|
||||
@use plume_models::posts::Post;
|
||||
@use plume_models::users::User;
|
||||
@use templates::{base, partials::post_card};
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use std::path::Path;
|
||||
@use crate::templates::{base, partials::post_card};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, blog: Blog, authors: &[User], page: i32, n_pages: i32, posts: Vec<Post>)
|
||||
|
||||
|
||||
@@ -2,12 +2,12 @@
|
||||
@use plume_models::blogs::Blog;
|
||||
@use plume_models::instance::Instance;
|
||||
@use plume_models::medias::Media;
|
||||
@use routes::blogs;
|
||||
@use routes::blogs::EditForm;
|
||||
@use routes::medias;
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use templates::partials::image_select;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::templates::partials::image_select;
|
||||
@use crate::routes::blogs;
|
||||
@use crate::routes::blogs::EditForm;
|
||||
@use crate::routes::medias;
|
||||
|
||||
@(ctx: BaseContext, blog: &Blog, medias: Vec<Media>, form: &EditForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
@use validator::ValidationErrors;
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::blogs::NewBlogForm;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::blogs::NewBlogForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, form: &NewBlogForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::base as base_template;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::base as base_template;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, error_message: String, error: Content)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::errors::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::errors::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::errors::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::errors::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, error_message: String)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::errors::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::errors::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
@@ -7,4 +7,3 @@
|
||||
<h1>@i18n!(ctx.1, "We couldn't find this page.")</h1>
|
||||
<p>@i18n!(ctx.1, "The link that led you here may be broken.")</p>
|
||||
})
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::errors::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::errors::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::errors::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::errors::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
@@ -7,4 +7,3 @@
|
||||
<h1>@i18n!(ctx.1, "The content you sent can't be processed.")</h1>
|
||||
<p>@i18n!(ctx.1, "Maybe it was too long.")</p>
|
||||
})
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use plume_models::{instance::Instance, users::User};
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, instance: Instance, admin: User, n_users: i64, n_articles: i64, n_instances: i64)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use plume_models::instance::Instance;
|
||||
@use validator::ValidationErrors;
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::instance::InstanceSettingsForm;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::instance::InstanceSettingsForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, instance: Instance, form: InstanceSettingsForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use templates::base;
|
||||
@use plume_models::blocklisted_emails::BlocklistedEmail;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx:BaseContext, emails: Vec<BlocklistedEmail>, page:i32, n_pages:i32)
|
||||
@:base(ctx, i18n!(ctx.1, "Blocklisted Emails"), {}, {}, {
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use templates::{base, partials::*};
|
||||
@use template_utils::*;
|
||||
@use plume_models::instance::Instance;
|
||||
@use plume_models::posts::Post;
|
||||
@use plume_models::timeline::Timeline;
|
||||
@use routes::*;
|
||||
@use crate::templates::{base, partials::*};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, instance: Instance, n_users: i64, n_articles: i64, all_tl: Vec<(Timeline, Vec<Post>)>)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use plume_models::instance::Instance;
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, instance: Instance, instances: Vec<Instance>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use plume_models::users::User;
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, users: Vec<User>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
@use plume_models::medias::{Media, MediaCategory};
|
||||
@use plume_models::safe_string::SafeString;
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, media: Media)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use plume_models::medias::*;
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, medias: Vec<Media>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use plume_models::notifications::Notification;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, notifications: Vec<Notification>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use template_utils::*;
|
||||
@use plume_models::comments::CommentTree;
|
||||
@use routes::*;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, comment_tree: &CommentTree, in_reply_to: Option<&str>, blog: &str, slug: &str)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use template_utils::*;
|
||||
@use plume_models::medias::*;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, id: &str, title: String, optional: bool, medias: Vec<Media>, selected: Option<i32>)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use template_utils::*;
|
||||
@use plume_models::instance::Instance;
|
||||
@use routes::*;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, instance: Instance, n_users: i64, n_articles: i64)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use plume_models::posts::Post;
|
||||
@use template_utils::*;
|
||||
@use routes::*;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, article: Post)
|
||||
|
||||
@@ -31,4 +31,3 @@
|
||||
}
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
@use templates::{base, partials::comment};
|
||||
@use template_utils::*;
|
||||
@use plume_models::blogs::Blog;
|
||||
@use plume_models::comments::{Comment, CommentTree};
|
||||
@use plume_models::posts::Post;
|
||||
@use plume_models::tags::Tag;
|
||||
@use plume_models::users::User;
|
||||
@use validator::ValidationErrors;
|
||||
@use routes::comments::NewCommentForm;
|
||||
@use routes::*;
|
||||
@use std::path::Path;
|
||||
@use validator::ValidationErrors;
|
||||
@use crate::templates::{base, partials::comment};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::comments::NewCommentForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, article: Post, blog: Blog, comment_form: &NewCommentForm, comment_errors: ValidationErrors, tags: Vec<Tag>, comments: Vec<CommentTree>, previous_comment: Option<Comment>, n_likes: i64, n_reshares: i64, has_liked: bool, has_reshared: bool, is_following: bool, author: User)
|
||||
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
@use templates::base;
|
||||
@use templates::partials::image_select;
|
||||
@use template_utils::*;
|
||||
@use validator::{ValidationErrors, ValidationErrorsKind};
|
||||
@use std::borrow::Cow;
|
||||
@use plume_models::medias::*;
|
||||
@use plume_models::blogs::Blog;
|
||||
@use plume_models::posts::Post;
|
||||
@use routes::posts::NewPostForm;
|
||||
@use routes::*;
|
||||
@use std::borrow::Cow;
|
||||
@use validator::{ValidationErrors, ValidationErrorsKind};
|
||||
@use crate::templates::base;
|
||||
@use crate::templates::partials::image_select;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::posts::NewPostForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, title: String, blog: Blog, editing: bool, form: &NewPostForm, is_draft: bool, article: Option<Post>, errors: ValidationErrors, medias: Vec<Media>, content_len: u64)
|
||||
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
@use templates::remote_interact_base;
|
||||
@use templates::partials::post_card;
|
||||
@use plume_models::posts::Post;
|
||||
@use routes::RemoteForm;
|
||||
@use routes::session::LoginForm;
|
||||
@use template_utils::*;
|
||||
@use validator::ValidationErrors;
|
||||
@use crate::templates::remote_interact_base;
|
||||
@use crate::templates::partials::post_card;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::RemoteForm;
|
||||
@use crate::routes::session::LoginForm;
|
||||
|
||||
@(ctx: BaseContext, post: Post, login_form: LoginForm, login_errs: ValidationErrors, remote_form: RemoteForm, remote_errs: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
@use templates::base;
|
||||
@use routes::session::LoginForm;
|
||||
@use routes::RemoteForm;
|
||||
@use template_utils::*;
|
||||
@use validator::ValidationErrors;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::session::LoginForm;
|
||||
@use crate::routes::RemoteForm;
|
||||
|
||||
@(ctx: BaseContext, title: String, login_msg: String, remote_msg: String, header: Content, login_form: LoginForm, login_errs: ValidationErrors, remote_form: RemoteForm, remote_errs: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, now: &str)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use templates::{base, partials::post_card};
|
||||
@use template_utils::*;
|
||||
@use plume_models::posts::Post;
|
||||
@use crate::templates::{base, partials::post_card};
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, query_str: &str, articles: Vec<Post>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use validator::ValidationErrors;
|
||||
@use routes::session::LoginForm;
|
||||
@use routes::*;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::routes::session::LoginForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, message: Option<String>, form: &LoginForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use routes::session::NewPasswordForm;
|
||||
@use validator::ValidationErrors;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::routes::session::NewPasswordForm;
|
||||
|
||||
@(ctx: BaseContext, form: &NewPasswordForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use routes::session::ResetForm;
|
||||
@use validator::ValidationErrors;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::routes::session::ResetForm;
|
||||
|
||||
@(ctx: BaseContext, form: &ResetForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
|
||||
@(ctx: BaseContext)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use templates::{base, partials::post_card};
|
||||
@use template_utils::*;
|
||||
@use plume_models::posts::Post;
|
||||
@use crate::templates::{base, partials::post_card};
|
||||
@use crate::template_utils::*;
|
||||
|
||||
@(ctx: BaseContext, tag: String, articles: Vec<Post>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use plume_models::posts::Post;
|
||||
@use plume_models::timeline::Timeline;
|
||||
@use template_utils::*;
|
||||
@use templates::base;
|
||||
@use templates::partials::post_card;
|
||||
@use routes::*;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::templates::partials::post_card;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, tl: Timeline, articles: Vec<Post>, all_tl: Vec<Timeline>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
@use templates::{base, partials::post_card};
|
||||
@use template_utils::*;
|
||||
@use plume_models::blogs::Blog;
|
||||
@use plume_models::posts::Post;
|
||||
@use routes::*;
|
||||
@use crate::templates::{base, partials::post_card};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, blogs: Vec<Blog>, drafts: Vec<Post>)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use templates::{base, partials::post_card, users::header};
|
||||
@use template_utils::*;
|
||||
@use plume_models::instance::Instance;
|
||||
@use plume_models::users::User;
|
||||
@use plume_models::posts::Post;
|
||||
@use routes::*;
|
||||
@use crate::templates::{base, partials::post_card, users::header};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, recents: Vec<Post>, reshares: Vec<Post>)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use plume_models::instance::Instance;
|
||||
@use routes::user::UpdateUserForm;
|
||||
@use validator::ValidationErrors;
|
||||
@use routes::*;
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::user::UpdateUserForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, form: UpdateUserForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use templates::remote_interact_base;
|
||||
@use plume_models::users::User;
|
||||
@use routes::RemoteForm;
|
||||
@use routes::session::LoginForm;
|
||||
@use template_utils::*;
|
||||
@use validator::ValidationErrors;
|
||||
@use crate::templates::remote_interact_base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::RemoteForm;
|
||||
@use crate::routes::session::LoginForm;
|
||||
|
||||
@(ctx: BaseContext, user: User, login_form: LoginForm, login_errs: ValidationErrors, remote_form: RemoteForm, remote_errs: ValidationErrors)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use templates::{base, users::header};
|
||||
@use template_utils::*;
|
||||
@use plume_models::users::User;
|
||||
@use routes::*;
|
||||
@use crate::templates::{base, users::header};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, followed: Vec<User>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
@use templates::{base, users::header};
|
||||
@use template_utils::*;
|
||||
@use plume_models::users::User;
|
||||
@use routes::*;
|
||||
@use crate::templates::{base, users::header};
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, user: User, follows: bool, is_remote: bool, remote_url: String, followers: Vec<User>, page: i32, n_pages: i32)
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
@use template_utils::*;
|
||||
@use plume_models::users::User;
|
||||
@use routes::*;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, user: &User, follows: bool, is_remote: bool, instance_url: String)
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
@use templates::base;
|
||||
@use template_utils::*;
|
||||
@use routes::user::NewUserForm;
|
||||
@use validator::{ValidationErrors, ValidationErrorsKind};
|
||||
@use routes::*;
|
||||
@use std::borrow::Cow;
|
||||
@use validator::{ValidationErrors, ValidationErrorsKind};
|
||||
@use crate::templates::base;
|
||||
@use crate::template_utils::*;
|
||||
@use crate::routes::user::NewUserForm;
|
||||
@use crate::routes::*;
|
||||
|
||||
@(ctx: BaseContext, enabled: bool, form: &NewUserForm, errors: ValidationErrors)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user