Skip to content

Commit

Permalink
Merge pull request #27 from DEPthes/feat/#9
Browse files Browse the repository at this point in the history
feat : 결정보관함, 로그아웃
  • Loading branch information
frombozztoang authored Aug 21, 2023
2 parents b26f2b8 + 3593b16 commit d791e2b
Show file tree
Hide file tree
Showing 28 changed files with 798 additions and 137 deletions.
40 changes: 36 additions & 4 deletions App.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@
import { Button, Image, Pressable, StyleSheet, Text, View } from "react-native";
import {
Button,
Image,
LogBox,
Pressable,
StyleSheet,
Text,
View,
YellowBox,
} from "react-native";
import Constants from "expo-constants";
import styled from "styled-components/native";
import { NavigationContainer } from "@react-navigation/native";
import { createBottomTabNavigator } from "@react-navigation/bottom-tabs";
import Home from "./pages/Home";
import MyPage from "./pages/MyPage";
import Storage from "./pages/Storage/Storage";
import ButtonStorage from "./assets/svg/ButtonStorage";
import ButtonMyPage from "./assets/svg/ButtonMyPage";
import { createNativeStackNavigator } from "@react-navigation/native-stack";
Expand All @@ -21,8 +27,13 @@ import { AuthProvider } from "./context/AuthContext";

import SplashMain from "./pages/Splash/SplashMain";
import ProfileSetting from "./pages/Join/ProfileSetting";
import ReplyBoxDetail from "./pages/Storage/ReplyBoxDetail";

interface Warning {
message: string;
}
function App() {
LogBox.ignoreAllLogs();
const Tab = createNativeStackNavigator();
return (
<NavigationContainer>
Expand Down Expand Up @@ -79,6 +90,27 @@ function App() {
})}
/>

<Tab.Screen
name="ReplyBoxDetail"
component={ReplyBoxDetail}
options={({ navigation }) => ({
title: "결정 보관함",
headerTransparent: true,
header: () => (
<CustomHeader
navigation={navigation}
title="결정 보관함"
showBackButton={true}
showBottomLine={true}
/>
),
tabBarIcon: () => (
<ButtonContainer>
<ButtonStorage />
</ButtonContainer>
),
})}
/>
<Tab.Screen
name="Login"
component={Login}
Expand Down
Binary file modified assets/png/ButtonHome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions assets/svg/FocusedButtonMyPage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from "react";
import Svg, { Circle, Path, Defs } from "react-native-svg";

const FocusedButtonMyPage: React.FC = () => {
return (
<Svg width={40} height={40} viewBox="0 0 1024 1024">
<Circle
cx={512}
cy={321.81}
r={207.26}
fill="#fff"
stroke="#fff"
strokeMiterlimit={10}
strokeWidth={50}
/>
<Path
d="M512,593.53c-209.73,0-379.74,141.44-379.74,315.93H891.74c0-174.48-170.02-315.93-379.74-315.93Z"
fill="#fff"
stroke="#fff"
strokeMiterlimit={10}
strokeWidth={50}
/>
</Svg>
);
};

export default FocusedButtonMyPage;
37 changes: 37 additions & 0 deletions assets/svg/FocusedButtonStorage.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import React from "react";
import Svg, { Circle, Path, Defs, Rect } from "react-native-svg";

const FocusedButtonStorage: React.FC = () => {
return (
<Svg width={40} height={40} viewBox="0 0 1024 1024">
<Path
d="M121.2,331.34H904.56V891.57c0,11.27-9.15,20.43-20.43,20.43H141.63c-11.27,0-20.43-9.15-20.43-20.43V331.34h0Z"
fill="#fff"
stroke="#fff"
strokeMiterlimit={10}
strokeWidth={50}
/>
<Path
d="M122.22,112H901.78c12.12,0,21.96,9.84,21.96,21.96v127.96H100.26v-127.96c0-12.12,9.84-21.96,21.96-21.96Z"
fill="#fff"
stroke="#fff"
strokeMiterlimit={10}
strokeWidth={50}
/>
<Rect
x="400.89"
y="426.79"
width="223.99"
height="59.18"
rx="13.79"
ry="13.7"
fill="#fff"
stroke="#fff"
strokeMiterlimit={10}
strokeWidth={50}
/>
</Svg>
);
};

export default FocusedButtonStorage;
130 changes: 130 additions & 0 deletions assets/svg/crystal/CrystalTemplate.jsx

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions assets/svg/crystal/crystal1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/svg/crystal/crystal2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/svg/crystal/crystal3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions assets/svg/crystal/crystal4.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d791e2b

Please sign in to comment.