Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/beta' into beta
Browse files Browse the repository at this point in the history
# Conflicts:
#	Cargo.lock
#	README.md
#	theseus_gui/package.json
#	theseus_gui/pnpm-lock.yaml
#	theseus_gui/src-tauri/tauri.conf.json
#	theseus_gui/src/App.vue
#	theseus_gui/src/components/GridDisplay.vue
#	theseus_gui/src/components/ui/AccountsCard.vue
#	theseus_gui/src/components/ui/ExportModal.vue
#	theseus_gui/src/components/ui/RunningAppBar.vue
#	theseus_gui/src/helpers/update.js
#	theseus_gui/src/languages/en_us.json
#	theseus_gui/src/languages/ru_ru.json
#	theseus_gui/src/pages/Settings.vue
#	theseus_gui/src/pages/instance/Mods.vue
  • Loading branch information
DIDIRUS4 committed Jan 31, 2024
2 parents e3c9534 + ca8d1ba commit 3670998
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 1 deletion.
20 changes: 19 additions & 1 deletion theseus_gui/src/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@ import { createApp } from 'vue'
import router from '@/routes'
import App from '@/App.vue'
import { createPinia } from 'pinia'
import { createPlugin as createVintl } from '@vintl/vintl/plugin'
import 'omorphia/dist/style.css'
import '@/assets/stylesheets/global.scss'
import '@/assets/stylesheets/components.scss'
import 'floating-vue/dist/style.css'
import FloatingVue from 'floating-vue'
import { get_opening_command, initialize_state } from '@/helpers/state'
Expand All @@ -24,10 +26,26 @@ const i18n = createI18n({

const pinia = createPinia()

const vintl = createVintl({
controllerOpts: {
defaultLocale: 'en-US',
locale: 'en-US',
locales: [
{
tag: 'en-US',
meta: {
displayName: 'American English',
},
},
],
},
})

let app = createApp(App)
app.use(router)
app.use(i18n);
app.use(pinia)
app.use(vintl)
app.use(FloatingVue)
app.mixin(loadCssMixin)

Expand Down Expand Up @@ -65,7 +83,7 @@ initialize_state()
.finally(() => {
mountedApp.initialize()
get_opening_command().then((command) => {
console.log(JSON.stringify(command)) // change me to use whatever FE command handler is made
console.log('Opening Command', JSON.stringify(command)) // change me to use whatever FE command handler is made
})
})
})
Expand Down
2 changes: 2 additions & 0 deletions theseus_gui/src/pages/project/Index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ async function fetchProjectData() {
installed.value =
instance.value?.path &&
(await check_installed(instance.value.path, data.value.id).catch(handleError))
breadcrumbs.setName('Project', data.value.title)
installedVersion.value = instance.value
? Object.values(instance.value.projects).find(
(p) => p?.metadata?.version?.project_id === data.value.id
Expand Down

0 comments on commit 3670998

Please sign in to comment.