diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 36764d8..fe5cd73 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,17 +26,17 @@ jobs: - name: Install frontend dependencies run: | - cd site + cd frontend bun install - name: Build frontend run: | - cd site + cd frontend bun run build - name: Copy frontend run: | - cp -r site/dist internal/assets/dist + cp -r frontend/dist internal/assets/dist - name: Run tests run: go test -v ./... diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 82e887b..3e664a0 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -29,7 +29,7 @@ go mod tidy You also need to download the frontend dependencies, this can be done like so: ```sh -cd site/ +cd frontend/ bun install ``` diff --git a/Dockerfile b/Dockerfile index 362d01b..047d0d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,22 @@ # Site builder -FROM oven/bun:1.1.45-alpine AS site-builder +FROM oven/bun:1.1.45-alpine AS frontend-builder -WORKDIR /site +WORKDIR /frontend -COPY ./site/package.json ./ -COPY ./site/bun.lockb ./ +COPY ./frontend/package.json ./ +COPY ./frontend/bun.lockb ./ RUN bun install -COPY ./site/public ./public -COPY ./site/src ./src -COPY ./site/eslint.config.js ./ -COPY ./site/index.html ./ -COPY ./site/tsconfig.json ./ -COPY ./site/tsconfig.app.json ./ -COPY ./site/tsconfig.node.json ./ -COPY ./site/vite.config.ts ./ -COPY ./site/postcss.config.cjs ./ +COPY ./frontend/public ./public +COPY ./frontend/src ./src +COPY ./frontend/eslint.config.js ./ +COPY ./frontend/index.html ./ +COPY ./frontend/tsconfig.json ./ +COPY ./frontend/tsconfig.app.json ./ +COPY ./frontend/tsconfig.node.json ./ +COPY ./frontend/vite.config.ts ./ +COPY ./frontend/postcss.config.cjs ./ RUN bun run build @@ -33,7 +33,7 @@ RUN go mod download COPY ./main.go ./ COPY ./cmd ./cmd COPY ./internal ./internal -COPY --from=site-builder /site/dist ./internal/assets/dist +COPY --from=frontend-builder /frontend/dist ./internal/assets/dist RUN CGO_ENABLED=0 go build -ldflags "-s -w" diff --git a/README.md b/README.md index f7359a8..62e2a64 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@
- Tinyauth + Tinyauth

Tinyauth

The easiest way to secure your apps with a login screen.

