Skip to content

Commit

Permalink
Merge pull request #129 from depromeet/dev
Browse files Browse the repository at this point in the history
dev to main merge
  • Loading branch information
klmhyeonwoo authored Jan 21, 2024
2 parents 4e8f847 + 6d9e932 commit b506b91
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 12 deletions.
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, user-scalable=no"
Expand All @@ -25,7 +25,7 @@
crossorigin=""
href="https://cdn.jsdelivr.net/gh/sun-typeface/SUIT/fonts/variable/woff2/SUIT-Variable.woff2"
/>
<title>praise-up</title>
<title>PRAISE UP</title>
</head>
<body>
<div id="root"></div>
Expand Down
15 changes: 15 additions & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed public/logo192.png
Binary file not shown.
Binary file removed public/logo512.png
Binary file not shown.
Binary file added public/logo_192.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 public/logo_512.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 public/logo_64.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
{
"name": "PP",
"short_name": "PP",
"name": "PRAISE UP",
"short_name": "PRAISE UP",
"icons": [
{
"src": "favicon.ico",
"src": "/logo_64.png",
"sizes": "64x64 32x32 24x24 16x16",
"type": "image/x-icon"
},
{
"src": "logo192.png",
"src": "/logo_192.png",
"type": "image/png",
"sizes": "192x192"
},
{
"src": "logo512.png",
"src": "/logo_512.png",
"type": "image/png",
"sizes": "512x512"
}
],
"start_url": "/",
"display": "standalone",
"orientation": "portrait",
"background_color": "#262626",
"theme_color": "#f2f2f2",
"background_color": "#ffffff",
"theme_color": "#ffffff",
"scope": "."
}
1 change: 0 additions & 1 deletion public/vite.svg

This file was deleted.

2 changes: 1 addition & 1 deletion src/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import axios, {
} from "axios";

// API 서버 연결 설정 필요
const DEVELOPMENT_API_URL = "https://api.praise-up.app";
const DEVELOPMENT_API_URL = "http://101.101.211.46:8080";
const PRODUCTION_API_URL = "https://api.praise-up.app";

const baseApi = axios.create({
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/post/keyword/selector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const Selector = ({
disableBodyScroll(document.body);
const viewPortWidth = window.visualViewport.width;
swiperRef.current.style!.width =
viewPortWidth >= 480 ? `${480 + 30}px` : `${viewPortWidth + 30}px`;
viewPortWidth >= 480 ? `${480 + 35}px` : `${viewPortWidth + 35}px`;
return () => enableBodyScroll(document.body);
}, []);

Expand Down
8 changes: 8 additions & 0 deletions src/style/swiper/keyword.scss
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,12 @@
.swiper-pagination-bullet-active {
background-color: rgba(131, 139, 152, 1);
}

.swiper-slide-active > div {
width: 100% !important;
height: 100% !important;
display: flex;
justify-content: center;
align-items: center;
}
}

0 comments on commit b506b91

Please sign in to comment.