fix internal routing

This commit is contained in:
lesion
2019-02-26 14:08:24 +01:00
parent e5f2e2eeda
commit aed2fdea3c
10 changed files with 27 additions and 123 deletions
-1
View File
@@ -1 +0,0 @@
.groupMenu[data-v-526ddfcd]{position:absolute;top:40px;width:100%;z-index:2}.badge[data-v-526ddfcd]{cursor:pointer}#tabss ul{-webkit-box-pack:space-evenly;-ms-flex-pack:space-evenly;justify-content:space-evenly;background:linear-gradient(#fff,#fff 22px,#007bff,#fff 23px,#fff)}#tabss ul .nav-link{background-color:#fff}#tabss ul .nav-link.active{background-color:#007bff}#eventDetail .modal-body{padding:0}#eventDetail .card{margin-left:-5px}#eventDetail .badge{margin-left:.1rem}.card-columns .card[data-v-f79fd7b2]{margin-top:.3em;margin-bottom:0}.card-img[data-v-f79fd7b2]{max-height:180px;-o-object-fit:cover;object-fit:cover}.badge[data-v-f79fd7b2]{margin-left:.1rem}#calendar{margin-bottom:0;margin-top:.3em}.card-columns{-webkit-column-count:1;column-count:1;-webkit-column-gap:.3em;column-gap:.3em}@media (min-width:576px){.container{max-width:none}.card-columns{-webkit-column-count:2;column-count:2;-webkit-column-gap:.3em;column-gap:.3em}}@media (min-width:950px){.container{max-width:1400px}.card-columns{-webkit-column-count:3;column-count:3;-webkit-column-gap:.3em;column-gap:.3em}}.item{-webkit-transition:all .2s;transition:all .2s;display:inline-block;width:100%}.list-enter,.list-leave-to{opacity:0;-webkit-transform:translateY(30px);transform:translateY(30px)}.list-leave-active{position:absolute;top:0;width:0;left:0;height:0;z-index:-10}#footer{position:absolute;width:100%;bottom:0}#search,#search ul{-webkit-box-align:baseline;-ms-flex-align:baseline;align-items:baseline}body,html{scrollbar-face-color:#313543;scrollbar-track-color:rgba(0,0,0,.1);font-family:Lato,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,sans-serif;font-size:1.1em;color:#2c3e50;background:#000}::-webkit-scrollbar{width:7px;height:7px}::-webkit-scrollbar-thumb{background:#313543;border:0 none #fff;border-radius:6px}::-webkit-scrollbar-thumb:hover{background:#353a49}::-webkit-scrollbar-thumb:active{background:#313543}::-webkit-scrollbar-track{border:0 none #fff;border-radius:6px;background:rgba(0,0,0,.1)}::-webkit-scrollbar-track:active,::-webkit-scrollbar-track:hover{background:#282c37}::-webkit-scrollbar-corner{background:transparent}
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+19 -4
View File
@@ -19,7 +19,7 @@
b-form-input.mt-1(v-model='mail.mail' :placeholder="$t('Insert your address')") b-form-input.mt-1(v-model='mail.mail' :placeholder="$t('Insert your address')")
b-button.mt-1.float-right(variant='success' @click='activate_email') {{$t('Send')}} b-button.mt-1.float-right(variant='success' @click='activate_email') {{$t('Send')}}
b-form(v-if="type==='embed'" style='max-width: 400px;') div(v-if="type==='embed'" style='max-width: 400px;')
el-switch(v-model='export_list' :active-text="$t('export_list')") el-switch(v-model='export_list' :active-text="$t('export_list')")
b-card(v-if='export_list' no-body header='Eventi') b-card(v-if='export_list' no-body header='Eventi')
b-list-group(flush) b-list-group(flush)
@@ -33,6 +33,8 @@
b-badge.float-right.ml-1(v-for='tag in event.tags') {{tag.tag}} b-badge.float-right.ml-1(v-for='tag in event.tags') {{tag.tag}}
small.float-right(v-b-popover.hover='event.place.address') {{event.place.name}} small.float-right(v-b-popover.hover='event.place.address') {{event.place.name}}
Calendar(v-else) Calendar(v-else)
br
b-form-textarea(v-model='script')
</template> </template>
<script> <script>
@@ -51,7 +53,8 @@ export default {
type: '', type: '',
link: '', link: '',
mail: {}, mail: {},
export_list: true export_list: true,
script: `<iframe>Ti piacerebbe</iframe>`,
} }
}, },
filters, filters,
@@ -67,8 +70,20 @@ export default {
this.$router.go(-1) this.$router.go(-1)
}, },
loadLink () { loadLink () {
const filters = this.filters.tags.join(',') const tags = this.filters.tags.join(',')
return `${config.apiurl}/export/${this.type}/${filters}` const places = this.filters.places.join(',')
let query = ''
if (tags || places) {
query = '?'
if (tags) {
query += 'tags=' + tags
if (places) { query += '&places=' + places }
} else {
query += 'places=' + places
}
}
return `${config.apiurl}/export/${this.type}${query}`
}, },
imgPath (event) { imgPath (event) {
return event.image_path && config.apiurl + '/../' + event.image_path return event.image_path && config.apiurl + '/../' + event.image_path
+1 -1
View File
@@ -32,7 +32,7 @@
label.text-muted {{$t('time_end_explanation')}} label.text-muted {{$t('time_end_explanation')}}
el-time-select( el-time-select(
v-model='time.end' v-model='time.end'
:picker-options="{start: `${event.multidate?'00:00':time.start}`, step: '00:30', end: '24:00'}" :picker-options="{start: '00:00', step: '00:30', end: '24:00'}"
) )
b-tab b-tab
+1 -1
View File
@@ -26,4 +26,4 @@ const en = {
register_explanation: `..` register_explanation: `..`
} }
module.exports = en export default en
+1 -1
View File
@@ -60,4 +60,4 @@ const it = {
carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.` carne e sangue, scrivici quindi due righe per farci capire che eventi vorresti pubblicare.`
} }
module.exports = it export default it
+5 -2
View File
@@ -8,11 +8,14 @@ const port = process.env.PORT || 8080
app.use(bodyParser.urlencoded({ extended: false })) app.use(bodyParser.urlencoded({ extended: false }))
app.use(bodyParser.json()) app.use(bodyParser.json())
app.use(cors())
app.use('/static', express.static(path.join(__dirname, 'uploads'))) app.use('/static', express.static(path.join(__dirname, 'uploads')))
app.use('/uploads', express.static('uploads')) app.use('/uploads', express.static('uploads'))
app.use('/', express.static(path.join(__dirname, 'client', 'dist')))
app.use(cors())
app.use('/api', api) app.use('/api', api)
app.use('/', express.static(path.join(__dirname, 'client', 'dist')))
app.use('/css', express.static(path.join(__dirname, 'client', 'dist', 'css')))
app.use('/js', express.static(path.join(__dirname, 'client', 'dist', 'js')))
app.use('*', express.static(path.join(__dirname, 'client', 'dist', 'index.html')))
app.listen(port) app.listen(port)
console.log('Magic happens at http://localhost:' + port) console.log('Magic happens at http://localhost:' + port)