sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

okay, we can start npm server now, but new db redirects to share

pull/1207/head
matt wilkie 2025-02-16 22:17:59 +07:00
parent 7af4e52766
commit bc66e98533
4 changed files with 53 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/public/app/widgets/type_widgets/content_widget.ts
Unescape Escape View File

@ -35,7 +35,7 @@ import RibbonOptions from "./options/appearance/ribbon.js";
import LocalizationOptions from "./options/appearance/i18n.js";
import CodeBlockOptions from "./options/appearance/code_block.js";
import EditorOptions from "./options/text_notes/editor.js";
import ShareSettingsOptions from "./options/other/share_settings.js"; // added import statement
import ShareSettingsOptions from "./options/other/share_settings.js";
import type FNote from "../../entities/fnote.js";
import type NoteContextAwareWidget from "../note_context_aware_widget.js";

47
src/public/app/widgets/type_widgets/options/other/share_settings.ts
Unescape Escape View File

@ -0,0 +1,47 @@
import OptionsWidget from "../options_widget.js";
import options from "../../../../services/options.js";
import { t } from "../../../../services/i18n.js";
const TPL = `
<div class="card-body">
<h4>${t('Share Settings')}</h4>
<div class="form-check">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="redirectBareDomain" value="true">
${t('Redirect bare domain to Share page')}
</label>
<p class="form-text">${t('When enabled, accessing the root URL will redirect to the Share page instead of Login')}</p>
</div>
<div class="form-check">
<label class="form-check-label">
<input class="form-check-input" type="checkbox" name="showLoginInShareTheme" value="true">
${t('Show Login link in Share theme')}
</label>
<p class="form-text">${t('Add a login link to the Share page footer')}</p>
</div>
</div>`;
export default class ShareSettingsOptions extends OptionsWidget {
doRender() {
this.$widget = $(TPL);
this.contentSized();
}
async optionsLoaded(options: Record<string, any>) {
this.$widget.find('input[name="redirectBareDomain"]').prop('checked',
options.redirectBareDomain === 'true');
this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked',
options.showLoginInShareTheme === 'true');
}
async save() {
const redirectBareDomain = this.$widget.find('input[name="redirectBareDomain"]').prop('checked');
await this.updateOption('redirectBareDomain', redirectBareDomain.toString());
const showLoginInShareTheme = this.$widget.find('input[name="showLoginInShareTheme"]').prop('checked');
await this.updateOption('showLoginInShareTheme', showLoginInShareTheme.toString());
}
}

3
src/services/options_interface.ts
Unescape Escape View File

@ -29,6 +29,9 @@ export interface OptionDefinitions extends KeyboardShortcutsOptions<KeyboardActi
detailFontFamily: FontFamily;
monospaceFontFamily: FontFamily;
spellCheckLanguageCode: string;
// Share settings
redirectBareDomain: string;
showLoginInShareTheme: string;
codeNotesMimeTypes: string;
headingStyle: string;
highlightsList: string;

4
src/share/routes.ts
Unescape Escape View File

@ -16,7 +16,7 @@ import type SNote from "./shaca/entities/snote.js";
import type SBranch from "./shaca/entities/sbranch.js";
import type SAttachment from "./shaca/entities/sattachment.js";
import utils from "../services/utils.js";
import optionService from '../services/option_service.js';
import options from '../services/options.js';
function getSharedSubTreeRoot(note: SNote): { note?: SNote; branch?: SBranch } {
if (note.noteId === shareRoot.SHARE_ROOT_NOTE_ID) {
@ -152,7 +152,7 @@ function register(router: Router) {
const { header, content, isEmpty } = contentRenderer.getContent(note);
const subRoot = getSharedSubTreeRoot(note);
const showLoginInShareTheme = optionService.getOption('showLoginInShareTheme');
const showLoginInShareTheme = options.getOption('showLoginInShareTheme');
const opts = { note, header, content, isEmpty, subRoot, assetPath, appPath, showLoginInShareTheme };
let useDefaultView = true;