From d77539381c672b27a8aa04e85e2db24b908a04ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Volds=C3=A6ter?= <ole.voldsater@uib.no>
Date: Thu, 24 Sep 2020 09:05:37 +0200
Subject: [PATCH] determinativ, pronomen + flyttet stiler tilbake til
Header.vue
---
src/components/Header.vue | 23 ++++++++++++++--
src/components/inflection/Adjective.vue | 14 ----------
src/components/inflection/AdjectiveAdv.vue | 14 ----------
src/components/inflection/AdjectiveMF.vue | 14 ----------
src/components/inflection/AdjectiveMF_F.vue | 14 ----------
src/components/inflection/Determinative.vue | 26 +++++++++++++++++++
.../inflection/DeterminativeAdj.vue | 17 ++++++++++++
src/components/inflection/Pronoun.vue | 21 +++++++++++++++
8 files changed, 85 insertions(+), 58 deletions(-)
create mode 100644 src/components/inflection/Determinative.vue
create mode 100644 src/components/inflection/DeterminativeAdj.vue
create mode 100644 src/components/inflection/Pronoun.vue
diff --git a/src/components/Header.vue b/src/components/Header.vue
index be7ef41c..ca59317c 100644
--- a/src/components/Header.vue
+++ b/src/components/Header.vue
@@ -25,6 +25,9 @@ import ADJ from './inflection/Adjective.vue'
import ADJ_adv from './inflection/AdjectiveAdv.vue'
import ADJ_masc_fem from './inflection/AdjectiveMF.vue'
import ADJ_masc_fem_fem from './inflection/AdjectiveMF_F.vue'
+import DET from './inflection/Determinative.vue'
+import DET_adj from './inflection/DeterminativeAdj.vue'
+import PRON from './inflection/Pronoun.vue'
export default {
name: 'Header',
@@ -40,12 +43,15 @@ export default {
ADJ,
ADJ_adv,
ADJ_masc_fem,
- ADJ_masc_fem_fem
+ ADJ_masc_fem_fem,
+ DET,
+ DET_adj,
+ PRON
}
}
</script>
-<style scoped>
+<style >
summary {
width: 30em;
@@ -69,6 +75,19 @@ details > summary {
text-decoration-style: dashed;
}
+.inflection table {
+ border-collapse: collapse;
+ margin: 10px;
+}
+
+.inflection td, .inflection th {
+ border: solid;
+ border-width: 1px;
+ margin: 0px 0px 0px 0px;
+ padding: 3px;
+}
+
+
details > summary::-webkit-details-marker {
display: none;
}
diff --git a/src/components/inflection/Adjective.vue b/src/components/inflection/Adjective.vue
index 9acaa8e8..3d9c98b3 100644
--- a/src/components/inflection/Adjective.vue
+++ b/src/components/inflection/Adjective.vue
@@ -33,17 +33,3 @@ export default {
}
}
</script>
-
-<style scoped>
- table {
- border-collapse: collapse;
- margin: 10px;
- }
-
- td, th {
- border: solid;
- border-width: 1px;
- margin: 0px 0px 0px 0px;
- padding: 3px;
- }
-</style>
diff --git a/src/components/inflection/AdjectiveAdv.vue b/src/components/inflection/AdjectiveAdv.vue
index 5c66eb8f..37f60771 100644
--- a/src/components/inflection/AdjectiveAdv.vue
+++ b/src/components/inflection/AdjectiveAdv.vue
@@ -20,17 +20,3 @@ export default {
}
}
</script>
-
-<style scoped>
- table {
- border-collapse: collapse;
- margin: 10px;
- }
-
- td, th {
- border: solid;
- border-width: 1px;
- margin: 0px 0px 0px 0px;
- padding: 3px;
- }
-</style>
diff --git a/src/components/inflection/AdjectiveMF.vue b/src/components/inflection/AdjectiveMF.vue
index 10144882..7b0eea28 100644
--- a/src/components/inflection/AdjectiveMF.vue
+++ b/src/components/inflection/AdjectiveMF.vue
@@ -35,17 +35,3 @@ export default {
}
}
</script>
-
-<style scoped>
- table {
- border-collapse: collapse;
- margin: 10px;
- }
-
- td, th {
- border: solid;
- border-width: 1px;
- margin: 0px 0px 0px 0px;
- padding: 3px;
- }
-</style>
diff --git a/src/components/inflection/AdjectiveMF_F.vue b/src/components/inflection/AdjectiveMF_F.vue
index d239415f..54e2d316 100644
--- a/src/components/inflection/AdjectiveMF_F.vue
+++ b/src/components/inflection/AdjectiveMF_F.vue
@@ -35,17 +35,3 @@ export default {
}
}
</script>
-
-<style scoped>
- table {
- border-collapse: collapse;
- margin: 10px;
- }
-
- td, th {
- border: solid;
- border-width: 1px;
- margin: 0px 0px 0px 0px;
- padding: 3px;
- }
-</style>
diff --git a/src/components/inflection/Determinative.vue b/src/components/inflection/Determinative.vue
new file mode 100644
index 00000000..04040fc5
--- /dev/null
+++ b/src/components/inflection/Determinative.vue
@@ -0,0 +1,26 @@
+<template>
+ <table>
+ <tr>
+ <th rowspan="2">Determinativ</th><th colspan="3">Entall</th><th rowspan="2">Flertall</th>
+ </tr>
+ <tr>
+ <th>Hankjønn</th><th>Hunkjønn</th><th>Intetkjønn</th>
+ </tr>
+ <tr v-for="(std, index) in standardisations" :key="index">
+ <td></td>
+ <td>{{std.inflection[0].word_form}}</td>
+ <td>{{std.inflection[1].word_form}}</td>
+ <td>{{std.inflection[2].word_form}}</td>
+ <td>{{std.inflection[3].word_form}}</td>
+ </tr>
+ </table>
+</template>
+
+<script>
+export default {
+ name: "DET",
+ props: {
+ standardisations: Array
+ }
+}
+</script>
diff --git a/src/components/inflection/DeterminativeAdj.vue b/src/components/inflection/DeterminativeAdj.vue
new file mode 100644
index 00000000..b009bf34
--- /dev/null
+++ b/src/components/inflection/DeterminativeAdj.vue
@@ -0,0 +1,17 @@
+<template>
+ <DET :standardisations="standardisations"></DET>
+</template>
+
+<script>
+import DET from './Determinative.vue'
+
+export default {
+ name: "DET_adj",
+ props: {
+ standardisations: Array
+ },
+ components: {
+ DET
+ }
+}
+</script>
diff --git a/src/components/inflection/Pronoun.vue b/src/components/inflection/Pronoun.vue
new file mode 100644
index 00000000..6e7a9ac6
--- /dev/null
+++ b/src/components/inflection/Pronoun.vue
@@ -0,0 +1,21 @@
+<template>
+ <table>
+ <tr>
+ <th>Pronomen</th><th>Subjektsform</th><th>Objektsform</th>
+ </tr>
+ <tr v-for="(std, index) in standardisations" :key="index">
+ <td></td>
+ <td>{{std.inflection[0].word_form}}</td>
+ <td>{{std.inflection[1].word_form}}</td>
+ </tr>
+ </table>
+</template>
+
+<script>
+export default {
+ name: "PRON",
+ props: {
+ standardisations: Array
+ }
+}
+</script>
--
GitLab