準備中

.env.example

@@ -50,3 +50,11 @@ JWT_BLACKLIST_GRACE_PERIOD=30
 
 MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
 MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
+
+GMO_KEY=""
+GMO_SECRET=""
+
+CONOHA_DENANT_ID=""
+CONOHA_DENANT_NAME=""
+CONOHA_USER_NAME=""
+CONOHA_USER_PASS=""

composer.json

@@ -1,63 +1,64 @@
 {
-    "name": "laravel/laravel",
+  "name": "laravel/laravel",
-    "description": "The Laravel Framework.",
+  "description": "The Laravel Framework.",
-    "keywords": ["framework", "laravel"],
+  "keywords": ["framework", "laravel"],
-    "license": "MIT",
+  "license": "MIT",
-    "type": "project",
+  "type": "project",
-    "require": {
+  "require": {
-        "php": ">=7.1.3",
+    "php": ">=7.1.3",
-        "barryvdh/laravel-cors": "^0.11.2",
+    "barryvdh/laravel-cors": "^0.11.2",
-        "fideloper/proxy": "^4.0",
+    "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.8.*",
+    "laravel/framework": "5.8.*",
-        "laravel/tinker": "^1.0.8",
+    "laravel/tinker": "^1.0.8",
-        "predis/predis": "^1.1.1"
+    "predis/predis": "^1.1.1",
-    },
+    "stripe/stripe-php": "^6.37"
-    "require-dev": {
+  },
-        "filp/whoops": "^2.3.1",
+  "require-dev": {
-        "fzaninotto/faker": "^1.8",
+    "filp/whoops": "^2.3.1",
-        "mockery/mockery": "^1.2.2",
+    "fzaninotto/faker": "^1.8",
-        "nunomaduro/collision": "^2.1.1",
+    "mockery/mockery": "^1.2.2",
-        "phpunit/phpunit": "^8.0.4",
+    "nunomaduro/collision": "^2.1.1",
-        "reliese/laravel": "^0.0.13",
+    "phpunit/phpunit": "^8.0.4",
-        "symfony/thanks": "^1.1.0"
+    "reliese/laravel": "^0.0.13",
-    },
+    "symfony/thanks": "^1.1.0"
-    "autoload": {
+  },
-        "classmap": [
+  "autoload": {
-            "database/seeds",
+    "classmap": [
-            "database/factories"
+      "database/seeds",
-        ],
+      "database/factories"
-        "psr-4": {
+    ],
-            "App\\": "app/"
+    "psr-4": {
-        }
+      "App\\": "app/"
-    },
+    }
-    "autoload-dev": {
+  },
-        "psr-4": {
+  "autoload-dev": {
-            "Tests\\": "tests/"
+    "psr-4": {
-        }
+      "Tests\\": "tests/"
-    },
+    }
-    "extra": {
+  },
-        "laravel": {
+  "extra": {
-            "dont-discover": [
+    "laravel": {
-            ]
+      "dont-discover": [
-        }
+      ]
-    },
+    }
-    "scripts": {
+  },
-        "post-root-package-install": [
+  "scripts": {
-            "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
+    "post-root-package-install": [
-        ],
+      "@php -r \"file_exists('.env') || copy('.env.example', '.env');\""
-        "post-create-project-cmd": [
+    ],
-            "@php artisan key:generate"
+    "post-create-project-cmd": [
-        ],
+      "@php artisan key:generate"
-        "post-autoload-dump": [
+    ],
-            "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
+    "post-autoload-dump": [
-            "@php artisan package:discover"
+      "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
-        ]
+      "@php artisan package:discover"
-    },
+    ]
-    "config": {
+  },
-        "preferred-install": "dist",
+  "config": {
-        "sort-packages": true,
+    "preferred-install": "dist",
-        "optimize-autoloader": true
+    "sort-packages": true,
-    },
+    "optimize-autoloader": true
-    "minimum-stability": "dev",
+  },
-    "prefer-stable": true
+  "minimum-stability": "dev",
-}
+  "prefer-stable": true
+}

package.json

@@ -5,6 +5,7 @@
         "development": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "watch": "cross-env NODE_ENV=development node_modules/webpack/bin/webpack.js --watch --progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",
         "watch-poll": "npm run watch -- --watch-poll",
