Merge branch 'pr214'

h44z · Mar 12, 2024 · e565e26 · e565e26
2 parents c89f201 + acc785e
commit e565e26
Show file tree

Hide file tree

Showing 17 changed files with 873 additions and 321 deletions.
diff --git a/cmd/api_build_tool/main.go b/cmd/api_build_tool/main.go
@@ -54,7 +54,7 @@ func generateApi(basePath, apiPath, version string) error {
 		OutputDir:           filepath.Join(basePath, "core/assets/doc"),
 		OutputTypes:         []string{"json", "yaml"},
 		ParseVendor:         false,
-		ParseDependency:     true,
+		ParseDependency:     3,
 		MarkdownFilesDir:    "",
 		ParseInternal:       true,
 		GeneratedTime:       false,

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/src/App.vue b/frontend/src/App.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { RouterLink, RouterView } from 'vue-router';
-import {computed, getCurrentInstance, onMounted, ref} from "vue";
-import {authStore} from "./stores/auth";
-import {securityStore} from "./stores/security";
-import {settingsStore} from "@/stores/settings";
+import { computed, getCurrentInstance, onMounted, ref } from "vue";
+import { authStore } from "./stores/auth";
+import { securityStore } from "./stores/security";
+import { settingsStore } from "@/stores/settings";
 
 const appGlobal = getCurrentInstance().appContext.config.globalProperties
 const auth = authStore()
@@ -80,20 +80,16 @@ const currentYear = ref(new Date().getFullYear())
 
         <div class="navbar-nav d-flex justify-content-end">
           <div v-if="auth.IsAuthenticated" class="nav-item dropdown">
-            <a aria-expanded="false" aria-haspopup="true" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"
-              role="button">{{ auth.User.Firstname }} {{ auth.User.Lastname }}</a>
+            <a aria-expanded="false" aria-haspopup="true" class="nav-link dropdown-toggle" data-bs-toggle="dropdown"
+              href="#" role="button">{{ auth.User.Firstname }} {{ auth.User.Lastname }}</a>
             <div class="dropdown-menu">
               <RouterLink :to="{ name: 'profile' }" class="dropdown-item"><i class="fas fa-user"></i> {{ $t('menu.profile') }}</RouterLink>
               <div class="dropdown-divider"></div>
-              <a class="dropdown-item" href="#" @click.prevent="auth.Logout">
-                <i class="fas fa-sign-out-alt"></i> {{ $t('menu.logout') }}
-              </a>
+              <a class="dropdown-item" href="#" @click.prevent="auth.Logout"><i class="fas fa-sign-out-alt"></i> {{ $t('menu.logout') }}</a>
             </div>
           </div>
           <div v-if="!auth.IsAuthenticated" class="nav-item">
-            <RouterLink :to="{ name: 'login' }" class="nav-link">
-              <i class="fas fa-sign-in-alt fa-sm fa-fw me-2"></i>{{ $t('menu.login') }}
-            </RouterLink>
+            <RouterLink :to="{ name: 'login' }" class="nav-link"><i class="fas fa-sign-in-alt fa-sm fa-fw me-2"></i>{{ $t('menu.login') }}</RouterLink>
           </div>
         </div>
       </div>
@@ -111,18 +107,18 @@ const currentYear = ref(new Date().getFullYear())
         <div class="col-6 text-end">
           <div :aria-label="$t('menu.lang')" class="btn-group" role="group">
             <div class="btn-group" role="group">
-              <button aria-expanded="false" aria-haspopup="true" class="btn btn btn-secondary pe-0" data-bs-toggle="dropdown" type="button"><span :class="languageFlag" class="fi"></span></button>
+              <button aria-expanded="false" aria-haspopup="true" class="btn btn btn-secondary pe-0"
+                data-bs-toggle="dropdown" type="button"><span :class="languageFlag" class="fi"></span></button>
               <div aria-labelledby="btnGroupDrop3" class="dropdown-menu" style="">
-                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('en')"><span class="fi fi-us"></span> English</a>
-                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('de')"><span class="fi fi-de"></span> Deutsch</a>
+                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('en')"><span class="fi fi-us"></span>English</a>
+                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('de')"><span class="fi fi-de"></span>Deutsch</a>
+                <a class="dropdown-item" href="#" @click.prevent="switchLanguage('ru')"><span class="fi fi-ru"></span>Русский</a>
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-  </footer>
-</template>
+  </footer></template>
 
-<style>
-</style>
+<style></style>