Skip to content

Commit

Permalink
chore: rename
Browse files Browse the repository at this point in the history
  • Loading branch information
siddhart1o1 committed Feb 7, 2024
1 parent 3258336 commit 45bbac4
Show file tree
Hide file tree
Showing 38 changed files with 39 additions and 39 deletions.
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ admin-panel:
- flake.lock
- pnpm-lock.yaml

blink-map:
- apps/blink-map/*
map:
- apps/map/*
- flake.lock
- pnpm-lock.yaml

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/buck2-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ 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[@]}")
fi
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)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,15 @@ 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[@]}")
fi
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
Expand Down
2 changes: 1 addition & 1 deletion BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -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"
],
Expand Down
2 changes: 0 additions & 2 deletions apps/blink-map/README.md

This file was deleted.

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/blink-map/BUCK → apps/map/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ next_build(
)

next_build_bin(
name = "blink-map",
name = "map",
)

dev_deps_srcs = {
Expand Down
4 changes: 2 additions & 2 deletions apps/blink-map/Dockerfile → apps/map/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM nixos/nix:latest AS builder
ARG APP=blink-map
ARG APP=map

COPY . /workdir
WORKDIR /workdir
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions apps/map/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Map

File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/blink-map/app/layout.tsx → apps/map/app/layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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",
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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: [
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion apps/blink-map/package.json → apps/map/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "blink-map",
"name": "map",
"private": true,
"scripts": {
"dev": "next dev -p 3005",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
4 changes: 2 additions & 2 deletions ci/apps/app-template.lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ci/apps/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
34 changes: 17 additions & 17 deletions dev/Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ 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",
CONSENT_TEST_LABEL: "consent-test",
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)
Expand Down Expand Up @@ -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"),
],
)

Expand Down Expand Up @@ -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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";};
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 45bbac4

Please sign in to comment.