Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
05fc98e
feat: 일렉트론 개발 구조 잡기 및 설정파일 구성
10tacion May 1, 2025
d8b78ce
feat: 최신 develop 사항 반영
10tacion May 3, 2025
91beee1
feat: 일렉트론 리다렉트 테스팅 추가
10tacion May 3, 2025
089c32f
feat: hashRouter로 변경 및 electron 로그인 인증 관련 로직 추가
10tacion May 6, 2025
a4fdb6b
feat: electron blocking 시스템 알림 추가
10tacion May 7, 2025
d84e4c6
feat: 시스템 알림에서 허용서비스 추가 로직 작성
10tacion May 7, 2025
99d5b79
fix: url 비교 로직 수정
10tacion May 7, 2025
1a7d484
fix: 모니터링 로직에서 허용서비스 없을 경우 아무 사이트도 접속 불가하도록 로직 수정
10tacion May 7, 2025
971fa1b
feat: mac os 종료 처리 hide로 대체
10tacion May 7, 2025
6470281
feat: 허용 서비스 추가 시 타이머 재시작 하도록 콜백 추가
10tacion May 7, 2025
1535e23
feat: mac os notarize 추가
10tacion May 8, 2025
3e826c4
feat: 로그아웃 시 authWindow 종료하고 mainWindow가 실행되게 로직 추가
10tacion May 8, 2025
63e3d9b
fix: 온보딩 로직 오류 수정
10tacion May 8, 2025
433d2e7
feat: hide 했다가 다시 restore 할 때 깜박이는 현상 최적화
10tacion May 8, 2025
2f712a5
feat: 브라우저의 새탭일 경우 모니터링 제외
10tacion May 10, 2025
b2b602d
feat: #320 onboarding QA pr 반영
10tacion May 10, 2025
5431e8d
feat: shared QA 사항 반영
10tacion May 10, 2025
8eebdee
feat: #319 허용서비스 최종 QA 반영
10tacion May 10, 2025
5c8ee40
feat: 타이머 캐러셀 QA 반영
10tacion May 10, 2025
ee73216
feat: #321 타이머 나머지 QA 사항 반영
10tacion May 10, 2025
815398a
feat: #321 홈 QA 사항 반영
10tacion May 10, 2025
d9309d0
chore: 개발서버 포트 번호 5173으로 해결
10tacion May 10, 2025
c79aef1
feat: 토큰 재발급 로직 바뀐 형식에 맞추어 수정
10tacion May 10, 2025
5eeeb03
feat: 화면 해상도 조정 및 개발자 도구 여는 상황 방지
10tacion May 10, 2025
01c8534
feat: truncate 설정
10tacion May 10, 2025
238cb3b
feat: 자동으로 줌 되는 현상 방지, 전체 화면에서 x 눌렀을 때 검정 화면 방지
10tacion May 10, 2025
83b9de1
feat: 타이머에서 선택된 할 일이 없을 경우 처리 로직 추가
10tacion May 10, 2025
9af821b
feat: 타이머에서 선택된 할 일이 없을 경우 시스템 알림 로직 추가
10tacion May 10, 2025
31bf1b0
feat: throwOnError를 통해서 에러 객체를 감지하게 설정
10tacion May 11, 2025
d284151
Merge origin/develop (keep feature contents)
10tacion Jul 9, 2025
9085373
feat: packages.json에서 코어팩 사용으로 명시된 필드 삭제 pnpm 버전 명시
10tacion Jul 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 2 additions & 9 deletions .github/workflows/pr-build-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:

- name: Install pnpm
uses: pnpm/action-setup@v4
with:
version: 9

- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
Expand All @@ -26,14 +28,5 @@ jobs:
- name: Install dependencies
run: pnpm install

- name: Clear TypeScript build info
run: |
echo "TypeScript 빌드 캐시 삭제"
rm -rf node_modules/.tmp
rm -rf node_modules/.cache

- name: Check TypeScript compilation
run: pnpm tsc -b

