Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tekst-API/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"title": "Tekst-Dev",
"summary": "An online text research platform",
"contact": {},
"version": "0.51.1b0"
"version": "0.51.2b0"
},
"servers": [
{
Expand Down
2 changes: 1 addition & 1 deletion Tekst-API/pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "tekst"
version = "0.51.1b0"
version = "0.51.2b0"
description = "An online text research platform"
readme = "README.md"
authors = [
Expand Down
2 changes: 1 addition & 1 deletion Tekst-API/uv.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Tekst-Web/i18n/ui/deDE.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,9 @@ browse:
activateCategory: Zeige alle Ressourcen dieser Kategorie
deactivateCategory: Verstecke alle Ressourcen dieser Kategorie
contentCitation:
title: Inhalt zitieren
full: Volle Ressourcen-Zitation mit Inhalts-URL
urlOnly: URL zu diesem Inhalt
full: Volle Ressourcen-Zitation mit Belegstellen-URL
resOnly: Ressourcen-Zitation
urlOnly: URL zu Inhalt/Belegstelle
uncategorized: Unkategorisiert
locationResourceNoData: Keine Daten für diese Belegstelle
textNoLocations: Die Einrichtung dieses Textes scheint unvollständig. Es wurden keine Belegstellen definiert.
Expand Down
10 changes: 5 additions & 5 deletions Tekst-Web/i18n/ui/enUS.yml
Original file line number Diff line number Diff line change
Expand Up @@ -232,9 +232,9 @@ browse:
activateCategory: Show all resources in this category
deactivateCategory: Hide all resources in this category
contentCitation:
title: Content Citation
full: Full resource citation with content URL
urlOnly: URL for this content
full: Full resource citation with location URL
resOnly: Resource citation
urlOnly: URL of content/location
archiveWidgetTitle: Content Archive
uncategorized: Uncategorized
locationResourceNoData: No data for this location
Expand Down Expand Up @@ -597,8 +597,8 @@ contents:
tipBtnCompare: Select other resource to compare with
tipBtnCopyOriginal: Copy from original resource
tipBtnApplyChanges: Copy content for this location
tipBtnPrevChange: Go to previous content
tipBtnNextChange: Go to next content
tipBtnPrevChange: Skip to previous content
tipBtnNextChange: Skip to next content
forComparison: '{title} (for comparison)'
fromOriginalResourceHint: |
This is a resource patch.
Expand Down
23 changes: 13 additions & 10 deletions Tekst-Web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Tekst-Web/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tekst",
"version": "0.51.1-beta.0",
"version": "0.51.2-beta.0",
"private": true,
"type": "module",
"scripts": {
Expand Down Expand Up @@ -47,13 +47,13 @@
"@babel/types": "^7.25.6",
"@intlify/eslint-plugin-vue-i18n": "^4.0.0",
"@intlify/unplugin-vue-i18n": "^11.0.0",
"@lucide/vue": "^1.7.0",
"@rushstack/eslint-patch": "^1.10.4",
"@tsconfig/node24": "^24.0.0",
"@types/color": "^4.0.0",
"@types/js-cookie": "^3.0.6",
"@types/jsdom": "^28.0.0",
"@types/node": "^24.0.0",
"@vicons/material": "^0.13.0",
"@vitejs/plugin-vue": "^6.0.0",
"@vue/eslint-config-prettier": "^10.0.0",
"@vue/eslint-config-typescript": "^14.0.1",
Expand Down
4 changes: 2 additions & 2 deletions Tekst-Web/src/components/AudioPlayer.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { DownloadIcon, ErrorIcon, LinkIcon, PauseIcon, PlayIcon } from '@/icons';
import { DownloadIcon, ErrorIcon, ExternalLinkIcon, PauseIcon, PlayIcon } from '@/icons';
import { useMediaControls } from '@vueuse/core';
import { NButton, NFlex, NIcon, NSlider } from 'naive-ui';
import { computed, onMounted, ref, watch, type CSSProperties } from 'vue';
Expand Down Expand Up @@ -104,7 +104,7 @@ onMounted(() => {
style="color: var(--text-color)"
>
<template #icon>
<n-icon :component="LinkIcon" />
<n-icon :component="ExternalLinkIcon" />
</template>
</n-button>
<n-button
Expand Down
8 changes: 3 additions & 5 deletions Tekst-Web/src/components/HelpButtonWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import GenericModal from '@/components/generic/GenericModal.vue';
import type { HelpText } from '@/composables/help';
import { useHelp } from '@/composables/help';
import { $t } from '@/i18n';
import { ErrorIcon, QuestionMarkIcon } from '@/icons';
import { ErrorIcon, FileQuestionMarkIcon } from '@/icons';
import { NButton, NEmpty, NIcon, NSpin, type ButtonSize } from 'naive-ui';
import { computed, ref } from 'vue';

Expand Down Expand Up @@ -74,16 +74,14 @@ async function handleHelpButtonClick() {
:style="buttonStyle"
@click.stop.prevent="handleHelpButtonClick"
>
<template #icon>
<n-icon :component="QuestionMarkIcon" />
</template>
<b>?</b>
</n-button>

<generic-modal
v-model:show="showModal"
width="wide"
:title="$t('help.help')"
:icon="QuestionMarkIcon"
:icon="FileQuestionMarkIcon"
heading-level="3"
@after-leave="handleClose"
>
Expand Down
4 changes: 2 additions & 2 deletions Tekst-Web/src/components/InsertItemSeparator.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<script setup lang="ts">
import { NButton, NIcon } from 'naive-ui';

import { AddIcon } from '@/icons';
import { PlusIcon } from '@/icons';

defineProps<{
title?: string;
Expand All @@ -23,7 +23,7 @@ defineEmits(['click']);
@click="$emit('click')"
>
<template #icon>
<n-icon :component="AddIcon" />
<n-icon :component="PlusIcon" />
</template>
</n-button>
<div class="add-level-separator"></div>
Expand Down
4 changes: 2 additions & 2 deletions Tekst-Web/src/components/ListingsFilters.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup lang="ts">
import { FilterIcon, JumpBackIcon, SearchIcon } from '@/icons';
import { FilterIcon, SearchIcon, UndoIcon } from '@/icons';
import {
NButton,
NCollapse,
Expand Down Expand Up @@ -86,7 +86,7 @@ onMounted(() => {
<n-button secondary class="mt-md" @click="reset">
{{ $t('common.reset') }}
<template #icon>
<n-icon :component="JumpBackIcon" />
<n-icon :component="UndoIcon" />
</template>
</n-button>
</n-flex>
Expand Down
4 changes: 2 additions & 2 deletions Tekst-Web/src/components/TasksWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import { commonDialogOptions } from '@/common';
import { useTasks } from '@/composables/tasks';
import { $t, $te } from '@/i18n';
import { CheckCircleIcon, ErrorIcon, HourglassIcon, UpdateIcon } from '@/icons';
import { CheckCircleIcon, ErrorIcon, HourglassIcon, TaskIcon } from '@/icons';
import { useStateStore } from '@/stores';
import {
NBadge,
Expand Down Expand Up @@ -72,7 +72,7 @@ function handleTaskClick(id: string) {
<template #menu>
<div class="task-list">
<n-flex justify="flex-start" align="center" :wrap="false" class="task-list-header">
<n-icon :component="UpdateIcon" />
<n-icon :component="TaskIcon" />
<span class="b ellipsis" style="color: var(--base-color)">{{ $t('tasks.title') }}</span>
</n-flex>
<n-scrollbar style="max-height: 60vh">
Expand Down
17 changes: 12 additions & 5 deletions Tekst-Web/src/components/browse/BookmarksWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ import { useBookmarks } from '@/composables/bookmarks';
import { useMessages } from '@/composables/messages';
import { usePrompt } from '@/composables/prompt';
import { $t } from '@/i18n';
import { AddIcon, BookIcon, BookmarksIcon, DeleteIcon, NoContentIcon, SearchIcon } from '@/icons';
import {
AddBookmarkIcon,
BookIcon,
BookmarkIcon,
DeleteIcon,
NoContentIcon,
SearchIcon,
} from '@/icons';
import { useBrowseStore, useStateStore, useThemeStore } from '@/stores';
import {
NButton,
Expand Down Expand Up @@ -71,7 +78,7 @@ async function handleCreateBookmarkClick() {
loading.value = true;
const comment = await prompt({
type: 'multiLineInput',
icon: BookmarksIcon,
icon: BookmarkIcon,
title: $t('browse.bookmarks.commentModalTitle'),
label: $t('browse.bookmarks.commentModalInputLabel'),
rows: 3,
Expand Down Expand Up @@ -111,15 +118,15 @@ async function handleWidgetClick() {
@click.stop.prevent="handleWidgetClick"
>
<template #icon>
<n-icon :component="BookmarksIcon" />
<n-icon :component="BookmarkIcon" />
</template>
</n-button>

<generic-modal
v-model:show="showModal"
width="wide"
:title="$t('browse.bookmarks.bookmarks')"
:icon="BookmarksIcon"
:icon="BookmarkIcon"
>
<n-input
v-model:value="filterString"
Expand All @@ -142,7 +149,7 @@ async function handleWidgetClick() {
@click="handleCreateBookmarkClick"
>
<template #icon>
<n-icon :component="AddIcon" size="large" />
<n-icon :component="AddBookmarkIcon" size="large" />
</template>
{{
!maxCountReached ? $t('browse.bookmarks.lblCreate') : $t('browse.bookmarks.maxCountReached')
Expand Down
6 changes: 3 additions & 3 deletions Tekst-Web/src/components/browse/BrowseLocationControls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { LocationRead } from '@/api';
import BookmarksWidget from '@/components/browse/BookmarksWidget.vue';
import LocationSelectModal from '@/components/modals/LocationSelectModal.vue';
import { $t } from '@/i18n';
import { ArrowBackIcon, ArrowForwardIcon, BookIcon } from '@/icons';
import { ArrowLeftIcon, ArrowRightIcon, BookIcon } from '@/icons';
import router from '@/router';
import { useAuthStore, useBrowseStore, useThemeStore } from '@/stores';
import { isInputFocused, isOverlayOpen } from '@/utils';
Expand Down Expand Up @@ -64,7 +64,7 @@ whenever(ArrowRight, () => {
@click="() => gotoLocation(browse.prevLocationId)"
>
<template #icon>
<n-icon :component="ArrowBackIcon" />
<n-icon :component="ArrowLeftIcon" />
</template>
</n-button>

Expand Down Expand Up @@ -100,7 +100,7 @@ whenever(ArrowRight, () => {
@click="() => gotoLocation(browse.nextLocationId)"
>
<template #icon>
<n-icon :component="ArrowForwardIcon" />
<n-icon :component="ArrowRightIcon" />
</template>
</n-button>
<location-select-modal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import {
CheckListIcon,
CheckAllIcon,
ClearIcon,
RefreshIcon,
SearchIcon,
Expand Down Expand Up @@ -176,7 +176,7 @@ onMounted(() => {
@click="() => switchBrowseHitResourcesActive(!search.browseHitResourcesActive)"
>
<template #icon>
<n-icon :component="CheckListIcon" />
<n-icon :component="CheckAllIcon" />
</template>
</n-button>
</n-badge>
Expand Down
4 changes: 2 additions & 2 deletions Tekst-Web/src/components/browse/ContentArchiveWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import ButtonShelf from '@/components/generic/ButtonShelf.vue';
import GenericModal from '@/components/generic/GenericModal.vue';
import { useMessages } from '@/composables/messages';
import { $t } from '@/i18n';
import { ArchiveIcon, ArrowBackIcon, NoContentIcon } from '@/icons';
import { ArchiveIcon, ArrowLeftIcon, NoContentIcon } from '@/icons';
import { useStateStore } from '@/stores';
import { utcToDateTimeString } from '@/utils';
import { NButton, NEmpty, NFlex, NIcon, NSpin } from 'naive-ui';
Expand Down Expand Up @@ -165,7 +165,7 @@ function cleanup() {
<template #start>
<n-button text icon-placement="left" @click="handleBackToOverview">
<template #icon>
<n-icon :component="ArrowBackIcon" />
<n-icon :component="ArrowLeftIcon" />
</template>
{{ $t('common.backToOverview') }}
</n-button>
Expand Down
4 changes: 2 additions & 2 deletions Tekst-Web/src/components/browse/ContentCitationWidget.vue
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function handleClick() {
dialog.create({
...commonDialogOptions,
icon: renderIcon(QuoteIcon, undefined, 'large'),
title: $t('browse.contentCitation.title'),
title: $t('models.resource.citation'),
contentClass: 'my-lg',
content: () => h(ContentCitationWidgetContent, { resource: props.resource }),
style: 'width: 600px',
Expand All @@ -36,7 +36,7 @@ function handleClick() {
<content-container-header-widget
v-bind="$attrs"
:full="full"
:title="$t('browse.contentCitation.title')"
:title="$t('models.resource.citation')"
:icon-component="QuoteIcon"
@click="handleClick"
/>
Expand Down
Loading
Loading