From cb5f73148a2dc9341d16326ed606d74e818fb61d Mon Sep 17 00:00:00 2001 From: Ariadne Conill Date: Mon, 11 Nov 2019 14:25:38 -0600 Subject: app: search API is not available in private mode so disable it --- src/App.vue | 1 + 1 file changed, 1 insertion(+) (limited to 'src/App.vue') diff --git a/src/App.vue b/src/App.vue index dbe842ec..1f244b56 100644 --- a/src/App.vue +++ b/src/App.vue @@ -43,6 +43,7 @@ class="nav-icon mobile-hidden" @toggled="onSearchBarToggled" @click.stop.native + v-if="currentUser || !privateMode" /> Date: Sun, 1 Dec 2019 19:34:01 -0500 Subject: hide instance url/link/text in header using hideSitename option --- src/App.js | 1 + src/App.vue | 1 + src/boot/after_store.js | 1 + src/components/mobile_nav/mobile_nav.js | 1 + src/components/mobile_nav/mobile_nav.vue | 1 + src/components/side_drawer/side_drawer.js | 3 +++ src/components/side_drawer/side_drawer.vue | 2 +- src/modules/instance.js | 1 + 8 files changed, 10 insertions(+), 1 deletion(-) (limited to 'src/App.vue') diff --git a/src/App.js b/src/App.js index 04a40e30..78ff29da 100644 --- a/src/App.js +++ b/src/App.js @@ -90,6 +90,7 @@ export default { }, sitename () { return this.$store.state.instance.name }, chat () { return this.$store.state.chat.channel.state === 'joined' }, + hideSitename () { return this.$store.state.instance.hideSitename }, suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled }, showInstanceSpecificPanel () { return this.$store.state.instance.showInstanceSpecificPanel && diff --git a/src/App.vue b/src/App.vue index dbe842ec..c66df843 100644 --- a/src/App.vue +++ b/src/App.vue @@ -31,6 +31,7 @@
{ copyInstanceOption('alwaysShowSubjectInput') copyInstanceOption('noAttachmentLinks') copyInstanceOption('showFeaturesPanel') + copyInstanceOption('hideSitename') return store.dispatch('setTheme', config['theme']) } diff --git a/src/components/mobile_nav/mobile_nav.js b/src/components/mobile_nav/mobile_nav.js index 5a90c31f..c1166a0c 100644 --- a/src/components/mobile_nav/mobile_nav.js +++ b/src/components/mobile_nav/mobile_nav.js @@ -29,6 +29,7 @@ const MobileNav = { unseenNotificationsCount () { return this.unseenNotifications.length }, + hideSitename () { return this.$store.state.instance.hideSitename }, sitename () { return this.$store.state.instance.name } }, methods: { diff --git a/src/components/mobile_nav/mobile_nav.vue b/src/components/mobile_nav/mobile_nav.vue index d1c24e56..51f1d636 100644 --- a/src/components/mobile_nav/mobile_nav.vue +++ b/src/components/mobile_nav/mobile_nav.vue @@ -17,6 +17,7 @@ - {{ sitename }} + {{ sitename }}
    diff --git a/src/modules/instance.js b/src/modules/instance.js index 96f14ed5..625323b9 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -27,6 +27,7 @@ const defaultState = { scopeCopy: true, subjectLineBehavior: 'email', postContentType: 'text/plain', + hideSitename: false, nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, -- cgit v1.2.3-70-g09d2 From 3eeb3dc57296cba13e3760a79b635fba5a332be0 Mon Sep 17 00:00:00 2001 From: Mark Felder Date: Thu, 12 Dec 2019 13:37:32 -0600 Subject: Lint --- src/App.vue | 2 +- src/components/nav_panel/nav_panel.js | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'src/App.vue') diff --git a/src/App.vue b/src/App.vue index d455e9ed..5f8517d4 100644 --- a/src/App.vue +++ b/src/App.vue @@ -43,8 +43,8 @@ Date: Thu, 12 Dec 2019 13:46:07 -0600 Subject: Finally trust eslint --- src/App.vue | 2 +- src/components/side_drawer/side_drawer.vue | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) (limited to 'src/App.vue') diff --git a/src/App.vue b/src/App.vue index 5f8517d4..1b1c2648 100644 --- a/src/App.vue +++ b/src/App.vue @@ -41,9 +41,9 @@
    -
  • +
  • {{ $t("nav.public_tl") }}
    • -
  • +
  • {{ $t("nav.twkn") }} @@ -101,8 +105,10 @@
    -
  • +
  • {{ $t("nav.search") }} -- cgit v1.2.3-70-g09d2 From e46bb942260d192beb601727519ed90df5c62494 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Tue, 28 Jan 2020 23:45:14 +0200 Subject: updated preview to account for underlay --- src/App.scss | 4 +- src/App.vue | 2 +- src/components/style_switcher/preview.vue | 188 ++++++++++++----------- src/components/style_switcher/style_switcher.vue | 4 +- 4 files changed, 107 insertions(+), 91 deletions(-) (limited to 'src/App.vue') diff --git a/src/App.scss b/src/App.scss index 1fabaaa9..85fd0b47 100644 --- a/src/App.scss +++ b/src/App.scss @@ -31,9 +31,11 @@ h4 { margin: auto; min-height: 100vh; max-width: 980px; + align-content: flex-start; +} +.underlay { background-color: rgba(0,0,0,0.15); background-color: var(--underlay, rgba(0,0,0,0.15)); - align-content: flex-start; } .text-center { diff --git a/src/App.vue b/src/App.vue index 1b1c2648..ff62fc51 100644 --- a/src/App.vue +++ b/src/App.vue @@ -78,7 +78,7 @@
    diff --git a/src/components/style_switcher/preview.vue b/src/components/style_switcher/preview.vue index 101a32bd..5b8c3839 100644 --- a/src/components/style_switcher/preview.vue +++ b/src/components/style_switcher/preview.vue @@ -1,101 +1,117 @@ + + diff --git a/src/components/style_switcher/style_switcher.vue b/src/components/style_switcher/style_switcher.vue index 5a42bba7..a3f9b488 100644 --- a/src/components/style_switcher/style_switcher.vue +++ b/src/components/style_switcher/style_switcher.vue @@ -116,9 +116,7 @@
    -
    - -
    + -- cgit v1.2.3-70-g09d2 From 2e35289c3376881ca17b9330113c816a3327f245 Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 3 May 2020 17:36:12 +0300 Subject: initial work on settings modal --- src/App.js | 5 + src/App.scss | 3 + src/App.vue | 7 +- .../mobile_post_status_button.js | 2 +- .../post_status_modal/post_status_modal.js | 3 - .../post_status_modal/post_status_modal.vue | 1 - src/components/settings_modal/settings_modal.js | 39 ++ src/components/settings_modal/settings_modal.scss | 59 ++ src/components/settings_modal/settings_modal.vue | 31 ++ .../settings_modal/tabs/data_import_export.js | 65 +++ .../settings_modal/tabs/data_import_export.vue | 43 ++ .../settings_modal/tabs/mutes_and_blocks.js | 124 +++++ .../settings_modal/tabs/mutes_and_blocks.vue | 173 ++++++ .../settings_modal/tabs/notifications.js | 27 + .../settings_modal/tabs/notifications.vue | 42 ++ src/components/settings_modal/tabs/profile.js | 179 ++++++ src/components/settings_modal/tabs/profile.scss | 82 +++ src/components/settings_modal/tabs/profile.vue | 213 ++++++++ src/components/settings_modal/tabs/security.js | 106 ++++ src/components/settings_modal/tabs/security.vue | 143 +++++ src/components/tab_switcher/tab_switcher.js | 7 +- src/components/tab_switcher/tab_switcher.scss | 220 +++++--- src/components/user_settings/user_settings.js | 257 +-------- src/components/user_settings/user_settings.vue | 597 --------------------- src/i18n/en.json | 1 + src/modules/interface.js | 28 + 26 files changed, 1530 insertions(+), 927 deletions(-) create mode 100644 src/components/settings_modal/settings_modal.js create mode 100644 src/components/settings_modal/settings_modal.scss create mode 100644 src/components/settings_modal/settings_modal.vue create mode 100644 src/components/settings_modal/tabs/data_import_export.js create mode 100644 src/components/settings_modal/tabs/data_import_export.vue create mode 100644 src/components/settings_modal/tabs/mutes_and_blocks.js create mode 100644 src/components/settings_modal/tabs/mutes_and_blocks.vue create mode 100644 src/components/settings_modal/tabs/notifications.js create mode 100644 src/components/settings_modal/tabs/notifications.vue create mode 100644 src/components/settings_modal/tabs/profile.js create mode 100644 src/components/settings_modal/tabs/profile.scss create mode 100644 src/components/settings_modal/tabs/profile.vue create mode 100644 src/components/settings_modal/tabs/security.js create mode 100644 src/components/settings_modal/tabs/security.vue (limited to 'src/App.vue') diff --git a/src/App.js b/src/App.js index 61b5eec1..4d9d50d4 100644 --- a/src/App.js +++ b/src/App.js @@ -6,6 +6,7 @@ import InstanceSpecificPanel from './components/instance_specific_panel/instance import FeaturesPanel from './components/features_panel/features_panel.vue' import WhoToFollowPanel from './components/who_to_follow_panel/who_to_follow_panel.vue' import ChatPanel from './components/chat_panel/chat_panel.vue' +import SettingsModal from './components/settings_modal/settings_modal.vue' import MediaModal from './components/media_modal/media_modal.vue' import SideDrawer from './components/side_drawer/side_drawer.vue' import MobilePostStatusButton from './components/mobile_post_status_button/mobile_post_status_button.vue' @@ -29,6 +30,7 @@ export default { SideDrawer, MobilePostStatusButton, MobileNav, + SettingsModal, UserReportingModal, PostStatusModal }, @@ -112,6 +114,9 @@ export default { onSearchBarToggled (hidden) { this.searchBarHidden = hidden }, + openSettingsModal () { + this.$store.dispatch('openSettingsModal') + }, updateMobileState () { const mobileLayout = windowWidth() <= 800 const changed = mobileLayout !== this.isMobileLayout diff --git a/src/App.scss b/src/App.scss index 89aa3215..7db9461c 100644 --- a/src/App.scss +++ b/src/App.scss @@ -860,6 +860,7 @@ nav { } } +// DELETE .setting-item { border-bottom: 2px solid var(--fg, $fallback--fg); margin: 1em 1em 1.4em; @@ -905,6 +906,8 @@ nav { max-width: 6em; } } +// DELETE + .select-multiple { display: flex; .option-list { diff --git a/src/App.vue b/src/App.vue index ff62fc51..db3f981f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -46,15 +46,15 @@ @toggled="onSearchBarToggled" @click.stop.native /> - - + +
    diff --git a/src/components/mobile_post_status_button/mobile_post_status_button.js b/src/components/mobile_post_status_button/mobile_post_status_button.js index 0ad12bb1..ff2d4eaa 100644 --- a/src/components/mobile_post_status_button/mobile_post_status_button.js +++ b/src/components/mobile_post_status_button/mobile_post_status_button.js @@ -52,7 +52,7 @@ const MobilePostStatusButton = { window.removeEventListener('scroll', this.handleScrollEnd) }, openPostForm () { - this.$store.dispatch('openPostStatusModal') + this.$store.dispatch('openSettingsModal') }, handleOSK () { // This is a big hack: we're guessing from changed window sizes if the diff --git a/src/components/post_status_modal/post_status_modal.js b/src/components/post_status_modal/post_status_modal.js index b44354db..be945400 100644 --- a/src/components/post_status_modal/post_status_modal.js +++ b/src/components/post_status_modal/post_status_modal.js @@ -13,9 +13,6 @@ const PostStatusModal = { } }, computed: { - isLoggedIn () { - return !!this.$store.state.users.currentUser - }, modalActivated () { return this.$store.state.postStatus.modalActivated }, diff --git a/src/components/post_status_modal/post_status_modal.vue b/src/components/post_status_modal/post_status_modal.vue index dbcd321e..07c58f74 100644 --- a/src/components/post_status_modal/post_status_modal.vue +++ b/src/components/post_status_modal/post_status_modal.vue @@ -1,6 +1,5 @@