Compare commits

..

1 commit

Author SHA1 Message Date
jopejoe1
4b5efaa76e add various cargo ci checks
Some checks failed
ci/woodpecker/pr/cargo_check Pipeline failed
ci/woodpecker/pr/cargo_clippy Pipeline failed
ci/woodpecker/pr/cargo_test Pipeline failed
ci/woodpecker/pr/check_fmt Pipeline was successful
2025-04-04 12:21:36 +02:00
7 changed files with 46 additions and 140 deletions

View file

@ -5,5 +5,4 @@ steps:
- name: "Run cargo check" - name: "Run cargo check"
image: docker.nix-community.org/nixpkgs/nix-flakes image: docker.nix-community.org/nixpkgs/nix-flakes
commands: commands:
- nix shell github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc - nix run github:nixos/nixpkgs/nixos-unstable#cargo -- check --workspace --all-targets
- cargo check --workspace --all-targets

View file

@ -5,5 +5,4 @@ steps:
- name: "Run cargo clippy" - name: "Run cargo clippy"
image: docker.nix-community.org/nixpkgs/nix-flakes image: docker.nix-community.org/nixpkgs/nix-flakes
commands: commands:
- nix shell github:nixos/nixpkgs/nixos-unstable#clippy github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc - nix run github:nixos/nixpkgs/nixos-unstable#clippy
- cargo clippy

View file

@ -5,5 +5,4 @@ steps:
- name: "Run cargo test" - name: "Run cargo test"
image: docker.nix-community.org/nixpkgs/nix-flakes image: docker.nix-community.org/nixpkgs/nix-flakes
commands: commands:
- nix shell github:nixos/nixpkgs/nixos-unstable#cargo github:nixos/nixpkgs/nixos-unstable#gcc - nix run github:nixos/nixpkgs/nixos-unstable#cargo -- test --workspace --all-targets
- cargo test --workspace --all-targets

View file

@ -24,69 +24,58 @@
packages = with pkgs; [ packages = with pkgs; [
corepack_latest corepack_latest
nodejs nodejs
cargo
clippy
]; ];
}; };
} }
); );
packages = forSystems (
system:
let
pkgs = pkgs' system;
in
{
fmt = pkgs.treefmt.withConfig {
runtimeInputs = with pkgs; [
nixfmt-rfc-style
nodePackages.prettier
rustfmt
];
settings = {
tree-root-file = ".git/index";
formatter = {
nixfmt = {
command = "nixfmt";
includes = [ "*.nix" ];
};
rustfmt = {
command = "rustfmt";
options = [
"--edition"
"2018"
];
includes = [ "*.rs" ];
};
prettier = {
command = "prettier";
options = [ "--write" ];
excludes = [ "pnpm-lock.yaml" ];
includes = [
"*.css"
"*.html"
"*.js"
"*.json"
"*.jsx"
"*.md"
"*.mdx"
"*.scss"
"*.ts"
"*.yaml"
"*.yml"
"*.vue"
];
};
};
};
};
}
);
formatter = forSystems ( formatter = forSystems (
system: system:
let let
pkgs = pkgs' system; pkgs = pkgs' system;
in in
self.outputs.packages.${system}.fmt pkgs.treefmt.withConfig {
runtimeInputs = with pkgs; [
nixfmt-rfc-style
nodePackages.prettier
rustfmt
];
settings = {
tree-root-file = ".git/index";
formatter = {
nixfmt = {
command = "nixfmt";
includes = [ "*.nix" ];
};
rustfmt = {
command = "rustfmt";
options = [
"--edition"
"2018"
];
includes = [ "*.rs" ];
};
prettier = {
command = "prettier";
options = [ "--write" ];
excludes = [ "pnpm-lock.yaml" ];
includes = [
"*.css"
"*.html"
"*.js"
"*.json"
"*.jsx"
"*.md"
"*.mdx"
"*.scss"
"*.ts"
"*.yaml"
"*.yml"
"*.vue"
];
};
};
};
}
); );
}; };
} }

View file

@ -14,9 +14,7 @@
"format": "prettier --write src/" "format": "prettier --write src/"
}, },
"dependencies": { "dependencies": {
"@primeuix/themes": "^1.0.1",
"pinia": "^3.0.1", "pinia": "^3.0.1",
"primevue": "^4.3.3",
"vue": "^3.5.13", "vue": "^3.5.13",
"vue-router": "^4.5.0" "vue-router": "^4.5.0"
}, },

View file

@ -2,19 +2,12 @@ import './assets/main.css'
import { createApp } from 'vue' import { createApp } from 'vue'
import { createPinia } from 'pinia' import { createPinia } from 'pinia'
import PrimeVue from 'primevue/config'
import Aura from '@primeuix/themes/aura'
import App from './App.vue' import App from './App.vue'
import router from './router' import router from './router'
const app = createApp(App) const app = createApp(App)
app.use(PrimeVue, {
theme: {
preset: Aura,
},
})
app.use(createPinia()) app.use(createPinia())
app.use(router) app.use(router)

71
pnpm-lock.yaml generated
View file

