From c1264ac2fe612612e8eb946616b892188ab06b58 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Mon, 31 Mar 2025 13:41:32 +0200 Subject: [PATCH] run formater --- README.md | 1 - crates/backend/src/controller.rs | 1 - crates/backend/src/main.rs | 4 +-- crates/migration/README.md | 60 ++++++++++++++++---------------- flake.nix | 1 + frontend/eslint.config.ts | 2 +- frontend/index.html | 8 ++--- frontend/vite.config.ts | 8 ++--- pnpm-workspace.yaml | 2 +- 9 files changed, 41 insertions(+), 46 deletions(-) diff --git a/README.md b/README.md index befd9ad..631f185 100644 --- a/README.md +++ b/README.md @@ -1,2 +1 @@ # peer-group-grading - diff --git a/crates/backend/src/controller.rs b/crates/backend/src/controller.rs index a4668e5..32d5768 100644 --- a/crates/backend/src/controller.rs +++ b/crates/backend/src/controller.rs @@ -2,5 +2,4 @@ use actix_web::web::{self, ServiceConfig}; pub fn register_controllers(cfg: &mut ServiceConfig) { cfg.service(web::scope("/users")); - } diff --git a/crates/backend/src/main.rs b/crates/backend/src/main.rs index 95a36b7..76c5d63 100644 --- a/crates/backend/src/main.rs +++ b/crates/backend/src/main.rs @@ -1,5 +1,5 @@ -use actix_session::{SessionMiddleware, storage::RedisSessionStore}; -use actix_web::{App, HttpResponse, HttpServer, cookie::Key, middleware::Logger, web}; +use actix_session::{storage::RedisSessionStore, SessionMiddleware}; +use actix_web::{cookie::Key, middleware::Logger, web, App, HttpResponse, HttpServer}; mod controller; diff --git a/crates/migration/README.md b/crates/migration/README.md index 3b438d8..dddefaa 100644 --- a/crates/migration/README.md +++ b/crates/migration/README.md @@ -1,41 +1,41 @@ # Running Migrator CLI - Generate a new migration file - ```sh - cargo run -- generate MIGRATION_NAME - ``` + ```sh + cargo run -- generate MIGRATION_NAME + ``` - Apply all pending migrations - ```sh - cargo run - ``` - ```sh - cargo run -- up - ``` + ```sh + cargo run + ``` + ```sh + cargo run -- up + ``` - Apply first 10 pending migrations - ```sh - cargo run -- up -n 10 - ``` + ```sh + cargo run -- up -n 10 + ``` - Rollback last applied migrations - ```sh - cargo run -- down - ``` + ```sh + cargo run -- down + ``` - Rollback last 10 applied migrations - ```sh - cargo run -- down -n 10 - ``` + ```sh + cargo run -- down -n 10 + ``` - Drop all tables from the database, then reapply all migrations - ```sh - cargo run -- fresh - ``` + ```sh + cargo run -- fresh + ``` - Rollback all applied migrations, then reapply all migrations - ```sh - cargo run -- refresh - ``` + ```sh + cargo run -- refresh + ``` - Rollback all applied migrations - ```sh - cargo run -- reset - ``` + ```sh + cargo run -- reset + ``` - Check the status of all migrations - ```sh - cargo run -- status - ``` + ```sh + cargo run -- status + ``` diff --git a/flake.nix b/flake.nix index a60e11e..86e4c4f 100644 --- a/flake.nix +++ b/flake.nix @@ -57,6 +57,7 @@ prettier = { command = "prettier"; options = [ "--write" ]; + excludes = [ "pnpm-lock.yaml" ]; includes = [ "*.css" "*.html" diff --git a/frontend/eslint.config.ts b/frontend/eslint.config.ts index 84b2cef..c441f2a 100644 --- a/frontend/eslint.config.ts +++ b/frontend/eslint.config.ts @@ -21,7 +21,7 @@ export default defineConfigWithVueTs( pluginVue.configs['flat/essential'], vueTsConfigs.recommended, - + { ...pluginVitest.configs.recommended, files: ['src/**/__tests__/*'], diff --git a/frontend/index.html b/frontend/index.html index 9e5fc8f..9d30802 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -1,9 +1,9 @@ - + - - - + + + Vite App diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts index d49d708..27b27e7 100644 --- a/frontend/vite.config.ts +++ b/frontend/vite.config.ts @@ -7,14 +7,10 @@ import vueDevTools from 'vite-plugin-vue-devtools' // https://vite.dev/config/ export default defineConfig({ - plugins: [ - vue(), - vueJsx(), - vueDevTools(), - ], + plugins: [vue(), vueJsx(), vueDevTools()], resolve: { alias: { - '@': fileURLToPath(new URL('./src', import.meta.url)) + '@': fileURLToPath(new URL('./src', import.meta.url)), }, }, }) diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 0383108..57f98c9 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -1,2 +1,2 @@ packages: - - 'frontend' \ No newline at end of file + - "frontend"