forked from FoundKeyGang/FoundKey
Merge branch 'main' into refactor/page.textarea.vue
This commit is contained in:
commit
d96baf1672
2 changed files with 155 additions and 182 deletions
|
@ -23,6 +23,7 @@ export const paramDef = {
|
||||||
description: { type: 'string' },
|
description: { type: 'string' },
|
||||||
permission: { type: 'array', uniqueItems: true, items: {
|
permission: { type: 'array', uniqueItems: true, items: {
|
||||||
type: 'string',
|
type: 'string',
|
||||||
|
// FIXME: add enum of possible permissions
|
||||||
} },
|
} },
|
||||||
callbackUrl: { type: 'string', nullable: true },
|
callbackUrl: { type: 'string', nullable: true },
|
||||||
},
|
},
|
||||||
|
@ -34,9 +35,6 @@ export default define(meta, paramDef, async (ps, user) => {
|
||||||
// Generate secret
|
// Generate secret
|
||||||
const secret = secureRndstr(32, true);
|
const secret = secureRndstr(32, true);
|
||||||
|
|
||||||
// for backward compatibility
|
|
||||||
const permission = unique(ps.permission.map(v => v.replace(/^(.+)(\/|-)(read|write)$/, '$3:$1')));
|
|
||||||
|
|
||||||
// Create account
|
// Create account
|
||||||
const app = await Apps.insert({
|
const app = await Apps.insert({
|
||||||
id: genId(),
|
id: genId(),
|
||||||
|
@ -44,7 +42,7 @@ export default define(meta, paramDef, async (ps, user) => {
|
||||||
userId: user ? user.id : null,
|
userId: user ? user.id : null,
|
||||||
name: ps.name,
|
name: ps.name,
|
||||||
description: ps.description,
|
description: ps.description,
|
||||||
permission,
|
permission: ps.permission,
|
||||||
callbackUrl: ps.callbackUrl,
|
callbackUrl: ps.callbackUrl,
|
||||||
secret: secret,
|
secret: secret,
|
||||||
}).then(x => Apps.findOneByOrFail(x.identifiers[0]));
|
}).then(x => Apps.findOneByOrFail(x.identifiers[0]));
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
<canvas ref="chartEl"></canvas>
|
<canvas ref="chartEl"></canvas>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script lang="ts">
|
<script lang="ts" setup>
|
||||||
import { defineComponent, onMounted, onUnmounted, ref } from 'vue';
|
import { onMounted, onUnmounted, ref } from 'vue';
|
||||||
import {
|
import {
|
||||||
Chart,
|
Chart,
|
||||||
ArcElement,
|
ArcElement,
|
||||||
|
@ -42,34 +42,19 @@ Chart.register(
|
||||||
Filler,
|
Filler,
|
||||||
);
|
);
|
||||||
|
|
||||||
const alpha = (hex, a) => {
|
const props = defineProps<{
|
||||||
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)!;
|
domain: string,
|
||||||
const r = parseInt(result[1], 16);
|
connection: any,
|
||||||
const g = parseInt(result[2], 16);
|
}>();
|
||||||
const b = parseInt(result[3], 16);
|
|
||||||
return `rgba(${r}, ${g}, ${b}, ${a})`;
|
|
||||||
};
|
|
||||||
|
|
||||||
export default defineComponent({
|
const chartEl = ref<HTMLCanvasElement>(null);
|
||||||
props: {
|
|
||||||
domain: {
|
|
||||||
type: String,
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
connection: {
|
|
||||||
required: true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
setup(props) {
|
const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
|
||||||
const chartEl = ref<HTMLCanvasElement>(null);
|
|
||||||
|
|
||||||
const gridColor = defaultStore.state.darkMode ? 'rgba(255, 255, 255, 0.1)' : 'rgba(0, 0, 0, 0.1)';
|
// フォントカラー
|
||||||
|
Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
|
||||||
|
|
||||||
// フォントカラー
|
onMounted(() => {
|
||||||
Chart.defaults.color = getComputedStyle(document.documentElement).getPropertyValue('--fg');
|
|
||||||
|
|
||||||
onMounted(() => {
|
|
||||||
const chartInstance = new Chart(chartEl.value, {
|
const chartInstance = new Chart(chartEl.value, {
|
||||||
type: 'line',
|
type: 'line',
|
||||||
data: {
|
data: {
|
||||||
|
@ -81,7 +66,7 @@ export default defineComponent({
|
||||||
borderWidth: 2,
|
borderWidth: 2,
|
||||||
borderJoinStyle: 'round',
|
borderJoinStyle: 'round',
|
||||||
borderColor: '#00E396',
|
borderColor: '#00E396',
|
||||||
backgroundColor: alpha('#00E396', 0.1),
|
backgroundColor: '#00E3961A',
|
||||||
data: []
|
data: []
|
||||||
}, {
|
}, {
|
||||||
label: 'Active',
|
label: 'Active',
|
||||||
|
@ -90,7 +75,7 @@ export default defineComponent({
|
||||||
borderWidth: 2,
|
borderWidth: 2,
|
||||||
borderJoinStyle: 'round',
|
borderJoinStyle: 'round',
|
||||||
borderColor: '#00BCD4',
|
borderColor: '#00BCD4',
|
||||||
backgroundColor: alpha('#00BCD4', 0.1),
|
backgroundColor: '#00BCD41A',
|
||||||
data: []
|
data: []
|
||||||
}, {
|
}, {
|
||||||
label: 'Waiting',
|
label: 'Waiting',
|
||||||
|
@ -99,7 +84,7 @@ export default defineComponent({
|
||||||
borderWidth: 2,
|
borderWidth: 2,
|
||||||
borderJoinStyle: 'round',
|
borderJoinStyle: 'round',
|
||||||
borderColor: '#FFB300',
|
borderColor: '#FFB300',
|
||||||
backgroundColor: alpha('#FFB300', 0.1),
|
backgroundColor: '#FFB3001A',
|
||||||
yAxisID: 'y2',
|
yAxisID: 'y2',
|
||||||
data: []
|
data: []
|
||||||
}, {
|
}, {
|
||||||
|
@ -130,7 +115,7 @@ export default defineComponent({
|
||||||
grid: {
|
grid: {
|
||||||
display: true,
|
display: true,
|
||||||
color: gridColor,
|
color: gridColor,
|
||||||
borderColor: 'rgb(0, 0, 0, 0)',
|
borderColor: '#0000',
|
||||||
},
|
},
|
||||||
ticks: {
|
ticks: {
|
||||||
display: false,
|
display: false,
|
||||||
|
@ -143,7 +128,7 @@ export default defineComponent({
|
||||||
stackWeight: 2,
|
stackWeight: 2,
|
||||||
grid: {
|
grid: {
|
||||||
color: gridColor,
|
color: gridColor,
|
||||||
borderColor: 'rgb(0, 0, 0, 0)',
|
borderColor: '#0000',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
y2: {
|
y2: {
|
||||||
|
@ -153,7 +138,7 @@ export default defineComponent({
|
||||||
stackWeight: 1,
|
stackWeight: 1,
|
||||||
grid: {
|
grid: {
|
||||||
color: gridColor,
|
color: gridColor,
|
||||||
borderColor: 'rgb(0, 0, 0, 0)',
|
borderColor: '#0000',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -218,15 +203,5 @@ export default defineComponent({
|
||||||
props.connection.off('stats', onStats);
|
props.connection.off('stats', onStats);
|
||||||
props.connection.off('statsLog', onStatsLog);
|
props.connection.off('statsLog', onStatsLog);
|
||||||
});
|
});
|
||||||
});
|
|
||||||
|
|
||||||
return {
|
|
||||||
chartEl,
|
|
||||||
};
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
|
Loading…
Reference in a new issue