Minor updates

This commit is contained in:
Torsten 2020-01-21 12:56:43 +01:00
parent feba34b5fd
commit 4f75f07c0a
3 changed files with 11 additions and 16 deletions

View file

@ -3,15 +3,8 @@
<component name="ChangeListManager">
<list default="true" id="eed7de89-f054-487c-bf59-36356758942b" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/Http/Controllers/AuthController.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/Http/Controllers/AuthController.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/app.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/app.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/js/modal.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/js/modal.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/mix-manifest.json" beforeDir="false" afterPath="$PROJECT_DIR$/public/mix-manifest.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/store.js" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/store.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/Main.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/Main.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/auth/Login.vue" beforeDir="false" afterPath="$PROJECT_DIR$/resources/js/views/auth/Login.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/js/views/components/modal.js" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/webpack.mix.js" beforeDir="false" afterPath="$PROJECT_DIR$/webpack.mix.js" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -214,7 +207,7 @@
<workItem from="1575965115540" duration="593000" />
<workItem from="1575966299565" duration="383000" />
<workItem from="1579075615585" duration="8354000" />
<workItem from="1579595422946" duration="4127000" />
<workItem from="1579595422946" duration="4917000" />
</task>
<servers />
</component>

View file

@ -2723,7 +2723,7 @@ var render = function() {
}
}
},
[_vm._v("Tourplan (Auszug)")]
[_vm._v("Tourplan (Beispiel)")]
)
])
: this.$store.state.user.role === "GUEST"
@ -2738,7 +2738,7 @@ var render = function() {
}
}
},
[_vm._v("Tourplan (Auszug-G)")]
[_vm._v("Tourplan (Gast)")]
)
])
: this.$store.state.user.role === "MEMBER"
@ -2915,9 +2915,11 @@ var staticRenderFns = [
"\n Stadtplan und Anfahrt mit öffentlichen Verkehrsmitteln findet ihr unter:"
),
_c("br"),
_vm._v(
"\n http://www.daantonio-duesseldorf.de Da Antonio befindet sich direkt neben der Kirche."
),
_vm._v(" "),
_c("a", { attrs: { href: "http://www.douro-restaurant.de/" } }, [
_vm._v("http://www.douro-restaurant.de/")
]),
_vm._v(". Das Douro befindet sich direkt neben der Kirche."),
_c("br"),
_vm._v(
"\n Parkmöglichkeiten sind im Umkreis um den Italiener genügend vorhanden."

View file

@ -10,8 +10,8 @@
<button class="button" @click="changeMainText('Mitgliedsantrag')">Mitgliedsantrag</button>
<span v-if="!this.$store.state.user.hasOwnProperty('role')"><button class="button" @click="changeMainText('Tourplan')" >Tourplan (Auszug)</button></span>
<span v-else-if="this.$store.state.user.role==='GUEST'"><button class="button" @click="changeMainText('Tourplan')" >Tourplan (Auszug-G)</button></span>
<span v-if="!this.$store.state.user.hasOwnProperty('role')"><button class="button" @click="changeMainText('Tourplan')" >Tourplan (Beispiel)</button></span>
<span v-else-if="this.$store.state.user.role==='GUEST'"><button class="button" @click="changeMainText('Tourplan')" >Tourplan (Gast)</button></span>
<span v-else-if="this.$store.state.user.role==='MEMBER'"><button class="button" @click="changeMainText('Tourplan')" >Tourplan (komplett)</button></span>
<span v-else-if="this.$store.state.user.role==='ADMIN'"><button class="button" @click="changeMainText('Tourplan')" >Tourplan (komplett)</button></span>
@ -46,7 +46,7 @@
Stammtisch Düsseldorf: Wir treffen uns jeden 2. Mittwoch im Monat ab ca. 19 Uhr in der<br/>
Trattoria and Bar Antonio, Roßstr. 87, 40476 Düsseldorf-Derendorf, Tel.: 0211/43637525.<br/>
Stadtplan und Anfahrt mit öffentlichen Verkehrsmitteln findet ihr unter:<br/>
http://www.daantonio-duesseldorf.de Da Antonio befindet sich direkt neben der Kirche.<br/>
<a href="http://www.douro-restaurant.de/">http://www.douro-restaurant.de/</a>. Das Douro befindet sich direkt neben der Kirche.<br/>
Parkmöglichkeiten sind im Umkreis um den Italiener genügend vorhanden.<br/>
</p>