Skip to content

Commit

Permalink
[MS] Turned off home page animation
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-7 committed Dec 15, 2023
1 parent 96c35a6 commit ff7fa21
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 19 deletions.
30 changes: 14 additions & 16 deletions client/src/views/home/HomePage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

<template>
<ion-page>
<ion-content
:fullscreen="true"
>
<ion-content :fullscreen="true">
<div id="page">
<home-page-sidebar @about-click="openAboutModal" />

Expand All @@ -21,19 +19,19 @@
:show-back-button="state !== HomePageState.OrganizationList"
/>

<slide-horizontal :reverse-direction="state === HomePageState.Login">
<template v-if="state === HomePageState.OrganizationList">
<organization-list-page @organization-select="onOrganizationSelected" />
</template>
<!-- after animation -->
<template v-if="state === HomePageState.Login && selectedDevice">
<login-page
:device="selectedDevice"
@login-click="login"
@forgotten-password-click="onForgottenPasswordClicked"
/>
</template>
</slide-horizontal>
<!-- <slide-horizontal :reverse-direction="state === HomePageState.Login"> -->
<template v-if="state === HomePageState.OrganizationList">
<organization-list-page @organization-select="onOrganizationSelected" />
</template>
<!-- after animation -->
<template v-if="state === HomePageState.Login && selectedDevice">
<login-page
:device="selectedDevice"
@login-click="login"
@forgotten-password-click="onForgottenPasswordClicked"
/>
</template>
<!-- </slide-horizontal> -->
</div>
<!-- end of organization -->
</div>
Expand Down
4 changes: 1 addition & 3 deletions client/src/views/home/OrganizationListPage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@
{{ $t('HomePage.organizationList.lastLogin') }}
</p>
<p>
{{
device.slug in storedDeviceDataDict ? timeSince(storedDeviceDataDict[device.slug].lastLogin, '--') : '--'
}}
{{ device.slug in storedDeviceDataDict ? timeSince(storedDeviceDataDict[device.slug].lastLogin, '--') : '--' }}
</p>
</ion-col>
</ion-row>
Expand Down

0 comments on commit ff7fa21

Please sign in to comment.