From 2812a5d04200ff548e8f01af17a99b1c1f34d25a 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?= <d@076.ne.jp>
Date: Thu, 8 Oct 2020 19:57:12 +0900
Subject: [PATCH] =?UTF-8?q?=E6=80=A7=E5=88=A5=EF=BC=9D=E3=83=86=E3=83=BC?=
 =?UTF-8?q?=E3=83=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/sass/_variables.scss                | 61 ++++++-------------
 resources/sass/_variables_f.scss              | 21 +++++++
 resources/sass/_variables_m.scss              | 21 +++++++
 resources/sass/app_f.scss                     | 61 +++++++++++++++++++
 resources/sass/app_m.scss                     | 61 +++++++++++++++++++
 resources/views/layouts/admin.blade.php       | 35 -----------
 resources/views/layouts/site.blade.php        |  6 ++
 .../views/pages/admin/dashboard.blade.php     |  7 ---
 routes/api/invoice.php                        | 51 ----------------
 routes/api/pack.php                           |  3 -
 routes/view/admin.php                         | 12 ----
 routes/web.php                                |  3 -
 webpack.mix.js                                |  2 +
 13 files changed, 190 insertions(+), 154 deletions(-)
 create mode 100644 resources/sass/_variables_f.scss
 create mode 100644 resources/sass/_variables_m.scss
 create mode 100644 resources/sass/app_f.scss
 create mode 100644 resources/sass/app_m.scss
 delete mode 100644 resources/views/layouts/admin.blade.php
 delete mode 100644 resources/views/pages/admin/dashboard.blade.php
 delete mode 100644 routes/api/invoice.php
 delete mode 100644 routes/api/pack.php
 delete mode 100644 routes/view/admin.php

diff --git a/resources/sass/_variables.scss b/resources/sass/_variables.scss
index 5a844aa..13a1307 100644
--- a/resources/sass/_variables.scss
+++ b/resources/sass/_variables.scss
@@ -1,49 +1,24 @@
-$spec: false;
-
 // 色
 //// メイン
-$suwa00: #9ed6ff;
-$suwa01: #8bb6d6;
-$suwa02: #6ec0fb;
-$suwa03: #3daee9;
-$suwa04: #1d99f3;
-$suwa05: #0094ff;
-$suwa06: #3498db;
-$suwa07: #2980b9;
-$suwa08: #205e7d;
-$suwa09: #2c3e50;
-$suwa10: #34495e;
+$suwa00: #f1d0ff;
+$suwa01: #e4b4f8;
+$suwa02: #d898f3;
+$suwa03: #cb81ea;
+$suwa04: #b16cce;
+$suwa05: #a05ebd;
+$suwa06: #9b59b6;
+$suwa07: #61237c;
+$suwa08: #46195a;
+$suwa09: #341242;
+$suwa10: #220a2c;
 
-$evil0: #6e93ad;
-$evil1: #436a86;
-$evil2: #2b6b8b;
-$evil3: #2980b9;
-$evil4: #22699c;
-$evil5: #04547d;
-$evil6: #1a3746;
-
-@if $spec {
-  $suwa00: #ffe6f9;
-  $suwa01: #e599e5;
-  $suwa02: #ea81e8;
-  $suwa03: #e93de9;
-  $suwa04: #f31de8;
-  $suwa05: #ea00ff;
-  $suwa06: #db34d3;
-  $suwa07: #b929b2;
-  $suwa07: #b459b6;
-  $suwa08: #7d2069;
-  $suwa09: #502c50;
-  $suwa10: #5e345c;
-
-  $evil0: #ad6ea8;
-  $evil1: #864386;
-  $evil2: #832b8b;
-  $evil3: #b929ad;
-  $evil4: #9c2296;
-  $evil5: #7d0469;
-  $evil6: #421a46;
-}
+$evil0: #916ead;
+$evil1: #6b4386;
+$evil2: #5d2b8b;
+$evil3: #6c29b9;
+$evil4: #57229c;
+$evil5: #51047d;
+$evil6: #2d1a46;
 
 //// 青
 $dan1: #9ed6ff;