diff --git a/assets/discohook.json b/assets/discohook.json index 53a728c..a3ab1a1 100644 --- a/assets/discohook.json +++ b/assets/discohook.json @@ -14,7 +14,7 @@ }, "timestamp": "2025-03-10T19:00:00.000Z", "thumbnail": { - "url": "https://github.com/steveiliop56/tinyauth/blob/main/site/public/logo.png?raw=true" + "url": "https://github.com/steveiliop56/tinyauth/blob/main/frontend/public/logo.png?raw=true" } } ], diff --git a/crowdin.yml b/crowdin.yml index 464d363..902d3d1 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -6,7 +6,7 @@ files: [ { - "source": "/site/src/lib/i18n/locales/en.json", - "translation": "/site/src/lib/i18n/locales/%locale%.json", + "source": "/frontend/src/lib/i18n/locales/en.json", + "translation": "/frontend/src/lib/i18n/locales/%locale%.json", }, ] diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 2b97dc9..de80080 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -21,9 +21,9 @@ services: container_name: tinyauth-frontend build: context: . - dockerfile: site/Dockerfile.dev + dockerfile: frontend/Dockerfile.dev volumes: - - ./site/src:/site/src + - ./frontend/src:/frontend/src ports: - 5173:5173 labels: diff --git a/site/.gitignore b/frontend/.gitignore similarity index 100% rename from site/.gitignore rename to frontend/.gitignore diff --git a/site/.prettierignore b/frontend/.prettierignore similarity index 100% rename from site/.prettierignore rename to frontend/.prettierignore diff --git a/site/.prettierrc b/frontend/.prettierrc similarity index 100% rename from site/.prettierrc rename to frontend/.prettierrc diff --git a/frontend/Dockerfile.dev b/frontend/Dockerfile.dev new file mode 100644 index 0000000..7a66ebd --- /dev/null +++ b/frontend/Dockerfile.dev @@ -0,0 +1,23 @@ +FROM oven/bun:1.1.45-alpine + +WORKDIR /frontend + +COPY ./frontend/package.json ./ +COPY ./frontend/bun.lockb ./ + +RUN bun install + +COPY ./frontend/public ./public +COPY ./frontend/src ./src + +COPY ./frontend/eslint.config.js ./ +COPY ./frontend/index.html ./ +COPY ./frontend/tsconfig.json ./ +COPY ./frontend/tsconfig.app.json ./ +COPY ./frontend/tsconfig.node.json ./ +COPY ./frontend/vite.config.ts ./ +COPY ./frontend/postcss.config.cjs ./ + +EXPOSE 5173 + +ENTRYPOINT ["bun", "run", "dev"] \ No newline at end of file diff --git a/site/bun.lockb b/frontend/bun.lockb similarity index 100% rename from site/bun.lockb rename to frontend/bun.lockb diff --git a/site/eslint.config.js b/frontend/eslint.config.js similarity index 100% rename from site/eslint.config.js rename to frontend/eslint.config.js diff --git a/site/index.html b/frontend/index.html similarity index 90% rename from site/index.html rename to frontend/index.html index 8533651..3632922 100644 --- a/site/index.html +++ b/frontend/index.html @@ -6,7 +6,7 @@ - + Tinyauth diff --git a/site/package-lock.json b/frontend/package-lock.json similarity index 99% rename from site/package-lock.json rename to frontend/package-lock.json index b348680..7f0ec3f 100644 --- a/site/package-lock.json +++ b/frontend/package-lock.json @@ -1,11 +1,11 @@ { - "name": "site", + "name": "frontend", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "site", + "name": "frontend", "version": "0.0.0", "dependencies": { "@mantine/core": "^7.16.0", @@ -2246,4 +2246,4 @@ } } } -} +} \ No newline at end of file diff --git a/site/package.json b/frontend/package.json similarity index 98% rename from site/package.json rename to frontend/package.json index 2e44296..ade1b7e 100644 --- a/site/package.json +++ b/frontend/package.json @@ -1,5 +1,5 @@ { - "name": "site", + "name": "frontend", "private": true, "version": "0.0.0", "type": "module", @@ -42,4 +42,4 @@ "typescript-eslint": "^8.18.2", "vite": "^6.0.5" } -} +} \ No newline at end of file diff --git a/site/postcss.config.cjs b/frontend/postcss.config.cjs similarity index 100% rename from site/postcss.config.cjs rename to frontend/postcss.config.cjs diff --git a/site/public/android-chrome-192x192.png b/frontend/public/android-chrome-192x192.png similarity index 100% rename from site/public/android-chrome-192x192.png rename to frontend/public/android-chrome-192x192.png diff --git a/site/public/android-chrome-512x512.png b/frontend/public/android-chrome-512x512.png similarity index 100% rename from site/public/android-chrome-512x512.png rename to frontend/public/android-chrome-512x512.png diff --git a/site/public/apple-touch-icon.png b/frontend/public/apple-touch-icon.png similarity index 100% rename from site/public/apple-touch-icon.png rename to frontend/public/apple-touch-icon.png diff --git a/site/public/favicon-16x16.png b/frontend/public/favicon-16x16.png similarity index 100% rename from site/public/favicon-16x16.png rename to frontend/public/favicon-16x16.png diff --git a/site/public/favicon-32x32.png b/frontend/public/favicon-32x32.png similarity index 100% rename from site/public/favicon-32x32.png rename to frontend/public/favicon-32x32.png diff --git a/site/public/favicon.ico b/frontend/public/favicon.ico similarity index 100% rename from site/public/favicon.ico rename to frontend/public/favicon.ico diff --git a/site/public/logo.png b/frontend/public/logo.png similarity index 100% rename from site/public/logo.png rename to frontend/public/logo.png diff --git a/site/public/site.webmanifest b/frontend/public/site.webmanifest similarity index 100% rename from site/public/site.webmanifest rename to frontend/public/site.webmanifest diff --git a/site/src/App.tsx b/frontend/src/App.tsx similarity index 100% rename from site/src/App.tsx rename to frontend/src/App.tsx diff --git a/site/src/components/auth/login-forn.tsx b/frontend/src/components/auth/login-forn.tsx similarity index 100% rename from site/src/components/auth/login-forn.tsx rename to frontend/src/components/auth/login-forn.tsx diff --git a/site/src/components/auth/oauth-buttons.tsx b/frontend/src/components/auth/oauth-buttons.tsx similarity index 100% rename from site/src/components/auth/oauth-buttons.tsx rename to frontend/src/components/auth/oauth-buttons.tsx diff --git a/site/src/components/auth/totp-form.tsx b/frontend/src/components/auth/totp-form.tsx similarity index 100% rename from site/src/components/auth/totp-form.tsx rename to frontend/src/components/auth/totp-form.tsx diff --git a/site/src/components/language-selector/language-selector.tsx b/frontend/src/components/language-selector/language-selector.tsx similarity index 100% rename from site/src/components/language-selector/language-selector.tsx rename to frontend/src/components/language-selector/language-selector.tsx diff --git a/site/src/components/layouts/layout.tsx b/frontend/src/components/layouts/layout.tsx similarity index 100% rename from site/src/components/layouts/layout.tsx rename to frontend/src/components/layouts/layout.tsx diff --git a/site/src/context/app-context.tsx b/frontend/src/context/app-context.tsx similarity index 100% rename from site/src/context/app-context.tsx rename to frontend/src/context/app-context.tsx diff --git a/site/src/context/user-context.tsx b/frontend/src/context/user-context.tsx similarity index 100% rename from site/src/context/user-context.tsx rename to frontend/src/context/user-context.tsx diff --git a/site/src/icons/github.tsx b/frontend/src/icons/github.tsx similarity index 100% rename from site/src/icons/github.tsx rename to frontend/src/icons/github.tsx diff --git a/site/src/icons/google.tsx b/frontend/src/icons/google.tsx similarity index 100% rename from site/src/icons/google.tsx rename to frontend/src/icons/google.tsx diff --git a/site/src/icons/oauth.tsx b/frontend/src/icons/oauth.tsx similarity index 100% rename from site/src/icons/oauth.tsx rename to frontend/src/icons/oauth.tsx diff --git a/site/src/icons/tailscale.tsx b/frontend/src/icons/tailscale.tsx similarity index 100% rename from site/src/icons/tailscale.tsx rename to frontend/src/icons/tailscale.tsx diff --git a/site/src/lib/i18n/i18n.ts b/frontend/src/lib/i18n/i18n.ts similarity index 100% rename from site/src/lib/i18n/i18n.ts rename to frontend/src/lib/i18n/i18n.ts diff --git a/site/src/lib/i18n/locales.ts b/frontend/src/lib/i18n/locales.ts similarity index 100% rename from site/src/lib/i18n/locales.ts rename to frontend/src/lib/i18n/locales.ts diff --git a/site/src/lib/i18n/locales/af-ZA.json b/frontend/src/lib/i18n/locales/af-ZA.json similarity index 100% rename from site/src/lib/i18n/locales/af-ZA.json rename to frontend/src/lib/i18n/locales/af-ZA.json diff --git a/site/src/lib/i18n/locales/ar-SA.json b/frontend/src/lib/i18n/locales/ar-SA.json similarity index 100% rename from site/src/lib/i18n/locales/ar-SA.json rename to frontend/src/lib/i18n/locales/ar-SA.json diff --git a/site/src/lib/i18n/locales/ca-ES.json b/frontend/src/lib/i18n/locales/ca-ES.json similarity index 100% rename from site/src/lib/i18n/locales/ca-ES.json rename to frontend/src/lib/i18n/locales/ca-ES.json diff --git a/site/src/lib/i18n/locales/cs-CZ.json b/frontend/src/lib/i18n/locales/cs-CZ.json similarity index 100% rename from site/src/lib/i18n/locales/cs-CZ.json rename to frontend/src/lib/i18n/locales/cs-CZ.json diff --git a/site/src/lib/i18n/locales/da-DK.json b/frontend/src/lib/i18n/locales/da-DK.json similarity index 100% rename from site/src/lib/i18n/locales/da-DK.json rename to frontend/src/lib/i18n/locales/da-DK.json diff --git a/site/src/lib/i18n/locales/de-DE.json b/frontend/src/lib/i18n/locales/de-DE.json similarity index 100% rename from site/src/lib/i18n/locales/de-DE.json rename to frontend/src/lib/i18n/locales/de-DE.json diff --git a/site/src/lib/i18n/locales/el-GR.json b/frontend/src/lib/i18n/locales/el-GR.json similarity index 100% rename from site/src/lib/i18n/locales/el-GR.json rename to frontend/src/lib/i18n/locales/el-GR.json diff --git a/site/src/lib/i18n/locales/en-US.json b/frontend/src/lib/i18n/locales/en-US.json similarity index 100% rename from site/src/lib/i18n/locales/en-US.json rename to frontend/src/lib/i18n/locales/en-US.json diff --git a/site/src/lib/i18n/locales/en.json b/frontend/src/lib/i18n/locales/en.json similarity index 100% rename from site/src/lib/i18n/locales/en.json rename to frontend/src/lib/i18n/locales/en.json diff --git a/site/src/lib/i18n/locales/es-ES.json b/frontend/src/lib/i18n/locales/es-ES.json similarity index 100% rename from site/src/lib/i18n/locales/es-ES.json rename to frontend/src/lib/i18n/locales/es-ES.json diff --git a/site/src/lib/i18n/locales/fi-FI.json b/frontend/src/lib/i18n/locales/fi-FI.json similarity index 100% rename from site/src/lib/i18n/locales/fi-FI.json rename to frontend/src/lib/i18n/locales/fi-FI.json diff --git a/site/src/lib/i18n/locales/fr-FR.json b/frontend/src/lib/i18n/locales/fr-FR.json similarity index 100% rename from site/src/lib/i18n/locales/fr-FR.json rename to frontend/src/lib/i18n/locales/fr-FR.json diff --git a/site/src/lib/i18n/locales/he-IL.json b/frontend/src/lib/i18n/locales/he-IL.json similarity index 100% rename from site/src/lib/i18n/locales/he-IL.json rename to frontend/src/lib/i18n/locales/he-IL.json diff --git a/site/src/lib/i18n/locales/hu-HU.json b/frontend/src/lib/i18n/locales/hu-HU.json similarity index 100% rename from site/src/lib/i18n/locales/hu-HU.json rename to frontend/src/lib/i18n/locales/hu-HU.json diff --git a/site/src/lib/i18n/locales/it-IT.json b/frontend/src/lib/i18n/locales/it-IT.json similarity index 100% rename from site/src/lib/i18n/locales/it-IT.json rename to frontend/src/lib/i18n/locales/it-IT.json diff --git a/site/src/lib/i18n/locales/ja-JP.json b/frontend/src/lib/i18n/locales/ja-JP.json similarity index 100% rename from site/src/lib/i18n/locales/ja-JP.json rename to frontend/src/lib/i18n/locales/ja-JP.json diff --git a/site/src/lib/i18n/locales/ko-KR.json b/frontend/src/lib/i18n/locales/ko-KR.json similarity index 100% rename from site/src/lib/i18n/locales/ko-KR.json rename to frontend/src/lib/i18n/locales/ko-KR.json diff --git a/site/src/lib/i18n/locales/nl-NL.json b/frontend/src/lib/i18n/locales/nl-NL.json similarity index 100% rename from site/src/lib/i18n/locales/nl-NL.json rename to frontend/src/lib/i18n/locales/nl-NL.json diff --git a/site/src/lib/i18n/locales/no-NO.json b/frontend/src/lib/i18n/locales/no-NO.json similarity index 100% rename from site/src/lib/i18n/locales/no-NO.json rename to frontend/src/lib/i18n/locales/no-NO.json diff --git a/site/src/lib/i18n/locales/pl-PL.json b/frontend/src/lib/i18n/locales/pl-PL.json similarity index 100% rename from site/src/lib/i18n/locales/pl-PL.json rename to frontend/src/lib/i18n/locales/pl-PL.json diff --git a/site/src/lib/i18n/locales/pt-BR.json b/frontend/src/lib/i18n/locales/pt-BR.json similarity index 100% rename from site/src/lib/i18n/locales/pt-BR.json rename to frontend/src/lib/i18n/locales/pt-BR.json diff --git a/site/src/lib/i18n/locales/pt-PT.json b/frontend/src/lib/i18n/locales/pt-PT.json similarity index 100% rename from site/src/lib/i18n/locales/pt-PT.json rename to frontend/src/lib/i18n/locales/pt-PT.json diff --git a/site/src/lib/i18n/locales/ro-RO.json b/frontend/src/lib/i18n/locales/ro-RO.json similarity index 100% rename from site/src/lib/i18n/locales/ro-RO.json rename to frontend/src/lib/i18n/locales/ro-RO.json diff --git a/site/src/lib/i18n/locales/ru-RU.json b/frontend/src/lib/i18n/locales/ru-RU.json similarity index 100% rename from site/src/lib/i18n/locales/ru-RU.json rename to frontend/src/lib/i18n/locales/ru-RU.json diff --git a/site/src/lib/i18n/locales/sr-SP.json b/frontend/src/lib/i18n/locales/sr-SP.json similarity index 100% rename from site/src/lib/i18n/locales/sr-SP.json rename to frontend/src/lib/i18n/locales/sr-SP.json diff --git a/site/src/lib/i18n/locales/sv-SE.json b/frontend/src/lib/i18n/locales/sv-SE.json similarity index 100% rename from site/src/lib/i18n/locales/sv-SE.json rename to frontend/src/lib/i18n/locales/sv-SE.json diff --git a/site/src/lib/i18n/locales/tr-TR.json b/frontend/src/lib/i18n/locales/tr-TR.json similarity index 100% rename from site/src/lib/i18n/locales/tr-TR.json rename to frontend/src/lib/i18n/locales/tr-TR.json diff --git a/site/src/lib/i18n/locales/uk-UA.json b/frontend/src/lib/i18n/locales/uk-UA.json similarity index 100% rename from site/src/lib/i18n/locales/uk-UA.json rename to frontend/src/lib/i18n/locales/uk-UA.json diff --git a/site/src/lib/i18n/locales/vi-VN.json b/frontend/src/lib/i18n/locales/vi-VN.json similarity index 100% rename from site/src/lib/i18n/locales/vi-VN.json rename to frontend/src/lib/i18n/locales/vi-VN.json diff --git a/site/src/lib/i18n/locales/zh-CN.json b/frontend/src/lib/i18n/locales/zh-CN.json similarity index 100% rename from site/src/lib/i18n/locales/zh-CN.json rename to frontend/src/lib/i18n/locales/zh-CN.json diff --git a/site/src/lib/i18n/locales/zh-TW.json b/frontend/src/lib/i18n/locales/zh-TW.json similarity index 100% rename from site/src/lib/i18n/locales/zh-TW.json rename to frontend/src/lib/i18n/locales/zh-TW.json diff --git a/site/src/main.tsx b/frontend/src/main.tsx similarity index 100% rename from site/src/main.tsx rename to frontend/src/main.tsx diff --git a/site/src/pages/continue-page.tsx b/frontend/src/pages/continue-page.tsx similarity index 100% rename from site/src/pages/continue-page.tsx rename to frontend/src/pages/continue-page.tsx diff --git a/site/src/pages/internal-server-error.tsx b/frontend/src/pages/internal-server-error.tsx similarity index 100% rename from site/src/pages/internal-server-error.tsx rename to frontend/src/pages/internal-server-error.tsx diff --git a/site/src/pages/login-page.tsx b/frontend/src/pages/login-page.tsx similarity index 100% rename from site/src/pages/login-page.tsx rename to frontend/src/pages/login-page.tsx diff --git a/site/src/pages/logout-page.tsx b/frontend/src/pages/logout-page.tsx similarity index 100% rename from site/src/pages/logout-page.tsx rename to frontend/src/pages/logout-page.tsx diff --git a/site/src/pages/not-found-page.tsx b/frontend/src/pages/not-found-page.tsx similarity index 100% rename from site/src/pages/not-found-page.tsx rename to frontend/src/pages/not-found-page.tsx diff --git a/site/src/pages/totp-page.tsx b/frontend/src/pages/totp-page.tsx similarity index 100% rename from site/src/pages/totp-page.tsx rename to frontend/src/pages/totp-page.tsx diff --git a/site/src/pages/unauthorized-page.tsx b/frontend/src/pages/unauthorized-page.tsx similarity index 100% rename from site/src/pages/unauthorized-page.tsx rename to frontend/src/pages/unauthorized-page.tsx diff --git a/site/src/schemas/app-context-schema.ts b/frontend/src/schemas/app-context-schema.ts similarity index 100% rename from site/src/schemas/app-context-schema.ts rename to frontend/src/schemas/app-context-schema.ts diff --git a/site/src/schemas/login-schema.ts b/frontend/src/schemas/login-schema.ts similarity index 100% rename from site/src/schemas/login-schema.ts rename to frontend/src/schemas/login-schema.ts diff --git a/site/src/schemas/user-context-schema.ts b/frontend/src/schemas/user-context-schema.ts similarity index 100% rename from site/src/schemas/user-context-schema.ts rename to frontend/src/schemas/user-context-schema.ts diff --git a/site/src/utils/utils.ts b/frontend/src/utils/utils.ts similarity index 100% rename from site/src/utils/utils.ts rename to frontend/src/utils/utils.ts diff --git a/site/src/vite-env.d.ts b/frontend/src/vite-env.d.ts similarity index 100% rename from site/src/vite-env.d.ts rename to frontend/src/vite-env.d.ts diff --git a/site/tsconfig.app.json b/frontend/tsconfig.app.json similarity index 100% rename from site/tsconfig.app.json rename to frontend/tsconfig.app.json diff --git a/site/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from site/tsconfig.json rename to frontend/tsconfig.json diff --git a/site/tsconfig.node.json b/frontend/tsconfig.node.json similarity index 100% rename from site/tsconfig.node.json rename to frontend/tsconfig.node.json diff --git a/site/vite.config.ts b/frontend/vite.config.ts similarity index 100% rename from site/vite.config.ts rename to frontend/vite.config.ts diff --git a/site/Dockerfile.dev b/site/Dockerfile.dev deleted file mode 100644 index b8f3156..0000000 --- a/site/Dockerfile.dev +++ /dev/null @@ -1,23 +0,0 @@ -FROM oven/bun:1.1.45-alpine - -WORKDIR /site - -COPY ./site/package.json ./ -COPY ./site/bun.lockb ./ - -RUN bun install - -COPY ./site/public ./public -COPY ./site/src ./src - -COPY ./site/eslint.config.js ./ -COPY ./site/index.html ./ -COPY ./site/tsconfig.json ./ -COPY ./site/tsconfig.app.json ./ -COPY ./site/tsconfig.node.json ./ -COPY ./site/vite.config.ts ./ -COPY ./site/postcss.config.cjs ./ - -EXPOSE 5173 - -ENTRYPOINT ["bun", "run", "dev"] \ No newline at end of file