Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .fleet/run.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"configurations": [
{
"type": "dotnet",
"name": "Dotnet configuration",
"projectPath": "$WORKSPACE_DIR$/ARC3/ARC3/arc3.csproj",
"workingDir": "$WORKSPACE_DIR$/ARC3/ARC3",
"environmentFile": "$WORKSPACE_DIR$/.env",
"args": []
}
]
}
3 changes: 3 additions & 0 deletions .fleet/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"toolchains": []
}
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@
[submodule "unity"]
path = unity
url = https://github.com/ARCv3/unity
[submodule "ops-infrastructure-stage"]
path = ops-infrastructure-stage
url = https://github.com/ARCv3/ops-infrastructure-stage
[submodule "ops-infrastructure-live"]
path = ops-infrastructure-live
url = https://github.com/ARCv3/ops-infrastructure-live
2 changes: 1 addition & 1 deletion ARC3-API
Submodule ARC3-API updated 58 files
+113 −0 .github/workflows/aws-deploy-live.yml
+50 −9 .github/workflows/aws-deploy-stg.yml
+81 −0 .github/workflows/td.json
+13 −4 Dockerfile
+3 −2 bin/www
+2 −2 bin/www-dev
+22 −0 package-lock.json
+3 −1 package.json
+1 −1 src/api/v1/controllers/AppealsControllers.js
+4 −5 src/api/v1/controllers/ApplicationControllers.js
+1 −1 src/api/v1/controllers/CommentsControllers.js
+3 −4 src/api/v1/controllers/DiscordControllers.js
+1 −1 src/api/v1/controllers/InsightsController.js
+1 −1 src/api/v1/controllers/StatController.js
+1 −1 src/api/v1/controllers/TranscriptControllers.js
+1 −1 src/api/v1/controllers/UserNotesControllers.js
+23 −0 src/api/v1/routers/AppealsRoutes.js
+24 −0 src/api/v1/routers/ApplicationRoutes.js
+20 −0 src/api/v1/routers/DiscordRoutes.js
+17 −0 src/api/v1/routers/InsightRoutes.js
+17 −0 src/api/v1/routers/StatRoutes.js
+19 −0 src/api/v1/routers/TranscriptRoutes.js
+21 −0 src/api/v1/routers/UsernoteRoutes.js
+33 −0 src/api/v1/v1.js
+1 −1 src/api/v2/controllers/DiscordControllers.js
+17 −0 src/api/v2/routers/DiscordRoutes.js
+31 −0 src/api/v2/v2.js
+15 −50 src/app.js
+0 −43 src/auth/middlewares/whitelist.js
+0 −0 src/auth/v1/auth.js
+4 −4 src/auth/v1/controllers/authentication.js
+7 −7 src/auth/v1/middlewares/authenticated.js
+48 −0 src/auth/v1/middlewares/whitelist.js
+16 −0 src/auth/v2/auth.js
+84 −0 src/auth/v2/controllers/authentication.js
+69 −0 src/auth/v2/middlewares/authenticated.js
+51 −0 src/auth/v2/middlewares/whitelist.js
+0 −0 src/db/v1/Appeal.js
+0 −0 src/db/v1/Application.js
+0 −0 src/db/v1/Approval.js
+0 −0 src/db/v1/Commandstat.js
+0 −0 src/db/v1/Comment.js
+17 −0 src/db/v1/Guild.js
+0 −0 src/db/v1/Insight.js
+0 −0 src/db/v1/Notes.js
+0 −0 src/db/v1/Transcript.js
+0 −0 src/db/v2/UserData.js
+0 −15 src/v1/db/Guild.js
+0 −14 src/v1/routers/AppealsRoutes.js
+0 −17 src/v1/routers/ApplicationRoutes.js
+0 −13 src/v1/routers/DiscordRoutes.js
+0 −10 src/v1/routers/InsightRoutes.js
+0 −10 src/v1/routers/StatRoutes.js
+0 −13 src/v1/routers/TranscriptRoutes.js
+0 −14 src/v1/routers/UsernoteRoutes.js
+0 −29 src/v1/v1.js
+0 −10 src/v2/routers/DiscordRoutes.js
+0 −17 src/v2/v2.js
90 changes: 90 additions & 0 deletions docker-compose-local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: arc-local

services:

arc3-local:
env_file:
- .env
depends_on:
- mongo-local
image: arc3-local
build:
dockerfile: arc3.Dockerfile
container_name: arc3-local

mongo-local:
image: mongo:7.0
env_file:
- .env
container_name: mongo-local
restart: always
environment:
- MONGO_INITDB_ROOT_USERNAME=root
- MONGO_INITDB_ROOT_PASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
volumes:
- mongo_data_local:/data/db
- mongo_config_local:/data/configdb
- ./keys/mongo.keyfile:/data/mongo.keyfile
ports:
- 27018:27017


