diff --git a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java index 7628b09..bb13534 100644 --- a/src/main/java/com/example/demo/app/presentation/controller/CourseController.java +++ b/src/main/java/com/example/demo/app/presentation/controller/CourseController.java @@ -41,7 +41,7 @@ public class CourseController { session.setAttribute("userForm", userForm); model.addAttribute("mode", "regist"); - model.addAttribute("currentCourseId", 4); + model.addAttribute("currentCourseId", courseService.findByName("バランスコース")); model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll())); model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll())); diff --git a/src/main/resources/static/css/menu.css b/src/main/resources/static/css/menu.css index 7f15fd6..4ef46fc 100644 --- a/src/main/resources/static/css/menu.css +++ b/src/main/resources/static/css/menu.css @@ -1,6 +1,7 @@ body { margin: 0; - padding: 0; + padding-top:80px; + padding-bottom:120px; } #calendar { diff --git a/src/main/resources/static/css/style.css b/src/main/resources/static/css/style.css new file mode 100644 index 0000000..399873b --- /dev/null +++ b/src/main/resources/static/css/style.css @@ -0,0 +1,214 @@ +/* ======================= + 全体 +======================= */ +body { + padding-top: 80px; + padding-bottom: 80px; + background-color: #f8f9fa; +} + +/* ======================= + コンテンツ +======================= */ +.main-container { + max-width: 480px; + margin: 0 auto; + padding: 0 12px; +} + +/* ======================= + タイトル +======================= */ +.page-title { + text-align: center; + font-weight: bold; + margin-bottom: 20px; +} + +/* ======================= + ヘッダー +======================= */ +.app-header { + background-color: #E3F2FD; + box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1); +} + +.app-logo { + font-size: 1.2rem; + font-weight: bold; +} + +/* ======================= + フッター +======================= */ +.app-footer { + background-color: #E3F2FD; + border-top: 1px solid #d0d7de; +} + +/* ======================= + カード +======================= */ +.app-card { + background-color: #ffffff; + border-radius: 12px; + padding: 15px; + margin-bottom: 15px; + box-shadow: 0 2px 5px rgba(0,0,0,0.08); +} + +.card { + border-radius: 12px; + margin-bottom: 12px; +} + +.card-body { + padding: 12px; +} + +/* ======================= + カレンダー +======================= */ + +#calendar { + width: 100%; + border-collapse: collapse; + table-layout: fixed; +} + +#calendar th, +#calendar td { + border: 1px solid black; +} + +th { + font-weight: bold; + height: 35px; + font-size: 13px; + text-align: center; +} + +td { + width: 14%; + height: 70px; + padding: 5px; + text-align: left; + vertical-align: top; +} + +td:hover { + background-color: lightblue; +} + +.holiday { + color: red; +} + +#today { + font-weight: bold; + background-color: bisque; +} + +.calendar-title { + display: grid; + grid-template-columns: 1fr auto 1fr; + align-items: center; + text-align: center; +} + +.calendar-date { + display: flex; + align-items: baseline; + gap: 10px; +} + +.year { + font-size: 20px; +} + +.month { + font-size: 30px; + font-weight: bold; +} + +.month-button { + display: flex; + justify-content: center; + align-items: center; + + width: 40px; + height: 40px; + + font-size: 28px; + text-decoration: none; + color: #333; + + border-radius: 50%; +} + +.month-button:hover { + background-color: #eee; +} + +.month-button:last-child { + justify-self: end; +} + +.date { + font-size: 13px; + font-weight: bold; +} + +.income { + color: blue; + font-size: 10px; +} + +.expense { + color: red; + font-size: 10px; +} + +.total { + margin: 15px 10px; + padding: 10px; + border-top: 1px solid #ddd; + + font-size: 16px; + text-align: right; +} + +/* ======================= + 金額表示 +======================= */ +.plus { + color: #dc3545; + font-weight: bold; +} + +.minus { + color: #0d6efd; + font-weight: bold; +} + +/* ======================= + テーブル +======================= */ +.table { + background-color: white; +} + +.table th { + vertical-align: middle; +} + +.table td { + vertical-align: middle; +} + +/* ======================= + ボタン +======================= */ +.btn { + border-radius: 10px; +} \ No newline at end of file diff --git a/src/main/resources/templates/analysis.html b/src/main/resources/templates/analysis.html index a44b40a..c85e4e0 100644 --- a/src/main/resources/templates/analysis.html +++ b/src/main/resources/templates/analysis.html @@ -4,17 +4,18 @@