@fishawack/lab-velocity 1.4.0 → 1.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/AuthModule/js/AuthRoutes.js +9 -2
  2. package/AuthModule/js/AuthStore.js +1 -1
  3. package/AuthModule/routes/logincallback.vue +1 -3
  4. package/_variables.scss +1 -1
  5. package/general.scss +1 -0
  6. package/modules/_AuthModule.scss +3 -1
  7. package/modules/_AuthVariables.scss +6 -1
  8. package/package.json +1 -1
package/AuthModule/js/AuthRoutes.js CHANGED
@@ -143,8 +143,9 @@ export function configureRoutes(router) {
143
143
  } else if (to.name === "login" || to.name === `${authBase}.login`) {
144
144
  if(autoLogin) {
145
145
  next({ name: `${authBase}.force-login` });
146
+ } else {
147
+ next({ name: redirect });
146
148
  }
147
- next({ name: redirect });
148
149
  } else if (
149
150
  !user?.email_verified_at &&
150
151
  to.matched.some((d) => d.meta.guest) !== true
@@ -158,8 +159,14 @@ export function configureRoutes(router) {
158
159
  next();
159
160
  } else if (admin) {
160
161
  next({ name: "login" });
162
+ } else if (to.path === "/callback") {
163
+ next({ name: `${authBase}.callback` });
161
164
  } else {
162
- next({ name: `${authBase}.login` });
165
+ if(autoLogin === true) {
166
+ next({ name: `${authBase}.force-login` });
167
+ } else {
168
+ next({ name: `${authBase}.login` });
169
+ }
163
170
  }
164
171
  }
165
172
  });
package/AuthModule/js/AuthStore.js CHANGED
@@ -10,7 +10,7 @@ const store = {
10
10
  intended: null,
11
11
  user: null,
12
12
  redirect: process.env.HYDRATE_REDIRECT ?? 'index',
13
- autoLogin: process.env.HYDRATE_ADMIN ?? false,
13
+ autoLogin: process.env.HYDRATE_ADMIN === 'true' ? true: false,
14
14
  }
15
15
  },
16
16
 
package/AuthModule/routes/logincallback.vue CHANGED
@@ -40,9 +40,7 @@ export default {
40
40
  },
41
41
 
42
42
  mounted() {
43
- if (this.$route.query.authenticated) {
44
- this.postLogin();
45
- }
43
+ this.postLogin();
46
44
  },
47
45
  };
48
46
  </script>
package/_variables.scss CHANGED
@@ -29,5 +29,5 @@ $color9: #ff0000;
29
29
  $color10: #dcdbdb;
30
30
  $color11: #8C8C8C; //Used
31
31
  $color12: #5C5C5C;
32
- $colorAlert: #D53A3A;
33
32
  $color13: #3C976E;
33
+ $colorAlert: #D53A3A;
package/general.scss CHANGED
@@ -29,6 +29,7 @@
29
29
  @import "./components/_collapse.scss";
30
30
  @import "./components/_tooltip.scss";
31
31
  @import "./components/_loader.scss";
32
+ @import "./modules/_AuthVariables.scss";
32
33
  @import "./modules/_AuthModule.scss";
33
34
 
34
35
 
package/modules/_AuthModule.scss CHANGED
@@ -117,9 +117,11 @@
117
117
  }
118
118
  .vel-basic__textbox {
119
119
  --el-border-color:#CFD8DD;
120
+ --el-input-text-color :#666666;
121
+ --el-input-focus-border-color:#CFD8DD;
122
+ --el-input-hover-border-color:#CFD8DD;
120
123
  font-size: 14px;
121
124
  padding-bottom: $am-spacing * 2.5;
122
-
123
125
  .el-input__inner {
124
126
  --el-input-inner-height:38px;
125
127
  }
package/modules/_AuthVariables.scss CHANGED
@@ -1,2 +1,7 @@
1
1
  $am-spacing: 8px;
2
- $am-highlight: #3C976E;
2
+ $am-highlight: #3C976E;
3
+
4
+ $color8: #f2f2f2; //Used
5
+ $color10: #dcdbdb;
6
+ $color12: #5C5C5C;
7
+ $colorAlert: #D53A3A;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@fishawack/lab-velocity",
3
- "version": "1.4.0",
3
+ "version": "1.4.2",
4
4
  "description": "Avalere Health branded style system",
5
5
  "scripts": {
6
6
  "setup": "npm ci || npm i && npm run content",