From 74f800908356eb729abbbde70fab5f1cf5856312 Mon Sep 17 00:00:00 2001 From: Fernando Date: Wed, 17 May 2023 13:04:11 -0500 Subject: [PATCH] [docx] Fix matpel code error --- deploy.sh | 6 +- esbuild-client-prod.js | 22 ------ esbuild-client.js | 27 ------- esbuild-prod.js | 20 +++++ esbuild.js | 69 +++++++----------- {src/certs/img => img}/aguila_logo.png | Bin {src/certs/img => img}/cee_logo.png | Bin {src/certs/img => img}/ceem_logo.jpg | Bin .../img => img}/colegio_ingenieros_logo.png | Bin {src/certs/img => img}/eate_logo.jpg | Bin {src/certs/img => img}/eeg2_logo.png | Bin {src/certs/img => img}/eeg_f_logo.png | Bin {src/certs/img => img}/eeg_logo.png | Bin {src/certs/img => img}/fondo_certificado.png | Bin {src/certs/img => img}/matpel-logo.png | Bin {src/certs/img => img}/michigan_logo.png | Bin {src/certs/img => img}/mtc_logo.png | Bin {src/certs/img => img}/osha_logo.png | Bin package.json | 4 +- sql/Dockerfile | 7 ++ src/certs/MATPEL.ts | 4 - src/certs/utils.ts | 3 +- src/views/hydration.ts | 5 ++ 23 files changed, 63 insertions(+), 104 deletions(-) delete mode 100644 esbuild-client-prod.js delete mode 100644 esbuild-client.js rename {src/certs/img => img}/aguila_logo.png (100%) rename {src/certs/img => img}/cee_logo.png (100%) rename {src/certs/img => img}/ceem_logo.jpg (100%) rename {src/certs/img => img}/colegio_ingenieros_logo.png (100%) rename {src/certs/img => img}/eate_logo.jpg (100%) rename {src/certs/img => img}/eeg2_logo.png (100%) rename {src/certs/img => img}/eeg_f_logo.png (100%) rename {src/certs/img => img}/eeg_logo.png (100%) rename {src/certs/img => img}/fondo_certificado.png (100%) rename {src/certs/img => img}/matpel-logo.png (100%) rename {src/certs/img => img}/michigan_logo.png (100%) rename {src/certs/img => img}/mtc_logo.png (100%) rename {src/certs/img => img}/osha_logo.png (100%) create mode 100644 sql/Dockerfile diff --git a/deploy.sh b/deploy.sh index 32faf69..b42ad91 100644 --- a/deploy.sh +++ b/deploy.sh @@ -5,12 +5,10 @@ pnpm i # Build Nestjs pnpm build -# Build JSX files +# Build JSX files and hydration node ./esbuild-prod.js -# Build hydration script -node ./esbuild-client-prod.js # Build tailwind ./node_modules/.bin/tailwindcss -i static/tailwind.css -o ./static/styles.css --minify # Send to remote -scp -r /home/mario/carpeta usuario@dominio.com:/home/usuario +# scp -r /home/mario/carpeta usuario@dominio.com:/home/usuario diff --git a/esbuild-client-prod.js b/esbuild-client-prod.js deleted file mode 100644 index 014c659..0000000 --- a/esbuild-client-prod.js +++ /dev/null @@ -1,22 +0,0 @@ -const { build } = require("esbuild"); -const { solidPlugin } = require("esbuild-plugin-solid"); - -build({ - platform: "browser", - entryPoints: [ - "src/views/hydration.ts", - ], - bundle: true, - minify: true, - logLevel: "info", - plugins: [ - solidPlugin({ - solid: { - generate: "dom", - hydratable: true, - }, - }) - ], - outdir: "static", - format: "cjs", -}); diff --git a/esbuild-client.js b/esbuild-client.js deleted file mode 100644 index 93c6ee9..0000000 --- a/esbuild-client.js +++ /dev/null @@ -1,27 +0,0 @@ -const { context } = require("esbuild"); -const { solidPlugin } = require("esbuild-plugin-solid"); - -(async () => { - const ctx = await context({ - platform: "browser", - entryPoints: [ - "src/views/hydration.ts", - ], - bundle: true, - minify: false, - logLevel: "info", - plugins: [ - solidPlugin({ - solid: { - generate: "dom", - hydratable: true, - }, - }) - ], - outdir: "static", - format: "cjs", - }); - - await ctx.watch(); - console.log("Watching hydration script..."); -})(); diff --git a/esbuild-prod.js b/esbuild-prod.js index 8f77546..b4e83b8 100644 --- a/esbuild-prod.js +++ b/esbuild-prod.js @@ -24,3 +24,23 @@ const { glob } = require("glob"); format: "cjs", }); })(); + +build({ + platform: "browser", + entryPoints: [ + "src/views/hydration.ts", + ], + bundle: true, + minify: true, + logLevel: "info", + plugins: [ + solidPlugin({ + solid: { + generate: "dom", + hydratable: true, + }, + }) + ], + outdir: "static", + format: "cjs", +}); diff --git a/esbuild.js b/esbuild.js index a02c5dc..9c19ef7 100644 --- a/esbuild.js +++ b/esbuild.js @@ -4,6 +4,9 @@ const path = require("path"); const fs = require("fs"); const { glob } = require("glob"); +/** + * Compile JSX files + */ (async() => { const files = await glob("dist/**/*.jsx"); console.log(files); @@ -25,53 +28,33 @@ const { glob } = require("glob"); }); await ctx.watch(); - console.log("Watching..."); + console.log("Watching Solid JSX..."); })(); -/* -glob("dist/** /*.jsx") - .then((files) => { - build({ - platform: "node", - entryPoints: files, - bundle: false, - minify: false, - logLevel: "info", - plugins: [solidPlugin({ +/** + * Generate hydration script + */ +(async () => { + const ctx = await context({ + platform: "browser", + entryPoints: [ + "src/views/hydration.ts", + ], + bundle: true, + minify: false, + logLevel: "info", + plugins: [ + solidPlugin({ solid: { - generate: "ssr", + generate: "dom", hydratable: true, }, - })], - outdir: "dist/src", - format: "cjs", - }); + }) + ], + outdir: "static", + format: "cjs", }); -*/ -/* -build({ - platform: "node", - entryPoints: [ - "src/main.ts", - ], - bundle: true, - minify: false, - logLevel: "info", - plugins: [solidPlugin({ - solid: { - generate: "ssr", - hydratable: true, - }, - })], - outdir: "dist", - format: "cjs", - external: [ - "@nestjs/*", - "@fastify/*", - "class-validator", - "class-transformer", - "cache-manager", - ], -}); - */ + await ctx.watch(); + console.log("Watching hydration script..."); +})(); diff --git a/src/certs/img/aguila_logo.png b/img/aguila_logo.png similarity index 100% rename from src/certs/img/aguila_logo.png rename to img/aguila_logo.png diff --git a/src/certs/img/cee_logo.png b/img/cee_logo.png similarity index 100% rename from src/certs/img/cee_logo.png rename to img/cee_logo.png diff --git a/src/certs/img/ceem_logo.jpg b/img/ceem_logo.jpg similarity index 100% rename from src/certs/img/ceem_logo.jpg rename to img/ceem_logo.jpg diff --git a/src/certs/img/colegio_ingenieros_logo.png b/img/colegio_ingenieros_logo.png similarity index 100% rename from src/certs/img/colegio_ingenieros_logo.png rename to img/colegio_ingenieros_logo.png diff --git a/src/certs/img/eate_logo.jpg b/img/eate_logo.jpg similarity index 100% rename from src/certs/img/eate_logo.jpg rename to img/eate_logo.jpg diff --git a/src/certs/img/eeg2_logo.png b/img/eeg2_logo.png similarity index 100% rename from src/certs/img/eeg2_logo.png rename to img/eeg2_logo.png diff --git a/src/certs/img/eeg_f_logo.png b/img/eeg_f_logo.png similarity index 100% rename from src/certs/img/eeg_f_logo.png rename to img/eeg_f_logo.png diff --git a/src/certs/img/eeg_logo.png b/img/eeg_logo.png similarity index 100% rename from src/certs/img/eeg_logo.png rename to img/eeg_logo.png diff --git a/src/certs/img/fondo_certificado.png b/img/fondo_certificado.png similarity index 100% rename from src/certs/img/fondo_certificado.png rename to img/fondo_certificado.png diff --git a/src/certs/img/matpel-logo.png b/img/matpel-logo.png similarity index 100% rename from src/certs/img/matpel-logo.png rename to img/matpel-logo.png diff --git a/src/certs/img/michigan_logo.png b/img/michigan_logo.png similarity index 100% rename from src/certs/img/michigan_logo.png rename to img/michigan_logo.png diff --git a/src/certs/img/mtc_logo.png b/img/mtc_logo.png similarity index 100% rename from src/certs/img/mtc_logo.png rename to img/mtc_logo.png diff --git a/src/certs/img/osha_logo.png b/img/osha_logo.png similarity index 100% rename from src/certs/img/osha_logo.png rename to img/osha_logo.png diff --git a/package.json b/package.json index db7899a..eacf777 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,7 @@ "test:cov": "jest --coverage", "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:watch": "node esbuild.js", - "ssr:hydration": "node esbuild-client.js", - "ssr": "concurrently \"node esbuild.js\" \"node esbuild-client.js\" \"tailwindcss -i static/tailwind.css -o ./static/styles.css --watch\"", + "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" }, diff --git a/sql/Dockerfile b/sql/Dockerfile new file mode 100644 index 0000000..7b6076c --- /dev/null +++ b/sql/Dockerfile @@ -0,0 +1,7 @@ +FROM mysql:debian + +# docker run --name eegsac -p 3306:3306 -e MYSQL_ROOT_PASSWORD=123456789 -d mysql:debian + +# sudo docker exec -it CONTAINER bash +# mysql -u root --password=123456789 +# cat backup.sql | sudo docker exec -i d53031d77ce5 /usr/bin/mysql -u root --password=123456789 educa7ls_plataforma diff --git a/src/certs/MATPEL.ts b/src/certs/MATPEL.ts index 7259d7b..95f6eee 100644 --- a/src/certs/MATPEL.ts +++ b/src/certs/MATPEL.ts @@ -235,10 +235,6 @@ export async function matpelCert(props: CertData): Promise { horizontal: FrameAnchorType.MARGIN, vertical: FrameAnchorType.MARGIN, }, - alignment: { - x: HorizontalPositionAlign.CENTER, - y: VerticalPositionAlign.TOP, - }, }, children: [ new TextRun({ diff --git a/src/certs/utils.ts b/src/certs/utils.ts index 6325d2f..a94e13e 100644 --- a/src/certs/utils.ts +++ b/src/certs/utils.ts @@ -29,7 +29,8 @@ type ImgConfig = { export function getImage(data: ImgConfig): ImageRun { return new ImageRun({ - data: fs.readFileSync(join(__dirname, "img", data.name)), + // Magic path, based on dist folder + data: fs.readFileSync(join(__dirname, "..", "..", "..", "img", data.name)), transformation: { height: cm(data.height), width: cm(data.width), diff --git a/src/views/hydration.ts b/src/views/hydration.ts index 9e7b2d5..293e57d 100644 --- a/src/views/hydration.ts +++ b/src/views/hydration.ts @@ -1,3 +1,8 @@ +/** + * This file generates a hidration script, which must + * then be sent to the client. + */ + import {hydrate} from "solid-js/web"; import {Certs} from "./Certs";