diff --git a/resources/sass/_variables_f.scss b/resources/sass/_variables_f.scss
new file mode 100644
index 0000000..aea2fc9
--- /dev/null
+++ b/resources/sass/_variables_f.scss
@@ -0,0 +1,21 @@
+// 色
+//// メイン
+$suwa00: #ffe6f9;
+$suwa01: #e599e5;
+$suwa02: #ea81e8;
+$suwa03: #e93de9;
+$suwa04: #f31de8;
+$suwa05: #ea00ff;
+$suwa06: #db34d3;
+$suwa07: #b459b6;
+$suwa08: #7d2069;
+$suwa09: #502c50;
+$suwa10: #5e345c;
+
+$evil0: #ad6ea8;
+$evil1: #864386;
+$evil2: #832b8b;
+$evil3: #b929ad;
+$evil4: #9c2296;
+$evil5: #7d0469;
+$evil6: #421a46;
diff --git a/resources/sass/_variables_m.scss b/resources/sass/_variables_m.scss
new file mode 100644
index 0000000..29e73e1
--- /dev/null
+++ b/resources/sass/_variables_m.scss
@@ -0,0 +1,21 @@
+// 色
+//// メイン
+$suwa00: #9ed6ff;
+$suwa01: #8bb6d6;
+$suwa02: #6ec0fb;
+$suwa03: #3daee9;
+$suwa04: #1d99f3;
+$suwa05: #0094ff;
+$suwa06: #3498db;
+$suwa07: #2980b9;
+$suwa08: #205e7d;
+$suwa09: #2c3e50;
+$suwa10: #34495e;
+
+$evil0: #6e93ad;
+$evil1: #436a86;
+$evil2: #2b6b8b;
+$evil3: #2980b9;
+$evil4: #22699c;
+$evil5: #04547d;
+$evil6: #1a3746;
diff --git a/resources/sass/app_f.scss b/resources/sass/app_f.scss
new file mode 100644
index 0000000..842ff68
--- /dev/null
+++ b/resources/sass/app_f.scss
@@ -0,0 +1,61 @@
+// Variables
+@import "variables";
+@import "variables_f";
+
+// Bootstrap
+@import '~bootstrap/scss/bootstrap';
+
+// フォント
+@import "jpserriffont";
+
+// ロゴ
+@import "logo";
+
+// ナビバー
+@import "navbar";
+
+// サイドメニュー
+@import "sidemenu";
+
+// コンテンツ
+@import "contents";
+
+// スクロール
+@import "scroll";
+
+// コンポーネント
+@import "conponent/badge";
+@import "conponent/button";
+@import "conponent/check";
+@import "conponent/form";
+@import "conponent/modal";
+@import "conponent/select";
+
+// テーブル
+@import "conponent/table";
+
+// その他
+#app {
+  font-family: monospace;
+  font-size: large;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-align: left;
+  margin-top: 48px;
+  margin-left: 0px;
+}
+
+body {
+  font-family: 'jpserriffont';
+  text-align: center;
+  color: $white1;
+  background-color: $black1;
+}
+
+a { color: $suwa04; }
+a:hover { color: $suwa03; }
+// .new { background-color: $suwa09; margin: 10px auto; padding: 0; }
+// .head > div { margin: 5px 0; }
+// .new-head, .new-body { padding: 10px; }
+// .new-head { border: 2px solid $suwa03; background-color: $suwa10; }
+// .new-body { border-bottom: 2px solid $suwa03; border-left: 2px solid $suwa03; border-right: 2px solid $suwa03; }
diff --git a/resources/sass/app_m.scss b/resources/sass/app_m.scss
new file mode 100644
index 0000000..9bf90ee
--- /dev/null
+++ b/resources/sass/app_m.scss
@@ -0,0 +1,61 @@
+// Variables
+@import "variables";
+@import "variables_m";
+
+// Bootstrap
+@import '~bootstrap/scss/bootstrap';
+
+// フォント
+@import "jpserriffont";
+
+// ロゴ
+@import "logo";
+
+// ナビバー
+@import "navbar";
+
+// サイドメニュー
+@import "sidemenu";
+
+// コンテンツ
+@import "contents";
+
+// スクロール
+@import "scroll";
+
+// コンポーネント
+@import "conponent/badge";
+@import "conponent/button";
+@import "conponent/check";
+@import "conponent/form";
+@import "conponent/modal";
+@import "conponent/select";
+
+// テーブル
+@import "conponent/table";
+
+// その他
+#app {
+  font-family: monospace;
+  font-size: large;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  text-align: left;
+  margin-top: 48px;
+  margin-left: 0px;
+}
+
+body {
+  font-family: 'jpserriffont';
+  text-align: center;
+  color: $white1;
+  background-color: $black1;
+}
+
+a { color: $suwa04; }
+a:hover { color: $suwa03; }
+// .new { background-color: $suwa09; margin: 10px auto; padding: 0; }
+// .head > div { margin: 5px 0; }
+// .new-head, .new-body { padding: 10px; }
+// .new-head { border: 2px solid $suwa03; background-color: $suwa10; }
+// .new-body { border-bottom: 2px solid $suwa03; border-left: 2px solid $suwa03; border-right: 2px solid $suwa03; }
diff --git a/resources/views/layouts/admin.blade.php b/resources/views/layouts/admin.blade.php
deleted file mode 100644
index b12d2d9..0000000
--- a/resources/views/layouts/admin.blade.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ app()->getLocale() }}">
-  <head>
-    <meta charset="utf-8">
-    <meta name="csrf-token" content="{{ csrf_token() }}">
-    <title>{{ config('app.name', 'Laravel') }}</title>
-    <link href="{{ asset('css/app.css') }}" rel="stylesheet">
-  </head>
-  <body>
-    <div id="app">
-      <div class="container-fluid">
-        <div class="row">
-          <div class="col">
-            <nav class="navbar sticky-top navbar-dark bg-dark navbar-expand-md">
-              <a href="/" class="navbar-brand">sa</a>
-            </nav>
-          </div>
-        </div>
-        <div class="row">
-          <div class="col-2">
-            <ul>
-              <li>トップ</li>
-              <li>ブログ</li>
-              <li>ページ</li>
-              <li>ユーザ</li>
-            </ul>
-          </div>
-          <div class="col">
-            @yield('content')
-          </div>
-        </div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/resources/views/layouts/site.blade.php b/resources/views/layouts/site.blade.php
index d8c5398..0f65012 100644
--- a/resources/views/layouts/site.blade.php
+++ b/resources/views/layouts/site.blade.php
@@ -37,7 +37,13 @@
   <meta name="msapplication-TileColor" content="#3daee9">
   <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
   <meta name="theme-color" content="#3daee9">
