whai/cherry-studio
1
1
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
denislov 2025-02-12 00:39:50 +08:00
parent a0cfe7df4a
commit d958f8d31f
8 changed files with 448 additions and 449 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -117,7 +117,8 @@ For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIB
Thank you for your support and contributions! Thank you for your support and contributions!
## Related Projects ## Related Projects
* [one-api](https://github.com/songquanpeng/one-api):LLM API management and distribution system, supporting mainstream models like OpenAI, Azure, and Anthropic. Features unified API interface, suitable for key management and secondary distribution.
- [one-api](https://github.com/songquanpeng/one-api):LLM API management and distribution system, supporting mainstream models like OpenAI, Azure, and Anthropic. Features unified API interface, suitable for key management and secondary distribution.
# 🚀 Contributors # 🚀 Contributors

3
docs/README.ja.md
View File

@ -118,7 +118,8 @@ Cherry Studioへの貢献を歓迎します！以下の方法で貢献できま
ご支援と貢献に感謝します！ ご支援と貢献に感謝します！
## 関連頁版 ## 関連頁版
* [one-api](https://github.com/songquanpeng/one-api):LLM APIの管理・配信システム。OpenAI、Azure、Anthropicなどの主要モデルに対応し、統一APIインターフェースを提供。APIキー管理と再配布に利用可能。
- [one-api](https://github.com/songquanpeng/one-api):LLM APIの管理・配信システム。OpenAI、Azure、Anthropicなどの主要モデルに対応し、統一APIインターフェースを提供。APIキー管理と再配布に利用可能。
# 🚀 コントリビューター # 🚀 コントリビューター

3
docs/README.zh.md
View File

@ -118,7 +118,8 @@ $ yarn build:linux
感谢您的支持和贡献！ 感谢您的支持和贡献！
## 相关项目 ## 相关项目
* [one-api](https://github.com/songquanpeng/one-api):LLM API管理及分发系统，支持OpenAI、Azure、Anthropic等主流模型，统一API接口，可用于密钥管理与二次分发。
- [one-api](https://github.com/songquanpeng/one-api):LLM API管理及分发系统，支持OpenAI、Azure、Anthropic等主流模型，统一API接口，可用于密钥管理与二次分发。
# 🚀 贡献者 # 🚀 贡献者

33
resources/cherry-studio/license.html
View File

@ -1,6 +1,5 @@
<!doctype html> <!doctype html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -43,8 +42,9 @@
<p class="mb-4">如有任何问题或需申请商业授权，请联系 Cherry Studio 开发团队。</p> <p class="mb-4">如有任何问题或需申请商业授权，请联系 Cherry Studio 开发团队。</p>
<p> <p>
除上述特定条件外，其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息，请访问 除上述特定条件外，其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息，请访问
<a href="http://www.apache.org/licenses/LICENSE-2.0" <a href="http://www.apache.org/licenses/LICENSE-2.0" class="text-blue-500 underline"
class="text-blue-500 underline">http://www.apache.org/licenses/LICENSE-2.0</a> >http://www.apache.org/licenses/LICENSE-2.0</a
>
</p> </p>
</div> </div>
<h1 class="text-3xl font-bold mb-6 text-center">Cherry Studio License</h1> <h1 class="text-3xl font-bold mb-6 text-center">Cherry Studio License</h1>
@ -57,28 +57,23 @@
<h3 class="text-xl font-semibold mb-2">I. Commercial Use License</h3> <h3 class="text-xl font-semibold mb-2">I. Commercial Use License</h3>
<ol class="list-decimal list-inside mb-4"> <ol class="list-decimal list-inside mb-4">
<li> <li>
<strong>Free Commercial Use</strong>: Users can use the software for commercial purposes without <strong>Free Commercial Use</strong>: Users can use the software for commercial purposes without modifying
modifying
the code. the code.
</li> </li>
<li> <li>
<strong>Commercial License Required</strong>: A commercial license is required if any of the <strong>Commercial License Required</strong>: A commercial license is required if any of the following
following
conditions are met: conditions are met:
<ol class="list-decimal list-inside ml-4"> <ol class="list-decimal list-inside ml-4">
<li> <li>
You modify, develop, or alter the software, including but not limited to changes to the You modify, develop, or alter the software, including but not limited to changes to the application
application
name, logo, code, or functionality. name, logo, code, or functionality.
</li> </li>
<li>You provide multi-tenant services to enterprise customers with 10 or more users.</li> <li>You provide multi-tenant services to enterprise customers with 10 or more users.</li>
<li> <li>
You pre-install or integrate the software into hardware devices or products and bundle it You pre-install or integrate the software into hardware devices or products and bundle it for sale.
for sale.
</li> </li>
<li> <li>
You are engaging in large-scale procurement for government or educational institutions, You are engaging in large-scale procurement for government or educational institutions, especially
especially
involving security, data privacy, or other sensitive requirements. involving security, data privacy, or other sensitive requirements.
</li> </li>
</ol> </ol>
@ -87,13 +82,11 @@
<h3 class="text-xl font-semibold mb-2">II. Contributor Agreement</h3> <h3 class="text-xl font-semibold mb-2">II. Contributor Agreement</h3>
<ol class="list-decimal list-inside mb-4"> <ol class="list-decimal list-inside mb-4">
<li> <li>
<strong>License Adjustment</strong>: The producer reserves the right to adjust the open-source <strong>License Adjustment</strong>: The producer reserves the right to adjust the open-source license as
license as
needed, making it stricter or more lenient. needed, making it stricter or more lenient.
</li> </li>
<li> <li>
<strong>Commercial Use</strong>: Any code you contribute may be used for commercial purposes, <strong>Commercial Use</strong>: Any code you contribute may be used for commercial purposes, including but
including but
not limited to cloud business operations. not limited to cloud business operations.
</li> </li>
</ol> </ol>
@ -108,11 +101,11 @@
<p> <p>
Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache Apart from the specific conditions mentioned above, all other rights and restrictions follow the Apache
License 2.0. Detailed information about the Apache License 2.0 can be found at License 2.0. Detailed information about the Apache License 2.0 can be found at
<a href="http://www.apache.org/licenses/LICENSE-2.0" <a href="http://www.apache.org/licenses/LICENSE-2.0" class="text-blue-500 underline"
class="text-blue-500 underline">http://www.apache.org/licenses/LICENSE-2.0</a> >http://www.apache.org/licenses/LICENSE-2.0</a
>
</p> </p>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

20
resources/cherry-studio/releases.html
View File

@ -1,6 +1,5 @@
<!doctype html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
@ -18,7 +17,8 @@
<!-- Loading状态 --> <!-- Loading状态 -->
<div v-if="loading" class="text-center py-8"> <div v-if="loading" class="text-center py-8">
<div class="inline-block animate-spin rounded-full h-8 w-8 border-4" <div
class="inline-block animate-spin rounded-full h-8 w-8 border-4"
:class="isDark ? 'border-gray-700 border-t-blue-500' : 'border-gray-300 border-t-blue-500'"></div> :class="isDark ? 'border-gray-700 border-t-blue-500' : 'border-gray-300 border-t-blue-500'"></div>
</div> </div>
@ -27,10 +27,14 @@
<!-- Release 列表 --> <!-- Release 列表 -->
<div v-else class="space-y-8"> <div v-else class="space-y-8">
<div v-for="release in releases" :key="release.id" class="relative pl-8" <div
v-for="release in releases"
:key="release.id"
class="relative pl-8"
:class="isDark ? 'border-l-2 border-gray-700' : 'border-l-2 border-gray-200'"> :class="isDark ? 'border-l-2 border-gray-700' : 'border-l-2 border-gray-200'">
<div class="absolute -left-2 top-0 w-4 h-4 rounded-full bg-green-500"></div> <div class="absolute -left-2 top-0 w-4 h-4 rounded-full bg-green-500"></div>
<div class="rounded-lg shadow-sm p-6 transition-shadow" <div
class="rounded-lg shadow-sm p-6 transition-shadow"
:class="isDark ? 'bg-black hover:shadow-md hover:shadow-black' : 'bg-white hover:shadow-md'"> :class="isDark ? 'bg-black hover:shadow-md hover:shadow-black' : 'bg-white hover:shadow-md'">
<div class="flex items-start justify-between mb-4"> <div class="flex items-start justify-between mb-4">
<div> <div>
@ -41,12 +45,15 @@
{{ formatDate(release.published_at) }} {{ formatDate(release.published_at) }}
</p> </p>
</div> </div>
<span class="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium" <span
class="inline-flex items-center px-3 py-1 rounded-full text-sm font-medium"
:class="isDark ? 'bg-green-900 text-green-200' : 'bg-green-100 text-green-800'"> :class="isDark ? 'bg-green-900 text-green-200' : 'bg-green-100 text-green-800'">
{{ release.tag_name }} {{ release.tag_name }}
</span> </span>
</div> </div>
<div class="prose" :class="isDark ? 'text-gray-300 dark-prose' : 'text-gray-600'" <div
class="prose"
:class="isDark ? 'text-gray-300 dark-prose' : 'text-gray-600'"
v-html="renderMarkdown(release.body)"></div> v-html="renderMarkdown(release.body)"></div>
</div> </div>
</div> </div>
@ -198,5 +205,4 @@
} }
</style> </style>
</body> </body>
</html> </html>

5
src/renderer/index.html
View File

@ -1,10 +1,10 @@
<!doctype html> <!doctype html>
<html lang="zh-CN"> <html lang="zh-CN">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="initial-scale=1, width=device-width" /> <meta name="viewport" content="initial-scale=1, width=device-width" />
<meta http-equiv="Content-Security-Policy" <meta
http-equiv="Content-Security-Policy"
content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" /> content="default-src 'self'; connect-src blob: *; script-src 'self' 'unsafe-eval' *; worker-src 'self' blob:; style-src 'self' 'unsafe-inline' *; font-src 'self' data: *; img-src 'self' data: file: * blob:; frame-src * file:" />
<style> <style>
@ -38,5 +38,4 @@
<script type="module" src="/src/init.ts"></script> <script type="module" src="/src/init.ts"></script>
<script type="module" src="/src/main.tsx"></script> <script type="module" src="/src/main.tsx"></script>
</body> </body>
</html> </html>

4
src/renderer/src/components/Layout/index.ts
View File

@ -95,14 +95,14 @@ export const Box = styled.div<BoxProps>`
box-sizing: border-box; box-sizing: border-box;
border: ${(props) => props?.border || 'none'}; border: ${(props) => props?.border || 'none'};
gap: ${(p) => (p.gap ? getElementValue(p.gap) : 0)}; gap: ${(p) => (p.gap ? getElementValue(p.gap) : 0)};
margin: ${(props) => (props.m || props.margin ? props.m ?? props.margin : 'none')}; margin: ${(props) => (props.m || props.margin ? (props.m ?? props.margin) : 'none')};
margin-top: ${(props) => (props.mt || props.marginTop ? getElementValue(props.mt || props.marginTop) : 'default')}; margin-top: ${(props) => (props.mt || props.marginTop ? getElementValue(props.mt || props.marginTop) : 'default')};
margin-bottom: ${(props) => margin-bottom: ${(props) =>
props.mb || props.marginBottom ? getElementValue(props.mb ?? props.marginBottom) : 'default'}; props.mb || props.marginBottom ? getElementValue(props.mb ?? props.marginBottom) : 'default'};
margin-left: ${(props) => (props.ml || props.marginLeft ? getElementValue(props.ml ?? props.marginLeft) : 'default')}; margin-left: ${(props) => (props.ml || props.marginLeft ? getElementValue(props.ml ?? props.marginLeft) : 'default')};
margin-right: ${(props) => margin-right: ${(props) =>
props.mr || props.marginRight ? getElementValue(props.mr ?? props.marginRight) : 'default'}; props.mr || props.marginRight ? getElementValue(props.mr ?? props.marginRight) : 'default'};
padding: ${(props) => (props.p || props.padding ? props.p ?? props.padding : 'none')}; padding: ${(props) => (props.p || props.padding ? (props.p ?? props.padding) : 'none')};
padding-top: ${(props) => (props.pt || props.paddingTop ? getElementValue(props.pt ?? props.paddingTop) : 'auto')}; padding-top: ${(props) => (props.pt || props.paddingTop ? getElementValue(props.pt ?? props.paddingTop) : 'auto')};
padding-bottom: ${(props) => padding-bottom: ${(props) =>
props.pb || props.paddingBottom ? getElementValue(props.pb ?? props.paddingBottom) : 'auto'}; props.pb || props.paddingBottom ? getElementValue(props.pb ?? props.paddingBottom) : 'auto'};

10
src/renderer/src/windows/menu/menu.html
View File

@ -1,9 +1,8 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Selection Menu</title> <title>Selection Menu</title>
<style> <style>
:root { :root {
@ -134,7 +133,7 @@
</menu> </menu>
<script> <script>
document.querySelectorAll('button').forEach(button => { document.querySelectorAll('button').forEach((button) => {
button.addEventListener('click', () => { button.addEventListener('click', () => {
const action = button.getAttribute('data-action') const action = button.getAttribute('data-action')
window.api.selectionMenu.action(action) window.api.selectionMenu.action(action)
@ -142,5 +141,4 @@
}) })
</script> </script>
</body> </body>
</html> </html>