diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..b444198 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,39 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Start full", + "dependsOn": ["Start backend", "Start frontend", "Start postgres"], + "dependsOrder": "parallel", + "isBackground": true, + "group": "build" + }, + { + "type": "shell", + "label": "Start backend", + "command": "yarn start:dev", + "options": { + "cwd": "./backend" + }, + "group": "build" + }, + { + "type": "shell", + "label": "Start frontend", + "command": "yarn start", + "options": { + "cwd": "./frontend" + }, + "group": "build" + }, + { + "type": "shell", + "label": "Start postgres", + "command": "podman-compose up", + "options": { + "cwd": "./support" + }, + "group": "build" + } + ] +} diff --git a/README.md b/README.md new file mode 100644 index 0000000..77e4bb6 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# Imagur + +> Totally not an imgur clone diff --git a/backend/README.md b/backend/README.md deleted file mode 100644 index 46d6ebe..0000000 --- a/backend/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Imagur-Backend - -Just testing diff --git a/backend/src/app.module.ts b/backend/src/app.module.ts index aa60427..8f44e33 100644 --- a/backend/src/app.module.ts +++ b/backend/src/app.module.ts @@ -1,12 +1,14 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AuthModule } from './routes/auth/auth.module'; +import { AuthModule } from './routes/api/auth/auth.module'; import { UserEntity } from './collections/userdb/user.entity'; import { ImageModule } from './routes/image/imageroute.module'; import { ServeStaticModule } from '@nestjs/serve-static'; import Config from './env'; import { ImageEntity } from './collections/imagedb/image.entity'; +const backendRoutes = ['i', 'api']; + @Module({ imports: [ TypeOrmModule.forRoot({ diff --git a/backend/src/env.ts b/backend/src/env.ts index 9e0b07f..45a4324 100644 --- a/backend/src/env.ts +++ b/backend/src/env.ts @@ -24,9 +24,11 @@ const Config = { : 128000000, }, static: { - packageRoot, + packageRoot: packageRoot, frontendRoot: - process.env.STATIC_FRONTEND_ROOT ?? join(packageRoot, '../frontend/build'), + process.env.STATIC_FRONTEND_ROOT ?? + join(packageRoot, '../frontend/dist'), + backendRoutes: ['i', 'api'], }, }; diff --git a/backend/src/main.ts b/backend/src/main.ts index d7f731c..b2d409f 100644 --- a/backend/src/main.ts +++ b/backend/src/main.ts @@ -11,6 +11,7 @@ import { import { AppModule } from './app.module'; import * as multipart from 'fastify-multipart'; +import { FrontendMiddleware } from './middleware/frontend.middleware'; async function bootstrap() { const fastifyAdapter = new FastifyAdapter(); @@ -20,10 +21,6 @@ async function bootstrap() { AppModule, fastifyAdapter, ); - // app.useStaticAssets({ - // root: join(__dirname, '..', 'public'), - // prefix: '/public', - // }); app.useGlobalPipes(new ValidationPipe({ disableErrorMessages: true })); await app.listen(3000); } diff --git a/backend/src/middleware/frontend.middleware.ts b/backend/src/middleware/frontend.middleware.ts new file mode 100644 index 0000000..be75dc3 --- /dev/null +++ b/backend/src/middleware/frontend.middleware.ts @@ -0,0 +1,47 @@ +import { StreamableFile } from '@nestjs/common'; +import { FastifyReply, FastifyRequest } from 'fastify'; +import { createReadStream } from 'fs'; +import path from 'path'; +import Config from 'src/env'; + +const allowedExt = [ + '.js', + '.ico', + '.css', + '.png', + '.jpg', + '.woff2', + '.woff', + '.ttf', + '.svg', +]; + +const resolvePath = (file: string) => + path.resolve(Config.static.frontendRoot, file); + +export function FrontendMiddleware( + req: FastifyRequest, + res: FastifyReply, + next: () => void, +) { + const { url } = req; + + for (let i = 0; i < Config.static.backendRoutes.length; i++) { + if (url.startsWith(`/${Config.static.backendRoutes[i]}`)) { + return next(); + } + } + + const { ext } = path.parse(url); + + if (ext != '') { + // it has a file extension --> resolve the file + // Fastifty + res.send(new StreamableFile(createReadStream(resolvePath(url)))); + } else { + // in all other cases, redirect to the index.html! + res.send(new StreamableFile(createReadStream(resolvePath('index.html')))); + } + + next(); +} diff --git a/backend/src/middleware/frontend.module.ts b/backend/src/middleware/frontend.module.ts new file mode 100644 index 0000000..a6d5941 --- /dev/null +++ b/backend/src/middleware/frontend.module.ts @@ -0,0 +1,12 @@ +import { Module, NestModule, RequestMethod } from '@nestjs/common'; +import { FrontendMiddleware } from './frontend.middleware'; + +@Module({}) +export class FrontendModule implements NestModule { + configure(consumer: any) { + consumer.apply(FrontendMiddleware).forRoutes({ + path: '*', + method: RequestMethod.ALL, + }); + } +} diff --git a/backend/src/routes/auth/admin.guard.ts b/backend/src/routes/api/auth/admin.guard.ts similarity index 100% rename from backend/src/routes/auth/admin.guard.ts rename to backend/src/routes/api/auth/admin.guard.ts diff --git a/backend/src/routes/auth/auth.controller.ts b/backend/src/routes/api/auth/auth.controller.ts similarity index 98% rename from backend/src/routes/auth/auth.controller.ts rename to backend/src/routes/api/auth/auth.controller.ts index f06c11c..6fb6a37 100644 --- a/backend/src/routes/auth/auth.controller.ts +++ b/backend/src/routes/api/auth/auth.controller.ts @@ -20,7 +20,7 @@ import { JwtAuthGuard } from './jwt.guard'; import { AdminGuard } from './admin.guard'; import { HasFailed } from 'src/types/failable'; -@Controller('auth') +@Controller('api/auth') export class AuthController { constructor(private authService: AuthService) {} diff --git a/backend/src/routes/auth/auth.dto.ts b/backend/src/routes/api/auth/auth.dto.ts similarity index 100% rename from backend/src/routes/auth/auth.dto.ts rename to backend/src/routes/api/auth/auth.dto.ts diff --git a/backend/src/routes/auth/auth.module.ts b/backend/src/routes/api/auth/auth.module.ts similarity index 100% rename from backend/src/routes/auth/auth.module.ts rename to backend/src/routes/api/auth/auth.module.ts diff --git a/backend/src/routes/auth/auth.service.ts b/backend/src/routes/api/auth/auth.service.ts similarity index 100% rename from backend/src/routes/auth/auth.service.ts rename to backend/src/routes/api/auth/auth.service.ts diff --git a/backend/src/routes/auth/jwt.guard.ts b/backend/src/routes/api/auth/jwt.guard.ts similarity index 100% rename from backend/src/routes/auth/jwt.guard.ts rename to backend/src/routes/api/auth/jwt.guard.ts diff --git a/backend/src/routes/auth/jwt.strategy.ts b/backend/src/routes/api/auth/jwt.strategy.ts similarity index 100% rename from backend/src/routes/auth/jwt.strategy.ts rename to backend/src/routes/api/auth/jwt.strategy.ts diff --git a/backend/src/routes/auth/local-auth.guard.ts b/backend/src/routes/api/auth/local-auth.guard.ts similarity index 100% rename from backend/src/routes/auth/local-auth.guard.ts rename to backend/src/routes/api/auth/local-auth.guard.ts diff --git a/backend/src/routes/auth/local.strategy.ts b/backend/src/routes/api/auth/local.strategy.ts similarity index 100% rename from backend/src/routes/auth/local.strategy.ts rename to backend/src/routes/api/auth/local.strategy.ts diff --git a/frontend/.gitignore b/frontend/.gitignore index 4d29575..800f3a8 100644 --- a/frontend/.gitignore +++ b/frontend/.gitignore @@ -10,6 +10,7 @@ # production /build +/dist # misc .DS_Store diff --git a/frontend/README.md b/frontend/README.md deleted file mode 100644 index b87cb00..0000000 --- a/frontend/README.md +++ /dev/null @@ -1,46 +0,0 @@ -# Getting Started with Create React App - -This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app). - -## Available Scripts - -In the project directory, you can run: - -### `npm start` - -Runs the app in the development mode.\ -Open [http://localhost:3000](http://localhost:3000) to view it in the browser. - -The page will reload if you make edits.\ -You will also see any lint errors in the console. - -### `npm test` - -Launches the test runner in the interactive watch mode.\ -See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information. - -### `npm run build` - -Builds the app for production to the `build` folder.\ -It correctly bundles React in production mode and optimizes the build for the best performance. - -The build is minified and the filenames include the hashes.\ -Your app is ready to be deployed! - -See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information. - -### `npm run eject` - -**Note: this is a one-way operation. Once you `eject`, you can’t go back!** - -If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project. - -Instead, it will copy all the configuration files and the transitive dependencies (webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own. - -You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it. - -## Learn More - -You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started). - -To learn React, check out the [React documentation](https://reactjs.org/). diff --git a/frontend/craco.config.js b/frontend/craco.config.js new file mode 100644 index 0000000..3ff9763 --- /dev/null +++ b/frontend/craco.config.js @@ -0,0 +1,7 @@ +module.exports = { + devServer: { + writeToDisk: true, + port: 3300, + liveReload: true, + }, +}; diff --git a/frontend/package.json b/frontend/package.json index aab891b..ae16545 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,8 +6,9 @@ "license": "GPL-3.0", "repository": "https://github.com/rubikscraft/Imagur", "author": "Rubikscraft ", - "type": "module", + "type": "commonjs", "dependencies": { + "@craco/craco": "^6.4.3", "@emotion/react": "^11.8.1", "@emotion/styled": "^11.8.1", "@mui/material": "^5.4.3", @@ -25,10 +26,8 @@ "typescript": "^4.5.5" }, "scripts": { - "start": "react-scripts start", - "watch": "cra-build-watch", - "build": "react-scripts build", - "eject": "react-scripts eject" + "start": "craco start", + "build": "craco build" }, "eslintConfig": { "extends": [ diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 7181574..cce572b 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -19,7 +19,7 @@ function App() { }, }); - const baseURL = location.protocol + '//' + location.host; + const baseURL = window.location.protocol + '//' + window.location.host; let [state, setState] = useState(States.Selecting); let [imageURL, setImageURL] = useState(''); @@ -63,7 +63,7 @@ function App() { return ( - {getView()} + {getView()} ); } diff --git a/frontend/src/components/centered/centered.tsx b/frontend/src/components/centered/centered.tsx index 5f6b948..8fc467e 100644 --- a/frontend/src/components/centered/centered.tsx +++ b/frontend/src/components/centered/centered.tsx @@ -1,19 +1,26 @@ +import React from 'react'; import './centered.css'; -function Centered( - props: React.DetailedHTMLProps< +class Centered extends React.Component< + React.DetailedHTMLProps< React.HTMLAttributes, HTMLDivElement - > & { screen?: boolean }, -) { - let clss = 'centered'; - if (props.screen) { - clss += ' centered-screen'; - } else { - clss += ' centered-normal'; - } + > & { fullScreen?: boolean }, + any +> { + render() { + let clss = 'centered'; + if (this.props.fullScreen) { + clss += ' centered-screen'; + } else { + clss += ' centered-normal'; + } - return
; + let filteredProps = { ...this.props }; + delete filteredProps.fullScreen; + + return
; + } } export default Centered; diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index a273b0c..9d379a3 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -1,11 +1,7 @@ { "compilerOptions": { "target": "es5", - "lib": [ - "dom", - "dom.iterable", - "esnext" - ], + "lib": ["dom", "dom.iterable", "esnext"], "allowJs": true, "skipLibCheck": true, "esModuleInterop": true, @@ -20,7 +16,5 @@ "noEmit": true, "jsx": "react-jsx" }, - "include": [ - "src" - ] + "include": ["src"] } diff --git a/frontend/yarn.lock b/frontend/yarn.lock index a59eb99..5b67235 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1095,6 +1095,30 @@ exec-sh "^0.3.2" minimist "^1.2.0" +"@craco/craco@^6.4.3": + version "6.4.3" + resolved "https://registry.yarnpkg.com/@craco/craco/-/craco-6.4.3.tgz#784395b6ebab764056550a2860494d24c3abd44e" + integrity sha512-RzkXYmNzRCGUyG7mM+IUMM+nvrpSfA34352sPSGQN76UivAmCAht3sI4v5JKgzO05oUK9Zwi6abCKD7iKXI8hQ== + dependencies: + cosmiconfig "^7.0.1" + cosmiconfig-typescript-loader "^1.0.0" + cross-spawn "^7.0.0" + lodash "^4.17.15" + semver "^7.3.2" + webpack-merge "^4.2.2" + +"@cspotcode/source-map-consumer@0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b" + integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg== + +"@cspotcode/source-map-support@0.7.0": + version "0.7.0" + resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5" + integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA== + dependencies: + "@cspotcode/source-map-consumer" "0.8.0" + "@csstools/convert-colors@^1.4.0": version "1.4.0" resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7" @@ -1769,6 +1793,26 @@ resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82" integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw== +"@tsconfig/node10@^1.0.7": + version "1.0.8" + resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9" + integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg== + +"@tsconfig/node12@^1.0.7": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c" + integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw== + +"@tsconfig/node14@^1.0.0": + version "1.0.1" + resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2" + integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg== + +"@tsconfig/node16@^1.0.2": + version "1.0.2" + resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e" + integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== + "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": version "7.1.18" resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8" @@ -2299,6 +2343,11 @@ acorn-walk@^7.1.1: resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz#0de889a601203909b0fbe07b8938dc21d2e967bc" integrity sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA== +acorn-walk@^8.1.1: + version "8.2.0" + resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1" + integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA== + acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" @@ -2309,7 +2358,7 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.5.0: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== @@ -2449,6 +2498,11 @@ aproba@^1.1.1: resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw== +arg@^4.1.0: + version "4.1.3" + resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" + integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== + argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" @@ -3700,6 +3754,14 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.3.tgz#a6042d3634c2b27e9328f837b965fac83808db85" integrity sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ== +cosmiconfig-typescript-loader@^1.0.0: + version "1.0.5" + resolved "https://registry.yarnpkg.com/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-1.0.5.tgz#22373003194a1887bbccbdfd05a13501397109a8" + integrity sha512-FL/YR1nb8hyN0bAcP3MBaIoZravfZtVsN/RuPnoo6UVjqIrDxSNIpXHCGgJe0ZWy5yImpyD6jq5wCJ5f1nUv8g== + dependencies: + cosmiconfig "^7" + ts-node "^10.5.0" + cosmiconfig@^5.0.0: version "5.2.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a" @@ -3721,7 +3783,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -cosmiconfig@^7.0.0: +cosmiconfig@^7, cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== @@ -3776,6 +3838,11 @@ create-hmac@^1.1.0, create-hmac@^1.1.4, create-hmac@^1.1.7: safe-buffer "^5.0.1" sha.js "^2.4.8" +create-require@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333" + integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ== + cross-spawn@7.0.3, cross-spawn@^7.0.0, cross-spawn@^7.0.2: version "7.0.3" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" @@ -4246,6 +4313,11 @@ diff-sequences@^26.6.2: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== +diff@^4.0.1: + version "4.0.2" + resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" + integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== + diffie-hellman@^5.0.0: version "5.0.3" resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" @@ -7285,6 +7357,11 @@ make-dir@^3.0.0, make-dir@^3.0.2: dependencies: semver "^6.0.0" +make-error@^1.1.1: + version "1.3.6" + resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2" + integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw== + makeerror@1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.12.tgz#3e5dd2079a82e812e983cc6610c4a2cb0eaa801a" @@ -10872,6 +10949,25 @@ tryer@^1.0.1: resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" integrity sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA== +ts-node@^10.5.0: + version "10.5.0" + resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.5.0.tgz#618bef5854c1fbbedf5e31465cbb224a1d524ef9" + integrity sha512-6kEJKwVxAJ35W4akuiysfKwKmjkbYxwQMTBaAxo9KKAx/Yd26mPUyhGz3ji+EsJoAgrLqVsYHNuuYwQe22lbtw== + dependencies: + "@cspotcode/source-map-support" "0.7.0" + "@tsconfig/node10" "^1.0.7" + "@tsconfig/node12" "^1.0.7" + "@tsconfig/node14" "^1.0.0" + "@tsconfig/node16" "^1.0.2" + acorn "^8.4.1" + acorn-walk "^8.1.1" + arg "^4.1.0" + create-require "^1.1.0" + diff "^4.0.1" + make-error "^1.1.1" + v8-compile-cache-lib "^3.0.0" + yn "3.1.1" + ts-pnp@1.2.0, ts-pnp@^1.1.6: version "1.2.0" resolved "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.2.0.tgz#a500ad084b0798f1c3071af391e65912c86bca92" @@ -11199,6 +11295,11 @@ uuid@^8.3.0, uuid@^8.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== +v8-compile-cache-lib@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.0.tgz#0582bcb1c74f3a2ee46487ceecf372e46bce53e8" + integrity sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA== + v8-compile-cache@^2.0.3: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" @@ -11367,6 +11468,13 @@ webpack-manifest-plugin@2.2.0: object.entries "^1.1.0" tapable "^1.0.0" +webpack-merge@^4.2.2: + version "4.2.2" + resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d" + integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g== + dependencies: + lodash "^4.17.15" + webpack-sources@^1.1.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" @@ -11780,6 +11888,11 @@ yargs@^15.4.1: y18n "^4.0.0" yargs-parser "^18.1.2" +yn@3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50" + integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q== + yocto-queue@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" diff --git a/backend/dev/docker-compose.yml b/support/docker-compose.yml similarity index 100% rename from backend/dev/docker-compose.yml rename to support/docker-compose.yml