Skip to content

Commit b7f2e64

Browse files
GHMattiGHMatti
authored andcommitted
refactor: ui
1 parent d2a4b3d commit b7f2e64

File tree

12 files changed

+23
-159
lines changed

12 files changed

+23
-159
lines changed

mysql-async.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16171,9 +16171,10 @@ const defaultCfg = {
1617116171
multipleStatements: true
1617216172
}; // Switch to just connecting immediately
1617316173

16174-
const server_server = new server({ ...defaultCfg,
16174+
const server_config = { ...defaultCfg,
1617516175
...utility_getConfig()
16176-
}, {
16176+
};
16177+
const server_server = new server(server_config, {
1617716178
tag: 'mysql-async'
1617816179
});
1617916180
let isReady = false;
@@ -16183,6 +16184,12 @@ on('onResourceStart', resourcename => {
1618316184
if (resourcename === 'mysql-async') {
1618416185
emit('onMySQLReady');
1618516186
isReady = true;
16187+
16188+
if (server_config.keepAlive) {
16189+
setInterval(() => {
16190+
server_server.execute('SELECT 1', [], null, 'mysql-async:keepAlive');
16191+
}, server_config.keepAlive * 1000);
16192+
}
1618616193
}
1618716194
});
1618816195
global.exports('mysql_execute', (query, parameters, callback, resource) => {

src/entry/nui.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Vue from 'vue';
2-
import vuetify from '../ui/plugins/vuetify';
2+
import vuetify from '../vendor/ghmattimysql/packages/ghmattimysql-ui/src/plugins/vuetify';
33
import App from '../ui/Nui.vue';
44

55
Vue.config.productionTip = false;

src/entry/server.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ const defaultCfg = {
1515
};
1616

1717
// Switch to just connecting immediately
18-
const server = new Server({ ...defaultCfg, ...getConfig() }, { tag: 'mysql-async' });
18+
const config = { ...defaultCfg, ...getConfig() };
19+
const server = new Server(config, { tag: 'mysql-async' });
1920

2021
let isReady = false;
2122
global.exports('is_ready', () => isReady);
@@ -25,6 +26,11 @@ on('onResourceStart', (resourcename) => {
2526
if (resourcename === 'mysql-async') {
2627
emit('onMySQLReady');
2728
isReady = true;
29+
if ((<any>config).keepAlive) {
30+
setInterval(() => {
31+
server.execute('SELECT 1', [], null, 'mysql-async:keepAlive');
32+
}, (<any>config).keepAlive * 1000);
33+
}
2834
}
2935
});
3036

src/template/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</head>
99
<body>
1010
<noscript>
11-
<strong>We're sorry but chargen doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
11+
<strong>We're sorry but mysql-explorer doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
1212
</noscript>
1313
<div id="app"></div>
1414
<!-- built files will be auto injected -->
File renamed without changes.

src/ui/Nui.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
</template>
7878

7979
<script>
80-
import MChart from './components/MChart.vue';
80+
import MChart from '../vendor/ghmattimysql/packages/ghmattimysql-ui/src/components/MChart.vue';
8181
8282
export default {
8383
components: {
@@ -203,7 +203,7 @@ export default {
203203
</script>
204204

205205
<style lang="scss">
206-
@import './styles/_mixins';
206+
@import '../vendor/ghmattimysql/packages/ghmattimysql-ui/src/styles/mixins';
207207
208208
html {
209209
overflow-y: auto;

src/ui/components/MChart.vue

Lines changed: 0 additions & 95 deletions
This file was deleted.

src/ui/plugins/vuetify.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/ui/styles/_mixins.scss

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/webpack.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,4 +154,4 @@ const nuiConfig = {
154154
},
155155
};
156156

157-
module.exports = [serverConfig, clientConfig];
157+
module.exports = [serverConfig, clientConfig, nuiConfig];

0 commit comments

Comments
 (0)