Skip to content

Commit

Permalink
Merge pull request #158 from Yanolza-Miniproject/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
2YH02 authored Nov 30, 2023
2 parents 54ca184 + 9ed3697 commit 9ab0685
Show file tree
Hide file tree
Showing 288 changed files with 14,000 additions and 5,490 deletions.
21 changes: 21 additions & 0 deletions .firebase/hosting.ZGlzdA.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
mockServiceWorker.js,1701150747621,ec13ae364749a2b7f62d03f26c23f8d3b8bd87f0f2548e440a93ba9eca00bb01
vite.svg,1700891169273,59ec4b6085a0cb1bf712a5e48dd5f35b08e34830d49c2026c18241be04e05d5a
index.html,1701155544817,968c5dce8e7f4c4062554f5df07f5dfe5b3be0a1800ccf4aec28d53164b9cc5c
assets/ajax-loader-XJzBMpIy.gif,1701155544817,e9699a225e244ba8bb48532313e5c56a76fe08358c6dd684fb3234f2f63e7961
assets/logo-lxiO5Ccs.png,1701155544817,a75812f98bbf330ff261ed1cc539ffa5200370988720075f6fef7d3c4fefcb1b
assets/slick-Zcw5u4Ni.svg,1701155544817,d00477d40ed40fa1dd3bdee27d9286804121b15fea83bae7d5415d902b055de0
assets/index--cVBK-Bo.css,1701155544817,49b2ac7524cd45974a048151ca4854b8329413867a8c500863da7b93bc9ac60e
assets/option2-kUkB2nNl.svg,1701155544817,827f70b1ffdd41094aad846d5e463918ac2450b9559488b75db63502d13ee29e
assets/type4-GLHtvs05.jpg,1701155544817,c0f82eda037586246bac553eba4f673cf969495c40d182a7d972ea3871802cae
assets/type1-AlJ1Dfbp.jpeg,1701155544817,123fddc8c9a531559cb52297531ab48861b282bfa7a2196f1ad76bbca273842f
assets/type2-OLa2L4XE.jpg,1701155544816,b9027e150b8594b04be7664b45b05c4df0033acba25128d0daf7bad43833b1fc
assets/browser-kOiMfIzF.js,1701155544817,c13121552a9bff71a074112caae7129f70a908a8d02f5bdd2cf0df4d11f1f441
assets/type7-CT-b9aiE.jpg,1701155544817,d5c748e21f620f09e9c1ab87af030b9a7230ed2c425c6cb5612faafd47b5a147
assets/type3-pxTTyho3.jpg,1701155544817,fb16202e7816d05ac78978945bcc0a7d009c0af436cb94d2c1d3ce5adc58b256
assets/type5-VjGfLRVS.jpg,1701155544817,4fa94e9a96a76156d51cc8d43f2953f8b0be76d5d8f4f15d006c17810aba58c1
assets/type6-dxlAL5Ol.png,1701155544817,eb76cdb243961f02e77dbda6cb6b125e402082cfb97e2f1a979bf9097b7d8bb0
assets/hotel-default-r7VDbsny.jpg,1701155544817,4a28169357fef027876db65caedf24b99024f5a7a6be958cbc5db9ba9e6e1971
assets/type8-sJeA8EB-.png,1701155544817,dd139aca2065ef05f0fe27304aeb9712e72a0816cbf991b501b2d1991b57e129
assets/type0-DInKlT4R.png,1701155544817,59fab688312360a5f573c8d2361df66d3b57b3b91668ed976b0f97170de4eb05
assets/type9-xpFQHIgZ.png,1701155544817,e14cd4c44dce0488773495acfdbcaed8029c659588caa468258480ad7697a191
assets/index-9bmLIOoD.js,1701155544817,ed73b1e1b34ea84c1b658484926c732498f180a9c5cb4e0d737bf4fef656215a
4 changes: 4 additions & 0 deletions .firebase/hosting.cHVibGlj.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
404.html,1701151600723,daa499dd96d8229e73235345702ba32f0793f0c8e5c0d30e40e37a5872be57aa
vite.svg,1700891169273,59ec4b6085a0cb1bf712a5e48dd5f35b08e34830d49c2026c18241be04e05d5a
index.html,1701151600926,060773d390ab3ab8974ab90c5186ef556b2f4abbc2f538b9b964d1b16c0defcb
mockServiceWorker.js,1701150747621,ec13ae364749a2b7f62d03f26c23f8d3b8bd87f0f2548e440a93ba9eca00bb01
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "yaja-project"
}
}
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/fe_pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
---

