8 Commits

Author SHA1 Message Date
Sebastian Dine 1346db06a6 deprecation note 2026-05-09 11:13:10 +02:00
Sebastian Dine 01e9436a42 macos .app removed from pipeline 2024-12-19 18:29:00 +00:00
Sebastian Dine 2f967a1626 macos support for release pipeline adjusted 2024-12-19 17:34:46 +00:00
Sebastian Dine f03167a531 version numbering fix 2024-12-19 17:22:15 +00:00
Sebastian Dine 7be5f51376 version 1.0.4 2024-12-19 17:33:04 +01:00
Sebastian Dine 0ce9b09979 bugfix
Card names with an à led to crashes when images were handled
2024-12-19 17:32:00 +01:00
Sebastian Dine 9793a13646 version 1.0.3 2023-09-05 11:56:04 +00:00
Sebastian Dine d6dd72bfb3 Update fs.rs 2023-09-05 11:48:06 +02:00
8 changed files with 45 additions and 11 deletions
+17 -5
View File
@@ -83,7 +83,7 @@ jobs:
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_x64_en-US.msi asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_x64_en-US.msi
asset_content_type: application/x-msi asset_content_type: application/x-msi
- name: upload release asset (Linux/Debian) - name: upload release asset (Linux/.deb)
if: matrix.platform == 'ubuntu-20.04' if: matrix.platform == 'ubuntu-20.04'
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
@@ -94,7 +94,7 @@ jobs:
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_amd64.deb asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_amd64.deb
asset_content_type: application/x-debian-package asset_content_type: application/x-debian-package
- name: upload release asset (Linux/AppImage) - name: upload release asset (Linux/.AppImage)
if: matrix.platform == 'ubuntu-20.04' if: matrix.platform == 'ubuntu-20.04'
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
@@ -105,13 +105,25 @@ jobs:
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_amd64.AppImage asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_amd64.AppImage
asset_content_type: application/x-executable asset_content_type: application/x-executable
- name: upload release asset (MacOS) - name: upload release asset (MacOS/.dmg)
if: matrix.platform == 'macos-latest' if: matrix.platform == 'macos-latest'
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
upload_url: ${{ needs.create-release.outputs.release_upload_url }} upload_url: ${{ needs.create-release.outputs.release_upload_url }}
asset_path: card-collection-manager-2/src-tauri/target/release/bundle/dmg/card-collection-manager-2_${{ needs.create-release.outputs.version }}_x64.dmg asset_path: card-collection-manager-2/src-tauri/target/release/bundle/dmg/card-collection-manager-2_${{ needs.create-release.outputs.version }}_aarch64.dmg
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_x64.dmg asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_aarch64.dmg
asset_content_type: application/x-apple-diskimage asset_content_type: application/x-apple-diskimage
#- name: upload release asset (MacOS/.app)
# if: matrix.platform == 'macos-latest'
# uses: actions/upload-release-asset@v1
# env:
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# with:
# upload_url: ${{ needs.create-release.outputs.release_upload_url }}
# asset_path: card-collection-manager-2/src-tauri/target/release/bundle/macos/card-collection-manager-2.app
# asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}.app
# asset_content_type: application/x-mach-binary
+17
View File
@@ -1,4 +1,11 @@
# Card Collection Manager 2 # Card Collection Manager 2
[![Deprecated: Continued as CCM3](https://img.shields.io/badge/%E2%84%B9%EF%B8%8F%20Project%20Deprecated-Continued%20as%20CCM3-yellow?style=for-the-badge)](https://github.com/sebastiandine/Card-Collection-Manager-3)
> [!WARNING]
> This project (**CCM2**) is deprecated and no longer actively developed.
> Development continues in **CCM3**: https://github.com/sebastiandine/Card-Collection-Manager-3
![img1](img1.PNG) ![img1](img1.PNG)
![img2](img2.PNG) ![img2](img2.PNG)
@@ -19,6 +26,16 @@ After performing these steps, the next time you open CCM2, you will see your col
## How to build/ contribute ## How to build/ contribute
### Creating a new version
To create a new version that is properly picked up by the pipeline to create a new release, adjust the version in the following files:
```
version
card-collection-manager-2/package.json
card-collection-manager-2/src-tauri/tauri.conf.json
card-collection-manager-2/src-tauri/Cargo.toml
```
### Contribute ### Contribute
The project includes configuration for [VSCode development containers](https://code.visualstudio.com/docs/remote/containers) which should be the preffered environment to develop new features of the app. The container automatically sets up a whole Tauri development environment including Typescript & Rust plugins for VSCode. The project includes configuration for [VSCode development containers](https://code.visualstudio.com/docs/remote/containers) which should be the preffered environment to develop new features of the app. The container automatically sets up a whole Tauri development environment including Typescript & Rust plugins for VSCode.
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "card-collection-manager-2", "name": "card-collection-manager-2",
"private": true, "private": true,
"version": "1.0.2", "version": "1.0.4",
"scripts": { "scripts": {
"dev": "next dev -p 1420", "dev": "next dev -p 1420",
"build": "next build && next export -o dist", "build": "next build && next export -o dist",
+1 -1
View File
@@ -203,7 +203,7 @@ dependencies = [
[[package]] [[package]]
name = "card-collection-manager-2" name = "card-collection-manager-2"
version = "1.0.0" version = "1.0.3"
dependencies = [ dependencies = [
"base64", "base64",
"image", "image",
@@ -1,8 +1,8 @@
[package] [package]
name = "card-collection-manager-2" name = "card-collection-manager-2"
version = "1.0.2" version = "1.0.4"
description = "A Tauri App" description = "A Tauri App"
authors = ["you"] authors = ["Sebastian Dine"]
license = "" license = ""
repository = "" repository = ""
edition = "2021" edition = "2021"
@@ -14,7 +14,12 @@ pub fn format_text_for_fs(text: &String) -> String {
.replace(":", "-") .replace(":", "-")
.replace("&", "And") .replace("&", "And")
.replace("|", "Or") .replace("|", "Or")
.replace("á", "a")
.replace("é", "e") .replace("é", "e")
.replace("í", "i")
.replace("ó", "o")
.replace("ú", "u")
.replace("û", "u")
} }
/// Parse an index from the end of a filename. This function supports indices with /// Parse an index from the end of a filename. This function supports indices with
@@ -8,7 +8,7 @@
}, },
"package": { "package": {
"productName": "card-collection-manager-2", "productName": "card-collection-manager-2",
"version": "1.0.2" "version": "1.0.4"
}, },
"tauri": { "tauri": {
"allowlist": { "allowlist": {
+1 -1
View File
@@ -1 +1 @@
1.0.2 1.0.4