Merge pull request #140 from 4Ailen/feat/#139_search

Feat/#139 search
4Ailen · Sep 8, 2023 · 061cfcf · 061cfcf
2 parents 0c7462e + 046b1b4
commit 061cfcf
Show file tree

Hide file tree

Showing 15 changed files with 289 additions and 78 deletions.
diff --git a/assets/translations/en-US.json b/assets/translations/en-US.json
@@ -309,6 +309,9 @@
   "Slight_Defect": "SLIGHT_DEFECT",
   "Used": "USED",
   "sale": "SELL",
-  "sold-out":"SOLD_OUT"
+  "sold-out":"SOLD_OUT",
+
+  "search1": "Type Keyword",
+  "search2": "Search for posts!"
 
 }
diff --git a/assets/translations/ko-KR.json b/assets/translations/ko-KR.json
@@ -311,5 +311,8 @@
   "Slight_Defect": "약간의 하자",
   "Used": "사용감 있음",
   "sale": "판매중",
-  "sold-out":"판매완료"
+  "sold-out":"판매완료",
+
+  "search1": "글 제목, 내용 등 검색어 입력",
+  "search2": "게시판의 글을 검색해보세요!"
 }
diff --git a/lib/views/pages/board/fashion_board_page.dart b/lib/views/pages/board/fashion_board_page.dart
@@ -4,6 +4,7 @@ import 'package:aliens/mockdatas/board_mockdata.dart';
 import 'package:aliens/models/chatRoom_model.dart';
 import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/sql_message_database.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
@@ -125,11 +126,20 @@ class _FashionBoardPageState extends State<FashionBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "패션게시판",)),
+                  );
+                },
+              child: SvgPicture.asset(
+                'assets/icon/icon_search.svg',
+                width: 25.r,
+                height: 25.r,
+                color: Colors.white,
+              ),
             ),
             ),
           ],

diff --git a/lib/views/pages/board/food_board_page.dart b/lib/views/pages/board/food_board_page.dart
@@ -4,6 +4,7 @@ import 'package:aliens/mockdatas/board_mockdata.dart';
 import 'package:aliens/models/chatRoom_model.dart';
 import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/sql_message_database.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
@@ -124,12 +125,21 @@ class _FoodBoardPageState extends State<FoodBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "음식게시판",)),
+                  );
+                },
+                child: SvgPicture.asset(
+                  'assets/icon/icon_search.svg',
+                  width: 25.r,
+                  height: 25.r,
+                  color: Colors.white,
+                ),
+              ),
             ),
           ],
         ),

diff --git a/lib/views/pages/board/free_posting_board_page.dart b/lib/views/pages/board/free_posting_board_page.dart
@@ -5,6 +5,7 @@ import 'package:aliens/models/chatRoom_model.dart';
 import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/board_provider.dart';
 import 'package:aliens/repository/sql_message_database.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:aliens/views/components/article_widget.dart';
 import 'package:aliens/views/pages/board/article_page.dart';
 import 'package:aliens/views/pages/board/article_writing_page.dart';
@@ -126,12 +127,21 @@ class _FreePostingBoardPageState extends State<FreePostingBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "자유게시판",)),
+                  );
+                },
+                child: SvgPicture.asset(
+                  'assets/icon/icon_search.svg',
+                  width: 25.r,
+                  height: 25.r,
+                  color: Colors.white,
+                ),
+              ),
             ),
           ],
         ),

diff --git a/lib/views/pages/board/game_board_page.dart b/lib/views/pages/board/game_board_page.dart
@@ -4,6 +4,7 @@ import 'package:aliens/mockdatas/board_mockdata.dart';
 import 'package:aliens/models/chatRoom_model.dart';
 import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/sql_message_database.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
@@ -125,12 +126,21 @@ class _GameBoardPageState extends State<GameBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "게임게시판",)),
+                  );
+                },
+                child: SvgPicture.asset(
+                  'assets/icon/icon_search.svg',
+                  width: 25.r,
+                  height: 25.r,
+                  color: Colors.white,
+                ),
+              ),
             ),
           ],
         ),

