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

Implemented instance url flow #27

Merged
merged 1 commit into from
Dec 15, 2021
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
4 changes: 3 additions & 1 deletion src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,9 @@ const api = async (customConfig: any) => {
data: customConfig.data,
params: customConfig.params
}
const baseURL = process.env.VUE_APP_BASE_URL;

let baseURL = store.getters['user/getInstanceUrl'];
baseURL = baseURL.startsWith('http') ? baseURL : `https://${baseURL}.hotwax.io/api/`;
if (baseURL) config.baseURL = baseURL;

if(customConfig.cache) config.adapter = axiosCache.adapter;
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
"Enter an order ID, product name, style name, SKU, customer name, UPCA or external ID":"Enter an order ID, product name, style name, SKU, customer name, UPCA or external ID",
"How are orders released?":"How are orders released?",
"in stock": "in stock",
"Instance Url": "Instance Url",
"Item cancelled successfully": "Item cancelled successfully",
"items preordered": "items preordered",
"Item promise date updated successfully": "Item promise date updated successfully",
Expand Down
1 change: 1 addition & 0 deletions src/store/modules/user/UserState.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ export default interface UserState {
token: string;
current: object | null;
selectedBrand: string;
instanceUrl: string;
}
7 changes: 7 additions & 0 deletions src/store/modules/user/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,13 @@ const actions: ActionTree<UserState, RootState> = {
// Reset all the current queries
this.dispatch("product/resetProductList")
this.dispatch("order/resetOrderQuery")
},

/**
* Set User Instance Url
*/
setUserInstanceUrl ({ state, commit }, payload){
commit(types.USER_INSTANCE_URL_UPDATED, payload)
}
}
export default actions;
3 changes: 3 additions & 0 deletions src/store/modules/user/getters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@ const getters: GetterTree <UserState, RootState> = {
},
getSelectedBrand (state) {
return state.selectedBrand
},
getInstanceUrl (state) {
return state.instanceUrl;
}
}
export default getters;
3 changes: 2 additions & 1 deletion src/store/modules/user/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ const userModule: Module<UserState, RootState> = {
state: {
token: '',
current: null,
selectedBrand: ''
selectedBrand: '',
instanceUrl: '',
},
getters,
actions,
Expand Down
3 changes: 2 additions & 1 deletion src/store/modules/user/mutation-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,5 @@ export const SN_USER = 'user'
export const USER_TOKEN_CHANGED = SN_USER + '/TOKEN_CHANGED'
export const USER_END_SESSION = SN_USER + '/END_SESSION'
export const USER_INFO_UPDATED = SN_USER + '/INFO_UPDATED'
export const USER_BRAND_UPDATED = SN_USER + '/BRAND_UPDATED'
export const USER_BRAND_UPDATED = SN_USER + '/BRAND_UPDATED'
export const USER_INSTANCE_URL_UPDATED = SN_USER + '/INSTANCE_URL_UPDATED'
3 changes: 3 additions & 0 deletions src/store/modules/user/mutations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@ const mutations: MutationTree <UserState> = {
[types.USER_BRAND_UPDATED] (state, payload) {
state.selectedBrand = payload
},
[types.USER_INSTANCE_URL_UPDATED] (state, payload) {
state.instanceUrl = payload;
}
}
export default mutations;
21 changes: 18 additions & 3 deletions src/views/login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
<form class="login-container" @keyup.enter="login(form)" @submit.prevent="login(form)">
<img src="../assets/images/hc.png"/>

<ion-item lines="full">
<ion-label>{{ $t("Instance Url") }}</ion-label>
<ion-input name="instanceUrl" v-model="instanceUrl" id="instanceUrl" type="text" required />
</ion-item>
<ion-item lines="full">
<ion-label>{{ $t("Username") }}</ion-label>
<ion-input name="username" v-model="username" id="username" type="text" required></ion-input>
<ion-input name="username" v-model="username" id="username" type="text" required />
</ion-item>
<ion-item lines="none">
<ion-label>{{ $t("Password") }}</ion-label>
<ion-input name="password" v-model="password" id="password" type="password" required></ion-input>
<ion-input name="password" v-model="password" id="password" type="password" required />
</ion-item>

<div class="ion-padding">
Expand All @@ -34,6 +38,7 @@ import {
import { defineComponent } from "vue";
import { useRouter } from "vue-router";
import { useStore } from "./../store";
import { mapGetters } from 'vuex';

export default defineComponent({
name: "login",
Expand All @@ -48,11 +53,21 @@ export default defineComponent({
data() {
return {
username: "",
password: ""
password: "",
instanceUrl: ""
};
},
computed: {
...mapGetters({
currentInstanceUrl: 'user/getInstanceUrl'
})
},
mounted() {
this.instanceUrl= this.currentInstanceUrl;
},
methods: {
login: function () {
this.store.dispatch("user/setUserInstanceUrl", this.instanceUrl)
const { username, password } = this;
this.store.dispatch("user/login", { username, password }).then((data: any) => {
if (data.token) {
Expand Down