Commit 336f6d83 authored by Markus Opolka's avatar Markus Opolka
Browse files

Merge branch 'v1.1.7' into 'master'

V1.1.7

See merge request !11
parents ebcd5310 009e3783
# Version 1.1.7
- More flexible API url and Dockerfile
- Fix bug in Letter view
# Version 1.1.6 # Version 1.1.6
- Extend autocomplete of feature search - Extend autocomplete of feature search
- Minor changes in index information - Minor changes in index information
......
...@@ -4,6 +4,8 @@ LABEL maintainer="markus.opolka@fau.de" ...@@ -4,6 +4,8 @@ LABEL maintainer="markus.opolka@fau.de"
COPY . /app COPY . /app
WORKDIR /app WORKDIR /app
# This is so lazy...
RUN sed 's/localhost/geuselambix.phil.uni-erlangen.de/' src/main.js
RUN yarn install RUN yarn install
RUN yarn run build RUN yarn run build
......
{ {
"name": "cdbp", "name": "cdbp",
"version": "1.1.6", "version": "1.1.7",
"description": "FAU CDBP", "description": "FAU CDBP",
"author": "Markus Opolka <markus@martialblog.de>", "author": "Markus Opolka <markus@martialblog.de>",
"private": true, "private": true,
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
</v-list> </v-list>
</v-navigation-drawer> </v-navigation-drawer>
<v-toolbar color="blue darken-4" dark fixed app> <v-toolbar color="#003366" dark fixed app>
<v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon> <v-toolbar-side-icon @click.stop="drawer = !drawer"></v-toolbar-side-icon>
<v-toolbar-title>{{name}}</v-toolbar-title> <v-toolbar-title>{{name}}</v-toolbar-title>
<v-spacer></v-spacer> <v-spacer></v-spacer>
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
</v-content> </v-content>
</v-fade-transition> </v-fade-transition>
</main> </main>
<v-footer color="blue darken-4" app> <v-footer color="#003366" app>
<span class="white--text">&copy; 2017 Friedrich-Alexander-Universität Erlangen-Nürnberg</span> <span class="white--text">&copy; 2018 Friedrich-Alexander-Universität Erlangen-Nürnberg</span>
</v-footer> </v-footer>
</v-app> </v-app>
......
...@@ -126,7 +126,7 @@ export default { ...@@ -126,7 +126,7 @@ export default {
// Call feature search API with parameters // Call feature search API with parameters
this.searching = true this.searching = true
let url = 'http://localhost:3000/api/features/' let url = 'api/features/'
// Adding the lettername to the API endpoint // Adding the lettername to the API endpoint
if (this.selected !== 'Toutes') { if (this.selected !== 'Toutes') {
url = url + this.selected url = url + this.selected
...@@ -168,14 +168,14 @@ export default { ...@@ -168,14 +168,14 @@ export default {
}, },
created () { created () {
// Get feature glossary // Get feature glossary
this.$http.get('http://localhost:3000/api/glossary/features').then(function (data) { this.$http.get('api/glossary/features').then(function (data) {
this.feature_categories_glossary = data.body.categories this.feature_categories_glossary = data.body.categories
this.feature_types_glossary = data.body.types this.feature_types_glossary = data.body.types
this.feature_subtypes_glossary = data.body.subtypes this.feature_subtypes_glossary = data.body.subtypes
}) })
// Create list of all letters // Create list of all letters
this.$http.get('http://localhost:3000/api/metadata/table').then(function (data) { this.$http.get('api/metadata/table').then(function (data) {
for (let letter of data.body) { for (let letter of data.body) {
if (letter.valid) { if (letter.valid) {
this.letters.push({text: letter.title}) this.letters.push({text: letter.title})
......
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
created () { created () {
// Get Name from Router and call API // Get Name from Router and call API
this.lettername = this.$route.params.letter this.lettername = this.$route.params.letter
this.$http.get('http://localhost:3000/api/letters/' + this.lettername).then(function (data) { this.$http.get('api/letters/' + this.lettername).then(function (data) {
// If there's only one element xml-js makes no array... great stuff -.- // If there's only one element xml-js makes no array... great stuff -.-
if (data.body.TEI.text.head.graphic instanceof Array) { if (data.body.TEI.text.head.graphic instanceof Array) {
...@@ -153,10 +153,10 @@ export default { ...@@ -153,10 +153,10 @@ export default {
// So we can iterate in the template // So we can iterate in the template
this.features.push({text: 'caractéristiques visuelles', root: data.body.TEI.teiHeader.xenoData.paratext}) this.features.push({text: 'caractéristiques visuelles', root: data.body.TEI.teiHeader.xenoData.paratext})
this.features.push({text: 'caractéristiques graphiques', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.graphische_charaktersitika}) this.features.push({text: 'caractéristiques graphiques', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.graphische_charakteristika})
this.features.push({text: 'caractéristiques lexicales', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.lexikalische_charaktersitika}) this.features.push({text: 'caractéristiques lexicales', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.lexikalische_charakteristike})
this.features.push({text: 'caractéristiques morphosyntaxiques', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.morphosyntaktische_charakterisitka}) this.features.push({text: 'caractéristiques morphosyntaxiques', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.morphosyntaktische_charakteristika})
this.features.push({text: 'caractéristiques pragmatiques', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.textstrukturelle_pragmatische_charakterisitka}) this.features.push({text: 'caractéristiques pragmatiques', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.textstrukturelle_pragmatische_charakteristika})
this.features.push({text: 'caractéristiques de tradition discursive', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.diskurstraditionelle_ebene}) this.features.push({text: 'caractéristiques de tradition discursive', root: data.body.TEI.teiHeader.xenoData.sprachliche_ebene.diskurstraditionelle_ebene})
// Do this last for progress bar // Do this last for progress bar
......
...@@ -67,13 +67,13 @@ export default { ...@@ -67,13 +67,13 @@ export default {
reload () { reload () {
// Trigger Backend to reload cache // Trigger Backend to reload cache
this.reloading = true this.reloading = true
this.$http.get('http://localhost:3000/api/metadata/reload').then(function (data) { this.$http.get('api/metadata/reload').then(function (data) {
this.load(true) this.load(true)
}) })
}, },
load (snack) { load (snack) {
// Initial load of metadata // Initial load of metadata
this.$http.get('http://localhost:3000/api/metadata/table').then(function (data) { this.$http.get('api/metadata/table').then(function (data) {
this.letters = data.body this.letters = data.body
this.reloading = false this.reloading = false
this.snackbar = snack this.snackbar = snack
......
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
} }
}, },
created () { created () {
this.$http.get('http://localhost:3000/api/metadata/table').then(function (data) { this.$http.get('api/metadata/table').then(function (data) {
this.items = data.body this.items = data.body
}) })
} }
......
...@@ -87,7 +87,7 @@ export default { ...@@ -87,7 +87,7 @@ export default {
// Remove undefined values // Remove undefined values
Object.keys(params).forEach((key) => (params[key] == null) && delete params[key]) Object.keys(params).forEach((key) => (params[key] == null) && delete params[key])
this.searching = true this.searching = true
this.$http.get('http://localhost:3000/api/search/', {params: params}).then(function (data) { this.$http.get('api/search/', {params: params}).then(function (data) {
this.results = data.body this.results = data.body
this.searching = false this.searching = false
}) })
......
...@@ -11,10 +11,12 @@ import '../node_modules/vuetify/dist/vuetify.min.css' ...@@ -11,10 +11,12 @@ import '../node_modules/vuetify/dist/vuetify.min.css'
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.use(Vuetify) Vue.use(Vuetify)
Vue.use(VueResource)
Vue.component('feature', Feature) Vue.component('feature', Feature)
Vue.component('result', Result) Vue.component('result', Result)
Vue.use(VueResource)
Vue.http.options.root = 'http://localhost:3000'
/* eslint-disable no-new */ /* eslint-disable no-new */
new Vue({ new Vue({
el: '#app', el: '#app',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment