Merge pull request #61 from vbetsch/develop

Sprint 3 - Implement UI for display, search, create and delete vaults

Author: vbetsch

.idea/dictionaries/project.xml

@@ -1,3 +1,4 @@
 /node_modules/
 /dist/
+/.github/release_template.md
 README.md

.prettierignore

@@ -2,5 +2,6 @@
   "semi": true,
   "singleQuote": true,
   "tabWidth": 2,
-  "trailingComma": "es5"
+  "trailingComma": "es5",
+  "arrowParens": "avoid"
 }

.prettierrc

@@ -8,6 +8,9 @@ package-lock.json:
 node_modules: package-lock.json
 	npm clean-install
 
+# Variables
+MIGRATION_NAME ?=
+
 # Commands
 up: docker-compose.yml
 	docker-compose up -d
@@ -35,13 +38,20 @@ coverage: node_modules
 	npm run test:cov
 
 migrate: up
-	npx prisma migrate dev --name init
+	@if [ -z "$(MIGRATION_NAME)" ]; then \
+	  echo "Error: MIGRATION_NAME is required"; \
+	  exit 1; \
+	fi
+	npm run prisma:migrate "$(MIGRATION_NAME)"
+
+reset_db: up
+	npm run prisma:reset
 
 clean:
 	rm -rf .next node_modules package-lock.json
 	npm install
 
-.PHONY: up down dev build lint format tests coverage migrate clean
+.PHONY: up down dev build lint format tests coverage migrate reset_db clean
 
 # Aliases
 run: up dev

Makefile

@@ -1,6 +1,6 @@
-import {dirname} from 'path';
-import {fileURLToPath} from 'url';
-import {FlatCompat} from '@eslint/eslintrc';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import { FlatCompat } from '@eslint/eslintrc';
 import js from '@eslint/js';
 import tseslint from 'typescript-eslint';
 import eslintPluginPrettier from 'eslint-plugin-prettier';
@@ -50,26 +50,28 @@ export default tseslint.config(
             message: 'Do not use `as any`, types must be explicit and safe.',
           },
           {
-            selector: "JSXOpeningElement[name.type='JSXIdentifier'][name.name=/^[a-z]/]",
+            selector:
+              "JSXOpeningElement[name.type='JSXIdentifier'][name.name=/^[a-z]/]",
             message:
               'Do not use native HTML elements: use an MUI component (PascalCase) instead.',
           },
         ],
 
         /* Code structure and clarity */
         // 'max-params': ['warn', 1],
+
         'default-case': 'warn',
         'import/no-unresolved': 'error',
         'no-inline-comments': 'warn',
         'no-undefined': 'warn',
         'no-var': 'error',
-        'prefer-const': ['error', {destructuring: 'all'}],
+        'prefer-const': ['error', { destructuring: 'all' }],
         'require-await': 'error',
         'require-object-destructuring': 'off',
-
+        'arrow-parens': ['error', 'as-needed'],
         /* Formatting */
-        'max-len': ['warn', {code: 300, ignoreUrls: true}],
-        'prettier/prettier': ['warn', {semi: true}],
+        'max-len': ['warn', { code: 300, ignoreUrls: true }],
+        'prettier/prettier': ['warn', { semi: true }],
         semi: ['error', 'always'],
 
         /* Naming conventions */
@@ -120,29 +122,29 @@ export default tseslint.config(
         ],
         '@typescript-eslint/explicit-function-return-type': [
           'error',
-          {allowExpressions: false},
+          { allowExpressions: false },
         ],
         '@typescript-eslint/explicit-member-accessibility': [
           'error',
-          {accessibility: 'explicit'},
+          { accessibility: 'explicit' },
         ],
         '@typescript-eslint/explicit-module-boundary-types': 'error',
         '@typescript-eslint/no-empty-function': ['warn'],
         '@typescript-eslint/no-extraneous-class': [
           'error',
-          {allowConstructorOnly: false},
+          { allowConstructorOnly: false },
         ],
         '@typescript-eslint/no-explicit-any': 'error',
         '@typescript-eslint/no-inferrable-types': 'off',
         '@typescript-eslint/no-magic-numbers': [
           'warn',
-          {ignoreEnums: true, ignore: [0, 1], enforceConst: true},
+          { ignoreEnums: true, ignore: [0, 1], enforceConst: true },
         ],
         '@typescript-eslint/no-namespace': 'off',
         '@typescript-eslint/no-unsafe-member-access': 'warn',
         '@typescript-eslint/no-unused-vars': [
           'error',
-          {argsIgnorePattern: '^_'},
+          { argsIgnorePattern: '^_' },
         ],
         '@typescript-eslint/prefer-function-type': 'warn',
         '@typescript-eslint/prefer-readonly': 'warn',
