Merge pull request #26 from yuminn-k/feature/board

feat(committee): add email column

.github/workflows/main.yml

@@ -0,0 +1,46 @@
+name: docker build ci
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  image-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Set env
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/v}" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: d556f8
+          password: ${{ secrets.GH_ACCESS }}
+      - name: Build and push
+        uses: docker/build-push-action@v2
+        with:
+          context: .
+          file: ./Dockerfile
+          push: true
+          platforms: linux/amd64,linux/arm64
+          tags: |
+            ghcr.io/esgforumwebsitedev/esgforum-laravel:latest
+            ghcr.io/esgforumwebsitedev/esgforum-laravel:${{ env.RELEASE_VERSION }}
+          ache-from: type=gha # 여기서 gha 는 Guthub Actions 용 캐시를 의미합니다.
+          cache-to: type=gha,mode=max
+      - name: Deploy
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.AWS_HOST }} # EC2 인스턴스 퍼블릭 DNS
+          username: ec2-user
+          key: ${{ secrets.AWS_SSH_KEY }} # pem 키--
+          # 도커 작업
+          script: |
+            docker stop esg-backend-laravel
+            cd ~/app
+            docker compose-up -d

app/Models/Member.php

@@ -25,7 +25,7 @@ public function committeeMembers()
     public function committees()
     {
         return $this->belongsToMany(Committee::class, 'committee_members', 'id2', 'cId')
-                ->withPivot('note')
-                ->withTimestamps();
+            ->withPivot('note')
+            ->withTimestamps();
     }
-}
+}

app/Models/Seminar.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Carbon\Carbon;
 
 class Seminar extends Model
 {
@@ -21,4 +22,9 @@ class Seminar extends Model
     'participation',
     'content'
   ];
+
+  public function getCreatedAtAttribute($value)
+  {
+    return Carbon::parse($value)->format('Y-m-d H:i:s');
+  }
 }

database/migrations/2023_07_22_093009_add_refresh_token_to_users_table.php

@@ -4,15 +4,14 @@
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration
-{
+return new class extends Migration {
     /**
      * Run the migrations.
      */
     public function up(): void
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->text('refresh_token')->nullable()->afrer('authority');
+            $table->text('refresh_token')->nullable()->after('authority');
         });
     }
 
@@ -25,4 +24,4 @@ public function down(): void
             $table->dropColumn('refresh_token');
         });
     }
-};
+};

database/migrations/2023_09_04_233932_add_email_to_members_table.php

@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('members', function (Blueprint $table) {
+            $table->string('email')->after('affiliation')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('members', function (Blueprint $table) {
+            $table->dropColumn('email');
+        });
+    }
+};