Skip to content

Meemong #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XisoDev wants to merge 4 commits into
base: adapfit
Choose a base branch
from
Open

Meemong #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7999622
update
XisoDev Apr 20, 2022
621a599
Merge branch 'master' of https://github.com/amuzcorp/ApplicationHelper
XisoDev Apr 20, 2022
e2bd596
Controller.php , plugin.php 누락된 코드 추가
zooz3456 Apr 21, 2022
1e1779f
update apple auth
XisoDev Nov 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 49 additions & 15 deletions plugin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
<?php
namespace Amuz\XePlugin\ApplicationHelper;

use Carbon\Carbon;
use Schema;
use Amuz\XePlugin\ApplicationHelper\Middleware\AmuzApiHelpers;
use Amuz\XePlugin\ApplicationHelper\Migrations\Migration;
use Illuminate\Support\Str;
use Route;
use Xpressengine\Http\Request;
use Xpressengine\Plugin\AbstractPlugin;
use Xpressengine\Plugins\Banner\Models\Group;
use Xpressengine\Plugins\Banner\Models\Item;
use Xpressengine\Plugins\SocialLogin\Handler;

class Plugin extends AbstractPlugin
Expand Down Expand Up @@ -84,7 +87,8 @@ function () {
Route::get('/ib/user/register/{group_id?}', ['as' => 'ahib::user_register', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@getRegister']);
Route::post('/ib/user/register/{group_id?}', ['as' => 'ahib::user_register.store', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@postRegister']); // for store
Route::post('/ib/user/group_select', ['as' => 'ahib::post_group_select', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@postGroupSelect']); // for store

Route::post('/ib/user/term_agree', ['as' => 'ahib::post_term_agree', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\RegisterController@postTermAgree']); // for store
//

Route::get('/ib/board/{instance_id}', ['as' => 'ahib::board', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\BoardController@index']);
Route::get('/ib/board/{instance_id}/create', ['as' => 'ahib::board_create', 'uses' => 'Amuz\XePlugin\ApplicationHelper\InAppBrowsers\BoardController@create']);
Expand All @@ -103,6 +107,7 @@ function () {
//get Board Comment Data
Route::get('/comment/getItem', ['as' => 'ah::get_comment', 'uses' => 'Amuz\XePlugin\ApplicationHelper\BoardApiController@getItem']);
Route::get('/banner/getItem', ['as' => 'application_helper.get.banner.item', 'uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@bannerItemData']);
Route::get('/banner/{banner_key}', ['as' => 'ah::banner_list', 'uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@getBanner']);

//이것은 마치 나의 필살기
Route::any('/syncDocuments', [
Expand All @@ -119,7 +124,7 @@ function () {
Route::get('/auth/user_groups',['as' => 'ah::user_groups','uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@user_groups']);

Route::any('/auth/update',['as' => 'ah::user_update','uses' => 'Amuz\XePlugin\ApplicationHelper\Controller@userUpdate']);
});
});
}

public function settingsRoute(){
Expand Down Expand Up @@ -291,22 +296,28 @@ public function interceptDynamicField() {
if(!$query) return $query;

//배너 아이템문서에 업데이트 발생할 경우 어댑핏 어플리케이션 배너 정보 업데이트
$banner_list = app('xe.config')->get('application_helper.app_config')->get('banner_list');

foreach($banner_list as $key => $banner) {
if($banner['id'] === $query->id) {
$banner_list[$key]['title'] = $query->title;
$banner_list[$key]['group_id'] = $query->group_id;
$banner_list[$key]['image_path'] = $query->image['path'];
$banner_list[$key]['image_id'] = $query->image['id'];
$banner_list[$key]['content'] = $query->content;
$banner_list[$key]['link'] = $query->link;
$banner_list[$key]['link_target'] = $query->link_target;
$banner_list[$key]['group'] = $query->group;
$xe_config = app('xe.config');
$ah_config = $xe_config->get('application_helper');
if($ah_config == null){
$xe_config->set('application_helper',[]);
$ah_config = $xe_config->get('application_helper');
}
$ah_banner_groups = $ah_config->get('banner',[]);

$banner_data = [];
foreach($ah_banner_groups as $key => $item) {
$banner_config = $ah_banner_groups[$key];
$group_id = $banner_config['group'];
$group = Group::find($group_id);
$banner_items = $this->getItems($group);
foreach($banner_items as $banner) {
if($banner->image === "") continue;
$banner->slide_time = (int) $banner_config['slide_time'];
$banner_data[$key][] = $banner->toArray();
}
}
app('xe.config')->set('application_helper.app_config', [
'banner_list' => $banner_list
'ah_banner_config' => $banner_data
]);
return $query;
});
Expand Down Expand Up @@ -376,4 +387,27 @@ public function checkUpdated()

return parent::checkUpdated();
}

public function getItems($group, $count = null, $onlyVisible = false)
{
$query = Item::where('group_id', $group->id);

if ($onlyVisible) {
$query->where('status', 'show')
->where(function ($query) {
$query->where('use_timer', 0)
->orWhere(function ($query) {
$now = Carbon::now();
$query->where('ended_at', '>', $now);
$query->where('started_at', '<', $now);
});
});
}

if ($count !== null) {
$query->take($count);
}

return $query->orderBy('order', 'desc')->orderBy('created_at', 'desc')->get();
}
}
Loading