## Issue Number

<!-- 설명을 적어주세요. -->
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/firebase-hosting-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# This file was auto-generated by the Firebase CLI
# https://github.com/firebase/firebase-tools

name: Deploy to Firebase Hosting on merge
'on':
push:
branches:
- develop
jobs:
build_and_deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: npm i && npm run build
- uses: FirebaseExtended/action-hosting-deploy@v0
with:
repoToken: '${{ secrets.GITHUB_TOKEN }}'
firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_YAJA_PROJECT }}'
channelId: live
projectId: yaja-project
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ dist-ssr
*.njsproj
*.sln
*.sw?


.env
3 changes: 1 addition & 2 deletions .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#!/usr/bin/env sh
. "$(dirname -- "$0")/_/husky.sh"

npm run format
npm run lint
npx lint-staged
5 changes: 4 additions & 1 deletion babel.config.cjs
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
// eslint-disable-next-line no-undef
module.exports = {
presets: [["@babel/preset-env", { targets: { node: "current" } }]],
presets: [
"babel-plugin-transform-import-meta",
["@babel/preset-env", { targets: { node: "current" } }],
],
};
12 changes: 12 additions & 0 deletions firebase.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"hosting": {
"public": "dist",
"ignore": ["firebase.json", "**/.*", "**/node_modules/**"],
"rewrites": [
{
"source": "**",
"destination": "/index.html"
}
]
}
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
<title>Hey놀자</title>
</head>
<body>
<div id="root"></div>
Expand Down
28 changes: 26 additions & 2 deletions jest.config.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ module.exports = {
// https://jestjs.io/docs/configuration#testenvironment-string
testEnvironment: "jsdom",

preset: "ts-jest/presets/default-esm",

// A list of paths to directories that Jest should use to search for files in
// https://jestjs.io/docs/configuration#roots-arraystring
roots: ["<rootDir>/src/"],
Expand All @@ -16,7 +18,26 @@ module.exports = {
// Jest transformations
// https://jestjs.io/docs/configuration#transform-objectstring-pathtotransformer--pathtotransformer-object
transform: {
"^.+\\.tsx?$": "ts-jest", // Transform TypeScript files using ts-jest
"^.+\\.tsx?$": [
"ts-jest",
{
diagnostics: {
ignoreCodes: [1343],
},
astTransformers: {
before: [
{
path: "node_modules/ts-jest-mock-import-meta", // or, alternatively, 'ts-jest-mock-import-meta' directly, without node_modules.
options: {
metaObjectReplacement: {
url: "http://43.200.54.142:8080/api/v1",
},
},
},
],
},
},
],
},

// A list of paths to modules that run some code to configure or set up the testing framework before each test file in the suite is executed
Expand Down Expand Up @@ -45,12 +66,15 @@ module.exports = {

// Handle static assets
// https://jestjs.io/docs/webpack#handling-static-assets
"^.+\\.(jpg|jpeg|png|gif|webp|avif|svg|ttf|woff|woff2)$": `<rootDir>/__mocks__/fileMock.js`,
"^.+\\.(jpg|jpeg|png|gif|webp|avif|svg|ttf|woff|woff2)$":
"jest-svg-transformer",

// Handle TypeScript path aliases
"^@/(.*)$": "<rootDir>/src/$1",
},

snapshotSerializers: ["@emotion/jest/serializer"],

verbose: true,
testTimeout: 30000,
};
6 changes: 6 additions & 0 deletions jest.setup.ts
Original file line number Diff line number Diff line change
@@ -1 +1,7 @@
import "@testing-library/jest-dom";
import "@emotion/jest";
import "@emotion/react";
import "@emotion/styled";
import { matchers } from "@emotion/jest";

expect.extend(matchers);
Loading

0 comments on commit 9ab0685

Please sign in to comment.