Skip to content

Commit

Permalink
Merge pull request #134 from DDD-Community/feat/#133
Browse files Browse the repository at this point in the history
Feat/#133
  • Loading branch information
G-hoon authored Jan 7, 2025
2 parents 871a5c2 + 49162f7 commit 4e5c4b5
Show file tree
Hide file tree
Showing 11 changed files with 313 additions and 79 deletions.
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"name": "AlignLab",
"outDir": "out/",
"executableName": "Alignlab",
"icon" : "assets/icons/icon.png"
"icon": "assets/icons/icon.png"
},
"rebuildConfig": {},
"makers": [
Expand All @@ -33,23 +33,23 @@
"name": "AlignLab",
"overwrite": true,
"format": "ULFO",
"icon" : "assets/icons/icon.png"
"icon": "assets/icons/icon.png"
}
}
],
"publishers": [
{
"name": "@electron-forge/publisher-github",
"config": {
"repository": {
"owner": "DDD-Community",
"name": "DDD-11-HERO-WEB"
},
"draft": false,
"prerelease": false
{
"name": "@electron-forge/publisher-github",
"config": {
"repository": {
"owner": "DDD-Community",
"name": "DDD-11-HERO-WEB"
},
"draft": false,
"prerelease": false
}
}
}
]
]
}
},
"scripts": {
Expand All @@ -63,7 +63,6 @@
"electron:preview": "yarn build && tsc -p tsconfig.electron.json && PREVIEW= electron .",
"electron:build": "tsc && yarn build && tsc -p tsconfig.electron.json && electron-forge make",
"electron:publish": "tsc && yarn build && tsc -p tsconfig.electron.json && electron-forge publish"

},
"dependencies": {
"@tanstack/react-query": "^5.51.23",
Expand All @@ -78,20 +77,21 @@
"p5": "^1.9.4",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-hot-toast": "^2.5.1",
"react-lottie": "^1.2.4",
"react-router-dom": "^6.8.1",
"react-tailwindcss-datepicker": "^1.7.2",
"socket.io-client": "^4.7.5",
"zustand": "^4.5.5",
"update-electron-app": "3.0.0"
"update-electron-app": "3.0.0",
"zustand": "^4.5.5"
},
"devDependencies": {
"@electron-forge/cli": "^6.0.4",
"@electron-forge/maker-deb": "^6.0.4",
"@electron-forge/maker-dmg": "^6.0.4",
"@electron-forge/maker-rpm": "^6.0.4",
"@electron-forge/maker-squirrel": "^6.0.4",
"@electron-forge/maker-zip": "^6.0.4",
"@electron-forge/maker-dmg": "^6.0.4",
"@electron-forge/publisher-github": "^6.0.4",
"@types/node": "^20.7.1",
"@types/qs": "^6.9.7",
Expand Down
3 changes: 2 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
// dependencies
import { Router } from "@/routes"

import { QueryClient, QueryClientProvider } from "@tanstack/react-query"
import { Toaster } from "react-hot-toast"
import ModalsProvider from "./providers/ModalsProvider"

const queryClient = new QueryClient()

const App = (): React.ReactElement => {
return (
<QueryClientProvider client={queryClient}>
<Toaster position="top-center" />
<ModalsProvider>
<Router />
</ModalsProvider>
Expand Down
43 changes: 43 additions & 0 deletions src/api/crewCheer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
import axiosInstance from "./axiosInstance"

interface MyCheerUpInfoResData {
data: {
countCheeredUp: number
cheeredUpUids: number[]
}
}

interface ReportResData {
data: {
id: number
uid: number
email: string
type: string
title: string
content: string
createdAt: string
modifiedAt: string
}
}

interface SendCrewCheerParam {
uids: number[]
}

export const requestSendCrewCheer = async (param: SendCrewCheerParam): Promise<ReportResData> => {
try {
const res = await axiosInstance.post(`/cheer-up`, param)
return res.data
} catch (e) {
throw e
}
}

export const getMyCheerUpInfo = async (date: string): Promise<MyCheerUpInfoResData> => {
try {
const res = await axiosInstance.get(`/cheer-up/me?cheeredAt=${date}`)
return res.data
} catch (e) {
throw e
}
}
12 changes: 12 additions & 0 deletions src/assets/icons/crew-cheer-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/icons/crew-cheer-my-count-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions src/assets/icons/crew-cheer-x-icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 4e5c4b5

Please sign in to comment.