- datset-detail.component.vue: show project.label and not name

- only use one main Layout file App.vue, also doi dubdomain needs menu
- npm updates
This commit is contained in:
Arno Kaimbacher 2022-09-06 10:56:29 +02:00
parent 6c3f6d5fd3
commit 8fd116df7f
4 changed files with 806 additions and 657 deletions

1450
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -46,7 +46,7 @@
"prettier": "^2.2.1", "prettier": "^2.2.1",
"sass": "^1.26.5", "sass": "^1.26.5",
"sass-loader": "^13.0.0", "sass-loader": "^13.0.0",
"typescript": "^4.7.2", "typescript": "^4.7.4",
"webpack": "^5.72.1" "webpack": "^5.72.1"
} }
} }

View File

@ -1,6 +1,6 @@
import { createApp } from "vue"; import { createApp } from "vue";
import App from "./App.vue"; import App from "./App.vue";
import App2 from "./App2.vue"; // import App2 from "./App2.vue";
import "./assets/scss/main-styles.scss"; import "./assets/scss/main-styles.scss";
// import FontAwesomeIcon from "@/utilities/fontawesome"; // import FontAwesomeIcon from "@/utilities/fontawesome";
import index from "./router/index"; import index from "./router/index";
@ -11,16 +11,17 @@ import VueMatomo from "vue-matomo";
const host = window.location.host; const host = window.location.host;
const parts = host.split("."); const parts = host.split(".");
// const domainLength = 2; // route1.example.com => domain length = 3 // const domainLength = 2; // route1.example.com => domain length = 3
let router, app; let router;
// let routes; // let routes;
if (parts[0] === "doi") { if (parts[0] === "doi") {
router = route1; router = route1;
app = App2; // app = App2;
} else { } else {
// If you want to do something else just comment the line below // If you want to do something else just comment the line below
router = index; router = index;
app = App; // app = App;
} }
const app = App;
createApp(app) createApp(app)
.use(VueMatomo, { .use(VueMatomo, {

View File

@ -223,7 +223,7 @@
<div class="column"> <div class="column">
<h3 class="label uppercase">Projekt/Project</h3> <h3 class="label uppercase">Projekt/Project</h3>
<p v-if="dataset.project != null"> <p v-if="dataset.project != null">
<span>{{ dataset.project.name }}</span> <span>{{ dataset.project.label }}</span>
</p> </p>
<p v-else>-</p> <p v-else>-</p>
</div> </div>