From b9bdf36872f2f09baa95aa034b3ba9aef566d4c3 Mon Sep 17 00:00:00 2001 From: Markus Thielker Date: Fri, 8 Mar 2024 21:54:36 +0100 Subject: [PATCH] N-FIN-1: customise template --- .../docker-image-build-and-push.yaml | 2 +- README.md | 20 ++--------- docker/{base-dev => finances-dev}/.gitignore | 0 .../docker-compose.yaml | 4 +-- .../{base-prod => finances-prod}/.gitignore | 0 .../docker-compose.yaml | 34 +++++++++---------- package-lock.json | 4 +-- package.json | 2 +- public/next.svg | 6 ---- public/vercel.svg | 4 --- src/app/layout.tsx | 5 +-- src/app/page.tsx | 2 +- 12 files changed, 29 insertions(+), 54 deletions(-) rename docker/{base-dev => finances-dev}/.gitignore (100%) rename docker/{base-dev => finances-dev}/docker-compose.yaml (83%) rename docker/{base-prod => finances-prod}/.gitignore (100%) rename docker/{base-prod => finances-prod}/docker-compose.yaml (51%) delete mode 100644 public/next.svg delete mode 100644 public/vercel.svg diff --git a/.github/workflows/docker-image-build-and-push.yaml b/.github/workflows/docker-image-build-and-push.yaml index 68181c5..125cfe2 100644 --- a/.github/workflows/docker-image-build-and-push.yaml +++ b/.github/workflows/docker-image-build-and-push.yaml @@ -41,4 +41,4 @@ jobs: with: push: true platforms: linux/amd64 - tags: markusthielker/next-base:latest, markusthielker/next-base:${{ steps.versions.outputs.tag_version }} + tags: markusthielker/next-finances:latest, markusthielker/next-finances:${{ steps.versions.outputs.tag_version }} diff --git a/README.md b/README.md index 22b89b2..1539d89 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,3 @@ -# Next-Base +# Next-Finances -A base implementation of my favorite NextJS stack. - -- [NextJS](https://nextjs.org/) -- [TailwindCSS](https://tailwindcss.com/) -- [shadcn/ui](https://ui.shadcn.com/) -- [Lucia](https://github.com/lucia-auth/lucia) -- [Prisma](https://www.prisma.io/) -- [Postgres](https://www.postgresql.org/) -- [Docker](https://www.docker.com/) - -This base already implements the sign-up and sign-in process with a clean UI, ready for customization. - -## Next Steps - -- Documentation -- Switching dark and light mode -- Change own username and password +This is my simple finances tracker that I use to keep track of my spending. diff --git a/docker/base-dev/.gitignore b/docker/finances-dev/.gitignore similarity index 100% rename from docker/base-dev/.gitignore rename to docker/finances-dev/.gitignore diff --git a/docker/base-dev/docker-compose.yaml b/docker/finances-dev/docker-compose.yaml similarity index 83% rename from docker/base-dev/docker-compose.yaml rename to docker/finances-dev/docker-compose.yaml index 25ebcfe..860b48d 100644 --- a/docker/base-dev/docker-compose.yaml +++ b/docker/finances-dev/docker-compose.yaml @@ -1,7 +1,7 @@ services: postgres: - container_name: base_postgres + container_name: next_finances_postgres image: postgres:15.2 restart: always healthcheck: @@ -14,6 +14,6 @@ services: environment: POSTGRES_USER: prisma POSTGRES_PASSWORD: prisma - POSTGRES_DB: base + POSTGRES_DB: finances volumes: - ./postgres-data:/var/lib/postgresql/data diff --git a/docker/base-prod/.gitignore b/docker/finances-prod/.gitignore similarity index 100% rename from docker/base-prod/.gitignore rename to docker/finances-prod/.gitignore diff --git a/docker/base-prod/docker-compose.yaml b/docker/finances-prod/docker-compose.yaml similarity index 51% rename from docker/base-prod/docker-compose.yaml rename to docker/finances-prod/docker-compose.yaml index f5faed8..4872bbf 100644 --- a/docker/base-prod/docker-compose.yaml +++ b/docker/finances-prod/docker-compose.yaml @@ -1,8 +1,8 @@ services: app-migrations: - container_name: base_migrations - image: markusthielker/next-base:1.0.0 + container_name: next_finances_migrations + image: markusthielker/next-finances:1.0.0 env_file: - .env depends_on: @@ -13,8 +13,8 @@ services: - internal app: - container_name: base_app - image: markusthielker/next-base:1.0.0 + container_name: next_finances_app + image: markusthielker/next-finances:1.0.0 env_file: - .env depends_on: @@ -23,17 +23,17 @@ services: restart: unless-stopped labels: - "traefik.enable=true" - - "traefik.http.routers.xyz-base.rule=Host(`base.thielker.xyz`)" - - "traefik.http.routers.xyz-base.entrypoints=web, websecure" - - "traefik.http.routers.xyz-base.tls=true" - - "traefik.http.routers.xyz-base.tls.certresolver=lets-encrypt" + - "traefik.http.routers.xyz-next-finances.rule=Host(`finances.thielker.xyz`)" + - "traefik.http.routers.xyz-next-finances.entrypoints=web, websecure" + - "traefik.http.routers.xyz-next-finances.tls=true" + - "traefik.http.routers.xyz-next-finances.tls.certresolver=lets-encrypt" networks: - web - internal app-studio: - container_name: base_studio - image: markusthielker/next-base:1.0.0 + container_name: next_finances_studio + image: markusthielker/next-finances:1.0.0 env_file: - .env depends_on: @@ -43,17 +43,17 @@ services: restart: unless-stopped labels: - "traefik.enable=true" - - "traefik.http.routers.xyz-base-studio.rule=Host(`db.base.thielker.xyz`)" - - "traefik.http.routers.xyz-base-studio.entrypoints=web, websecure" - - "traefik.http.services.xyz-finances-db.loadbalancer.server.port=5555" - - "traefik.http.routers.xyz-base-studio.tls=true" - - "traefik.http.routers.xyz-base-studio.tls.certresolver=lets-encrypt" + - "traefik.http.routers.xyz-next-finances-studio.rule=Host(`studio.finances.thielker.xyz`)" + - "traefik.http.routers.xyz-next-finances-studio.entrypoints=web, websecure" + - "traefik.http.services.xyz-next-finances-studio.loadbalancer.server.port=5555" + - "traefik.http.routers.xyz-next-finances-studio.tls=true" + - "traefik.http.routers.xyz-next-finances-studio.tls.certresolver=lets-encrypt" networks: - web - internal postgres: - container_name: base_postgres + container_name: next_finances_postgres image: postgres:15.2 restart: unless-stopped healthcheck: @@ -64,7 +64,7 @@ services: environment: POSTGRES_USER: prisma POSTGRES_PASSWORD: prisma - POSTGRES_DB: base + POSTGRES_DB: finances volumes: - ./postgres-data:/var/lib/postgresql/data networks: diff --git a/package-lock.json b/package-lock.json index b8b6dc2..fd121ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "next-base", + "name": "next-finances", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "next-base", + "name": "next-finances", "version": "0.1.0", "dependencies": { "@hookform/resolvers": "^3.3.4", diff --git a/package.json b/package.json index dc87f9b..a341310 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "next-base", + "name": "next-finances", "version": "0.1.0", "private": true, "scripts": { diff --git a/public/next.svg b/public/next.svg deleted file mode 100644 index 50840de..0000000 --- a/public/next.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/public/vercel.svg b/public/vercel.svg deleted file mode 100644 index 1bd2abd..0000000 --- a/public/vercel.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - \ No newline at end of file diff --git a/src/app/layout.tsx b/src/app/layout.tsx index 181a015..6dac1ca 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -3,12 +3,13 @@ import { Inter } from 'next/font/google'; import './globals.css'; import { cn } from '@/lib/utils'; import { Toaster } from '@/components/ui/sonner'; +import React from 'react'; const inter = Inter({subsets: ['latin']}); export const metadata: Metadata = { - title: 'Create Next App', - description: 'Generated by create next app', + title: 'Finances', + description: 'Track your finances with ease', }; export default function RootLayout({ diff --git a/src/app/page.tsx b/src/app/page.tsx index ebe9704..10f0a31 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -12,7 +12,7 @@ export default async function Home() { - Next Base + Next Finances ); }