Merge branch 'feature/add-ids-and-classes' of github.com:Zetaphor/lemmy-ui into feature/add-ids-and-classes

This commit is contained in:
Zetaphor 2023-06-16 18:29:29 -03:00
commit f38630b224
8 changed files with 5 additions and 27 deletions

View file

@ -54,7 +54,7 @@
"inferno-server": "^8.1.1",
"isomorphic-cookie": "^1.2.4",
"jwt-decode": "^3.1.2",
"lemmy-js-client": "0.17.2-rc.24",
"lemmy-js-client": "0.18.0-rc.1",
"lodash": "^4.17.21",
"markdown-it": "^13.0.1",
"markdown-it-container": "^3.0.0",

View file

@ -360,7 +360,6 @@ export class Community extends Component<
community_view={res.community_view}
moderators={res.moderators}
admins={site_res.admins}
online={res.online}
enableNsfw={enableNsfw(site_res)}
editable
allLanguages={site_res.all_languages}

View file

@ -39,7 +39,6 @@ interface SidebarProps {
allLanguages: Language[];
siteLanguages: number[];
communityLanguages?: number[];
online: number;
enableNsfw?: boolean;
showIcon?: boolean;
editable?: boolean;
@ -237,12 +236,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
const counts = community_view.counts;
return (
<ul className="my-1 list-inline">
<li className="list-inline-item badge badge-secondary">
{i18n.t("number_online", {
count: this.props.online,
formattedCount: numToSI(this.props.online),
})}
</li>
<li
className="list-inline-item badge badge-secondary pointer"
data-tippy-content={i18n.t("active_users_in_the_last_day", {

View file

@ -361,7 +361,6 @@ export class Home extends Component<any, HomeState> {
siteRes: {
site_view: { counts, site },
admins,
online,
},
showSubscribedMobile,
showTrendingMobile,
@ -393,7 +392,6 @@ export class Home extends Component<any, HomeState> {
site={site}
admins={admins}
counts={counts}
online={online}
showLocal={showLocal(this.isoData)}
/>
)}
@ -417,7 +415,6 @@ export class Home extends Component<any, HomeState> {
siteRes: {
site_view: { counts, site },
admins,
online,
},
} = this.state;
@ -442,7 +439,6 @@ export class Home extends Component<any, HomeState> {
site={site}
admins={admins}
counts={counts}
online={online}
showLocal={showLocal(this.isoData)}
/>
{this.hasFollows && (

View file

@ -81,7 +81,6 @@ export class SiteForm extends Component<SiteFormProps, SiteFormState> {
slur_filter_regex: ls.slur_filter_regex,
actor_name_max_length: ls.actor_name_max_length,
federation_enabled: ls.federation_enabled,
federation_debug: ls.federation_debug,
federation_worker_count: ls.federation_worker_count,
captcha_enabled: ls.captcha_enabled,
captcha_difficulty: ls.captcha_difficulty,

View file

@ -12,7 +12,6 @@ interface SiteSidebarProps {
showLocal: boolean;
counts?: SiteAggregates;
admins?: PersonView[];
online?: number;
}
interface SiteSidebarState {
@ -99,15 +98,8 @@ export class SiteSidebar extends Component<SiteSidebarProps, SiteSidebarState> {
badges(siteAggregates: SiteAggregates) {
const counts = siteAggregates;
const online = this.props.online ?? 1;
return (
<ul className="my-2 list-inline">
<li className="list-inline-item badge badge-secondary">
{i18n.t("number_online", {
count: online,
formattedCount: numToSI(online),
})}
</li>
<li
className="list-inline-item badge badge-secondary pointer"
data-tippy-content={i18n.t("active_users_in_the_last_day", {

View file

@ -553,7 +553,6 @@ export class Post extends Component<any, PostState> {
community_view={res.data.community_view}
moderators={res.data.moderators}
admins={this.state.siteRes.admins}
online={res.data.online}
enableNsfw={enableNsfw(this.state.siteRes)}
showIcon
allLanguages={this.state.siteRes.all_languages}

View file

@ -5615,10 +5615,10 @@ leac@^0.6.0:
resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912"
integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
lemmy-js-client@0.17.2-rc.24:
version "0.17.2-rc.24"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.17.2-rc.24.tgz#3b09233a6d89286e559be2e840d81c0c549562ad"
integrity sha512-aSHz7UTcwnwnNd9poY8tEXP7RA9ieZm9MAfSljcbCNU5ds9CASXYNodmraUVJiqCmT4HWnj7IeVmBC9r7nTHnw==
lemmy-js-client@0.18.0-rc.1:
version "0.18.0-rc.1"
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.18.0-rc.1.tgz#fd0c88810572d90413696011ebaed19e3b8162d8"
integrity sha512-lQe443Nr5UCSoY+IxmT7mBe0IRF6EAZ/4PJSRoPSL+U8A+egMMBPbuxnisHzLsC+eDOWRUIgOqZlwlaRnbmuig==
dependencies:
cross-fetch "^3.1.5"
form-data "^4.0.0"