-
Notifications
You must be signed in to change notification settings - Fork 2
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.
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
#592 공유하기 링크의 OG image URL 수정 #593
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,57 @@ | ||
import App from "App"; | ||
import { Suspense } from "react"; | ||
import { CookiesProvider } from "react-cookie"; | ||
import ReactDOM from "react-dom"; | ||
import { Route, BrowserRouter as Router, Switch } from "react-router-dom"; | ||
import routes from "routes"; | ||
|
||
import Loading from "components/Loading"; | ||
import ModalProvider from "components/Modal/ModalProvider"; | ||
import Skeleton from "components/Skeleton"; | ||
import AlertProvider from "components/Skeleton/AlertProvider"; | ||
import CSSVariablesProvider from "components/Skeleton/CSSVariablesProvider"; | ||
import ChannelTalkProvider from "components/Skeleton/ChannelTalkProvider"; | ||
import FirebaseMessagingProvider from "components/Skeleton/FirebaseMessagingProvider"; | ||
import FlutterEventCommunicationProvider from "components/Skeleton/FlutterEventCommunicationProvider"; | ||
import GoogleAnalyticsProvier from "components/Skeleton/GoogleAnalyticsProvier"; | ||
import I18nextProvider from "components/Skeleton/I18nextProvider"; | ||
import ScrollRestoration from "components/Skeleton/ScrollRestoration"; | ||
import SocketToastProvider from "components/Skeleton/SocketToastProvider"; | ||
import VirtualKeyboardDetector from "components/Skeleton/VirtualKeyboardDetector"; | ||
|
||
import "./App.css"; | ||
import "./Font.css"; | ||
|
||
import { RecoilRoot } from "recoil"; | ||
|
||
const App = () => { | ||
return ( | ||
<CookiesProvider> | ||
<RecoilRoot> | ||
<Router> | ||
<I18nextProvider /> | ||
<ScrollRestoration /> | ||
<CSSVariablesProvider /> | ||
<VirtualKeyboardDetector /> | ||
<ChannelTalkProvider /> | ||
<GoogleAnalyticsProvier /> | ||
<FirebaseMessagingProvider /> | ||
<FlutterEventCommunicationProvider /> | ||
<SocketToastProvider /> | ||
<AlertProvider /> | ||
<ModalProvider /> | ||
<Skeleton> | ||
<Suspense fallback={<Loading center />}> | ||
<Switch> | ||
{routes.map((route) => ( | ||
<Route key={route.path} {...route} /> | ||
))} | ||
</Switch> | ||
</Suspense> | ||
</Skeleton> | ||
</Router> | ||
</RecoilRoot> | ||
</CookiesProvider> | ||
); | ||
}; | ||
|
||
ReactDOM.render(<App />, document.getElementById("root")); |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
import dotenv from "dotenv"; | ||
import { FirebaseConfig } from "types/env"; | ||
|
||
dotenv.config(); | ||
|
||
const env = { ...process.env, ...window["env"] }; | ||
|
||
export const nodeEnv = env.NODE_ENV; // automatically provided | ||
export const backServer = env.REACT_APP_BACK_URL; // required | ||
export const ioServer = env.REACT_APP_IO_URL ?? backServer; // optional (주어지지 않은 경우 REACT_APP_BACK_URL로 설정) | ||
export const ogServer = env.REACT_APP_OG_URL; // optional | ||
export const s3BaseUrl = env.REACT_APP_S3_URL; // required | ||
export const channelTalkPluginKey = env.REACT_APP_CHANNELTALK_PLUGIN_KEY; // optional | ||
export const kakaoSDKKey = env.REACT_APP_KAKAO_SDK_KEY; // optional | ||
export const gaTrackingId = env.REACT_APP_GA_TRACKING_ID; // optional | ||
export const firebaseConfig: Nullable<FirebaseConfig> = | ||
env.REACT_APP_FIREBASE_CONFIG && JSON.parse(env.REACT_APP_FIREBASE_CONFIG); // optional |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
type Env = { | ||
REACT_APP_BACK_URL: string; | ||
REACT_APP_IO_URL?: string; | ||
REACT_APP_OG_URL?: string; | ||
REACT_APP_S3_URL: string; | ||
REACT_APP_CHANNELTALK_PLUGIN_KEY?: string; | ||
REACT_APP_KAKAO_SDK_KEY?: string; | ||
REACT_APP_GA_TRACKING_ID?: string; | ||
REACT_APP_FIREBASE_CONFIG?: string; | ||
}; | ||
|
||
export type FirebaseConfig = { | ||
apiKey: string; | ||
authDomain: string; | ||
projectId: string; | ||
storageBucket: string; | ||
messagingSenderId: string; | ||
appId: string; | ||
measurementId: string; | ||
dinamicLink: { | ||
host: string; | ||
androidPacakgeName: string; | ||
iosAppBundleId: string; | ||
appStoreId: string; | ||
}; | ||
}; | ||
|
||
export default Env; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://github.com/sparcs-kaist/taxi-front/pull/590/files#r1260842566
@cokia 님께서 이전에 PR에 반영하셨던 내용이라 conflict 날 수 있을 것 같아요