Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .github/workflows/cms-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build & push CMS docker images
run: make docker-cms ENVIRONMENT=-dev
run: make docker-cms ENVIRONMENT=-dev NEXT_PUBLIC_SERVER_URL=${{ secrets.DEV_CMS_SERVER_URL }}

deploy:
needs: build-cms
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ docker: ## Build and push landing docker images.
make build push

build-cms: ## Build utexo CMS docker image.
docker build -f ./cms/Dockerfile -t $(IMAGE_UTEXO_CMS_BACKUP) ./cms && \
docker build -f ./cms/Dockerfile -t $(IMAGE_UTEXO_CMS_LATEST) ./cms
docker build --build-arg NEXT_PUBLIC_SERVER_URL=$(NEXT_PUBLIC_SERVER_URL) -f ./cms/Dockerfile -t $(IMAGE_UTEXO_CMS_BACKUP) ./cms && \
docker build --build-arg NEXT_PUBLIC_SERVER_URL=$(NEXT_PUBLIC_SERVER_URL) -f ./cms/Dockerfile -t $(IMAGE_UTEXO_CMS_LATEST) ./cms

push-cms: ## Push utexo CMS docker image.
docker push $(IMAGE_UTEXO_CMS_BACKUP) && \
Expand Down
15 changes: 13 additions & 2 deletions cms/.env.example
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
# PostgreSQL connection string
DATABASE_URL=postgresql://payload:payload_dev@postgres:5432/payload_cms
DATABASE_URL=

# Secret key for Payload (generate a random string for production)
PAYLOAD_SECRET=your-secret-here
PAYLOAD_SECRET=

# Initial admin/user credentials
SEED_USER_EMAIL=
SEED_USER_PASSWORD=

# SMTP / Email
SMTP_HOST=
SMTP_PORT=
SMTP_USER=
SMTP_PASS=
SMTP_FROM_ADDRESS=
SMTP_DEBUG=

# Public server URL (used for email links, etc.)
NEXT_PUBLIC_SERVER_URL=
3 changes: 2 additions & 1 deletion cms/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ ENV NEXT_TELEMETRY_DISABLED=1
# Dummy env vars for build (real values passed at runtime)
ENV DATABASE_URL=postgresql://placeholder:placeholder@localhost:5432/placeholder
ENV PAYLOAD_SECRET=placeholder-secret-for-build-only
ENV NEXT_PUBLIC_SERVER_URL=https://cms.dev.utexo.com
ARG NEXT_PUBLIC_SERVER_URL=https://placeholder.example.com
ENV NEXT_PUBLIC_SERVER_URL=$NEXT_PUBLIC_SERVER_URL

RUN npm run build

Expand Down
36 changes: 36 additions & 0 deletions cms/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 4 additions & 2 deletions cms/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
"migrate:create": "payload migrate:create"
},
"dependencies": {
"@payloadcms/db-postgres": "3.84.1",
"@payloadcms/email-nodemailer": "^3.84.1",
"@payloadcms/next": "3.84.1",
"@payloadcms/richtext-lexical": "3.84.1",
"@payloadcms/ui": "3.84.1",
Expand All @@ -31,13 +33,13 @@
"payload": "3.84.1",
"react": "19.2.6",
"react-dom": "19.2.6",
"sharp": "0.34.2",
"@payloadcms/db-postgres": "3.84.1"
"sharp": "0.34.2"
},
"devDependencies": {
"@playwright/test": "1.58.2",
"@testing-library/react": "16.3.0",
"@types/node": "22.19.9",
"@types/nodemailer": "^8.0.0",
"@types/react": "19.2.14",
"@types/react-dom": "19.2.3",
"@vitejs/plugin-react": "4.5.2",
Expand Down
19 changes: 19 additions & 0 deletions cms/src/payload.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import path from 'path'
import { buildConfig } from 'payload'
import { fileURLToPath } from 'url'
import sharp from 'sharp'
import { nodemailerAdapter } from '@payloadcms/email-nodemailer'

import { Users } from './collections/Users'
import { Media } from './collections/Media'
Expand All @@ -15,6 +16,7 @@ const filename = fileURLToPath(import.meta.url)
const dirname = path.dirname(filename)

export default buildConfig({
serverURL: process.env.NEXT_PUBLIC_SERVER_URL,
cors: ['https://dev.utexo.com', 'https://utexo.com'],
admin: {
user: Users.slug,
Expand Down Expand Up @@ -52,4 +54,21 @@ export default buildConfig({
}),
sharp,
plugins: [],
email: nodemailerAdapter({
defaultFromAddress: process.env.SMTP_FROM_ADDRESS || 'email-collector@utexo.com',
defaultFromName: 'Utexo CMS',

transportOptions: {
host: process.env.SMTP_HOST,
port: Number(process.env.SMTP_PORT),
secure: false,

auth: {
user: process.env.SMTP_USER,
pass: process.env.SMTP_PASS,
},
logger: process.env.SMTP_DEBUG === 'true',
debug: process.env.SMTP_DEBUG === 'true',
},
}),
})
2 changes: 1 addition & 1 deletion new-branding/src/components/common/Navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export class NavigationItem {
public submenu?: NavigationItem[],
) {}
}
export const additionalNavigation: NavigationItem[] = [new NavigationItem("Contact", "/contact-sales"), new NavigationItem("Mint USDT", "/mint")];
export const additionalNavigation: NavigationItem[] = [new NavigationItem("Mint USDT", "/mint"), new NavigationItem("Blog", "/blog"), new NavigationItem("Contact", "/contact-sales")];

const FOCUSABLE_SELECTOR = 'a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex="-1"])';

Expand Down
Loading