Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Can't think of a title yet #276

Draft
wants to merge 4 commits into
base: update
Choose a base branch
from
Draft
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
9 changes: 0 additions & 9 deletions .dockerignore

This file was deleted.

7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,8 @@ dist
# Jetbrains IDE
.idea

# prisma
**/prisma/source/*
# Generated files
*.gen
typegen.ts
build
hooks.ts
2 changes: 2 additions & 0 deletions .graphqlrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
schema: './server/.gen/schema.graphql'
documents: './web/app/graphql/**/*.{graphql,js,ts,jsx,tsx}'
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"search.exclude": {
"**/.yarn": true,
"**/.pnp.*": true
},
"typescript.tsdk": ".yarn/sdks/typescript/lib",
"typescript.enablePromptUseWorkspaceTsdk": true,
"prettier.prettierPath": ".yarn/sdks/prettier/index.js",

"conventionalCommits.scopes": [
"core",
"server",
"web"
]
],

"typescript.tsdk": "node_modules\\typescript\\lib",
"prettier.prettierPath": "node_modules\\prettier"
}
631 changes: 0 additions & 631 deletions .yarn/releases/yarn-3.0.0.cjs

This file was deleted.

786 changes: 786 additions & 0 deletions .yarn/releases/yarn-3.2.1.cjs

Large diffs are not rendered by default.

9 changes: 2 additions & 7 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,9 @@
packageExtensions:
styled-components@*:
peerDependencies:
babel-plugin-macros: "*"
nodeLinker: node-modules

plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
spec: "@yarnpkg/plugin-workspace-tools"
- path: .yarn/plugins/@yarnpkg/plugin-production-install.cjs
spec: "https://gitlab.com/Larry1123/yarn-contrib/-/raw/master/packages/plugin-production-install/bundles/@yarnpkg/plugin-production-install.js"

yarnPath: .yarn/releases/yarn-3.0.0.cjs
yarnPath: .yarn/releases/yarn-3.2.1.cjs
8 changes: 8 additions & 0 deletions Caddyfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
:5000

@backend {
path /api/* /graphql
}

reverse_proxy @backend host.docker.internal:4000
reverse_proxy host.docker.internal:3000
27 changes: 27 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
version: '3.1'

services:
db:
image: postgres:latest
restart: always
ports:
- '5432:5432'
environment:
POSTGRES_USER: dzone
POSTGRES_PASSWORD: password

caddy:
image: caddy:latest
restart: unless-stopped
ports:
- '5000:5000'
volumes:
- ./Caddyfile:/etc/caddy/Caddyfile
- ./site:/srv
- caddy_data:/data
- caddy_config:/config

volumes:
caddy_data:
external: true
caddy_config:
12 changes: 0 additions & 12 deletions docker/caddyfile

This file was deleted.

12 changes: 0 additions & 12 deletions docker/docker-compose.production.yml

This file was deleted.

40 changes: 0 additions & 40 deletions docker/docker-compose.yml

This file was deleted.

15 changes: 5 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,19 @@
"private": true,
"description": "An ambient life simulation driven by the user activity within a Discord server",
"workspaces": [
"./packages/**"
"./web",
"./server"
],
"scripts": {
"dev": "docker-compose -f ./docker/docker-compose.yml up",
"prod": "docker-compose -f ./docker/docker-compose.yml -f ./docker/docker-compose.production.yml up"
},
"devDependencies": {
"prettier": "^2.3.2",
"prettier": "^2.6.2",
"prettier-plugin-jsdoc": "^0.3.23",
"typescript": "^4.3.5"
"typescript": "^4.7.2"
},
"author": "Devin Spikowski",
"contributors": [
"Devin Spikowski <vegeta897@gmail.com> (https://pixelatomy.com)",
"Sagnik Pradhan <markten6321@gmail.com> (https://sagnikpradhan.github.io)"
],
"license": "ISC",
"dependencies": {
"@d-zone/common": "workspace:packages/common"
}
"packageManager": "yarn@3.2.1"
}
3 changes: 0 additions & 3 deletions packages/common/package.json

This file was deleted.

27 changes: 0 additions & 27 deletions packages/common/tsconfig.json

This file was deleted.

37 changes: 0 additions & 37 deletions packages/server/dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions packages/server/package.json

This file was deleted.

1 change: 0 additions & 1 deletion packages/server/source/index.ts

This file was deleted.

66 changes: 0 additions & 66 deletions packages/server/source/library/api/routers/oauth.ts

This file was deleted.

24 changes: 0 additions & 24 deletions packages/server/source/library/api/routers/user.ts

This file was deleted.

Loading