From cd2950074ba054b2008609d0b3f16ac8bfc9ddf5 Mon Sep 17 00:00:00 2001 From: E Date: Sat, 11 Sep 2021 21:24:21 +0100 Subject: [PATCH] Fix contact, edit Dockerfile, and package.json, fix small bugs in pages --- Dockerfile | 2 +- package.json | 4 +--- views/about.pug | 4 ++-- views/contact.pug | 27 ++++++++++++++------------- views/index.pug | 2 +- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7766a6c..a94b47c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ ENV NODE_ENV=production WORKDIR /app COPY ["package.json", "package-lock.json*", "./"] -RUN npm install && npm install nodemon +RUN npm install && npm build-tails && npm install nodemon COPY . . CMD [ "npm", "start" ] diff --git a/package.json b/package.json index 8fdedac..e81a2a4 100644 --- a/package.json +++ b/package.json @@ -30,9 +30,7 @@ "nodemailer": "^6.6.0", "pug": "^3.0.2", "tailwind-hamburgers": "^1.1.1", - "winston": "^3.3.3" - }, - "devDependencies": { + "winston": "^3.3.3", "autoprefixer": "^10.3.4", "npm-watch": "^0.11.0", "postcss-cli": "^8.3.1", diff --git a/views/about.pug b/views/about.pug index bd7df0b..68d2704 100644 --- a/views/about.pug +++ b/views/about.pug @@ -40,7 +40,7 @@ block content img(class="w-2/3" src=val.feature_image) else img(src="/images/logo.png") - div + div.mb-5 a(href=val.url) h1.font-sans.text-3xl.mt-3.mb-3 #{val.title} p.text-lg #{val.excerpt} @@ -56,7 +56,7 @@ block content img(class="w-2/3" src=val.feature_image) else img(src="/images/logo.png") - div + div.mb-5 a(href=val.url) h1.font-sans.text-3xl.mt-3.mb-3 #{val.title} p.text-lg #{val.excerpt} diff --git a/views/contact.pug b/views/contact.pug index 7e1defe..8047aa1 100644 --- a/views/contact.pug +++ b/views/contact.pug @@ -24,29 +24,30 @@ block nav-links span Contact block content - div + div.w-full div h1.font-sans.text-6xl.wavy.mb-10 Contact. div form#contact-form(action='/contact' method='post' role='form') - .form-group + div.mb-5 label Name - .form-row - .col - input#fname(name='firstname' class="form-control" type='text' placeholder='First name' required="true") - .col - input#lname(name='lastname' class="form-control" type='text' placeholder='Last name' required="true") + div(class="sm:flex sm:flex-row") + .flex.w-full + input#fname(class="w-full border-2 border-pink bg-black p-2 text-base" name='firstname' class="form-control" type='text' placeholder='First name' required="true") + div(class="mb-3 sm:mb-0 sm:ml-5") + .flex.w-full + input#lname(class="w-full border-2 border-pink bg-black p-2 text-base" name='lastname' class="form-control" type='text' placeholder='Last name' required="true") - .form-group + div.mb-5 label(for='email') Email - input#email(name='email' class="form-control" type='text' placeholder='Email (example@email.com)' required='true' pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$") - .form-group + input#email(class="w-full border-2 border-pink bg-black p-2 text-base" name='email' class="form-control" type='text' placeholder='Email (example@email.com)' required='true' pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,4}$") + div.mb-5 label(for='message') Message - textarea#message(name='message' class="form-control" placeholder='Enter your message here' rows='3' required='true') - .form-group(style="margin-bottom: 0.5rem") + textarea#message(class="w-full border-2 border-pink bg-black p-2 text-base" name='message' class="form-control" placeholder='Enter your message here' rows='3' required='true') + div.mb-5 .h-captcha(data-sitekey='49abba50-1813-4ab3-acbf-2a8bfff1f7c3') - button(type='submit' class="button-c") Submit + button(type='submit' class="rounded-lg px-3 py-2 bg-pink text-black text-lg hover:ring-pink hover:ring-2 hover:bg-black hover:text-pink") Submit div if message diff --git a/views/index.pug b/views/index.pug index 2d5902a..7970be9 100644 --- a/views/index.pug +++ b/views/index.pug @@ -22,7 +22,7 @@ block nav-links block content div(class="flex sm:w-2/4 items-center sm:my-0 mt-10 mb-16") - div.text-3xl + div.text-2xl h1(class="font-sans text-7xl pb-5 sm:pb-10") | Hello, br