diff --git a/lib/views/pages/board/info_board_page.dart b/lib/views/pages/board/info_board_page.dart
@@ -6,6 +6,7 @@ import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/sql_message_database.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -127,12 +128,21 @@ class _InfoBoardPageState extends State<InfoBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "정보게시판",)),
+                  );
+                },
+                child: SvgPicture.asset(
+                  'assets/icon/icon_search.svg',
+                  width: 25.r,
+                  height: 25.r,
+                  color: Colors.white,
+                ),
+              ),
             ),
           ],
         ),

diff --git a/lib/views/pages/board/market_board_page.dart b/lib/views/pages/board/market_board_page.dart
@@ -7,6 +7,7 @@ import 'package:aliens/models/memberDetails_model.dart';
 import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/sql_message_database.dart';
 import 'package:aliens/views/pages/board/market_detail_page.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:aliens/views/pages/home_page.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -135,12 +136,22 @@ class _MarketBoardPageState extends State<MarketBoardPage> {
           ),
           centerTitle: true,
           actions: [
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),),
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "마켓게시판",)),
+                  );
+                },
+                child: SvgPicture.asset(
+                  'assets/icon/icon_search.svg',
+                  width: 25.r,
+                  height: 25.r,
+                  color: Colors.white,
+                ),
+              ),
+            ),
           ],
 
 

diff --git a/lib/views/pages/board/market_notice_page.dart b/lib/views/pages/board/market_notice_page.dart
@@ -71,12 +71,6 @@ class _MarketNoticePageState extends State<MarketNoticePage> {
           ),
           centerTitle: true,
           actions: [
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),),
           ],
 
 

diff --git a/lib/views/pages/board/music_board_page.dart b/lib/views/pages/board/music_board_page.dart
@@ -9,6 +9,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:provider/provider.dart';
 
@@ -127,12 +128,21 @@ class _MusicBoardPageState extends State<MusicBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
+            Padding(padding: EdgeInsets.all(8),
+              child: GestureDetector(
+                onTap: () {
+                  Navigator.push(context,
+                    MaterialPageRoute(
+                        builder: (context) => SearchPage(screenArguments: widget.screenArguments, category: "음악게시판",)),
+                  );
+                },
+                child: SvgPicture.asset(
+                  'assets/icon/icon_search.svg',
+                  width: 25.r,
+                  height: 25.r,
+                  color: Colors.white,
+                ),
+              ),
             ),
           ],
         ),

diff --git a/lib/views/pages/board/my_article_page.dart b/lib/views/pages/board/my_article_page.dart
@@ -131,15 +131,6 @@ class _MyArticlePageState extends State<MyArticlePage> {
                 ),
               ),
             ),
-            Padding(
-              padding: EdgeInsets.all(8),
-              child: SvgPicture.asset(
-                'assets/icon/icon_search.svg',
-                width: 25.r,
-                height: 25.r,
-                color: Colors.white,
-              ),
-            ),
           ],
         ),
         body: isDrawerStart

diff --git a/lib/views/pages/board/notice_board_page.dart b/lib/views/pages/board/notice_board_page.dart
@@ -7,6 +7,7 @@ import 'package:aliens/repository/sql_message_database.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
 import 'package:flutter_svg/svg.dart';
@@ -120,13 +121,6 @@ class _NoticeBoardPageState extends State<NoticeBoardPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
-            ),
           ]
       ),
       body: isDrawerStart

diff --git a/lib/views/pages/board/notice_detail_page.dart b/lib/views/pages/board/notice_detail_page.dart
@@ -8,6 +8,7 @@ import 'package:aliens/models/screenArgument.dart';
 import 'package:aliens/repository/sql_message_database.dart';
 import 'package:aliens/views/pages/chatting/chatting_page.dart';
 import 'package:easy_localization/easy_localization.dart';
+import 'package:aliens/views/pages/board/search_page.dart';
 import 'package:firebase_messaging/firebase_messaging.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_screenutil/flutter_screenutil.dart';
@@ -102,13 +103,6 @@ class _NoticeDetailPageState extends State<NoticeDetailPage> {
                 ),
               ),
             ),
-            Padding(padding: EdgeInsets.all(8), child: SvgPicture.asset(
-              'assets/icon/icon_search.svg',
-              width: 25.r,
-              height: 25.r,
-              color: Colors.white,
-            ),
-            ),
           ]
       ),
       body: isDrawerStart