Skip to content

Commit

Permalink
Merge pull request #407 from depromeet/fix/route
Browse files Browse the repository at this point in the history
fix: 앱 상태 회고 작성 화면 라우팅 변경
  • Loading branch information
raymondanythings committed Sep 18, 2024
2 parents 7483545 + ed354e7 commit 9c7c61f
Show file tree
Hide file tree
Showing 19 changed files with 426 additions and 336 deletions.
18 changes: 18 additions & 0 deletions apps/mobile/app/write/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import { WebViewLayout } from "@/layout/webview-layout";
import { useSuspense } from "@/provider/suspense-provider";
import { useSafeAreaInsets } from "react-native-safe-area-context";

export default function WritePage() {
const insets = useSafeAreaInsets();
const { backgroundColor } = useSuspense();
return (
<WebViewLayout
pathname="/write"
style={{
backgroundColor: backgroundColor ?? "#212329",
paddingTop: insets.top,
paddingBottom: insets.bottom,
}}
/>
);
}
14 changes: 7 additions & 7 deletions apps/mobile/ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -122,11 +122,11 @@ PODS:
- ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core
- Yoga
- Mixpanel-swift (4.2.7):
- Mixpanel-swift/Complete (= 4.2.7)
- Mixpanel-swift/Complete (4.2.7)
- MixpanelReactNative (3.0.5):
- Mixpanel-swift (= 4.2.7)
- Mixpanel-swift (4.3.0):
- Mixpanel-swift/Complete (= 4.3.0)
- Mixpanel-swift/Complete (4.3.0)
- MixpanelReactNative (3.0.6):
- Mixpanel-swift (= 4.3.0)
- React-Core
- RCT-Folly (2024.01.01.00):
- boost
Expand Down Expand Up @@ -1806,8 +1806,8 @@ SPEC CHECKSUMS:
KakaoSDKUser: 043bcd7e91454ebf3bf64f150c430e6f65f0a08d
lottie-ios: e047b1d2e6239b787cc5e9755b988869cf190494
lottie-react-native: 4279da8b681e89c29a2adb9f99985d6cf372d49d
Mixpanel-swift: 7f5b749dbda2708033d67ff3d7a91710468d4a38
MixpanelReactNative: 00d0aa5ebf291f389a87d9583419c4d4e51c5941
Mixpanel-swift: 2192b9a24cf41b870749e4e0e10fbc9822bb2b4a
MixpanelReactNative: 429e2f1c7d4e9a56d082f03df0a6963206eafc9f
RCT-Folly: 02617c592a293bd6d418e0a88ff4ee1f88329b47
RCTDeprecation: 3afceddffa65aee666dafd6f0116f1d975db1584
RCTRequired: ec1239bc9d8bf63e10fb92bd8b26171a9258e0c1
Expand Down
4 changes: 2 additions & 2 deletions apps/mobile/ios/layer.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.4;
MARKETING_VERSION = 1.0.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down Expand Up @@ -425,7 +425,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.4;
MARKETING_VERSION = 1.0.5;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/114.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/120.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/29.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/40.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/57.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/58.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/60.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/80.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified apps/mobile/ios/layer/Images.xcassets/AppIcon.appiconset/87.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion apps/mobile/ios/layer/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0.4</string>
<string>1.0.5</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand Down
2 changes: 2 additions & 0 deletions apps/mobile/ios/layer/layer.entitlements
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:app.layerapp.io</string>
Expand Down
10 changes: 5 additions & 5 deletions apps/web/src/component/actionItem/NotActionItemBoxData.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
import { css } from "@emotion/react";
import { useNavigate } from "react-router-dom";
import { PATHS } from "@layer/shared";

import { Button } from "@/component/common/button";
import { Icon } from "@/component/common/Icon";
import { Spacing } from "@/component/common/Spacing";
import { Typography } from "@/component/common/typography";
import { PATHS } from "@/config/paths.ts";
import { useTestNatigate } from "@/lib/test-natigate";
import { ANIMATION } from "@/style/common/animation.ts";
import { DESIGN_TOKEN_COLOR, DESIGN_TOKEN_TEXT } from "@/style/designTokens.ts";

export function NotActionItemBoxData() {
const navigate = useNavigate();
const navigate = useTestNatigate();

return (
<div
Expand Down Expand Up @@ -57,15 +57,15 @@ export function NotActionItemBoxData() {
<Spacing size={3} />
<Button
onClick={() => {
navigate(PATHS.home());
void navigate(PATHS.home());
}}
colorSchema={"outline"}
css={css`
width: fit-content;
padding: 1.3rem 3.65rem;
`}
>
<Typography variant={"subtitle16SemiBold"} color={"gray800"} onClick={() => navigate(PATHS.home())}>
<Typography variant={"subtitle16SemiBold"} color={"gray800"}>
회고 진행하기
</Typography>
</Button>
Expand Down
8 changes: 4 additions & 4 deletions apps/web/src/component/home/EmptyAnalysis.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import { css } from "@emotion/react";
import { useNavigate } from "react-router-dom";
import { PATHS } from "@layer/shared";

import { Icon } from "@/component/common/Icon";
import { Spacing } from "@/component/common/Spacing";
import { Typography } from "@/component/common/typography";
import { PATHS } from "@/config/paths";
import { useTestNatigate } from "@/lib/test-natigate";
import { ANIMATION } from "@/style/common/animation.ts";
import { DESIGN_TOKEN_COLOR } from "@/style/designTokens";

export function EmptyAnalysis() {
const navigate = useNavigate();
const navigate = useTestNatigate();
return (
<div
css={css`
Expand Down Expand Up @@ -42,7 +42,7 @@ export function EmptyAnalysis() {
<Spacing size={3} />
<button
onClick={() => {
navigate(PATHS.home());
void navigate(PATHS.home());
}}
css={css`
border: 1px solid ${DESIGN_TOKEN_COLOR.gray300};
Expand Down
Loading

0 comments on commit 9c7c61f

Please sign in to comment.