Skip to content

Commit 562e697

Browse files
authored
Merge pull request #377 from kookmin-sw/frontend/develop
[Merge] frontend/develop -> master
2 parents 4da8988 + 4e8908f commit 562e697

67 files changed

Lines changed: 3445 additions & 1211 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: Deploy Frontend to Vercel
2+
3+
on:
4+
push:
5+
branches:
6+
- frontend/develop
7+
paths:
8+
- "frontend/**"
9+
- ".github/workflows/deploy-frontend.yml"
10+
11+
jobs:
12+
sync-to-fork:
13+
name: Sync frontend/develop to Vercel fork
14+
runs-on: ubuntu-latest
15+
16+
steps:
17+
- name: Checkout frontend/develop
18+
uses: actions/checkout@v4
19+
with:
20+
token: ${{ secrets.SINJI_DEPLOY_TOKEN }}
21+
fetch-depth: 0
22+
ref: frontend/develop
23+
24+
- name: Push to Vercel fork
25+
run: |
26+
git remote add vercel-fork https://sinji2102:${{ secrets.SINJI_DEPLOY_TOKEN }}@github.com/sinji2102/2026-capstone-09
27+
git config user.name sinji2102
28+
git config user.email sinji.3010@gmail.com
29+
git push -f vercel-fork frontend/develop:frontend/develop
30+
31+
- name: Clean up
32+
run: |
33+
git remote remove vercel-fork

extension/.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
node_modules/
22
dist/
33
.env
4-
.env.production
4+
.env.production
5+
6+
flowmeet-extension.zip

extension/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"name": "FlowMeet",
44
"version": "1.0.0",
55
"description": "Google Meet 회의를 FlowMeet과 자동으로 연동합니다",
6-
"permissions": ["storage", "alarms", "tabs"],
6+
"permissions": ["storage", "alarms"],
77
"host_permissions": [
88
"https://meet.google.com/*",
99
"https://api.flowmeet.kr/*",

frontend/package.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "flowmeet",
3-
"version": "0.2.3",
3+
"version": "1.0.0",
44
"private": true,
55
"main": "electron/main.cjs",
66
"scripts": {
@@ -21,8 +21,7 @@
2121
"files": [
2222
"electron/**/*"
2323
],
24-
"icon": "assets/icon"
25-
,
24+
"icon": "assets/icon",
2625
"publish": {
2726
"provider": "github",
2827
"owner": "kookmin-sw",
@@ -31,7 +30,10 @@
3130
},
3231
"mac": {
3332
"category": "public.app-category.productivity",
34-
"target": ["dmg", "zip"]
33+
"target": [
34+
"dmg",
35+
"zip"
36+
]
3537
},
3638
"win": {
3739
"target": "nsis"
@@ -48,6 +50,7 @@
4850
"@tanstack/react-query-devtools": "^5.100.9",
4951
"@tiptap/core": "^3.22.4",
5052
"@tiptap/extension-collaboration": "^3.20.1",
53+
"@tiptap/extension-image": "^3.20.1",
5154
"@tiptap/extensions": "^3.20.4",
5255
"@tiptap/react": "^3.20.1",
5356
"@tiptap/starter-kit": "^3.20.1",
@@ -68,7 +71,9 @@
6871
"react": "19.2.3",
6972
"react-dom": "19.2.3",
7073
"react-hook-form": "^7.74.0",
74+
"react-markdown": "^10.1.0",
7175
"reactflow": "^11.11.4",
76+
"remark-gfm": "^4.0.1",
7277
"tailwind-merge": "^3.5.0",
7378
"tiptap-markdown": "^0.9.0",
7479
"use-debounce": "^10.1.1",

0 commit comments

Comments
 (0)