+        "w": "npm run watch -- --watch-poll",
         "hot": "cross-env NODE_ENV=development node_modules/webpack-dev-server/bin/webpack-dev-server.js --inline --hot --config=node_modules/laravel-mix/setup/webpack.config.js",
         "prod": "npm run production",
         "production": "cross-env NODE_ENV=production node_modules/webpack/bin/webpack.js --no-progress --hide-modules --config=node_modules/laravel-mix/setup/webpack.config.js",

resources/assets/js/app.js

@@ -8,7 +8,7 @@
 require('./bootstrap');
 
 window.Vue = require('vue');
-import bash from './components/cli.vue';
+import bash from './components/bash/cli.vue';
 
 Vue.component('bash', bash);
 

resources/assets/js/components/bash/cli.vue

@@ -72,9 +72,7 @@
       },
       ls(pwd) {
         var neopwd = pwd.replace('/', 'sl');
-        axios.get('/api/rpc/bash/exec', {
+        axios.get('/api/rpc/bash/exec', { arg: ['ls', '', ''] }).then(res => {
-          arg: ['ls', '', '']
-        }).then(res => {
           this.result.push({
             username: this.user,
             hostname: this.host,
@@ -105,9 +103,7 @@
 
         this.pwd = pwd;
       },
-      clear() {
+      clear() { this.result = []; }
-        this.result = [];
-      }
     }
   }
 </script>
@@ -122,27 +118,11 @@
     width: 500px;
     outline: none;
   }
-  .regBold {
+  .regBold { font-weight: bold; }
-    font-weight: bold;
+  .regText { color: #2ecc71; }
-  }
+  .pathText { color: #3498db; }
-  .regText {
+  h1, h2 { font-weight: normal; }
-    color: #2ecc71;
+  ul { list-style-type: none; padding: 0; }
-  }
+  li { display: inline-block; margin: 0 10px; }
-  .pathText {
+  a { color: #1cdc9a; }
-    color: #3498db;
-  }
-  h1, h2 {
-    font-weight: normal;
-  }
-  ul {
-    list-style-type: none;
-    padding: 0;
-  }
-  li {
-    display: inline-block;
-    margin: 0 10px;
-  }
-  a {
-    color: #1cdc9a;
-  }
 </style>

routes/api/bash.php

@@ -0,0 +1,4 @@
+<?php
+
+// コマンド
+Route::get('/api/rpc/bash/exec', 'BashController@exec');

routes/api/board.php

@@ -1,15 +1,6 @@
 <?php
 
-/*
+// カテゴリー
-|--------------------------------------------------------------------------
-| Board class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to board.
-|
-*/
-
-// Category
 Route::get('/api/rpc/board/category/getcategories', 'BoardController@getCategories');
 Route::get('/api/rpc/board/category/getcategory/{id}', 'BoardController@getCategory');
 Route::get('/api/rpc/board/category/getcategoryname/{id}', 'BoardController@getCategoryName');
@@ -18,7 +9,7 @@ Route::post('/api/rpc/board/category/add', 'BoardController@addCategory');
 Route::post('/api/rpc/board/category/edit', 'BoardController@editCategory');
 Route::post('/api/rpc/board/category/delete', 'BoardController@deleteCategory');
 
-// Forum
+// フォーラム
 Route::get('/api/rpc/board/forum/getforumsincategory/{cat_id}', 'BoardController@getForumsInCategory');
 Route::get('/api/rpc/board/forum/getforums/{id}', 'BoardController@getForums');
 Route::get('/api/rpc/board/forum/getforum/{id}', 'BoardController@getForum');
@@ -30,7 +21,7 @@ Route::post('/api/rpc/board/forum/add', 'BoardController@addForum');
 Route::post('/api/rpc/board/forum/edit', 'BoardController@editForum');
 Route::post('/api/rpc/board/forum/delete', 'BoardController@deleteForum');
 
-// Topic
+// スレッド
 Route::get('/api/rpc/board/topic/gettopics/{for}/{from}/{to}', 'BoardController@getTopics');
 Route::get('/api/rpc/board/topic/gettopicsunpinned/{for}/{from}/{to}', 'BoardController@getTopicsUnpinned');
 Route::get('/api/rpc/board/topic/gettopicspinned/{for}/{from}/{to}', 'BoardController@getTopicsPinned');
@@ -54,7 +45,7 @@ Route::post('/api/rpc/board/topic/move', 'BoardController@moveTopic');
 Route::post('/api/rpc/board/topic/pin', 'BoardController@pinTopic');
 Route::post('/api/rpc/board/topic/unpin', 'BoardController@unpinTopic');
 
-// Post
+// 投稿
 Route::get('/api/rpc/board/post/getpostsintopic/{top}/{from}/{to}', 'BoardController@getPostsInTopic');
 Route::get('/api/rpc/board/post/countpostsintopic/{top}', 'BoardController@countPostsInTopic');
 Route::get('/api/rpc/board/post/getpost/{id}', 'BoardController@getPost');

routes/api/image.php

@@ -1,14 +1,6 @@
 <?php
 
-/*
+# 画像
-|--------------------------------------------------------------------------
-| Image class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to image.
-|
-*/
-
 Route::get('/api/rpc/image/get/userwithuploads', 'ImageController@getUserWithUploads');
 Route::get('/api/rpc/image/get/all', 'ImageController@getAll');
 Route::get('/api/rpc/image/get/own', 'ImageController@getOwn');

routes/api/invoice.php

@@ -1,15 +1,6 @@
 <?php
 
-/*
+// 顧客様
-|--------------------------------------------------------------------------
-| Invoice class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to invoice.
-|
-*/
-
-// Management
 Route::get('/api/rpc/invoice/company/getall', 'InvoiceController@getCompanies');
 Route::get('/api/rpc/invoice/company/get/{id}', 'InvoiceController@getCompany');
 
@@ -17,7 +8,7 @@ Route::post('/api/rpc/invoice/company/new', 'InvoiceController@newCompany');
 Route::post('/api/rpc/invoice/company/edit', 'InvoiceController@editCompany');
 Route::post('/api/rpc/invoice/company/delete', 'InvoiceController@deleteCompany');
 
-// Relations
+// 連絡先
 Route::get('/api/rpc/invoice/contacts/getall', 'InvoiceController@getContacts');
 Route::get('/api/rpc/invoice/contacts/get/{id}', 'InvoiceController@getContact');
 
@@ -25,7 +16,7 @@ Route::post('/api/rpc/invoice/contacts/new', 'InvoiceController@newContact');
 Route::post('/api/rpc/invoice/contacts/edit', 'InvoiceController@editContact');
 Route::post('/api/rpc/invoice/contacts/delete', 'InvoiceController@deleteContact');
 
-// Invoices
+// 請求書
 Route::get('/api/rpc/invoice/invoices/getall', 'InvoiceController@getInvoices');
 Route::get('/api/rpc/invoice/periods/getall', 'InvoiceController@getPeriods');
 Route::get('/api/rpc/invoice/products/getall', 'InvoiceController@getProducts');

routes/api/pack.php

@@ -0,0 +1,3 @@
+<?php
+
+Route::get('/api/rpc/pack/get', 'PackageController@get');

routes/api/site.php

@@ -1,15 +1,6 @@
 <?php
 
-/*
+// 投稿
-|--------------------------------------------------------------------------
-| Site class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to site.
-|
-*/
-
-// Posts
 Route::get('/api/rpc/site/post/get/all', 'SiteController@getPosts');
 Route::get('/api/rpc/site/post/get/user/{id}', 'SiteController@getUserPosts');
 Route::get('/api/rpc/site/post/get/id/{id}', 'SiteController@getPostSlug');
@@ -18,7 +9,7 @@ Route::post('/api/rpc/site/post/new', 'SiteController@newPost');
 Route::post('/api/rpc/site/post/edit', 'SiteController@editPost');
 Route::post('/api/rpc/site/post/delete', 'SiteController@deletePost');
 
-// Comments
+// コメント
 Route::get('/api/rpc/site/comment/get/all/{id}', 'SiteController@getComments');
 Route::get('/api/rpc/site/comment/get/one/{id}', 'SiteController@getComment');
 Route::post('/api/rpc/site/comment/new', 'SiteController@newComment');
@@ -26,7 +17,7 @@ Route::post('/api/rpc/site/comment/edit', 'SiteController@editComment');
 Route::post('/api/rpc/site/comment/remove', 'SiteController@removeComment');
 Route::post('/api/rpc/site/comment/vote', 'SiteController@voteComment');
 
-// Pages
+// ページ
 Route::get('/api/rpc/site/page/get/menu', 'SiteController@getPagesInMenu');
 Route::get('/api/rpc/site/page/get/all', 'SiteController@getPages');
 Route::get('/api/rpc/site/page/get/id/{id}', 'SiteController@getPageSlug');
@@ -35,7 +26,7 @@ Route::post('/api/rpc/site/page/new', 'SiteController@newPage');
 Route::post('/api/rpc/site/page/edit', 'SiteController@editPage');
 Route::post('/api/rpc/site/page/delete', 'SiteController@deletePage');
 
-// Contact Fields
+// 連絡先
 Route::get('/api/rpc/site/contact/getcontactfields', 'SiteController@getContactFields');
 Route::get('/api/rpc/site/contact/getcontactfield/id', 'SiteController@getContactField');
 Route::post('/api/rpc/site/contact/new', 'SiteController@newContactField');
@@ -59,6 +50,6 @@ Route::post('/api/rpc/site/portfolio/edititem', 'SiteController@editPortfolioIte
 Route::post('/api/rpc/site/portfolio/removeitem', 'SiteController@removePortfolioItem');
 Route::post('/api/rpc/site/portfolio/deleteitem', 'SiteController@deletePortfolioItem');
 
-// Admin
+// 管理者
 Route::get('/api/rpc/site/admin/getsettings', 'SiteController@getSettings');
 Route::post('/api/rpc/site/admin/setsettings', 'SiteController@setSettings');

routes/api/store.php

@@ -1,23 +1,12 @@
 <?php
 
-// namespace \App\Http\Controllers\Store;
+// ゲーム
-
-/*
-|--------------------------------------------------------------------------
-| Store class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to store.
-|
-*/
-
-// Games
 Route::get('/api/rpc/store/game/getgames', 'StoreController@getGames');
 Route::get('/api/rpc/store/game/getgame/{id}', 'StoreController@getGame');
 Route::post('/api/rpc/store/game/newgame', 'StoreController@newGame');
 Route::post('/api/rpc/store/game/editgame', 'StoreController@editGame');
 
-// Category
+// カテゴリー
 Route::get('/api/rpc/store/category/getcategories', 'StoreController@getCategories');
 Route::get('/api/rpc/store/category/getcategory/{id}', 'StoreController@getCategory');
 Route::get('/api/rpc/store/category/getgameofcategory/{id}', 'StoreController@getGameOfCategory');
@@ -29,8 +18,8 @@ Route::get('/api/rpc/store/category/getcategoryname/{id}', 'StoreController@getC
 Route::post('/api/rpc/store/category/newcategory', 'StoreController@newCategory');
 Route::post('/api/rpc/store/category/editcategory', 'StoreController@editCategory');
 
-// Entry
+// ファイル
-// Just to test middleware.
+// テスト用
 Route::get('/api/rpc/store/entry/getallentries', 'StoreController@getAllEntries');
 //->middleware('auth');
 Route::get('/api/rpc/store/entry/getallapprovedentries', 'StoreController@getAllApprovedEntries');
@@ -59,5 +48,5 @@ Route::post('/api/rpc/store/entry/update', 'StoreController@updateEntry');
 Route::post('/api/rpc/store/entry/restore', 'StoreController@restoreEntry');
 Route::post('/api/rpc/store/entry/remove', 'StoreController@removeEntry');
 
-// Compiled routes.
+// ルート
 Route::get('/api/rpc/store/browse/browsepermissions/{uid}', 'StoreController@browsePermissions');

routes/api/user.php

@@ -1,15 +1,6 @@
 <?php
 
-/*
+// オーナー
-|--------------------------------------------------------------------------
-| User class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to user.
-|
-*/
-
-// Owner
 Route::get('/api/rpc/user/owner/countownersofentry/{id}', 'UserController@countOwnersOfEntry');
 Route::get('/api/rpc/user/owner/getownersofentry/{id}', 'UserController@getOwnersOfEntry');
 Route::get('/api/rpc/user/owner/countentriesofowner/{id}', 'UserController@countEntriesOfOwner');
@@ -18,7 +9,7 @@ Route::get('/api/rpc/user/owner/getownerlist', 'UserController@getOwnerList');
 
 Route::post('/api/rpc/user/owner/addowner', 'UserController@addOwner');
 
-// User
+// ユーザ
 Route::get('/api/rpc/user/user/getusersonline', 'UserController@getUsersOnline');
 Route::get('/api/rpc/user/user/getcountries', 'UserController@getCountries');
 Route::get('/api/rpc/user/user/getusers', 'UserController@getUsers');
@@ -39,7 +30,7 @@ Route::post('/api/rpc/user/user/updatetotaltopiccount', 'UserController@updateTo
 Route::post('/api/rpc/user/user/avatarupload', 'UserController@avatarUpload');
 Route::post('/api/rpc/user/user/edit', 'UserController@editUser');
 
-// Comment
+// コメント
 Route::get('/api/rpc/user/comment/count/{id}', 'UserController@countComments');
 Route::get('/api/rpc/user/comment/get/{id}', 'UserController@getComments');
 Route::get('/api/rpc/user/comment/reply/{id}', 'UserController@getReplies');
@@ -49,7 +40,7 @@ Route::post('/api/rpc/user/comment/edit', 'UserController@editComment');
 Route::post('/api/rpc/user/comment/delete', 'UserController@deleteComment');
 Route::post('/api/rpc/user/comment/undelete', 'UserController@undeleteComment');
 
-// Notifications
+// 通知
 Route::get('/api/rpc/user/notification/get', 'UserController@getNotification');
 
 Route::post('/api/rpc/user/notification/del', 'UserController@delNotification');

routes/class/bash.php

@@ -1,13 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| User class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to user.
-|
-*/
-
-// Commands
-Route::get('/api/rpc/bash/exec', 'BashController@exec');

routes/class/pack.php

@@ -1,12 +0,0 @@
-<?php
-
-/*
-|--------------------------------------------------------------------------
-| Package class
-|--------------------------------------------------------------------------
-|
-| These are the API routes corresponding to board.
-|
-*/
-
-Route::get('/api/rpc/pack/get', 'PackageController@get');

routes/view/bash.php

@@ -0,0 +1,3 @@
+<?php
+
+Route::get('/', function () { return view('pages/bash/cli'); });

routes/web.php

@@ -11,13 +11,16 @@
 |
 */
 
-require(__DIR__.'/class/board.php');
+require(__DIR__.'/api/bash.php');
-require(__DIR__.'/class/image.php');
+require(__DIR__.'/api/board.php');
-require(__DIR__.'/class/invoice.php');
+require(__DIR__.'/api/image.php');
-require(__DIR__.'/class/pack.php');
+require(__DIR__.'/api/invoice.php');
-require(__DIR__.'/class/site.php');
+require(__DIR__.'/api/pack.php');
-require(__DIR__.'/class/store.php');
+require(__DIR__.'/api/site.php');
-require(__DIR__.'/class/user.php');
+require(__DIR__.'/api/store.php');
+require(__DIR__.'/api/user.php');
+
+require(__DIR__.'/view/bash.php');
 
 // Auth
 Route::post('/api/auth/checkself', 'AuthController@checkSelf');
@@ -35,11 +38,4 @@ Route::get('/api/rpc/permission/getpermissionsfrommodule', 'PermissionController
 Route::get('/api/rpc/permission/getpermissionfrommodule/{id}', 'PermissionController@getPermissionFromModule');
 Route::get('/api/rpc/permission/getpermissions/{mdl}', 'PermissionController@getPermissions');
 Route::get('/api/rpc/permission/getpermissiongroup/{mdl}/{id}', 'PermissionController@getPermissionGroup');
-Route::get('/api/rpc/permission/getpermissionuser/{mdl}/{id}', 'PermissionController@getPermissionUser');
+Route::get('/api/rpc/permission/getpermissionuser/{mdl}/{id}', 'PermissionController@getPermissionUser');
-
-// Bash
-Route::get('/', function () {
-  return view('cli');
-});
-
-require(__DIR__.'/class/bash.php');