From 1636e66eb4bc7a4ef83cd6d44e9fd996c2a6cf3c Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Tue, 18 Oct 2022 15:58:57 +0200 Subject: [PATCH 1/2] Docker --- .DS_Store | Bin 6148 -> 0 bytes .gitignore | 1 + Dockerfile | 14 ++ public/.DS_Store | Bin 6148 -> 0 bytes public/css/pdf.css | 348 ++++++++++++++++++++-------------------- public/images/.DS_Store | Bin 6148 -> 0 bytes 6 files changed, 189 insertions(+), 174 deletions(-) delete mode 100644 .DS_Store create mode 100644 Dockerfile delete mode 100644 public/.DS_Store delete mode 100644 public/images/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index ec0fd92b4a18c51bcb11757acaf9544d2a711047..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKOHRWu5FOKxqPB}7gkYH^8<4t%O{m%hJER@}`bkTnZ7NF3HXH7MkT?Jmx8MjI zg#*Bwv5VrQMXXSTJd*tq=gm0t?AS38srtNEBdQXShr*aIp;}@5oJ+>GOv?^XNsPO* zQPk~>qE3eE8k_=7fz4BZzuf{IQICc+qvZF?OTr1t!KawKdLGP>CbUR==gfOq!5biA zDxTU)@k)p%Ja7ky8__L=c5L;q!e>HL8vo$)k@6{08y-{ic1<%ozU26r$kBrqAuU)9 znp2`z|VVxglq~+()Ip!Ak)rStq$nJ+{ro}I!pE-5FglZ`+ zW~9X}h{_?|XH-J|7IQftHUqI|vw3BWu67DI1)Kuk3h?^iqc8>rV~w(Oppqj1Fpp+2 zT=NeB`}hU}gRw?Dfhp|@)UL`LF_d;kyKi`b!C0eqCuI&F%Ji(v2}Mcoi0=!XRG`t- zP64NYtw2uSR(bz#u0Q|VPVUYr;1u{*3aEUe)u`(0)MK&7yM84JOBUy diff --git a/.gitignore b/.gitignore index 8e4976f..afb1cfc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /one/ desktop.ini public/images/hamburgermenu-l.png +.history \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..eaeb764 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,14 @@ +# syntax=docker/dockerfile:1 + +FROM node:12.18.1 +ENV NODE_ENV=production + +WORKDIR /app + +COPY ["package.json", "package-lock.json*", "./"] + +RUN npm install --production + +COPY . . + +CMD [ "node", "server.js" ] diff --git a/public/.DS_Store b/public/.DS_Store deleted file mode 100644 index 80c3d845253d803a3522762afde03eba293b6cb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHK!A=4(5N!dmi!pLAkz+63I6yQA2a^rr!JEk%J*a`*KwuNtCG6rx5wpLcf8-bV zJI=I)grEm6#>h-Eebeboo4(z2TE-Y}PPv}w-!x~zsLZ7yFByRh`FrKR=?l7Hy-*?T&aBUOg6Wb-xi`E3cH1SXAmY%?8eim z=}vC3cj?9h&)8RCI9%GUckTC*c5(kK3}V+0dJ~oGcY6?WcjE`$FlmOoK_RIWNPc$=CIaE&<-dH#-$pU kDPX8l46#^>OQ1@?FVO(B4W=5w140)8MFTa&z^^j!2~d|(VE_OC diff --git a/public/css/pdf.css b/public/css/pdf.css index a3e52e0..721c295 100644 --- a/public/css/pdf.css +++ b/public/css/pdf.css @@ -1,175 +1,175 @@ -:root{ - --main-bg-color: rgb(60, 198, 140); - --main-bg-color: #e88649; - --main-logo-color: rgb(109, 108, 104); - - --text-color: rgb(235, 232, 217); - --text-title-color: rgb(128, 127, 124); - --text-body-title-color: rgb(235, 232, 217); - --text-shadow-color: rgb(213, 211, 200); - - --main-a-color: #ffeb5c; - --main-a-hover-color: rgb(197, 197, 195); - - --text-background-color:#49d0a7; - - --content-container-color: #e88649; - --cv-items-color: rgba(155, 154, 153, 0); - --cv-title-color: #68ceafaf; - --cv-body-color: rgb(235, 232, 217); - --cv-year-color: rgb(207, 202, 134); - - --footer-bg-color: rgb(49, 49, 45); - --footer-text-color: rgb(235, 232, 217); - } - - -body { - background-color: var(--main-bg-color); - font-family: 'Jetbrains Mono'; -} -@page { - size: 21cm 29.7cm; - margin: 0mm 10mm 0mm 10mm; -} - -.afour{ - page-break-after: always; - -} -h1{ - color: var(--main-a-color); -} -h2{ - color: var(--main-a-color); -} - -h3{ - color: var(--text-color); -} - -p { - font-size: 1.1rem; - color: var(--text-color); -} - -a{ - color: var(--main-a-color); -} - -a:hover{ - color:var(--main-a-hover-color); -} - -a:visited{ - color: var(--main-a-color); -} - -.logo{ - float: right; - height: 100px; - margin: 10px; - background-color: var(--main-logo-color); - border-radius: 15px; - padding: 10px; - box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); -} -.print{ - display: inline-block; - margin:10px 0px 0px 20px; - padding: 5px 5px 5px 5px; - height: 70px; - width: 70px; - border-radius: 15px; -} -.print:hover{ - background-color: #ffffff; -} - -.pdf-image-container{ - display: inline; - padding: 20px; -} -.pdf-image{ - - padding: 0px; - height: 300px; - border: 2px solid var(--main-a-color); - border-radius: 15px; - } - - .title-container{ - display: inline-block; - padding: 20px; - } - -.pdf-body{ - display: inline-block; - margin: 0px; - padding-top: 30px; - padding-bottom: 40px; - padding-left: 20px; -} - -.cv-items{ - padding: 20px; - border: 0px solid; - border-radius: 4px; - background-color: var(--cv-items-color); - margin: 10px; -} - -.cvTitle{ - background-color: var(--cv-title-color); - font-weight: bold; - font-size: 1.2rem; - border-top-left-radius: 4px; - border-top-right-radius: 4px; -} -.cvYear{ - background-color: var(--cv-year-color); -} - -.cvBody{ - background-color: var(--cv-body-color); - border-bottom-left-radius: 4px; - border-bottom-right-radius: 4px; - padding: 20px; -} - -.cvBody a{ - color: #000; -} -.cvBody p{ - color: var(--text-title-color); -} - -div.footer { - position: fixed; - bottom: 0; - left: 0; - width: 100%; - padding: 0px; - text-align: center; - z-index: 1; - background-color: var(--footer-bg-color); - font-size:0.7em; - color: var(--footer-text-color); - overflow:hidden ; -} - -@media print{ - .print{ - display: none; - } - .logo{ - display: none; - } - .afour{ - padding-top: 10px; - } - .pdf-image{ - padding: 0px; - height: 250px; - } +:root{ + --main-bg-color: rgb(60, 198, 140); + --main-bg-color: #e88649; + --main-logo-color: rgb(109, 108, 104); + + --text-color: rgb(235, 232, 217); + --text-title-color: rgb(128, 127, 124); + --text-body-title-color: rgb(235, 232, 217); + --text-shadow-color: rgb(213, 211, 200); + + --main-a-color: #ffeb5c; + --main-a-hover-color: rgb(197, 197, 195); + + --text-background-color:#49d0a7; + + --content-container-color: #e88649; + --cv-items-color: rgba(155, 154, 153, 0); + --cv-title-color: #68ceafaf; + --cv-body-color: rgb(235, 232, 217); + --cv-year-color: rgb(207, 202, 134); + + --footer-bg-color: rgb(49, 49, 45); + --footer-text-color: rgb(235, 232, 217); + } + + +body { + background-color: var(--main-bg-color); + font-family: 'Jetbrains Mono'; +} +@page { + size: 21cm 29.7cm; + margin: 0mm 10mm 0mm 10mm; +} + +.afour{ + page-break-after: always; + +} +h1{ + color: var(--main-a-color); +} +h2{ + color: var(--main-a-color); +} + +h3{ + color: var(--text-color); +} + +p { + font-size: 1.1rem; + color: var(--text-color); +} + +a{ + color: var(--main-a-color); +} + +a:hover{ + color:var(--main-a-hover-color); +} + +a:visited{ + color: var(--main-a-color); +} + +.logo{ + float: right; + height: 100px; + margin: 10px; + background-color: var(--main-logo-color); + border-radius: 15px; + padding: 10px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); +} +.print{ + display: inline-block; + margin:10px 0px 0px 20px; + padding: 5px 5px 5px 5px; + height: 70px; + width: 70px; + border-radius: 15px; +} +.print:hover{ + background-color: #ffffff; +} + +.pdf-image-container{ + display: inline; + padding: 20px; +} +.pdf-image{ + + padding: 0px; + height: 300px; + border: 2px solid var(--main-a-color); + border-radius: 15px; + } + + .title-container{ + display: inline-block; + padding: 20px; + } + +.pdf-body{ + display: inline-block; + margin: 0px; + padding-top: 30px; + padding-bottom: 40px; + padding-left: 20px; +} + +.cv-items{ + padding: 20px; + border: 0px solid; + border-radius: 4px; + background-color: var(--cv-items-color); + margin: 10px; +} + +.cvTitle{ + background-color: var(--cv-title-color); + font-weight: bold; + font-size: 1.2rem; + border-top-left-radius: 4px; + border-top-right-radius: 4px; +} +.cvYear{ + background-color: var(--cv-year-color); +} + +.cvBody{ + background-color: var(--cv-body-color); + border-bottom-left-radius: 4px; + border-bottom-right-radius: 4px; + padding: 20px; +} + +.cvBody a{ + color: #000; +} +.cvBody p{ + color: var(--text-title-color); +} + +div.footer { + position: fixed; + bottom: 0; + left: 0; + width: 100%; + padding: 0px; + text-align: center; + z-index: 1; + background-color: var(--footer-bg-color); + font-size:0.7em; + color: var(--footer-text-color); + overflow:hidden ; +} + +@media print{ + .print{ + display: none; + } + .logo{ + display: none; + } + .afour{ + padding-top: 10px; + } + .pdf-image{ + padding: 0px; + height: 250px; + } } \ No newline at end of file diff --git a/public/images/.DS_Store b/public/images/.DS_Store deleted file mode 100644 index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3 zem<@ulZcFPQ@L2!n>{z**++&mCkOWA81W14cNZlEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ zLs35+`xjp>T0 Date: Tue, 18 Oct 2022 16:03:36 +0200 Subject: [PATCH 2/2] docker --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index eaeb764..84f1410 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,8 @@ ENV NODE_ENV=production WORKDIR /app +RUN git clone https://github.com/CodeByMini/codebymini + COPY ["package.json", "package-lock.json*", "./"] RUN npm install --production