Skip to content

Commit

Permalink
Merge pull request #1 from marina-yhm/main
Browse files Browse the repository at this point in the history
Config: 공통테마적용
  • Loading branch information
marinesnow34 authored Oct 27, 2023
2 parents d21b11d + 7300cbf commit 36cc91f
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
AWS_DEFAULT_REGION: ap-northeast-2
BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME }}
run: |
aws s3 sync build s3://$BUCKET_NAME/
aws s3 sync build s3://$BUCKET_NAME/ --delete
# - name: Cloufront cache invalidation
# env:
# AWS_ACCESS_KEY_ID: ${{ secrets.CF_ACCESS_KEY_ID }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
ENDPOINT_URL: ${{ secrets.CF_ENDPOINT_URL }}
run: |
aws s3 sync build s3://$BUCKET_NAME/build_ceo \
--endpoint-url $ENDPOINT_URL
--endpoint-url $ENDPOINT_URL --delete
- name: SSH and deploy
uses: appleboy/[email protected]
Expand All @@ -65,7 +65,7 @@ jobs:
timeout: 40s # 30초 기본
script: |
aws s3 sync s3://readyvery-dev-server/build_ceo ./docker/react/build_boss \
--endpoint-url https://29c6e4b55b1ddb8d2b6e69df21141caa.r2.cloudflarestorage.com
--endpoint-url https://29c6e4b55b1ddb8d2b6e69df21141caa.r2.cloudflarestorage.com --delete
- name: Discordbot alert # 디스코드 알림
uses: sarisia/[email protected]
with:
Expand Down
7 changes: 6 additions & 1 deletion src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,17 @@ import ReactDOM from "react-dom/client";
import "./index.css";
import App from "./App";
import { BrowserRouter } from "react-router-dom";
import { ThemeProvider } from 'styled-components';
import theme from './style/theme/theme';

const root = ReactDOM.createRoot(document.getElementById("root"));
root.render(
<React.StrictMode>
<BrowserRouter>
<App />
<ThemeProvider theme={theme}>
<App />
</ThemeProvider>

</BrowserRouter>
</React.StrictMode>
);
Expand Down
15 changes: 15 additions & 0 deletions src/style/theme/theme.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
const theme = {
colors: {
MainColor: '#05422b',
HoverColor: '#3CB371',
accent: '#e0234e',
},
fontSize: {
small: '12px',
medium: '16px',
large: '24px',
},
// 여기에 더 많은 테마 변수를 추가할 수 있습니다.
};

export default theme;

0 comments on commit 36cc91f

Please sign in to comment.