From fe53b54f64fb5aa3cd3b6774c35e35d27ae13837 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=91=D0=B0=D0=B1=D0=BA=D0=B8=D0=BD?= Date: Tue, 5 Jul 2022 17:19:39 +0300 Subject: [PATCH] mmc scan begin --- app/Http/Controllers/MMCController.php | 7 ++ public/css/app.css | 121 +++++++++++-------------- resources/views/mmc/list.blade.php | 25 +++-- resources/views/mmc/scan.blade.php | 18 ++++ 4 files changed, 98 insertions(+), 73 deletions(-) create mode 100644 resources/views/mmc/scan.blade.php diff --git a/app/Http/Controllers/MMCController.php b/app/Http/Controllers/MMCController.php index 7cd9bf9..cd16e6e 100644 --- a/app/Http/Controllers/MMCController.php +++ b/app/Http/Controllers/MMCController.php @@ -122,4 +122,11 @@ class MMCController extends Controller // User::findOrFail($id)->delete(); // return redirect()->route('users.index'); } + + public function scan(Request $request) + { + $project_id = $request->session()->get('project_id'); + $project = Project::find($project_id); + return view('mmc.scan', ['project' => $project]); + } } diff --git a/public/css/app.css b/public/css/app.css index 2fbee43..d293b64 100644 --- a/public/css/app.css +++ b/public/css/app.css @@ -707,12 +707,6 @@ select { .-ml-px { margin-left: -1px; } -.mt-1 { - margin-top: 0.25rem; -} -.mt-4 { - margin-top: 1rem; -} .ml-1 { margin-left: 0.25rem; } @@ -725,6 +719,9 @@ select { .ml-2 { margin-left: 0.5rem; } +.mt-4 { + margin-top: 1rem; +} .ml-4 { margin-left: 1rem; } @@ -737,6 +734,9 @@ select { .-mt-px { margin-top: -1px; } +.mt-1 { + margin-top: 0.25rem; +} .-mr-2 { margin-right: -0.5rem; } @@ -797,18 +797,18 @@ select { .w-5 { width: 1.25rem; } -.w-96 { - width: 24rem; -} -.w-full { - width: 100%; -} .w-8 { width: 2rem; } .w-auto { width: auto; } +.w-96 { + width: 24rem; +} +.w-full { + width: 100%; +} .w-4 { width: 1rem; } @@ -827,9 +827,6 @@ select { .max-w-6xl { max-width: 72rem; } -.max-w-xl { - max-width: 36rem; -} .flex-1 { flex: 1 1 0%; } @@ -939,9 +936,6 @@ select { .border-l-4 { border-left-width: 4px; } -.border-r { - border-right-width: 1px; -} .border-gray-300 { --tw-border-opacity: 1; border-color: rgb(209 213 219 / var(--tw-border-opacity)); @@ -954,16 +948,12 @@ select { --tw-border-opacity: 1; border-color: rgb(243 244 246 / var(--tw-border-opacity)); } -.border-transparent { - border-color: transparent; -} .border-indigo-400 { --tw-border-opacity: 1; border-color: rgb(129 140 248 / var(--tw-border-opacity)); } -.border-gray-400 { - --tw-border-opacity: 1; - border-color: rgb(156 163 175 / var(--tw-border-opacity)); +.border-transparent { + border-color: transparent; } .bg-white { --tw-bg-opacity: 1; @@ -981,14 +971,14 @@ select { --tw-bg-opacity: 1; background-color: rgb(107 114 128 / var(--tw-bg-opacity)); } -.bg-gray-800 { - --tw-bg-opacity: 1; - background-color: rgb(31 41 55 / var(--tw-bg-opacity)); -} .bg-indigo-50 { --tw-bg-opacity: 1; background-color: rgb(238 242 255 / var(--tw-bg-opacity)); } +.bg-gray-800 { + --tw-bg-opacity: 1; + background-color: rgb(31 41 55 / var(--tw-bg-opacity)); +} .fill-current { fill: currentColor; } @@ -1040,12 +1030,12 @@ select { .pt-4 { padding-top: 1rem; } -.pl-2 { - padding-left: 0.5rem; -} .pt-8 { padding-top: 2rem; } +.pl-2 { + padding-left: 0.5rem; +} .pt-2 { padding-top: 0.5rem; } @@ -1055,9 +1045,6 @@ select { .pb-1 { padding-bottom: 0.25rem; } -.pt-6 { - padding-top: 1.5rem; -} .pt-1 { padding-top: 0.25rem; } @@ -1067,6 +1054,9 @@ select { .pr-4 { padding-right: 1rem; } +.pt-6 { + padding-top: 1.5rem; +} .text-center { text-align: center; } @@ -1077,14 +1067,14 @@ select { font-size: 0.875rem; line-height: 1.25rem; } -.text-xl { - font-size: 1.25rem; - line-height: 1.75rem; -} .text-lg { font-size: 1.125rem; line-height: 1.75rem; } +.text-xl { + font-size: 1.25rem; + line-height: 1.75rem; +} .text-base { font-size: 1rem; line-height: 1.5rem; @@ -1117,9 +1107,6 @@ select { .tracking-widest { letter-spacing: 0.1em; } -.tracking-wider { - letter-spacing: 0.05em; -} .text-gray-500 { --tw-text-opacity: 1; color: rgb(107 114 128 / var(--tw-text-opacity)); @@ -1128,6 +1115,14 @@ select { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); } +.text-blue-500 { + --tw-text-opacity: 1; + color: rgb(59 130 246 / var(--tw-text-opacity)); +} +.text-red-500 { + --tw-text-opacity: 1; + color: rgb(239 68 68 / var(--tw-text-opacity)); +} .text-gray-800 { --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); @@ -1136,10 +1131,6 @@ select { --tw-text-opacity: 1; color: rgb(255 255 255 / var(--tw-text-opacity)); } -.text-red-500 { - --tw-text-opacity: 1; - color: rgb(239 68 68 / var(--tw-text-opacity)); -} .text-gray-200 { --tw-text-opacity: 1; color: rgb(229 231 235 / var(--tw-text-opacity)); @@ -1164,9 +1155,13 @@ select { --tw-text-opacity: 1; color: rgb(34 197 94 / var(--tw-text-opacity)); } -.text-blue-500 { +.text-indigo-700 { --tw-text-opacity: 1; - color: rgb(59 130 246 / var(--tw-text-opacity)); + color: rgb(67 56 202 / var(--tw-text-opacity)); +} +.text-indigo-600 { + --tw-text-opacity: 1; + color: rgb(79 70 229 / var(--tw-text-opacity)); } .text-green-600 { --tw-text-opacity: 1; @@ -1176,14 +1171,6 @@ select { --tw-text-opacity: 1; color: rgb(220 38 38 / var(--tw-text-opacity)); } -.text-indigo-700 { - --tw-text-opacity: 1; - color: rgb(67 56 202 / var(--tw-text-opacity)); -} -.text-indigo-600 { - --tw-text-opacity: 1; - color: rgb(79 70 229 / var(--tw-text-opacity)); -} .underline { -webkit-text-decoration-line: underline; text-decoration-line: underline; @@ -9096,10 +9083,6 @@ readers do not read off random characters that represent icons */ --tw-text-opacity: 1; color: rgb(156 163 175 / var(--tw-text-opacity)); } -.hover\:text-green-700:hover { - --tw-text-opacity: 1; - color: rgb(21 128 61 / var(--tw-text-opacity)); -} .hover\:text-blue-700:hover { --tw-text-opacity: 1; color: rgb(29 78 216 / var(--tw-text-opacity)); @@ -9108,18 +9091,22 @@ readers do not read off random characters that represent icons */ --tw-text-opacity: 1; color: rgb(185 28 28 / var(--tw-text-opacity)); } +.hover\:text-green-700:hover { + --tw-text-opacity: 1; + color: rgb(21 128 61 / var(--tw-text-opacity)); +} .hover\:text-gray-700:hover { --tw-text-opacity: 1; color: rgb(55 65 81 / var(--tw-text-opacity)); } -.hover\:text-gray-900:hover { - --tw-text-opacity: 1; - color: rgb(17 24 39 / var(--tw-text-opacity)); -} .hover\:text-gray-800:hover { --tw-text-opacity: 1; color: rgb(31 41 55 / var(--tw-text-opacity)); } +.hover\:text-gray-900:hover { + --tw-text-opacity: 1; + color: rgb(17 24 39 / var(--tw-text-opacity)); +} .focus\:z-10:focus { z-index: 10; } @@ -9135,14 +9122,14 @@ readers do not read off random characters that represent icons */ --tw-border-opacity: 1; border-color: rgb(165 180 252 / var(--tw-border-opacity)); } -.focus\:border-gray-900:focus { - --tw-border-opacity: 1; - border-color: rgb(17 24 39 / var(--tw-border-opacity)); -} .focus\:border-indigo-700:focus { --tw-border-opacity: 1; border-color: rgb(67 56 202 / var(--tw-border-opacity)); } +.focus\:border-gray-900:focus { + --tw-border-opacity: 1; + border-color: rgb(17 24 39 / var(--tw-border-opacity)); +} .focus\:bg-gray-100:focus { --tw-bg-opacity: 1; background-color: rgb(243 244 246 / var(--tw-bg-opacity)); diff --git a/resources/views/mmc/list.blade.php b/resources/views/mmc/list.blade.php index cc924ba..2db4556 100644 --- a/resources/views/mmc/list.blade.php +++ b/resources/views/mmc/list.blade.php @@ -3,7 +3,7 @@

- {{ $project->name }}: {{ __('MMC List')}} + {{ $project->name }}: {{ __('MMC List') }}

@@ -13,11 +13,24 @@
- - - +
+
+ + + +
+
+ + + +
+
TODO: MMC table diff --git a/resources/views/mmc/scan.blade.php b/resources/views/mmc/scan.blade.php new file mode 100644 index 0000000..a19c1c5 --- /dev/null +++ b/resources/views/mmc/scan.blade.php @@ -0,0 +1,18 @@ + + +

+ {{ __('Scan MMC') }} +

+ + +
+
+
+
+
+
+
+
+
+
+ \ No newline at end of file