From 45bbac4dc1fbe9ef39ddabaf35e2cd2bcfad6f34 Mon Sep 17 00:00:00 2001 From: Siddharth Tiwari Date: Mon, 5 Feb 2024 00:14:34 +0530 Subject: [PATCH] chore: rename --- .github/labeler.yml | 4 +-- .github/workflows/bats.yml | 2 +- .github/workflows/buck2-test.yaml | 4 +-- .github/workflows/integration-test.yml | 4 +-- BUCK | 2 +- apps/blink-map/README.md | 2 -- apps/{blink-map => map}/.eslintrc.json | 0 apps/{blink-map => map}/.gitignore | 0 apps/{blink-map => map}/BUCK | 2 +- apps/{blink-map => map}/Dockerfile | 4 +-- apps/map/README.md | 2 ++ apps/{blink-map => map}/app/favicon.ico | Bin apps/{blink-map => map}/app/globals.css | 0 apps/{blink-map => map}/app/layout.tsx | 2 +- apps/{blink-map => map}/app/page.tsx | 0 apps/{blink-map => map}/codegen.yml | 0 .../components/map/index.tsx | 0 .../components/map/map-theme.ts | 0 apps/{blink-map => map}/env.ts | 0 .../instrumentation.node.ts | 2 +- apps/{blink-map => map}/instrumentation.ts | 0 apps/{blink-map => map}/next.config.js | 0 apps/{blink-map => map}/package.json | 2 +- apps/{blink-map => map}/postcss.config.js | 0 apps/{blink-map => map}/prettier.config.js | 0 apps/{blink-map => map}/prettierrc.js | 0 apps/{blink-map => map}/public/logo.svg | 0 .../services/galoy/graphql/client.ts | 0 .../services/galoy/graphql/generated.ts | 0 .../graphql/queries/business-map-marker.ts | 0 apps/{blink-map => map}/tailwind.config.ts | 0 apps/{blink-map => map}/tsconfig.json | 0 ci/apps/app-template.lib.yml | 4 +-- ci/apps/pipeline.yml | 2 +- dev/Tiltfile | 34 +++++++++--------- flake.nix | 2 +- pnpm-lock.yaml | 2 +- pnpm-workspace.yaml | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) delete mode 100644 apps/blink-map/README.md rename apps/{blink-map => map}/.eslintrc.json (100%) rename apps/{blink-map => map}/.gitignore (100%) rename apps/{blink-map => map}/BUCK (98%) rename apps/{blink-map => map}/Dockerfile (95%) create mode 100644 apps/map/README.md rename apps/{blink-map => map}/app/favicon.ico (100%) rename apps/{blink-map => map}/app/globals.css (100%) rename apps/{blink-map => map}/app/layout.tsx (94%) rename apps/{blink-map => map}/app/page.tsx (100%) rename apps/{blink-map => map}/codegen.yml (100%) rename apps/{blink-map => map}/components/map/index.tsx (100%) rename apps/{blink-map => map}/components/map/map-theme.ts (100%) rename apps/{blink-map => map}/env.ts (100%) rename apps/{blink-map => map}/instrumentation.node.ts (95%) rename apps/{blink-map => map}/instrumentation.ts (100%) rename apps/{blink-map => map}/next.config.js (100%) rename apps/{blink-map => map}/package.json (98%) rename apps/{blink-map => map}/postcss.config.js (100%) rename apps/{blink-map => map}/prettier.config.js (100%) rename apps/{blink-map => map}/prettierrc.js (100%) rename apps/{blink-map => map}/public/logo.svg (100%) rename apps/{blink-map => map}/services/galoy/graphql/client.ts (100%) rename apps/{blink-map => map}/services/galoy/graphql/generated.ts (100%) rename apps/{blink-map => map}/services/galoy/graphql/queries/business-map-marker.ts (100%) rename apps/{blink-map => map}/tailwind.config.ts (100%) rename apps/{blink-map => map}/tsconfig.json (100%) diff --git a/.github/labeler.yml b/.github/labeler.yml index 797784738a1..5d35153e1d8 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -22,8 +22,8 @@ admin-panel: - flake.lock - pnpm-lock.yaml -blink-map: - - apps/blink-map/* +map: + - apps/map/* - flake.lock - pnpm-lock.yaml diff --git a/.github/workflows/bats.yml b/.github/workflows/bats.yml index 658499faba1..972cb4bda3c 100644 --- a/.github/workflows/bats.yml +++ b/.github/workflows/bats.yml @@ -18,7 +18,7 @@ jobs: - name: Buck2 build run: | nix develop -c buck2 build //core/api //core/api-ws-server \ - //core/api-keys //apps/dashboard //apps/consent //apps/pay //apps/admin-panel //apps/blink-map \ + //core/api-keys //apps/dashboard //apps/consent //apps/pay //apps/admin-panel //apps/map \ //core/notifications - name: Run bats tests run: | diff --git a/.github/workflows/buck2-test.yaml b/.github/workflows/buck2-test.yaml index 726657be8ba..2ac06b68ac1 100644 --- a/.github/workflows/buck2-test.yaml +++ b/.github/workflows/buck2-test.yaml @@ -23,7 +23,7 @@ jobs: ${{ toJSON(github.event.pull_request.labels.*.name) }} EOF - DEFAULT_LABELS=("dashboard" "consent" "pay" "core" "api-keys" "notifications" "admin-panel" "blink-map") + DEFAULT_LABELS=("dashboard" "consent" "pay" "core" "api-keys" "notifications" "admin-panel" "map") LABELS=($(jq -r '.[]' < labels.json)) if [ ${#LABELS[@]} -eq 0 ]; then LABELS=("${DEFAULT_LABELS[@]}") @@ -31,7 +31,7 @@ jobs: for LABEL in "${LABELS[@]}"; do case "$LABEL" in - dashboard|consent|pay|admin-panel|blink-map) + dashboard|consent|pay|admin-panel|map) ARGS+=" //apps/$LABEL:test" ;; core) diff --git a/.github/workflows/integration-test.yml b/.github/workflows/integration-test.yml index 0565ec608df..bc91095fe93 100644 --- a/.github/workflows/integration-test.yml +++ b/.github/workflows/integration-test.yml @@ -22,7 +22,7 @@ jobs: ${{ toJSON(github.event.pull_request.labels.*.name) }} EOF - DEFAULT_LABELS=("dashboard" "consent" "pay" "core" "admin-panel" "blink-map") + DEFAULT_LABELS=("dashboard" "consent" "pay" "core" "admin-panel" "map") LABELS=($(jq -r '.[]' < labels.json)) if [ ${#LABELS[@]} -eq 0 ]; then LABELS=("${DEFAULT_LABELS[@]}") @@ -30,7 +30,7 @@ jobs: for LABEL in "${LABELS[@]}"; do case "$LABEL" in - dashboard|consent|pay|core|admin-panel|blink-map) + dashboard|consent|pay|core|admin-panel|map) ARGS+=" --test $LABEL" ;; esac diff --git a/BUCK b/BUCK index e07e9a4b998..482cfe37fc6 100644 --- a/BUCK +++ b/BUCK @@ -8,7 +8,7 @@ pnpm_workspace( "//apps/dashboard:package.json", "//apps/pay:package.json", "//apps/admin-panel:package.json", - "//apps/blink-map:package.json", + "//apps/map:package.json", "//lib/eslint-config:package.json", "//lib/galoy-components:package.json" ], diff --git a/apps/blink-map/README.md b/apps/blink-map/README.md deleted file mode 100644 index 5c2d58c3217..00000000000 --- a/apps/blink-map/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# Blink Map - diff --git a/apps/blink-map/.eslintrc.json b/apps/map/.eslintrc.json similarity index 100% rename from apps/blink-map/.eslintrc.json rename to apps/map/.eslintrc.json diff --git a/apps/blink-map/.gitignore b/apps/map/.gitignore similarity index 100% rename from apps/blink-map/.gitignore rename to apps/map/.gitignore diff --git a/apps/blink-map/BUCK b/apps/map/BUCK similarity index 98% rename from apps/blink-map/BUCK rename to apps/map/BUCK index 377b6a07143..83780d50c28 100644 --- a/apps/blink-map/BUCK +++ b/apps/map/BUCK @@ -55,7 +55,7 @@ next_build( ) next_build_bin( - name = "blink-map", + name = "map", ) dev_deps_srcs = { diff --git a/apps/blink-map/Dockerfile b/apps/map/Dockerfile similarity index 95% rename from apps/blink-map/Dockerfile rename to apps/map/Dockerfile index aa01ee6742b..fd299527dd5 100644 --- a/apps/blink-map/Dockerfile +++ b/apps/map/Dockerfile @@ -1,5 +1,5 @@ FROM nixos/nix:latest AS builder -ARG APP=blink-map +ARG APP=map COPY . /workdir WORKDIR /workdir @@ -16,7 +16,7 @@ RUN cp -R $(nix-store --query --requisites result/) /tmp/nix-store-closure RUN ln -snf $(nix-store --query result/)/bin/* /tmp/local-bin/ FROM gcr.io/distroless/static-debian11 AS final -ARG APP=blink-map +ARG APP=map WORKDIR /app/$APP COPY --from=builder /tmp/nix-store-closure /nix/store diff --git a/apps/map/README.md b/apps/map/README.md new file mode 100644 index 00000000000..7169fbef20b --- /dev/null +++ b/apps/map/README.md @@ -0,0 +1,2 @@ +# Map + diff --git a/apps/blink-map/app/favicon.ico b/apps/map/app/favicon.ico similarity index 100% rename from apps/blink-map/app/favicon.ico rename to apps/map/app/favicon.ico diff --git a/apps/blink-map/app/globals.css b/apps/map/app/globals.css similarity index 100% rename from apps/blink-map/app/globals.css rename to apps/map/app/globals.css diff --git a/apps/blink-map/app/layout.tsx b/apps/map/app/layout.tsx similarity index 94% rename from apps/blink-map/app/layout.tsx rename to apps/map/app/layout.tsx index 3edcf5713cd..ee34153e39f 100644 --- a/apps/blink-map/app/layout.tsx +++ b/apps/map/app/layout.tsx @@ -5,7 +5,7 @@ import "./globals.css" const inter = Inter({ subsets: ["latin"] }) export const metadata: Metadata = { - title: "Blink Maps", + title: "Maps", description: "Merchant map for Blink", } diff --git a/apps/blink-map/app/page.tsx b/apps/map/app/page.tsx similarity index 100% rename from apps/blink-map/app/page.tsx rename to apps/map/app/page.tsx diff --git a/apps/blink-map/codegen.yml b/apps/map/codegen.yml similarity index 100% rename from apps/blink-map/codegen.yml rename to apps/map/codegen.yml diff --git a/apps/blink-map/components/map/index.tsx b/apps/map/components/map/index.tsx similarity index 100% rename from apps/blink-map/components/map/index.tsx rename to apps/map/components/map/index.tsx diff --git a/apps/blink-map/components/map/map-theme.ts b/apps/map/components/map/map-theme.ts similarity index 100% rename from apps/blink-map/components/map/map-theme.ts rename to apps/map/components/map/map-theme.ts diff --git a/apps/blink-map/env.ts b/apps/map/env.ts similarity index 100% rename from apps/blink-map/env.ts rename to apps/map/env.ts diff --git a/apps/blink-map/instrumentation.node.ts b/apps/map/instrumentation.node.ts similarity index 95% rename from apps/blink-map/instrumentation.node.ts rename to apps/map/instrumentation.node.ts index 540b206397e..377f594508b 100644 --- a/apps/blink-map/instrumentation.node.ts +++ b/apps/map/instrumentation.node.ts @@ -12,7 +12,7 @@ const sdk = new NodeSDK({ textMapPropagator: new W3CTraceContextPropagator(), resource: new Resource({ [SemanticResourceAttributes.SERVICE_NAME]: - process.env.TRACING_SERVICE_NAME || "blink-map", + process.env.TRACING_SERVICE_NAME || "map", }), spanProcessor: new SimpleSpanProcessor(new OTLPTraceExporter()), instrumentations: [ diff --git a/apps/blink-map/instrumentation.ts b/apps/map/instrumentation.ts similarity index 100% rename from apps/blink-map/instrumentation.ts rename to apps/map/instrumentation.ts diff --git a/apps/blink-map/next.config.js b/apps/map/next.config.js similarity index 100% rename from apps/blink-map/next.config.js rename to apps/map/next.config.js diff --git a/apps/blink-map/package.json b/apps/map/package.json similarity index 98% rename from apps/blink-map/package.json rename to apps/map/package.json index 21759467ab1..499850d689c 100644 --- a/apps/blink-map/package.json +++ b/apps/map/package.json @@ -1,5 +1,5 @@ { - "name": "blink-map", + "name": "map", "private": true, "scripts": { "dev": "next dev -p 3005", diff --git a/apps/blink-map/postcss.config.js b/apps/map/postcss.config.js similarity index 100% rename from apps/blink-map/postcss.config.js rename to apps/map/postcss.config.js diff --git a/apps/blink-map/prettier.config.js b/apps/map/prettier.config.js similarity index 100% rename from apps/blink-map/prettier.config.js rename to apps/map/prettier.config.js diff --git a/apps/blink-map/prettierrc.js b/apps/map/prettierrc.js similarity index 100% rename from apps/blink-map/prettierrc.js rename to apps/map/prettierrc.js diff --git a/apps/blink-map/public/logo.svg b/apps/map/public/logo.svg similarity index 100% rename from apps/blink-map/public/logo.svg rename to apps/map/public/logo.svg diff --git a/apps/blink-map/services/galoy/graphql/client.ts b/apps/map/services/galoy/graphql/client.ts similarity index 100% rename from apps/blink-map/services/galoy/graphql/client.ts rename to apps/map/services/galoy/graphql/client.ts diff --git a/apps/blink-map/services/galoy/graphql/generated.ts b/apps/map/services/galoy/graphql/generated.ts similarity index 100% rename from apps/blink-map/services/galoy/graphql/generated.ts rename to apps/map/services/galoy/graphql/generated.ts diff --git a/apps/blink-map/services/galoy/graphql/queries/business-map-marker.ts b/apps/map/services/galoy/graphql/queries/business-map-marker.ts similarity index 100% rename from apps/blink-map/services/galoy/graphql/queries/business-map-marker.ts rename to apps/map/services/galoy/graphql/queries/business-map-marker.ts diff --git a/apps/blink-map/tailwind.config.ts b/apps/map/tailwind.config.ts similarity index 100% rename from apps/blink-map/tailwind.config.ts rename to apps/map/tailwind.config.ts diff --git a/apps/blink-map/tsconfig.json b/apps/map/tsconfig.json similarity index 100% rename from apps/blink-map/tsconfig.json rename to apps/map/tsconfig.json diff --git a/ci/apps/app-template.lib.yml b/ci/apps/app-template.lib.yml index 274656295e2..9c03ab2e569 100644 --- a/ci/apps/app-template.lib.yml +++ b/ci/apps/app-template.lib.yml @@ -196,9 +196,9 @@ plan: #@ "YAML_PATH": ".image.digest", #@ "CHART": "admin-panel" #@ } -#@ "blink-map": { +#@ "map": { #@ "YAML_PATH": ".image.digest", -#@ "CHART": "blink-map" +#@ "CHART": "map" #@ } #@ } name: #@ bump_image_in_chart_name(app) diff --git a/ci/apps/pipeline.yml b/ci/apps/pipeline.yml index 093493d2ded..b420cb64af5 100644 --- a/ci/apps/pipeline.yml +++ b/ci/apps/pipeline.yml @@ -12,7 +12,7 @@ #@ "bump_image_in_chart_name", #@ "bump_image_in_chart") -#@ apps = ["consent", "dashboard", "pay", "admin-panel", "blink-map"] +#@ apps = ["consent", "dashboard", "pay", "admin-panel", "map"] groups: - name: all diff --git a/dev/Tiltfile b/dev/Tiltfile index df1168e483e..3532ca14e10 100644 --- a/dev/Tiltfile +++ b/dev/Tiltfile @@ -7,7 +7,7 @@ CONSENT_TEST_LABEL = "consent" DASHBOARD_TEST_LABEL = "dashboard" PAY_TEST_LABEL = "pay" ADMIN_PANEL_TEST_LABEL = "admin-panel" -BLINK_MAP_TEST_LABEL = "blink-map" +map_TEST_LABEL = "map" TEST_RESOURCES = { CORE_TEST_LABEL: "api-test", @@ -15,7 +15,7 @@ TEST_RESOURCES = { DASHBOARD_TEST_LABEL: "dashboard-test", PAY_TEST_LABEL: "pay-test", ADMIN_PANEL_TEST_LABEL: "admin-panel-test", - BLINK_MAP_TEST_LABEL: "blink-map-test" + map_TEST_LABEL: "map-test" } is_ci=("ci" in sys.argv) or cfg.get("bats", False) @@ -128,28 +128,28 @@ local_resource( ], ) -blink_map_target = "//apps/blink-map:dev" +map_target = "//apps/map:dev" if is_ci: - blink_map_target = '//apps/blink-map:blink-map' -blink_map_env = { + map_target = '//apps/map:map' +map_env = { "PORT": "3005", "CORE_URL" : "http://localhost:4455/graphql", } local_resource( - "blink-map", + "map", labels = ["apps"], - cmd = "buck2 build {}".format(blink_map_target), - serve_cmd = "buck2 run {}".format(blink_map_target), - env = blink_map_env, - serve_env = blink_map_env, - deps = _buck2_dep_inputs(blink_map_target), + cmd = "buck2 build {}".format(map_target), + serve_cmd = "buck2 run {}".format(map_target), + env = map_env, + serve_env = map_env, + deps = _buck2_dep_inputs(map_target), allow_parallel = True, resource_deps = [ "api", "apollo-router", ], links = [ - link("http://localhost:3005", "blink-map"), + link("http://localhost:3005", "map"), ], ) @@ -223,14 +223,14 @@ local_resource( ], ) -blink_map_test_target = "//apps/blink-map:test-integration" +map_test_target = "//apps/map:test-integration" local_resource( - "blink-map-test", + "map-test", labels = ["test"], - auto_init = is_ci and BLINK_MAP_TEST_LABEL in cfg.get("test", []), - cmd = "buck2 test {}".format(blink_map_test_target), + auto_init = is_ci and map_TEST_LABEL in cfg.get("test", []), + cmd = "buck2 test {}".format(map_test_target), resource_deps = [ - "blink-map", + "map", ], ) diff --git a/flake.nix b/flake.nix index 9cb1dbfe549..f9d12189d4b 100644 --- a/flake.nix +++ b/flake.nix @@ -228,7 +228,7 @@ dashboard = nextDerivation {pkgName = "dashboard";}; pay = nextDerivation {pkgName = "pay";}; admin-panel = nextDerivation {pkgName = "admin-panel";}; - blink-map = nextDerivation {pkgName = "blink-map";}; + map = nextDerivation {pkgName = "map";}; api-keys = rustDerivation {pkgName = "api-keys";}; notifications = rustDerivation {pkgName = "notifications";}; diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ec01c7619b5..807c451066d 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -149,7 +149,7 @@ importers: specifier: ^29.1.1 version: 29.1.2(@babel/core@7.23.7)(jest@29.7.0)(typescript@5.2.2) - apps/blink-map: + apps/map: dependencies: '@apollo/client': specifier: ^3.9.2 diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 7e59d3ac5a6..348a533c538 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -5,7 +5,7 @@ packages: - apps/dashboard - apps/admin-panel - apps/pay - - apps/blink-map + - apps/map - lib/eslint-config - lib/gt3-server-node-express-sdk - lib/galoy-components