diff --git a/frontend-dev/index.html b/frontend-dev/index.html index 48c59fc..0304cd3 100644 --- a/frontend-dev/index.html +++ b/frontend-dev/index.html @@ -6,6 +6,12 @@ Solid App + + diff --git a/frontend-dev/tailwind.config.js b/frontend-dev/tailwind.config.js index 539c806..7e9034d 100644 --- a/frontend-dev/tailwind.config.js +++ b/frontend-dev/tailwind.config.js @@ -5,7 +5,11 @@ module.exports = { "../src/**/*.tsx" ], theme: { - extend: {}, + extend: { + fontFamily: { + "mono": ["Iosevka", "monospace"] + } + }, colors: { "c-primary": "var(--c-primary)", "c-on-primary": "var(--c-on-primary)", @@ -21,8 +25,11 @@ module.exports = { "c-on-surface": "var(--c-on-surface)", "c-outline": "var(--c-outline)", "c-surface-variant": "var(--c-surface-variant)", - "c-on-surface-variant": "var(--c-on-surface-variant)" - } + "c-on-surface-variant": "var(--c-on-surface-variant)", + "c-green": "#006b54", + "c-success": "var(--c-success)", + "c-on-success": "var(--c-on-success)", + }, }, plugins: [] }; diff --git a/package.json b/package.json index eacf777..97a49f0 100644 --- a/package.json +++ b/package.json @@ -18,8 +18,7 @@ "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:e2e": "jest --config ./test/jest-e2e.json", "ssr": "concurrently \"node esbuild.js\" \"tailwindcss -i static/tailwind.css -o ./static/styles.css --watch\"", - "tailwind": "tailwindcss -i static/tailwind.css -o ./static/styles.css --watch", - "docx": "tsc docx/main.ts && node docx/main.js" + "tailwind": "tailwindcss -i static/tailwind.css -o ./static/styles.css --watch" }, "dependencies": { "@nestjs/common": "^9.0.0", diff --git a/src/app.module.ts b/src/app.module.ts index fee3fd3..a2604f0 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -25,7 +25,7 @@ const db = process.env.MY_SQL_DB; imports: [ TypeOrmModule.forRoot({ type: "mysql", - // To allow remote connections a manual URI is used, for some + // To allow remote connections a manual URI is used url: `mysql://${user}:${password}@${host}:${port}/${db}`, // These values are rejected when using a remote connection, for some reason diff --git a/src/controller/certificate/certificate.controller.ts b/src/controller/certificate/certificate.controller.ts index 0c27112..d9ea8b3 100644 --- a/src/controller/certificate/certificate.controller.ts +++ b/src/controller/certificate/certificate.controller.ts @@ -43,7 +43,6 @@ export class CertificateController { @Delete(":id") async delete(@Param() param: { id: number }) { - console.log(param); const result = await this.certificateService.deleteById(param.id); if (!result) { throw new InternalServerErrorException(); diff --git a/src/controller/certificate/certificate.service.ts b/src/controller/certificate/certificate.service.ts index 0ffd8f2..6f56ca1 100644 --- a/src/controller/certificate/certificate.service.ts +++ b/src/controller/certificate/certificate.service.ts @@ -222,7 +222,6 @@ export class CertificateService { const certificate = await this.registroGIERepository.findOneBy({ id, }); - console.log(certificate); if (certificate !== null) { await this.registroGIERepository.delete(certificate); diff --git a/src/controller/certificate/certificate.template.ts b/src/controller/certificate/certificate.template.ts index cf871bc..33dff9c 100644 --- a/src/controller/certificate/certificate.template.ts +++ b/src/controller/certificate/certificate.template.ts @@ -9,6 +9,12 @@ export function template(ssr: string): string { + + ${generateHydrationScript()} @@ -19,5 +25,4 @@ export function template(ssr: string): string { `; - } diff --git a/src/views/components/Registers.tsx b/src/views/components/Registers.tsx index 2600d06..884b069 100644 --- a/src/views/components/Registers.tsx +++ b/src/views/components/Registers.tsx @@ -40,15 +40,18 @@ export function Registers(props: { person: Person | null, lastUpdate: number })
- Nombres y Apellidos -
- +
+ Nombres y Apellidos +
+ +
+

; +type HTMLButtonEvent = JSX.EventHandlerUnion; /* @@ -73,23 +74,8 @@ export function Search(props: {setPerson: (p: Person | null) => void}) {


- setDni(e.target.value)} - disabled={loading()} - /> -
+ +
+ props.setDni(e.target.value)} + disabled={props.loading} + /> + + +
+ ) +} diff --git a/static/tailwind.css b/static/tailwind.css index 5b3850e..9432070 100644 --- a/static/tailwind.css +++ b/static/tailwind.css @@ -17,6 +17,9 @@ --c-outline: #9d8e81; --c-surface-variant: #50453a; --c-on-surface-variant: #d5c3b5; + + --c-success: #78da9f; + --c-on-success: #00391f; } @media (prefers-color-scheme: light) { @@ -36,6 +39,9 @@ --c-outline: #85736c; --c-surface-variant: #f4ded4; --c-on-surface-variant: #52443d; + + --c-success: #006d40; + --c-on-success: #ffffff; } } diff --git a/tailwind.config.js b/tailwind.config.js index 7cdc759..057abca 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -4,7 +4,11 @@ module.exports = { "./src/**/*.tsx", ], theme: { - extend: {}, + extend: { + fontFamily: { + "mono": ["Iosevka", "monospace"] + } + }, colors: { "c-primary": "var(--c-primary)", "c-on-primary": "var(--c-on-primary)", @@ -22,6 +26,8 @@ module.exports = { "c-surface-variant": "var(--c-surface-variant)", "c-on-surface-variant": "var(--c-on-surface-variant)", "c-green": "#006b54", + "c-success": "var(--c-success)", + "c-on-success": "var(--c-on-success)", }, }, plugins: [],