forked from Archives/Athou_commafeed
Compare commits
34 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
82cf0e154a | ||
|
|
efe32e86c9 | ||
|
|
e208d4ae1e | ||
|
|
adf20327bd | ||
|
|
781c41b452 | ||
|
2b597f9b43 | ||
|
|
2e26f34135 | ||
|
|
9e59a472da | ||
|
|
970043467c | ||
|
|
3e903fc6bc | ||
|
|
95f4cffa7c | ||
|
|
6ebe0fa827 | ||
|
|
488a88fe95 | ||
|
|
d5898a0173 | ||
|
|
bdcfbc22bf | ||
|
|
53b06f41f3 | ||
|
|
872247d80f | ||
|
|
7c226f41db | ||
|
|
bb55a91a14 | ||
|
|
f140650b4e | ||
|
|
8a64a9db31 | ||
|
|
c1520652f2 | ||
|
|
90e3044249 | ||
|
|
f7786d9962 | ||
|
|
aeaaeaee0e | ||
|
|
4d0a8fd133 | ||
|
|
b1938c234c | ||
|
|
6a5052787d | ||
|
|
877fc33180 | ||
|
|
8b0b9b1a66 | ||
|
|
689c329430 | ||
|
|
52f911f303 | ||
|
|
91d0988177 | ||
|
|
4f644ba9f5 |
10
CHANGELOG.md
10
CHANGELOG.md
@@ -1,5 +1,15 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [3.8.0]
|
||||||
|
|
||||||
|
- add previous and next buttons in the toolbar
|
||||||
|
- add a setting to always scroll selected entry to the top of the page, even if it fits entirely on screen
|
||||||
|
- clicking on the body of an entry in expanded mode selects it and marks it as read
|
||||||
|
- add rich text editor with autocomplete for custom css and js code in settings (desktop only)
|
||||||
|
- dramatically improve performance while scrolling
|
||||||
|
- fix broken welcome page mobile layout
|
||||||
|
- format dates in user locale instead of GMT in relative date popups
|
||||||
|
|
||||||
## [3.7.0]
|
## [3.7.0]
|
||||||
|
|
||||||
- the sidebar is now resizable
|
- the sidebar is now resizable
|
||||||
|
|||||||
@@ -4,13 +4,11 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<link rel="icon" type="image/x-icon" href="favicon.ico" />
|
<link rel="icon" type="image/x-icon" href="favicon.ico" />
|
||||||
<link rel="manifest" href="manifest.json" />
|
<link rel="manifest" href="manifest.json" />
|
||||||
<link rel="stylesheet" href="custom_css.css" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
|
||||||
<title>CommaFeed</title>
|
<title>CommaFeed</title>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="root"></div>
|
<div id="root"></div>
|
||||||
<script type="module" src="/src/main.tsx"></script>
|
<script type="module" src="/src/main.tsx"></script>
|
||||||
<script src="custom_js.js"></script>
|
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
68
commafeed-client/package-lock.json
generated
68
commafeed-client/package-lock.json
generated
@@ -20,10 +20,13 @@
|
|||||||
"@mantine/notifications": "^6.0.11",
|
"@mantine/notifications": "^6.0.11",
|
||||||
"@mantine/spotlight": "^6.0.11",
|
"@mantine/spotlight": "^6.0.11",
|
||||||
"@mantine/styles": "^6.0.11",
|
"@mantine/styles": "^6.0.11",
|
||||||
|
"@monaco-editor/react": "^4.5.1",
|
||||||
"@reduxjs/toolkit": "^1.9.5",
|
"@reduxjs/toolkit": "^1.9.5",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
|
"escape-string-regexp": "^5.0.0",
|
||||||
"interweave": "^13.1.0",
|
"interweave": "^13.1.0",
|
||||||
|
"monaco-editor": "^0.38.0",
|
||||||
"mousetrap": "^1.6.5",
|
"mousetrap": "^1.6.5",
|
||||||
"re-resizable": "^6.9.9",
|
"re-resizable": "^6.9.9",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
@@ -2055,6 +2058,17 @@
|
|||||||
"stylis": "4.2.0"
|
"stylis": "4.2.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@emotion/babel-plugin/node_modules/escape-string-regexp": {
|
||||||
|
"version": "4.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
|
||||||
|
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@emotion/cache": {
|
"node_modules/@emotion/cache": {
|
||||||
"version": "11.11.0",
|
"version": "11.11.0",
|
||||||
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
|
"resolved": "https://registry.npmjs.org/@emotion/cache/-/cache-11.11.0.tgz",
|
||||||
@@ -3049,6 +3063,30 @@
|
|||||||
"moo": "^0.5.1"
|
"moo": "^0.5.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@monaco-editor/loader": {
|
||||||
|
"version": "1.3.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/@monaco-editor/loader/-/loader-1.3.3.tgz",
|
||||||
|
"integrity": "sha512-6KKF4CTzcJiS8BJwtxtfyYt9shBiEv32ateQ9T4UVogwn4HM/uPo9iJd2Dmbkpz8CM6Y0PDUpjnZzCwC+eYo2Q==",
|
||||||
|
"dependencies": {
|
||||||
|
"state-local": "^1.0.6"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"monaco-editor": ">= 0.21.0 < 1"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/@monaco-editor/react": {
|
||||||
|
"version": "4.5.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@monaco-editor/react/-/react-4.5.1.tgz",
|
||||||
|
"integrity": "sha512-NNDFdP+2HojtNhCkRfE6/D6ro6pBNihaOzMbGK84lNWzRu+CfBjwzGt4jmnqimLuqp5yE5viHS2vi+QOAnD5FQ==",
|
||||||
|
"dependencies": {
|
||||||
|
"@monaco-editor/loader": "^1.3.3"
|
||||||
|
},
|
||||||
|
"peerDependencies": {
|
||||||
|
"monaco-editor": ">= 0.25.0 < 1",
|
||||||
|
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
|
||||||
|
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
|
"node_modules/@nicolo-ribaudo/eslint-scope-5-internals": {
|
||||||
"version": "5.1.1-v1",
|
"version": "5.1.1-v1",
|
||||||
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
|
"resolved": "https://registry.npmjs.org/@nicolo-ribaudo/eslint-scope-5-internals/-/eslint-scope-5-internals-5.1.1-v1.tgz",
|
||||||
@@ -6667,11 +6705,11 @@
|
|||||||
"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
|
"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
|
||||||
},
|
},
|
||||||
"node_modules/escape-string-regexp": {
|
"node_modules/escape-string-regexp": {
|
||||||
"version": "4.0.0",
|
"version": "5.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz",
|
||||||
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
|
"integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=10"
|
"node": ">=12"
|
||||||
},
|
},
|
||||||
"funding": {
|
"funding": {
|
||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
@@ -7149,6 +7187,18 @@
|
|||||||
"url": "https://opencollective.com/eslint"
|
"url": "https://opencollective.com/eslint"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/eslint/node_modules/escape-string-regexp": {
|
||||||
|
"version": "4.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
|
||||||
|
"integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
|
||||||
|
"dev": true,
|
||||||
|
"engines": {
|
||||||
|
"node": ">=10"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/eslint/node_modules/eslint-scope": {
|
"node_modules/eslint/node_modules/eslint-scope": {
|
||||||
"version": "7.2.0",
|
"version": "7.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.0.tgz",
|
||||||
@@ -8999,6 +9049,11 @@
|
|||||||
"ufo": "^1.1.2"
|
"ufo": "^1.1.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/monaco-editor": {
|
||||||
|
"version": "0.38.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.38.0.tgz",
|
||||||
|
"integrity": "sha512-11Fkh6yzEmwx7O0YoLxeae0qEGFwmyPRlVxpg7oF9czOOCB/iCjdJrG5I67da5WiXK3YJCxoz9TJFE8Tfq/v9A=="
|
||||||
|
},
|
||||||
"node_modules/moo": {
|
"node_modules/moo": {
|
||||||
"version": "0.5.2",
|
"version": "0.5.2",
|
||||||
"resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
|
"resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz",
|
||||||
@@ -11010,6 +11065,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/stampit/-/stampit-4.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/stampit/-/stampit-4.3.2.tgz",
|
||||||
"integrity": "sha512-pE2org1+ZWQBnIxRPrBM2gVupkuDD0TTNIo1H6GdT/vO82NXli2z8lRE8cu/nBIHrcOCXFBAHpb9ZldrB2/qOA=="
|
"integrity": "sha512-pE2org1+ZWQBnIxRPrBM2gVupkuDD0TTNIo1H6GdT/vO82NXli2z8lRE8cu/nBIHrcOCXFBAHpb9ZldrB2/qOA=="
|
||||||
},
|
},
|
||||||
|
"node_modules/state-local": {
|
||||||
|
"version": "1.0.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/state-local/-/state-local-1.0.7.tgz",
|
||||||
|
"integrity": "sha512-HTEHMNieakEnoe33shBYcZ7NX83ACUjCu8c40iOGEZsngj9zRnkqS9j1pqQPXwobB0ZcVTk27REb7COQ0UR59w=="
|
||||||
|
},
|
||||||
"node_modules/std-env": {
|
"node_modules/std-env": {
|
||||||
"version": "3.3.3",
|
"version": "3.3.3",
|
||||||
"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.3.tgz",
|
"resolved": "https://registry.npmjs.org/std-env/-/std-env-3.3.3.tgz",
|
||||||
|
|||||||
@@ -26,10 +26,13 @@
|
|||||||
"@mantine/notifications": "^6.0.11",
|
"@mantine/notifications": "^6.0.11",
|
||||||
"@mantine/spotlight": "^6.0.11",
|
"@mantine/spotlight": "^6.0.11",
|
||||||
"@mantine/styles": "^6.0.11",
|
"@mantine/styles": "^6.0.11",
|
||||||
|
"@monaco-editor/react": "^4.5.1",
|
||||||
"@reduxjs/toolkit": "^1.9.5",
|
"@reduxjs/toolkit": "^1.9.5",
|
||||||
"axios": "^1.4.0",
|
"axios": "^1.4.0",
|
||||||
"dayjs": "^1.11.7",
|
"dayjs": "^1.11.7",
|
||||||
|
"escape-string-regexp": "^5.0.0",
|
||||||
"interweave": "^13.1.0",
|
"interweave": "^13.1.0",
|
||||||
|
"monaco-editor": "^0.38.0",
|
||||||
"mousetrap": "^1.6.5",
|
"mousetrap": "^1.6.5",
|
||||||
"re-resizable": "^6.9.9",
|
"re-resizable": "^6.9.9",
|
||||||
"react": "^18.2.0",
|
"react": "^18.2.0",
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed</artifactId>
|
<artifactId>commafeed</artifactId>
|
||||||
<version>3.7.0</version>
|
<version>3.8.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>commafeed-client</artifactId>
|
<artifactId>commafeed-client</artifactId>
|
||||||
<name>CommaFeed Client</name>
|
<name>CommaFeed Client</name>
|
||||||
|
|||||||
@@ -93,8 +93,8 @@ export const Constants = {
|
|||||||
isBottomVisible: (div: HTMLElement) => div.getBoundingClientRect().bottom <= window.innerHeight,
|
isBottomVisible: (div: HTMLElement) => div.getBoundingClientRect().bottom <= window.innerHeight,
|
||||||
},
|
},
|
||||||
dom: {
|
dom: {
|
||||||
mainScrollAreaId: "main-scroll-area-id",
|
|
||||||
entryId: (entry: Entry) => `entry-id-${entry.id}`,
|
entryId: (entry: Entry) => `entry-id-${entry.id}`,
|
||||||
|
entryContextMenuId: (entry: Entry) => entry.id,
|
||||||
},
|
},
|
||||||
browserExtensionUrl: "https://github.com/Athou/commafeed-browser-extension",
|
browserExtensionUrl: "https://github.com/Athou/commafeed-browser-extension",
|
||||||
bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
|
bitcoinWalletAddress: "1dymfUxqCWpyD7a6rQSqNy4rLVDBsAr5e",
|
||||||
|
|||||||
@@ -45,18 +45,27 @@ const initialState: EntriesState = {
|
|||||||
|
|
||||||
const getEndpoint = (sourceType: EntrySourceType) =>
|
const getEndpoint = (sourceType: EntrySourceType) =>
|
||||||
sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
|
sourceType === "category" || sourceType === "tag" ? client.category.getEntries : client.feed.getEntries
|
||||||
export const loadEntries = createAsyncThunk<Entries, { source: EntrySource; clearSearch: boolean }, { state: RootState }>(
|
export const loadEntries = createAsyncThunk<
|
||||||
"entries/load",
|
Entries,
|
||||||
async (arg, thunkApi) => {
|
{ source: EntrySource; clearSearch: boolean },
|
||||||
if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
|
{
|
||||||
|
state: RootState
|
||||||
const state = thunkApi.getState()
|
|
||||||
const endpoint = getEndpoint(arg.source.type)
|
|
||||||
const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
|
|
||||||
return result.data
|
|
||||||
}
|
}
|
||||||
)
|
>("entries/load", async (arg, thunkApi) => {
|
||||||
export const loadMoreEntries = createAsyncThunk<Entries, void, { state: RootState }>("entries/loadMore", async (_, thunkApi) => {
|
if (arg.clearSearch) thunkApi.dispatch(setSearch(""))
|
||||||
|
|
||||||
|
const state = thunkApi.getState()
|
||||||
|
const endpoint = getEndpoint(arg.source.type)
|
||||||
|
const result = await endpoint(buildGetEntriesPaginatedRequest(state, arg.source, 0))
|
||||||
|
return result.data
|
||||||
|
})
|
||||||
|
export const loadMoreEntries = createAsyncThunk<
|
||||||
|
Entries,
|
||||||
|
void,
|
||||||
|
{
|
||||||
|
state: RootState
|
||||||
|
}
|
||||||
|
>("entries/loadMore", async (_, thunkApi) => {
|
||||||
const state = thunkApi.getState()
|
const state = thunkApi.getState()
|
||||||
const { source } = state.entries
|
const { source } = state.entries
|
||||||
const offset =
|
const offset =
|
||||||
@@ -74,7 +83,13 @@ const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource,
|
|||||||
tag: source.type === "tag" ? source.id : undefined,
|
tag: source.type === "tag" ? source.id : undefined,
|
||||||
keywords: state.entries.search,
|
keywords: state.entries.search,
|
||||||
})
|
})
|
||||||
export const reloadEntries = createAsyncThunk<void, void, { state: RootState }>("entries/reload", async (arg, thunkApi) => {
|
export const reloadEntries = createAsyncThunk<
|
||||||
|
void,
|
||||||
|
void,
|
||||||
|
{
|
||||||
|
state: RootState
|
||||||
|
}
|
||||||
|
>("entries/reload", async (arg, thunkApi) => {
|
||||||
const state = thunkApi.getState()
|
const state = thunkApi.getState()
|
||||||
thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
|
thunkApi.dispatch(loadEntries({ source: state.entries.source, clearSearch: false }))
|
||||||
})
|
})
|
||||||
@@ -123,15 +138,18 @@ export const markEntriesUpToEntry = createAsyncThunk<void, Entry, { state: RootS
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
export const markAllEntries = createAsyncThunk<void, { sourceType: EntrySourceType; req: MarkRequest }, { state: RootState }>(
|
export const markAllEntries = createAsyncThunk<
|
||||||
"entries/entry/markAll",
|
void,
|
||||||
async (arg, thunkApi) => {
|
{ sourceType: EntrySourceType; req: MarkRequest },
|
||||||
const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
|
{
|
||||||
await endpoint(arg.req)
|
state: RootState
|
||||||
thunkApi.dispatch(reloadEntries())
|
|
||||||
thunkApi.dispatch(reloadTree())
|
|
||||||
}
|
}
|
||||||
)
|
>("entries/entry/markAll", async (arg, thunkApi) => {
|
||||||
|
const endpoint = arg.sourceType === "category" ? client.category.markEntries : client.feed.markEntries
|
||||||
|
await endpoint(arg.req)
|
||||||
|
thunkApi.dispatch(reloadEntries())
|
||||||
|
thunkApi.dispatch(reloadTree())
|
||||||
|
})
|
||||||
export const starEntry = createAsyncThunk("entries/entry/star", (arg: { entry: Entry; starred: boolean }) => {
|
export const starEntry = createAsyncThunk("entries/entry/star", (arg: { entry: Entry; starred: boolean }) => {
|
||||||
client.entry.star({
|
client.entry.star({
|
||||||
id: arg.entry.id,
|
id: arg.entry.id,
|
||||||
@@ -175,31 +193,25 @@ export const selectEntry = createAsyncThunk<
|
|||||||
if (arg.scrollToEntry) {
|
if (arg.scrollToEntry) {
|
||||||
const entryElement = document.getElementById(Constants.dom.entryId(entry))
|
const entryElement = document.getElementById(Constants.dom.entryId(entry))
|
||||||
if (entryElement) {
|
if (entryElement) {
|
||||||
const scrollSpeed = state.user.settings?.scrollSpeed
|
const alwaysScrollToEntry = state.user.settings?.alwaysScrollToEntry
|
||||||
thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
|
const entryEntirelyVisible = Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)
|
||||||
scrollToEntry(entryElement, scrollSpeed, () => thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false)))
|
if (alwaysScrollToEntry || !entryEntirelyVisible) {
|
||||||
|
const scrollSpeed = state.user.settings?.scrollSpeed
|
||||||
|
thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(true))
|
||||||
|
scrollToEntry(entryElement, scrollSpeed, () => thunkApi.dispatch(entriesSlice.actions.setScrollingToEntry(false)))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
const scrollToEntry = (entryElement: HTMLElement, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
|
const scrollToEntry = (entryElement: HTMLElement, scrollSpeed: number | undefined, onScrollEnded: () => void) => {
|
||||||
// the entry is entirely visible, no need to scroll
|
scrollToWithCallback({
|
||||||
if (Constants.layout.isTopVisible(entryElement) && Constants.layout.isBottomVisible(entryElement)) {
|
options: {
|
||||||
onScrollEnded()
|
// add a small gap between the top of the content and the top of the page
|
||||||
return
|
top: entryElement.offsetTop - Constants.layout.headerHeight - 3,
|
||||||
}
|
behavior: scrollSpeed && scrollSpeed > 0 ? "smooth" : "auto",
|
||||||
|
},
|
||||||
const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
|
onScrollEnded,
|
||||||
if (scrollArea) {
|
})
|
||||||
scrollToWithCallback({
|
|
||||||
element: scrollArea,
|
|
||||||
options: {
|
|
||||||
// add a small gap between the top of the content and the top of the page
|
|
||||||
top: entryElement.offsetTop - 3,
|
|
||||||
behavior: scrollSpeed && scrollSpeed > 0 ? "smooth" : "auto",
|
|
||||||
},
|
|
||||||
onScrollEnded,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export const selectPreviousEntry = createAsyncThunk<
|
export const selectPreviousEntry = createAsyncThunk<
|
||||||
@@ -248,7 +260,13 @@ export const selectNextEntry = createAsyncThunk<
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
export const tagEntry = createAsyncThunk<void, TagRequest, { state: RootState }>("entries/entry/tag", async (arg, thunkApi) => {
|
export const tagEntry = createAsyncThunk<
|
||||||
|
void,
|
||||||
|
TagRequest,
|
||||||
|
{
|
||||||
|
state: RootState
|
||||||
|
}
|
||||||
|
>("entries/entry/tag", async (arg, thunkApi) => {
|
||||||
await client.entry.tag(arg)
|
await client.entry.tag(arg)
|
||||||
thunkApi.dispatch(reloadTags())
|
thunkApi.dispatch(reloadTags())
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -80,6 +80,17 @@ export const changeScrollMarks = createAsyncThunk<
|
|||||||
if (!settings) return
|
if (!settings) return
|
||||||
client.user.saveSettings({ ...settings, scrollMarks })
|
client.user.saveSettings({ ...settings, scrollMarks })
|
||||||
})
|
})
|
||||||
|
export const changeAlwaysScrollToEntry = createAsyncThunk<
|
||||||
|
void,
|
||||||
|
boolean,
|
||||||
|
{
|
||||||
|
state: RootState
|
||||||
|
}
|
||||||
|
>("settings/alwaysScrollToEntry", (alwaysScrollToEntry, thunkApi) => {
|
||||||
|
const { settings } = thunkApi.getState().user
|
||||||
|
if (!settings) return
|
||||||
|
client.user.saveSettings({ ...settings, alwaysScrollToEntry })
|
||||||
|
})
|
||||||
export const changeSharingSetting = createAsyncThunk<
|
export const changeSharingSetting = createAsyncThunk<
|
||||||
void,
|
void,
|
||||||
{ site: keyof SharingSettings; value: boolean },
|
{ site: keyof SharingSettings; value: boolean },
|
||||||
@@ -136,6 +147,10 @@ export const userSlice = createSlice({
|
|||||||
if (!state.settings) return
|
if (!state.settings) return
|
||||||
state.settings.scrollMarks = action.meta.arg
|
state.settings.scrollMarks = action.meta.arg
|
||||||
})
|
})
|
||||||
|
builder.addCase(changeAlwaysScrollToEntry.pending, (state, action) => {
|
||||||
|
if (!state.settings) return
|
||||||
|
state.settings.alwaysScrollToEntry = action.meta.arg
|
||||||
|
})
|
||||||
builder.addCase(changeSharingSetting.pending, (state, action) => {
|
builder.addCase(changeSharingSetting.pending, (state, action) => {
|
||||||
if (!state.settings) return
|
if (!state.settings) return
|
||||||
state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
|
state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
|
||||||
@@ -146,6 +161,7 @@ export const userSlice = createSlice({
|
|||||||
changeScrollSpeed.fulfilled,
|
changeScrollSpeed.fulfilled,
|
||||||
changeShowRead.fulfilled,
|
changeShowRead.fulfilled,
|
||||||
changeScrollMarks.fulfilled,
|
changeScrollMarks.fulfilled,
|
||||||
|
changeAlwaysScrollToEntry.fulfilled,
|
||||||
changeSharingSetting.fulfilled
|
changeSharingSetting.fulfilled
|
||||||
),
|
),
|
||||||
() => {
|
() => {
|
||||||
|
|||||||
@@ -233,6 +233,7 @@ export interface Settings {
|
|||||||
customCss?: string
|
customCss?: string
|
||||||
customJs?: string
|
customJs?: string
|
||||||
scrollSpeed: number
|
scrollSpeed: number
|
||||||
|
alwaysScrollToEntry: boolean
|
||||||
sharingSettings: SharingSettings
|
sharingSettings: SharingSettings
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import { throttle } from "throttle-debounce"
|
||||||
import { Category } from "./types"
|
import { Category } from "./types"
|
||||||
|
|
||||||
export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
|
export function visitCategoryTree(category: Category, visitor: (category: Category) => void): void {
|
||||||
@@ -26,30 +27,21 @@ export const calculatePlaceholderSize = ({ width, height, maxWidth }: { width?:
|
|||||||
return { width: placeholderWidth, height: placeholderHeight }
|
return { width: placeholderWidth, height: placeholderHeight }
|
||||||
}
|
}
|
||||||
|
|
||||||
export const scrollToWithCallback = ({
|
export const scrollToWithCallback = ({ options, onScrollEnded }: { options: ScrollToOptions; onScrollEnded: () => void }) => {
|
||||||
element,
|
|
||||||
options,
|
|
||||||
onScrollEnded,
|
|
||||||
}: {
|
|
||||||
element: HTMLElement
|
|
||||||
options: ScrollToOptions
|
|
||||||
onScrollEnded: () => void
|
|
||||||
}) => {
|
|
||||||
const offset = (options.top ?? 0).toFixed()
|
const offset = (options.top ?? 0).toFixed()
|
||||||
|
|
||||||
const onScroll = () => {
|
const onScroll = throttle(100, () => {
|
||||||
if (element.offsetTop.toFixed() === offset) {
|
if (window.scrollY.toFixed() === offset) {
|
||||||
element.removeEventListener("scroll", onScroll)
|
window.removeEventListener("scroll", onScroll)
|
||||||
onScrollEnded()
|
onScrollEnded()
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
|
window.addEventListener("scroll", onScroll)
|
||||||
element.addEventListener("scroll", onScroll)
|
|
||||||
|
|
||||||
// scrollTo does not trigger if there's nothing to do, trigger it manually
|
// scrollTo does not trigger if there's nothing to do, trigger it manually
|
||||||
onScroll()
|
onScroll()
|
||||||
|
|
||||||
element.scrollTo(options)
|
window.scrollTo(options)
|
||||||
}
|
}
|
||||||
|
|
||||||
export const truncate = (str: string, n: number) => (str.length > n ? `${str.slice(0, n - 1)}\u2026` : str)
|
export const truncate = (str: string, n: number) => (str.length > n ? `${str.slice(0, n - 1)}\u2026` : str)
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import { ActionIcon, Button, Tooltip, useMantineTheme } from "@mantine/core"
|
import { ActionIcon, Button, Tooltip, useMantineTheme } from "@mantine/core"
|
||||||
import { ActionIconProps } from "@mantine/core/lib/ActionIcon/ActionIcon"
|
import { ActionIconProps } from "@mantine/core/lib/ActionIcon/ActionIcon"
|
||||||
import { ButtonProps } from "@mantine/core/lib/Button/Button"
|
import { ButtonProps } from "@mantine/core/lib/Button/Button"
|
||||||
import { useMediaQuery } from "@mantine/hooks"
|
import { useActionButton } from "hooks/useActionButton"
|
||||||
import { forwardRef, MouseEventHandler, ReactNode } from "react"
|
import { forwardRef, MouseEventHandler, ReactNode } from "react"
|
||||||
|
|
||||||
interface ActionButtonProps {
|
interface ActionButtonProps {
|
||||||
@@ -18,9 +18,9 @@ interface ActionButtonProps {
|
|||||||
* Switches between Button with label (desktop) and ActionIcon (mobile)
|
* Switches between Button with label (desktop) and ActionIcon (mobile)
|
||||||
*/
|
*/
|
||||||
export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
|
export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
|
||||||
|
const { mobile } = useActionButton()
|
||||||
const theme = useMantineTheme()
|
const theme = useMantineTheme()
|
||||||
const variant = props.variant ?? "subtle"
|
const variant = props.variant ?? "subtle"
|
||||||
const mobile = !useMediaQuery(`(min-width: ${theme.breakpoints.lg})`)
|
|
||||||
const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop)
|
const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop)
|
||||||
return iconOnly ? (
|
return iconOnly ? (
|
||||||
<Tooltip label={props.label} openDelay={500}>
|
<Tooltip label={props.label} openDelay={500}>
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
import { Group } from "@mantine/core"
|
|
||||||
|
|
||||||
export function ButtonToolbar(props: { children: React.ReactNode }) {
|
|
||||||
return <Group spacing={14}>{props.children}</Group>
|
|
||||||
}
|
|
||||||
@@ -13,7 +13,7 @@ export function RelativeDate(props: { date: Date | number | undefined }) {
|
|||||||
if (!props.date) return <Trans>N/A</Trans>
|
if (!props.date) return <Trans>N/A</Trans>
|
||||||
const date = dayjs(props.date)
|
const date = dayjs(props.date)
|
||||||
return (
|
return (
|
||||||
<Tooltip label={date.toString()} openDelay={500}>
|
<Tooltip label={date.toDate().toLocaleString()} openDelay={500}>
|
||||||
<span>{date.from(dayjs(now))}</span>
|
<span>{date.from(dayjs(now))}</span>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
)
|
)
|
||||||
|
|||||||
36
commafeed-client/src/components/code/CodeEditor.tsx
Normal file
36
commafeed-client/src/components/code/CodeEditor.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
import { Input, Textarea } from "@mantine/core"
|
||||||
|
import RichCodeEditor from "components/code/RichCodeEditor"
|
||||||
|
import { useMobile } from "hooks/useMobile"
|
||||||
|
import { ReactNode } from "react"
|
||||||
|
|
||||||
|
interface CodeEditorProps {
|
||||||
|
description?: ReactNode
|
||||||
|
language: "css" | "javascript"
|
||||||
|
value: string
|
||||||
|
onChange: (value: string | undefined) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
export function CodeEditor(props: CodeEditorProps) {
|
||||||
|
const mobile = useMobile()
|
||||||
|
|
||||||
|
return mobile ? (
|
||||||
|
// monaco mobile support is poor, fallback to textarea
|
||||||
|
<Textarea
|
||||||
|
autosize
|
||||||
|
minRows={4}
|
||||||
|
maxRows={15}
|
||||||
|
description={props.description}
|
||||||
|
styles={{
|
||||||
|
input: {
|
||||||
|
fontFamily: "monospace",
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
value={props.value}
|
||||||
|
onChange={e => props.onChange(e.currentTarget.value)}
|
||||||
|
/>
|
||||||
|
) : (
|
||||||
|
<Input.Wrapper description={props.description}>
|
||||||
|
<RichCodeEditor height="30vh" language={props.language} value={props.value} onChange={props.onChange} />
|
||||||
|
</Input.Wrapper>
|
||||||
|
)
|
||||||
|
}
|
||||||
52
commafeed-client/src/components/code/RichCodeEditor.tsx
Normal file
52
commafeed-client/src/components/code/RichCodeEditor.tsx
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
import { useMantineTheme } from "@mantine/core"
|
||||||
|
import { Loader } from "components/Loader"
|
||||||
|
import { useAsync } from "react-async-hook"
|
||||||
|
|
||||||
|
const init = async () => {
|
||||||
|
window.MonacoEnvironment = {
|
||||||
|
async getWorker(_, label) {
|
||||||
|
let worker
|
||||||
|
if (label === "css") {
|
||||||
|
worker = await import("monaco-editor/esm/vs/language/css/css.worker?worker")
|
||||||
|
} else if (label === "javascript") {
|
||||||
|
worker = await import("monaco-editor/esm/vs/language/typescript/ts.worker?worker")
|
||||||
|
} else {
|
||||||
|
worker = await import("monaco-editor/esm/vs/editor/editor.worker?worker")
|
||||||
|
}
|
||||||
|
// eslint-disable-next-line new-cap
|
||||||
|
return new worker.default()
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
const monacoReact = await import("@monaco-editor/react")
|
||||||
|
const monaco = await import("monaco-editor")
|
||||||
|
monacoReact.loader.config({ monaco })
|
||||||
|
return monacoReact.Editor
|
||||||
|
}
|
||||||
|
|
||||||
|
interface RichCodeEditorProps {
|
||||||
|
height: number | string
|
||||||
|
language: "css" | "javascript"
|
||||||
|
value: string
|
||||||
|
onChange: (value: string | undefined) => void
|
||||||
|
}
|
||||||
|
|
||||||
|
function RichCodeEditor(props: RichCodeEditorProps) {
|
||||||
|
const theme = useMantineTheme()
|
||||||
|
const editorTheme = theme.colorScheme === "dark" ? "vs-dark" : "light"
|
||||||
|
|
||||||
|
const { result: Editor } = useAsync(init, [])
|
||||||
|
if (!Editor) return <Loader />
|
||||||
|
return (
|
||||||
|
<Editor
|
||||||
|
height={props.height}
|
||||||
|
defaultLanguage={props.language}
|
||||||
|
theme={editorTheme}
|
||||||
|
options={{ minimap: { enabled: false } }}
|
||||||
|
value={props.value}
|
||||||
|
onChange={props.onChange}
|
||||||
|
/>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
export default RichCodeEditor
|
||||||
@@ -1,12 +1,14 @@
|
|||||||
import { Box, createStyles, Mark, TypographyStylesProvider } from "@mantine/core"
|
import { Box, createStyles, Mark, TypographyStylesProvider } from "@mantine/core"
|
||||||
import { Constants } from "app/constants"
|
import { Constants } from "app/constants"
|
||||||
import { useAppSelector } from "app/store"
|
|
||||||
import { calculatePlaceholderSize } from "app/utils"
|
import { calculatePlaceholderSize } from "app/utils"
|
||||||
import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
|
import { ImageWithPlaceholderWhileLoading } from "components/ImageWithPlaceholderWhileLoading"
|
||||||
|
import escapeStringRegexp from "escape-string-regexp"
|
||||||
import { ChildrenNode, Interweave, Matcher, MatchResponse, Node, TransformCallback } from "interweave"
|
import { ChildrenNode, Interweave, Matcher, MatchResponse, Node, TransformCallback } from "interweave"
|
||||||
|
import React from "react"
|
||||||
|
|
||||||
export interface ContentProps {
|
export interface ContentProps {
|
||||||
content: string
|
content: string
|
||||||
|
highlight?: string
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStyles = createStyles(theme => ({
|
const useStyles = createStyles(theme => ({
|
||||||
@@ -63,7 +65,7 @@ class HighlightMatcher extends Matcher {
|
|||||||
|
|
||||||
constructor(search: string) {
|
constructor(search: string) {
|
||||||
super("highlight")
|
super("highlight")
|
||||||
this.search = search
|
this.search = escapeStringRegexp(search)
|
||||||
}
|
}
|
||||||
|
|
||||||
match(string: string): MatchResponse<unknown> | null {
|
match(string: string): MatchResponse<unknown> | null {
|
||||||
@@ -82,10 +84,10 @@ class HighlightMatcher extends Matcher {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Content(props: ContentProps) {
|
// memoize component because Interweave is costly
|
||||||
|
const Content = React.memo((props: ContentProps) => {
|
||||||
const { classes } = useStyles()
|
const { classes } = useStyles()
|
||||||
const search = useAppSelector(state => state.entries.search)
|
const matchers = props.highlight ? [new HighlightMatcher(props.highlight)] : []
|
||||||
const matchers = search ? [new HighlightMatcher(search)] : []
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<TypographyStylesProvider>
|
<TypographyStylesProvider>
|
||||||
@@ -94,4 +96,6 @@ export function Content(props: ContentProps) {
|
|||||||
</Box>
|
</Box>
|
||||||
</TypographyStylesProvider>
|
</TypographyStylesProvider>
|
||||||
)
|
)
|
||||||
}
|
})
|
||||||
|
|
||||||
|
export { Content }
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ import { useBrowserExtension } from "hooks/useBrowserExtension"
|
|||||||
import { useMousetrap } from "hooks/useMousetrap"
|
import { useMousetrap } from "hooks/useMousetrap"
|
||||||
import { useViewMode } from "hooks/useViewMode"
|
import { useViewMode } from "hooks/useViewMode"
|
||||||
import { useEffect } from "react"
|
import { useEffect } from "react"
|
||||||
|
import { useContextMenu } from "react-contexify"
|
||||||
import InfiniteScroll from "react-infinite-scroller"
|
import InfiniteScroll from "react-infinite-scroller"
|
||||||
import { throttle } from "throttle-debounce"
|
import { throttle } from "throttle-debounce"
|
||||||
import { FeedEntry } from "./FeedEntry"
|
import { FeedEntry } from "./FeedEntry"
|
||||||
@@ -59,10 +60,38 @@ export function FeedEntries() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
useEffect(() => {
|
const contextMenu = useContextMenu()
|
||||||
const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
|
const headerRightClicked = (entry: ExpendableEntry, event: React.MouseEvent) => {
|
||||||
|
event.preventDefault()
|
||||||
|
contextMenu.show({
|
||||||
|
id: Constants.dom.entryContextMenuId(entry),
|
||||||
|
event,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
const listener = () => {
|
const bodyClicked = (entry: ExpendableEntry) => {
|
||||||
|
if (viewMode !== "expanded") return
|
||||||
|
dispatch(
|
||||||
|
selectEntry({
|
||||||
|
entry,
|
||||||
|
expand: true,
|
||||||
|
markAsRead: true,
|
||||||
|
scrollToEntry: true,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
const swipedRight = (entry: ExpendableEntry) => dispatch(markEntry({ entry, read: !entry.read }))
|
||||||
|
|
||||||
|
// close context menu on scroll
|
||||||
|
useEffect(() => {
|
||||||
|
const listener = throttle(100, () => contextMenu.hideAll())
|
||||||
|
window.addEventListener("scroll", listener)
|
||||||
|
return () => window.removeEventListener("scroll", listener)
|
||||||
|
}, [contextMenu])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const listener = throttle(100, () => {
|
||||||
if (viewMode !== "expanded") return
|
if (viewMode !== "expanded") return
|
||||||
if (scrollingToEntry) return
|
if (scrollingToEntry) return
|
||||||
|
|
||||||
@@ -84,11 +113,10 @@ export function FeedEntries() {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
const throttledListener = throttle(100, listener)
|
window.addEventListener("scroll", listener)
|
||||||
scrollArea?.addEventListener("scroll", throttledListener)
|
return () => window.removeEventListener("scroll", listener)
|
||||||
return () => scrollArea?.removeEventListener("scroll", throttledListener)
|
}, [dispatch, contextMenu, entries, viewMode, scrollMarks, scrollingToEntry])
|
||||||
}, [dispatch, entries, viewMode, scrollMarks, scrollingToEntry])
|
|
||||||
|
|
||||||
useMousetrap("r", () => dispatch(reloadEntries()))
|
useMousetrap("r", () => dispatch(reloadEntries()))
|
||||||
useMousetrap("j", () =>
|
useMousetrap("j", () =>
|
||||||
@@ -140,9 +168,8 @@ export function FeedEntries() {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
|
window.scrollTo({
|
||||||
scrollArea?.scrollTo({
|
top: window.scrollY + document.documentElement.clientHeight * 0.8,
|
||||||
top: scrollArea.scrollTop + scrollArea.clientHeight * 0.8,
|
|
||||||
behavior: "smooth",
|
behavior: "smooth",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -179,9 +206,8 @@ export function FeedEntries() {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
|
window.scrollTo({
|
||||||
scrollArea?.scrollTo({
|
top: window.scrollY - document.documentElement.clientHeight * 0.8,
|
||||||
top: scrollArea.scrollTop - scrollArea.clientHeight * 0.8,
|
|
||||||
behavior: "smooth",
|
behavior: "smooth",
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -253,8 +279,6 @@ export function FeedEntries() {
|
|||||||
loadMore={() => dispatch(loadMoreEntries())}
|
loadMore={() => dispatch(loadMoreEntries())}
|
||||||
hasMore={hasMore}
|
hasMore={hasMore}
|
||||||
loader={<Loader key={0} />}
|
loader={<Loader key={0} />}
|
||||||
useWindow={false}
|
|
||||||
getScrollParent={() => document.getElementById(Constants.dom.mainScrollAreaId)}
|
|
||||||
>
|
>
|
||||||
{entries.map(entry => (
|
{entries.map(entry => (
|
||||||
<div
|
<div
|
||||||
@@ -270,6 +294,9 @@ export function FeedEntries() {
|
|||||||
showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")}
|
showSelectionIndicator={entry.id === selectedEntryId && (!entry.expanded || viewMode === "expanded")}
|
||||||
maxWidth={sidebarVisible ? Constants.layout.entryMaxWidth : undefined}
|
maxWidth={sidebarVisible ? Constants.layout.entryMaxWidth : undefined}
|
||||||
onHeaderClick={event => headerClicked(entry, event)}
|
onHeaderClick={event => headerClicked(entry, event)}
|
||||||
|
onHeaderRightClick={event => headerRightClicked(entry, event)}
|
||||||
|
onBodyClick={() => bodyClicked(entry)}
|
||||||
|
onSwipedRight={() => swipedRight(entry)}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -1,15 +1,13 @@
|
|||||||
import { Box, createStyles, Divider, Paper } from "@mantine/core"
|
import { Box, createStyles, Divider, Paper } from "@mantine/core"
|
||||||
import { MantineNumberSize } from "@mantine/styles"
|
import { MantineNumberSize } from "@mantine/styles"
|
||||||
import { Constants } from "app/constants"
|
import { Constants } from "app/constants"
|
||||||
import { markEntry } from "app/slices/entries"
|
|
||||||
import { useAppDispatch } from "app/store"
|
|
||||||
import { Entry, ViewMode } from "app/types"
|
import { Entry, ViewMode } from "app/types"
|
||||||
import { useViewMode } from "hooks/useViewMode"
|
import { useViewMode } from "hooks/useViewMode"
|
||||||
import React from "react"
|
import React from "react"
|
||||||
import { useSwipeable } from "react-swipeable"
|
import { useSwipeable } from "react-swipeable"
|
||||||
import { FeedEntryBody } from "./FeedEntryBody"
|
import { FeedEntryBody } from "./FeedEntryBody"
|
||||||
import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
|
import { FeedEntryCompactHeader } from "./FeedEntryCompactHeader"
|
||||||
import { FeedEntryContextMenu, useFeedEntryContextMenu } from "./FeedEntryContextMenu"
|
import { FeedEntryContextMenu } from "./FeedEntryContextMenu"
|
||||||
import { FeedEntryFooter } from "./FeedEntryFooter"
|
import { FeedEntryFooter } from "./FeedEntryFooter"
|
||||||
import { FeedEntryHeader } from "./FeedEntryHeader"
|
import { FeedEntryHeader } from "./FeedEntryHeader"
|
||||||
|
|
||||||
@@ -20,6 +18,9 @@ interface FeedEntryProps {
|
|||||||
showSelectionIndicator: boolean
|
showSelectionIndicator: boolean
|
||||||
maxWidth?: number
|
maxWidth?: number
|
||||||
onHeaderClick: (e: React.MouseEvent) => void
|
onHeaderClick: (e: React.MouseEvent) => void
|
||||||
|
onHeaderRightClick: (e: React.MouseEvent) => void
|
||||||
|
onBodyClick: (e: React.MouseEvent) => void
|
||||||
|
onSwipedRight: () => void
|
||||||
}
|
}
|
||||||
|
|
||||||
const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: ViewMode }) => {
|
const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: ViewMode }) => {
|
||||||
@@ -49,9 +50,16 @@ const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: View
|
|||||||
backgroundHoverColor = theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
|
backgroundHoverColor = theme.colorScheme === "dark" ? theme.colors.dark[6] : theme.colors.gray[1]
|
||||||
}
|
}
|
||||||
|
|
||||||
const styles = {
|
let paperBorderLeftColor
|
||||||
|
if (props.showSelectionIndicator) {
|
||||||
|
const borderLeftColor = theme.colorScheme === "dark" ? theme.colors.orange[4] : theme.colors.orange[6]
|
||||||
|
paperBorderLeftColor = `${borderLeftColor} !important`
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
paper: {
|
paper: {
|
||||||
backgroundColor,
|
backgroundColor,
|
||||||
|
borderLeftColor: paperBorderLeftColor,
|
||||||
marginTop: marginY,
|
marginTop: marginY,
|
||||||
marginBottom: marginY,
|
marginBottom: marginY,
|
||||||
[theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
|
[theme.fn.smallerThan(Constants.layout.mobileBreakpoint)]: {
|
||||||
@@ -69,30 +77,20 @@ const useStyles = createStyles((theme, props: FeedEntryProps & { viewMode?: View
|
|||||||
textDecoration: "none",
|
textDecoration: "none",
|
||||||
},
|
},
|
||||||
body: {
|
body: {
|
||||||
|
direction: props.entry.rtl ? "rtl" : "ltr",
|
||||||
maxWidth: props.maxWidth ?? "100%",
|
maxWidth: props.maxWidth ?? "100%",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
if (props.showSelectionIndicator) {
|
|
||||||
const borderLeftColor = theme.colorScheme === "dark" ? theme.colors.orange[4] : theme.colors.orange[6]
|
|
||||||
styles.paper.borderLeftColor = `${borderLeftColor} !important`
|
|
||||||
}
|
|
||||||
|
|
||||||
return styles
|
|
||||||
})
|
})
|
||||||
|
|
||||||
export function FeedEntry(props: FeedEntryProps) {
|
export function FeedEntry(props: FeedEntryProps) {
|
||||||
const { viewMode } = useViewMode()
|
const { viewMode } = useViewMode()
|
||||||
const { classes, cx } = useStyles({ ...props, viewMode })
|
const { classes, cx } = useStyles({ ...props, viewMode })
|
||||||
|
|
||||||
const dispatch = useAppDispatch()
|
|
||||||
|
|
||||||
const swipeHandlers = useSwipeable({
|
const swipeHandlers = useSwipeable({
|
||||||
onSwipedRight: () => dispatch(markEntry({ entry: props.entry, read: !props.entry.read })),
|
onSwipedRight: props.onSwipedRight,
|
||||||
})
|
})
|
||||||
|
|
||||||
const { onContextMenu } = useFeedEntryContextMenu(props.entry)
|
|
||||||
|
|
||||||
let paddingX: MantineNumberSize = "xs"
|
let paddingX: MantineNumberSize = "xs"
|
||||||
if (viewMode === "title" || viewMode === "cozy") paddingX = 6
|
if (viewMode === "title" || viewMode === "cozy") paddingX = 6
|
||||||
|
|
||||||
@@ -130,7 +128,7 @@ export function FeedEntry(props: FeedEntryProps) {
|
|||||||
rel="noreferrer"
|
rel="noreferrer"
|
||||||
onClick={props.onHeaderClick}
|
onClick={props.onHeaderClick}
|
||||||
onAuxClick={props.onHeaderClick}
|
onAuxClick={props.onHeaderClick}
|
||||||
onContextMenu={onContextMenu}
|
onContextMenu={props.onHeaderRightClick}
|
||||||
>
|
>
|
||||||
<Box px={paddingX} py={paddingY} {...swipeHandlers}>
|
<Box px={paddingX} py={paddingY} {...swipeHandlers}>
|
||||||
{compactHeader && <FeedEntryCompactHeader entry={props.entry} />}
|
{compactHeader && <FeedEntryCompactHeader entry={props.entry} />}
|
||||||
@@ -138,8 +136,8 @@ export function FeedEntry(props: FeedEntryProps) {
|
|||||||
</Box>
|
</Box>
|
||||||
</a>
|
</a>
|
||||||
{props.expanded && (
|
{props.expanded && (
|
||||||
<Box px={paddingX} pb={paddingY}>
|
<Box px={paddingX} pb={paddingY} onClick={props.onBodyClick}>
|
||||||
<Box className={classes.body} sx={{ direction: props.entry.rtl ? "rtl" : "ltr" }}>
|
<Box className={classes.body}>
|
||||||
<FeedEntryBody entry={props.entry} />
|
<FeedEntryBody entry={props.entry} />
|
||||||
</Box>
|
</Box>
|
||||||
<Divider variant="dashed" my={paddingY} />
|
<Divider variant="dashed" my={paddingY} />
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Box } from "@mantine/core"
|
import { Box } from "@mantine/core"
|
||||||
|
import { useAppSelector } from "app/store"
|
||||||
import { Entry } from "app/types"
|
import { Entry } from "app/types"
|
||||||
import { Content } from "./Content"
|
import { Content } from "./Content"
|
||||||
import { Enclosure } from "./Enclosure"
|
import { Enclosure } from "./Enclosure"
|
||||||
@@ -9,10 +10,11 @@ export interface FeedEntryBodyProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function FeedEntryBody(props: FeedEntryBodyProps) {
|
export function FeedEntryBody(props: FeedEntryBodyProps) {
|
||||||
|
const search = useAppSelector(state => state.entries.search)
|
||||||
return (
|
return (
|
||||||
<Box>
|
<Box>
|
||||||
<Box>
|
<Box>
|
||||||
<Content content={props.entry.content} />
|
<Content content={props.entry.content} highlight={search} />
|
||||||
</Box>
|
</Box>
|
||||||
{props.entry.enclosureType && props.entry.enclosureUrl && (
|
{props.entry.enclosureType && props.entry.enclosureUrl && (
|
||||||
<Box pt="md">
|
<Box pt="md">
|
||||||
|
|||||||
@@ -7,10 +7,8 @@ import { useAppDispatch, useAppSelector } from "app/store"
|
|||||||
import { Entry } from "app/types"
|
import { Entry } from "app/types"
|
||||||
import { truncate } from "app/utils"
|
import { truncate } from "app/utils"
|
||||||
import { useBrowserExtension } from "hooks/useBrowserExtension"
|
import { useBrowserExtension } from "hooks/useBrowserExtension"
|
||||||
import { useEffect } from "react"
|
import { Item, Menu, Separator } from "react-contexify"
|
||||||
import { Item, Menu, Separator, useContextMenu } from "react-contexify"
|
|
||||||
import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbRss, TbStar, TbStarOff } from "react-icons/tb"
|
import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbRss, TbStar, TbStarOff } from "react-icons/tb"
|
||||||
import { throttle } from "throttle-debounce"
|
|
||||||
|
|
||||||
interface FeedEntryContextMenuProps {
|
interface FeedEntryContextMenuProps {
|
||||||
entry: Entry
|
entry: Entry
|
||||||
@@ -29,8 +27,6 @@ const useStyles = createStyles(theme => ({
|
|||||||
},
|
},
|
||||||
}))
|
}))
|
||||||
|
|
||||||
const menuId = (entry: Entry) => entry.id
|
|
||||||
|
|
||||||
export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
|
export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
|
||||||
const { classes, theme } = useStyles()
|
const { classes, theme } = useStyles()
|
||||||
const sourceType = useAppSelector(state => state.entries.source.type)
|
const sourceType = useAppSelector(state => state.entries.source.type)
|
||||||
@@ -38,7 +34,7 @@ export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
|
|||||||
const { openLinkInBackgroundTab } = useBrowserExtension()
|
const { openLinkInBackgroundTab } = useBrowserExtension()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu id={menuId(props.entry)} theme={theme.colorScheme} animation={false} className={classes.menu}>
|
<Menu id={Constants.dom.entryContextMenuId(props.entry)} theme={theme.colorScheme} animation={false} className={classes.menu}>
|
||||||
<Item
|
<Item
|
||||||
onClick={() => {
|
onClick={() => {
|
||||||
window.open(props.entry.url, "_blank", "noreferrer")
|
window.open(props.entry.url, "_blank", "noreferrer")
|
||||||
@@ -102,29 +98,3 @@ export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
|
|||||||
</Menu>
|
</Menu>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function useFeedEntryContextMenu(entry: Entry) {
|
|
||||||
const contextMenu = useContextMenu({
|
|
||||||
id: menuId(entry),
|
|
||||||
})
|
|
||||||
|
|
||||||
const onContextMenu = (event: React.MouseEvent) => {
|
|
||||||
event.preventDefault()
|
|
||||||
contextMenu.show({
|
|
||||||
event,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
// close context menu on scroll
|
|
||||||
useEffect(() => {
|
|
||||||
const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
|
|
||||||
|
|
||||||
const listener = () => contextMenu.hideAll()
|
|
||||||
const throttledListener = throttle(100, listener)
|
|
||||||
|
|
||||||
scrollArea?.addEventListener("scroll", throttledListener)
|
|
||||||
return () => scrollArea?.removeEventListener("scroll", throttledListener)
|
|
||||||
}, [contextMenu])
|
|
||||||
|
|
||||||
return { onContextMenu }
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,15 +1,12 @@
|
|||||||
import { t, Trans } from "@lingui/macro"
|
import { t, Trans } from "@lingui/macro"
|
||||||
import { Group, Indicator, MultiSelect, Popover } from "@mantine/core"
|
import { Group, Indicator, MultiSelect, Popover } from "@mantine/core"
|
||||||
import { useMediaQuery } from "@mantine/hooks"
|
|
||||||
import { Constants } from "app/constants"
|
|
||||||
import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/slices/entries"
|
import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/slices/entries"
|
||||||
import { useAppDispatch, useAppSelector } from "app/store"
|
import { useAppDispatch, useAppSelector } from "app/store"
|
||||||
import { Entry } from "app/types"
|
import { Entry } from "app/types"
|
||||||
import { ActionButton } from "components/ActionButtton"
|
import { ActionButton } from "components/ActionButton"
|
||||||
import { ButtonToolbar } from "components/ButtonToolbar"
|
import { useActionButton } from "hooks/useActionButton"
|
||||||
import { useEffect, useState } from "react"
|
import { useMobile } from "hooks/useMobile"
|
||||||
import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
|
import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
|
||||||
import { throttle } from "throttle-debounce"
|
|
||||||
import { ShareButtons } from "./ShareButtons"
|
import { ShareButtons } from "./ShareButtons"
|
||||||
|
|
||||||
interface FeedEntryFooterProps {
|
interface FeedEntryFooterProps {
|
||||||
@@ -17,10 +14,10 @@ interface FeedEntryFooterProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export function FeedEntryFooter(props: FeedEntryFooterProps) {
|
export function FeedEntryFooter(props: FeedEntryFooterProps) {
|
||||||
const [scrollPosition, setScrollPosition] = useState(0)
|
|
||||||
const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
|
const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
|
||||||
const tags = useAppSelector(state => state.user.tags)
|
const tags = useAppSelector(state => state.user.tags)
|
||||||
const mobile = !useMediaQuery(`(min-width: ${Constants.layout.mobileBreakpoint})`)
|
const mobile = useMobile()
|
||||||
|
const { spacing } = useActionButton()
|
||||||
const dispatch = useAppDispatch()
|
const dispatch = useAppDispatch()
|
||||||
|
|
||||||
const showSharingButtons = sharingSettings && Object.values(sharingSettings).some(v => v)
|
const showSharingButtons = sharingSettings && Object.values(sharingSettings).some(v => v)
|
||||||
@@ -34,19 +31,9 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
|
|||||||
})
|
})
|
||||||
)
|
)
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const scrollArea = document.getElementById(Constants.dom.mainScrollAreaId)
|
|
||||||
|
|
||||||
const listener = () => setScrollPosition(scrollArea ? scrollArea.scrollTop : 0)
|
|
||||||
const throttledListener = throttle(100, listener)
|
|
||||||
|
|
||||||
scrollArea?.addEventListener("scroll", throttledListener)
|
|
||||||
return () => scrollArea?.removeEventListener("scroll", throttledListener)
|
|
||||||
}, [])
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Group position="apart">
|
<Group position="apart">
|
||||||
<ButtonToolbar>
|
<Group spacing={spacing}>
|
||||||
{props.entry.markable && (
|
{props.entry.markable && (
|
||||||
<ActionButton
|
<ActionButton
|
||||||
icon={props.entry.read ? <TbEyeOff size={18} /> : <TbEyeCheck size={18} />}
|
icon={props.entry.read ? <TbEyeOff size={18} /> : <TbEyeCheck size={18} />}
|
||||||
@@ -61,7 +48,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
|
|||||||
/>
|
/>
|
||||||
|
|
||||||
{showSharingButtons && (
|
{showSharingButtons && (
|
||||||
<Popover withArrow withinPortal shadow="md" positionDependencies={[scrollPosition]} closeOnClickOutside={!mobile}>
|
<Popover withArrow withinPortal shadow="md" closeOnClickOutside={!mobile}>
|
||||||
<Popover.Target>
|
<Popover.Target>
|
||||||
<ActionButton icon={<TbShare size={18} />} label={<Trans>Share</Trans>} />
|
<ActionButton icon={<TbShare size={18} />} label={<Trans>Share</Trans>} />
|
||||||
</Popover.Target>
|
</Popover.Target>
|
||||||
@@ -72,7 +59,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
|
|||||||
)}
|
)}
|
||||||
|
|
||||||
{tags && (
|
{tags && (
|
||||||
<Popover withArrow withinPortal shadow="md" positionDependencies={[scrollPosition]} closeOnClickOutside={!mobile}>
|
<Popover withArrow withinPortal shadow="md" closeOnClickOutside={!mobile}>
|
||||||
<Popover.Target>
|
<Popover.Target>
|
||||||
<Indicator label={props.entry.tags.length} disabled={props.entry.tags.length === 0} inline size={16}>
|
<Indicator label={props.entry.tags.length} disabled={props.entry.tags.length === 0} inline size={16}>
|
||||||
<ActionButton icon={<TbTag size={18} />} label={<Trans>Tags</Trans>} />
|
<ActionButton icon={<TbTag size={18} />} label={<Trans>Tags</Trans>} />
|
||||||
@@ -96,7 +83,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
|
|||||||
<a href={props.entry.url} target="_blank" rel="noreferrer">
|
<a href={props.entry.url} target="_blank" rel="noreferrer">
|
||||||
<ActionButton icon={<TbExternalLink size={18} />} label={<Trans>Open link</Trans>} />
|
<ActionButton icon={<TbExternalLink size={18} />} label={<Trans>Open link</Trans>} />
|
||||||
</a>
|
</a>
|
||||||
</ButtonToolbar>
|
</Group>
|
||||||
|
|
||||||
<ActionButton
|
<ActionButton
|
||||||
icon={<TbArrowBarToDown size={18} />}
|
icon={<TbArrowBarToDown size={18} />}
|
||||||
|
|||||||
@@ -1,15 +1,29 @@
|
|||||||
import { t, Trans } from "@lingui/macro"
|
import { t, Trans } from "@lingui/macro"
|
||||||
import { ActionIcon, Center, Divider, Indicator, Popover, TextInput } from "@mantine/core"
|
import { ActionIcon, Box, Center, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core"
|
||||||
import { useForm } from "@mantine/form"
|
import { useForm } from "@mantine/form"
|
||||||
import { reloadEntries, search } from "app/slices/entries"
|
import { reloadEntries, search, selectNextEntry, selectPreviousEntry } from "app/slices/entries"
|
||||||
import { changeReadingMode, changeReadingOrder } from "app/slices/user"
|
import { changeReadingMode, changeReadingOrder } from "app/slices/user"
|
||||||
import { useAppDispatch, useAppSelector } from "app/store"
|
import { useAppDispatch, useAppSelector } from "app/store"
|
||||||
import { ActionButton } from "components/ActionButtton"
|
import { ActionButton } from "components/ActionButton"
|
||||||
import { ButtonToolbar } from "components/ButtonToolbar"
|
|
||||||
import { Loader } from "components/Loader"
|
import { Loader } from "components/Loader"
|
||||||
|
import { useActionButton } from "hooks/useActionButton"
|
||||||
import { useBrowserExtension } from "hooks/useBrowserExtension"
|
import { useBrowserExtension } from "hooks/useBrowserExtension"
|
||||||
|
import { useMobile } from "hooks/useMobile"
|
||||||
import { useEffect } from "react"
|
import { useEffect } from "react"
|
||||||
import { TbArrowDown, TbArrowUp, TbExternalLink, TbEye, TbEyeOff, TbRefresh, TbSearch, TbSettings, TbUser, TbX } from "react-icons/tb"
|
import {
|
||||||
|
TbArrowDown,
|
||||||
|
TbArrowUp,
|
||||||
|
TbExternalLink,
|
||||||
|
TbEye,
|
||||||
|
TbEyeOff,
|
||||||
|
TbRefresh,
|
||||||
|
TbSearch,
|
||||||
|
TbSettings,
|
||||||
|
TbSortAscending,
|
||||||
|
TbSortDescending,
|
||||||
|
TbUser,
|
||||||
|
TbX,
|
||||||
|
} from "react-icons/tb"
|
||||||
import { MarkAllAsReadButton } from "./MarkAllAsReadButton"
|
import { MarkAllAsReadButton } from "./MarkAllAsReadButton"
|
||||||
import { ProfileMenu } from "./ProfileMenu"
|
import { ProfileMenu } from "./ProfileMenu"
|
||||||
|
|
||||||
@@ -17,6 +31,25 @@ function HeaderDivider() {
|
|||||||
return <Divider orientation="vertical" />
|
return <Divider orientation="vertical" />
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function HeaderToolbar(props: { children: React.ReactNode }) {
|
||||||
|
const { spacing } = useActionButton()
|
||||||
|
const mobile = useMobile("480px")
|
||||||
|
return mobile ? (
|
||||||
|
// on mobile use all available width
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
width: "100%",
|
||||||
|
display: "flex",
|
||||||
|
justifyContent: "space-between",
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{props.children}
|
||||||
|
</Box>
|
||||||
|
) : (
|
||||||
|
<Group spacing={spacing}>{props.children}</Group>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
const iconSize = 18
|
const iconSize = 18
|
||||||
|
|
||||||
export function Header() {
|
export function Header() {
|
||||||
@@ -42,7 +75,36 @@ export function Header() {
|
|||||||
if (!settings) return <Loader />
|
if (!settings) return <Loader />
|
||||||
return (
|
return (
|
||||||
<Center>
|
<Center>
|
||||||
<ButtonToolbar>
|
<HeaderToolbar>
|
||||||
|
<ActionButton
|
||||||
|
icon={<TbArrowDown size={iconSize} />}
|
||||||
|
label={<Trans>Next</Trans>}
|
||||||
|
onClick={() =>
|
||||||
|
dispatch(
|
||||||
|
selectNextEntry({
|
||||||
|
expand: true,
|
||||||
|
markAsRead: true,
|
||||||
|
scrollToEntry: true,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<ActionButton
|
||||||
|
icon={<TbArrowUp size={iconSize} />}
|
||||||
|
label={<Trans>Previous</Trans>}
|
||||||
|
onClick={() =>
|
||||||
|
dispatch(
|
||||||
|
selectPreviousEntry({
|
||||||
|
expand: true,
|
||||||
|
markAsRead: true,
|
||||||
|
scrollToEntry: true,
|
||||||
|
})
|
||||||
|
)
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<HeaderDivider />
|
||||||
|
|
||||||
<ActionButton
|
<ActionButton
|
||||||
icon={<TbRefresh size={iconSize} />}
|
icon={<TbRefresh size={iconSize} />}
|
||||||
label={<Trans>Refresh</Trans>}
|
label={<Trans>Refresh</Trans>}
|
||||||
@@ -58,7 +120,7 @@ export function Header() {
|
|||||||
onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
|
onClick={() => dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
|
||||||
/>
|
/>
|
||||||
<ActionButton
|
<ActionButton
|
||||||
icon={settings.readingOrder === "asc" ? <TbArrowUp size={iconSize} /> : <TbArrowDown size={iconSize} />}
|
icon={settings.readingOrder === "asc" ? <TbSortAscending size={iconSize} /> : <TbSortDescending size={iconSize} />}
|
||||||
label={settings.readingOrder === "asc" ? <Trans>Asc</Trans> : <Trans>Desc</Trans>}
|
label={settings.readingOrder === "asc" ? <Trans>Asc</Trans> : <Trans>Desc</Trans>}
|
||||||
onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
|
onClick={() => dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
|
||||||
/>
|
/>
|
||||||
@@ -106,7 +168,7 @@ export function Header() {
|
|||||||
/>
|
/>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</ButtonToolbar>
|
</HeaderToolbar>
|
||||||
</Center>
|
</Center>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ import { Trans } from "@lingui/macro"
|
|||||||
import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
|
import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
|
||||||
import { markAllEntries } from "app/slices/entries"
|
import { markAllEntries } from "app/slices/entries"
|
||||||
import { useAppDispatch, useAppSelector } from "app/store"
|
import { useAppDispatch, useAppSelector } from "app/store"
|
||||||
import { ActionButton } from "components/ActionButtton"
|
import { ActionButton } from "components/ActionButton"
|
||||||
import { useState } from "react"
|
import { useState } from "react"
|
||||||
import { TbChecks } from "react-icons/tb"
|
import { TbChecks } from "react-icons/tb"
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
import { Box, MediaQuery } from "@mantine/core"
|
import { Box } from "@mantine/core"
|
||||||
import { Constants } from "app/constants"
|
import { useMobile } from "hooks/useMobile"
|
||||||
import React from "react"
|
import React from "react"
|
||||||
|
|
||||||
export function OnDesktop(props: { children: React.ReactNode }) {
|
export function OnDesktop(props: { children: React.ReactNode }) {
|
||||||
return (
|
const mobile = useMobile()
|
||||||
<MediaQuery smallerThan={Constants.layout.mobileBreakpoint} styles={{ display: "none" }}>
|
return <Box>{!mobile && props.children}</Box>
|
||||||
<Box>{props.children}</Box>
|
|
||||||
</MediaQuery>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,11 +1,8 @@
|
|||||||
import { Box, MediaQuery } from "@mantine/core"
|
import { Box } from "@mantine/core"
|
||||||
import { Constants } from "app/constants"
|
import { useMobile } from "hooks/useMobile"
|
||||||
import React from "react"
|
import React from "react"
|
||||||
|
|
||||||
export function OnMobile(props: { children: React.ReactNode }) {
|
export function OnMobile(props: { children: React.ReactNode }) {
|
||||||
return (
|
const mobile = useMobile()
|
||||||
<MediaQuery largerThan={Constants.layout.mobileBreakpoint} styles={{ display: "none" }}>
|
return <Box>{mobile && props.children}</Box>
|
||||||
<Box>{props.children}</Box>
|
|
||||||
</MediaQuery>
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
import { Trans } from "@lingui/macro"
|
import { Trans } from "@lingui/macro"
|
||||||
import { Box, Button, Group, Stack, Textarea } from "@mantine/core"
|
import { Box, Button, Group, Stack } from "@mantine/core"
|
||||||
import { useForm } from "@mantine/form"
|
import { useForm } from "@mantine/form"
|
||||||
import { client, errorToStrings } from "app/client"
|
import { client, errorToStrings } from "app/client"
|
||||||
import { redirectToSelectedSource } from "app/slices/redirect"
|
import { redirectToSelectedSource } from "app/slices/redirect"
|
||||||
import { useAppDispatch, useAppSelector } from "app/store"
|
import { useAppDispatch, useAppSelector } from "app/store"
|
||||||
import { Alert } from "components/Alert"
|
import { Alert } from "components/Alert"
|
||||||
|
import { CodeEditor } from "components/code/CodeEditor"
|
||||||
import { useEffect } from "react"
|
import { useEffect } from "react"
|
||||||
import { useAsyncCallback } from "react-async-hook"
|
import { useAsyncCallback } from "react-async-hook"
|
||||||
import { TbDeviceFloppy } from "react-icons/tb"
|
import { TbDeviceFloppy } from "react-icons/tb"
|
||||||
@@ -55,30 +56,16 @@ export function CustomCodeSettings() {
|
|||||||
|
|
||||||
<form onSubmit={form.onSubmit(saveCustomCode.execute)}>
|
<form onSubmit={form.onSubmit(saveCustomCode.execute)}>
|
||||||
<Stack>
|
<Stack>
|
||||||
<Textarea
|
<CodeEditor
|
||||||
autosize
|
|
||||||
minRows={4}
|
|
||||||
maxRows={15}
|
|
||||||
{...form.getInputProps("customCss")}
|
|
||||||
description={<Trans>Custom CSS rules that will be applied</Trans>}
|
description={<Trans>Custom CSS rules that will be applied</Trans>}
|
||||||
styles={{
|
language="css"
|
||||||
input: {
|
{...form.getInputProps("customCss")}
|
||||||
fontFamily: "monospace",
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Textarea
|
<CodeEditor
|
||||||
autosize
|
|
||||||
minRows={4}
|
|
||||||
maxRows={15}
|
|
||||||
{...form.getInputProps("customJs")}
|
|
||||||
description={<Trans>Custom JS code that will be executed on page load</Trans>}
|
description={<Trans>Custom JS code that will be executed on page load</Trans>}
|
||||||
styles={{
|
language="javascript"
|
||||||
input: {
|
{...form.getInputProps("customJs")}
|
||||||
fontFamily: "monospace",
|
|
||||||
},
|
|
||||||
}}
|
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<Group>
|
<Group>
|
||||||
|
|||||||
@@ -1,7 +1,14 @@
|
|||||||
import { Trans } from "@lingui/macro"
|
import { Trans } from "@lingui/macro"
|
||||||
import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
|
import { Divider, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
|
||||||
import { Constants } from "app/constants"
|
import { Constants } from "app/constants"
|
||||||
import { changeLanguage, changeScrollMarks, changeScrollSpeed, changeSharingSetting, changeShowRead } from "app/slices/user"
|
import {
|
||||||
|
changeAlwaysScrollToEntry,
|
||||||
|
changeLanguage,
|
||||||
|
changeScrollMarks,
|
||||||
|
changeScrollSpeed,
|
||||||
|
changeSharingSetting,
|
||||||
|
changeShowRead,
|
||||||
|
} from "app/slices/user"
|
||||||
import { useAppDispatch, useAppSelector } from "app/store"
|
import { useAppDispatch, useAppSelector } from "app/store"
|
||||||
import { SharingSettings } from "app/types"
|
import { SharingSettings } from "app/types"
|
||||||
import { locales } from "i18n"
|
import { locales } from "i18n"
|
||||||
@@ -11,6 +18,7 @@ export function DisplaySettings() {
|
|||||||
const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
|
const scrollSpeed = useAppSelector(state => state.user.settings?.scrollSpeed)
|
||||||
const showRead = useAppSelector(state => state.user.settings?.showRead)
|
const showRead = useAppSelector(state => state.user.settings?.showRead)
|
||||||
const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
|
const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
|
||||||
|
const alwaysScrollToEntry = useAppSelector(state => state.user.settings?.alwaysScrollToEntry)
|
||||||
const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
|
const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
|
||||||
const dispatch = useAppDispatch()
|
const dispatch = useAppDispatch()
|
||||||
|
|
||||||
@@ -32,6 +40,12 @@ export function DisplaySettings() {
|
|||||||
onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
|
onChange={e => dispatch(changeScrollSpeed(e.currentTarget.checked))}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<Switch
|
||||||
|
label={<Trans>Always scroll selected entry to the top of the page, even if it fits entirely on screen</Trans>}
|
||||||
|
checked={alwaysScrollToEntry}
|
||||||
|
onChange={e => dispatch(changeAlwaysScrollToEntry(e.currentTarget.checked))}
|
||||||
|
/>
|
||||||
|
|
||||||
<Switch
|
<Switch
|
||||||
label={<Trans>Show feeds and categories with no unread entries</Trans>}
|
label={<Trans>Show feeds and categories with no unread entries</Trans>}
|
||||||
checked={showRead}
|
checked={showRead}
|
||||||
|
|||||||
9
commafeed-client/src/hooks/useActionButton.ts
Normal file
9
commafeed-client/src/hooks/useActionButton.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { useMantineTheme } from "@mantine/core"
|
||||||
|
import { useMobile } from "hooks/useMobile"
|
||||||
|
|
||||||
|
export const useActionButton = () => {
|
||||||
|
const theme = useMantineTheme()
|
||||||
|
const mobile = useMobile(theme.breakpoints.xl)
|
||||||
|
const spacing = mobile ? 14 : 0
|
||||||
|
return { mobile, spacing }
|
||||||
|
}
|
||||||
4
commafeed-client/src/hooks/useMobile.ts
Normal file
4
commafeed-client/src/hooks/useMobile.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
import { useMediaQuery } from "@mantine/hooks"
|
||||||
|
import { Constants } from "app/constants"
|
||||||
|
|
||||||
|
export const useMobile = (breakpoint: string = Constants.layout.mobileBreakpoint) => !useMediaQuery(`(min-width: ${breakpoint})`)
|
||||||
@@ -71,6 +71,10 @@ msgstr "إداري"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "الكل"
|
msgstr "الكل"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "تم إرسال بريد إلكتروني إذا تم تسجيل هذا العنوان. "
|
msgstr "تم إرسال بريد إلكتروني إذا تم تسجيل هذا العنوان. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "الأحدث أولاً"
|
msgstr "الأحدث أولاً"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "التالي"
|
msgstr "التالي"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "كلمات المرور غير متطابقة"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "المنـصب"
|
msgstr "المنـصب"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "الملف الشخصي"
|
msgstr "الملف الشخصي"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Administrador"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Tot"
|
msgstr "Tot"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "S'ha enviat un correu electrònic si aquesta adreça estava registrada. "
|
msgstr "S'ha enviat un correu electrònic si aquesta adreça estava registrada. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "El més nou primer"
|
msgstr "El més nou primer"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Següent"
|
msgstr "Següent"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Les contrasenyes no coincideixen"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posició"
|
msgstr "Posició"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Perfil"
|
msgstr "Perfil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Správce"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Všechny"
|
msgstr "Všechny"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Pokud byla tato adresa zaregistrována, byl odeslán e-mail. "
|
msgstr "Pokud byla tato adresa zaregistrována, byl odeslán e-mail. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Nejnovější jako první"
|
msgstr "Nejnovější jako první"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Další"
|
msgstr "Další"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Hesla se neshodují"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Pozice"
|
msgstr "Pozice"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Gweinyddol"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Pawb"
|
msgstr "Pawb"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Mae e-bost wedi'i anfon os oedd y cyfeiriad hwn wedi'i gofrestru. "
|
msgstr "Mae e-bost wedi'i anfon os oedd y cyfeiriad hwn wedi'i gofrestru. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Y diweddaraf yn gyntaf"
|
msgstr "Y diweddaraf yn gyntaf"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Nesaf"
|
msgstr "Nesaf"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Nid yw cyfrineiriau yn cyfateb"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Swydd"
|
msgstr "Swydd"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Proffil"
|
msgstr "Proffil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr ""
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Alle"
|
msgstr "Alle"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Der er sendt en e-mail, hvis denne adresse var registreret. "
|
msgstr "Der er sendt en e-mail, hvis denne adresse var registreret. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Nyeste først"
|
msgstr "Nyeste først"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Næste"
|
msgstr "Næste"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Adgangskoder stemmer ikke overens"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Verwaltung"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Alle"
|
msgstr "Alle"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Eine E-Mail wurde gesendet, wenn diese Adresse registriert wurde. "
|
msgstr "Eine E-Mail wurde gesendet, wenn diese Adresse registriert wurde. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Neueste zuerst"
|
msgstr "Neueste zuerst"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Weiter"
|
msgstr "Weiter"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Passwörter stimmen nicht überein"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Stellung"
|
msgstr "Stellung"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Admin"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "All"
|
msgstr "All"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "An email has been sent if this address was registered. Check your inbox."
|
msgstr "An email has been sent if this address was registered. Check your inbox."
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Newest first"
|
msgstr "Newest first"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Next"
|
msgstr "Next"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Passwords do not match"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Position"
|
msgstr "Position"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr "Previous"
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profile"
|
msgstr "Profile"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Administrador"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Todo"
|
msgstr "Todo"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Se ha enviado un correo electrónico si se registró esta dirección. "
|
msgstr "Se ha enviado un correo electrónico si se registró esta dirección. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "más reciente primero"
|
msgstr "más reciente primero"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Siguiente"
|
msgstr "Siguiente"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Las contraseñas no coinciden"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posición"
|
msgstr "Posición"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Perfil"
|
msgstr "Perfil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "مدیر"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "همه"
|
msgstr "همه"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "اگر این آدرس ثبت شده باشد ایمیل ارسال شده است. "
|
msgstr "اگر این آدرس ثبت شده باشد ایمیل ارسال شده است. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "ابتدا جدیدترین"
|
msgstr "ابتدا جدیدترین"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "بعد"
|
msgstr "بعد"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "گذرواژه ها مطابقت ندارند"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "موقعیت"
|
msgstr "موقعیت"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "نمایه"
|
msgstr "نمایه"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Järjestelmänvalvoja"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Kaikki"
|
msgstr "Kaikki"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Sähköposti on lähetetty, jos tämä osoite on rekisteröity. "
|
msgstr "Sähköposti on lähetetty, jos tämä osoite on rekisteröity. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Uusin ensin"
|
msgstr "Uusin ensin"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Seuraava"
|
msgstr "Seuraava"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Salasanat eivät täsmää"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Sijainti"
|
msgstr "Sijainti"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profiili"
|
msgstr "Profiili"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Administrateur"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Tout"
|
msgstr "Tout"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr "Toujours remonter l'entrée sélectionnée en haut de la page, même si elle s'affiche complètement à l'écran"
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Un e-mail a été envoyé si cette adresse est enregistrée. Vérifiez votre boîte de réception."
|
msgstr "Un e-mail a été envoyé si cette adresse est enregistrée. Vérifiez votre boîte de réception."
|
||||||
@@ -129,11 +133,11 @@ msgstr "Retour à la connexion"
|
|||||||
|
|
||||||
#: src/components/KeyboardShortcutsHelp.tsx
|
#: src/components/KeyboardShortcutsHelp.tsx
|
||||||
msgid "Browser extension required for Chrome"
|
msgid "Browser extension required for Chrome"
|
||||||
msgstr ""
|
msgstr "L'extension navigateur est nécessaire sur Chrome"
|
||||||
|
|
||||||
#: src/pages/app/AboutPage.tsx
|
#: src/pages/app/AboutPage.tsx
|
||||||
msgid "Browser extention"
|
msgid "Browser extention"
|
||||||
msgstr ""
|
msgstr "Extension navigateur"
|
||||||
|
|
||||||
#: src/components/admin/UserEdit.tsx
|
#: src/components/admin/UserEdit.tsx
|
||||||
#: src/components/content/add/AddCategory.tsx
|
#: src/components/content/add/AddCategory.tsx
|
||||||
@@ -169,7 +173,7 @@ msgstr "Vérifie que le flux fonctionne"
|
|||||||
|
|
||||||
#: src/pages/app/AboutPage.tsx
|
#: src/pages/app/AboutPage.tsx
|
||||||
msgid "CommaFeed browser extension version {browserExtensionVersion}."
|
msgid "CommaFeed browser extension version {browserExtensionVersion}."
|
||||||
msgstr ""
|
msgstr "Extension CommaFeed pour navigateur version {browserExtensionVersion}."
|
||||||
|
|
||||||
#: src/pages/app/AboutPage.tsx
|
#: src/pages/app/AboutPage.tsx
|
||||||
msgid "CommaFeed next unread item"
|
msgid "CommaFeed next unread item"
|
||||||
@@ -177,7 +181,7 @@ msgstr "CommaFeed prochain article non lu"
|
|||||||
|
|
||||||
#: src/pages/app/AboutPage.tsx
|
#: src/pages/app/AboutPage.tsx
|
||||||
msgid "CommaFeed version {version} ({revision})."
|
msgid "CommaFeed version {version} ({revision})."
|
||||||
msgstr ""
|
msgstr "CommaFeed version {version} ({revision})."
|
||||||
|
|
||||||
#: src/components/header/ProfileMenu.tsx
|
#: src/components/header/ProfileMenu.tsx
|
||||||
msgid "Compact"
|
msgid "Compact"
|
||||||
@@ -319,7 +323,7 @@ msgstr "Exporter vos abonnements et catégories en tant que fichier OPML qui peu
|
|||||||
#: src/components/header/Header.tsx
|
#: src/components/header/Header.tsx
|
||||||
#: src/pages/WelcomePage.tsx
|
#: src/pages/WelcomePage.tsx
|
||||||
msgid "Extension options"
|
msgid "Extension options"
|
||||||
msgstr ""
|
msgstr "Options de l'extension"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
msgid "Feed name"
|
msgid "Feed name"
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Plus récent en premier"
|
msgstr "Plus récent en premier"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Suivant"
|
msgstr "Suivant"
|
||||||
|
|
||||||
@@ -555,7 +560,7 @@ msgstr "Oups !"
|
|||||||
|
|
||||||
#: src/components/header/Header.tsx
|
#: src/components/header/Header.tsx
|
||||||
msgid "Open CommaFeed"
|
msgid "Open CommaFeed"
|
||||||
msgstr ""
|
msgstr "Ouvrir CommaFeed"
|
||||||
|
|
||||||
#: src/components/KeyboardShortcutsHelp.tsx
|
#: src/components/KeyboardShortcutsHelp.tsx
|
||||||
msgid "Open current entry in a new tab"
|
msgid "Open current entry in a new tab"
|
||||||
@@ -635,6 +640,10 @@ msgstr "Les mots de passe ne correspondent pas"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Position"
|
msgstr "Position"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr "Précédent"
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
@@ -803,7 +812,7 @@ msgstr "Marquer l'entrée actuelle comme lue/non lue"
|
|||||||
|
|
||||||
#: src/components/KeyboardShortcutsHelp.tsx
|
#: src/components/KeyboardShortcutsHelp.tsx
|
||||||
msgid "Toggle sidebar"
|
msgid "Toggle sidebar"
|
||||||
msgstr ""
|
msgstr "Montrer/cacher la barre latérale"
|
||||||
|
|
||||||
#: src/pages/auth/LoginPage.tsx
|
#: src/pages/auth/LoginPage.tsx
|
||||||
msgid "Try out CommaFeed with the demo account: demo/demo"
|
msgid "Try out CommaFeed with the demo account: demo/demo"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Administración"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Todos"
|
msgstr "Todos"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Enviouse un correo electrónico se este enderezo estaba rexistrado. "
|
msgstr "Enviouse un correo electrónico se este enderezo estaba rexistrado. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "o máis novo primeiro"
|
msgstr "o máis novo primeiro"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Seguinte"
|
msgstr "Seguinte"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Os contrasinais non coinciden"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posición"
|
msgstr "Posición"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Perfil"
|
msgstr "Perfil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr ""
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Mind"
|
msgstr "Mind"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "E-mailt küldtünk, ha ez a cím regisztrálva volt. "
|
msgstr "E-mailt küldtünk, ha ez a cím regisztrálva volt. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "A legújabbak először"
|
msgstr "A legújabbak először"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Következő"
|
msgstr "Következő"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "A jelszavak nem egyeznek"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Pozíció"
|
msgstr "Pozíció"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr ""
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Semua"
|
msgstr "Semua"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Email telah dikirim jika alamat ini terdaftar. "
|
msgstr "Email telah dikirim jika alamat ini terdaftar. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Terbaru dulu"
|
msgstr "Terbaru dulu"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Selanjutnya"
|
msgstr "Selanjutnya"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Kata sandi tidak cocok"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posisi"
|
msgstr "Posisi"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Ammin"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Tutto"
|
msgstr "Tutto"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "È stata inviata un'e-mail se questo indirizzo è stato registrato. "
|
msgstr "È stata inviata un'e-mail se questo indirizzo è stato registrato. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Il più recente prima"
|
msgstr "Il più recente prima"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Avanti"
|
msgstr "Avanti"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Le password non corrispondono"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posizione"
|
msgstr "Posizione"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profilo"
|
msgstr "Profilo"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "管理人"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "全員"
|
msgstr "全員"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "このアドレスが登録されていれば、メールが送信されました。"
|
msgstr "このアドレスが登録されていれば、メールが送信されました。"
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "最新順"
|
msgstr "最新順"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "次へ"
|
msgstr "次へ"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "パスワードが一致しません"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "位置"
|
msgstr "位置"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "プロフィール"
|
msgstr "プロフィール"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "관리자"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "전체"
|
msgstr "전체"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "이 주소가 등록된 경우 이메일이 전송되었습니다. "
|
msgstr "이 주소가 등록된 경우 이메일이 전송되었습니다. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "최신순"
|
msgstr "최신순"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "다음"
|
msgstr "다음"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "비밀번호가 일치하지 않습니다"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "위치"
|
msgstr "위치"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "프로필"
|
msgstr "프로필"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Pentadbir"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Semua"
|
msgstr "Semua"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "E-mel telah dihantar jika alamat ini didaftarkan. "
|
msgstr "E-mel telah dihantar jika alamat ini didaftarkan. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Terbaharu dahulu"
|
msgstr "Terbaharu dahulu"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Seterusnya"
|
msgstr "Seterusnya"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Kata laluan tidak sepadan"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Kedudukan"
|
msgstr "Kedudukan"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr ""
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Alle"
|
msgstr "Alle"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "En e-post er sendt hvis denne adressen var registrert. "
|
msgstr "En e-post er sendt hvis denne adressen var registrert. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Nyeste først"
|
msgstr "Nyeste først"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Neste"
|
msgstr "Neste"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Passordene samsvarer ikke"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posisjon"
|
msgstr "Posisjon"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Beheerder"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Alles"
|
msgstr "Alles"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Er is een e-mail verzonden als dit adres is geregistreerd. "
|
msgstr "Er is een e-mail verzonden als dit adres is geregistreerd. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Nieuwste eerst"
|
msgstr "Nieuwste eerst"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Volgende"
|
msgstr "Volgende"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Wachtwoorden komen niet overeen"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Positie"
|
msgstr "Positie"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profiel"
|
msgstr "Profiel"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr ""
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Alle"
|
msgstr "Alle"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "En e-post er sendt hvis denne adressen var registrert. "
|
msgstr "En e-post er sendt hvis denne adressen var registrert. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Nyeste først"
|
msgstr "Nyeste først"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Neste"
|
msgstr "Neste"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Passordene samsvarer ikke"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posisjon"
|
msgstr "Posisjon"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Administracja"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Wszystkie"
|
msgstr "Wszystkie"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "E-mail został wysłany, jeśli ten adres został zarejestrowany. "
|
msgstr "E-mail został wysłany, jeśli ten adres został zarejestrowany. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Najnowsze jako pierwsze"
|
msgstr "Najnowsze jako pierwsze"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Dalej"
|
msgstr "Dalej"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Hasła nie pasują"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Pozycja"
|
msgstr "Pozycja"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Administrador"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Todos"
|
msgstr "Todos"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Um email foi enviado se este endereço foi registrado. "
|
msgstr "Um email foi enviado se este endereço foi registrado. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Mais novo primeiro"
|
msgstr "Mais novo primeiro"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Próximo"
|
msgstr "Próximo"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Senhas não coincidem"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Posição"
|
msgstr "Posição"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Perfil"
|
msgstr "Perfil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Админ"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Все"
|
msgstr "Все"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Электронное письмо было отправлено, если этот адрес был зарегистрирован. "
|
msgstr "Электронное письмо было отправлено, если этот адрес был зарегистрирован. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Сначала новые"
|
msgstr "Сначала новые"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Далее"
|
msgstr "Далее"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Пароли не совпадают"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Позиция"
|
msgstr "Позиция"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Профиль"
|
msgstr "Профиль"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Správca"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Všetky"
|
msgstr "Všetky"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "E-mail bol odoslaný, ak bola táto adresa zaregistrovaná. "
|
msgstr "E-mail bol odoslaný, ak bola táto adresa zaregistrovaná. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Najnovšie ako prvé"
|
msgstr "Najnovšie ako prvé"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Ďalej"
|
msgstr "Ďalej"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Heslá sa nezhodujú"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Pozícia"
|
msgstr "Pozícia"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr ""
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Alla"
|
msgstr "Alla"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Ett e-postmeddelande har skickats om denna adress var registrerad. "
|
msgstr "Ett e-postmeddelande har skickats om denna adress var registrerad. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Nyast först"
|
msgstr "Nyast först"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Nästa"
|
msgstr "Nästa"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Lösenorden matchar inte"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "Yönetici"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "Tümü"
|
msgstr "Tümü"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "Bu adres kayıtlıysa bir e-posta gönderildi. "
|
msgstr "Bu adres kayıtlıysa bir e-posta gönderildi. "
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "Önce en yenisi"
|
msgstr "Önce en yenisi"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "Sonraki"
|
msgstr "Sonraki"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "Parolalar eşleşmiyor"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "Konum"
|
msgstr "Konum"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "Profil"
|
msgstr "Profil"
|
||||||
|
|||||||
@@ -71,6 +71,10 @@ msgstr "管理员"
|
|||||||
msgid "All"
|
msgid "All"
|
||||||
msgstr "全部"
|
msgstr "全部"
|
||||||
|
|
||||||
|
#: src/components/settings/DisplaySettings.tsx
|
||||||
|
msgid "Always scroll selected entry to the top of the page, even if it fits entirely on screen"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/auth/PasswordRecoveryPage.tsx
|
#: src/pages/auth/PasswordRecoveryPage.tsx
|
||||||
msgid "An email has been sent if this address was registered. Check your inbox."
|
msgid "An email has been sent if this address was registered. Check your inbox."
|
||||||
msgstr "如果此地址已注册，则已发送电子邮件。"
|
msgstr "如果此地址已注册，则已发送电子邮件。"
|
||||||
@@ -526,6 +530,7 @@ msgid "Newest first"
|
|||||||
msgstr "最新优先"
|
msgstr "最新优先"
|
||||||
|
|
||||||
#: src/components/content/add/Subscribe.tsx
|
#: src/components/content/add/Subscribe.tsx
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
msgid "Next"
|
msgid "Next"
|
||||||
msgstr "下一个"
|
msgstr "下一个"
|
||||||
|
|
||||||
@@ -635,6 +640,10 @@ msgstr "密码不匹配"
|
|||||||
msgid "Position"
|
msgid "Position"
|
||||||
msgstr "位置"
|
msgstr "位置"
|
||||||
|
|
||||||
|
#: src/components/header/Header.tsx
|
||||||
|
msgid "Previous"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: src/pages/app/SettingsPage.tsx
|
#: src/pages/app/SettingsPage.tsx
|
||||||
msgid "Profile"
|
msgid "Profile"
|
||||||
msgstr "配置文件"
|
msgstr "配置文件"
|
||||||
|
|||||||
@@ -1,23 +1,32 @@
|
|||||||
import { Trans } from "@lingui/macro"
|
import { Trans } from "@lingui/macro"
|
||||||
import { Anchor, Box, Center, Container, Divider, Group, Image, Title, useMantineColorScheme } from "@mantine/core"
|
import { Anchor, Box, Center, Container, Divider, Group, Image, Title, useMantineColorScheme } from "@mantine/core"
|
||||||
import { useMediaQuery } from "@mantine/hooks"
|
|
||||||
import { client } from "app/client"
|
import { client } from "app/client"
|
||||||
import { Constants } from "app/constants"
|
|
||||||
import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/slices/redirect"
|
import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/slices/redirect"
|
||||||
import { useAppDispatch, useAppSelector } from "app/store"
|
import { useAppDispatch, useAppSelector } from "app/store"
|
||||||
import welcome_page_dark from "assets/welcome_page_dark.png"
|
import welcome_page_dark from "assets/welcome_page_dark.png"
|
||||||
import welcome_page_light from "assets/welcome_page_light.png"
|
import welcome_page_light from "assets/welcome_page_light.png"
|
||||||
import { ActionButton } from "components/ActionButtton"
|
import { ActionButton } from "components/ActionButton"
|
||||||
import { ButtonToolbar } from "components/ButtonToolbar"
|
|
||||||
import { useBrowserExtension } from "hooks/useBrowserExtension"
|
import { useBrowserExtension } from "hooks/useBrowserExtension"
|
||||||
|
import { useMobile } from "hooks/useMobile"
|
||||||
import { useAsyncCallback } from "react-async-hook"
|
import { useAsyncCallback } from "react-async-hook"
|
||||||
import { SiGithub, SiTwitter } from "react-icons/si"
|
import { SiGithub, SiTwitter } from "react-icons/si"
|
||||||
import { TbClock, TbKey, TbMoon, TbSettings, TbSun, TbUserPlus } from "react-icons/tb"
|
import { TbClock, TbKey, TbMoon, TbSettings, TbSun, TbUserPlus } from "react-icons/tb"
|
||||||
import { PageTitle } from "./PageTitle"
|
import { PageTitle } from "./PageTitle"
|
||||||
|
|
||||||
|
const iconSize = 18
|
||||||
|
|
||||||
export function WelcomePage() {
|
export function WelcomePage() {
|
||||||
|
const serverInfos = useAppSelector(state => state.server.serverInfos)
|
||||||
const { colorScheme } = useMantineColorScheme()
|
const { colorScheme } = useMantineColorScheme()
|
||||||
|
const dispatch = useAppDispatch()
|
||||||
const image = colorScheme === "light" ? welcome_page_light : welcome_page_dark
|
const image = colorScheme === "light" ? welcome_page_light : welcome_page_dark
|
||||||
|
|
||||||
|
const login = useAsyncCallback(client.user.login, {
|
||||||
|
onSuccess: () => {
|
||||||
|
dispatch(redirectToRootCategory())
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container>
|
<Container>
|
||||||
<Header />
|
<Header />
|
||||||
@@ -26,6 +35,18 @@ export function WelcomePage() {
|
|||||||
<Title order={3}>Bloat-free feed reader</Title>
|
<Title order={3}>Bloat-free feed reader</Title>
|
||||||
</Center>
|
</Center>
|
||||||
|
|
||||||
|
{serverInfos?.demoAccountEnabled && (
|
||||||
|
<Center>
|
||||||
|
<ActionButton
|
||||||
|
label={<Trans>Try the demo!</Trans>}
|
||||||
|
icon={<TbClock size={iconSize} />}
|
||||||
|
variant="outline"
|
||||||
|
onClick={() => login.execute({ name: "demo", password: "demo" })}
|
||||||
|
showLabelOnMobile
|
||||||
|
/>
|
||||||
|
</Center>
|
||||||
|
)}
|
||||||
|
|
||||||
<Divider my="xl" />
|
<Divider my="xl" />
|
||||||
|
|
||||||
<Image src={image} />
|
<Image src={image} />
|
||||||
@@ -38,7 +59,7 @@ export function WelcomePage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function Header() {
|
function Header() {
|
||||||
const mobile = !useMediaQuery(`(min-width: ${Constants.layout.mobileBreakpoint})`)
|
const mobile = useMobile()
|
||||||
|
|
||||||
if (mobile) {
|
if (mobile) {
|
||||||
return (
|
return (
|
||||||
@@ -60,30 +81,14 @@ function Header() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function Buttons() {
|
function Buttons() {
|
||||||
const iconSize = 18
|
|
||||||
const serverInfos = useAppSelector(state => state.server.serverInfos)
|
const serverInfos = useAppSelector(state => state.server.serverInfos)
|
||||||
const { colorScheme, toggleColorScheme } = useMantineColorScheme()
|
const { colorScheme, toggleColorScheme } = useMantineColorScheme()
|
||||||
const { isBrowserExtensionPopup, openSettingsPage } = useBrowserExtension()
|
const { isBrowserExtensionPopup, openSettingsPage } = useBrowserExtension()
|
||||||
const dispatch = useAppDispatch()
|
const dispatch = useAppDispatch()
|
||||||
const dark = colorScheme === "dark"
|
const dark = colorScheme === "dark"
|
||||||
|
|
||||||
const login = useAsyncCallback(client.user.login, {
|
|
||||||
onSuccess: () => {
|
|
||||||
dispatch(redirectToRootCategory())
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<ButtonToolbar>
|
<Group spacing={14}>
|
||||||
{serverInfos?.demoAccountEnabled && (
|
|
||||||
<ActionButton
|
|
||||||
label={<Trans>Try the demo!</Trans>}
|
|
||||||
icon={<TbClock size={iconSize} />}
|
|
||||||
variant="outline"
|
|
||||||
onClick={() => login.execute({ name: "demo", password: "demo" })}
|
|
||||||
showLabelOnMobile
|
|
||||||
/>
|
|
||||||
)}
|
|
||||||
<ActionButton
|
<ActionButton
|
||||||
label={<Trans>Log in</Trans>}
|
label={<Trans>Log in</Trans>}
|
||||||
icon={<TbKey size={iconSize} />}
|
icon={<TbKey size={iconSize} />}
|
||||||
@@ -116,7 +121,7 @@ function Buttons() {
|
|||||||
hideLabelOnDesktop
|
hideLabelOnDesktop
|
||||||
/>
|
/>
|
||||||
)}
|
)}
|
||||||
</ButtonToolbar>
|
</Group>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,6 +20,8 @@ const shownGauges: { [key: string]: string } = {
|
|||||||
"com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Queue size",
|
"com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Queue size",
|
||||||
"com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Worker active",
|
"com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Worker active",
|
||||||
"com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Updater active",
|
"com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Updater active",
|
||||||
|
"com.commafeed.frontend.ws.WebSocketSessions.users": "WebSocket users",
|
||||||
|
"com.commafeed.frontend.ws.WebSocketSessions.sessions": "WebSocket sessions",
|
||||||
}
|
}
|
||||||
|
|
||||||
export function MetricsPage() {
|
export function MetricsPage() {
|
||||||
|
|||||||
@@ -13,7 +13,6 @@ import {
|
|||||||
Title,
|
Title,
|
||||||
useMantineTheme,
|
useMantineTheme,
|
||||||
} from "@mantine/core"
|
} from "@mantine/core"
|
||||||
import { useMediaQuery, useViewportSize } from "@mantine/hooks"
|
|
||||||
import { Constants } from "app/constants"
|
import { Constants } from "app/constants"
|
||||||
import { redirectToAdd, redirectToRootCategory } from "app/slices/redirect"
|
import { redirectToAdd, redirectToRootCategory } from "app/slices/redirect"
|
||||||
import { reloadTree, setMobileMenuOpen, setSidebarWidth } from "app/slices/tree"
|
import { reloadTree, setMobileMenuOpen, setSidebarWidth } from "app/slices/tree"
|
||||||
@@ -24,6 +23,7 @@ import { Logo } from "components/Logo"
|
|||||||
import { OnDesktop } from "components/responsive/OnDesktop"
|
import { OnDesktop } from "components/responsive/OnDesktop"
|
||||||
import { OnMobile } from "components/responsive/OnMobile"
|
import { OnMobile } from "components/responsive/OnMobile"
|
||||||
import { useAppLoading } from "hooks/useAppLoading"
|
import { useAppLoading } from "hooks/useAppLoading"
|
||||||
|
import { useMobile } from "hooks/useMobile"
|
||||||
import { useWebSocket } from "hooks/useWebSocket"
|
import { useWebSocket } from "hooks/useWebSocket"
|
||||||
import { LoadingPage } from "pages/LoadingPage"
|
import { LoadingPage } from "pages/LoadingPage"
|
||||||
import { Resizable } from "re-resizable"
|
import { Resizable } from "re-resizable"
|
||||||
@@ -90,9 +90,8 @@ function LogoAndTitle() {
|
|||||||
export default function Layout(props: LayoutProps) {
|
export default function Layout(props: LayoutProps) {
|
||||||
const { classes } = useStyles(props)
|
const { classes } = useStyles(props)
|
||||||
const theme = useMantineTheme()
|
const theme = useMantineTheme()
|
||||||
const viewport = useViewportSize()
|
|
||||||
const { loading } = useAppLoading()
|
const { loading } = useAppLoading()
|
||||||
const mobile = !useMediaQuery(`(min-width: ${Constants.layout.mobileBreakpoint})`)
|
const mobile = useMobile()
|
||||||
const mobileMenuOpen = useAppSelector(state => state.tree.mobileMenuOpen)
|
const mobileMenuOpen = useAppSelector(state => state.tree.mobileMenuOpen)
|
||||||
const sidebarHidden = props.sidebarWidth === 0
|
const sidebarHidden = props.sidebarWidth === 0
|
||||||
const dispatch = useAppDispatch()
|
const dispatch = useAppDispatch()
|
||||||
@@ -177,7 +176,7 @@ export default function Layout(props: LayoutProps) {
|
|||||||
)}
|
)}
|
||||||
{!mobileMenuOpen && (
|
{!mobileMenuOpen && (
|
||||||
<Group>
|
<Group>
|
||||||
<Box mr="sm">{burger}</Box>
|
<Box>{burger}</Box>
|
||||||
<Box sx={{ flexGrow: 1 }}>{props.header}</Box>
|
<Box sx={{ flexGrow: 1 }}>{props.header}</Box>
|
||||||
</Group>
|
</Group>
|
||||||
)}
|
)}
|
||||||
@@ -196,18 +195,11 @@ export default function Layout(props: LayoutProps) {
|
|||||||
</Header>
|
</Header>
|
||||||
}
|
}
|
||||||
>
|
>
|
||||||
<ScrollArea
|
<Box id="content" className={classes.mainContent}>
|
||||||
sx={{ height: viewport.height - Constants.layout.headerHeight }}
|
<Suspense fallback={<Loader />}>
|
||||||
viewportRef={ref => {
|
<Outlet />
|
||||||
if (ref) ref.id = Constants.dom.mainScrollAreaId
|
</Suspense>
|
||||||
}}
|
</Box>
|
||||||
>
|
|
||||||
<Box id="content" className={classes.mainContent}>
|
|
||||||
<Suspense fallback={<Loader />}>
|
|
||||||
<Outlet />
|
|
||||||
</Suspense>
|
|
||||||
</Box>
|
|
||||||
</ScrollArea>
|
|
||||||
</AppShell>
|
</AppShell>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { TbCode, TbPhoto, TbUser } from "react-icons/tb"
|
|||||||
export function SettingsPage() {
|
export function SettingsPage() {
|
||||||
return (
|
return (
|
||||||
<Container size="sm" px={0}>
|
<Container size="sm" px={0}>
|
||||||
<Tabs defaultValue="display">
|
<Tabs defaultValue="display" keepMounted={false}>
|
||||||
<Tabs.List>
|
<Tabs.List>
|
||||||
<Tabs.Tab value="display" icon={<TbPhoto size={16} />}>
|
<Tabs.Tab value="display" icon={<TbPhoto size={16} />}>
|
||||||
<Trans>Display</Trans>
|
<Trans>Display</Trans>
|
||||||
|
|||||||
@@ -1,13 +1,41 @@
|
|||||||
import { lingui } from "@lingui/vite-plugin"
|
import { lingui } from "@lingui/vite-plugin"
|
||||||
import react from "@vitejs/plugin-react"
|
import react from "@vitejs/plugin-react"
|
||||||
import { visualizer } from "rollup-plugin-visualizer"
|
import { visualizer } from "rollup-plugin-visualizer"
|
||||||
import { defineConfig } from "vite"
|
import { defineConfig, PluginOption } from "vite"
|
||||||
import eslint from "vite-plugin-eslint"
|
import eslint from "vite-plugin-eslint"
|
||||||
import tsconfigPaths from "vite-tsconfig-paths"
|
import tsconfigPaths from "vite-tsconfig-paths"
|
||||||
|
|
||||||
|
// inject custom js and css links in html
|
||||||
|
const customCodeInjector: PluginOption = {
|
||||||
|
name: "customCodeInjector",
|
||||||
|
transformIndexHtml: html => {
|
||||||
|
return {
|
||||||
|
html,
|
||||||
|
tags: [
|
||||||
|
{
|
||||||
|
tag: "script",
|
||||||
|
attrs: {
|
||||||
|
src: "custom_js.js",
|
||||||
|
},
|
||||||
|
injectTo: "body",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
tag: "link",
|
||||||
|
attrs: {
|
||||||
|
rel: "stylesheet",
|
||||||
|
href: "custom_css.css",
|
||||||
|
},
|
||||||
|
injectTo: "head",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
// https://vitejs.dev/config/
|
// https://vitejs.dev/config/
|
||||||
export default defineConfig({
|
export default defineConfig({
|
||||||
plugins: [
|
plugins: [
|
||||||
|
customCodeInjector,
|
||||||
react({
|
react({
|
||||||
babel: {
|
babel: {
|
||||||
// babel-macro is needed for lingui
|
// babel-macro is needed for lingui
|
||||||
@@ -32,7 +60,7 @@ export default defineConfig({
|
|||||||
},
|
},
|
||||||
},
|
},
|
||||||
build: {
|
build: {
|
||||||
chunkSizeWarningLimit: 1000,
|
chunkSizeWarningLimit: 3000,
|
||||||
rollupOptions: {
|
rollupOptions: {
|
||||||
output: {
|
output: {
|
||||||
manualChunks: id => {
|
manualChunks: id => {
|
||||||
|
|||||||
@@ -117,7 +117,6 @@ logging:
|
|||||||
liquibase: INFO
|
liquibase: INFO
|
||||||
org.hibernate.SQL: INFO # or ALL for sql debugging
|
org.hibernate.SQL: INFO # or ALL for sql debugging
|
||||||
org.hibernate.engine.internal.StatisticalLoggingSessionEventListener: WARN
|
org.hibernate.engine.internal.StatisticalLoggingSessionEventListener: WARN
|
||||||
org.hibernate.orm.deprecation: "OFF"
|
|
||||||
appenders:
|
appenders:
|
||||||
- type: console
|
- type: console
|
||||||
- type: file
|
- type: file
|
||||||
|
|||||||
@@ -122,7 +122,6 @@ logging:
|
|||||||
com.commafeed: INFO
|
com.commafeed: INFO
|
||||||
liquibase: INFO
|
liquibase: INFO
|
||||||
io.dropwizard.server.ServerFactory: INFO
|
io.dropwizard.server.ServerFactory: INFO
|
||||||
org.hibernate.orm.deprecation: "OFF"
|
|
||||||
appenders:
|
appenders:
|
||||||
- type: console
|
- type: console
|
||||||
- type: file
|
- type: file
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
<parent>
|
<parent>
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed</artifactId>
|
<artifactId>commafeed</artifactId>
|
||||||
<version>3.7.0</version>
|
<version>3.8.0</version>
|
||||||
</parent>
|
</parent>
|
||||||
<artifactId>commafeed-server</artifactId>
|
<artifactId>commafeed-server</artifactId>
|
||||||
<name>CommaFeed Server</name>
|
<name>CommaFeed Server</name>
|
||||||
@@ -226,7 +226,7 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed-client</artifactId>
|
<artifactId>commafeed-client</artifactId>
|
||||||
<version>3.7.0</version>
|
<version>3.8.0</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|||||||
@@ -65,6 +65,8 @@ public class UserSettings extends AbstractModel {
|
|||||||
@Column(name = "scroll_speed")
|
@Column(name = "scroll_speed")
|
||||||
private int scrollSpeed;
|
private int scrollSpeed;
|
||||||
|
|
||||||
|
private boolean alwaysScrollToEntry;
|
||||||
|
|
||||||
private boolean email;
|
private boolean email;
|
||||||
private boolean gmail;
|
private boolean gmail;
|
||||||
private boolean facebook;
|
private boolean facebook;
|
||||||
|
|||||||
@@ -35,6 +35,9 @@ public class Settings implements Serializable {
|
|||||||
@ApiModelProperty(value = "user's preferred scroll speed when navigating between entries", required = true)
|
@ApiModelProperty(value = "user's preferred scroll speed when navigating between entries", required = true)
|
||||||
private int scrollSpeed;
|
private int scrollSpeed;
|
||||||
|
|
||||||
|
@ApiModelProperty(value = "always scroll selected entry to the top of the page, even if it fits entirely on screen", required = true)
|
||||||
|
private boolean alwaysScrollToEntry;
|
||||||
|
|
||||||
@ApiModelProperty(value = "sharing settings", required = true)
|
@ApiModelProperty(value = "sharing settings", required = true)
|
||||||
private SharingSettings sharingSettings = new SharingSettings();
|
private SharingSettings sharingSettings = new SharingSettings();
|
||||||
|
|
||||||
|
|||||||
@@ -103,6 +103,7 @@ public class UserREST {
|
|||||||
s.setCustomJs(settings.getCustomJs());
|
s.setCustomJs(settings.getCustomJs());
|
||||||
s.setLanguage(settings.getLanguage());
|
s.setLanguage(settings.getLanguage());
|
||||||
s.setScrollSpeed(settings.getScrollSpeed());
|
s.setScrollSpeed(settings.getScrollSpeed());
|
||||||
|
s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry());
|
||||||
} else {
|
} else {
|
||||||
s.setReadingMode(ReadingMode.unread.name());
|
s.setReadingMode(ReadingMode.unread.name());
|
||||||
s.setReadingOrder(ReadingOrder.desc.name());
|
s.setReadingOrder(ReadingOrder.desc.name());
|
||||||
@@ -120,6 +121,7 @@ public class UserREST {
|
|||||||
s.setScrollMarks(true);
|
s.setScrollMarks(true);
|
||||||
s.setLanguage("en");
|
s.setLanguage("en");
|
||||||
s.setScrollSpeed(400);
|
s.setScrollSpeed(400);
|
||||||
|
s.setAlwaysScrollToEntry(false);
|
||||||
}
|
}
|
||||||
return Response.ok(s).build();
|
return Response.ok(s).build();
|
||||||
}
|
}
|
||||||
@@ -145,6 +147,7 @@ public class UserREST {
|
|||||||
s.setCustomJs(settings.getCustomJs());
|
s.setCustomJs(settings.getCustomJs());
|
||||||
s.setLanguage(settings.getLanguage());
|
s.setLanguage(settings.getLanguage());
|
||||||
s.setScrollSpeed(settings.getScrollSpeed());
|
s.setScrollSpeed(settings.getScrollSpeed());
|
||||||
|
s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry());
|
||||||
|
|
||||||
s.setEmail(settings.getSharingSettings().isEmail());
|
s.setEmail(settings.getSharingSettings().isEmail());
|
||||||
s.setGmail(settings.getSharingSettings().isGmail());
|
s.setGmail(settings.getSharingSettings().isGmail());
|
||||||
|
|||||||
@@ -10,6 +10,8 @@ import javax.servlet.http.HttpServletResponse;
|
|||||||
@Singleton
|
@Singleton
|
||||||
public class RobotsTxtDisallowAllServlet extends HttpServlet {
|
public class RobotsTxtDisallowAllServlet extends HttpServlet {
|
||||||
|
|
||||||
|
private static final long serialVersionUID = 1L;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
|
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
|
||||||
resp.setContentType("text/plain");
|
resp.setContentType("text/plain");
|
||||||
|
|||||||
@@ -5,9 +5,12 @@ import java.util.Set;
|
|||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
import javax.websocket.Session;
|
import javax.websocket.Session;
|
||||||
|
|
||||||
|
import com.codahale.metrics.Gauge;
|
||||||
|
import com.codahale.metrics.MetricRegistry;
|
||||||
import com.commafeed.backend.model.User;
|
import com.commafeed.backend.model.User;
|
||||||
|
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
@@ -16,15 +19,23 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
public class WebSocketSessions {
|
public class WebSocketSessions {
|
||||||
|
|
||||||
// a user may have multiple sessions (two tabs, on mobile, ...)
|
// a user may have multiple sessions (two tabs, two devices, ...)
|
||||||
private final Map<Long, Set<Session>> sessions = new ConcurrentHashMap<>();
|
private final Map<Long, Set<Session>> sessions = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public WebSocketSessions(MetricRegistry metrics) {
|
||||||
|
metrics.register(MetricRegistry.name(getClass(), "users"),
|
||||||
|
(Gauge<Long>) () -> sessions.values().stream().filter(v -> !v.isEmpty()).count());
|
||||||
|
metrics.register(MetricRegistry.name(getClass(), "sessions"),
|
||||||
|
(Gauge<Long>) () -> sessions.values().stream().mapToLong(Set::size).sum());
|
||||||
|
}
|
||||||
|
|
||||||
public void add(Long userId, Session session) {
|
public void add(Long userId, Session session) {
|
||||||
sessions.computeIfAbsent(userId, v -> ConcurrentHashMap.newKeySet()).add(session);
|
sessions.computeIfAbsent(userId, v -> ConcurrentHashMap.newKeySet()).add(session);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void remove(Session session) {
|
public void remove(Session session) {
|
||||||
sessions.values().forEach(v -> v.removeIf(e -> e.equals(session)));
|
sessions.values().forEach(v -> v.remove(session));
|
||||||
}
|
}
|
||||||
|
|
||||||
public void sendMessage(User user, String text) {
|
public void sendMessage(User user, String text) {
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
|
||||||
|
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
|
||||||
|
|
||||||
|
<changeSet id="always-scroll-to-entry" author="athou">
|
||||||
|
<addColumn tableName="USERSETTINGS">
|
||||||
|
<column name="alwaysScrollToEntry" type="BOOLEAN" defaultValueBoolean="false">
|
||||||
|
<constraints nullable="false" />
|
||||||
|
</column>
|
||||||
|
</addColumn>
|
||||||
|
</changeSet>
|
||||||
|
|
||||||
|
</databaseChangeLog>
|
||||||
@@ -20,5 +20,6 @@
|
|||||||
<include file="changelogs/db.changelog-3.2.xml" />
|
<include file="changelogs/db.changelog-3.2.xml" />
|
||||||
<include file="changelogs/db.changelog-3.5.xml" />
|
<include file="changelogs/db.changelog-3.5.xml" />
|
||||||
<include file="changelogs/db.changelog-3.6.xml" />
|
<include file="changelogs/db.changelog-3.6.xml" />
|
||||||
|
<include file="changelogs/db.changelog-3.8.xml" />
|
||||||
|
|
||||||
</databaseChangeLog>
|
</databaseChangeLog>
|
||||||
2
pom.xml
2
pom.xml
@@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
<groupId>com.commafeed</groupId>
|
<groupId>com.commafeed</groupId>
|
||||||
<artifactId>commafeed</artifactId>
|
<artifactId>commafeed</artifactId>
|
||||||
<version>3.7.0</version>
|
<version>3.8.0</version>
|
||||||
<name>CommaFeed</name>
|
<name>CommaFeed</name>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user