2 Commits

Author SHA1 Message Date
f8987b08da Add persistent flag of origin
All checks were successful
Publish Docker Image / Publish Docker Image (push) Successful in 1m12s
2024-10-17 21:36:50 -04:00
cbf75acbeb Fix empty images section if no images + Remove postgres port 2024-10-17 20:46:34 -04:00
12 changed files with 58 additions and 23 deletions

View File

@ -18,6 +18,8 @@ PRISMA_HIDE_UPDATE_MESSAGE=true
FIRST_NAME=firstname
LAST_NAME=lastname
COUNTRY=US
SMTP_HOST=smtp.example.com
SMTP_PORT=465
SMTP_SECURE=true

View File

@ -6,6 +6,8 @@
FIRST_NAME=firstname
LAST_NAME=lastname
COUNTRY=US
SMTP_HOST=smtp.example.com
SMTP_PORT=465
SMTP_SECURE=true

View File

@ -21,9 +21,10 @@ services:
- API_PROXY_TARGET=http://localhost:8911
- MAX_HTTP_CONNECTIONS_PER_MINUTE=60
- SESSION_SECRET=super_secret_session_key_change_me_in_production_please
- DATABASE_URL=postgresql://redwood:changeme@db:5432/portfolio
- DATABASE_URL=postgresql://redwood:changeme@db/portfolio
- FIRST_NAME=first name # Your first name
- LAST_NAME=lastname # Your last name
- COUNTRY=US # ISO-3166-1 alpha-2 country code, https://en.wikipedia.org/wiki/ISO_3166-1#Codes
- SMTP_HOST=smtp.example.com
- SMTP_PORT=465
- SMTP_SECURE=true
@ -58,8 +59,6 @@ services:
- POSTGRES_USER=redwood
- POSTGRES_PASSWORD=changeme
- POSTGRES_DB=portfolio
ports:
- 5432:5432
volumes:
- postgres:/var/lib/postgresql/data
@ -75,9 +74,9 @@ sudo docker exec -u root portfolio chown -R node:node /home/node/app/api/files_p
## Logging In
- Once the container is up and running, head to `/login` (`https://portfolio.example.com/login`), default credentials are below
- If you would like to change the password, head to `/forgot-password` (`https://portfolio.example.com/forgot-password`), the username is `admin`
- If you correctly set up the Gmail app password, you should receive an email from yourself
- It contains the link needed to change your password
- If you correctly configured [SMTP](#smtp), you should receive an Email from [`EMAIL_FROM`](#docker-compose) to [`EMAIL_TO`](#docker-compose)
- The Email contains the link needed to change your password
### Default Credentials
**Username:** `admin`
**Password:** [`SMTP_PASSWORD`](#smtp)
**Password:** [`SMTP_PASSWORD`](#docker-compose)

View File

@ -11,6 +11,7 @@
"@redwoodjs/graphql-server": "8.4.0",
"@tus/file-store": "^1.4.0",
"@tus/server": "^1.7.0",
"country-flag-icons": "^1.5.13",
"graphql-scalars": "^1.23.0",
"nodemailer": "^6.9.14"
},

View File

@ -10,6 +10,13 @@ import { createServer } from '@redwoodjs/api-server'
import { logger } from 'src/lib/logger'
import { handleTusUpload } from 'src/lib/tus'
;(async () => {
const { hasFlag } = await import('country-flag-icons')
if (!hasFlag(process.env.COUNTRY))
throw new Error(
'Invalid COUNTRY environment variable, please select a valid ISO-3166-1 alpha-2 country code\n See https://en.wikipedia.org/wiki/ISO_3166-1#Codes'
)
const server = await createServer({
logger,
configureApiServer: async (server) => {

View File

@ -9,9 +9,10 @@ services:
- API_PROXY_TARGET=http://localhost:8911
- MAX_HTTP_CONNECTIONS_PER_MINUTE=60
- SESSION_SECRET=super_secret_session_key_change_me_in_production_please
- DATABASE_URL=postgresql://redwood:changeme@db:5432/portfolio
- DATABASE_URL=postgresql://redwood:changeme@db/portfolio
- FIRST_NAME=first name # Your first name
- LAST_NAME=lastname # Your last name
- COUNTRY=US # ISO-3166-1 alpha-2 country code, https://en.wikipedia.org/wiki/ISO_3166-1#Codes
- SMTP_HOST=smtp.example.com
- SMTP_PORT=465
- SMTP_SECURE=true
@ -46,8 +47,6 @@ services:
- POSTGRES_USER=redwood
- POSTGRES_PASSWORD=changeme
- POSTGRES_DB=portfolio
ports:
- 5432:5432
volumes:
- postgres:/var/lib/postgresql/data

View File

@ -9,7 +9,7 @@
title = "${FIRST_NAME} ${LAST_NAME}"
port = 8910
apiUrl = "/api"
includeEnvironmentVariables = ["FIRST_NAME", "LAST_NAME", "API_ADDRESS_PROD", "API_ADDRESS_DEV"]
includeEnvironmentVariables = ["FIRST_NAME", "LAST_NAME", "COUNTRY", "API_ADDRESS_PROD", "API_ADDRESS_DEV"]
[generate]
tests = false
stories = false

View File

@ -35,6 +35,7 @@
"@uppy/react": "^4.0.1",
"@uppy/tus": "^4.0.0",
"@uppy/webcam": "^4.0.1",
"country-flag-icons": "^1.5.13",
"date-fns": "^4.1.0",
"humanize-string": "2.1.0",
"react": "18.3.1",

View File

@ -69,20 +69,23 @@ const Project = ({ project }: Props) => {
</div>
</>
)}
<h2 className="sm:hidden font-bold text-3xl text-center">Images</h2>
{project.images.length > 0 && (
<h2 className="sm:hidden font-bold text-3xl text-center">Images</h2>
)}
</div>
<div className="flex flex-wrap gap-4 items-center pt-8 justify-center">
{project.images.map((image, i) => (
<a
href={image}
target="_blank"
rel="noreferrer"
key={i}
className="rounded-xl"
>
<img src={image} alt="" className="rounded-xl" />
</a>
))}
<div className="flex flex-wrap gap-4 pt-8 justify-center h-fit">
{project.images.length > 0 &&
project.images.map((image, i) => (
<a
href={image}
target="_blank"
rel="noreferrer"
key={i}
className="rounded-xl"
>
<img src={image} alt="" className="rounded-xl" />
</a>
))}
</div>
</div>
)

View File

@ -1,3 +1,4 @@
import { hasFlag } from 'country-flag-icons'
import { hydrateRoot, createRoot } from 'react-dom/client'
import App from 'src/App'
@ -15,6 +16,11 @@ if (!redwoodAppElement)
"exists in your 'web/src/index.html' file."
)
if (!hasFlag(process.env.COUNTRY))
throw new Error(
'Invalid COUNTRY environment variable, please select a valid ISO-3166-1 alpha-2 country code\n See https://en.wikipedia.org/wiki/ISO_3166-1#Codes'
)
if (redwoodAppElement.children?.length > 0)
hydrateRoot(redwoodAppElement, <App />)
else {

View File

@ -1,5 +1,6 @@
import { mdiCompass, mdiContacts } from '@mdi/js'
import Icon from '@mdi/react'
import getUnicodeFlagIcon from 'country-flag-icons/unicode'
import { Link, routes } from '@redwoodjs/router'
import { Metadata } from '@redwoodjs/web'
@ -44,6 +45,11 @@ const HomePage = () => (
{getLogoComponent('gitea')}
</a>
</div>
<div className="fixed bottom-2 right-2 z-10">
<p className="btn btn-square text-xl">
{getUnicodeFlagIcon(process.env.COUNTRY)}
</p>
</div>
</>
)

View File

@ -7336,6 +7336,7 @@ __metadata:
"@tus/file-store": "npm:^1.4.0"
"@tus/server": "npm:^1.7.0"
"@types/nodemailer": "npm:^6.4.15"
country-flag-icons: "npm:^1.5.13"
graphql-scalars: "npm:^1.23.0"
nodemailer: "npm:^6.9.14"
languageName: unknown
@ -9061,6 +9062,13 @@ __metadata:
languageName: node
linkType: hard
"country-flag-icons@npm:^1.5.13":
version: 1.5.13
resolution: "country-flag-icons@npm:1.5.13"
checksum: 10c0/beee2fe225469507d6c8df90376e031f08a5f103f65cd68e1db0679e82d4ffb2fbb27a3bb19defd112745b5c19d1972df615df21813c8c2074062dd5eb08eabb
languageName: node
linkType: hard
"crc-32@npm:^1.2.0":
version: 1.2.2
resolution: "crc-32@npm:1.2.2"
@ -19234,6 +19242,7 @@ __metadata:
"@uppy/tus": "npm:^4.0.0"
"@uppy/webcam": "npm:^4.0.1"
autoprefixer: "npm:^10.4.20"
country-flag-icons: "npm:^1.5.13"
daisyui: "npm:^4.12.10"
date-fns: "npm:^4.1.0"
humanize-string: "npm:2.1.0"