Skip to content

Commit

Permalink
Merge branch 'dev' into 19-feat-create-login-page
Browse files Browse the repository at this point in the history
  • Loading branch information
NamgungJongMin authored Jan 8, 2024
2 parents 37fbdbb + eb5326c commit 5997870
Show file tree
Hide file tree
Showing 122 changed files with 7,690 additions and 535 deletions.
2,332 changes: 1,896 additions & 436 deletions package-lock.json

Large diffs are not rendered by default.

Binary file added public/mapIconHome.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
189 changes: 112 additions & 77 deletions public/mockServiceWorker.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,113 +8,124 @@
* - Please do NOT serve this file on production.
*/

const INTEGRITY_CHECKSUM = "c5f7f8e188b673ea4e677df7ea3c5a39";
const IS_MOCKED_RESPONSE = Symbol("isMockedResponse");
const activeClientIds = new Set();
const INTEGRITY_CHECKSUM = 'c5f7f8e188b673ea4e677df7ea3c5a39'
const IS_MOCKED_RESPONSE = Symbol('isMockedResponse')
const activeClientIds = new Set()

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

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

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

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

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

if (!client) {
return;
return
}

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

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

case "INTEGRITY_CHECK_REQUEST": {
case 'INTEGRITY_CHECK_REQUEST': {
sendToClient(client, {
type: "INTEGRITY_CHECK_RESPONSE",
type: 'INTEGRITY_CHECK_RESPONSE',
payload: INTEGRITY_CHECKSUM,
});
break;
})
break
}

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

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

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

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

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

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

break;
break
}
}
});
})

self.addEventListener("fetch", function (event) {
const { request } = event;
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;
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);
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();
;(async function () {
const responseClone = response.clone()

sendToClient(
client,
{
type: "RESPONSE",
type: 'RESPONSE',
payload: {
requestId,
isMockedResponse: IS_MOCKED_RESPONSE in response,
Expand All @@ -126,64 +137,84 @@ async function handleRequest(event, requestId) {
},
},
[responseClone.body],
);
})();
)
})()
}

return response;
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);
const client = await self.clients.get(event.clientId)

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

const allClients = await self.clients.matchAll({
type: "window",
});
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;
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());
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 });
return fetch(requestClone, { headers })
}

// Bypass mocking when the client is not active.
if (!client) {
return passthrough();
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();
return passthrough()
}

// Bypass requests with the explicit bypass header.
// Such requests can be issued by "ctx.fetch()".
const mswIntention = request.headers.get("x-msw-intention");
if (["bypass", "passthrough"].includes(mswIntention)) {
return passthrough();
}

// Notify the client that a request has been intercepted.
const requestBuffer = await request.arrayBuffer();
const clientMessage = await sendToClient(
client,
{
type: "REQUEST",
type: 'REQUEST',
payload: {
id: requestId,
url: request.url,
Expand All @@ -202,51 +233,55 @@ async function getResponse(event, client, requestId) {
},
},
[requestBuffer],
);
)

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

case "MOCK_NOT_FOUND": {
return passthrough();
case 'MOCK_NOT_FOUND': {
return passthrough()
}
}

return passthrough();
return passthrough()
}

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

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

resolve(event.data);
};
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();
return Response.error()
}

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

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

return mockedResponse;
return mockedResponse
}
Binary file added public/tripVoteLogoHome.png
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/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions src/assets/ic_vote.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions src/assets/plus.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 14 additions & 0 deletions src/components/Alarm/Back/Back.module.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
@use "@/sass" as *;

.container {
width: 100%;
padding: 16px 20px;

&__button {
display: flex;
flex-direction: row;
align-items: center;
gap: 12px;
@include typography(button);
}
}
20 changes: 20 additions & 0 deletions src/components/Alarm/Back/Back.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { AiOutlineLeft } from "react-icons/ai";

import styles from "./Back.module.scss";

import useGoBack from "@/hooks/useGoBack";
function Back() {
const goBack = useGoBack();
return (
<div className={styles.container}>
<button onClick={goBack} className={styles.container__button}>
<div>
<AiOutlineLeft />
</div>
<p>알림</p>
</button>
</div>
);
}

export default Back;
Loading

0 comments on commit 5997870

Please sign in to comment.