Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

move files #10137

Merged
merged 5 commits into from
Sep 18, 2024
Merged

move files #10137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
627acac
move files
hamza221 Sep 12, 2024
e62a7db
UI-fixes
hamza221 Sep 12, 2024
4ad4f4a
fixup! UI-fixes
hamza221 Sep 16, 2024
ceb4002
fixup! UI-fixes
hamza221 Sep 16, 2024
a3cc9f5
fixup! UI-fixes
hamza221 Sep 17, 2024
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 src/components/AccountSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ import CertificateSettings from './CertificateSettings.vue'
import SearchSettings from './SearchSettings.vue'
import TrashRetentionSettings from './TrashRetentionSettings.vue'
import logger from '../logger.js'
import MailFilters from './MailFilters.vue'
import MailFilters from './mailFilter/MailFilters.vue'

export default {
name: 'AccountSettings',
Expand Down
165 changes: 0 additions & 165 deletions src/components/MailFilterTest.vue
View file
Open in desktop

This file was deleted.

30 changes: 1 addition & 29 deletions src/components/MailFilterAction.vue → ...omponents/mailFilter/MailFilterAction.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
<NcButton aria-label="Delete action"
type="tertiary-no-background"
@click="deleteAction">
{{ t('mail', 'Delete action') }}
<template #icon>
<DeleteIcon :size="20" />
</template>
Expand Down Expand Up @@ -77,12 +78,6 @@ export default {
},
},
methods: {
// changeActionType(value) {
// this.changeAction({
// id: this.action.id,
// type: value,
// })
// },
updateAction(properties) {
this.$emit('update-action', { ...this.action, ...properties })
},
Expand All @@ -98,27 +93,4 @@ export default {
gap: 5px;
align-items: baseline;
}
//
//.mail-filter-column label {
// display: block;
//}
//
//.form-group {
// margin: calc(var(--default-grid-baseline) * 4) 0;
// display: flex;
// flex-direction: column;
// align-items: flex-start;
//}
//
//.external-label {
// display: flex;
// width: 100%;
// margin-top: 1rem;
//}
//
//.external-label label {
// padding-top: 7px;
// padding-right: 14px;
// white-space: nowrap;
//}
</style>
0 src/components/MailFilterActionAddflag.vue → ...ts/mailFilter/MailFilterActionAddflag.vue
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/components/MailFilterActionFileinto.vue → ...s/mailFilter/MailFilterActionFileinto.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<script>

import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
import { mailboxHasRights } from '../util/acl.js'
import { mailboxHasRights } from '../../util/acl.js'
export default {
name: 'MailFilterActionFileinto',
components: {
Expand Down
0 src/components/MailFilterDeleteModal.vue → ...ents/mailFilter/MailFilterDeleteModal.vue
View file
Open in desktop
File renamed without changes.
21 changes: 11 additions & 10 deletions src/components/MailFilterOperator.vue → ...ponents/mailFilter/MailFilterOperator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,24 +8,20 @@
<p>{{ t('mail', 'Operator') }}</p>
</div>
<div class="mail-filter-row">
<NcCheckboxRadioSwitch :checked.sync="filter.operator"
<NcCheckboxRadioSwitch :checked="filter.operator"
value="allof"
name="sharing_permission_radio"
type="radio">
type="radio"
@update:checked="updateFilter('allof')">
{{ t('mail', 'allof') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="filter.operator"
<NcCheckboxRadioSwitch :checked="filter.operator"
value="anyof"
name="sharing_permission_radio"
type="radio">
type="radio"
@update:checked="updateFilter('anyof')">
{{ t('mail', 'anyof') }}
</NcCheckboxRadioSwitch>
<NcCheckboxRadioSwitch :checked.sync="filter.operator"
value="true"
name="sharing_permission_radio"
type="radio">
{{ t('mail', 'true') }}
</NcCheckboxRadioSwitch>
</div>
</div>
</template>
Expand All @@ -43,6 +39,11 @@ export default {
required: true,
},
},
methods: {
updateFilter(operator) {
this.$emit('update:operator', operator)
},
},
}
</script>
<style lang="scss" scoped>
Expand Down
Loading
Loading