@ -10,15 +10,9 @@ importers:
frontend: frontend:
dependencies: dependencies:
'@primeuix/themes':
specifier: ^1.0.1
version: 1.0.1
pinia: pinia:
specifier: ^3.0.1 specifier: ^3.0.1
version: 3.0.1(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2)) version: 3.0.1(typescript@5.8.2)(vue@3.5.13(typescript@5.8.2))
primevue:
specifier: ^4.3.3
version: 4.3.3(vue@3.5.13(typescript@5.8.2))
vue: vue:
specifier: ^3.5.13 specifier: ^3.5.13
version: 3.5.13(typescript@5.8.2) version: 3.5.13(typescript@5.8.2)
@ -522,30 +516,6 @@ packages:
'@polka/url@1.0.0-next.28': '@polka/url@1.0.0-next.28':
resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
'@primeuix/styled@0.5.1':
resolution: {integrity: sha512-5Ftw/KSauDPClQ8F2qCyCUF7cIUEY4yLNikf0rKV7Vsb8zGYNK0dahQe7CChaR6M2Kn+NA2DSBSk76ZXqj6Uog==}
engines: {node: '>=12.11.0'}
'@primeuix/styles@1.0.1':
resolution: {integrity: sha512-R7SX001ILHIJM9hh1opbsuOFFK8dOM8GY1y99jaCFnAc5gGy3mFPJMhoexRYV1a6UZ2YbfcsQVPbIhoONI1gfg==}
'@primeuix/themes@1.0.1':
resolution: {integrity: sha512-RllttI3oGTZa66UQDCIA2lPnJvO/xqtNpy+0eNql6fIxdS2AUg5n7L81jTZrHNZ+31T5OBzL/SGFCDycmHTz2g==}
'@primeuix/utils@0.5.3':
resolution: {integrity: sha512-7SGh7734wcF1/uK6RzO6Z6CBjGQ97GDHfpyl2F1G/c7R0z9hkT/V72ypDo82AWcCS7Ta07oIjDpOCTkSVZuEGQ==}
engines: {node: '>=12.11.0'}
'@primevue/core@4.3.3':
resolution: {integrity: sha512-kSkN5oourG7eueoFPIqiNX3oDT/f0I5IRK3uOY/ytz+VzTZp5yuaCN0Nt42ZQpVXjDxMxDvUhIdaXVrjr58NhQ==}
engines: {node: '>=12.11.0'}
peerDependencies:
vue: ^3.5.0
'@primevue/icons@4.3.3':
resolution: {integrity: sha512-ouQaxHyeFB6MSfEGGbjaK5Qv9efS1xZGetZoU5jcPm090MSYLFtroP1CuK3lZZAQals06TZ6T6qcoNukSHpK5w==}
engines: {node: '>=12.11.0'}
'@rollup/pluginutils@5.1.4': '@rollup/pluginutils@5.1.4':
resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==} resolution: {integrity: sha512-USm05zrsFxYLPdWWq+K3STlWiT/3ELn3RcV5hJMghpeAIhxfsUIg6mt12CBJBInWMV4VneoV7SfGv8xIwo2qNQ==}
engines: {node: '>=14.0.0'} engines: {node: '>=14.0.0'}
@ -1743,10 +1713,6 @@ packages:
resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==} resolution: {integrity: sha512-4yf0QO/sllf/1zbZWYnvWw3NxCQwLXKzIj0G849LSufP15BXKM0rbD2Z3wVnkMfjdn/CB0Dpp444gYAACdsplg==}
engines: {node: '>=18'} engines: {node: '>=18'}
primevue@4.3.3:
resolution: {integrity: sha512-nooYVoEz5CdP3EhUkD6c3qTdRmpLHZh75fBynkUkl46K8y5rksHTjdSISiDijwTA5STQIOkyqLb+RM+HQ6nC1Q==}
engines: {node: '>=12.11.0'}
proto-list@1.2.4: proto-list@1.2.4:
resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==} resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
@ -2584,33 +2550,6 @@ snapshots:
'@polka/url@1.0.0-next.28': {} '@polka/url@1.0.0-next.28': {}
'@primeuix/styled@0.5.1':
dependencies:
'@primeuix/utils': 0.5.3
'@primeuix/styles@1.0.1':
dependencies:
'@primeuix/styled': 0.5.1
'@primeuix/themes@1.0.1':
dependencies:
'@primeuix/styled': 0.5.1
'@primeuix/utils@0.5.3': {}
'@primevue/core@4.3.3(vue@3.5.13(typescript@5.8.2))':
dependencies:
'@primeuix/styled': 0.5.1
'@primeuix/utils': 0.5.3
vue: 3.5.13(typescript@5.8.2)
'@primevue/icons@4.3.3(vue@3.5.13(typescript@5.8.2))':
dependencies:
'@primeuix/utils': 0.5.3
'@primevue/core': 4.3.3(vue@3.5.13(typescript@5.8.2))
transitivePeerDependencies:
- vue
'@rollup/pluginutils@5.1.4(rollup@4.37.0)': '@rollup/pluginutils@5.1.4(rollup@4.37.0)':
dependencies: dependencies:
'@types/estree': 1.0.6 '@types/estree': 1.0.6
@ -3840,16 +3779,6 @@ snapshots:
dependencies: dependencies:
parse-ms: 4.0.0 parse-ms: 4.0.0
primevue@4.3.3(vue@3.5.13(typescript@5.8.2)):
dependencies:
'@primeuix/styled': 0.5.1
'@primeuix/styles': 1.0.1
'@primeuix/utils': 0.5.3
'@primevue/core': 4.3.3(vue@3.5.13(typescript@5.8.2))
'@primevue/icons': 4.3.3(vue@3.5.13(typescript@5.8.2))
transitivePeerDependencies:
- vue
proto-list@1.2.4: {} proto-list@1.2.4: {}
punycode@2.3.1: {} punycode@2.3.1: {}