From 0602d86e694093300ceb888c4858f7ffa48d9452 Mon Sep 17 00:00:00 2001
From: philipp lang <philipp@aweos.de>
Date: Sun, 11 Apr 2021 17:37:26 +0200
Subject: [PATCH] Add letter address
---
app/Member/Member.php | 2 +-
app/Member/MemberResource.php | 1 +
.../migrations/2020_04_12_223230_create_members_table.php | 1 +
resources/js/app.js | 2 ++
resources/js/components/FTextarea.vue | 6 +++---
resources/js/views/member/Edit.vue | 3 +++
6 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/app/Member/Member.php b/app/Member/Member.php
index 9f0e355c..dbf15d10 100644
--- a/app/Member/Member.php
+++ b/app/Member/Member.php
@@ -10,7 +10,7 @@ class Member extends Model
{
use Notifiable;
- public $fillable = ['firstname', 'lastname', 'nickname', 'other_country', 'birthday', 'joined_at', 'send_newspaper', 'address', 'further_address', 'zip', 'location', 'main_phone', 'mobile_phone', 'work_phone', 'fax', 'email', 'email_parents', 'nami_id', 'letter_address', 'country_id', 'way_id', 'nationality_id', 'fee_id', 'region_id', 'gender_id', 'confession_id'];
+ public $fillable = ['firstname', 'lastname', 'nickname', 'other_country', 'birthday', 'joined_at', 'send_newspaper', 'address', 'further_address', 'zip', 'location', 'main_phone', 'mobile_phone', 'work_phone', 'fax', 'email', 'email_parents', 'nami_id', 'letter_address', 'country_id', 'way_id', 'nationality_id', 'fee_id', 'region_id', 'gender_id', 'confession_id', 'letter_address'];
public $dates = ['joined_at', 'birthday'];
diff --git a/app/Member/MemberResource.php b/app/Member/MemberResource.php
index 5f526f77..668a5893 100644
--- a/app/Member/MemberResource.php
+++ b/app/Member/MemberResource.php
@@ -40,6 +40,7 @@ class MemberResource extends JsonResource
'nationality_id' => $this->nationality_id,
'other_country' => $this->other_country,
'confession_id' => $this->confession_id,
+ 'letter_address' => $this->letter_address,
];
}
}
diff --git a/database/migrations/2020_04_12_223230_create_members_table.php b/database/migrations/2020_04_12_223230_create_members_table.php
index d403c17e..68b3c6c8 100644
--- a/database/migrations/2020_04_12_223230_create_members_table.php
+++ b/database/migrations/2020_04_12_223230_create_members_table.php
@@ -39,6 +39,7 @@ class CreateMembersTable extends Migration
$table->integer('nami_id')->nullable();
$table->foreignId('nationality_id')->constrained();
$table->foreignId('fee_id')->constrained();
+ $table->text('letter_address')->nullable();
$table->timestamps();
});
diff --git a/resources/js/app.js b/resources/js/app.js
index 929ac6e8..5d63dc9c 100644
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -7,6 +7,7 @@ import Sprite from './components/Sprite.js';
import FText from './components/FText.vue';
import FSelect from './components/FSelect.vue';
+import FTextarea from './components/FTextarea.vue';
import Pages from './components/Pages.vue';
import VBool from './components/VBool.vue';
import App from './layouts/App.vue';
@@ -14,6 +15,7 @@ import App from './layouts/App.vue';
Vue.use(plugin)
Vue.component('f-text', FText);
Vue.component('f-select', FSelect);
+Vue.component('f-textarea', FTextarea);
Vue.component('sprite', Sprite);
Vue.component('pages', Pages);
Vue.component('v-bool', VBool);
diff --git a/resources/js/components/FTextarea.vue b/resources/js/components/FTextarea.vue
index ea79f57e..e38ab347 100644
--- a/resources/js/components/FTextarea.vue
+++ b/resources/js/components/FTextarea.vue
@@ -1,6 +1,6 @@
<template>
<label class="flex flex-col relative">
- <span v-if="label && !inset" class="font-semibold text-gray-700" :class="{
+ <span v-if="label && !inset" class="font-semibold text-gray-400" :class="{
'text-xs': size == 'sm',
'text-sm': size === null
}">{{ label }}<span v-show="required" class="text-red-800"> *</span></span>
@@ -9,9 +9,9 @@
'text-sm': size === null
}">{{ label }}<span v-show="required" class="text-red-800"> *</span></span>
<textarea v-text="value" @input="trigger" :placeholder="placeholder"
- class="h-full outline-none border-gray-400 border-solid" :rows="rows"
+ class="h-full outline-none bg-gray-700 border-gray-600 border-solid" :rows="rows"
:class="{
- 'rounded-lg text-sm border-2 p-2 text-gray-800': size === null,
+ 'rounded-lg text-sm border-2 p-2 text-gray-300': size === null,
'rounded-lg py-2 px-2 text-xs border-2 text-gray-800': size == 'sm'
}"
></textarea>
diff --git a/resources/js/views/member/Edit.vue b/resources/js/views/member/Edit.vue
index 4db5bd5e..90592bc0 100644
--- a/resources/js/views/member/Edit.vue
+++ b/resources/js/views/member/Edit.vue
@@ -76,6 +76,9 @@
<div>
<f-select :options="confessions" id="confession_id" v-model="inner.confession_id" label="Konfession"></f-select>
</div>
+ <div>
+ <f-textarea rows="4" id="letter_address" v-model="inner.letter_address" label="Brief-Adresse"></f-textarea>
+ </div>
</div>
</div>
</form>