From d958f8d31feaac23aaea92e7ec9c6c2da2c4c7ff Mon Sep 17 00:00:00 2001 From: denislov <2864326614@qq.com> Date: Wed, 12 Feb 2025 00:39:50 +0800 Subject: [PATCH] format --- README.md | 3 +- docs/README.ja.md | 3 +- docs/README.zh.md | 3 +- resources/cherry-studio/license.html | 221 +++++++------ resources/cherry-studio/releases.html | 332 ++++++++++---------- src/renderer/index.html | 71 +++-- src/renderer/src/components/Layout/index.ts | 4 +- src/renderer/src/windows/menu/menu.html | 260 ++++++++------- 8 files changed, 448 insertions(+), 449 deletions(-) diff --git a/README.md b/README.md index 3cd03ded..6e8e707f 100644 --- a/README.md +++ b/README.md @@ -117,7 +117,8 @@ For more detailed guidelines, please refer to our [Contributing Guide](./CONTRIB Thank you for your support and contributions! ## 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 diff --git a/docs/README.ja.md b/docs/README.ja.md index 0160025a..0be68e8d 100644 --- a/docs/README.ja.md +++ b/docs/README.ja.md @@ -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キー管理と再配布に利用可能。 # 🚀 コントリビューター diff --git a/docs/README.zh.md b/docs/README.zh.md index bf616fda..0897dc86 100644 --- a/docs/README.zh.md +++ b/docs/README.zh.md @@ -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接口，可用于密钥管理与二次分发。 # 🚀 贡献者 diff --git a/resources/cherry-studio/license.html b/resources/cherry-studio/license.html index 3cf43612..38df70a9 100644 --- a/resources/cherry-studio/license.html +++ b/resources/cherry-studio/license.html @@ -1,118 +1,111 @@ + + + + CherryStudio 许可协议-ZH/EN + + - - - - CherryStudio 许可协议-ZH/EN - - - - -
-

Cherry Studio 许可协议

-
-

许可协议

-

- 本软件采用 Apache License 2.0 许可。除 Apache License 2.0 规定的条款外，您在使用 Cherry - Studio 时还应遵守以下附加条款： -

-

一. 商用许可

-
    -
  1. 免费商用：用户在不修改代码的情况下，可以免费用于商业目的。
    2. -
  2. - 商业授权：如果您满足以下任意条件之一，需取得商业授权： -
      -
    1. 对本软件进行二次修改、开发（包括但不限于修改应用名称、logo、代码以及功能）。
      2. -
    2. 为企业客户提供多租户服务，且该服务支持 10 人或以上的使用。
      3. -
    3. 预装或集成到硬件设备或产品中进行捆绑销售。
      4. -
    4. 政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。
      5. -
    -
    3. -
-

二. 贡献者协议

-
    -
  1. 许可调整：生产者有权根据需要对开源协议进行调整，使其更加严格或宽松。
    2. -
  2. 商业用途：您贡献的代码可能会被用于商业用途，包括但不限于云业务运营。
    3. -
-

三. 其他条款

-
    -
  1. 本协议条款的解释权归 Cherry Studio 开发者所有。
    2. -
  2. 本协议可能根据实际情况进行更新，更新时将通过本软件通知用户。
    3. -
-

如有任何问题或需申请商业授权，请联系 Cherry Studio 开发团队。

-

- 除上述特定条件外，其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息，请访问 - http://www.apache.org/licenses/LICENSE-2.0 -

+ +
+

Cherry Studio 许可协议

+
+

许可协议

+

+ 本软件采用 Apache License 2.0 许可。除 Apache License 2.0 规定的条款外，您在使用 Cherry + Studio 时还应遵守以下附加条款： +

+

一. 商用许可

+
    +
  1. 免费商用：用户在不修改代码的情况下，可以免费用于商业目的。
    2. +
  2. + 商业授权：如果您满足以下任意条件之一，需取得商业授权： +
      +
    1. 对本软件进行二次修改、开发（包括但不限于修改应用名称、logo、代码以及功能）。
      2. +
    2. 为企业客户提供多租户服务，且该服务支持 10 人或以上的使用。
      3. +
    3. 预装或集成到硬件设备或产品中进行捆绑销售。
      4. +
    4. 政府或教育机构的大规模采购项目，特别是涉及安全、数据隐私等敏感需求时。
      5. +
    +
    3. +
+

二. 贡献者协议

+
    +
  1. 许可调整：生产者有权根据需要对开源协议进行调整，使其更加严格或宽松。
    2. +
  2. 商业用途：您贡献的代码可能会被用于商业用途，包括但不限于云业务运营。
    3. +
+

三. 其他条款

+
    +
  1. 本协议条款的解释权归 Cherry Studio 开发者所有。
    2. +
  2. 本协议可能根据实际情况进行更新，更新时将通过本软件通知用户。
    3. +
+

如有任何问题或需申请商业授权，请联系 Cherry Studio 开发团队。

+

+ 除上述特定条件外，其他所有权利和限制均遵循 Apache License 2.0。有关 Apache License 2.0 的详细信息，请访问 + http://www.apache.org/licenses/LICENSE-2.0 +

+
+

Cherry Studio License

+
+

License Agreement

+

+ This software is licensed under the Apache License 2.0. In addition to the terms of the + Apache License 2.0, the following additional terms apply to the use of Cherry Studio: +

+

I. Commercial Use License

+
    +
  1. + Free Commercial Use: Users can use the software for commercial purposes without modifying + the code. +
    2. +
  2. + Commercial License Required: A commercial license is required if any of the following + conditions are met: +
      +
    1. + You modify, develop, or alter the software, including but not limited to changes to the application + name, logo, code, or functionality. +
      2. +
    2. You provide multi-tenant services to enterprise customers with 10 or more users.
      3. +
    3. + You pre-install or integrate the software into hardware devices or products and bundle it for sale. +
      4. +
    4. + You are engaging in large-scale procurement for government or educational institutions, especially + involving security, data privacy, or other sensitive requirements. +
      5. +
    +
    3. +
+

II. Contributor Agreement

+
    +
  1. + License Adjustment: The producer reserves the right to adjust the open-source license as + needed, making it stricter or more lenient. +
    2. +
  2. + Commercial Use: Any code you contribute may be used for commercial purposes, including but + not limited to cloud business operations. +
    3. +
+

III. Other Terms

+
    +
  1. The interpretation of these terms is subject to the discretion of Cherry Studio developers.
    2. +
  2. These terms may be updated, and users will be notified through the software when changes occur.
    3. +
+

+ For any questions or to request a commercial license, please contact the Cherry Studio development team. +

+

+ 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 + http://www.apache.org/licenses/LICENSE-2.0 +

+
-

Cherry Studio License

-
-

License Agreement

-

- This software is licensed under the Apache License 2.0. In addition to the terms of the - Apache License 2.0, the following additional terms apply to the use of Cherry Studio: -

-

I. Commercial Use License

-
    -
  1. - Free Commercial Use: Users can use the software for commercial purposes without - modifying - the code. -
    2. -
  2. - Commercial License Required: A commercial license is required if any of the - following - conditions are met: -
      -
    1. - You modify, develop, or alter the software, including but not limited to changes to the - application - name, logo, code, or functionality. -
      2. -
    2. You provide multi-tenant services to enterprise customers with 10 or more users.
      3. -
    3. - You pre-install or integrate the software into hardware devices or products and bundle it - for sale. -
      4. -
    4. - You are engaging in large-scale procurement for government or educational institutions, - especially - involving security, data privacy, or other sensitive requirements. -
      5. -
    -
    3. -
-

II. Contributor Agreement

-
    -
  1. - License Adjustment: The producer reserves the right to adjust the open-source - license as - needed, making it stricter or more lenient. -
    2. -
  2. - Commercial Use: Any code you contribute may be used for commercial purposes, - including but - not limited to cloud business operations. -
    3. -
-

III. Other Terms

-
    -
  1. The interpretation of these terms is subject to the discretion of Cherry Studio developers.
    2. -
  2. These terms may be updated, and users will be notified through the software when changes occur.
    3. -
-

- For any questions or to request a commercial license, please contact the Cherry Studio development team. -

-

- 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 - http://www.apache.org/licenses/LICENSE-2.0 -

-
-
- - - \ No newline at end of file + + diff --git a/resources/cherry-studio/releases.html b/resources/cherry-studio/releases.html index 7963e124..55156458 100644 --- a/resources/cherry-studio/releases.html +++ b/resources/cherry-studio/releases.html @@ -1,7 +1,6 @@ - - + Github Releases Timeline @@ -9,194 +8,201 @@ - + - +
-
-

Release Timeline

+
+

Release Timeline

- -
-
-
- - -
{{ error }}
- - -
-
-
-
-
-
-

- {{ release.name || release.tag_name }} -

-

- {{ formatDate(release.published_at) }} -

-
- - {{ release.tag_name }} - -
-
-
-
-
+ +
+
+ + +
{{ error }}
+ + +
+
+
+
+
+
+

+ {{ release.name || release.tag_name }} +

+

+ {{ formatDate(release.published_at) }} +

+
+ + {{ release.tag_name }} + +
+
+
+
+
+
- - - \ No newline at end of file + + diff --git a/src/renderer/index.html b/src/renderer/index.html index ed825050..53db584f 100644 --- a/src/renderer/index.html +++ b/src/renderer/index.html @@ -1,42 +1,41 @@ + + + + - - - - + + - #spinner img { - width: 100px; - border-radius: 50px; - } - - - - -
-
- -
- - - - - \ No newline at end of file + +
+
+ +
+ + + + diff --git a/src/renderer/src/components/Layout/index.ts b/src/renderer/src/components/Layout/index.ts index f3ff7203..2e5a0b60 100644 --- a/src/renderer/src/components/Layout/index.ts +++ b/src/renderer/src/components/Layout/index.ts @@ -95,14 +95,14 @@ export const Box = styled.div` box-sizing: border-box; border: ${(props) => props?.border || 'none'}; 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-bottom: ${(props) => props.mb || props.marginBottom ? getElementValue(props.mb ?? props.marginBottom) : 'default'}; margin-left: ${(props) => (props.ml || props.marginLeft ? getElementValue(props.ml ?? props.marginLeft) : 'default')}; margin-right: ${(props) => 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-bottom: ${(props) => props.pb || props.paddingBottom ? getElementValue(props.pb ?? props.paddingBottom) : 'auto'}; diff --git a/src/renderer/src/windows/menu/menu.html b/src/renderer/src/windows/menu/menu.html index f5507af3..dd7945b1 100644 --- a/src/renderer/src/windows/menu/menu.html +++ b/src/renderer/src/windows/menu/menu.html @@ -1,146 +1,144 @@ - + - - - - - Selection Menu - - + button:active { + transform: scale(0.95); + } - -
- - - - - - + svg { + width: 16px; + height: 16px; + fill: currentColor; + } + + - - - - \ No newline at end of file + + +