Skip to content

Commit

Permalink
Merge pull request #506 from uu-plathome/main
Browse files Browse the repository at this point in the history
Productionへの反映
  • Loading branch information
H37kouya authored Dec 27, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 4476f48 + d862768 commit 65c90b6
Showing 44 changed files with 6 additions and 2,309 deletions.
51 changes: 0 additions & 51 deletions .github/workflows/api.yml
Original file line number Diff line number Diff line change
@@ -62,54 +62,3 @@ jobs:
run: |
docker compose exec -T app ls storage/logs
docker compose exec -T app /bin/bash -c "cd storage/logs && find . -type f | xargs cat"
deploy-stg:
if: github.ref == 'refs/heads/develop/stg'
needs: [laravel-tests]
runs-on: ubuntu-latest

steps:
- name: Deploy
uses: appleboy/ssh-action@v0.1.6
with:
host: ${{ secrets.XSERVER_HOST_NAME }}
username: ${{ secrets.XSERVER_USER_NAME }}
key: ${{ secrets.XSERVER_SSH_KEY }}
port: 10022
script: |
whoami
pwd
ls -la
deploy:
if: github.ref == 'refs/heads/develop/production'
needs: [laravel-tests]
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Deploy
env:
PRIVATE_KEY: ${{ secrets.XSERVER_SSH_KEY }}
USER_NAME: ${{ secrets.XSERVER_USER_NAME }}
HOST_NAME: ${{ secrets.XSERVER_HOST_NAME }}
run: |
echo "$PRIVATE_KEY" > private_key && chmod 600 private_key
ssh -vvv -p 10022 -o StrictHostKeyChecking=no -i private_key ${USER_NAME}@${HOST_NAME} '
cd ~/uu-circles.com/work/api && \
mkdir ${{ github.run_number }} && \
cd ${{ github.run_number }} && \
git clone https://github.com/UU-PlatHome/uu-circles.git && \
cd uu-circles/api && \
git reset --hard origin/develop/production && \
cp ../../../.env .env && \
cp ../../../credentials.json credentials.json && \
composer install && \
php artisan migrate --force && \
php artisan cache:clear && \
php artisan config:cache && \
php artisan route:cache && \
php artisan view:cache
cd ~/uu-circles.com && \
ln -nfs ~/uu-circles.com/work/api/${{ github.run_number }} ~/uu-circles.com/work/api/current
'
Original file line number Diff line number Diff line change
@@ -4,7 +4,10 @@ import { BaseSelect } from '@/src/components/atoms/form/BaseSelect'
import { BaseTextarea } from '@/src/components/atoms/form/BaseTextarea'
import { UseBooleanInput, UseStringInput } from '@/src/hooks/useInput'
import { __ } from '@/src/lang/ja'
import { getAllPlaceOfActivity } from '@/src/lib/enum/api/PlaceOfActivity'
import {
getAllPlaceOfActivity,
PlaceOfActivity,
} from '@/src/lib/enum/api/PlaceOfActivity'
import { getAllWeek, Week } from '@/src/lib/enum/api/Week'

type Props = {
@@ -188,7 +191,7 @@ const ActivityEditCircleForm: FC<Props> = ({ form }) => {
items={[
...getAllPlaceOfActivity().map((_placeOfActivity) => ({
value: _placeOfActivity,
label: __(_placeOfActivity),
label: __(_placeOfActivity, PlaceOfActivity._type),
})),
]}
{...form.commonPlaceOfActivity}
7 changes: 0 additions & 7 deletions api/app/Console/Commands/GenerateRequestTypeForTs.php
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
use App\Http\Requests\Admin\CircleNewJoy\UpdateCircleNewJoyRequest;
use App\Http\Requests\Admin\CircleTag;
use App\Http\Requests\Admin\CircleUser;
use App\Http\Requests\Admin\DemoCircleNewJoy;
use App\Http\Requests\Circle\Auth\ForgotPasswordCircleRequest;
use App\Http\Requests\Circle\Auth\LoginCircleFormRequest;
use App\Http\Requests\Circle\Auth\RegisterCircleFormRequest;
@@ -34,7 +33,6 @@
use App\Http\Requests\Circle\CircleUser\RegisterCircleUserRequest as CircleUserRegisterCircleUserRequest;
use App\Http\Requests\Circle\CircleUser\UpdateCircleUserRequest as CircleUserUpdateCircleUserRequest;
use App\Http\Requests\Circle\User\UpdateOwnUserRequest;
use App\Http\Requests\Main;
use Illuminate\Console\Command;
use ReflectionClass;

@@ -98,8 +96,6 @@ public function __construct()
CircleTag\CreateOrUpdateCircleTagRequest::class,
Announcement\CreateAnnouncementRequest::class,
Announcement\UpdateAnnouncementRequest::class,
DemoCircleNewJoy\RegisterDemoCircleNewJoyRequest::class,
DemoCircleNewJoy\UpdateDemoCircleNewJoyRequest::class,
];
$this->requestCircleClasses = [
ForgotPasswordCircleRequest::class,
@@ -118,9 +114,6 @@ public function __construct()
ImportCircleUserRequest::class,
\App\Http\Requests\Circle\CircleTag\CreateOrUpdateCircleTagRequest::class,
];
$this->requestMainClasses = [
Main\PagePosition\CreatePagePositionRequest::class,
];
}

private function init()
2 changes: 0 additions & 2 deletions api/app/Console/Commands/MakeEnumForTs.php
Original file line number Diff line number Diff line change
@@ -8,7 +8,6 @@
use App\Enum\CircleTagModel;
use App\Enum\CircleType;
use App\Enum\DateOfActivity;
use App\Enum\DemoCircleNewjoyType;
use App\Enum\Importance;
use App\Enum\PlaceOfActivity;
use App\Enum\Role;
@@ -67,7 +66,6 @@ public function __construct()
CategorySlugProperty::class,
CircleType::class,
CircleTagModel::class,
DemoCircleNewjoyType::class,
DateOfActivity::class,
Importance::class,
PlaceOfActivity::class,
26 changes: 0 additions & 26 deletions api/app/Enum/DemoCircleNewjoyType.php

This file was deleted.

21 changes: 0 additions & 21 deletions api/app/Enum/Property/DemoCircleNewJoyProperty.php

This file was deleted.

8 changes: 0 additions & 8 deletions api/app/Enum/RouteProperty/ApiRouteProperty.php
Original file line number Diff line number Diff line change
@@ -6,8 +6,6 @@ class ApiRouteProperty
{
// トップページ
const MainIndex = 'main.index';
// トップページ (デモ)
const MainDemoIndex = 'main.index.demo';
// サイトマップ
const MainSitemap = 'main.sitemap';
// 統計
@@ -26,17 +24,11 @@ class ApiRouteProperty

// 今日の新歓
const MainCircleNewJoyToday = 'main.circleNewJoy.today';
// 今日の新歓 (デモ)
const MainCircleNewJoyTodayDemo = 'main.circleNewJoy.today.demo';

// 新歓
const MainCircleNewJoyIndex = 'main.circleNewJoy.index';
const MainCircleNewJoyShow = 'main.circleNewJoy.show';

// デモ新歓
const MainDemoCircleNewJoyIndex = 'main.circleNewJoy.demo.index';
const MainDemoCircleNewJoyShow = 'main.circleNewJoy.demo.show';

// ガチャ
const MainGachaPickup = 'main.gacha.pickup';
const MainGachaDraw = 'main.gacha.draw';

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 65c90b6

Please sign in to comment.