Skip to content

Commit

Permalink
HOTFIX: favicon 추가, 위치태그 로직 복구
Browse files Browse the repository at this point in the history
  • Loading branch information
oooppq committed Sep 8, 2023
1 parent 28acd8b commit a53dc2d
Show file tree
Hide file tree
Showing 31 changed files with 150 additions and 10 deletions.
74 changes: 74 additions & 0 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,80 @@
<meta charset="UTF-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<link
rel="apple-touch-icon"
sizes="57x57"
href="src/assets/img/favicon/apple-icon-57x57.png"
/>
<link
rel="apple-touch-icon"
sizes="60x60"
href="src/assets/img/favicon/apple-icon-60x60.png"
/>
<link
rel="apple-touch-icon"
sizes="72x72"
href="src/assets/img/favicon/apple-icon-72x72.png"
/>
<link
rel="apple-touch-icon"
sizes="76x76"
href="src/assets/img/favicon/apple-icon-76x76.png"
/>
<link
rel="apple-touch-icon"
sizes="114x114"
href="src/assets/img/favicon/apple-icon-114x114.png"
/>
<link
rel="apple-touch-icon"
sizes="120x120"
href="src/assets/img/favicon/apple-icon-120x120.png"
/>
<link
rel="apple-touch-icon"
sizes="144x144"
href="src/assets/img/favicon/apple-icon-144x144.png"
/>
<link
rel="apple-touch-icon"
sizes="152x152"
href="src/assets/img/favicon/apple-icon-152x152.png"
/>
<link
rel="apple-touch-icon"
sizes="180x180"
href="src/assets/img/favicon/apple-icon-180x180.png"
/>
<link
rel="icon"
type="image/png"
sizes="192x192"
href="src/assets/img/favicon/android-icon-192x192.png"
/>
<link
rel="icon"
type="image/png"
sizes="32x32"
href="src/assets/img/favicon/favicon-32x32.png"
/>
<link
rel="icon"
type="image/png"
sizes="96x96"
href="src/assets/img/favicon/favicon-96x96.png"
/>
<link
rel="icon"
type="image/png"
sizes="16x16"
href="src/assets/img/favicon/favicon-16x16.png"
/>
<!-- <link rel="manifest" href="src/assets/img/favicon/manifest.json" /> -->
<!-- <meta
name="msapplication-TileImage"
content="src/assets/img/favicon/ms-icon-144x144.png"
/> -->

