mirror of
https://github.com/sebastiandine/Card-Collection-Manager-2.git
synced 2026-08-28 17:00:55 +00:00
Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Sebastian Dine
|
1346db06a6 | ||
|
Sebastian Dine
|
01e9436a42 | ||
|
Sebastian Dine
|
2f967a1626 | ||
|
Sebastian Dine
|
f03167a531 | ||
|
Sebastian Dine
|
7be5f51376 | ||
|
Sebastian Dine
|
0ce9b09979 | ||
|
Sebastian Dine
|
9793a13646 | ||
|
Sebastian Dine
|
d6dd72bfb3 | ||
|
Sebastian Dine
|
ae79bae1d6 | ||
|
Sebastian Dine
|
974b5fb30e | ||
|
Sebastian Dine
|
5d7ef22cfd |
@@ -83,7 +83,7 @@ jobs:
|
||||
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_x64_en-US.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'
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
@@ -94,7 +94,7 @@ jobs:
|
||||
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_amd64.deb
|
||||
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'
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
@@ -105,13 +105,25 @@ jobs:
|
||||
asset_name: card-collection-manager-2_${{ needs.create-release.outputs.version }}_amd64.AppImage
|
||||
asset_content_type: application/x-executable
|
||||
|
||||
- name: upload release asset (MacOS)
|
||||
- name: upload release asset (MacOS/.dmg)
|
||||
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/dmg/card-collection-manager-2_${{ needs.create-release.outputs.version }}_x64.dmg
|
||||
asset_name: 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 }}_aarch64.dmg
|
||||
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
|
||||
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
# Card Collection Manager 2
|
||||
|
||||
[](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
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -19,10 +26,20 @@ After performing these steps, the next time you open CCM2, you will see your col
|
||||
|
||||
|
||||
## 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
|
||||
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.
|
||||
|
||||
Also, in directory `hooks/` you find some helpful git hooks that automate/standardize some work. You can activate these hooks by executing the script `activate_hooks.sh` from within the `hooks/` directory. If you are receiving errors like `fatal: cannot run .git/hooks/pre-commit: No such file or directory`, check the line-end sequence of the hook scripts, adjust them according to your system and run `activate_hooks.sh` again.
|
||||
Also, in directory `hooks/` you find some helpful git hooks that automate/standardize some work. You can activate these hooks by executing the script `activate_hooks.sh` from within the `hooks/` directory. If you are receiving errors like `fatal: cannot run .git/hooks/pre-commit: No such file or directory`, check the line-end sequence of the hook scripts, adjust them according to your system and run `activate_hooks.sh` again. The hooks are especially useful for versioning. They ensure that the version number in each of the 3 manifest files are the same and create a `version` file with the current version at the project's root level, which can be picked up easily by automated CI/CD tasks.
|
||||
|
||||
Additionally, if you want to run the GUI out of the container, you need to use a X11 tool. I will briefly explain how to run them in order to display the GUI from the container:
|
||||
|
||||
|
||||
Regular → Executable
+28
-28
@@ -1,28 +1,28 @@
|
||||
{
|
||||
"name": "card-collection-manager-2",
|
||||
"private": true,
|
||||
"version": "1.0.1",
|
||||
"scripts": {
|
||||
"dev": "next dev -p 1420",
|
||||
"build": "next build && next export -o dist",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^1.1.0",
|
||||
"next": "^12.2.5",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-icons": "^4.6.0",
|
||||
"react-loader-spinner": "^5.3.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^1.1.0",
|
||||
"@types/node": "^18.7.11",
|
||||
"@types/react": "^18.0.17",
|
||||
"@types/react-dom": "^18.0.6",
|
||||
"autoprefixer": "^10.4.13",
|
||||
"postcss": "^8.4.18",
|
||||
"tailwindcss": "^3.2.2",
|
||||
"typescript": "^4.7.4"
|
||||
}
|
||||
}
|
||||
{
|
||||
"name": "card-collection-manager-2",
|
||||
"private": true,
|
||||
"version": "1.0.4",
|
||||
"scripts": {
|
||||
"dev": "next dev -p 1420",
|
||||
"build": "next build && next export -o dist",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^1.1.0",
|
||||
"next": "^12.2.5",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0",
|
||||
"react-icons": "^4.6.0",
|
||||
"react-loader-spinner": "^5.3.4"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^1.1.0",
|
||||
"@types/node": "^18.7.11",
|
||||
"@types/react": "^18.0.17",
|
||||
"@types/react-dom": "^18.0.6",
|
||||
"autoprefixer": "^10.4.13",
|
||||
"postcss": "^8.4.18",
|
||||
"tailwindcss": "^3.2.2",
|
||||
"typescript": "^4.7.4"
|
||||
}
|
||||
}
|
||||
|
||||
+1
-1
@@ -203,7 +203,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "card-collection-manager-2"
|
||||
version = "1.0.0"
|
||||
version = "1.0.3"
|
||||
dependencies = [
|
||||
"base64",
|
||||
"image",
|
||||
|
||||
Regular → Executable
+42
-42
@@ -1,42 +1,42 @@
|
||||
[package]
|
||||
name = "card-collection-manager-2"
|
||||
version = "1.0.1"
|
||||
description = "A Tauri App"
|
||||
authors = ["you"]
|
||||
license = ""
|
||||
repository = ""
|
||||
edition = "2021"
|
||||
rust-version = "1.57"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "1.1", features = [] }
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
tauri = { version = "1.1", features = ["api-all"] }
|
||||
|
||||
# b64 image encoding
|
||||
base64 = "0.13"
|
||||
image = "0.24"
|
||||
|
||||
# rest calls
|
||||
reqwest = { version = "0.11", features = ["blocking", "json"] }
|
||||
|
||||
# iterator for enums
|
||||
strum = "0.24"
|
||||
strum_macros = "0.24"
|
||||
|
||||
# data type checker, e.g. is_digit
|
||||
nom = "7.1.1"
|
||||
|
||||
|
||||
[features]
|
||||
# by default Tauri runs in production mode
|
||||
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
|
||||
default = [ "custom-protocol" ]
|
||||
# this feature is used used for production builds where `devPath` points to the filesystem
|
||||
# DO NOT remove this
|
||||
custom-protocol = [ "tauri/custom-protocol" ]
|
||||
[package]
|
||||
name = "card-collection-manager-2"
|
||||
version = "1.0.4"
|
||||
description = "A Tauri App"
|
||||
authors = ["Sebastian Dine"]
|
||||
license = ""
|
||||
repository = ""
|
||||
edition = "2021"
|
||||
rust-version = "1.57"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "1.1", features = [] }
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
tauri = { version = "1.1", features = ["api-all"] }
|
||||
|
||||
# b64 image encoding
|
||||
base64 = "0.13"
|
||||
image = "0.24"
|
||||
|
||||
# rest calls
|
||||
reqwest = { version = "0.11", features = ["blocking", "json"] }
|
||||
|
||||
# iterator for enums
|
||||
strum = "0.24"
|
||||
strum_macros = "0.24"
|
||||
|
||||
# data type checker, e.g. is_digit
|
||||
nom = "7.1.1"
|
||||
|
||||
|
||||
[features]
|
||||
# by default Tauri runs in production mode
|
||||
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
|
||||
default = [ "custom-protocol" ]
|
||||
# this feature is used used for production builds where `devPath` points to the filesystem
|
||||
# DO NOT remove this
|
||||
custom-protocol = [ "tauri/custom-protocol" ]
|
||||
|
||||
@@ -14,7 +14,12 @@ pub fn format_text_for_fs(text: &String) -> String {
|
||||
.replace(":", "-")
|
||||
.replace("&", "And")
|
||||
.replace("|", "Or")
|
||||
.replace("á", "a")
|
||||
.replace("é", "e")
|
||||
.replace("í", "i")
|
||||
.replace("ó", "o")
|
||||
.replace("ú", "u")
|
||||
.replace("û", "u")
|
||||
}
|
||||
|
||||
/// Parse an index from the end of a filename. This function supports indices with
|
||||
|
||||
Regular → Executable
+67
-67
@@ -1,67 +1,67 @@
|
||||
{
|
||||
"build": {
|
||||
"beforeDevCommand": "yarn dev",
|
||||
"beforeBuildCommand": "yarn build",
|
||||
"devPath": "http://localhost:1420",
|
||||
"distDir": "../dist",
|
||||
"withGlobalTauri": false
|
||||
},
|
||||
"package": {
|
||||
"productName": "card-collection-manager-2",
|
||||
"version": "1.0.0"
|
||||
},
|
||||
"tauri": {
|
||||
"allowlist": {
|
||||
"all": true
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"category": "DeveloperTool",
|
||||
"copyright": "",
|
||||
"deb": {
|
||||
"depends": []
|
||||
},
|
||||
"externalBin": [],
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
"icons/128x128.png",
|
||||
"icons/icon.icns",
|
||||
"icons/icon.ico"
|
||||
],
|
||||
"identifier": "com.sdine.dev",
|
||||
"longDescription": "",
|
||||
"macOS": {
|
||||
"entitlements": null,
|
||||
"exceptionDomain": "",
|
||||
"frameworks": [],
|
||||
"providerShortName": null,
|
||||
"signingIdentity": null
|
||||
},
|
||||
"resources": [],
|
||||
"shortDescription": "",
|
||||
"targets": "all",
|
||||
"windows": {
|
||||
"certificateThumbprint": null,
|
||||
"digestAlgorithm": "sha256",
|
||||
"timestampUrl": ""
|
||||
}
|
||||
},
|
||||
"security": {
|
||||
"csp": null
|
||||
},
|
||||
"updater": {
|
||||
"active": false
|
||||
},
|
||||
"windows": [
|
||||
{
|
||||
"fullscreen": false,
|
||||
"resizable": true,
|
||||
"title": "Card Collection Manager 2",
|
||||
"minWidth": 1300,
|
||||
"minHeight": 900,
|
||||
"width": 1300,
|
||||
"height": 900
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
{
|
||||
"build": {
|
||||
"beforeDevCommand": "yarn dev",
|
||||
"beforeBuildCommand": "yarn build",
|
||||
"devPath": "http://localhost:1420",
|
||||
"distDir": "../dist",
|
||||
"withGlobalTauri": false
|
||||
},
|
||||
"package": {
|
||||
"productName": "card-collection-manager-2",
|
||||
"version": "1.0.4"
|
||||
},
|
||||
"tauri": {
|
||||
"allowlist": {
|
||||
"all": true
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"category": "DeveloperTool",
|
||||
"copyright": "",
|
||||
"deb": {
|
||||
"depends": []
|
||||
},
|
||||
"externalBin": [],
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
"icons/128x128.png",
|
||||
"icons/icon.icns",
|
||||
"icons/icon.ico"
|
||||
],
|
||||
"identifier": "com.sdine.dev",
|
||||
"longDescription": "",
|
||||
"macOS": {
|
||||
"entitlements": null,
|
||||
"exceptionDomain": "",
|
||||
"frameworks": [],
|
||||
"providerShortName": null,
|
||||
"signingIdentity": null
|
||||
},
|
||||
"resources": [],
|
||||
"shortDescription": "",
|
||||
"targets": "all",
|
||||
"windows": {
|
||||
"certificateThumbprint": null,
|
||||
"digestAlgorithm": "sha256",
|
||||
"timestampUrl": ""
|
||||
}
|
||||
},
|
||||
"security": {
|
||||
"csp": null
|
||||
},
|
||||
"updater": {
|
||||
"active": false
|
||||
},
|
||||
"windows": [
|
||||
{
|
||||
"fullscreen": false,
|
||||
"resizable": true,
|
||||
"title": "Card Collection Manager 2",
|
||||
"minWidth": 1300,
|
||||
"minHeight": 900,
|
||||
"width": 1300,
|
||||
"height": 900
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1 +0,0 @@
|
||||
1.0.0
|
||||
@@ -1,2 +1,2 @@
|
||||
#!/bin/sh
|
||||
#!/bin/sh
|
||||
cp ./pre-commit ../.git/hooks
|
||||
+10
-7
@@ -1,26 +1,29 @@
|
||||
#!/bin/sh
|
||||
PROJECT_ROOT=$(pwd)
|
||||
|
||||
# check if version and project name are the same in frontend and backend manifest
|
||||
# Check if version and project name are the same in all manifest files.
|
||||
# TAURI_VERSION is the version that is actually used by the tauri build command,
|
||||
# but to avoid any misconception, versions in all manifests should be the same.
|
||||
cd $PROJECT_ROOT && cd card-collection-manager-2/src-tauri
|
||||
CARGO_VERSION=$(cargo read-manifest | jq -r .version)
|
||||
CARGO_NAME=$(cargo read-manifest | jq -r .name)
|
||||
TAURI_VERSION=$(cat tauri.conf.json | jq -r .package.version)
|
||||
TAURI_NAME=$(cat tauri.conf.json | jq -r .package.productName)
|
||||
cd $PROJECT_ROOT && cd card-collection-manager-2
|
||||
YARN_VERSION=$(cat package.json | jq -r .version)
|
||||
YARN_NAME=$(cat package.json | jq -r .name)
|
||||
|
||||
if [ $CARGO_VERSION != $YARN_VERSION ]; then
|
||||
echo "[PRE-COMMIT] Project version in 'package.json' and 'Cargo.toml' does not match."
|
||||
if [ $CARGO_VERSION != $YARN_VERSION ] || [ $CARGO_VERSION != $TAURI_VERSION ] || [ $YARN_VERSION != $TAURI_VERSION ]; then
|
||||
echo "[PRE-COMMIT] Project version in manifests does not match."
|
||||
exit 1
|
||||
fi
|
||||
if [ $CARGO_NAME != $YARN_NAME ]; then
|
||||
echo "[PRE-COMMIT] Project name in 'package.json' and 'Cargo.toml' does not match."
|
||||
if [ $CARGO_NAME != $YARN_NAME ] || [ $CARGO_NAME != $TAURI_NAME ] || [ $YARN_NAME != $TAURI_NAME ]; then
|
||||
echo "[PRE-COMMIT] Project name in manifests does not match."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
cd $PROJECT_ROOT
|
||||
echo $CARGO_VERSION > version
|
||||
echo $TAURI_VERSION > version
|
||||
git add version
|
||||
|
||||
exit 0
|
||||
Reference in New Issue
Block a user