Skip to content

Commit

Permalink
Merge branch 'jooy2:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
lnrdnl authored Sep 4, 2024
2 parents c5e378d + 43d8aac commit 2f4aeca
Show file tree
Hide file tree
Showing 22 changed files with 2,239 additions and 1,336 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/app-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ on:
jobs:
app-test:
runs-on: ${{ matrix.os }}
name: Test NodeJS ${{ matrix.node_version }} on ${{ matrix.os }}
name: Test Node.js ${{ matrix.node_version }} on ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
Expand All @@ -35,7 +35,7 @@ jobs:
run: |
sudo apt install -y -q --no-install-recommends xvfb
- name: Setup NodeJS ${{ matrix.node_version }}
- name: Setup Node.js ${{ matrix.node_version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node_version }}
Expand Down
24 changes: 1 addition & 23 deletions .github/workflows/documents.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ jobs:
with:
node-version: '22'

# copy and replace string index.md file
# - name: Copy and replace string index.md file
# run: cp ../README.md ./src/index.md
# - name: Copy image asset (logo)
# run: cp ../src/renderer/public/images/vutron-logo.webp ./src/public
# - name: Copy image asset (sample)
# run: cp ../.github/resources/vutron-sample.webp ./src/public

# cache node_modules
- name: Cache dependencies
uses: actions/cache@v4
Expand All @@ -52,20 +44,6 @@ jobs:
if: steps.npm-cache.outputs.cache-hit != 'true'
run: npm install

# - name: Find and Replace (logo)
# uses: jacobtomlinson/gha-find-replace@v3
# with:
# find: "src/renderer/public/images/vutron-logo.webp"
# replace: "public/vutron-logo.webp"
# regex: false
#
# - name: Find and Replace (sample)
# uses: jacobtomlinson/gha-find-replace@v3
# with:
# find: ".github/resources/vutron-sample.webp"
# replace: "public/vutron-sample.webp"
# regex: false

# run build script
- name: Build VitePress site
run: npm run build
Expand All @@ -80,7 +58,7 @@ jobs:
# deploy the default output dir of VitePress
build_dir: docs/dist
jekyll: false
fqdn: 'vutron.jooy2.com'
fqdn: 'vutron.cdget.com'
env:
# @see https://docs.github.com/en/actions/reference/authentication-in-a-workflow#about-the-github_token-secret
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# .gitignore for NodeJS Projects
# .gitignore for Node.js Projects
# ---------- Start of common ignore files

# Node artifact files
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ This Code of Conduct applies within all community spaces, and also applies when

## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at https://jooy2.com/contact. All complaints will be reviewed and investigated promptly and fairly.
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at https://cdget.com/contact. All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the reporter of any incident.

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022-2024 jooy2 <jooy2.contact@gmail.com> (https://jooy2.com).
Copyright (c) 2022-2024 CDGet <jooy2.contact@gmail.com> (https://cdget.com).

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
6 changes: 3 additions & 3 deletions README.ko-KR.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
- ⚡️ Pinia 스토어를 활용한 글로벌 상태 관리
- ⚡️ GitHub 커뮤니티와 공식 문서를 통한 프로젝트 기술지원

## [문서 (설치 및 시작하기)](https://vutron.jooy2.com/installation-and-build/getting-started)
## [문서 (설치 및 시작하기)](https://vutron.cdget.com/installation-and-build/getting-started)

자세한 설치 방법이나 기본적인 템플릿 사용 방법에 대한 전체 문서를 참고하려면 다음 문서 페이지를 방문하세요: https://vutron.jooy2.com/installation-and-build/getting-started
자세한 설치 방법이나 기본적인 템플릿 사용 방법에 대한 전체 문서를 참고하려면 다음 문서 페이지를 방문하세요: https://vutron.cdget.com/installation-and-build/getting-started

## 기여

[GitHub Issue](https://github.com/jooy2/vutron/issues) 페이지를 통해 문제를 보고할 수 있습니다. 또한 자주 사용될 만한 기능이나 버그 수정에 대해 Pull Request를 보내주실 수 있습니다.

## 라이선스

Copyright © 2022-2024 [Jooy2](https://jooy2.com) <[jooy2.contact@gmail.com](mailto:jooy2.contact@gmail.com)> Released under the MIT license.
Copyright © 2022-2024 [CDGet](https://cdget.com) <[jooy2.contact@gmail.com](mailto:jooy2.contact@gmail.com)> Released under the MIT license.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@ Quick Start Templates for **[Vite](https://vitejs.dev)** + **[Vue 3](https://vue
- ⚡️ Global state management through the Pinia store
- ⚡️ Quick support through the GitHub community and official documentation

## [Documentation (Getting Started)](https://vutron.jooy2.com/installation-and-build/getting-started)
## [Documentation (Getting Started)](https://vutron.cdget.com/installation-and-build/getting-started)

For complete documentation including installation instructions and basic usage, please refer to each item in the link below: https://vutron.jooy2.com/installation-and-build/getting-started
For complete documentation including installation instructions and basic usage, please refer to each item in the link below: https://vutron.cdget.com/installation-and-build/getting-started

## Contribute

You can report issues on [GitHub Issue](https://github.com/jooy2/vutron/issues). You can also request a pull to fix bugs and add frequently used features.

## License

Copyright © 2022-2024 [Jooy2](https://jooy2.com) <[jooy2.contact@gmail.com](mailto:jooy2.contact@gmail.com)> Released under the MIT license.
Copyright © 2022-2024 [CDGet](https://cdget.com) <[jooy2.contact@gmail.com](mailto:jooy2.contact@gmail.com)> Released under the MIT license.
6 changes: 3 additions & 3 deletions README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,14 @@
- ⚡️ 通过 Pinia 存储进行全局状态管理
- ⚡️ 通过 GitHub 社区和官方文档提供快速支持

## [文档(入门指南)](https://vutron.jooy2.com/installation-and-build/getting-started)
## [文档(入门指南)](https://vutron.cdget.com/installation-and-build/getting-started)

完整的文档,包括安装说明和基本使用方法,请参阅以下链接的每个项目:https://vutron.jooy2.com/installation-and-build/getting-started
完整的文档,包括安装说明和基本使用方法,请参阅以下链接的每个项目:https://vutron.cdget.com/installation-and-build/getting-started

## 贡献

您可以在 [GitHub 问题页面](https://github.com/jooy2/vutron/issues) 上报告问题。您还可以请求拉取请求,修复错误并添加常用功能。

## 许可证

版权所有 © 2022-2024 [Jooy2](https://jooy2.com) <[jooy2.contact@gmail.com](mailto:jooy2.contact@gmail.com)>,根据 MIT 许可证发布。
版权所有 © 2022-2024 [CDGet](https://cdget.com) <[jooy2.contact@gmail.com](mailto:jooy2.contact@gmail.com)>,根据 MIT 许可证发布。
7 changes: 4 additions & 3 deletions buildAssets/builder/config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* eslint-disable no-template-curly-in-string */
const dotenv = require('dotenv')
const packageJson = require('../../package.json')

const baseConfig = {
productName: 'Vutron',
appId: 'com.vutron.vutron',
productName: packageJson.name,
appId: packageJson.appId,
asar: true,
extends: null,
compression: 'maximum',
Expand Down Expand Up @@ -69,7 +70,7 @@ const baseConfig = {
oneClick: true
},
linux: {
executableName: 'vutron',
executableName: packageJson.name.toLowerCase(),
icon: 'buildAssets/icons',
category: 'Utility',
target: [
Expand Down
Loading

0 comments on commit 2f4aeca

Please sign in to comment.