mongo_admin_ui:
image: mongo-express
env_file:
- .env
environment:
- ME_CONFIG_MONGODB_ADMINUSERNAME=root
- ME_CONFIG_MONGODB_ADMINPASSWORD=${MONGO_INITDB_ROOT_PASSWORD}
- ME_CONFIG_MONGODB_SERVER=mongo-local
- ME_CONFIG_BASICAUTH_USERNAME=admin
- ME_CONFIG_BASICAUTH_PASSWORD=${EXPRESS_PWRD}
container_name: mongo_admin_ui
ports:
- 8081:8081

arc-api-local:
env_file:
- .env
image: arc3-api-local
build:
context: ARC3-API
dockerfile: Dockerfile
args:
- fullchain=${FULLCHAIN}
- privkey=${PRIVKEY}
container_name: arc3-api-local
restart: on-failure
ports:
- 3040:3030

unity-local:
environment:
- PORT=3000
- UNITY_BASE_URI=unity.local.billiecord.com
- UNITY_API_BASE_URI=api.local.billiecord.com
depends_on:
- arc-api-local
image: unity
build:
context: unity
dockerfile: Dockerfile
container_name: unity-local
restart: on-failure
ports:
- 3050:3000

app:
image: 'jc21/nginx-proxy-manager:latest'
restart: unless-stopped
ports:
- '80:80'
- '81:81'
- '443:443'
volumes:
- ./data:/data
- ./letsencrypt:/etc/letsencrypt

volumes:
mongo_data_local:
mongo_config_local:
1 change: 1 addition & 0 deletions ops-infrastructure-live
1 change: 1 addition & 0 deletions ops-infrastructure-stage
2 changes: 1 addition & 1 deletion unity
Submodule unity updated 60 files
+2 −0 .dockerignore
+0 −3 .env
+15 −0 .fleet/run.json
+101 −0 .github/workflows/aws-deploy-live.yml
+104 −0 .github/workflows/aws-deploy-stg.yml
+86 −0 .github/workflows/td.json
+1 −0 .gitignore
+14 −0 Dockerfile
+27 −0 app/api/auth/route.ts
+18 −0 app/api/revoke/route.ts
+6 −16 app/dashboard/applications/page.tsx
+4 −11 app/dashboard/layout.tsx
+31 −39 app/dashboard/notes/page.tsx
+2 −2 app/dashboard/page.tsx
+2 −23 app/dashboard/transcripts/page.tsx
+13 −3 app/layout.tsx
+15 −5 app/login/page.tsx
+6 −5 app/page.tsx
+23 −0 components/auth.tsx
+79 −0 components/login-form.tsx
+1 −1 components/ui/MemberLabel.tsx
+36 −0 components/ui/badge.tsx
+12 −5 components/ui/breadcrumb.tsx
+76 −0 components/ui/card.tsx
+30 −0 components/ui/checkbox.tsx
+210 −0 components/ui/data-table.tsx
+26 −0 components/ui/label.tsx
+68 −0 components/unity/applications/application-display.tsx
+142 −0 components/unity/applications/applications-list.tsx
+117 −0 components/unity/applications/columns.tsx
+9 −8 components/unity/insights/insight-list.tsx
+53 −0 components/unity/main-hero.tsx
+61 −46 components/unity/nav-main.tsx
+1 −1 components/unity/nav-user.tsx
+165 −0 components/unity/notes/columns.tsx
+53 −0 components/unity/notes/notes-display.tsx
+9 −0 components/unity/notes/recent-notes.tsx
+27 −0 components/unity/notes/user-column.tsx
+44 −0 components/unity/notes/user-note.tsx
+86 −0 components/unity/notes/user-notes.tsx
+4 −10 components/unity/profile/ProfilePage.tsx
+15 −7 components/unity/team-switcher.tsx
+74 −0 components/unity/transcripts-datatable/columns.tsx
+71 −0 components/unity/transcripts-datatable/transcripts-list.tsx
+49 −24 components/unity/transcripts/transcript-list.tsx
+5 −5 components/unity/transcripts/transcript-view.tsx
+5 −4 components/unity/unity-sidebar.tsx
+13 −0 hooks/use-auth-token.ts
+130 −27 hooks/use-backend.tsx
+0 −1 hooks/use-darkmode.tsx
+0 −17 hooks/use-global-state.ts
+17 −0 hooks/use-once-authenticated.ts
+53 −0 hooks/use-redirects.tsx
+17 −0 hooks/use-selected-guild-state.ts
+117 −2 lib/definitions.ts
+19 −1 lib/utils.ts
+30 −0 middleware.ts
+13 −20 next.config.mjs
+308 −6 package-lock.json
+5 −1 package.json
Loading