From 98868e470e72fc2f23728fb6cea8b873272f7487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?= =?UTF-8?q?=E8=A8=AA=E5=AD=90?= Date: Thu, 8 Aug 2019 18:00:24 +0900 Subject: [PATCH] =?UTF-8?q?=E6=BA=96=E5=82=99=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 8 ++ app/Http/Controllers/MailController.php | 0 composer.json | 125 +++++++++--------- package.json | 1 + resources/assets/js/app.js | 2 +- .../assets/js/components/{ => bash}/cli.vue | 38 ++---- .../views/{ => pages/bash}/cli.blade.php | 0 resources/views/pages/site/editpage.blade.php | 0 resources/views/pages/site/editpost.blade.php | 0 resources/views/pages/site/newpage.blade.php | 0 resources/views/pages/site/newpost.blade.php | 0 resources/views/pages/site/page.blade.php | 0 resources/views/pages/site/post.blade.php | 0 routes/api/bash.php | 4 + routes/{class => api}/board.php | 17 +-- routes/{class => api}/image.php | 10 +- routes/{class => api}/invoice.php | 15 +-- routes/api/pack.php | 3 + routes/{class => api}/site.php | 19 +-- routes/{class => api}/store.php | 21 +-- routes/{class => api}/user.php | 17 +-- routes/{class => api}/vps.php | 0 routes/class/bash.php | 13 -- routes/class/pack.php | 12 -- routes/view/bash.php | 3 + routes/web.php | 26 ++-- 26 files changed, 125 insertions(+), 209 deletions(-) create mode 100644 app/Http/Controllers/MailController.php rename resources/assets/js/components/{ => bash}/cli.vue (86%) rename resources/views/{ => pages/bash}/cli.blade.php (100%) create mode 100644 resources/views/pages/site/editpage.blade.php create mode 100644 resources/views/pages/site/editpost.blade.php create mode 100644 resources/views/pages/site/newpage.blade.php create mode 100644 resources/views/pages/site/newpost.blade.php create mode 100644 resources/views/pages/site/page.blade.php create mode 100644 resources/views/pages/site/post.blade.php create mode 100644 routes/api/bash.php rename routes/{class => api}/board.php (94%) rename routes/{class => api}/image.php (71%) rename routes/{class => api}/invoice.php (91%) create mode 100644 routes/api/pack.php rename routes/{class => api}/site.php (92%) rename routes/{class => api}/store.php (91%) rename routes/{class => api}/user.php (90%) rename routes/{class => api}/vps.php (100%) delete mode 100644 routes/class/bash.php delete mode 100644 routes/class/pack.php create mode 100644 routes/view/bash.php diff --git a/.env.example b/.env.example index a162327..256cca1 100644 --- a/.env.example +++ b/.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="" diff --git a/app/Http/Controllers/MailController.php b/app/Http/Controllers/MailController.php new file mode 100644 index 0000000..e69de29 diff --git a/composer.json b/composer.json index 76e213d..923c3a3 100644 --- a/composer.json +++ b/composer.json @@ -1,63 +1,64 @@ { - "name": "laravel/laravel", - "description": "The Laravel Framework.", - "keywords": ["framework", "laravel"], - "license": "MIT", - "type": "project", - "require": { - "php": ">=7.1.3", - "barryvdh/laravel-cors": "^0.11.2", - "fideloper/proxy": "^4.0", - "laravel/framework": "5.8.*", - "laravel/tinker": "^1.0.8", - "predis/predis": "^1.1.1" - }, - "require-dev": { - "filp/whoops": "^2.3.1", - "fzaninotto/faker": "^1.8", - "mockery/mockery": "^1.2.2", - "nunomaduro/collision": "^2.1.1", - "phpunit/phpunit": "^8.0.4", - "reliese/laravel": "^0.0.13", - "symfony/thanks": "^1.1.0" - }, - "autoload": { - "classmap": [ - "database/seeds", - "database/factories" - ], - "psr-4": { - "App\\": "app/" - } - }, - "autoload-dev": { - "psr-4": { - "Tests\\": "tests/" - } - }, - "extra": { - "laravel": { - "dont-discover": [ - ] - } - }, - "scripts": { - "post-root-package-install": [ - "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" - ], - "post-create-project-cmd": [ - "@php artisan key:generate" - ], - "post-autoload-dump": [ - "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", - "@php artisan package:discover" - ] - }, - "config": { - "preferred-install": "dist", - "sort-packages": true, - "optimize-autoloader": true - }, - "minimum-stability": "dev", - "prefer-stable": true -} + "name": "laravel/laravel", + "description": "The Laravel Framework.", + "keywords": ["framework", "laravel"], + "license": "MIT", + "type": "project", + "require": { + "php": ">=7.1.3", + "barryvdh/laravel-cors": "^0.11.2", + "fideloper/proxy": "^4.0", + "laravel/framework": "5.8.*", + "laravel/tinker": "^1.0.8", + "predis/predis": "^1.1.1", + "stripe/stripe-php": "^6.37" + }, + "require-dev": { + "filp/whoops": "^2.3.1", + "fzaninotto/faker": "^1.8", + "mockery/mockery": "^1.2.2", + "nunomaduro/collision": "^2.1.1", + "phpunit/phpunit": "^8.0.4", + "reliese/laravel": "^0.0.13", + "symfony/thanks": "^1.1.0" + }, + "autoload": { + "classmap": [ + "database/seeds", + "database/factories" + ], + "psr-4": { + "App\\": "app/" + } + }, + "autoload-dev": { + "psr-4": { + "Tests\\": "tests/" + } + }, + "extra": { + "laravel": { + "dont-discover": [ + ] + } + }, + "scripts": { + "post-root-package-install": [ + "@php -r \"file_exists('.env') || copy('.env.example', '.env');\"" + ], + "post-create-project-cmd": [ + "@php artisan key:generate" + ], + "post-autoload-dump": [ + "Illuminate\\Foundation\\ComposerScripts::postAutoloadDump", + "@php artisan package:discover" + ] + }, + "config": { + "preferred-install": "dist", + "sort-packages": true, + "optimize-autoloader": true + }, + "minimum-stability": "dev", + "prefer-stable": true +} \ No newline at end of file diff --git a/package.json b/package.json index 7c6677d..6973df4 100644 --- a/package.json +++ b/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", diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 796d70e..8a7c3a4 100644 --- a/resources/assets/js/app.js +++ b/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); diff --git a/resources/assets/js/components/cli.vue b/resources/assets/js/components/bash/cli.vue similarity index 86% rename from resources/assets/js/components/cli.vue rename to resources/assets/js/components/bash/cli.vue index f38d07a..bd585d8 100644 --- a/resources/assets/js/components/cli.vue +++ b/resources/assets/js/components/bash/cli.vue @@ -72,9 +72,7 @@ }, ls(pwd) { var neopwd = pwd.replace('/', 'sl'); - axios.get('/api/rpc/bash/exec', { - arg: ['ls', '', ''] - }).then(res => { + axios.get('/api/rpc/bash/exec', { arg: ['ls', '', ''] }).then(res => { this.result.push({ username: this.user, hostname: this.host, @@ -105,9 +103,7 @@ this.pwd = pwd; }, - clear() { - this.result = []; - } + clear() { this.result = []; } } } @@ -122,27 +118,11 @@ width: 500px; outline: none; } - .regBold { - font-weight: bold; - } - .regText { - color: #2ecc71; - } - .pathText { - color: #3498db; - } - h1, h2 { - font-weight: normal; - } - ul { - list-style-type: none; - padding: 0; - } - li { - display: inline-block; - margin: 0 10px; - } - a { - color: #1cdc9a; - } + .regBold { font-weight: bold; } + .regText { color: #2ecc71; } + .pathText { color: #3498db; } + h1, h2 { font-weight: normal; } + ul { list-style-type: none; padding: 0; } + li { display: inline-block; margin: 0 10px; } + a { color: #1cdc9a; } diff --git a/resources/views/cli.blade.php b/resources/views/pages/bash/cli.blade.php similarity index 100% rename from resources/views/cli.blade.php rename to resources/views/pages/bash/cli.blade.php diff --git a/resources/views/pages/site/editpage.blade.php b/resources/views/pages/site/editpage.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/pages/site/editpost.blade.php b/resources/views/pages/site/editpost.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/pages/site/newpage.blade.php b/resources/views/pages/site/newpage.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/pages/site/newpost.blade.php b/resources/views/pages/site/newpost.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/pages/site/page.blade.php b/resources/views/pages/site/page.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/resources/views/pages/site/post.blade.php b/resources/views/pages/site/post.blade.php new file mode 100644 index 0000000..e69de29 diff --git a/routes/api/bash.php b/routes/api/bash.php new file mode 100644 index 0000000..f9d12c2 --- /dev/null +++ b/routes/api/bash.php @@ -0,0 +1,4 @@ +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'); diff --git a/routes/class/user.php b/routes/api/user.php similarity index 90% rename from routes/class/user.php rename to routes/api/user.php index 51ffb9b..53a81fc 100644 --- a/routes/class/user.php +++ b/routes/api/user.php @@ -1,15 +1,6 @@