- name: Build project
run: pnpm run build
25 changes: 25 additions & 0 deletions build/entitlements.mac.plist
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<!-- Allows Just-In-Time compilation required by V8 JavaScript engine in Electron -->
<key>com.apple.security.cs.allow-jit</key>
<true/>

<!-- This is needed for the V8 JavaScript engine to function properly -->
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>

<!-- Allows network connections -->
<key>com.apple.security.network.client</key>
<true/>

<!-- Uncomment to allow read and write access to files explicitly selected by the user through system dialogs -->
<!-- <key>com.apple.security.files.user-selected.read-write</key>
<true/> -->

<!-- Uncomment to allow read and write access to the user's Downloads directory -->
<!-- <key>com.apple.security.files.downloads.read-write</key>
<true/> -->
</dict>
</plist>
28 changes: 28 additions & 0 deletions electron-builder.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"appId": "com.morib.client",
"productName": "Morib",
"icon": "public/logo_icon.png",
"files": [
"dist-react",
"dist-electron"
],
"extraResources": [
"dist-electron/preload.cjs"
],
"mac": {
"target": ["dmg"],
"hardenedRuntime": true,
"gatekeeperAssess": false,
"entitlements": "build/entitlements.mac.plist",
"entitlementsInherit": "build/entitlements.mac.plist",
"notarize": true
},
"afterSign": "scripts/notarize.cjs",
"linux": {
"target": "AppImage",
"category": "Utility"
},
"win": {
"target": ["portable","msi"]
}
}
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@
<div id="overlay"></div>
<div id="modal"></div>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
<script type="module" src="/src/app/main.tsx"></script>
</body>
</html>
31 changes: 27 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,31 @@
{
"name": "morib-client",
"name": "Morib",
"description": "Your complete immersion space. Morib",
"author": {
"name": "Morib",
"email": "morib0615@gmail.com",
"url": "https://morib.in"
},
"private": true,
"version": "0.0.0",
"type": "module",
"main": "dist-electron/main.js",
"scripts": {
"dev": "vite",
"dev": "pnpm dev:react & pnpm dev:electron",
"dev:react": "vite",
"dev:electron": "pnpm transpile:electron && cross-env NODE_ENV=development electron .",
"build": "tsc -b && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
"preview": "vite preview",
"transpile:electron": "tsc --project src/electron/tsconfig.json",
"dist:mac": "pnpm transpile:electron && pnpm build && electron-builder --mac --arm64",
"dist:mac:intel": "pnpm transpile:electron && pnpm build && electron-builder --mac --x64",
"dist:mac:universal": "pnpm transpile:electron && pnpm build && electron-builder --mac --universal",
"dist:mac:notarize": "./scripts/build-mac.sh",
"dist:mac:intel:notarize": "./scripts/build-mac-intel.sh",
"dist:mac:universal:notarize": "./scripts/build-mac-universal.sh",
"dist:win": "pnpm transpile:electron && pnpm build && electron-builder --win --x64",
"dist:linux": "pnpm transpile:electron && pnpm build && electron-builder --linux --x64"
},
"dependencies": {
"@remix-run/router": "^1.17.0",
Expand Down Expand Up @@ -39,6 +57,9 @@
"@typescript-eslint/parser": "^7.14.1",
"@vitejs/plugin-react-swc": "^3.7.0",
"autoprefixer": "^10.4.19",
"cross-env": "^7.0.3",
"electron": "^35.1.5",
"electron-builder": "^26.0.12",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-jsx-a11y": "^6.9.0",
Expand All @@ -60,5 +81,7 @@
"public"
]
},
"packageManager": "pnpm@9.15.4+sha512.b2dc20e2fc72b3e18848459b37359a32064663e5627a51e4c74b2c29dd8e8e0491483c3abb40789cfd578bf362fb6ba8261b05f0387d76792ed6e23ea3b1b6a0"
"engines": {
"pnpm": "9"
}
}
Loading