@@ -187,9 +189,9 @@ export default tseslint.config(
 
     {
       files: ['**/*.test.ts', '**/*.spec.ts', '**/*.test.tsx', '**/*.spec.tsx'],
-      plugins: {jest: eslintPluginJest},
+      plugins: { jest: eslintPluginJest },
       settings: {
-        jest: {version: 29},
+        jest: { version: 29 },
       },
     },
   ],

eslint.config.mjs

@@ -10,7 +10,9 @@
     "format:c": "prettier --check .",
     "format:w": "prettier --write .",
     "test": "jest",
-    "test:cov": "jest --coverage"
+    "test:cov": "jest --coverage",
+    "prisma:reset": "prisma migrate reset",
+    "prisma:migrate": "prisma migrate dev --name"
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",

package.json

@@ -0,0 +1,13 @@
+/*
+  Warnings:
+
+  - The primary key for the `Vault` table will be changed. If it partially fails, the table could be left without primary key constraint.
+  - You are about to drop the column `id` on the `Vault` table. All the data in the column will be lost.
+  - The required column `uuid` was added to the `Vault` table with a prisma-level default value. This is not possible if the table is not empty. Please add this column as optional, then populate it before making it required.
+
+*/
+-- AlterTable
+ALTER TABLE "Vault" DROP CONSTRAINT "Vault_pkey",
+DROP COLUMN "id",
+ADD COLUMN     "uuid" TEXT NOT NULL,
+ADD CONSTRAINT "Vault_pkey" PRIMARY KEY ("uuid");

prisma/migrations/20250731173933_id_to_uuid/migration.sql

@@ -9,7 +9,7 @@ datasource db {
 }
 
 model Vault {
-  id     String @id @default(uuid())
+  uuid   String @id @default(uuid())
   label  String @db.VarChar(255)
   secret String @db.VarChar(255)
 }

prisma/schema.prisma

@@ -1,6 +1,7 @@
 import type { JSX } from 'react';
 import React from 'react';
 import type { Metadata } from 'next';
+import type { SharedLayoutProps } from '@shared/types/props/SharedLayoutProps';
 
 export const metadata: Metadata = {
   title: 'LockLite API',
@@ -9,9 +10,7 @@ export const metadata: Metadata = {
 
 export default function RootLayout({
   children,
-}: {
-  children: React.ReactNode;
-}): JSX.Element {
+}: SharedLayoutProps): JSX.Element {
   return (
     // eslint-disable-next-line no-restricted-syntax
     <html lang="en">

src/app/api/layout.tsx

@@ -4,6 +4,7 @@ import React from 'react';
 import ThemeRegistry from '@ui/providers/ThemeRegistry';
 import { AppBar, Container, Toolbar, Typography } from '@mui/material';
 import PageContainer from '@ui/components/common/PageContainer';
+import type { SharedLayoutProps } from '@shared/types/props/SharedLayoutProps';
 
 export const metadata: Metadata = {
   title: {
@@ -15,9 +16,7 @@ export const metadata: Metadata = {
 
 export default function RootLayout({
   children,
-}: {
-  children: React.ReactNode;
-}): JSX.Element {
+}: SharedLayoutProps): JSX.Element {
   return (
     // eslint-disable-next-line no-restricted-syntax
     <html lang="en" style={{ height: '100%' }}>