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.

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

[Feature] 인증에 따른 UI 변경사항 적용 및 공통 컴포넌트 구현 #23

Merged
merged 27 commits into from
Jun 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
f4344ec
feat: 헤더 전용 서치박스 컴포넌트 구현
cobocho Jun 13, 2024
b17b5fc
feat: `Header` 컴포넌트 구현
cobocho Jun 14, 2024
b045349
style: 스토리북 경로 분리
cobocho Jun 14, 2024
b95e80d
feat: `Select` 컴포넌트 구현
cobocho Jun 14, 2024
c5e5e3e
feat: 아이콘 업데이트
cobocho Jun 14, 2024
01e7115
feat: 사이드바 프로필 구현
cobocho Jun 14, 2024
65242a1
feat: 아코디언 컴포넌트 구현
cobocho Jun 14, 2024
2094b3d
feat: 사이드바 및 헤더 UI 구현
cobocho Jun 14, 2024
6ced460
feat: `Select` 컴포넌트명 `Dropbox`로 변경
cobocho Jun 14, 2024
be5b478
feat: 커먼 컴포넌트 리팩토링
cobocho Jun 14, 2024
cfe3e1a
feat: 유저 수정 Form 구현
cobocho Jun 14, 2024
1575d9a
refactor: 커먼 컴포넌트 props 개선
cobocho Jun 14, 2024
dfefce2
test: input 타입 변경에 따른 테스트코드 수정
cobocho Jun 14, 2024
1e00f26
design: 푸터 레이아웃 수정
cobocho Jun 14, 2024
1cf5b2d
feat: 모달 컴포넌트 구현
cobocho Jun 14, 2024
5799de3
test: 테스트코드 일부 리팩토링
cobocho Jun 14, 2024
9d8f1bb
refactor: API 인터페이스 리팩토링
cobocho Jun 14, 2024
80e3887
feat: 계정 탈퇴 로직 구현
cobocho Jun 14, 2024
4dc672c
feat: 계정 수정 로직 구현
cobocho Jun 15, 2024
ecf0162
refactor: API 생성 빌더 추가
cobocho Jun 15, 2024
f7b5b69
fix: MSW 수정 및 쿼리 수정사항 반영
cobocho Jun 15, 2024
c44a545
feat: `SilentRefresh` 컴포넌트 구현
cobocho Jun 15, 2024
a969dc9
design: 레이아웃 오류 수정
cobocho Jun 15, 2024
9dfca15
fix: 드랍박스 애니메이션 및 로직 수정
cobocho Jun 15, 2024
b66a2b3
design: 사이드바 UI 애니메이션 수정
cobocho Jun 15, 2024
e34ae3d
feat: 로그아웃 기능 구현
cobocho Jun 15, 2024
0763d60
feat: 스토리북 업데이트
cobocho Jun 17, 2024
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
4 changes: 2 additions & 2 deletions apps/extension/hooks/useSearch/useSearch.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useQuery } from '@tanstack/react-query'
import { serchQueryOptions, type SearchResponse } from '@vook-client/api'
import { searchQueryOptions, type SearchResponse } from '@vook-client/api'
import {
pipe,
take,
Expand Down Expand Up @@ -45,7 +45,7 @@ export const getTailText = (terms: string[]) =>

export const useSearch = ({ selectedText }: UseSearchProps) => {
const query = useQuery({
...serchQueryOptions.get({
...searchQueryOptions.search({
query: `${selectedText}`,
withFormat: true,
highlightPreTag: '<strong>',
Expand Down
1 change: 1 addition & 0 deletions apps/web/.env.development
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
NEXT_PUBLIC_DOMAIN=http://localhost:3000
NEXT_PUBLIC_API_URL=https://dev.vook-api.seungyeop-lee.com
NEXT_PUBLIC_GOOGLE_LOGIN_URL=https://dev.vook-api.seungyeop-lee.com/oauth2/authorization/google
NEXT_PUBLIC_MSW=enable
3 changes: 3 additions & 0 deletions apps/web/.env.production
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
NEXT_PUBLIC_DOMAIN=http://localhost:3000
NEXT_PUBLIC_API_URL=https://dev.vook-api.seungyeop-lee.com
NEXT_PUBLIC_GOOGLE_LOGIN_URL=https://dev.vook-api.seungyeop-lee.com/oauth2/authorization/google
19 changes: 18 additions & 1 deletion apps/web/next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,24 @@ const nextConfig = {
styledComponents: true,
},
output: 'standalone',
webpack(config, { nextRuntime, webpack }) {
experimental: {
instrumentationHook: true,
},
webpack(config, { nextRuntime, webpack, isServer }) {
if (isServer) {
if (Array.isArray(config.resolve.alias)) {
config.resolve.alias.push({ name: 'msw/browser', alias: false })
} else {
config.resolve.alias['msw/browser'] = false
}
} else {
if (Array.isArray(config.resolve.alias)) {
config.resolve.alias.push({ name: 'msw/node', alias: false })
} else {
config.resolve.alias['msw/node'] = false
}
}

if (!nextRuntime) {
config.plugins.push(
new webpack.BannerPlugin({
Expand Down
7 changes: 6 additions & 1 deletion apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,10 @@
"jsdom": "^24.0.0",
"msw": "^2.3.1",
"vitest": "^1.5.2"
},
"msw": {
"workerDirectory": [
"public"
]
}
}
}
284 changes: 284 additions & 0 deletions apps/web/public/mockServiceWorker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,284 @@
/* eslint-disable */
/* tslint:disable */

/**
* Mock Service Worker.
* @see https://github.com/mswjs/msw
* - Please do NOT modify this file.
* - Please do NOT serve this file on production.
*/

const PACKAGE_VERSION = '2.3.1'
const INTEGRITY_CHECKSUM = '26357c79639bfa20d64c0efca2a87423'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

self.addEventListener('install', function () {
self.skipWaiting()
})

self.addEventListener('activate', function (event) {
event.waitUntil(self.clients.claim())
})

self.addEventListener('message', async function (event) {
const clientId = event.source.id

if (!clientId || !self.clients) {
return
}

const client = await self.clients.get(clientId)

if (!client) {
return
}

const allClients = await self.clients.matchAll({
type: 'window',
})

switch (event.data) {
case 'KEEPALIVE_REQUEST': {
sendToClient(client, {
type: 'KEEPALIVE_RESPONSE',
})
break
}

case 'INTEGRITY_CHECK_REQUEST': {
sendToClient(client, {
type: 'INTEGRITY_CHECK_RESPONSE',
payload: {
packageVersion: PACKAGE_VERSION,
checksum: INTEGRITY_CHECKSUM,
},
})
break
}

case 'MOCK_ACTIVATE': {
activeClientIds.add(clientId)

sendToClient(client, {
type: 'MOCKING_ENABLED',
payload: true,
})
break
}

case 'MOCK_DEACTIVATE': {
activeClientIds.delete(clientId)
break
}

case 'CLIENT_CLOSED': {
activeClientIds.delete(clientId)

const remainingClients = allClients.filter((client) => {
return client.id !== clientId
})

// Unregister itself when there are no more clients
if (remainingClients.length === 0) {
self.registration.unregister()
}

break
}
}
})

self.addEventListener('fetch', function (event) {
const { request } = event

// Bypass navigation requests.
if (request.mode === 'navigate') {
return
}

// Opening the DevTools triggers the "only-if-cached" request
// that cannot be handled by the worker. Bypass such requests.
if (request.cache === 'only-if-cached' && request.mode !== 'same-origin') {
return
}

// Bypass all requests when there are no active clients.
// Prevents the self-unregistered worked from handling requests
// after it's been deleted (still remains active until the next reload).
if (activeClientIds.size === 0) {
return
}

// Generate unique request ID.
const requestId = crypto.randomUUID()
event.respondWith(handleRequest(event, requestId))
})

async function handleRequest(event, requestId) {
const client = await resolveMainClient(event)
const response = await getResponse(event, client, requestId)

// Send back the response clone for the "response:*" life-cycle events.
// Ensure MSW is active and ready to handle the message, otherwise
// this message will pend indefinitely.
if (client && activeClientIds.has(client.id)) {
;(async function () {
const responseClone = response.clone()

sendToClient(
client,
{
type: 'RESPONSE',
payload: {
requestId,
isMockedResponse: IS_MOCKED_RESPONSE in response,
type: responseClone.type,
status: responseClone.status,
statusText: responseClone.statusText,
body: responseClone.body,
headers: Object.fromEntries(responseClone.headers.entries()),
},
},
[responseClone.body],
)
})()
}

return response
}

// Resolve the main client for the given event.
// Client that issues a request doesn't necessarily equal the client
// that registered the worker. It's with the latter the worker should
// communicate with during the response resolving phase.
async function resolveMainClient(event) {
const client = await self.clients.get(event.clientId)

if (client?.frameType === 'top-level') {
return client
}

const allClients = await self.clients.matchAll({
type: 'window',
})

return allClients
.filter((client) => {
// Get only those clients that are currently visible.
return client.visibilityState === 'visible'
})
.find((client) => {
// Find the client ID that's recorded in the
// set of clients that have registered the worker.
return activeClientIds.has(client.id)
})
}

async function getResponse(event, client, requestId) {
const { request } = event

// Clone the request because it might've been already used
// (i.e. its body has been read and sent to the client).
const requestClone = request.clone()

function passthrough() {
const headers = Object.fromEntries(requestClone.headers.entries())

// Remove internal MSW request header so the passthrough request
// complies with any potential CORS preflight checks on the server.
// Some servers forbid unknown request headers.
delete headers['x-msw-intention']

return fetch(requestClone, { headers })
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough()
}

// Bypass initial page load requests (i.e. static assets).
// The absence of the immediate/parent client in the map of the active clients
// means that MSW hasn't dispatched the "MOCK_ACTIVATE" event yet
// and is not ready to handle requests.
if (!activeClientIds.has(client.id)) {
return passthrough()
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer()
const clientMessage = await sendToClient(
client,
{
type: 'REQUEST',
payload: {
id: requestId,
url: request.url,
mode: request.mode,
method: request.method,
headers: Object.fromEntries(request.headers.entries()),
cache: request.cache,
credentials: request.credentials,
destination: request.destination,
integrity: request.integrity,
redirect: request.redirect,
referrer: request.referrer,
referrerPolicy: request.referrerPolicy,
body: requestBuffer,
keepalive: request.keepalive,
},
},
[requestBuffer],
)

switch (clientMessage.type) {
case 'MOCK_RESPONSE': {
return respondWithMock(clientMessage.data)
}

case 'PASSTHROUGH': {
return passthrough()
}
}

return passthrough()
}

function sendToClient(client, message, transferrables = []) {
return new Promise((resolve, reject) => {
const channel = new MessageChannel()

channel.port1.onmessage = (event) => {
if (event.data && event.data.error) {
return reject(event.data.error)
}

resolve(event.data)
}

client.postMessage(
message,
[channel.port2].concat(transferrables.filter(Boolean)),
)
})
}

async function respondWithMock(response) {
// Setting response status code to 0 is a no-op.
// However, when responding with a "Response.error()", the produced Response
// instance will have status code set to 0. Since it's not possible to create
// a Response instance with status code 0, handle that use-case separately.
if (response.status === 0) {
return Response.error()
}

const mockedResponse = new Response(response.body, response)

Reflect.defineProperty(mockedResponse, IS_MOCKED_RESPONSE, {
value: true,
enumerable: true,
})

return mockedResponse
}
4 changes: 1 addition & 3 deletions apps/web/setupTests.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import '@testing-library/jest-dom'
import { handlers } from '@vook-client/api'
import { setupServer } from 'msw/node'
import { cleanup } from '@testing-library/react'
import { afterEach } from 'vitest'

const mswServer = setupServer(...handlers)
import { mswServer } from './src/mock/node'

vi.mock('next/font/local', () => {
return {
Expand Down
10 changes: 9 additions & 1 deletion apps/web/src/app/(afterLogin)/layout.css.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,15 @@
import { style } from '@vanilla-extract/css'

import { SIDE_BAR_WIDTH } from '@/styles/layout'
import { HEADER_HEIGHT, SIDE_BAR_WIDTH } from '@/styles/layout'

export const mainArea = style({
position: 'relative',

minHeight: `calc(100vh - ${HEADER_HEIGHT}px)`,

padding: 40,
paddingBottom: 400,

marginTop: HEADER_HEIGHT,
marginLeft: SIDE_BAR_WIDTH,
})
Loading
Loading