Skip to content

Commit 74c53ba

Browse files
committed
fix: conflict error
2 parents bc418cd + 358988e commit 74c53ba

45 files changed

Lines changed: 2016 additions & 3018 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/deploy.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
name: git push into another repo to deploy to vercel
2+
3+
on:
4+
push:
5+
branches: [main]
6+
workflow_dispatch:
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
container: pandoc/latex
12+
steps:
13+
- uses: actions/checkout@v2
14+
- name: Install mustache (to update the date)
15+
run: apk add ruby && gem install mustache
16+
- name: creates output
17+
run: sh ./build.sh
18+
- name: Pushes to another repository
19+
id: push_directory
20+
uses: cpina/github-action-push-to-another-repository@main
21+
env:
22+
API_TOKEN_GITHUB: ${{ secrets.AUTO_ACTIONS }}
23+
with:
24+
source-directory: 'output'
25+
destination-github-username: scorchedrice
26+
destination-repository-name: mycode
27+
user-email: ${{ secrets.EMAIL }}
28+
commit-message: ${{ github.event.head_commit.message || 'auto deploy' }}
29+
target-branch: main
30+
- name: Test get variable exported by push-to-another-repository
31+
run: echo $DESTINATION_CLONED_DIRECTORY

.rnstorybook/index.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

.rnstorybook/main.ts

Lines changed: 0 additions & 11 deletions
This file was deleted.

.rnstorybook/preview.tsx

Lines changed: 0 additions & 14 deletions
This file was deleted.

.rnstorybook/stories/Button.stories.tsx

Lines changed: 0 additions & 52 deletions
This file was deleted.

.rnstorybook/stories/Button.tsx

Lines changed: 0 additions & 105 deletions
This file was deleted.

.rnstorybook/stories/StoryExample.stories.tsx

Lines changed: 0 additions & 14 deletions
This file was deleted.

.rnstorybook/storybook.requires.ts

Lines changed: 0 additions & 49 deletions
This file was deleted.

app.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ export default {
103103
},
104104

105105
extra: {
106-
storybookEnabled: process.env.STORYBOOK_ENABLED,
107106
kakaoNativeAppKey: process.env.MYCODE_KAKAO_NATIVE_APP_KEY,
108107
BACKEND_URL: process.env.MYCODE_BACKEND_URL,
108+
NAVER_MAP_CLIENT_ID: process.env.NAVER_MAP_CLIENT_ID,
109109
eas: {
110110
projectId: process.env.MYCODE_EAS_PROJECT_ID,
111111
},

app/(tabs)/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ export default function HomeScreen() {
490490
setScrollBackgroundColor(backgroundColor);
491491
};
492492

493-
const handleSearchPress = () => router.push("/(tabs)/search");
493+
const handleSearchPress = () => router.push("/(tabs)/search_tab");
494494

495495
const handleSchedulePress = () => router.push("/(tabs)/schedule");
496496

0 commit comments

Comments
 (0)