diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 03284e2..06d8795 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -16,9 +16,6 @@ on: jobs: docker: runs-on: ubuntu-latest - strategy: - matrix: - project: [web, api] steps: - name: Checkout uses: actions/checkout@v3 @@ -34,7 +31,7 @@ jobs: id: meta uses: docker/metadata-action@v4 with: - images: code.tjo.space/tjo-space/tjo.space/${{ matrix.project }} + images: code.tjo.space/tjo-space/tjo.space # generate Docker tags based on the following events/attributes tags: | type=schedule @@ -55,7 +52,7 @@ jobs: env: ACTIONS_RUNTIME_TOKEN: '' with: - context: ${{ matrix.project }} + context: . push: true #platforms: linux/amd64,linux/arm64 tags: ${{ steps.meta.outputs.tags }} diff --git a/web/.gitignore b/.gitignore similarity index 100% rename from web/.gitignore rename to .gitignore diff --git a/web/Dockerfile b/Dockerfile similarity index 100% rename from web/Dockerfile rename to Dockerfile diff --git a/README.md b/README.md index 8ac6455..9bd2de2 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,8 @@ # [tjo.space](https://tjo.space) -## API - -``` -$ cd api -$ bun install -$ bun start -``` - -## WEB - ### Development ``` -$ cd web $ npm install $ npm start ``` @@ -22,7 +11,6 @@ $ npm start 1. Generate default locale (english) text to be translated. ``` -$ cd web $ npm install $ npm run write-translations ``` diff --git a/api/.gitignore b/api/.gitignore deleted file mode 100644 index 87e5610..0000000 --- a/api/.gitignore +++ /dev/null @@ -1,42 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js - -# testing -/coverage - -# next.js -/.next/ -/out/ - -# production -/build - -# misc -.DS_Store -*.pem - -# debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# local env files -.env.local -.env.development.local -.env.test.local -.env.production.local - -# vercel -.vercel - -**/*.trace -**/*.zip -**/*.tar.gz -**/*.tgz -**/*.log -package-lock.json -**/*.bun \ No newline at end of file diff --git a/api/Dockerfile b/api/Dockerfile deleted file mode 100644 index ad410cf..0000000 --- a/api/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -FROM oven/bun - -ADD package.json package.json -ADD bun.lockb bun.lockb - -RUN bun install - -ADD src src - -CMD bun src/index.ts -EXPOSE 3003 diff --git a/api/README.md b/api/README.md deleted file mode 100644 index 688c87e..0000000 --- a/api/README.md +++ /dev/null @@ -1,15 +0,0 @@ -# Elysia with Bun runtime - -## Getting Started -To get started with this template, simply paste this command into your terminal: -```bash -bun create elysia ./elysia-example -``` - -## Development -To start the development server run: -```bash -bun run dev -``` - -Open http://localhost:3000/ with your browser to see the result. \ No newline at end of file diff --git a/api/bun.lockb b/api/bun.lockb deleted file mode 100755 index 046c91e..0000000 Binary files a/api/bun.lockb and /dev/null differ diff --git a/api/package.json b/api/package.json deleted file mode 100644 index 70e01cf..0000000 --- a/api/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "api", - "version": "0.0.0", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1", - "dev": "bun run --watch src/index.ts" - }, - "dependencies": { - "@elysiajs/swagger": "mentos1386/elysia-swagger#fix-prefix-swagger", - "elysia": "latest" - }, - "devDependencies": { - "bun-types": "latest", - "typescript": "^5.0.0" - }, - "module": "src/index.js" -} diff --git a/api/src/index.ts b/api/src/index.ts deleted file mode 100644 index 674df10..0000000 --- a/api/src/index.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { Elysia } from "elysia"; -//import { swagger } from "@elysiajs/swagger"; - -const app = new Elysia({ - prefix: "/api", -}); -//.use( -// swagger({ -// documentation: { info: { title: "tjo.space API" } }, -// }) -//); - -app.get("/", (ctx) => ctx.headers); - -app.listen({ port: 3003, hostname: "0.0.0.0" }); -console.log( - `🦊 Elysia is running at ${app.server?.hostname}:${app.server?.port}` -); diff --git a/api/tsconfig.json b/api/tsconfig.json deleted file mode 100644 index 1ca2350..0000000 --- a/api/tsconfig.json +++ /dev/null @@ -1,103 +0,0 @@ -{ - "compilerOptions": { - /* Visit https://aka.ms/tsconfig to read more about this file */ - - /* Projects */ - // "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */ - // "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */ - // "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */ - // "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */ - // "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */ - // "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */ - - /* Language and Environment */ - "target": "ES2021", /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */ - // "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */ - // "jsx": "preserve", /* Specify what JSX code is generated. */ - // "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */ - // "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */ - // "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */ - // "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */ - // "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */ - // "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */ - // "noLib": true, /* Disable including any library files, including the default lib.d.ts. */ - // "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */ - // "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */ - - /* Modules */ - "module": "ES2022", /* Specify what module code is generated. */ - // "rootDir": "./", /* Specify the root folder within your source files. */ - "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */ - // "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */ - // "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */ - // "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */ - // "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */ - "types": ["bun-types"], /* Specify type package names to be included without being referenced in a source file. */ - // "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */ - // "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */ - // "resolveJsonModule": true, /* Enable importing .json files. */ - // "noResolve": true, /* Disallow 'import's, 'require's or ''s from expanding the number of files TypeScript should add to a project. */ - - /* JavaScript Support */ - // "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */ - // "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */ - // "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */ - - /* Emit */ - // "declaration": true, /* Generate .d.ts files from TypeScript and JavaScript files in your project. */ - // "declarationMap": true, /* Create sourcemaps for d.ts files. */ - // "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */ - // "sourceMap": true, /* Create source map files for emitted JavaScript files. */ - // "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */ - // "outDir": "./", /* Specify an output folder for all emitted files. */ - // "removeComments": true, /* Disable emitting comments. */ - // "noEmit": true, /* Disable emitting files from a compilation. */ - // "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */ - // "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */ - // "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */ - // "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */ - // "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */ - // "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */ - // "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */ - // "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */ - // "newLine": "crlf", /* Set the newline character for emitting files. */ - // "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */ - // "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */ - // "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */ - // "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */ - // "declarationDir": "./", /* Specify the output directory for generated declaration files. */ - // "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */ - - /* Interop Constraints */ - // "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */ - // "allowSyntheticDefaultImports": true, /* Allow 'import x from y' when a module doesn't have a default export. */ - "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */ - // "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */ - "forceConsistentCasingInFileNames": true, /* Ensure that casing is correct in imports. */ - - /* Type Checking */ - "strict": true, /* Enable all strict type-checking options. */ - // "noImplicitAny": true, /* Enable error reporting for expressions and declarations with an implied 'any' type. */ - // "strictNullChecks": true, /* When type checking, take into account 'null' and 'undefined'. */ - // "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */ - // "strictBindCallApply": true, /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */ - // "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */ - // "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */ - // "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */ - // "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */ - // "noUnusedLocals": true, /* Enable error reporting when local variables aren't read. */ - // "noUnusedParameters": true, /* Raise an error when a function parameter isn't read. */ - // "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */ - // "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */ - // "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */ - // "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */ - // "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */ - // "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */ - // "allowUnusedLabels": true, /* Disable error reporting for unused labels. */ - // "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */ - - /* Completeness */ - // "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */ - "skipLibCheck": true /* Skip type checking all .d.ts files. */ - } -} diff --git a/web/babel.config.js b/babel.config.js similarity index 100% rename from web/babel.config.js rename to babel.config.js diff --git a/web/blog/2019-05-28-first-blog-post.md b/blog/2019-05-28-first-blog-post.md similarity index 100% rename from web/blog/2019-05-28-first-blog-post.md rename to blog/2019-05-28-first-blog-post.md diff --git a/web/blog/2019-05-29-long-blog-post.md b/blog/2019-05-29-long-blog-post.md similarity index 100% rename from web/blog/2019-05-29-long-blog-post.md rename to blog/2019-05-29-long-blog-post.md diff --git a/web/blog/2021-08-01-mdx-blog-post.mdx b/blog/2021-08-01-mdx-blog-post.mdx similarity index 100% rename from web/blog/2021-08-01-mdx-blog-post.mdx rename to blog/2021-08-01-mdx-blog-post.mdx diff --git a/web/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg b/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg similarity index 100% rename from web/blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg rename to blog/2021-08-26-welcome/docusaurus-plushie-banner.jpeg diff --git a/web/blog/2021-08-26-welcome/index.md b/blog/2021-08-26-welcome/index.md similarity index 100% rename from web/blog/2021-08-26-welcome/index.md rename to blog/2021-08-26-welcome/index.md diff --git a/web/blog/authors.yml b/blog/authors.yml similarity index 100% rename from web/blog/authors.yml rename to blog/authors.yml diff --git a/web/docs/intro.md b/docs/intro.md similarity index 100% rename from web/docs/intro.md rename to docs/intro.md diff --git a/web/docs/tutorial-basics/_category_.json b/docs/tutorial-basics/_category_.json similarity index 100% rename from web/docs/tutorial-basics/_category_.json rename to docs/tutorial-basics/_category_.json diff --git a/web/docs/tutorial-basics/congratulations.md b/docs/tutorial-basics/congratulations.md similarity index 100% rename from web/docs/tutorial-basics/congratulations.md rename to docs/tutorial-basics/congratulations.md diff --git a/web/docs/tutorial-basics/create-a-blog-post.md b/docs/tutorial-basics/create-a-blog-post.md similarity index 100% rename from web/docs/tutorial-basics/create-a-blog-post.md rename to docs/tutorial-basics/create-a-blog-post.md diff --git a/web/docs/tutorial-basics/create-a-document.md b/docs/tutorial-basics/create-a-document.md similarity index 100% rename from web/docs/tutorial-basics/create-a-document.md rename to docs/tutorial-basics/create-a-document.md diff --git a/web/docs/tutorial-basics/create-a-page.md b/docs/tutorial-basics/create-a-page.md similarity index 100% rename from web/docs/tutorial-basics/create-a-page.md rename to docs/tutorial-basics/create-a-page.md diff --git a/web/docs/tutorial-basics/deploy-your-site.md b/docs/tutorial-basics/deploy-your-site.md similarity index 100% rename from web/docs/tutorial-basics/deploy-your-site.md rename to docs/tutorial-basics/deploy-your-site.md diff --git a/web/docs/tutorial-basics/markdown-features.mdx b/docs/tutorial-basics/markdown-features.mdx similarity index 100% rename from web/docs/tutorial-basics/markdown-features.mdx rename to docs/tutorial-basics/markdown-features.mdx diff --git a/web/docs/tutorial-extras/_category_.json b/docs/tutorial-extras/_category_.json similarity index 100% rename from web/docs/tutorial-extras/_category_.json rename to docs/tutorial-extras/_category_.json diff --git a/web/docs/tutorial-extras/img/docsVersionDropdown.png b/docs/tutorial-extras/img/docsVersionDropdown.png similarity index 100% rename from web/docs/tutorial-extras/img/docsVersionDropdown.png rename to docs/tutorial-extras/img/docsVersionDropdown.png diff --git a/web/docs/tutorial-extras/img/localeDropdown.png b/docs/tutorial-extras/img/localeDropdown.png similarity index 100% rename from web/docs/tutorial-extras/img/localeDropdown.png rename to docs/tutorial-extras/img/localeDropdown.png diff --git a/web/docs/tutorial-extras/manage-docs-versions.md b/docs/tutorial-extras/manage-docs-versions.md similarity index 100% rename from web/docs/tutorial-extras/manage-docs-versions.md rename to docs/tutorial-extras/manage-docs-versions.md diff --git a/web/docs/tutorial-extras/translate-your-site.md b/docs/tutorial-extras/translate-your-site.md similarity index 100% rename from web/docs/tutorial-extras/translate-your-site.md rename to docs/tutorial-extras/translate-your-site.md diff --git a/web/docusaurus.config.js b/docusaurus.config.js similarity index 100% rename from web/docusaurus.config.js rename to docusaurus.config.js diff --git a/web/i18n/en/code.json b/i18n/en/code.json similarity index 100% rename from web/i18n/en/code.json rename to i18n/en/code.json diff --git a/web/i18n/en/docusaurus-plugin-content-blog/options.json b/i18n/en/docusaurus-plugin-content-blog/options.json similarity index 100% rename from web/i18n/en/docusaurus-plugin-content-blog/options.json rename to i18n/en/docusaurus-plugin-content-blog/options.json diff --git a/web/i18n/en/docusaurus-plugin-content-docs/current.json b/i18n/en/docusaurus-plugin-content-docs/current.json similarity index 100% rename from web/i18n/en/docusaurus-plugin-content-docs/current.json rename to i18n/en/docusaurus-plugin-content-docs/current.json diff --git a/web/i18n/en/docusaurus-theme-classic/footer.json b/i18n/en/docusaurus-theme-classic/footer.json similarity index 100% rename from web/i18n/en/docusaurus-theme-classic/footer.json rename to i18n/en/docusaurus-theme-classic/footer.json diff --git a/web/i18n/en/docusaurus-theme-classic/navbar.json b/i18n/en/docusaurus-theme-classic/navbar.json similarity index 100% rename from web/i18n/en/docusaurus-theme-classic/navbar.json rename to i18n/en/docusaurus-theme-classic/navbar.json diff --git a/web/package-lock.json b/package-lock.json similarity index 100% rename from web/package-lock.json rename to package-lock.json diff --git a/web/package.json b/package.json similarity index 100% rename from web/package.json rename to package.json diff --git a/web/sidebars.js b/sidebars.js similarity index 100% rename from web/sidebars.js rename to sidebars.js diff --git a/web/src/components/HomepageFeatures/index.tsx b/src/components/HomepageFeatures/index.tsx similarity index 100% rename from web/src/components/HomepageFeatures/index.tsx rename to src/components/HomepageFeatures/index.tsx diff --git a/web/src/components/HomepageFeatures/styles.module.css b/src/components/HomepageFeatures/styles.module.css similarity index 100% rename from web/src/components/HomepageFeatures/styles.module.css rename to src/components/HomepageFeatures/styles.module.css diff --git a/web/src/css/custom.css b/src/css/custom.css similarity index 100% rename from web/src/css/custom.css rename to src/css/custom.css diff --git a/web/src/pages/index.module.css b/src/pages/index.module.css similarity index 100% rename from web/src/pages/index.module.css rename to src/pages/index.module.css diff --git a/web/src/pages/index.tsx b/src/pages/index.tsx similarity index 100% rename from web/src/pages/index.tsx rename to src/pages/index.tsx diff --git a/web/src/pages/markdown-page.md b/src/pages/markdown-page.md similarity index 100% rename from web/src/pages/markdown-page.md rename to src/pages/markdown-page.md diff --git a/web/static/.nojekyll b/static/.nojekyll similarity index 100% rename from web/static/.nojekyll rename to static/.nojekyll diff --git a/web/static/img/icon.svg b/static/img/icon.svg similarity index 100% rename from web/static/img/icon.svg rename to static/img/icon.svg diff --git a/web/static/img/logo-dark.svg b/static/img/logo-dark.svg similarity index 100% rename from web/static/img/logo-dark.svg rename to static/img/logo-dark.svg diff --git a/web/static/img/logo-light.svg b/static/img/logo-light.svg similarity index 100% rename from web/static/img/logo-light.svg rename to static/img/logo-light.svg diff --git a/web/static/img/logo.svg b/static/img/logo.svg similarity index 100% rename from web/static/img/logo.svg rename to static/img/logo.svg diff --git a/web/static/img/undraw_chat_tjo_space.svg b/static/img/undraw_chat_tjo_space.svg similarity index 100% rename from web/static/img/undraw_chat_tjo_space.svg rename to static/img/undraw_chat_tjo_space.svg diff --git a/web/static/img/undraw_cloud_tjo_space.svg b/static/img/undraw_cloud_tjo_space.svg similarity index 100% rename from web/static/img/undraw_cloud_tjo_space.svg rename to static/img/undraw_cloud_tjo_space.svg diff --git a/web/static/img/undraw_code_tjo_space.svg b/static/img/undraw_code_tjo_space.svg similarity index 100% rename from web/static/img/undraw_code_tjo_space.svg rename to static/img/undraw_code_tjo_space.svg diff --git a/web/static/img/undraw_mail_tjo_space.svg b/static/img/undraw_mail_tjo_space.svg similarity index 100% rename from web/static/img/undraw_mail_tjo_space.svg rename to static/img/undraw_mail_tjo_space.svg diff --git a/web/static/img/undraw_media_tjo_space.svg b/static/img/undraw_media_tjo_space.svg similarity index 100% rename from web/static/img/undraw_media_tjo_space.svg rename to static/img/undraw_media_tjo_space.svg diff --git a/web/static/img/undraw_paperless_tjo_space.svg b/static/img/undraw_paperless_tjo_space.svg similarity index 100% rename from web/static/img/undraw_paperless_tjo_space.svg rename to static/img/undraw_paperless_tjo_space.svg diff --git a/web/static/img/undraw_rss_tjo_space.svg b/static/img/undraw_rss_tjo_space.svg similarity index 100% rename from web/static/img/undraw_rss_tjo_space.svg rename to static/img/undraw_rss_tjo_space.svg diff --git a/web/static/img/undraw_search_tjo_space.svg b/static/img/undraw_search_tjo_space.svg similarity index 100% rename from web/static/img/undraw_search_tjo_space.svg rename to static/img/undraw_search_tjo_space.svg diff --git a/web/static/img/undraw_send_tjo_space.svg b/static/img/undraw_send_tjo_space.svg similarity index 100% rename from web/static/img/undraw_send_tjo_space.svg rename to static/img/undraw_send_tjo_space.svg diff --git a/web/static/img/undraw_vault_tjo_space.svg b/static/img/undraw_vault_tjo_space.svg similarity index 100% rename from web/static/img/undraw_vault_tjo_space.svg rename to static/img/undraw_vault_tjo_space.svg diff --git a/web/static/img/undraw_vpn_tjo_space.svg b/static/img/undraw_vpn_tjo_space.svg similarity index 100% rename from web/static/img/undraw_vpn_tjo_space.svg rename to static/img/undraw_vpn_tjo_space.svg diff --git a/web/static/img/undraw_yt_tjo_space.svg b/static/img/undraw_yt_tjo_space.svg similarity index 100% rename from web/static/img/undraw_yt_tjo_space.svg rename to static/img/undraw_yt_tjo_space.svg diff --git a/web/tsconfig.json b/tsconfig.json similarity index 100% rename from web/tsconfig.json rename to tsconfig.json