Skip to content

Commit

Permalink
Merge pull request #36 from userXinos/compendium-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
userXinos committed Nov 7, 2023
2 parents dfbae16 + 46c6ed8 commit 93b2f99
Show file tree
Hide file tree
Showing 30 changed files with 1,623 additions and 86 deletions.
9 changes: 8 additions & 1 deletion i18n/locales/en/site.json5
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@
DEPLOYED: 'App deployed',
MODULES_BY_ARTIFACT_TYPE: 'Modules by artifact type',
COMPACT_MODE: 'Compact mode',
COMPACT_MODE_NOTE: 'WARNING! Only turn it off if you know what you\'re doing.'
COMPACT_MODE_NOTE: 'WARNING! Only turn it off if you know what you\'re doing.',
CONFIRM_LOGIN: 'Confirm your login from {0} as ${1}',
FILTER: 'Filter',
ENTER_CODE: 'Connect code from the bot',
CANNOT_BE_EMPTY: 'Cannot be empty',
INCORRECT_CODE: 'Incorrect code',
HS_COMPENDIUM: 'HSCompendium',
TECHNOLOGIES: 'Technologies'
}
9 changes: 8 additions & 1 deletion i18n/locales/ru/site.json5
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,12 @@
DEPLOYED: 'Приложение развернуто',
MODULES_BY_ARTIFACT_TYPE: 'Модули по типу артефакта',
COMPACT_MODE: 'Компактный режим',
COMPACT_MODE_NOTE: 'ПРЕДУПРЕЖДЕНИЕ! Отключайте только если знаете что делаете.'
COMPACT_MODE_NOTE: 'ПРЕДУПРЕЖДЕНИЕ! Отключайте только если знаете что делаете.',
CONFIRM_LOGIN: 'Подтвердите вход из {0} как ${1}',
FILTER: 'Фильтр',
ENTER_CODE: 'Код подлючепния от бота',
CANNOT_BE_EMPTY: 'Не может быть пустым',
INCORRECT_CODE: 'Неверный код',
HS_COMPENDIUM: 'HSCompendium',
TECHNOLOGIES: 'Технологии'
}
9 changes: 9 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"postinstall": "(cd parser && npm install && cd ..) && (cd i18n && npm install && cd ..)",
"test": "echo \"Error: no test specified\" && exit 1"
},
"web-types": "./web-types.json",
"dependencies": {
"@aacassandra/vue3-progressbar": "^1.0.3",
"@intlify/vue-i18n-loader": "^4.2.0",
Expand All @@ -22,6 +23,7 @@
"@vue/compiler-sfc": "^3.3.2",
"@vueuse/head": "^1.1.26",
"babel-core": "^7.0.0-bridge.0",
"bot_client": "github:mcgoldric/compendium-client",
"jsoncrush": "^1.1.8",
"lodash.debounce": "^4.0.8",
"raw-loader": "^4.0.2",
Expand Down
14 changes: 8 additions & 6 deletions src/App.vue
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
<!--suppress HtmlUnknownAttribute -->
<!--suppress HtmlUnknownTag -->

<template>
<div>
<v-head><title>Hades Space</title></v-head>
<vue-progress-bar />

<!--suppress HtmlUnknownTag -->
<vue-progress-bar />

<div
v-touch:swipe="swipeHandler"
Expand Down Expand Up @@ -58,6 +56,7 @@
<script setup lang="ts">
import { onMounted, onUnmounted, onErrorCaptured, ref, getCurrentInstance } from 'vue';
import router from '@Utils/Vue/router';
import { stop as compendiumStop } from '@Utils/compendium';
import { Head as VHead } from '@vueuse/head';
import GoTop from '@/components/GoTop.vue';
Expand All @@ -72,7 +71,7 @@ import appChangelog from '@/composables/appChangelog';
const MAX_WIDTH = 1000;
const internalInstance = getCurrentInstance();
const { $Progress } = internalInstance.appContext.config.globalProperties;
const { $Progress } = internalInstance?.appContext.config.globalProperties; // eslint-disable-line no-unsafe-optional-chaining
const isMinMode = ref(window.innerWidth < MAX_WIDTH);
const renderError = ref<Error>();
Expand All @@ -82,7 +81,10 @@ const { isOpen: changelogIsOpen, onClose: changelogOnClose } = appChangelog();
$Progress.start();
onMounted(() => window.addEventListener('resize', resize));
onUnmounted(() => window.removeEventListener('resize', resize));
onUnmounted(() => {
window.removeEventListener('resize', resize);
compendiumStop();
});
onErrorCaptured((err) => {
renderError.value = err;
});
Expand Down
Loading

0 comments on commit 93b2f99

Please sign in to comment.