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.

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

removed all async component loading #3505

Merged
merged 1 commit into from
May 15, 2024
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
3 changes: 2 additions & 1 deletion src/js/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,13 @@ import './assets/scss/print.scss'
import './assets/scss/transitions.scss'
import './assets/scss/markdown.scss'
import { watchPolls } from './mixins/watchPolls.js'
import LoadingOverlay from './components/Base/modules/LoadingOverlay.vue'

export default {
name: 'App',
components: {
NcContent,
LoadingOverlay: () => import('./components/Base/modules/LoadingOverlay.vue'),
LoadingOverlay,
UserSettingsDlg,
},

Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Actions/modules/ActionRegister.vue
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@

<script>
import { NcModal, NcButton } from '@nextcloud/vue'
import PublicRegisterModal from '../../Public/PublicRegisterModal.vue'

export default {
name: 'ActionRegister',

components: {
NcButton,
NcModal,
PublicRegisterModal: () => import('../../Public/PublicRegisterModal.vue'),
PublicRegisterModal,
},

data() {
Expand Down
4 changes: 3 additions & 1 deletion src/js/components/Base/modules/ConfigBox.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
</template>

<script>
import InformationIcon from 'vue-material-design-icons/InformationVariant.vue'

export default {
name: 'ConfigBox',
components: {
InformationIcon: () => import('vue-material-design-icons/InformationVariant.vue'),
InformationIcon,
},
props: {
name: {
Expand Down
15 changes: 8 additions & 7 deletions src/js/components/Cards/VoteInfoCards.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,19 @@

<script>
import { mapState, mapGetters } from 'vuex'
import { CardAddProposals, CardClosedPoll, CardLimitedVotes, CardLocked, CardRegister, CardSendConfirmations, CardUnpublishedPoll } from './index.js'

export default {
name: 'VoteInfoCards',

components: {
CardAddProposals: () => import('./modules/CardAddProposals.vue'),
CardClosedPoll: () => import('./modules/CardClosedPoll.vue'),
CardLimitedVotes: () => import('./modules/CardLimitedVotes.vue'),
CardLocked: () => import('./modules/CardLocked.vue'),
CardRegister: () => import('./modules/CardRegister.vue'),
CardSendConfirmations: () => import('./modules/CardSendConfirmations.vue'),
CardUnpublishedPoll: () => import('./modules/CardUnpublishedPoll.vue'),
CardAddProposals,
CardClosedPoll,
CardLimitedVotes,
CardLocked,
CardRegister,
CardSendConfirmations,
CardUnpublishedPoll,

},

Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Cards/modules/CardAddProposals.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,13 @@
<script>
import { mapState, mapGetters } from 'vuex'
import { CardDiv } from '../../Base/index.js'
import OptionProposals from '../../Options/OptionProposals.vue'

export default {
name: 'CardAddProposals',
components: {
CardDiv,
OptionProposals: () => import('../../Options/OptionProposals.vue'),
OptionProposals,
},

data() {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Cards/modules/CardHiddenParticipants.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
<script>
import { mapState, mapGetters } from 'vuex'
import { CardDiv } from '../../Base/index.js'
import ActionSwitchSafeTable from '../../Actions/modules/ActionSwitchSafeTable.vue'

export default {
name: 'CardHiddenParticipants',
components: {
CardDiv,
ActionSwitchSafeTable: () => import('../../Actions/modules/ActionSwitchSafeTable.vue'),
ActionSwitchSafeTable,
},

data() {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Cards/modules/CardLimitedVotes.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,13 @@
<script>
import { mapState, mapGetters, mapActions } from 'vuex'
import { CardDiv } from '../../Base/index.js'
import ActionDeleteOrphanedVotes from '../../Actions/modules/ActionDeleteOrphanedVotes.vue'

export default {
name: 'CardLimitedVotes',
components: {
CardDiv,
ActionDeleteOrphanedVotes: () => import('../../Actions/modules/ActionDeleteOrphanedVotes.vue'),
ActionDeleteOrphanedVotes,
},

computed: {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Cards/modules/CardRegister.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,13 @@
<script>
import { mapState } from 'vuex'
import { CardDiv } from '../../Base/index.js'
import ActionRegister from '../../Actions/modules/ActionRegister.vue'

export default {
name: 'CardRegister',
components: {
CardDiv,
ActionRegister: () => import('../../Actions/modules/ActionRegister.vue'),
ActionRegister,
},

data() {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Cards/modules/CardSendConfirmations.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,13 @@
<script>
import { mapState, mapGetters } from 'vuex'
import { CardDiv } from '../../Base/index.js'
import ActionSendConfirmed from '../../Actions/modules/ActionSendConfirmed.vue'

export default {
name: 'CardSendConfirmations',
components: {
CardDiv,
ActionSendConfirmed: () => import('../../Actions/modules/ActionSendConfirmed.vue'),
ActionSendConfirmed,
},

data() {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Cards/modules/CardUnpublishedPoll.vue
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,13 @@
<script>
import { mapState } from 'vuex'
import { CardDiv } from '../../Base/index.js'
import ActionOpenSharesSidebar from '../../Actions/modules/ActionOpenSharesSidebar.vue'

export default {
name: 'CardUnpublishedPoll',
components: {
CardDiv,
ActionOpenSharesSidebar: () => import('../../Actions/modules/ActionOpenSharesSidebar.vue'),
ActionOpenSharesSidebar,
},

data() {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Configuration/ConfigAutoReminder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
import { mapState } from 'vuex'
import { NcActions, NcActionButton, NcPopover, NcCheckboxRadioSwitch } from '@nextcloud/vue'
import InformationIcon from 'vue-material-design-icons/InformationVariant.vue'
import AutoReminderInformation from './AutoReminderInformation.vue'

export default {
name: 'ConfigAutoReminder',
Expand All @@ -54,7 +55,7 @@ export default {
NcActionButton,
NcPopover,
InformationIcon,
AutoReminderInformation: () => import('./AutoReminderInformation.vue'),
AutoReminderInformation,
},

computed: {
Expand Down
6 changes: 4 additions & 2 deletions src/js/components/Options/OptionProposals.vue
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@

<script>
import { mapState, mapGetters } from 'vuex'
import OptionsDateAdd from './OptionsDateAdd.vue'
import OptionsTextAdd from './OptionsTextAdd.vue'

export default {
name: 'OptionProposals',

components: {
OptionsDateAdd: () => import('./OptionsDateAdd.vue'),
OptionsTextAdd: () => import('./OptionsTextAdd.vue'),
OptionsDateAdd,
OptionsTextAdd,
},

computed: {
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Options/OptionsDate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ import DeleteIcon from 'vue-material-design-icons/Delete.vue'
import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
import OptionItemOwner from './OptionItemOwner.vue'

export default {
name: 'OptionsDate',
Expand All @@ -113,7 +114,7 @@ export default {
NcModal,
OptionCloneDate,
OptionItem,
OptionItemOwner: () => import('./OptionItemOwner.vue'),
OptionItemOwner,
},

mixins: [
Expand Down
3 changes: 2 additions & 1 deletion src/js/components/Options/OptionsText.vue
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ import RestoreIcon from 'vue-material-design-icons/Recycle.vue'
import TextPollIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
import OptionsTextAdd from './OptionsTextAdd.vue'

export default {
name: 'OptionsText',
Expand All @@ -109,7 +110,7 @@ export default {
OptionItemOwner,
NcActions,
NcActionButton,
OptionsTextAdd: () => import('./OptionsTextAdd.vue'),
OptionsTextAdd,
},

mixins: [
Expand Down
9 changes: 6 additions & 3 deletions src/js/components/Poll/PollHeaderButtons.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ import { mapState } from 'vuex'
import { NcButton, NcPopover } from '@nextcloud/vue'
import { ActionToggleSidebar } from '../Actions/index.js'
import PollInformationIcon from 'vue-material-design-icons/InformationOutline.vue'
import PollInformation from '../Poll/PollInformation.vue'
import UserMenu from '../User/UserMenu.vue'
import ExportPoll from '../Export/ExportPoll.vue'

export default {
name: 'PollHeaderButtons',
Expand All @@ -53,9 +56,9 @@ export default {
PollInformationIcon,
NcPopover,
NcButton,
UserMenu: () => import('../User/UserMenu.vue'),
ExportPoll: () => import('../Export/ExportPoll.vue'),
PollInformation: () => import('../Poll/PollInformation.vue'),
UserMenu,
ExportPoll,
PollInformation,
},

data() {
Expand Down
13 changes: 13 additions & 0 deletions src/js/components/Settings/AdminSettings/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export { default as AdminActivities } from './AdminActivities.vue'
export { default as AdminArchivePolls } from './AdminArchivePolls.vue'
export { default as AdminCombo } from './AdminCombo.vue'
export { default as AdminEmail } from './AdminEmail.vue'
export { default as AdminLegal } from './AdminLegal.vue'
export { default as AdminPerformance } from './AdminPerformance.vue'
export { default as AdminPollCreation } from './AdminPollCreation.vue'
export { default as AdminPollDownload } from './AdminPollDownload.vue'
export { default as AdminPollsInNavigation } from './AdminPollsInNavigation.vue'
export { default as AdminShareOpenPoll } from './AdminShareOpenPoll.vue'
export { default as AdminSharePublicCreate } from './AdminSharePublicCreate.vue'
export { default as AdminSharePublicShowLogin } from './AdminSharePublicShowLogin.vue'
export { default as AdminShowMailAddresses } from './AdminShowMailAddresses.vue'
4 changes: 4 additions & 0 deletions src/js/components/Settings/UserSettings/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export {default as CalendarSettings } from './CalendarSettings.vue'
export {default as FeatureSettings } from './FeatureSettings.vue'
export {default as StyleSettings } from './StyleSettings.vue'
export {default as PerformanceSettings } from './PerformanceSettings.vue'
9 changes: 5 additions & 4 deletions src/js/components/Settings/UserSettingsDlg.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,17 +44,18 @@

import { NcAppSettingsDialog, NcAppSettingsSection } from '@nextcloud/vue'
import { subscribe, unsubscribe } from '@nextcloud/event-bus'
import { CalendarSettings, FeatureSettings, StyleSettings, PerformanceSettings } from './UserSettings/index.js'

export default {
name: 'UserSettingsDlg',

components: {
NcAppSettingsDialog,
NcAppSettingsSection,
CalendarSettings: () => import('./UserSettings/CalendarSettings.vue'),
FeatureSettings: () => import('./UserSettings/FeatureSettings.vue'),
StyleSettings: () => import('./UserSettings/StyleSettings.vue'),
PerformanceSettings: () => import('./UserSettings/PerformanceSettings.vue'),
CalendarSettings,
FeatureSettings,
StyleSettings,
PerformanceSettings,
},

data() {
Expand Down
6 changes: 4 additions & 2 deletions src/js/components/SideBar/SideBarTabOptions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ import AddDateIcon from 'vue-material-design-icons/CalendarPlus.vue'
import DateOptionsIcon from 'vue-material-design-icons/CalendarMonth.vue'
import ShiftDateIcon from 'vue-material-design-icons/CalendarStart.vue'
import TextOptionsIcon from 'vue-material-design-icons/FormatListBulletedSquare.vue'
import OptionsDateAdd from '../Options/OptionsDateAdd.vue'
import OptionsTextAddBulk from '../Options/OptionsTextAddBulk.vue'

export default {
name: 'SideBarTabOptions',
Expand All @@ -91,8 +93,8 @@ export default {
OptionsDate,
OptionsDateShift,
OptionsText,
OptionsDateAdd: () => import('../Options/OptionsDateAdd.vue'),
OptionsTextAddBulk: () => import('../Options/OptionsTextAddBulk.vue'),
OptionsDateAdd,
OptionsTextAddBulk,
},

computed: {
Expand Down
6 changes: 6 additions & 0 deletions src/js/components/SideBar/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export { default as SideBarTabConfiguration } from './SideBarTabConfiguration.vue'
export { default as SideBarTabComments } from './SideBarTabComments.vue'
export { default as SideBarTabOptions } from './SideBarTabOptions.vue'
export { default as SideBarTabShare } from './SideBarTabShare.vue'
export { default as SideBarTabActivity } from './SideBarTabActivity.vue'
export { default as SideBarTabDatePolls } from './SideBarTabDatePolls.vue'
34 changes: 22 additions & 12 deletions src/js/components/User/UserItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<LinkIcon v-if="typeComputed === 'public'" :size="mdIconSize" />
<LinkIcon v-if="typeComputed === 'addPublicLink'" :size="mdIconSize" />
<AnoymousIcon v-if="typeComputed === 'anonymous'" :size="mdIconSize" />
<InternalLinkIcon v-if="typeComputed === 'internalAccess'" :size="mdIconSize" />
<LinkIcon v-if="typeComputed === 'internalAccess'" :size="mdIconSize" />
<ContactGroupIcon v-if="typeComputed === 'contactGroup'" :size="mdIconSize" />
<GroupIcon v-if="typeComputed === 'group'" :size="mdIconSize" />
<CircleIcon v-if="typeComputed === 'circle'" :size="mdIconSize" />
Expand Down Expand Up @@ -60,23 +60,33 @@
<script>
import { getCurrentUser } from '@nextcloud/auth'
import { NcAvatar } from '@nextcloud/vue'
import AdminIcon from 'vue-material-design-icons/ShieldCrown.vue'
import LinkIcon from 'vue-material-design-icons/LinkVariant.vue'
import ContactIcon from 'vue-material-design-icons/CardAccountDetails.vue'
import EmailIcon from 'vue-material-design-icons/Email.vue'
import ShareIcon from 'vue-material-design-icons/ShareVariant.vue'
import ContactGroupIcon from 'vue-material-design-icons/AccountGroupOutline.vue'
import GroupIcon from 'vue-material-design-icons/AccountMultiple.vue'
import CircleIcon from 'vue-material-design-icons/GoogleCirclesExtended.vue'
import DeletedUserIcon from 'vue-material-design-icons/AccountOff.vue'
import AnoymousIcon from 'vue-material-design-icons/Incognito.vue'


export default {
name: 'UserItem',

components: {
NcAvatar,
AdminIcon: () => import('vue-material-design-icons/ShieldCrown.vue'),
LinkIcon: () => import('vue-material-design-icons/LinkVariant.vue'),
InternalLinkIcon: () => import('vue-material-design-icons/LinkVariant.vue'),
ContactIcon: () => import('vue-material-design-icons/CardAccountDetails.vue'),
EmailIcon: () => import('vue-material-design-icons/Email.vue'),
ShareIcon: () => import('vue-material-design-icons/ShareVariant.vue'),
ContactGroupIcon: () => import('vue-material-design-icons/AccountGroupOutline.vue'),
GroupIcon: () => import('vue-material-design-icons/AccountMultiple.vue'),
CircleIcon: () => import('vue-material-design-icons/GoogleCirclesExtended.vue'),
DeletedUserIcon: () => import('vue-material-design-icons/AccountOff.vue'),
AnoymousIcon: () => import('vue-material-design-icons/Incognito.vue'),
AdminIcon,
LinkIcon,
ContactIcon,
EmailIcon,
ShareIcon,
ContactGroupIcon,
GroupIcon,
CircleIcon,
DeletedUserIcon,
AnoymousIcon,
},

inheritAttrs: false,
Expand Down
6 changes: 4 additions & 2 deletions src/js/components/VoteTable/VoteColumn.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ import VoteItem from './VoteItem.vue'
import { confirmOption } from '../../mixins/optionMixins.js'
import UnconfirmIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
import ConfirmIcon from 'vue-material-design-icons/CheckboxBlankOutline.vue'
import CalendarPeek from '../Calendar/CalendarPeek.vue'
import OptionItemOwner from '../Options/OptionItemOwner.vue'

export default {
name: 'VoteColumn',
Expand All @@ -79,8 +81,8 @@ export default {
FlexSpacer,
VoteItem,
NcButton,
CalendarPeek: () => import('../Calendar/CalendarPeek.vue'),
OptionItemOwner: () => import('../Options/OptionItemOwner.vue'),
CalendarPeek,
OptionItemOwner,
},

mixins: [confirmOption],
Expand Down
Loading
Loading