From 8b1c18ae8db486023f95027462cc3e22e33b0c37 Mon Sep 17 00:00:00 2001 From: Araozu Date: Mon, 11 Mar 2024 14:47:47 -0500 Subject: [PATCH] Properly setup tailwind --- .gitignore | 2 ++ src/main/resources/frontend/main.css => main.css | 0 src/main/resources/frontend/package.json => package.json | 4 ++-- .../resources/frontend/pnpm-lock.yaml => pnpm-lock.yaml | 0 pom.xml | 6 ++++++ src/main/resources/frontend/.gitignore | 1 - src/main/resources/templates/index.html | 2 +- .../frontend/tailwind.config.js => tailwind.config.js | 4 ++-- 8 files changed, 13 insertions(+), 6 deletions(-) rename src/main/resources/frontend/main.css => main.css (100%) rename src/main/resources/frontend/package.json => package.json (55%) rename src/main/resources/frontend/pnpm-lock.yaml => pnpm-lock.yaml (100%) delete mode 100644 src/main/resources/frontend/.gitignore rename src/main/resources/frontend/tailwind.config.js => tailwind.config.js (94%) diff --git a/.gitignore b/.gitignore index 4550a7e..8b5ce09 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,5 @@ build/ ### css compiled by tailwind ### src/main/resources/static/main.css + +node_modules/ diff --git a/src/main/resources/frontend/main.css b/main.css similarity index 100% rename from src/main/resources/frontend/main.css rename to main.css diff --git a/src/main/resources/frontend/package.json b/package.json similarity index 55% rename from src/main/resources/frontend/package.json rename to package.json index 5d3b613..042ae4a 100644 --- a/src/main/resources/frontend/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "dev": "tailwindcss -i ./main.css -o ../static/main.css --watch", - "build": "tailwindcss -i ./main.css -o ../static/main.css --minify" + "dev": "tailwindcss -i ./main.css -o ./src/main/resources/static/main.css --watch", + "build": "tailwindcss -i ./main.css -o ./src/main/resources/static/main.css --minify" }, "keywords": [], "author": "", diff --git a/src/main/resources/frontend/pnpm-lock.yaml b/pnpm-lock.yaml similarity index 100% rename from src/main/resources/frontend/pnpm-lock.yaml rename to pnpm-lock.yaml diff --git a/pom.xml b/pom.xml index e7a27ec..4a0d6bc 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,12 @@ 21 + + + org.springframework.boot + spring-boot-starter-actuator + + org.springframework.boot spring-boot-starter-data-jpa diff --git a/src/main/resources/frontend/.gitignore b/src/main/resources/frontend/.gitignore deleted file mode 100644 index b512c09..0000000 --- a/src/main/resources/frontend/.gitignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html index 11cfb99..b58bf75 100644 --- a/src/main/resources/templates/index.html +++ b/src/main/resources/templates/index.html @@ -19,7 +19,7 @@

- Javaaaaaa!!!!! + Java forever and ever

diff --git a/src/main/resources/frontend/tailwind.config.js b/tailwind.config.js similarity index 94% rename from src/main/resources/frontend/tailwind.config.js rename to tailwind.config.js index c13d6de..2155aa8 100644 --- a/src/main/resources/frontend/tailwind.config.js +++ b/tailwind.config.js @@ -1,8 +1,8 @@ /** @type {import('tailwindcss').Config} */ module.exports = { content: [ - "../templates/**/*.{html,js}", - "../static/**/*.{html,js}", + "./src/main/resources/templates/**/*.{html,js}", + "./src/main/resources/static/**/*.{html,js}", ], theme: { extend: {