Skip to content

Commit

Permalink
Implemented: removed active session from the locales file and simplif…
Browse files Browse the repository at this point in the history
…ied the login guiard
  • Loading branch information
sanskar345 committed Aug 3, 2023
1 parent 1ceacd7 commit c73eb3d
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 7 deletions.
1 change: 0 additions & 1 deletion src/locales/en.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"App": "App",
"Active session": "Active session",
"All items were canceled from the order": "All items were canceled from the order",
"An email notification will be sent to that their order is ready for pickup. This order will also be moved to the packed orders tab.": "An email notification will be sent to { customerName } that their order is ready for pickup.{ space } This order will also be moved to the packed orders tab.",
"An email notification will be sent to that their order is ready for pickup.": "An email notification will be sent to { customerName } that their order is ready for pickup.",
Expand Down
1 change: 0 additions & 1 deletion src/locales/es.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"App": "Aplicación",
"Active session": "Active session",
"All items were canceled from the order": "Todos los artículos se cancelaron del pedido",
"An email notification will be sent to that their order is ready for pickup. This order will also be moved to the packed orders tab.": "Se enviará una notificación por correo electrónico a {customerName} de que su pedido está listo para recoger.{ space } Este pedido también se moverá a la pestaña de pedidos empacados.",
"An email notification will be sent to that their order is ready for pickup.": "Se enviará una notificación por correo electrónico a {customerName} de que su pedido está listo para recoger.",
Expand Down
1 change: 0 additions & 1 deletion src/locales/ja.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
{
"App": "App",
"Active session": "Active session",
"All items were canceled from the order": "全ての商品が注文からキャンセルされました",
"An email notification will be sent to that their order is ready for pickup. This order will also be moved to the packed orders tab.": "{ customerName }様宛に注文の受け取り準備が完了したことをお知らするメールが送信されます。{ space } この注文は「梱包済み注文」タブに移動されます.",
"An email notification will be sent to that their order is ready for pickup.": "{ customerName }様宛に注文の受け取り準備が完了したことをお知らするメールが送信されます。",
Expand Down
6 changes: 2 additions & 4 deletions src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@ const authGuard = async (to: any, from: any, next: any) => {

const loginGuard = (to: any, from: any, next: any) => {
const authStore = useAuthStore()
if (authStore.isAuthenticated) {
// if route has token and oms do the login flow processing
if (to.query?.token && to.query?.oms) next()
else next('/')
if (authStore.isAuthenticated && !to.query?.token && !to.query?.oms) {
next('/')
}
next();
};
Expand Down

0 comments on commit c73eb3d

Please sign in to comment.