diff --git a/.env.example b/.env.example index ac74863..4609353 100644 --- a/.env.example +++ b/.env.example @@ -3,6 +3,7 @@ APP_ENV=local APP_KEY= APP_DEBUG=true APP_URL=http://localhost +THEME="techsuwa" LOG_CHANNEL=stack diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php deleted file mode 100644 index 5aea7c4..0000000 --- a/resources/views/layouts/site.blade.php +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - - - - テクニカル諏訪子 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @if (isset($user) && isset($user->profile) && $user->profile->gender == 1) - - @elseif (isset($user) && isset($user->profile) && $user->profile->gender == 2) - - @elseif (isset($user) && isset($user->profile) && $user->profile->gender == 0) - - @else - - @endif - - - -
-
-
-
-
- ヘッダー -
テクニカル諏訪子
-
-
- ユーチューブのロゴ - ニコニコ動画のロゴ - LBRYのロゴ -
-
- マストドンのロゴ - ビットチュートのロゴ - -
-
-
-
-
-
-
- -
-
-
-
-
- -
-
- @if (isset($user->perm) && isset($res) && ($user->perm['blg_editpost'] || $user->perm['blg_editpage'] || $user->perm['blg_delpost'] || $user->perm['blg_delpage'])) - current(); - $url = explode('/', $url); - - if (isset($url[3])) { - if ($url[3] == 'blog') { - $current = $res->slug; - $slug = $res->slug; - } - else if (isset($url[4]) && isset($url[5]) && $url[3] == 'video' && $url[4] == 'play') { - $current = $url[5]; - $slug = $res->vid; - } - else { - foreach ($menu as $i) { - if ($url[3] == $i['slug']) $current = $url[3]; - $slug = $url[3]; - } - } - } - ?> - @if ($current != '' && $slug != '' && $slug == $current && $url[3] != 'video' && ($user->perm['blg_editpost'] || $user->perm['blg_editpage'] || $user->perm['blg_delpost'] || $user->perm['blg_delpage'])) -
- @if ($current != '' && $slug != '' && $slug == $current && ($user->perm['blg_editpost'] || $user->perm['blg_editpage'])) - - @endif - @if ($current != '' && $slug != '' && $slug == $current && ($user->perm['blg_delpost'] || $user->perm['blg_delpage'])) - - @endif -
- @endif - - @if (isset($url[3]) && isset($url[4]) && isset($url[5]) && $url[3] == 'video' && $url[4] == 'play' && $current != '' && $slug != '' && $slug == $current && $user->perm['blg_editpost']) -
- @if ($current != '' && $slug != '' && $slug == $current && $user->perm['blg_editpost']) - - @endif - @if ($current != '' && $slug != '' && $slug == $current && $user->perm['blg_delpost']) - - @endif -
- @endif - @endif - @yield('content') -
-
-
-
- テクニカル諏訪子のホームページに来まして有難う御座います。ソースコードはこちらです。 -
-
-
-
-
- - - - @if (strpos($_SERVER['REQUEST_URI'], '/video/play') !== false || $_SERVER['REQUEST_URI'] == '/video/play') - - @endif - - diff --git a/resources/views/pages/bash/cli.blade.php b/resources/views/pages/bash/cli.blade.php index 976c652..751ebc4 100644 --- a/resources/views/pages/bash/cli.blade.php +++ b/resources/views/pages/bash/cli.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.bash') +@extends('theme.'.env('THEME').'.bash') @section('content') diff --git a/resources/views/pages/site/commentlist.blade.php b/resources/views/pages/site/commentlist.blade.php index 442fc40..71e9be9 100644 --- a/resources/views/pages/site/commentlist.blade.php +++ b/resources/views/pages/site/commentlist.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/content/add.blade.php b/resources/views/pages/site/content/add.blade.php index c32082d..a3321e6 100644 --- a/resources/views/pages/site/content/add.blade.php +++ b/resources/views/pages/site/content/add.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/content/edit.blade.php b/resources/views/pages/site/content/edit.blade.php index dbf3704..4d547fc 100644 --- a/resources/views/pages/site/content/edit.blade.php +++ b/resources/views/pages/site/content/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/index.blade.php b/resources/views/pages/site/index.blade.php index 13973e9..822d41e 100644 --- a/resources/views/pages/site/index.blade.php +++ b/resources/views/pages/site/index.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/login.blade.php b/resources/views/pages/site/login.blade.php index 45011b2..a472344 100644 --- a/resources/views/pages/site/login.blade.php +++ b/resources/views/pages/site/login.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/memberlist.blade.php b/resources/views/pages/site/memberlist.blade.php index 8d7d64c..7cacad4 100644 --- a/resources/views/pages/site/memberlist.blade.php +++ b/resources/views/pages/site/memberlist.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/notallowed.blade.php b/resources/views/pages/site/notallowed.blade.php index 68f469d..111fca8 100644 --- a/resources/views/pages/site/notallowed.blade.php +++ b/resources/views/pages/site/notallowed.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/notfound.blade.php b/resources/views/pages/site/notfound.blade.php index 6e04de1..50ae898 100644 --- a/resources/views/pages/site/notfound.blade.php +++ b/resources/views/pages/site/notfound.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/page.blade.php b/resources/views/pages/site/page.blade.php index 9c14e5f..5a2bed7 100644 --- a/resources/views/pages/site/page.blade.php +++ b/resources/views/pages/site/page.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/post.blade.php b/resources/views/pages/site/post.blade.php index 3a95744..3b1cd69 100644 --- a/resources/views/pages/site/post.blade.php +++ b/resources/views/pages/site/post.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/profile.blade.php b/resources/views/pages/site/profile.blade.php index c304330..6720ea7 100644 --- a/resources/views/pages/site/profile.blade.php +++ b/resources/views/pages/site/profile.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/profileedit.blade.php b/resources/views/pages/site/profileedit.blade.php index 7271a1e..5099544 100644 --- a/resources/views/pages/site/profileedit.blade.php +++ b/resources/views/pages/site/profileedit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/register.blade.php b/resources/views/pages/site/register.blade.php index 90cb64a..bd441fa 100644 --- a/resources/views/pages/site/register.blade.php +++ b/resources/views/pages/site/register.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/video/game.blade.php b/resources/views/pages/site/video/game.blade.php index 4036c33..e003b5b 100644 --- a/resources/views/pages/site/video/game.blade.php +++ b/resources/views/pages/site/video/game.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/video/game/add.blade.php b/resources/views/pages/site/video/game/add.blade.php index 3612ed6..3ebaa7d 100644 --- a/resources/views/pages/site/video/game/add.blade.php +++ b/resources/views/pages/site/video/game/add.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/video/game/edit.blade.php b/resources/views/pages/site/video/game/edit.blade.php index fb565ac..34e3125 100644 --- a/resources/views/pages/site/video/game/edit.blade.php +++ b/resources/views/pages/site/video/game/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/video/play/add.blade.php b/resources/views/pages/site/video/play/add.blade.php index 4aa43b0..43ccef7 100644 --- a/resources/views/pages/site/video/play/add.blade.php +++ b/resources/views/pages/site/video/play/add.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/video/play/edit.blade.php b/resources/views/pages/site/video/play/edit.blade.php index fe00914..1fe73d9 100644 --- a/resources/views/pages/site/video/play/edit.blade.php +++ b/resources/views/pages/site/video/play/edit.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content') diff --git a/resources/views/pages/site/video/prayer.blade.php b/resources/views/pages/site/video/prayer.blade.php index 1d40717..f9b08e0 100644 --- a/resources/views/pages/site/video/prayer.blade.php +++ b/resources/views/pages/site/video/prayer.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/pages/site/video/videotable.blade.php b/resources/views/pages/site/video/videotable.blade.php index 445032c..371c826 100644 --- a/resources/views/pages/site/video/videotable.blade.php +++ b/resources/views/pages/site/video/videotable.blade.php @@ -1,4 +1,4 @@ -@extends('layouts.site') +@extends('theme.'.env('THEME').'.site') @section('content')
diff --git a/resources/views/layouts/bash.blade.php b/resources/views/theme/techsuwa/bash.blade.php similarity index 100% rename from resources/views/layouts/bash.blade.php rename to resources/views/theme/techsuwa/bash.blade.php diff --git a/resources/views/theme/techsuwa/component/appbar.blade.php b/resources/views/theme/techsuwa/component/appbar.blade.php new file mode 100644 index 0000000..13adccc --- /dev/null +++ b/resources/views/theme/techsuwa/component/appbar.blade.php @@ -0,0 +1,7 @@ +
+
+
+ +
+
+
diff --git a/resources/views/theme/techsuwa/component/colors.blade.php b/resources/views/theme/techsuwa/component/colors.blade.php new file mode 100644 index 0000000..c429997 --- /dev/null +++ b/resources/views/theme/techsuwa/component/colors.blade.php @@ -0,0 +1,13 @@ + + + + +@if (isset($user) && isset($user->profile) && $user->profile->gender == 1) + +@elseif (isset($user) && isset($user->profile) && $user->profile->gender == 2) + +@elseif (isset($user) && isset($user->profile) && $user->profile->gender == 0) + +@else + +@endif diff --git a/resources/views/theme/techsuwa/component/contentedit.blade.php b/resources/views/theme/techsuwa/component/contentedit.blade.php new file mode 100644 index 0000000..ed1b61a --- /dev/null +++ b/resources/views/theme/techsuwa/component/contentedit.blade.php @@ -0,0 +1,27 @@ +@if (isset($user->perm) && isset($res) && ($user->perm['blg_editpost'] || $user->perm['blg_editpage'] || $user->perm['blg_delpost'] || $user->perm['blg_delpage'])) + current(); + $url = explode('/', $url); + + if (isset($url[3])) { + if ($url[3] == 'blog') { + $current = $res->slug; + $slug = $res->slug; + } + else if (isset($url[4]) && isset($url[5]) && $url[3] == 'video' && $url[4] == 'play') { + $current = $url[5]; + $slug = $res->vid; + } + else { + foreach ($menu as $i) { + if ($url[3] == $i['slug']) $current = $url[3]; + $slug = $url[3]; + } + } + } + ?> + @include('theme.'.env('THEME').'.contentedit.content') + @include('theme.'.env('THEME').'.contentedit.video') +@endif diff --git a/resources/views/theme/techsuwa/component/contentedit/content.blade.php b/resources/views/theme/techsuwa/component/contentedit/content.blade.php new file mode 100644 index 0000000..e92f13f --- /dev/null +++ b/resources/views/theme/techsuwa/component/contentedit/content.blade.php @@ -0,0 +1,10 @@ +@if ($current != '' && $slug != '' && $slug == $current && $url[3] != 'video' && ($user->perm['blg_editpost'] || $user->perm['blg_editpage'] || $user->perm['blg_delpost'] || $user->perm['blg_delpage'])) +
+ @if ($current != '' && $slug != '' && $slug == $current && ($user->perm['blg_editpost'] || $user->perm['blg_editpage'])) + + @endif + @if ($current != '' && $slug != '' && $slug == $current && ($user->perm['blg_delpost'] || $user->perm['blg_delpage'])) + + @endif +
+@endif diff --git a/resources/views/theme/techsuwa/component/contentedit/video.blade.php b/resources/views/theme/techsuwa/component/contentedit/video.blade.php new file mode 100644 index 0000000..5835113 --- /dev/null +++ b/resources/views/theme/techsuwa/component/contentedit/video.blade.php @@ -0,0 +1,10 @@ +@if (isset($url[3]) && isset($url[4]) && isset($url[5]) && $url[3] == 'video' && $url[4] == 'play' && $current != '' && $slug != '' && $slug == $current && $user->perm['blg_editpost']) +
+ @if ($current != '' && $slug != '' && $slug == $current && $user->perm['blg_editpost']) + + @endif + @if ($current != '' && $slug != '' && $slug == $current && $user->perm['blg_delpost']) + + @endif +
+@endif diff --git a/resources/views/theme/techsuwa/component/favicon.blade.php b/resources/views/theme/techsuwa/component/favicon.blade.php new file mode 100644 index 0000000..f2cbce4 --- /dev/null +++ b/resources/views/theme/techsuwa/component/favicon.blade.php @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/views/theme/techsuwa/component/footer.php b/resources/views/theme/techsuwa/component/footer.php new file mode 100644 index 0000000..bec6655 --- /dev/null +++ b/resources/views/theme/techsuwa/component/footer.php @@ -0,0 +1,5 @@ +
+
+ テクニカル諏訪子のホームページに来まして有難う御座います。ソースコードはこちらです。 +
+
diff --git a/resources/views/theme/techsuwa/component/header.blade.php b/resources/views/theme/techsuwa/component/header.blade.php new file mode 100644 index 0000000..35e9b26 --- /dev/null +++ b/resources/views/theme/techsuwa/component/header.blade.php @@ -0,0 +1,7 @@ +
+
+ ヘッダー +
テクニカル諏訪子
+ @include('theme.'.env('THEME').'.component.header.sns') +
+
diff --git a/resources/views/theme/techsuwa/component/header/sns.blade.php b/resources/views/theme/techsuwa/component/header/sns.blade.php new file mode 100644 index 0000000..1c10f3c --- /dev/null +++ b/resources/views/theme/techsuwa/component/header/sns.blade.php @@ -0,0 +1,12 @@ +
+
+ ユーチューブのロゴ + ニコニコ動画のロゴ + LBRYのロゴ +
+
+ マストドンのロゴ + ビットチュートのロゴ + +
+
diff --git a/resources/views/theme/techsuwa/component/menu.blade.php b/resources/views/theme/techsuwa/component/menu.blade.php new file mode 100644 index 0000000..bfe07f7 --- /dev/null +++ b/resources/views/theme/techsuwa/component/menu.blade.php @@ -0,0 +1,8 @@ +
+ +
diff --git a/resources/views/theme/techsuwa/component/navbar.blade.php b/resources/views/theme/techsuwa/component/navbar.blade.php new file mode 100644 index 0000000..2579a68 --- /dev/null +++ b/resources/views/theme/techsuwa/component/navbar.blade.php @@ -0,0 +1,45 @@ + diff --git a/resources/views/theme/techsuwa/site.blade.php b/resources/views/theme/techsuwa/site.blade.php new file mode 100644 index 0000000..1a8e5d4 --- /dev/null +++ b/resources/views/theme/techsuwa/site.blade.php @@ -0,0 +1,38 @@ + + + + + + + + + + テクニカル諏訪子 + + @include('theme.'.env('THEME').'.component.favicon') + + @include('theme.'.env('THEME').'.component.colors') + + + @include('theme.'.env('THEME').'.component.navbar') +
+
+
+ @include('theme.'.env('THEME').'.component.header') + @include('theme.'.env('THEME').'.component.appbar') +
+ @include('theme.'.env('THEME').'.component.menu') +
+ @include('theme.'.env('THEME').'.component.contentedit') + @yield('content') +
+
+ @include('theme.'.env('THEME').'.component.footer') +
+
+
+ + + + + diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php deleted file mode 100644 index 3fb48cc..0000000 --- a/resources/views/welcome.blade.php +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - Laravel - - - - - - - - -
- @if (Route::has('login')) - - @endif - -
-
- Laravel -
- - -
-
- -