From 2f044c37bcf9839e2add8a8a5b437a9f4436e0d7 Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Wed, 19 Dec 2018 12:14:52 +0100
Subject: [PATCH 1/9] Translate metadata in Letter component
---
src/components/Letter.vue | 22 ++++++++++++++++++++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/src/components/Letter.vue b/src/components/Letter.vue
index 2208f4d..8e7a5dd 100644
--- a/src/components/Letter.vue
+++ b/src/components/Letter.vue
@@ -13,7 +13,7 @@
<v-card-text>
<ul style="list-style-type:none;">
<li v-for="(value, key) in letter.teiHeader.fileDesc.titleStmt">
- <span class="body-2">{{ capitalize(key) }}:</span> {{ value._text }}
+ <span class="body-2">{{ capitalize(toFrench(key)) }}:</span> {{ value._text }}
</li>
</ul>
</v-card-text>
@@ -89,7 +89,17 @@ export default {
letter: null,
images: [],
showComments: true,
- features: []
+ features: [],
+ metadataTranslations: {
+ title: 'titre',
+ collection: 'collection',
+ author: 'auteur(e)',
+ recipient: 'destinataire',
+ gender: 'sex',
+ date: 'date',
+ place: 'lieur',
+ stamp: 'tampon'
+ }
}
},
methods: {
@@ -104,6 +114,14 @@ export default {
}
return text
},
+ toFrench (word) {
+ // Translate some metadata keys to French
+ if (word in this.metadataTranslations) {
+ return this.metadataTranslations[word]
+ } else {
+ return word
+ }
+ },
capitalize (word) {
// Capitalize first letter of a String
return word.charAt(0).toUpperCase() + word.slice(1)
--
GitLab
From ef4fe5493f00d086cd15a1f0f2cbbd62a7fc81b4 Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Wed, 19 Dec 2018 15:52:30 +0100
Subject: [PATCH 2/9] Fix bug in comment display
---
src/components/Letter.vue | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/components/Letter.vue b/src/components/Letter.vue
index 8e7a5dd..c99de39 100644
--- a/src/components/Letter.vue
+++ b/src/components/Letter.vue
@@ -109,6 +109,11 @@ export default {
},
formatText (text) {
// Remove [Stuff] from text
+
+ if (text instanceof Array) {
+ text = text.join(' ')
+ }
+
if (!this.showComments) {
text = text.replace(/\[.*\]/, '')
}
--
GitLab
From 89bb9d166384b0d65ad90209749b88bc2e839738 Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Wed, 19 Dec 2018 15:56:30 +0100
Subject: [PATCH 3/9] Change feature search from v-autocomplete to combobox to
allow user input
---
src/components/Features.vue | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/components/Features.vue b/src/components/Features.vue
index c33d5cd..16f1a88 100644
--- a/src/components/Features.vue
+++ b/src/components/Features.vue
@@ -31,31 +31,31 @@
<!-- Input Fields for Search -->
<v-flex xs12 md3>
- <v-autocomplete
+ <v-combobox
v-model="feature_category"
:items="feature_categories_glossary"
label="Category"
@keyup.enter.native="validate"
>
- </v-autocomplete>
+ </v-combobox>
</v-flex>
<v-flex xs12 md3>
- <v-autocomplete
+ <v-combobox
v-model="feature_type"
:items="feature_types_glossary"
label="Types"
@keyup.enter.native="validate"
>
- </v-autocomplete>
+ </v-combobox>
</v-flex>
<v-flex xs12 md3>
- <v-autocomplete
+ <v-combobox
v-model="feature_subtype"
:items="feature_subtypes_glossary"
label="Subtypes"
@keyup.enter.native="validate"
>
- </v-autocomplete>
+ </v-combobox>
</v-flex>
<!-- Search Buttons -->
--
GitLab
From f0dfa9126a278c342dfd585145d650c44012afb1 Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Wed, 19 Dec 2018 16:02:33 +0100
Subject: [PATCH 4/9] Add link to source code in Index
---
src/components/Index.vue | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/components/Index.vue b/src/components/Index.vue
index 3ca1d47..a22920e 100644
--- a/src/components/Index.vue
+++ b/src/components/Index.vue
@@ -37,6 +37,9 @@
<p>Ces lettres serviront également de base pour une nouvelle histoire de l’alphabétisation et aideront aussi les disciplines voisines de la linguistique, notamment l’historiographie de la vie quotidienne et la science culturelle.</p>
</v-flex>
+
+ <p>Source: <a target="_blank" href="https://gitlab.cs.fau.de/bi40resu/vue-cdbp">https://gitlab.cs.fau.de/bi40resu/vue-cdbp</a></p>
+
</v-layout>
</v-container>
--
GitLab
From cb16abc14edec3f788abc9275a3a6254f1d2a99b Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Wed, 19 Dec 2018 16:06:46 +0100
Subject: [PATCH 5/9] Bump to v1.1.6
---
CHANGELOG.md | 10 ++++++++++
package.json | 2 +-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bd3ff3..25dd60b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+# Version 1.1.6
+- Extend autocomplete of feature search
+- Minor changes in index information
+- Fix bug in note display
+
+# Version 1.1.5
+- Add autocomplete to feature search
+- Add display of new note-tags
+- Change frontend to French
+
# Version 1.1.4
- Make Google Fonts available offline
- Unify project title
diff --git a/package.json b/package.json
index 3f4c009..afe839c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "cdbp",
- "version": "1.1.4",
+ "version": "1.1.6",
"description": "FAU CDBP",
"author": "Markus Opolka <markus@martialblog.de>",
"private": true,
--
GitLab
From b356dab372c7726ddf39b9fd76e7d81d2d42255f Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Wed, 19 Dec 2018 16:18:11 +0100
Subject: [PATCH 6/9] Sort feature glossary
---
lib.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib.js b/lib.js
index a77e493..9673bde 100755
--- a/lib.js
+++ b/lib.js
@@ -205,9 +205,9 @@ function featureGlossary (objs) {
}
let ret = {
- categories: Array.from(new Set(categories)),
- types: Array.from(new Set(types)),
- subtypes: Array.from(new Set(subtypes))
+ categories: Array.from(new Set(categories)).sort(),
+ types: Array.from(new Set(types)).sort(),
+ subtypes: Array.from(new Set(subtypes)).sort()
}
return ret
--
GitLab
From 8b085aa67a9ba153419232fa7119faa6215fd6f9 Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Thu, 20 Dec 2018 11:43:56 +0100
Subject: [PATCH 7/9] Remove dead code
---
lib.js | 24 ------------------------
1 file changed, 24 deletions(-)
diff --git a/lib.js b/lib.js
index 9673bde..3127a3f 100755
--- a/lib.js
+++ b/lib.js
@@ -143,30 +143,6 @@ function searchFeaturesInDocument (document, query) {
return document
}
-function featureToString (feature) {
- /*
- * Turn into feature object into category>type>subtype String
- */
-
- let category = feature.category
- let type = feature.type
- let subtype = feature.subtype
-
- let ret = ''
-
- if (category !== undefined) {
- ret = ret.concat(category)
- }
- if (type !== undefined) {
- ret = ret.concat(' > ', type)
- }
- if (subtype !== undefined) {
- ret = ret.concat(' > ', subtype)
- }
-
- return ret
-}
-
function featureGlossary (objs) {
/*
* Turn list of documents objects into a glossary set
--
GitLab
From 03a5c7e90f90728db5859e2a3ba252aaedf58afd Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Thu, 20 Dec 2018 11:44:52 +0100
Subject: [PATCH 8/9] Add Dockerfile
---
.dockerignore | 10 ++++++++++
Dockerfile | 12 ++++++++++++
2 files changed, 22 insertions(+)
create mode 100644 .dockerignore
create mode 100644 Dockerfile
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..ccba9af
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,10 @@
+.git
+.gitignore
+.dockerignore
+Dockerfile
+node_modules
+*.md
+*.txt
+*.example
+.editorconfig
+yarn.lock
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..16417b0
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,12 @@
+FROM node:alpine
+LABEL maintainer="markus.opolka@fau.de"
+
+COPY . /app
+WORKDIR /app
+
+RUN yarn install
+RUN yarn run build
+
+EXPOSE 3000
+
+ENTRYPOINT node app.js
--
GitLab
From 3cd7db403955fe7f74e85ebf86f3deed7d1e1c08 Mon Sep 17 00:00:00 2001
From: Markus Opolka <markus@martialblog.de>
Date: Thu, 20 Dec 2018 11:53:54 +0100
Subject: [PATCH 9/9] Fix typo in French translation
---
src/components/Letter.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/Letter.vue b/src/components/Letter.vue
index c99de39..354288f 100644
--- a/src/components/Letter.vue
+++ b/src/components/Letter.vue
@@ -95,9 +95,9 @@ export default {
collection: 'collection',
author: 'auteur(e)',
recipient: 'destinataire',
- gender: 'sex',
+ gender: 'sexe',
date: 'date',
- place: 'lieur',
+ place: 'lieu',
stamp: 'tampon'
}
}
--
GitLab