Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Optimize template images + disable image optim docker #313

Merged
merged 3 commits into from
Feb 6, 2024
Merged

Optimize template images + disable image optim docker #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85e1216
Optimize template images + disable image optim docker
JhumanJ Feb 6, 2024
78b401e
Fix new name default docker env variable name
JhumanJ Feb 6, 2024
fb717b4
Re-establish template page cache
JhumanJ Feb 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ADD client/package.json client/package-lock.json ./
RUN npm install

ADD client /app/
RUN cp .env.docker .env
RUN npm run build

# syntax=docker/dockerfile:1.3-labs
Expand Down
1 change: 1 addition & 0 deletions client/.env.docker
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ NUXT_PUBLIC_GOOGLE_ANALYTICS_CODE=
NUXT_PUBLIC_H_CAPTCHA_SITE_KEY=
NUXT_PUBLIC_PAID_PLANS_ENABLED=false
NUXT_PUBLIC_S3_ENABLED=false
NUXT_PUBLIC_IMAGE_OPTIMIZATION_DISABLED=true
NUXT_API_SECRET=
4 changes: 2 additions & 2 deletions client/components/pages/templates/SingleTemplate.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
</div>

<div class="aspect-[4/3] rounded-lg shadow-sm overflow-hidden">
<img class="group-hover:scale-110 transition-all duration-200 h-full object-cover w-full"
:src="template.image_url" alt=""
<NuxtImg class="group-hover:scale-110 transition-all duration-200 h-full object-cover w-full" v-if="template.image_url"
:src="template.image_url" alt="" width="450px"
/>
</div>
<p
Expand Down
21 changes: 21 additions & 0 deletions client/lib/images/dummy-image-provider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { joinURL } from 'ufo'
import { createOperationsGenerator } from '#image'

const operationsGenerator = createOperationsGenerator()

export const getImage = (
src,
{ modifiers = {}, baseURL } = {}
) => {

if (!baseURL) {
// also support runtime config
baseURL = useRuntimeConfig().public.siteUrl
}

const operations = operationsGenerator(modifiers)

return {
url: joinURL(baseURL, src + (operations ? '?' + operations : '')),
}
}
11 changes: 10 additions & 1 deletion client/nuxt.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,17 @@ export default defineNuxtConfig({
}
}
},
image: {
image: runtimeConfig.public.useDummyImageProvider ? {
provider: 'dummy',
providers: {
dummy: {
provider: '~/lib/dummy-image-provider.js',
}
}
} :{
quality: 95,
format: 'webp',
domains: ['images.unsplash.com']
},
sourcemap: true,
vite: {
Expand Down
6 changes: 3 additions & 3 deletions client/pages/templates/[slug].vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@
<section class="pt-12 bg-gray-50 sm:pt-16 border-b pb-[250px] relative">
<div class="px-4 mx-auto sm:px-6 lg:px-8 max-w-7xl">
<div class="flex flex-col items-center justify-center max-w-4xl gap-8 mx-auto md:gap-12 md:flex-row">
<div class="aspect-[4/3] shrink-0 rounded-lg shadow-sm overflow-hidden group max-w-xs">
<img class="object-cover w-full h-full transition-all duration-200 group-hover:scale-110"
:src="template.image_url" alt="Template cover image"
<div class="aspect-[4/3] shrink-0 rounded-lg shadow-sm overflow-hidden group max-w-sm">
<NuxtImg class="object-cover w-full transition-all duration-200 group-hover:scale-110 h-[240px]"
:src="template.image_url" alt="Template cover image" width="500px" height="380px"
/>
</div>

Expand Down
1 change: 1 addition & 0 deletions client/runtimeConfig.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export default {
s3Enabled: process.env.NUXT_PUBLIC_S3_ENABLED || false,
paidPlansEnabled: process.env.NUXT_PUBLIC_PAID_PLANS_ENABLED || false,
customDomainsEnabled: process.env.NUXT_PUBLIC_CUSTOM_DOMAINS_ENABLED || false,
useDummyImageProvider: process.env.NUXT_PUBLIC_IMAGE_OPTIMIZATION_DISABLED || false,

// Config within public will be also exposed to the client
SENTRY_DSN_PUBLIC: process.env.SENTRY_DSN_PUBLIC,
Expand Down
5 changes: 2 additions & 3 deletions docker/nuxt-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,9 @@ nvm use 20
cd /app/nuxt/server/

. /app/client/.env
[ "x$NUXT_API_SECRET" != "x" ] || generate-api-secret.sh

sed 's/^/export /' < /app/.nuxt.env > env.sh
[ "x$NUXT_API_SECRET" != "x" ] || generate-api-secret.sh

. env.sh
eval $(sed 's/^/export /' < /app/client/.env)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Directly exporting environment variables using eval and sed simplifies the process but ensure .env file format is compatible and does not contain complex shell commands or expressions that could lead to execution or injection vulnerabilities.


node index.mjs
Loading