From 185371b649c2d685c94fb42fb853c10080f5bad6 Mon Sep 17 00:00:00 2001 From: Elara Musayelyan Date: Tue, 26 Sep 2023 15:32:46 -0700 Subject: [PATCH] Remove 'lure-' prefix from subdirectories --- .woodpecker.yml | 12 ++++++------ {lure-backend => backend}/README.md | 0 {lure-backend => backend}/api.go | 0 {lure-backend => backend}/badge-logo.txt | 0 {lure-backend => backend}/badge.go | 0 {lure-backend => backend}/go.mod | 0 {lure-backend => backend}/go.sum | 0 {lure-backend => backend}/internal/api/gen.go | 0 .../internal/api/lure.pb.go | 0 .../internal/api/lure.proto | 0 .../internal/api/lure.twirp.go | 0 {lure-backend => backend}/main.go | 0 {lure-backend => backend}/webhook.go | 0 {lure-frontend => frontend}/.eslintignore | 0 {lure-frontend => frontend}/.eslintrc.cjs | 0 {lure-frontend => frontend}/.gitignore | 0 {lure-frontend => frontend}/.npmrc | 0 {lure-frontend => frontend}/.prettierignore | 0 {lure-frontend => frontend}/.prettierrc | 0 {lure-frontend => frontend}/LICENSE | 0 {lure-frontend => frontend}/package-lock.json | 0 {lure-frontend => frontend}/package.json | 0 {lure-frontend => frontend}/src/app.d.ts | 0 {lure-frontend => frontend}/src/app.html | 0 {lure-frontend => frontend}/src/app.scss | 0 .../src/darkly/overrides.scss | 0 .../src/darkly/variables.scss | 0 {lure-frontend => frontend}/src/lib/lure.pb.ts | 0 .../src/routes/+layout.svelte | 0 .../src/routes/+page.svelte | 0 .../src/routes/about/+page.svelte | 0 .../src/routes/footer.svelte | 0 .../src/routes/header.svelte | 0 .../src/routes/icons/+page.svelte | 0 .../src/routes/install/+page.server.js | 0 .../src/routes/pkg/[repo]/[name]/+page.svelte | 0 .../pkg/[repo]/[name]/lure.sh/+page.svelte | 0 .../src/routes/pkgs/+page.svelte | 0 {lure-frontend => frontend}/src/stores.js | 0 {lure-frontend => frontend}/src/variables.scss | 0 {lure-frontend => frontend}/static/favicon.png | Bin .../static/lure-no-text.svg | 0 .../static/lure-text-white.svg | 0 .../static/lure-text.svg | 0 {lure-frontend => frontend}/svelte.config.js | 0 {lure-frontend => frontend}/tsconfig.json | 0 {lure-frontend => frontend}/vite.config.js | 0 template.nomad | 16 ++++++++-------- 48 files changed, 14 insertions(+), 14 deletions(-) rename {lure-backend => backend}/README.md (100%) rename {lure-backend => backend}/api.go (100%) rename {lure-backend => backend}/badge-logo.txt (100%) rename {lure-backend => backend}/badge.go (100%) rename {lure-backend => backend}/go.mod (100%) rename {lure-backend => backend}/go.sum (100%) rename {lure-backend => backend}/internal/api/gen.go (100%) rename {lure-backend => backend}/internal/api/lure.pb.go (100%) rename {lure-backend => backend}/internal/api/lure.proto (100%) rename {lure-backend => backend}/internal/api/lure.twirp.go (100%) rename {lure-backend => backend}/main.go (100%) rename {lure-backend => backend}/webhook.go (100%) rename {lure-frontend => frontend}/.eslintignore (100%) rename {lure-frontend => frontend}/.eslintrc.cjs (100%) rename {lure-frontend => frontend}/.gitignore (100%) rename {lure-frontend => frontend}/.npmrc (100%) rename {lure-frontend => frontend}/.prettierignore (100%) rename {lure-frontend => frontend}/.prettierrc (100%) rename {lure-frontend => frontend}/LICENSE (100%) rename {lure-frontend => frontend}/package-lock.json (100%) rename {lure-frontend => frontend}/package.json (100%) rename {lure-frontend => frontend}/src/app.d.ts (100%) rename {lure-frontend => frontend}/src/app.html (100%) rename {lure-frontend => frontend}/src/app.scss (100%) rename {lure-frontend => frontend}/src/darkly/overrides.scss (100%) rename {lure-frontend => frontend}/src/darkly/variables.scss (100%) rename {lure-frontend => frontend}/src/lib/lure.pb.ts (100%) rename {lure-frontend => frontend}/src/routes/+layout.svelte (100%) rename {lure-frontend => frontend}/src/routes/+page.svelte (100%) rename {lure-frontend => frontend}/src/routes/about/+page.svelte (100%) rename {lure-frontend => frontend}/src/routes/footer.svelte (100%) rename {lure-frontend => frontend}/src/routes/header.svelte (100%) rename {lure-frontend => frontend}/src/routes/icons/+page.svelte (100%) rename {lure-frontend => frontend}/src/routes/install/+page.server.js (100%) rename {lure-frontend => frontend}/src/routes/pkg/[repo]/[name]/+page.svelte (100%) rename {lure-frontend => frontend}/src/routes/pkg/[repo]/[name]/lure.sh/+page.svelte (100%) rename {lure-frontend => frontend}/src/routes/pkgs/+page.svelte (100%) rename {lure-frontend => frontend}/src/stores.js (100%) rename {lure-frontend => frontend}/src/variables.scss (100%) rename {lure-frontend => frontend}/static/favicon.png (100%) rename {lure-frontend => frontend}/static/lure-no-text.svg (100%) rename {lure-frontend => frontend}/static/lure-text-white.svg (100%) rename {lure-frontend => frontend}/static/lure-text.svg (100%) rename {lure-frontend => frontend}/svelte.config.js (100%) rename {lure-frontend => frontend}/tsconfig.json (100%) rename {lure-frontend => frontend}/vite.config.js (100%) diff --git a/.woodpecker.yml b/.woodpecker.yml index 1fb90fc..860a63f 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -15,14 +15,14 @@ steps: publish-frontend: image: gitea.elara.ws/elara6331/crane secrets: [ registry_password ] - directory: lure-frontend + commands: - export HOME=/home/nonroot - crane auth login gitea.elara.ws -u Elara6331 -p "$${REGISTRY_PASSWORD}" - - crane append -b gitea.elara.ws/elara6331/node -f app.tar.gz -t gitea.elara.ws/elara6331/lure-web:amd64 --platform=linux/amd64 - - crane append -b gitea.elara.ws/elara6331/node -f app.tar.gz -t gitea.elara.ws/elara6331/lure-web:arm64 --platform=linux/arm64 - - crane append -b gitea.elara.ws/elara6331/node -f app.tar.gz -t gitea.elara.ws/elara6331/lure-web:riscv64 --platform=linux/riscv64 - - crane index append -m gitea.elara.ws/elara6331/lure-web:amd64 -m gitea.elara.ws/elara6331/lure-web:arm64 -m gitea.elara.ws/elara6331/lure-web:riscv64 -t gitea.elara.ws/elara6331/lure-web:latest + - crane append -b gitea.elara.ws/elara6331/node -f app.tar.gz -t gitea.elara.ws/lure/frontend:amd64 --platform=linux/amd64 + - crane append -b gitea.elara.ws/elara6331/node -f app.tar.gz -t gitea.elara.ws/lure/frontend:arm64 --platform=linux/arm64 + - crane append -b gitea.elara.ws/elara6331/node -f app.tar.gz -t gitea.elara.ws/lure/frontend:riscv64 --platform=linux/riscv64 + - crane index append -m gitea.elara.ws/lure/frontend:amd64 -m gitea.elara.ws/lure/frontend:arm64 -m gitea.elara.ws/lure/frontend:riscv64 -t gitea.elara.ws/lure/frontend:latest build-backend: image: gitea.elara.ws/elara6331/builder @@ -34,7 +34,7 @@ steps: environment: - REGISTRY=gitea.elara.ws - REGISTRY_USERNAME=Elara6331 - - KO_DOCKER_REPO=gitea.elara.ws/elara6331 + - KO_DOCKER_REPO=gitea.elara.ws/lure - KO_DEFAULTBASEIMAGE=gitea.elara.ws/elara6331/static deploy: diff --git a/lure-backend/README.md b/backend/README.md similarity index 100% rename from lure-backend/README.md rename to backend/README.md diff --git a/lure-backend/api.go b/backend/api.go similarity index 100% rename from lure-backend/api.go rename to backend/api.go diff --git a/lure-backend/badge-logo.txt b/backend/badge-logo.txt similarity index 100% rename from lure-backend/badge-logo.txt rename to backend/badge-logo.txt diff --git a/lure-backend/badge.go b/backend/badge.go similarity index 100% rename from lure-backend/badge.go rename to backend/badge.go diff --git a/lure-backend/go.mod b/backend/go.mod similarity index 100% rename from lure-backend/go.mod rename to backend/go.mod diff --git a/lure-backend/go.sum b/backend/go.sum similarity index 100% rename from lure-backend/go.sum rename to backend/go.sum diff --git a/lure-backend/internal/api/gen.go b/backend/internal/api/gen.go similarity index 100% rename from lure-backend/internal/api/gen.go rename to backend/internal/api/gen.go diff --git a/lure-backend/internal/api/lure.pb.go b/backend/internal/api/lure.pb.go similarity index 100% rename from lure-backend/internal/api/lure.pb.go rename to backend/internal/api/lure.pb.go diff --git a/lure-backend/internal/api/lure.proto b/backend/internal/api/lure.proto similarity index 100% rename from lure-backend/internal/api/lure.proto rename to backend/internal/api/lure.proto diff --git a/lure-backend/internal/api/lure.twirp.go b/backend/internal/api/lure.twirp.go similarity index 100% rename from lure-backend/internal/api/lure.twirp.go rename to backend/internal/api/lure.twirp.go diff --git a/lure-backend/main.go b/backend/main.go similarity index 100% rename from lure-backend/main.go rename to backend/main.go diff --git a/lure-backend/webhook.go b/backend/webhook.go similarity index 100% rename from lure-backend/webhook.go rename to backend/webhook.go diff --git a/lure-frontend/.eslintignore b/frontend/.eslintignore similarity index 100% rename from lure-frontend/.eslintignore rename to frontend/.eslintignore diff --git a/lure-frontend/.eslintrc.cjs b/frontend/.eslintrc.cjs similarity index 100% rename from lure-frontend/.eslintrc.cjs rename to frontend/.eslintrc.cjs diff --git a/lure-frontend/.gitignore b/frontend/.gitignore similarity index 100% rename from lure-frontend/.gitignore rename to frontend/.gitignore diff --git a/lure-frontend/.npmrc b/frontend/.npmrc similarity index 100% rename from lure-frontend/.npmrc rename to frontend/.npmrc diff --git a/lure-frontend/.prettierignore b/frontend/.prettierignore similarity index 100% rename from lure-frontend/.prettierignore rename to frontend/.prettierignore diff --git a/lure-frontend/.prettierrc b/frontend/.prettierrc similarity index 100% rename from lure-frontend/.prettierrc rename to frontend/.prettierrc diff --git a/lure-frontend/LICENSE b/frontend/LICENSE similarity index 100% rename from lure-frontend/LICENSE rename to frontend/LICENSE diff --git a/lure-frontend/package-lock.json b/frontend/package-lock.json similarity index 100% rename from lure-frontend/package-lock.json rename to frontend/package-lock.json diff --git a/lure-frontend/package.json b/frontend/package.json similarity index 100% rename from lure-frontend/package.json rename to frontend/package.json diff --git a/lure-frontend/src/app.d.ts b/frontend/src/app.d.ts similarity index 100% rename from lure-frontend/src/app.d.ts rename to frontend/src/app.d.ts diff --git a/lure-frontend/src/app.html b/frontend/src/app.html similarity index 100% rename from lure-frontend/src/app.html rename to frontend/src/app.html diff --git a/lure-frontend/src/app.scss b/frontend/src/app.scss similarity index 100% rename from lure-frontend/src/app.scss rename to frontend/src/app.scss diff --git a/lure-frontend/src/darkly/overrides.scss b/frontend/src/darkly/overrides.scss similarity index 100% rename from lure-frontend/src/darkly/overrides.scss rename to frontend/src/darkly/overrides.scss diff --git a/lure-frontend/src/darkly/variables.scss b/frontend/src/darkly/variables.scss similarity index 100% rename from lure-frontend/src/darkly/variables.scss rename to frontend/src/darkly/variables.scss diff --git a/lure-frontend/src/lib/lure.pb.ts b/frontend/src/lib/lure.pb.ts similarity index 100% rename from lure-frontend/src/lib/lure.pb.ts rename to frontend/src/lib/lure.pb.ts diff --git a/lure-frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte similarity index 100% rename from lure-frontend/src/routes/+layout.svelte rename to frontend/src/routes/+layout.svelte diff --git a/lure-frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte similarity index 100% rename from lure-frontend/src/routes/+page.svelte rename to frontend/src/routes/+page.svelte diff --git a/lure-frontend/src/routes/about/+page.svelte b/frontend/src/routes/about/+page.svelte similarity index 100% rename from lure-frontend/src/routes/about/+page.svelte rename to frontend/src/routes/about/+page.svelte diff --git a/lure-frontend/src/routes/footer.svelte b/frontend/src/routes/footer.svelte similarity index 100% rename from lure-frontend/src/routes/footer.svelte rename to frontend/src/routes/footer.svelte diff --git a/lure-frontend/src/routes/header.svelte b/frontend/src/routes/header.svelte similarity index 100% rename from lure-frontend/src/routes/header.svelte rename to frontend/src/routes/header.svelte diff --git a/lure-frontend/src/routes/icons/+page.svelte b/frontend/src/routes/icons/+page.svelte similarity index 100% rename from lure-frontend/src/routes/icons/+page.svelte rename to frontend/src/routes/icons/+page.svelte diff --git a/lure-frontend/src/routes/install/+page.server.js b/frontend/src/routes/install/+page.server.js similarity index 100% rename from lure-frontend/src/routes/install/+page.server.js rename to frontend/src/routes/install/+page.server.js diff --git a/lure-frontend/src/routes/pkg/[repo]/[name]/+page.svelte b/frontend/src/routes/pkg/[repo]/[name]/+page.svelte similarity index 100% rename from lure-frontend/src/routes/pkg/[repo]/[name]/+page.svelte rename to frontend/src/routes/pkg/[repo]/[name]/+page.svelte diff --git a/lure-frontend/src/routes/pkg/[repo]/[name]/lure.sh/+page.svelte b/frontend/src/routes/pkg/[repo]/[name]/lure.sh/+page.svelte similarity index 100% rename from lure-frontend/src/routes/pkg/[repo]/[name]/lure.sh/+page.svelte rename to frontend/src/routes/pkg/[repo]/[name]/lure.sh/+page.svelte diff --git a/lure-frontend/src/routes/pkgs/+page.svelte b/frontend/src/routes/pkgs/+page.svelte similarity index 100% rename from lure-frontend/src/routes/pkgs/+page.svelte rename to frontend/src/routes/pkgs/+page.svelte diff --git a/lure-frontend/src/stores.js b/frontend/src/stores.js similarity index 100% rename from lure-frontend/src/stores.js rename to frontend/src/stores.js diff --git a/lure-frontend/src/variables.scss b/frontend/src/variables.scss similarity index 100% rename from lure-frontend/src/variables.scss rename to frontend/src/variables.scss diff --git a/lure-frontend/static/favicon.png b/frontend/static/favicon.png similarity index 100% rename from lure-frontend/static/favicon.png rename to frontend/static/favicon.png diff --git a/lure-frontend/static/lure-no-text.svg b/frontend/static/lure-no-text.svg similarity index 100% rename from lure-frontend/static/lure-no-text.svg rename to frontend/static/lure-no-text.svg diff --git a/lure-frontend/static/lure-text-white.svg b/frontend/static/lure-text-white.svg similarity index 100% rename from lure-frontend/static/lure-text-white.svg rename to frontend/static/lure-text-white.svg diff --git a/lure-frontend/static/lure-text.svg b/frontend/static/lure-text.svg similarity index 100% rename from lure-frontend/static/lure-text.svg rename to frontend/static/lure-text.svg diff --git a/lure-frontend/svelte.config.js b/frontend/svelte.config.js similarity index 100% rename from lure-frontend/svelte.config.js rename to frontend/svelte.config.js diff --git a/lure-frontend/tsconfig.json b/frontend/tsconfig.json similarity index 100% rename from lure-frontend/tsconfig.json rename to frontend/tsconfig.json diff --git a/lure-frontend/vite.config.js b/frontend/vite.config.js similarity index 100% rename from lure-frontend/vite.config.js rename to frontend/vite.config.js diff --git a/template.nomad b/template.nomad index 97bbf59..74d4222 100644 --- a/template.nomad +++ b/template.nomad @@ -14,7 +14,7 @@ job "lure-web" { } } - task "lure-backend" { + task "backend" { driver = "docker" env { @@ -26,7 +26,7 @@ job "lure-web" { } config { - image = "gitea.elara.ws/elara6331/lure-backend:latest" + image = "gitea.elara.ws/lure/backend:latest" ports = ["api"] } @@ -35,8 +35,8 @@ job "lure-web" { port = "api" tags = [ "traefik.enable=true", - "traefik.http.routers.lure-api-server.rule=Host(`api.lure.elara.ws`)", - "traefik.http.routers.lure-api-server.tls.certresolver=letsencrypt" + "traefik.http.routers.lure-backend.rule=Host(`api.lure.elara.ws`)", + "traefik.http.routers.lure-backend.tls.certresolver=letsencrypt" ] check { @@ -48,11 +48,11 @@ job "lure-web" { } } - task "lure-web" { + task "frontend" { driver = "docker" config { - image = "gitea.elara.ws/elara6331/lure-web:latest" + image = "gitea.elara.ws/lure/frontend:latest" ports = ["http"] args = ["build"] } @@ -63,8 +63,8 @@ job "lure-web" { port = "http" tags = [ "traefik.enable=true", - "traefik.http.routers.lure-web.rule=Host(`lure.elara.ws`)", - "traefik.http.routers.lure-web.tls.certresolver=letsencrypt", + "traefik.http.routers.lure-frontend.rule=Host(`lure.elara.ws`)", + "traefik.http.routers.lure-frontend.tls.certresolver=letsencrypt", ] } }