+  @if (isset($user) && $user->profile->gender == 1)
+  <link href="{{ asset('css/app_m.css') }}" rel="stylesheet">
+  @elseif (isset($user) && $user->profile->gender == 2)
+  <link href="{{ asset('css/app_f.css') }}" rel="stylesheet">
+  @else
   <link href="{{ asset('css/app.css') }}" rel="stylesheet">
+  @endif
 </head>
 <body>
   <nav class="navbar fixed-top navbar-dark bg-dark navbar-expand-md">
diff --git a/resources/views/pages/admin/dashboard.blade.php b/resources/views/pages/admin/dashboard.blade.php
deleted file mode 100644
index a75bec5..0000000
--- a/resources/views/pages/admin/dashboard.blade.php
+++ /dev/null
@@ -1,7 +0,0 @@
-@extends('layouts.admin')
-
-@section('content')
-
-うんこちんこ
-
-@endsection
diff --git a/routes/api/invoice.php b/routes/api/invoice.php
deleted file mode 100644
index 216c1c2..0000000
--- a/routes/api/invoice.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-
-// 顧客様
-Route::get('/api/rpc/invoice/company/getall', 'InvoiceController@getCompanies');
-Route::get('/api/rpc/invoice/company/get/{id}', 'InvoiceController@getCompany');
-
-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');
-
-// 連絡先
-Route::get('/api/rpc/invoice/contacts/getall', 'InvoiceController@getContacts');
-Route::get('/api/rpc/invoice/contacts/get/{id}', 'InvoiceController@getContact');
-
-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');
-
-// 請求書
-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');
-Route::get('/api/rpc/invoice/services/getall', 'InvoiceController@getServices');
-Route::get('/api/rpc/invoice/taxes/getall', 'InvoiceController@getTaxes');
-
-Route::get('/api/rpc/invoice/invoices/get/{id}', 'InvoiceController@getInvoice');
-Route::get('/api/rpc/invoice/periods/get/{id}', 'InvoiceController@getPeriod');
-Route::get('/api/rpc/invoice/products/get/{id}', 'InvoiceController@getProduct');
-Route::get('/api/rpc/invoice/services/get/{id}', 'InvoiceController@getService');
-Route::get('/api/rpc/invoice/taxes/get/{id}', 'InvoiceController@getTax');
-
-Route::post('/api/rpc/invoice/invoices/delete', 'InvoiceController@deleteInvoice');
-Route::post('/api/rpc/invoice/invoices/deleteitem', 'InvoiceController@deleteInvoiceItem');
-Route::post('/api/rpc/invoice/periods/delete', 'InvoiceController@deletePeriod');
-Route::post('/api/rpc/invoice/products/delete', 'InvoiceController@deleteProduct');
-Route::post('/api/rpc/invoice/services/delete', 'InvoiceController@deleteService');
-Route::post('/api/rpc/invoice/taxes/delete', 'InvoiceController@deleteTax');
-
-Route::post('/api/rpc/invoice/invoices/edit', 'InvoiceController@editInvoice');
-Route::post('/api/rpc/invoice/invoices/edititem', 'InvoiceController@editInvoiceItem');
-Route::post('/api/rpc/invoice/periods/edit', 'InvoiceController@editPeriod');
-Route::post('/api/rpc/invoice/products/edit', 'InvoiceController@editProduct');
-Route::post('/api/rpc/invoice/services/edit', 'InvoiceController@editService');
-Route::post('/api/rpc/invoice/taxes/edit', 'InvoiceController@editTax');
-
-Route::post('/api/rpc/invoice/invoices/new', 'InvoiceController@newInvoice');
-Route::post('/api/rpc/invoice/invoices/newitem', 'InvoiceController@newInvoiceItem');
-Route::post('/api/rpc/invoice/periods/new', 'InvoiceController@newPeriod');
-Route::post('/api/rpc/invoice/products/new', 'InvoiceController@newProduct');
-Route::post('/api/rpc/invoice/services/new', 'InvoiceController@newService');
-Route::post('/api/rpc/invoice/taxes/new', 'InvoiceController@newTax');
diff --git a/routes/api/pack.php b/routes/api/pack.php
deleted file mode 100644
index c2ca2f4..0000000
--- a/routes/api/pack.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-
-Route::get('/api/rpc/pack/get', 'PackageController@get');
diff --git a/routes/view/admin.php b/routes/view/admin.php
deleted file mode 100644
index 7bc1855..0000000
--- a/routes/view/admin.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-Route::get('/admin',                'AdminPanelController@dashboard');
-Route::get('/admin/blog',           'AdminPanelController@bloglist' );
-Route::get('/admin/blog/add',       'AdminPanelController@blogadd'  );
-Route::get('/admin/blog/edit/{id}', 'AdminPanelController@blogedit' );
-Route::get('/admin/page',           'AdminPanelController@pagelist' );
-Route::get('/admin/page/add',       'AdminPanelController@pageadd'  );
-Route::get('/admin/page/edit/{id}', 'AdminPanelController@pageedit' );
-Route::get('/admin/user',           'AdminPanelController@userlist' );
-Route::get('/admin/user/add',       'AdminPanelController@useradd'  );
-Route::get('/admin/user/edit/{id}', 'AdminPanelController@useredit' );
diff --git a/routes/web.php b/routes/web.php
index 370828d..527861c 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -18,14 +18,11 @@ use Illuminate\Support\Facades\Route;
 // });
 
 require(__DIR__.'/api/bash.php');
-require(__DIR__.'/api/invoice.php');
 require(__DIR__.'/api/nihon.php');
-require(__DIR__.'/api/pack.php');
 require(__DIR__.'/api/site.php');
 require(__DIR__.'/api/user.php');
 
 Route::get('/logout', 'AuthController@logout');
 
-require(__DIR__.'/view/admin.php');
 require(__DIR__.'/view/bash.php');
 require(__DIR__.'/view/site.php');
diff --git a/webpack.mix.js b/webpack.mix.js
index 4b629ef..cd7b1f0 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -13,6 +13,8 @@ const mix = require('laravel-mix');
 
 mix.js('resources/js/app.js', 'public/js')
     .sass('resources/sass/app.scss', 'public/css')
+    .sass('resources/sass/app_m.scss', 'public/css')
+    .sass('resources/sass/app_f.scss', 'public/css')
     .copy('resources/fonts/*', 'public/fonts')
     .copy('resources/img/*', 'public/img')
     .copy('resources/img/bash/*', 'public/img/bash')