mirror of
https://github.com/LemmyNet/lemmy-ui.git
synced 2025-01-26 03:45:50 +00:00
Updating for new v19 changes. WIP.
This commit is contained in:
parent
bb8e4f26ee
commit
631469cd25
8 changed files with 14 additions and 28 deletions
|
@ -1 +1 @@
|
||||||
Subproject commit d0f3548379e446d2c333e582734bc68f8d684f4d
|
Subproject commit abd40d4737fa732321fd7b62e42bbfcd51081cb6
|
17
package.json
17
package.json
|
@ -23,16 +23,9 @@
|
||||||
"translations:update": "git submodule update --remote --recursive"
|
"translations:update": "git submodule update --remote --recursive"
|
||||||
},
|
},
|
||||||
"lint-staged": {
|
"lint-staged": {
|
||||||
"*.{ts,tsx,js}": [
|
"*.{ts,tsx,js}": ["prettier --write", "eslint --fix"],
|
||||||
"prettier --write",
|
"*.{css, scss}": ["prettier --write"],
|
||||||
"eslint --fix"
|
"package.json": ["sortpack"]
|
||||||
],
|
|
||||||
"*.{css, scss}": [
|
|
||||||
"prettier --write"
|
|
||||||
],
|
|
||||||
"package.json": [
|
|
||||||
"sortpack"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@babel/plugin-proposal-decorators": "^7.21.5",
|
"@babel/plugin-proposal-decorators": "^7.21.5",
|
||||||
|
@ -70,9 +63,10 @@
|
||||||
"inferno-router": "^8.2.2",
|
"inferno-router": "^8.2.2",
|
||||||
"inferno-server": "^8.2.2",
|
"inferno-server": "^8.2.2",
|
||||||
"jwt-decode": "^3.1.2",
|
"jwt-decode": "^3.1.2",
|
||||||
"lemmy-js-client": "^0.19.0-rc.13",
|
"lemmy-js-client": "0.19.0-alpha.13",
|
||||||
"lodash.isequal": "^4.5.0",
|
"lodash.isequal": "^4.5.0",
|
||||||
"markdown-it": "^13.0.1",
|
"markdown-it": "^13.0.1",
|
||||||
|
"markdown-it-bidi": "^0.1.0",
|
||||||
"markdown-it-container": "^3.0.0",
|
"markdown-it-container": "^3.0.0",
|
||||||
"markdown-it-emoji": "^2.0.2",
|
"markdown-it-emoji": "^2.0.2",
|
||||||
"markdown-it-footnote": "^3.0.3",
|
"markdown-it-footnote": "^3.0.3",
|
||||||
|
@ -80,7 +74,6 @@
|
||||||
"markdown-it-ruby": "^0.1.1",
|
"markdown-it-ruby": "^0.1.1",
|
||||||
"markdown-it-sub": "^1.0.0",
|
"markdown-it-sub": "^1.0.0",
|
||||||
"markdown-it-sup": "^1.0.0",
|
"markdown-it-sup": "^1.0.0",
|
||||||
"markdown-it-bidi": "^0.1.0",
|
|
||||||
"mini-css-extract-plugin": "^2.7.5",
|
"mini-css-extract-plugin": "^2.7.5",
|
||||||
"register-service-worker": "^1.7.2",
|
"register-service-worker": "^1.7.2",
|
||||||
"run-node-webpack-plugin": "^1.3.0",
|
"run-node-webpack-plugin": "^1.3.0",
|
||||||
|
|
|
@ -258,7 +258,7 @@ export class MarkdownTextArea extends Component<
|
||||||
value={this.state.imageUploadStatus.uploaded}
|
value={this.state.imageUploadStatus.uploaded}
|
||||||
max={this.state.imageUploadStatus.total}
|
max={this.state.imageUploadStatus.total}
|
||||||
text={
|
text={
|
||||||
I18NextService.i18n.t("pictures_uploded_progess", {
|
I18NextService.i18n.t("pictures_uploaded_progess", {
|
||||||
uploaded: this.state.imageUploadStatus.uploaded,
|
uploaded: this.state.imageUploadStatus.uploaded,
|
||||||
total: this.state.imageUploadStatus.total,
|
total: this.state.imageUploadStatus.total,
|
||||||
}) ?? undefined
|
}) ?? undefined
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
import { getUnixTime, hostname } from "@utils/helpers";
|
import { hostname } from "@utils/helpers";
|
||||||
import { amAdmin, amMod, amTopMod } from "@utils/roles";
|
import { amAdmin, amMod, amTopMod } from "@utils/roles";
|
||||||
import { Component, InfernoNode, linkEvent } from "inferno";
|
import { Component, InfernoNode, linkEvent } from "inferno";
|
||||||
import { T } from "inferno-i18next-dess";
|
import { T } from "inferno-i18next-dess";
|
||||||
|
@ -546,7 +546,6 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
|
||||||
community_id: i.props.community_view.community.id,
|
community_id: i.props.community_view.community.id,
|
||||||
removed: !i.props.community_view.community.removed,
|
removed: !i.props.community_view.community.removed,
|
||||||
reason: i.state.removeReason,
|
reason: i.state.removeReason,
|
||||||
expires: getUnixTime(i.state.removeExpires), // TODO fix this
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -364,7 +364,7 @@ function renderModlogType({ type_, view }: ModlogType) {
|
||||||
case "ModRemoveCommunity": {
|
case "ModRemoveCommunity": {
|
||||||
const mrco = view as ModRemoveCommunityView;
|
const mrco = view as ModRemoveCommunityView;
|
||||||
const {
|
const {
|
||||||
mod_remove_community: { reason, expires, removed },
|
mod_remove_community: { reason, removed },
|
||||||
community,
|
community,
|
||||||
} = mrco;
|
} = mrco;
|
||||||
|
|
||||||
|
@ -379,11 +379,6 @@ function renderModlogType({ type_, view }: ModlogType) {
|
||||||
<div>reason: {reason}</div>
|
<div>reason: {reason}</div>
|
||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
{expires && (
|
|
||||||
<span>
|
|
||||||
<div>expires: {formatPastDate(expires)}</div>
|
|
||||||
</span>
|
|
||||||
)}
|
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
@ -249,7 +249,6 @@ export class Settings extends Component<any, SettingsState> {
|
||||||
show_bot_accounts,
|
show_bot_accounts,
|
||||||
show_scores,
|
show_scores,
|
||||||
show_read_posts,
|
show_read_posts,
|
||||||
show_new_post_notifs,
|
|
||||||
send_notifications_to_email,
|
send_notifications_to_email,
|
||||||
email,
|
email,
|
||||||
},
|
},
|
||||||
|
@ -285,7 +284,6 @@ export class Settings extends Component<any, SettingsState> {
|
||||||
show_bot_accounts,
|
show_bot_accounts,
|
||||||
show_scores,
|
show_scores,
|
||||||
show_read_posts,
|
show_read_posts,
|
||||||
show_new_post_notifs,
|
|
||||||
email,
|
email,
|
||||||
bio,
|
bio,
|
||||||
send_notifications_to_email,
|
send_notifications_to_email,
|
||||||
|
|
|
@ -1713,6 +1713,7 @@ export class PostListing extends Component<PostListingProps, PostListingState> {
|
||||||
if (myAuth() && !i.props.post_view.read) {
|
if (myAuth() && !i.props.post_view.read) {
|
||||||
i.props.onMarkPostAsRead({
|
i.props.onMarkPostAsRead({
|
||||||
post_id: i.props.post_view.post.id,
|
post_id: i.props.post_view.post.id,
|
||||||
|
post_ids: [],
|
||||||
read: true,
|
read: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -6064,10 +6064,10 @@ leac@^0.6.0:
|
||||||
resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912"
|
resolved "https://registry.yarnpkg.com/leac/-/leac-0.6.0.tgz#dcf136e382e666bd2475f44a1096061b70dc0912"
|
||||||
integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
|
integrity sha512-y+SqErxb8h7nE/fiEX07jsbuhrpO9lL8eca7/Y1nuWV2moNlXhyd59iDGcRf6moVyDMbmTNzL40SUyrFU/yDpg==
|
||||||
|
|
||||||
lemmy-js-client@^0.19.0-rc.13:
|
lemmy-js-client@0.19.0-alpha.13:
|
||||||
version "0.19.0-rc.13"
|
version "0.19.0-alpha.13"
|
||||||
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-rc.13.tgz#e0e15ba6fe3a08cb85130eea7eec4bd2773999f9"
|
resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.19.0-alpha.13.tgz#58fccefd436900624c8c7a04e478f810c08abff5"
|
||||||
integrity sha512-JP9oEh1+Wfttqx5O5EMAVIR/hFVS66iVKmEo8/Uxw8fJfyUeQo7BhKvG8LTYegBE39Womgyu3KxXb7Jy9DRI5A==
|
integrity sha512-sRb7JiWuzH/InwGHfnH8Dv18626vsCKgOThYCOKMd6LqtKHJ6FhnTKrTEz110GZq1Kx8KxPeDU5XTIG6YSA05w==
|
||||||
dependencies:
|
dependencies:
|
||||||
cross-fetch "^3.1.5"
|
cross-fetch "^3.1.5"
|
||||||
form-data "^4.0.0"
|
form-data "^4.0.0"
|
||||||
|
|
Loading…
Reference in a new issue