- {{ i18n.get("_.vue.loading") }}
+ {{ i18n.get("_.vue.loading") }}
@@ -28,7 +28,7 @@
import axios from "axios";
import Status from "../components/Status";
import moment from "moment";
-import {ProfileModel, StatusModel} from "../js/APImodels";
+import {StatusModel} from "../js/APImodels";
export default {
name: "SingleStatus",
@@ -40,7 +40,33 @@ export default {
polyline: null, //ToDo Typedef
stopovers: null, //ToDo Typedef
likes: null,
- moment: moment
+ moment: moment,
+ metaData: {
+ title: undefined,
+ url: undefined,
+ image: undefined,
+ description: undefined,
+ robots: undefined
+ }
+ };
+ },
+ metaInfo() {
+ return {
+ title: this.metaData.title,
+ meta: [
+ {name: "robots", content: this.metaData.robots, vmid: "robots"},
+ {name: "description", content: this.metaData.description, vmid: "description"},
+ {name: "DC.Description", content: this.metaData.description, vmid: "DC.Description"},
+ {name: "og:title", content: this.metaData.title, vmid: "og:title"},
+ {name: "og:url", content: this.metaData.url, vmid: "og:url"},
+ {name: "og:image", content: this.metaData.image, vmid: "og:image"},
+ {name: "og:description", content: this.metaData.description, vmid: "og:description"},
+ {name: "twitter:card", content: "summary", vmid: "twitter:card"},
+ {name: "twitter:site", content: "@traewelling", vmid: "twitter:site"},
+ {name: "twitter:title", content: this.metaData.title, vmid: "twitter:title"},
+ {name: "twitter:description", content: this.metaData.description, vmid: "twitter:description"},
+ {name: "twitter:image", content: this.metaData.image, vmid: "twitter:image"}
+ ]
};
},
created() {
@@ -48,6 +74,7 @@ export default {
this.fetchData();
} else {
this.status = this.statusData;
+ this.updateMetadata();
this.fetchPolyline();
this.fetchLikes();
}
@@ -58,6 +85,20 @@ export default {
props: {
statusData: null
},
+ computed: {
+ rilIdentifierOrigin() {
+ if (this.status.train.origin.rilIdentifier) {
+ return " (" + this.status.train.origin.rilIdentifier + ")";
+ }
+ return "";
+ },
+ rilIdentifierDestination() {
+ if (this.status.train.destination.rilIdentifier) {
+ return " (" + this.status.train.destination.rilIdentifier + ")";
+ }
+ return "";
+ },
+ },
methods: {
fetchData() {
this.error = null;
@@ -67,6 +108,7 @@ export default {
.then((response) => {
this.loading = false;
this.status = response.data.data;
+ this.updateMetadata();
this.fetchPolyline();
this.fetchStopovers();
this.fetchLikes();
@@ -105,6 +147,24 @@ export default {
.catch((error) => {
console.error(error);
})
+ },
+ updateMetadata() {
+ if (this.status.preventIndex) {
+ this.metaData.robots = "noindex";
+ }
+ this.metaData.description = this.i18n.choice("_.description.status", 1, {
+ "username": this.status.username,
+ "origin": this.status.train.origin.name + this.rilIdentifierOrigin,
+ "destination": this.status.train.destination.name + this.rilIdentifierDestination,
+ "date": this.moment(this.status.train.origin.departure).format("LLL"),
+ "lineName": this.status.train.lineName
+ });
+ this.metaData.url = window.location.origin + this.$router.resolve({
+ name: "singleStatus",
+ params: {id: this.status.id}
+ }).href; //ToDo combine all window.location.origin...-methods to one single method
+ this.metaData.title = this.i18n.choice("_.status.ogp-title", 1, {"name": this.status.username});
+ this.metaData.image = "/profile/" + this.status.username + "/profilepicture";
}
}
}
diff --git a/resources/views/Stationboard.vue b/resources/views/Stationboard.vue
index 048271d00..8a90e44c3 100644
--- a/resources/views/Stationboard.vue
+++ b/resources/views/Stationboard.vue
@@ -7,10 +7,10 @@
-
+
@@ -99,21 +99,21 @@ import moment from "moment";
import {travelImages} from "../js/APImodels";
export default {
- name: "Stationboard",
- components: {
- StationForm,
- ModalConfirm
- },
- data() {
- return {
- station: null,
- departures: null,
- times: {
- now: 0,
- prev: 0,
- next: 0
- },
- loading: false,
+ name: "Stationboard",
+ components: {
+ StationForm,
+ ModalConfirm
+ },
+ data() {
+ return {
+ station: null,
+ departures: null,
+ times: {
+ now: 0,
+ prev: 0,
+ next: 0
+ },
+ loading: false,
images: travelImages,
moment: moment
};
@@ -143,33 +143,33 @@ export default {
goToTrip(departure) {
if (departure.cancelled) {
console.error("stop cancelled");
- return;
+ return;
}
- this.$router.push({
- name: "trains.trip", query: {
- tripID: departure.tripId,
- lineName: departure.line.name ?? departure.line.fahrtNr,
- start: departure.station.id,
- departure: departure.plannedWhen
- }
- });
+ this.$router.push({
+ name: "trains.trip", query: {
+ tripID: departure.tripId,
+ lineName: departure.line.name ?? departure.line.fahrtNr,
+ start: departure.station.id,
+ departure: departure.plannedWhen
+ }
+ });
},
- toggleSetHomeModal() {
- this.$refs.confirmHomeModal.show();
- },
- setHome() {
- axios
- .put("/trains/station/" + this.station.name + "/home")
- .then((result) => {
- this.result = result.data.data;
- //ToDo add a confirm popup or sth
- this.$auth.fetch();
- alert(this.i18n.choice("_.user.home-set", 1, {"station": this.result.name}));
- })
- .catch((error) => {
- console.error(error);
- });
- }
+ toggleSetHomeModal() {
+ this.$refs.confirmHomeModal.show();
+ },
+ setHome() {
+ axios
+ .put("/trains/station/" + this.station.name + "/home")
+ .then((result) => {
+ this.result = result.data.data;
+ //ToDo add a confirm popup or sth
+ this.$auth.fetch();
+ alert(this.i18n.choice("_.user.home-set", 1, {"station": this.result.name}));
+ })
+ .catch((error) => {
+ console.error(error);
+ });
+ }
}
};
diff --git a/resources/views/landing.blade.php b/resources/views/landing.blade.php
index d6a411b4b..6e105cc4f 100644
--- a/resources/views/landing.blade.php
+++ b/resources/views/landing.blade.php
@@ -1,42 +1,27 @@
-
+
-
-
-
+
{{ config('app.name', 'Träwelling') }}
-
-
@yield('title') - {{ config('app.name', 'Träwelling') }}
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
diff --git a/routes/api.php b/routes/api.php
index a6d13c890..99f71fc2b 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -11,6 +11,7 @@
|
*/
+use App\Http\Controllers\API\v1\AuthController as v1Auth;
use App\Http\Controllers\API\v1\EventController;
use App\Http\Controllers\API\v1\LikesController;
use App\Http\Controllers\API\v1\NotificationController;
@@ -18,7 +19,6 @@
use App\Http\Controllers\API\v1\StatusController;
use App\Http\Controllers\API\v1\TransportController;
use App\Http\Controllers\API\v1\UserController;
-use App\Http\Controllers\API\v1\AuthController as v1Auth;
use Illuminate\Support\Facades\Route;
Route::group(['prefix' => 'v1', 'middleware' => 'return-json'], function() {