adminforth 1.2.30 → 1.2.32

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 (5) hide show
  1. package/dataConnectors/clickhouse.ts +3 -9
  2. package/dist/dataConnectors/clickhouse.js +3 -9
  3. package/dist/spa/spa/src/views/LoginView.vue +38 -25
  4. package/package.json +1 -1
  5. package/spa/src/views/LoginView.vue +38 -25
package/dataConnectors/clickhouse.ts CHANGED
@@ -61,10 +61,9 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
61
61
  field.type = AdminForthDataTypes.STRING;
62
62
  } else if (baseType.startsWith('Decimal')) {
63
63
  field.type = AdminForthDataTypes.DECIMAL;
64
- // const [precision, scale] = baseType.match(/\d+/g);
65
- // TODO
66
- // field.precision = parseInt(precision);
67
- // field.scale = parseInt(scale);
64
+ const [precision, scale] = baseType.match(/\d+/g);
65
+ field.precision = parseInt(precision);
66
+ field.scale = parseInt(scale);
68
67
  } else if (baseType.startsWith('Float')) {
69
68
  field.type = AdminForthDataTypes.FLOAT;
70
69
  } else if (baseType == 'DateTime64' || baseType == 'DateTime') {
@@ -216,7 +215,6 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
216
215
  limit,
217
216
  offset,
218
217
  };
219
- console.log('🪲 Clickhouse Query', q, 'params:', d);
220
218
 
221
219
  const stmt = await this.client.query({
222
220
  query: q,
@@ -224,9 +222,6 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
224
222
  query_params: d,
225
223
  });
226
224
 
227
- if (process.env.HEAVY_DEBUG) {
228
- console.log('🪲 Clickhouse Query', q, 'params:', d);
229
- }
230
225
  const rows = await stmt.json();
231
226
 
232
227
  let total = 0;
@@ -237,7 +232,6 @@ class ClickhouseConnector extends AdminForthBaseConnector implements IAdminForth
237
232
  query_params: d,
238
233
  });
239
234
  const countResp = await countQ.json()
240
- console.log('🪲 Clickhouse Query count', countResp);
241
235
  total = countResp[0]['COUNT()'];
242
236
  }
243
237
 
package/dist/dataConnectors/clickhouse.js CHANGED
@@ -77,10 +77,9 @@ class ClickhouseConnector extends AdminForthBaseConnector {
77
77
  }
78
78
  else if (baseType.startsWith('Decimal')) {
79
79
  field.type = AdminForthDataTypes.DECIMAL;
80
- // const [precision, scale] = baseType.match(/\d+/g);
81
- // TODO
82
- // field.precision = parseInt(precision);
83
- // field.scale = parseInt(scale);
80
+ const [precision, scale] = baseType.match(/\d+/g);
81
+ field.precision = parseInt(precision);
82
+ field.scale = parseInt(scale);
84
83
  }
