Skip to content
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.

Sign up for GitHub

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

release 1.0.6 ver #34

Merged
merged 7 commits into from
Oct 4, 2023
Merged

release 1.0.6 ver #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eca93d7
Main (#24)
jinu6262 Oct 2, 2023
6e555e0
fix: 페이지 네이션 버그 수정 (#25)
jinu6262 Oct 2, 2023
2e2be30
fix: 시간 단위 표기 수정 (#26)
jinu6262 Oct 3, 2023
f0e7eea
fix: 사이드바 동작 수정 (#28)
jinu6262 Oct 3, 2023
60812f3
fix: 요청사항 변경
jinu6262 Oct 3, 2023
ef92136
Merge branch 'main' into dev
jinu6262 Oct 3, 2023
532ed2e
design: favicon 추가 (#33)
jinu6262 Oct 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified public/favicon.ico
View file
Open in desktop
Binary file not shown.
6 changes: 5 additions & 1 deletion src/assets/icons/User.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/icons/down.svg
View file
Open in desktop
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/icons/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import PublicFacilities from '@/assets/icons/publicFacilities.svg';
import MaintenanceCost from '@/assets/icons/maintenanceCost.svg';
import Survey from '@/assets/icons/survey.svg';
import Setting from '@/assets/icons/setting.svg';
import Down from '@/assets/icons/down.svg';

export {
Notification,
Expand All @@ -32,4 +33,5 @@ export {
MaintenanceCost,
Survey,
Setting,
Down,
};
44 changes: 40 additions & 4 deletions src/components/admin/visitor/VisitorSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Down } from '@/assets/icons';
import { getSearchVisitors } from '@/pages/api/visitor/visitorRequests';
import theme from '@/styles/theme';
import { VisitorSearchProps } from '@/types/visitor/visitor';
Expand Down Expand Up @@ -56,10 +57,13 @@ function VisitorSearch({ setVisitorList, setPage }: VisitorSearchProps) {
<div css={container}>
<p>검색</p>
<div css={searchForm}>
<select onChange={(e) => onChangeSelectHandler(e)}>
<option value="COMPANY">입주사명</option>
<option value="VISITOR">방문자명</option>
</select>
<div css={selectDivStyles}>
<select id="data" onChange={(e) => onChangeSelectHandler(e)}>
<option value="COMPANY">입주사명</option>
<option value="VISITOR">방문자명</option>
</select>
<Down />
</div>
<input
type="text"
placeholder={
Expand Down Expand Up @@ -91,6 +95,17 @@ const container = css`
}
`;

const selectDivStyles = css`
display: flex;
justify-content: space-between;
align-items: center;
height: 44px;
border-radius: 8px;
border: 1px solid ${theme.palette.greyscale.grey30};
padding: 011px;
word-break: keep-all;
`;

const searchForm = css`
display: flex;
align-items: center;
Expand All @@ -104,6 +119,27 @@ const searchForm = css`
padding: 10px 11px;
word-break: keep-all;
}
select {
border: 0; //기본 스타일 제거

-webkit-appearance: none; /* for chrome */

-moz-appearance: none; /*for firefox*/

appearance: none;

box-sizing: border-box; //select 박스의 크기 방식 지정.

background: transparent; //배경색 투명 처리
}

select::-ms-expand {
display: none; /*for IE10,11*/
}

select:focus {
outline: none;
}

input {
width: 290px;
Expand Down
5 changes: 5 additions & 0 deletions src/pages/_document.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ function Document() {
return (
<Html lang="ko">
<Head />
<meta property="og:title" content="오피스너" />
<meta property="og:description" content="편리한 오피스 생활의 시작" />
<meta property="og:url" content="officener.vercel.app" />

<title>Officener</title>
<body>
<Main />
<NextScript />
Expand Down