めちゃくちゃ修正でしょ!
このコミットが含まれているのは:
コミット
c7f49971c3
|
@ -24,6 +24,7 @@
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"bootstrap": "^4.5.0",
|
"bootstrap": "^4.5.0",
|
||||||
"jquery": "^3.5.1",
|
"jquery": "^3.5.1",
|
||||||
|
"popper.js": "^1.16.1",
|
||||||
"vue": "^2.6.11",
|
"vue": "^2.6.11",
|
||||||
"vue-draggable-resizable": "^2.2.0"
|
"vue-draggable-resizable": "^2.2.0"
|
||||||
}
|
}
|
||||||
|
|
|
@ -9,6 +9,12 @@ window._ = require('lodash');
|
||||||
window.Vue = require('vue');
|
window.Vue = require('vue');
|
||||||
window.axios = require('axios');
|
window.axios = require('axios');
|
||||||
|
|
||||||
|
try {
|
||||||
|
window.$ = window.jQuery = require('jquery');
|
||||||
|
|
||||||
|
require('bootstrap');
|
||||||
|
} catch (e) {}
|
||||||
|
|
||||||
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
window.axios.defaults.headers.common['X-Requested-With'] = 'XMLHttpRequest';
|
||||||
|
|
||||||
Vue.component('appbar', require('./components/appbar.vue').default);
|
Vue.component('appbar', require('./components/appbar.vue').default);
|
||||||
|
|
|
@ -50,28 +50,27 @@
|
||||||
<li class="nav-item"><a class="nav-link{{ ($_SERVER['REQUEST_URI'] == '/passman' ? ' active' : '') }}" href="#">パスマン</a></li>
|
<li class="nav-item"><a class="nav-link{{ ($_SERVER['REQUEST_URI'] == '/passman' ? ' active' : '') }}" href="#">パスマン</a></li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="navbar-nav ml-auto">
|
<ul class="navbar-nav ml-auto">
|
||||||
@if ($user)
|
<li class="nav-item dropdown">
|
||||||
<li class="nav-item dropdown">
|
<a class="nav-link dropdown-toggle" href="#" id="userdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
|
||||||
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">
|
@if ($user)
|
||||||
<img src="/{{ $user->profile->avatar }}" height="25px">
|
<img src="/{{ $user->profile->avatar }}" height="25px">
|
||||||
<span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
|
<span style="{{ $user->profile->name_style }}">{{ $user->profile->showname }}</span>
|
||||||
</a>
|
@else
|
||||||
<ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
|
未入会者
|
||||||
<li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの表示</a></li>
|
@endif
|
||||||
<li><a role="menuitem" target="_self" href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの編集</a></li>
|
</a>
|
||||||
<li><div class="dropdown-divider"></div></li>
|
<div class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
|
||||||
<li><a role="menuitem" target="_self" href="/logout" class="dropdown-item">サインアウト</a></li>
|
@if ($user)
|
||||||
</ul>
|
<a href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの表示</a>
|
||||||
</li>
|
<a href="/profile/{{ $user->id }}" class="dropdown-item">プロファイルの編集</a>
|
||||||
@else
|
<div class="dropdown-divider"></div>
|
||||||
<li class="nav-item dropdown">
|
<a href="/logout" class="dropdown-item">サインアウト</a>
|
||||||
<a href="#" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle" id="userdown">未入会者</a>
|
@else
|
||||||
<ul tabindex="-1" class="dropdown-menu dropdown-menu-right" aria-labelledby="userdown">
|
<a href="/login" class="dropdown-item">サインイン</a>
|
||||||
<li class="nav-item"><a target="_self" href="/login" class="nav-link">サインイン</a></li>
|
<a href="/register" class="dropdown-item">新規登録</a>
|
||||||
<li class="nav-item"><a target="_self" href="/register" class="nav-link">新規登録</a></li>
|
@endif
|
||||||
</ul>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
@endif
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
@ -92,7 +91,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div class="row nomobile">
|
<div class="row nomobile">
|
||||||
<div class="col-md" style="padding-bottom: 32px;">
|
<div class="col-md" style="padding-bottom: 32px;">
|
||||||
<div class="within">
|
<div class="within" style="background-color: #31363b;">
|
||||||
<appbar />
|
<appbar />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -2,12 +2,14 @@
|
||||||
|
|
||||||
@section('content')
|
@section('content')
|
||||||
|
|
||||||
@foreach ($res as $r)
|
<div style="border: 2px solid #3daee9; box-shadow: 0px 0px 7px 3px #1d99f3; padding: 8px; background-color: #31363b;">
|
||||||
<div class="within {{ ($r->public_status !== 0 ? ' wny' : '') }}">
|
@foreach ($res as $k => $r)
|
||||||
<div class="bar {{ ($r->public_status !== 0 ? ' bny' : '') }}">
|
<div class="within {{ ($r->public_status !== 0 ? ' wny' : '') }}" style="margin: {{ ($k == 0 ? 0 : 16) }}px auto {{ ($k == count($res)-1 ? 0 : 16) }}px">
|
||||||
<a href="/blog/{{ $r->slug }}">{{ $r->title }}</a>
|
<div class="bar {{ ($r->public_status !== 0 ? ' bny' : '') }}">
|
||||||
|
<a href="/blog/{{ $r->slug }}">{{ $r->title }}</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
@endforeach
|
||||||
</div>
|
</div>
|
||||||
@endforeach
|
|
||||||
|
|
||||||
@endsection
|
@endsection
|
||||||
|
|
新しいイシューから参照