85
84
  else if (baseType.startsWith('Float')) {
86
85
  field.type = AdminForthDataTypes.FLOAT;
@@ -210,15 +209,11 @@ class ClickhouseConnector extends AdminForthBaseConnector {
210
209
  const q = `SELECT ${columns} FROM ${tableName} ${where} ${orderBy} LIMIT {limit:Int} OFFSET {offset:Int}`;
211
210
  const d = Object.assign(Object.assign({}, params), { limit,
212
211
  offset });
213
- console.log('🪲 Clickhouse Query', q, 'params:', d);
214
212
  const stmt = yield this.client.query({
215
213
  query: q,
216
214
  format: 'JSONEachRow',
217
215
  query_params: d,
218
216
  });
219
- if (process.env.HEAVY_DEBUG) {
220
- console.log('🪲 Clickhouse Query', q, 'params:', d);
221
- }
222
217
  const rows = yield stmt.json();
223
218
  let total = 0;
224
219
  if (getTotals) {
@@ -228,7 +223,6 @@ class ClickhouseConnector extends AdminForthBaseConnector {
228
223
  query_params: d,
229
224
  });
230
225
  const countResp = yield countQ.json();
231
- console.log('🪲 Clickhouse Query count', countResp);
232
226
  total = countResp[0]['COUNT()'];
233
227
  }
234
228
  return {
package/dist/spa/spa/src/views/LoginView.vue CHANGED
@@ -22,17 +22,23 @@
22
22
  </div>
23
23
  <!-- Modal body -->
24
24
  <div class="p-4 md:p-5">
25
- <form class="space-y-4" @submit.prevent>
25
+ <form class="space-y-4" @submit.prevent>
26
26
  <div>
27
27
  <label for="username" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your {{ coreStore.config?.usernameFieldName?.toLowerCase() }}</label>
28
- <input type="username" name="username" id="username" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" placeholder="name@company.com" required />
28
+ <input type="username" name="username" id="username"
29
+ ref="usernameInput"
30
+ @keydown.enter="passwordInput.focus()"
31
+ class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" placeholder="name@company.com" required />
29
32
  </div>
30
33
  <div class="relative">
31
34
  <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your password</label>
32
- <input :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" required />
35
+ <input
36
+ ref="passwordInput"
37
+ @keydown.enter="login"
38
+ :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" required />
33
39
  <button type="button" @click="showPw = !showPw" class="absolute top-12 right-3 -translate-y-1/2 text-gray-400 dark:text-gray-300">
34
- <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
35
- <IconEyeSlashSolid class="w-5 h-5" v-else />
40
+ <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
41
+ <IconEyeSlashSolid class="w-5 h-5" v-else />
36
42
  </button>
37
43
  </div>
38
44
  <!-- <div class="flex justify-between">
@@ -86,6 +92,8 @@ import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbi
86
92
  import { callAdminForthApi, loadFile } from '@/utils';
87
93
  import { useRouter } from 'vue-router';
88
94
 
95
+ const passwordInput = ref(null);
96
+ const usernameInput = ref(null);
89
97
 
90
98
  const router = useRouter();
91
99
  const inProgress = ref(false);
@@ -99,31 +107,36 @@ const showPw = ref(false);
99
107
  const error = ref(null);
100
108
 
101
109
  onMounted(() => {
102
- coreStore.getPublicConfig()
110
+ coreStore.getPublicConfig();
111
+ usernameInput.value.focus();
103
112
  });
104
113
 
105
114
 
106
-
107
115
  async function login() {
108
- inProgress.value = true;
109
- const resp = await callAdminForthApi({
110
- path: '/login',
111
- method: 'POST',
112
- body: {
113
- username: document.getElementById('username').value,
114
- password: document.getElementById('password').value,
115
- }
116
- });
117
- inProgress.value = false;
118
- if (resp.error) {
119
- error.value = resp.error;
120
- } else if (resp.redirectTo) {
121
- router.push(resp.redirectTo);
122
- } else {
123
- error.value = null;
124
- await user.finishLogin();
116
+ const username = usernameInput.value.value;
117
+ const password = passwordInput.value.value;
118
+
119
+ if (!username || !password) {
120
+ return;
121
+ }
122
+ inProgress.value = true;
123
+ const resp = await callAdminForthApi({
124
+ path: '/login',
125
+ method: 'POST',
126
+ body: {
127
+ username,
128
+ password,
125
129
  }
126
-
130
+ });
131
+ inProgress.value = false;
132
+ if (resp.error) {
133
+ error.value = resp.error;
134
+ } else if (resp.redirectTo) {
135
+ router.push(resp.redirectTo);
136
+ } else {
137
+ error.value = null;
138
+ await user.finishLogin();
139
+ }
127
140
  }
128
141
 
129
142
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "adminforth",
3
- "version": "1.2.30",
3
+ "version": "1.2.32",
4
4
  "description": "OpenSource Vue3 powered forth-generation admin panel",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/spa/src/views/LoginView.vue CHANGED
@@ -22,17 +22,23 @@
22
22
  </div>
23
23
  <!-- Modal body -->
24
24
  <div class="p-4 md:p-5">
25
- <form class="space-y-4" @submit.prevent>
25
+ <form class="space-y-4" @submit.prevent>
26
26
  <div>
27
27
  <label for="username" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your {{ coreStore.config?.usernameFieldName?.toLowerCase() }}</label>
28
- <input type="username" name="username" id="username" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" placeholder="name@company.com" required />
28
+ <input type="username" name="username" id="username"
29
+ ref="usernameInput"
30
+ @keydown.enter="passwordInput.focus()"
31
+ class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" placeholder="name@company.com" required />
29
32
  </div>
30
33
  <div class="relative">
31
34
  <label for="password" class="block mb-2 text-sm font-medium text-gray-900 dark:text-white">Your password</label>
32
- <input :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" required />
35
+ <input
36
+ ref="passwordInput"
37
+ @keydown.enter="login"
38
+ :type="!showPw ? 'password': 'text'" name="password" id="password" placeholder="••••••••" class="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-600 dark:border-gray-500 dark:placeholder-gray-400 dark:text-white" required />
33
39
  <button type="button" @click="showPw = !showPw" class="absolute top-12 right-3 -translate-y-1/2 text-gray-400 dark:text-gray-300">
34
- <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
35
- <IconEyeSlashSolid class="w-5 h-5" v-else />
40
+ <IconEyeSolid class="w-5 h-5" v-if="!showPw" />
41
+ <IconEyeSlashSolid class="w-5 h-5" v-else />
36
42
  </button>
37
43
  </div>
38
44
  <!-- <div class="flex justify-between">
@@ -86,6 +92,8 @@ import { IconEyeSolid, IconEyeSlashSolid } from '@iconify-prerendered/vue-flowbi
86
92
  import { callAdminForthApi, loadFile } from '@/utils';
87
93
  import { useRouter } from 'vue-router';
88
94
 
95
+ const passwordInput = ref(null);
96
+ const usernameInput = ref(null);
89
97
 
90
98
  const router = useRouter();
91
99
  const inProgress = ref(false);
@@ -99,31 +107,36 @@ const showPw = ref(false);
99
107
  const error = ref(null);
100
108
 
101
109
  onMounted(() => {
102
- coreStore.getPublicConfig()
110
+ coreStore.getPublicConfig();
111
+ usernameInput.value.focus();
103
112
  });
104
113
 
105
114
 
106
-
107
115
  async function login() {
108
- inProgress.value = true;
109
- const resp = await callAdminForthApi({
110
- path: '/login',
111
- method: 'POST',
112
- body: {
113
- username: document.getElementById('username').value,
114
- password: document.getElementById('password').value,
115
- }
116
- });
117
- inProgress.value = false;
118
- if (resp.error) {
119
- error.value = resp.error;
120
- } else if (resp.redirectTo) {
121
- router.push(resp.redirectTo);
122
- } else {
123
- error.value = null;
124
- await user.finishLogin();
116
+ const username = usernameInput.value.value;
117
+ const password = passwordInput.value.value;
118
+
119
+ if (!username || !password) {
120
+ return;
121
+ }
122
+ inProgress.value = true;
123
+ const resp = await callAdminForthApi({
124
+ path: '/login',
125
+ method: 'POST',
126
+ body: {
127
+ username,
128
+ password,
125
129
  }
126
-
130
+ });
131
+ inProgress.value = false;
132
+ if (resp.error) {
133
+ error.value = resp.error;
134
+ } else if (resp.redirectTo) {
135
+ router.push(resp.redirectTo);
136
+ } else {
137
+ error.value = null;
138
+ await user.finishLogin();
139
+ }
127
140
  }
128
141
 
129
142