Skip to content

Commit

Permalink
Merge pull request #83 from ymaheshwari1/#82
Browse files Browse the repository at this point in the history
Improved: app to upgrade ionic to v7.6.0(#82)
  • Loading branch information
ymaheshwari1 authored Feb 23, 2024
2 parents 745259a + e1955d7 commit 592f44a
Show file tree
Hide file tree
Showing 4 changed files with 125 additions and 59 deletions.
164 changes: 118 additions & 46 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@
"dependencies": {
"@hotwax/dxp-components": "^1.11.0",
"@hotwax/oms-api": "^1.9.0",
"@ionic/vue": "^6.0.2",
"@ionic/vue-router": "^6.0.2",
"@ionic/core": "^7.6.0",
"@ionic/vue": "^7.6.0",
"@ionic/vue-router": "^7.6.0",
"core-js": "^3.8.3",
"firebase": "^10.3.1",
"luxon": "^3.3.0",
Expand Down
4 changes: 1 addition & 3 deletions src/views/Home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
<ion-list>
<ion-item lines="full">
<ion-icon slot="start" :icon="lockClosedOutline"/>
<ion-label>
{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}
</ion-label>
{{ authStore.current?.partyName ? authStore.current?.partyName : authStore.current.userLoginId }}
<ion-button fill="outline" color="medium" slot="end" @click="authStore.logout()">
{{ $t('Logout') }}
</ion-button>
Expand Down
11 changes: 3 additions & 8 deletions src/views/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
<Logo />
<section v-if="showOmsInput">
<ion-item lines="full">
<ion-label position="fixed">{{ $t("OMS") }}</ion-label>
<ion-input name="instanceUrl" v-model="instanceUrl" id="instanceUrl" type="text" required />
<ion-input :label="$t('OMS')" label-placement="fixed" name="instanceUrl" v-model="instanceUrl" id="instanceUrl" type="text" required />
</ion-item>

<div class="ion-padding">
Expand All @@ -28,12 +27,10 @@
</div>

<ion-item lines="full">
<ion-label position="fixed">{{ $t("Username") }}</ion-label>
<ion-input name="username" v-model="username" id="username" type="text" required />
<ion-input :label="$t('Username')" label-placement="fixed" name="username" v-model="username" id="username" type="text" required />
</ion-item>
<ion-item lines="none">
<ion-label position="fixed">{{ $t("Password") }}</ion-label>
<ion-input name="password" v-model="password" id="password" type="password" required />
<ion-input :label="$t('Password')" label-placement="fixed" name="password" v-model="password" id="password" type="password" required />
</ion-item>

<div class="ion-padding">
Expand Down Expand Up @@ -67,7 +64,6 @@ import {
IonIcon,
IonInput,
IonItem,
IonLabel,
IonPage,
loadingController
} from "@ionic/vue";
Expand All @@ -92,7 +88,6 @@ export default defineComponent({
IonIcon,
IonInput,
IonItem,
IonLabel,
IonPage,
Logo
},
Expand Down

0 comments on commit 592f44a

Please sign in to comment.