<script
type="text/javascript"
Expand Down
Binary file added src/assets/img/favicon/android-icon-144x144.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 added src/assets/img/favicon/android-icon-192x192.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 added src/assets/img/favicon/android-icon-36x36.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 added src/assets/img/favicon/android-icon-48x48.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 added src/assets/img/favicon/android-icon-72x72.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 added src/assets/img/favicon/android-icon-96x96.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 added src/assets/img/favicon/apple-icon-114x114.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 added src/assets/img/favicon/apple-icon-120x120.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 added src/assets/img/favicon/apple-icon-144x144.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 added src/assets/img/favicon/apple-icon-152x152.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 added src/assets/img/favicon/apple-icon-180x180.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 added src/assets/img/favicon/apple-icon-57x57.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 added src/assets/img/favicon/apple-icon-60x60.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 added src/assets/img/favicon/apple-icon-72x72.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 added src/assets/img/favicon/apple-icon-76x76.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 added src/assets/img/favicon/apple-icon-precomposed.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 added src/assets/img/favicon/apple-icon.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: 2 additions & 0 deletions src/assets/img/favicon/browserconfig.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<browserconfig><msapplication><tile><square70x70logo src="/ms-icon-70x70.png"/><square150x150logo src="/ms-icon-150x150.png"/><square310x310logo src="/ms-icon-310x310.png"/><TileColor>#ffffff</TileColor></tile></msapplication></browserconfig>
Binary file added src/assets/img/favicon/favicon-16x16.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 added src/assets/img/favicon/favicon-32x32.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 added src/assets/img/favicon/favicon-96x96.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 added src/assets/img/favicon/favicon.ico
Binary file not shown.
41 changes: 41 additions & 0 deletions src/assets/img/favicon/manifest.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
{
"name": "App",
"icons": [
{
"src": "\/android-icon-36x36.png",
"sizes": "36x36",
"type": "image\/png",
"density": "0.75"
},
{
"src": "\/android-icon-48x48.png",
"sizes": "48x48",
"type": "image\/png",
"density": "1.0"
},
{
"src": "\/android-icon-72x72.png",
"sizes": "72x72",
"type": "image\/png",
"density": "1.5"
},
{
"src": "\/android-icon-96x96.png",
"sizes": "96x96",
"type": "image\/png",
"density": "2.0"
},
{
"src": "\/android-icon-144x144.png",
"sizes": "144x144",
"type": "image\/png",
"density": "3.0"
},
{
"src": "\/android-icon-192x192.png",
"sizes": "192x192",
"type": "image\/png",
"density": "4.0"
}
]
}
Binary file added src/assets/img/favicon/ms-icon-144x144.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 added src/assets/img/favicon/ms-icon-150x150.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 added src/assets/img/favicon/ms-icon-310x310.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 added src/assets/img/favicon/ms-icon-70x70.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 10 additions & 1 deletion src/libs/userAuth.helpers.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -154,11 +154,20 @@ export const useAuth = () => {
} else if (authError) {
// console.log(authError.response.status);
if (authError.response.status === 404) {
// if(authError.response?.data?.message)
// console.log(authError.response?.data?.message);
// 유저 인증에 문제가 있을 때
setAuthInfo(authStates.ERROR, null);
// window.location.reload();
} else if (authError.response.status === 401)
} else if (
authError.response.status === 401 ||
authError.response.status === 400
) {
setAuthInfo(authStates.INVALID, null);
} else {
setAuthInfo(authStates.UNAUTHORIZED, null);
}

// 어떤 error 인지에 따라 다른 action을 취하도록 수정해야 함.
} else if (!authIsLoading) {
// 네트워크에 문제가 있을 때
Expand Down
21 changes: 18 additions & 3 deletions src/pages/Login/LoginBody.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable react/prop-types */
import React from 'react';
import React, { useState } from 'react';
import { LoginBodyContainer } from './login.style';
import jmcIcon from '../../assets/img/user-jmc-icon.svg';
import { useLoginHandler } from './login.helpers';
Expand All @@ -12,6 +12,7 @@ const LoginBody = ({ authState, login, refresh }) => {
handlePasswordChange,
handleLogin,
} = useLoginHandler(login, refresh);
const [isInit, setIsInit] = useState(true);

return (
<LoginBodyContainer>
Expand All @@ -34,8 +35,22 @@ const LoginBody = ({ authState, login, refresh }) => {
placeholder="password"
onChange={handlePasswordChange}
/>
<LoginError authState={authState} isInputMissing={isInputMissing} />
<button className="loginBtn" type="button" onClick={handleLogin}>
<LoginError
isInit={isInit}
authState={authState}
isInputMissing={isInputMissing}
/>
{/* {!isInit && (
)} */}
<button
className="loginBtn"
type="button"
onClick={(e) => {
handleLogin(e);
setIsInit(false);
}}
>
로그인
</button>
</div>
Expand Down
11 changes: 5 additions & 6 deletions src/pages/Restaurant/RestaurantNav.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -107,12 +107,11 @@ const RestaurantNav = ({
<Dropdown
data={
restaurantState.selectedLocCat
? // ? locTag.filter(
// (tag) =>
// // tag.location_Category_id === restaurantState.selectedLocCat.id

// )
locTag
? locTag.filter(
(tag) =>
tag.locationCategoryId ===
restaurantState.selectedLocCat.id
)
: []
}
selected={restaurantState.selectedLocTag}
Expand Down

0 comments on commit a53dc2d

Please sign in to comment.