mirror of
https://github.com/cheeaun/phanpy.git
synced 2025-02-02 06:06:41 +01:00
Include Prettier & format everything properly
My bad for not including prettier
This commit is contained in:
Lim Chee Aun
parent
4c0bfc332c
commit
e652ce8d9b
16 changed files with 145 additions and 138 deletions
13
package-lock.json
generated
13
package-lock.json
generated
|
|
@ -58,6 +58,7 @@
|
|||
"postcss": "~8.4.49",
|
||||
"postcss-dark-theme-class": "~1.3.0",
|
||||
"postcss-preset-env": "~10.1.1",
|
||||
"prettier": "3.4.1",
|
||||
"sonda": "~0.6.1",
|
||||
"twitter-text": "~3.1.0",
|
||||
"vite": "~5.4.11",
|
||||
|
|
@ -8406,17 +8407,15 @@
|
|||
}
|
||||
},
|
||||
"node_modules/prettier": {
|
||||
"version": "2.8.0",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.0.tgz",
|
||||
"integrity": "sha512-9Lmg8hTFZKG0Asr/kW9Bp8tJjRVluO8EJQVfY2T7FMw9T5jy4I/Uvx0Rca/XWf50QQ1/SS48+6IJWnrb+2yemA==",
|
||||
"version": "3.4.1",
|
||||
"resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.1.tgz",
|
||||
"integrity": "sha512-G+YdqtITVZmOJje6QkXQWzl3fSfMxFwm1tjTyo9exhkmWSqC4Yhd1+lug++IlR2mvRVAxEDDWYkQdeSztajqgg==",
|
||||
"dev": true,
|
||||
"license": "MIT",
|
||||
"peer": true,
|
||||
"bin": {
|
||||
"prettier": "bin-prettier.js"
|
||||
"prettier": "bin/prettier.cjs"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=10.13.0"
|
||||
"node": ">=14"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/prettier/prettier?sponsor=1"
|
||||
|
|
|
|||
|
|
@ -66,6 +66,7 @@
|
|||
"postcss": "~8.4.49",
|
||||
"postcss-dark-theme-class": "~1.3.0",
|
||||
"postcss-preset-env": "~10.1.1",
|
||||
"prettier": "3.4.1",
|
||||
"sonda": "~0.6.1",
|
||||
"twitter-text": "~3.1.0",
|
||||
"vite": "~5.4.11",
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ import SearchCommand from './components/search-command';
|
|||
import Shortcuts from './components/shortcuts';
|
||||
import NotFound from './pages/404';
|
||||
import AccountStatuses from './pages/account-statuses';
|
||||
import AnnualReport from './pages/annual-report';
|
||||
import Bookmarks from './pages/bookmarks';
|
||||
import Catchup from './pages/catchup';
|
||||
import Favourites from './pages/favourites';
|
||||
|
|
@ -46,7 +47,6 @@ import Search from './pages/search';
|
|||
import StatusRoute from './pages/status-route';
|
||||
import Trending from './pages/trending';
|
||||
import Welcome from './pages/welcome';
|
||||
import AnnualReport from './pages/annual-report';
|
||||
import {
|
||||
api,
|
||||
hasInstance,
|
||||
|
|
@ -99,7 +99,8 @@ window.__STATES_STATS__ = () => {
|
|||
// Experimental "garbage collection" for states
|
||||
// Every 15 minutes
|
||||
// Only posts for now
|
||||
setInterval(() => {
|
||||
setInterval(
|
||||
() => {
|
||||
if (!window.__IDLE__) return;
|
||||
const { statuses, unfurledLinks, notifications } = states;
|
||||
let keysCount = 0;
|
||||
|
|
@ -131,7 +132,9 @@ setInterval(() => {
|
|||
if (keysCount) {
|
||||
console.info(`GC: Removed ${keysCount} keys`);
|
||||
}
|
||||
}, 15 * 60 * 1000);
|
||||
},
|
||||
15 * 60 * 1000,
|
||||
);
|
||||
|
||||
// Preload icons
|
||||
// There's probably a better way to do this
|
||||
|
|
|
|||
|
|
@ -261,9 +261,7 @@ const contentText = {
|
|||
),
|
||||
emoji_reaction: emojiText,
|
||||
'pleroma:emoji_reaction': emojiText,
|
||||
annual_report: ({ year }) => (
|
||||
<Trans>Your {year} #Wrapstodon is here!</Trans>
|
||||
),
|
||||
annual_report: ({ year }) => <Trans>Your {year} #Wrapstodon is here!</Trans>,
|
||||
};
|
||||
|
||||
// account_suspension, domain_block, user_domain_block
|
||||
|
|
@ -537,7 +535,9 @@ function Notification({
|
|||
)}
|
||||
{type === 'annual_report' && (
|
||||
<div>
|
||||
<Link to={`/annual_report/${annualReport?.year}`}><Trans>View #Wrapstodon</Trans></Link>
|
||||
<Link to={`/annual_report/${annualReport?.year}`}>
|
||||
<Trans>View #Wrapstodon</Trans>
|
||||
</Link>
|
||||
</div>
|
||||
)}
|
||||
</>
|
||||
|
|
|
|||
42
src/locales/en.po
generated
42
src/locales/en.po
generated
|
|
@ -963,7 +963,7 @@ msgid "Nothing to show"
|
|||
msgstr ""
|
||||
|
||||
#: src/components/generic-accounts.jsx:145
|
||||
#: src/components/notification.jsx:446
|
||||
#: src/components/notification.jsx:444
|
||||
#: src/pages/accounts.jsx:41
|
||||
#: src/pages/search.jsx:317
|
||||
#: src/pages/search.jsx:350
|
||||
|
|
@ -1472,78 +1472,78 @@ msgstr ""
|
|||
msgid "Moderation warning"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:265
|
||||
#: src/components/notification.jsx:264
|
||||
msgid "Your {year} #Wrapstodon is here!"
|
||||
msgstr "Your {year} #Wrapstodon is here!"
|
||||
|
||||
#: src/components/notification.jsx:272
|
||||
#: src/components/notification.jsx:270
|
||||
msgid "An admin from <0>{from}</0> has suspended <1>{targetName}</1>, which means you can no longer receive updates from them or interact with them."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:278
|
||||
#: src/components/notification.jsx:276
|
||||
msgid "An admin from <0>{from}</0> has blocked <1>{targetName}</1>. Affected followers: {followersCount}, followings: {followingCount}."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:284
|
||||
#: src/components/notification.jsx:282
|
||||
msgid "You have blocked <0>{targetName}</0>. Removed followers: {followersCount}, followings: {followingCount}."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:292
|
||||
#: src/components/notification.jsx:290
|
||||
msgid "Your account has received a moderation warning."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:293
|
||||
#: src/components/notification.jsx:291
|
||||
msgid "Your account has been disabled."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:294
|
||||
#: src/components/notification.jsx:292
|
||||
msgid "Some of your posts have been marked as sensitive."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:295
|
||||
#: src/components/notification.jsx:293
|
||||
msgid "Some of your posts have been deleted."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:296
|
||||
#: src/components/notification.jsx:294
|
||||
msgid "Your posts will be marked as sensitive from now on."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:297
|
||||
#: src/components/notification.jsx:295
|
||||
msgid "Your account has been limited."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:298
|
||||
#: src/components/notification.jsx:296
|
||||
msgid "Your account has been suspended."
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:373
|
||||
#: src/components/notification.jsx:371
|
||||
msgid "[Unknown notification type: {type}]"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:442
|
||||
#: src/components/notification.jsx:440
|
||||
#: src/components/status.jsx:1036
|
||||
#: src/components/status.jsx:1046
|
||||
msgid "Boosted/Liked by…"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:443
|
||||
#: src/components/notification.jsx:441
|
||||
msgid "Liked by…"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:444
|
||||
#: src/components/notification.jsx:442
|
||||
msgid "Boosted by…"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:445
|
||||
#: src/components/notification.jsx:443
|
||||
msgid "Followed by…"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:516
|
||||
#: src/components/notification.jsx:532
|
||||
#: src/components/notification.jsx:514
|
||||
#: src/components/notification.jsx:530
|
||||
msgid "Learn more <0/>"
|
||||
msgstr ""
|
||||
|
||||
#: src/components/notification.jsx:540
|
||||
#: src/components/notification.jsx:539
|
||||
msgid "View #Wrapstodon"
|
||||
msgstr "View #Wrapstodon"
|
||||
|
||||
|
|
@ -2410,7 +2410,7 @@ msgid "Login required."
|
|||
msgstr "Login required."
|
||||
|
||||
#: src/compose.jsx:90
|
||||
#: src/pages/annual-report.jsx:132
|
||||
#: src/pages/annual-report.jsx:136
|
||||
#: src/pages/http-route.jsx:91
|
||||
#: src/pages/login.jsx:270
|
||||
msgid "Go home"
|
||||
|
|
|
|||
|
|
@ -64,7 +64,8 @@ export default function AnnualReport() {
|
|||
<tr>
|
||||
{Object.entries(item).map(([k, value]) => (
|
||||
<td>
|
||||
{value && /(accountId)/i.test(k) &&
|
||||
{value &&
|
||||
/(accountId)/i.test(k) &&
|
||||
/^(mostRebloggedAccounts|commonlyInteractedWithAccounts)$/i.test(
|
||||
key,
|
||||
) ? (
|
||||
|
|
@ -90,14 +91,17 @@ export default function AnnualReport() {
|
|||
<>
|
||||
<dt>{k}</dt>
|
||||
<dd>
|
||||
{value &&
|
||||
{value && (
|
||||
<Link to={`/${instance}/s/${value}`}>
|
||||
<Status
|
||||
status={statuses?.find((s) => s.id === value)}
|
||||
status={statuses?.find(
|
||||
(s) => s.id === value,
|
||||
)}
|
||||
size="s"
|
||||
readOnly
|
||||
/>
|
||||
</Link>}
|
||||
</Link>
|
||||
)}
|
||||
</dd>
|
||||
</>
|
||||
))}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ function escapeHTML(html) {
|
|||
'&': '&',
|
||||
'<': '<',
|
||||
'>': '>',
|
||||
}[c]),
|
||||
})[c],
|
||||
);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ function statusPeek(status) {
|
|||
video: '📹',
|
||||
audio: '🎵',
|
||||
unknown: '',
|
||||
}[m.type] || ''),
|
||||
})[m.type] || '',
|
||||
)
|
||||
.join('');
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue