Skip to content

Commit

Permalink
remove mentions of scoutgame (#5147)
Browse files Browse the repository at this point in the history
* remove mentions of scoutgame

* fix types
  • Loading branch information
mattcasey authored Dec 30, 2024
1 parent 2a31c1d commit 3a74b14
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 123 deletions.
1 change: 0 additions & 1 deletion .cdk/config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { Options } from './ProductionStack';

Check warning on line 1 in .cdk/config.ts

View workflow job for this annotation

GitHub Actions / Test apps

File ignored by default.

Check warning on line 1 in .cdk/config.ts

View workflow job for this annotation

GitHub Actions / Test apps

File ignored by default.

Check warning on line 1 in .cdk/config.ts

View workflow job for this annotation

GitHub Actions / Test app

File ignored by default.

const charmverseCert = 'arn:aws:acm:us-east-1:310849459438:certificate/b960ff5c-ed3e-4e65-b2c4-ecc64e696902';
const scoutgameCert = 'arn:aws:acm:us-east-1:310849459438:certificate/b901f27e-5a33-4dea-b4fb-39308a580423';
const sunnyCert = 'arn:aws:acm:us-east-1:310849459438:certificate/4618b240-08da-4d91-98c1-ac12362be229';

export const apps: { [key: string]: { stg?: Options; prd?: Options } } = {
Expand Down
4 changes: 1 addition & 3 deletions .env.test.local.example
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,4 @@ FORCE_COLOR=1

REACT_APP_BUILDER_NFT_CONTRACT_ADDRESS=0x1d305a06cb9dbdc32e08c3d230889acb9fe8a4dd
# so that we can load the UI and tests still pass
REACT_APP_WALLETCONNECT_PROJECTID=PLACEHOLDER_WALLETCONNECT_PROJECTID
# Tests should run as scout game webapp
REACT_APP_SCOUTGAME_PLATFORM=webapp
REACT_APP_WALLETCONNECT_PROJECTID=PLACEHOLDER_WALLETCONNECT_PROJECTID
2 changes: 0 additions & 2 deletions .github/actions/build_docker_image/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,8 @@ runs:
run: |
npm prune --omit=dev
rm -rf .next/cache
rm -rf apps/scoutgame/.next/cache
rm -rf apps/sunnyawards/.next/cache
rm -rf apps/farcaster/.next/cache
rm -rf apps/scoutgametelegram/.next/cache
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
Expand Down
22 changes: 2 additions & 20 deletions .github/workflows/destroy_staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
clean-up:
if: |
(github.event.action == 'unlabeled' && startsWith(github.event.label.name, ':rocket: deploy')) ||
(github.event.action == 'closed' && (contains(github.event.pull_request.labels.*.name, ':rocket: deploy') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-ceramic') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-scoutgame') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-sunnyawards') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-farcaster') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-cron') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-waitlist') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-websockets') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-scoutgamecron')))
(github.event.action == 'closed' && (contains(github.event.pull_request.labels.*.name, ':rocket: deploy') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-ceramic') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-sunnyawards') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-farcaster') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-cron') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-waitlist') || contains(github.event.pull_request.labels.*.name, ':rocket: deploy-websockets')))
runs-on: ubuntu-latest
steps:
- name: Configure AWS credentials
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
run: |
stage_name_suffix="${{ github.event.number }}-${{ env.GITHUB_HEAD_REF_SLUG }}"
for app in ceramic cron farcaster scoutgame scoutgamecron scoutgametelegram sunnyawards waitlist webapp websockets; do
for app in ceramic cron farcaster sunnyawards waitlist webapp websockets; do
# sanitize and trim string so that it can be used as a valid subdomain. Includes removing hyphens at the start and end of the name
stage_name=`echo "stg-${app}-${stage_name_suffix}" | sed -E -e 's/[^a-zA-Z0-9-]+//g' -e 's/(.{40}).*/\1/' -e 's/^-/0/' -e 's/-$/0/'`
Expand Down Expand Up @@ -75,24 +75,6 @@ jobs:
token: ${{ steps.get-token.outputs.token }}
environment: ${{ steps.destroy_aws_stack.outputs.farcaster_env }}

- name: Delete Scout Game Github deployment
uses: strumwolf/delete-deployment-environment@v3
with:
token: ${{ steps.get-token.outputs.token }}
environment: ${{ steps.destroy_aws_stack.outputs.scoutgame_env }}

- name: Delete Scout Game Cron Github deployment
uses: strumwolf/delete-deployment-environment@v3
with:
token: ${{ steps.get-token.outputs.token }}
environment: ${{ steps.destroy_aws_stack.outputs.scoutgamecron_env }}

- name: Delete Scout Game Telegram Github deployment
uses: strumwolf/delete-deployment-environment@v3
with:
token: ${{ steps.get-token.outputs.token }}
environment: ${{ steps.destroy_aws_stack.outputs.scoutgametelegram_env }}

- name: Delete Sunny Awards Github deployment
uses: strumwolf/delete-deployment-environment@v3
with:
Expand Down
6 changes: 0 additions & 6 deletions .github/workflows/test_new_core_pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,6 @@ jobs:
test_command: 'npm run typecheck -w apps/cron'
- test_name: 'Typecheck websockets'
test_command: 'npm run typecheck -w apps/websockets'
- test_name: 'Typecheck scoutgame'
test_command: 'npm run typecheck -w apps/scoutgame'
- test_name: 'Typecheck scoutgame telegram'
test_command: 'npm run typecheck -w apps/scoutgametelegram'
- test_name: 'Typecheck scoutgame cron'
test_command: 'npm run typecheck -w apps/scoutgamecron'

steps:
- uses: actions/checkout@v4
Expand Down
6 changes: 0 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@ serverless/*.node
.next/
dist/

# scoutgame app
/apps/scoutgame/public/sw*
/apps/scoutgame/public/swe-worker*
/apps/scoutgame/public/builder-nfts
/apps/scoutgametelegram/public/builder-nfts

# Tests
/__e2e-dist__/

Expand Down
2 changes: 1 addition & 1 deletion @connect-shared/lib/mixpanel/trackEventAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const trackEventAction = actionClient
.action(async ({ parsedInput, ctx }) => {
const { event: eventName, ...eventPayload } = parsedInput;

let sessionUserId = ctx.session.user?.id || ctx.session.scoutId;
let sessionUserId = ctx.session.user?.id;
const userId = sessionUserId || '';

// TODO: Handle anonymous user ids
Expand Down
1 change: 0 additions & 1 deletion @connect-shared/lib/session/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { getIronOptions as getIronOptionsRoot } from '@root/lib/session/getIronO
export type SessionData = {
user?: { id: string };
anonymousUserId?: string;
scoutId?: string; // for ScoutGame, users in the scout database
};

export function getIronOptions() {
Expand Down
2 changes: 1 addition & 1 deletion @connect-shared/lib/session/logoutAction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { log } from '@charmverse/core/log';
import { actionClient } from '../actions/actionClient';

export const logoutAction = actionClient.metadata({ actionName: 'logout' }).action(async ({ ctx }) => {
const userId = ctx.session.user?.id || ctx.session.scoutId;
const userId = ctx.session.user?.id;
ctx.session.destroy();
await ctx.session.save();

Expand Down
82 changes: 0 additions & 82 deletions package-lock.json

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

0 comments on commit 3a74b14

Please sign in to comment.