From c07b599e9c2431d1c44f15b2df8c5aac5644e61b Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 12:14:58 +0900 Subject: [PATCH 1/9] =?UTF-8?q?modify:=E3=83=9C=E3=82=BF=E3=83=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/main.css | 40 ++++++++++++-- resources/views/articles/index.blade.php | 69 ++++++++++++------------ resources/views/layouts/app.blade.php | 15 +++++- resources/views/programs/index.blade.php | 67 ++++++++++++----------- 4 files changed, 121 insertions(+), 70 deletions(-) diff --git a/public/main.css b/public/main.css index 271f4cc..f7fd7fd 100644 --- a/public/main.css +++ b/public/main.css @@ -8,11 +8,14 @@ input[type="email"], input[type="password"], select, textarea { - width: 100%; + width: 70%; padding: 8px; border: 1px solid #bbb; border-radius: 4px; } + + + header { /*Intern Manager*/ display: flex; justify-content: space-between; @@ -73,15 +76,18 @@ button, .btn {/*ボタン*/ padding: 2px 8px; border: 1px solid rgba(0, 0, 0, 0.2); border-radius: 4px; - background: #eee; - color: #333; + background: #605f5f; + color: #ddd; font-size: .9rem; cursor: pointer; + } button:hover, .btn:hover { background: #ddd; } + + a.intern-index { color: #000; margin-bottom: 100px; @@ -139,6 +145,8 @@ a.intern-index { position: relative; max-width: 190px; margin-bottom: 20px; + float: left;/*改行しない*/ + margin-top: 30px; } .serch-input { @@ -174,12 +182,34 @@ a.intern-index { height: 1rem; } - /*検索ここまで*/ + /*検索ボタン*/ + .search-button{ + display: inline-block; + padding: 2px 8px; + border-radius: 4px; + background: #24b4fb; + color: #FFF; + font-size: .9rem; + cursor: pointer; + height: 40px; + margin-top: 30px; + } + +/*検索ここまで*/ + +/*絞り込み*/ +.dropdown-button-container { + display: flex; /* フレックスボックスを使用して横並びに配置 */ + align-items: center; /* 垂直方向の中央揃え */ + } .filter-button{ - margin-bottom: 30px; + font-size: small; + height: 35px; } + + header nav ul { display: flex; margin: 0; diff --git a/resources/views/articles/index.blade.php b/resources/views/articles/index.blade.php index b2b20d3..f46a232 100644 --- a/resources/views/articles/index.blade.php +++ b/resources/views/articles/index.blade.php @@ -1,3 +1,4 @@ + @extends('layouts.app') @section('head') @@ -23,7 +24,7 @@ -
+
@@ -31,57 +32,59 @@
- - + +
+
+
@csrf

業種別に検索

- - +
+ + +
@csrf

期間別に検索

- - +
+ + +
全て 選考なし 選考あり 選考落ち - + @endsection diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 7e7b351..507fe47 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -23,8 +23,21 @@ + diff --git a/resources/views/programs/index.blade.php b/resources/views/programs/index.blade.php index d560a6e..014eddb 100644 --- a/resources/views/programs/index.blade.php +++ b/resources/views/programs/index.blade.php @@ -1,3 +1,4 @@ + @extends('layouts.app') @section('head') @@ -31,49 +32,53 @@
- - + +
+
+
@csrf

業種別に検索

- - + +
+ + +
@csrf

期間別に検索

- - + +
+ + +
全て 選考なし From 40abc5ac3c8aee546e1ea9f1b68eabb91ce87547 Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 12:23:19 +0900 Subject: [PATCH 2/9] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=AE=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/articles/create.blade.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/articles/create.blade.php b/resources/views/articles/create.blade.php index 6399ec3..e4a7000 100644 --- a/resources/views/articles/create.blade.php +++ b/resources/views/articles/create.blade.php @@ -1,7 +1,8 @@ @extends('layouts.app') @include('commons.errors') @section('head') - 記録入力 +

Intern Manager

+ トップへ戻る @endsection() @section('content')
From 7421126c3bf9f83826f6c3069b26265320829caa Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 12:44:38 +0900 Subject: [PATCH 3/9] =?UTF-8?q?=E4=B8=80=E8=A6=A7=E3=81=AE=E4=BD=93?= =?UTF-8?q?=E8=A3=81=E3=82=92=E6=95=B4=E3=81=88=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/articles/index.blade.php | 2 ++ resources/views/programs/index.blade.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/views/articles/index.blade.php b/resources/views/articles/index.blade.php index f46a232..6225cbd 100644 --- a/resources/views/articles/index.blade.php +++ b/resources/views/articles/index.blade.php @@ -95,12 +95,14 @@ @section('content')

参加済みインターン一覧

@foreach ($articles as $article) +
+
@endforeach @if (count($articles) === 0)

No results found for "{{ $search }}"

diff --git a/resources/views/programs/index.blade.php b/resources/views/programs/index.blade.php index 014eddb..ec85e5d 100644 --- a/resources/views/programs/index.blade.php +++ b/resources/views/programs/index.blade.php @@ -1,4 +1,4 @@ - + @extends('layouts.app') @section('head') @@ -99,6 +99,7 @@ @section('content')

参加予定インターン一覧

@foreach ($programs as $program) +
{{ $program->title }} @@ -106,6 +107,7 @@
{{ $program->date }}
{{ $program->time }}
+
@endforeach From 975e37beffd7c918cbc6eaa243818663678987e1 Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 12:47:43 +0900 Subject: [PATCH 4/9] =?UTF-8?q?=E3=83=98=E3=83=83=E3=83=80=E3=83=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/main.css | 22 +++++++++------------- resources/views/articles/edit.blade.php | 4 ++++ resources/views/articles/show.blade.php | 5 +++-- resources/views/programs/edit.blade.php | 4 ++++ resources/views/programs/show.blade.php | 5 +++-- 5 files changed, 23 insertions(+), 17 deletions(-) diff --git a/public/main.css b/public/main.css index f7fd7fd..dbe69a8 100644 --- a/public/main.css +++ b/public/main.css @@ -226,7 +226,7 @@ header nav ul li a.active { /*共通↓*/ -.program-item { +.contents-body{ margin-bottom: 20px; padding: 20px; border-bottom: 1px solid #ddd; @@ -235,7 +235,11 @@ header nav ul li a.active { .program-title a { font-weight: bold; /* リンク内のテキストを太字に */ text-decoration: none; /* リンクの下線を非表示に */ - color: #333; /* リンクのテキストカラー */ + color: #333; /* リ + ンクのテキストカラー */ +} +dl.form-list { + max-width: 600px; } @@ -251,15 +255,7 @@ header nav ul li a.active { font-size: .8rem; color: #777; } -.article-body { - margin: 1rem 0; - padding: 1rem 0; - border-top: 1px dotted #ddd; - border-bottom: 1px dotted #ddd; -} -dl.form-list { - max-width: 600px; -} + .article-control { display: flex; @@ -277,12 +273,12 @@ dl.form-list { font-size: .8rem; color: #777; } -.program-body ,.article-body{ - margin: 5rem 0; +/*.contents-body { padding: 1rem 0; border-top: 1px dotted #ddd; border-bottom: 1px dotted #ddd; } +*/ .program-control { display: flex; diff --git a/resources/views/articles/edit.blade.php b/resources/views/articles/edit.blade.php index 6f3ec1c..4297eef 100644 --- a/resources/views/articles/edit.blade.php +++ b/resources/views/articles/edit.blade.php @@ -1,4 +1,8 @@ @extends('layouts.app') +@section('head') +

Intern Manager

+ トップへ戻る +@endsection() @section('content') @include('commons.errors') diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php index 155a4e3..1d9ddc0 100644 --- a/resources/views/articles/show.blade.php +++ b/resources/views/articles/show.blade.php @@ -1,12 +1,13 @@ @extends('layouts.app') @section('head') - 活動内容 +

Intern Manager

+ トップへ戻る @endsection() @section('content')

{{ $article->title }}

{{ $article->date }}

-
{{ $article->created_at }}
+
作成日{{ $article->created_at }}
{!! nl2br(e($article->period)) !!}
{!! nl2br(e($article->selection)) !!}
{!! nl2br(e($article->industry)) !!}
diff --git a/resources/views/programs/edit.blade.php b/resources/views/programs/edit.blade.php index 2e4518b..9b1a5ca 100644 --- a/resources/views/programs/edit.blade.php +++ b/resources/views/programs/edit.blade.php @@ -1,4 +1,8 @@ @extends('layouts.app') +@section('head') +

Intern Manager

+ トップへ戻る +@endsection() @section('content') @include('commons.errors') diff --git a/resources/views/programs/show.blade.php b/resources/views/programs/show.blade.php index ab88e7f..c9cdcf8 100644 --- a/resources/views/programs/show.blade.php +++ b/resources/views/programs/show.blade.php @@ -1,13 +1,14 @@ @extends('layouts.app') @section('head') - 活動内容 +

Intern Manager

+ トップへ戻る @endsection() @section('content')

{{ $program->title }}

{{ $program->date }}
{{ $program->time }} -
{{ $program->created_at }}
+
作成日{{ $program->created_at }}
{!! nl2br(e($program->content)) !!}
編集 From c26f2fc9a05d521934d7dca4f61eb09ca8159470 Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 14:08:17 +0900 Subject: [PATCH 5/9] =?UTF-8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6?= =?UTF-8?q?=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/main.css | 18 ++++++++++++++++++ resources/views/articles/form.blade.php | 7 ++++--- resources/views/layouts/app.blade.php | 6 ++++-- 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/public/main.css b/public/main.css index dbe69a8..9da5ca7 100644 --- a/public/main.css +++ b/public/main.css @@ -49,6 +49,7 @@ footer { .aside { flex: 1; /* 横幅を均等に分配 */ padding: 30px; /* 余白を追加（調整可能） */ + margin: 30px; background: #fff; } @@ -56,6 +57,7 @@ footer { .content { flex: 4; /* 横幅を均等に分配 */ padding: 30px; /* 余白を追加（調整可能） */ + margin:10px 20px 10px 10px; background: #fff; } @@ -283,4 +285,20 @@ dl.form-list { .program-control { display: flex; justify-content: space-between; +} + + + +/*新規作成フォーム*/ +/*行間 +.form-list{ + line-height: 2; +} +*/ +.form-title{ + margin-bottom: 30px; +} + +dt{ + margin-top:20px } \ No newline at end of file diff --git a/resources/views/articles/form.blade.php b/resources/views/articles/form.blade.php index bb7aabf..687ce0a 100644 --- a/resources/views/articles/form.blade.php +++ b/resources/views/articles/form.blade.php @@ -1,8 +1,9 @@ @csrf +

新規登録

-
企業名
+
企業名
-
日時
+
日時 *
期間
1DAY
@@ -33,7 +34,7 @@
企業説明
-
インターン内容
+
インターン内容 *
感想
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 507fe47..279159a 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -12,7 +12,8 @@ @yield('head') -
+ +
@yield('aside') @@ -20,8 +21,9 @@
@yield('content')
-
+
+
internmanager From 7c33163cdc44d86154c2892abf2639dcde5a403f Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 14:44:04 +0900 Subject: [PATCH 6/9] a --- public/main.css | 8 +++++--- resources/views/articles/show.blade.php | 10 ++++++++++ resources/views/layouts/app.blade.php | 11 ----------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/public/main.css b/public/main.css index 9da5ca7..e4cb7cb 100644 --- a/public/main.css +++ b/public/main.css @@ -49,15 +49,17 @@ footer { .aside { flex: 1; /* 横幅を均等に分配 */ padding: 30px; /* 余白を追加（調整可能） */ - margin: 30px; + margin: 2rem; + margin-top: 2rem; background: #fff; } /* メインコンテンツ（content）のスタイル */ .content { - flex: 4; /* 横幅を均等に分配 */ + flex: 3; /* 横幅を均等に分配 */ padding: 30px; /* 余白を追加（調整可能） */ - margin:10px 20px 10px 10px; + margin-top:1rem; + margin-right: 3rem; background: #fff; } diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php index 1d9ddc0..fdf1484 100644 --- a/resources/views/articles/show.blade.php +++ b/resources/views/articles/show.blade.php @@ -24,4 +24,14 @@
+@endsection + +@section('aside') + + @endsection \ No newline at end of file diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index 279159a..8cbc58e 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -28,18 +28,7 @@ internmanager - From 0b2276d97388012274e736b974c9179b9acee1f7 Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Wed, 13 Sep 2023 15:02:10 +0900 Subject: [PATCH 7/9] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E3=81=AE=E8=A6=8B=E3=81=9F=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/main.css | 5 ++ resources/views/articles/form.blade.php | 94 ++++++++++++++----------- 2 files changed, 58 insertions(+), 41 deletions(-) diff --git a/public/main.css b/public/main.css index e4cb7cb..efb0e70 100644 --- a/public/main.css +++ b/public/main.css @@ -303,4 +303,9 @@ dl.form-list { dt{ margin-top:20px +} + +.form-group{ + padding: 20px; + border-bottom: 1px solid #ddd; } \ No newline at end of file diff --git a/resources/views/articles/form.blade.php b/resources/views/articles/form.blade.php index 687ce0a..96a8671 100644 --- a/resources/views/articles/form.blade.php +++ b/resources/views/articles/form.blade.php @@ -1,45 +1,57 @@ @csrf

新規登録

-
企業名
-
-
日時 *
-
-
期間
-
1DAY
-
1週間未満
-
短期
-
長期
-
選考
-
選考あり
-
選考なし
-
選考落ち
-
業種
-
- -
-
企業説明
-
-
インターン内容 *
-
-
感想
-
-
評価
-
A
-
B
-
C
+
+
企業名
+
+
インターン内容 *
+
+ +
選考
+
選考あり
+
選考なし
+
選考落ち
+
+ +
+
日時 *
+
+
期間
+
1DAY
+
1週間未満
+
短期
+
長期
+
+
+ +
業種
+
+ +
+
企業説明
+
+
+
+ +
感想
+
+
評価
+
A
+
B
+
C
+
\ No newline at end of file From c38f67b41cfbaa977122c7a23174b145ecb42071 Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Fri, 15 Sep 2023 14:45:45 +0900 Subject: [PATCH 8/9] ? --- public/main.css | 76 ++++++++++++++++-------- resources/views/articles/index.blade.php | 8 +-- resources/views/articles/show.blade.php | 6 +- resources/views/programs/index.blade.php | 10 ++-- 4 files changed, 65 insertions(+), 35 deletions(-) diff --git a/public/main.css b/public/main.css index efb0e70..b22228c 100644 --- a/public/main.css +++ b/public/main.css @@ -14,7 +14,19 @@ textarea { border-radius: 4px; } +a { + text-decoration: none; + } + /* 通常のリンクの色 */ +a { + color: blue; + } + + /* 訪問済みリンクの色 */ + a:visited { + color: black; + } header { /*Intern Manager*/ display: flex; @@ -87,16 +99,12 @@ button, .btn {/*ボタン*/ } button:hover, .btn:hover { - background: #ddd; + background: #080808; } -a.intern-index { - color: #000; - margin-bottom: 100px; - border-bottom: none; -} + .create-button {/*新規作成ボタン*/ border: 2px solid #24b4fb; @@ -105,10 +113,11 @@ a.intern-index { padding: 0.8em 1.2em 0.8em 1em; transition: all ease-in-out 0.2s; font-size: 16px; - margin-bottom: 40px; + margin-bottom: 20px; + margin-left:20px; } - button span { + .create-button span { display: flex; justify-content: center; align-items: center; @@ -116,30 +125,45 @@ a.intern-index { font-weight: 600; } - button:hover { + .create-button:hover { background-color: #0071e2; } /*インターン一覧ボタン*/ - a.intern-index { - font-family: monospace; - background-color: #f3f7fe; - color: #3b82f6; - border: none; - border-radius: 8px; - width: 200px; - height: 50px; - font-size:120%; - transition: .3s; - margin-bottom: 500px; + + ul { + list-style-type: none; /* ブリットを非表示にする */ + padding: 0; /* リストの内側の余白をゼロにする */ + } + .intern-index{ + padding: 12.5px 30px; + border: 0; + border-radius: 100px; + background-color: #ffffff; + color: #333; + font-weight: Bold; + font-size:16x; + transition: all 0.5s; + -webkit-transition: all 0.5s; + list-style-type: none; + margin-bottom: 20px; + margin-left: 5px; + width: 150px; } - a.intern-index:hover { - background-color: #3b82f6; - box-shadow: 0 0 0 5px #3b83f65f; - color: #fff; + .intern-index:hover { + background-color: #6fc5ff; + box-shadow: 0 0 20px #6fc5ff50; + transform: scale(1.1); } + .intern-index:active { + background-color: #3d94cf; + transition: all 0.25s; + -webkit-transition: all 0.25s; + box-shadow: none; + transform: scale(0.98); + } /*検索*/ .group { @@ -199,6 +223,10 @@ a.intern-index { margin-top: 30px; } + .search-button:hover{ + background-color: #0071e2; + } + /*検索ここまで*/ /*絞り込み*/ diff --git a/resources/views/articles/index.blade.php b/resources/views/articles/index.blade.php index 6225cbd..d81caaa 100644 --- a/resources/views/articles/index.blade.php +++ b/resources/views/articles/index.blade.php @@ -17,11 +17,11 @@ -
-参加予定インターン -
-参加済みインターン +
diff --git a/resources/views/articles/show.blade.php b/resources/views/articles/show.blade.php index fdf1484..52b63d3 100644 --- a/resources/views/articles/show.blade.php +++ b/resources/views/articles/show.blade.php @@ -28,10 +28,14 @@ @section('aside') -
+
+ +
+ + @endsection \ No newline at end of file diff --git a/resources/views/programs/index.blade.php b/resources/views/programs/index.blade.php index ec85e5d..188d006 100644 --- a/resources/views/programs/index.blade.php +++ b/resources/views/programs/index.blade.php @@ -16,12 +16,10 @@ New Data - -
-参加予定インターン -
-参加済みインターン - + From 9a670168e253eea0e91f4dc5fcd6af943164b6d0 Mon Sep 17 00:00:00 2001 From: kazama0812 Date: Tue, 19 Sep 2023 14:15:53 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=E8=A9=B3=E7=B4=B0=E3=83=9C=E3=82=BF?= =?UTF-8?q?=E3=83=B3=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/main.css | 36 +++++++++++++++++++----- resources/views/articles/index.blade.php | 1 + resources/views/programs/index.blade.php | 2 ++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/public/main.css b/public/main.css index b22228c..c0cdb54 100644 --- a/public/main.css +++ b/public/main.css @@ -17,14 +17,8 @@ textarea { a { text-decoration: none; } - /* 通常のリンクの色 */ -a { - color: blue; - } - - /* 訪問済みリンクの色 */ - a:visited { + a { color: black; } @@ -256,6 +250,34 @@ header nav ul li a.active { } +/*詳細ボタン*/ +.detail-button { + background-color: #eee; + border: none; + padding: 0.5rem; + font-size: 1rem; + width: 7em; + border-radius: 1rem; + color: rgb(179, 179, 179); + cursor: pointer; + margin-left: 50rem; + } + + .detail-button:active { + color: white; + transform: translateY(0.2rem); + } + + .detail-button:hover:not(:disabled) { + background: rgb(90, 90, 90); + color: white; + } + + .detail-button:disabled { + cursor: auto; + color: grey; + } + /*共通↓*/ .contents-body{ diff --git a/resources/views/articles/index.blade.php b/resources/views/articles/index.blade.php index d81caaa..2bdb006 100644 --- a/resources/views/articles/index.blade.php +++ b/resources/views/articles/index.blade.php @@ -102,6 +102,7 @@
{{ $article->date }}
+ {{ $article->title }} @endforeach @if (count($articles) === 0) diff --git a/resources/views/programs/index.blade.php b/resources/views/programs/index.blade.php index 188d006..a9e1ceb 100644 --- a/resources/views/programs/index.blade.php +++ b/resources/views/programs/index.blade.php @@ -105,6 +105,8 @@
{{ $program->date }}
{{ $program->time }}
+ {{ $program->title }} @endforeach