Skip to content

feat. 검색 결과 페이지 레이아웃 추가 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wooooooooook wants to merge 1 commit into
base: feat/main-all-screen
Choose a base branch
from
Open

feat. 검색 결과 페이지 레이아웃 추가 #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 10 additions & 35 deletions app/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { HamburgerIcon, SearchIcon, ThingoLogoSmall } from '@/components/icons';
import { Text } from '@/components/ui/text';
import { Link } from 'expo-router';
import * as React from 'react';
import { Dimensions, Keyboard, ScrollView, View } from 'react-native';
import { Dimensions, Keyboard, ScrollView, TouchableOpacity, View } from 'react-native';
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { Page1 } from './_components/Page1';
import AllScreen from './_components/all-screen';
Expand All @@ -11,9 +12,8 @@ import { Page4 } from './_components/Page4';
import NoticeScreen from './_components/notice-screen';
import { Page6 } from './_components/Page6';
import { Page7 } from './_components/Page7';
import { Input } from '@/components/ui/input';
import { Button } from '@/components/ui/button';
import clsx from 'clsx';
import { TabBar } from '@/components/ui/tab-bar';

const { width } = Dimensions.get('window');
const TABS = ['ALL', '학식', '게시판', '명지도', '공지사항', '학사일정', '명대신문', '명대뉴스'];
Expand All @@ -23,7 +23,6 @@ export default function Screen() {
const insets = useSafeAreaInsets();
const scrollRef = React.useRef<ScrollView>(null);
const [currentTab, setCurrentTab] = React.useState(TABS[INITIAL_PAGE]);
const [searchQuery, setSearchQuery] = React.useState('');

React.useEffect(() => {
scrollRef.current?.scrollTo({ x: width * INITIAL_PAGE, animated: false });
Expand All @@ -47,15 +46,12 @@ export default function Screen() {
<View className="h-15 w-screen flex-row items-center px-3 pb-1 pt-2">
<ThingoLogoSmall />
<View className="flex-1 p-1.5">
<View className="flex-1 flex-row items-center rounded-full bg-grey-02 px-3 py-1.5">
<SearchIcon className="text-grey-30" />
<Input
value={searchQuery}
onChangeText={setSearchQuery}
placeholder="검색어를 입력하세요"
className="flex-1 border-0 bg-transparent p-0 text-body06 text-grey-80 shadow-none"
/>
</View>
<Link href="/search" asChild>
<TouchableOpacity className="flex-1 flex-row items-center gap-2 rounded-full bg-grey-02 px-3 py-1.5">
<SearchIcon className="text-grey-30" />
<Text className="text-body06 text-grey-40">검색어를 입력하세요</Text>
</TouchableOpacity>
</Link>
</View>
<Button className="h-fit p-1" variant="ghost">
<HamburgerIcon />
Expand All @@ -64,28 +60,7 @@ export default function Screen() {
</View>

{/* 탭 네비게이션 */}
<View className="border-b border-grey-20">
<ScrollView
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={{ paddingHorizontal: 16 }}>
{TABS.map((label, index) => (
<Button
key={label}
variant="ghost"
className={clsx(
'rounded-none px-5 pb-2 pt-2.5',
currentTab === label && 'border-b-2 border-mju-primary'
)}
onPress={() => handleTabPress(index)}>
<Text
className={`${currentTab === label ? 'text-body04 text-mju-primary' : 'text-body06 text-grey-40'}`}>
{label}
</Text>
</Button>
))}
</ScrollView>
</View>
<TabBar tabs={TABS} currentTab={currentTab} onTabPress={handleTabPress} />

{/* 스와이프 페이지 */}
<ScrollView
Expand Down
Loading