diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2f0c1d..9678468 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,6 +9,9 @@ on: jobs: build-and-test: runs-on: ubuntu-latest + defaults: + run: + working-directory: ./apps/bot strategy: matrix: node-version: [18.x] diff --git a/README.md b/README.md index a7cbc1c..5855958 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Follow these steps to set up and run your bot using this repository: After cloning the repository, navigate to the `web-app` directory: ```bash - cd web-app + cd apps/web-app ``` Run the following command to build the web app: @@ -49,7 +49,7 @@ Follow these steps to set up and run your bot using this repository: This command will generate build output resources inside the `dist` directory. You can now deploy these resources as a regular static website to your hosting provider of choice. - For information on launching the web app in developer mode, please refer to [web-app/README.md](./web-app/README.md) + For information on launching the web app in developer mode, please refer to [apps/web-app/README.md](./apps/web-app/README.md) 3. **Configure the Menu Button** @@ -61,12 +61,16 @@ Follow these steps to set up and run your bot using this repository: **Congrats!** Web App is deployed and available to bot users. -> **Note** -> The previous steps are focused on deploying web app. If your goal is to have a fully functional bot that also operates within a chat interface, follow the steps below. +> [!NOTE] +> At this stage web app is fully functional, further steps are optional. 4. **Environment Variables Setup** - Once you have completed the web app build and deployment, return to the project's root directory. + Once you have completed the web app build and deployment, navigate to the `apps/bot` directory: + + ```bash + cd ../bot + ``` Create an environment variables file by copying the provided example file: ```bash diff --git a/.env.example b/apps/bot/.env.example similarity index 100% rename from .env.example rename to apps/bot/.env.example diff --git a/.eslintrc.json b/apps/bot/.eslintrc.json similarity index 100% rename from .eslintrc.json rename to apps/bot/.eslintrc.json diff --git a/.gitignore b/apps/bot/.gitignore similarity index 100% rename from .gitignore rename to apps/bot/.gitignore diff --git a/.husky/pre-commit b/apps/bot/.husky/pre-commit similarity index 100% rename from .husky/pre-commit rename to apps/bot/.husky/pre-commit diff --git a/.vscode/extensions.json b/apps/bot/.vscode/extensions.json similarity index 100% rename from .vscode/extensions.json rename to apps/bot/.vscode/extensions.json diff --git a/.vscode/settings.json b/apps/bot/.vscode/settings.json similarity index 100% rename from .vscode/settings.json rename to apps/bot/.vscode/settings.json diff --git a/locales/en.ftl b/apps/bot/locales/en.ftl similarity index 100% rename from locales/en.ftl rename to apps/bot/locales/en.ftl diff --git a/package-lock.json b/apps/bot/package-lock.json similarity index 100% rename from package-lock.json rename to apps/bot/package-lock.json diff --git a/package.json b/apps/bot/package.json similarity index 100% rename from package.json rename to apps/bot/package.json diff --git a/src/bot/callback-data/change-language.ts b/apps/bot/src/bot/callback-data/change-language.ts similarity index 100% rename from src/bot/callback-data/change-language.ts rename to apps/bot/src/bot/callback-data/change-language.ts diff --git a/src/bot/callback-data/index.ts b/apps/bot/src/bot/callback-data/index.ts similarity index 100% rename from src/bot/callback-data/index.ts rename to apps/bot/src/bot/callback-data/index.ts diff --git a/src/bot/context.ts b/apps/bot/src/bot/context.ts similarity index 100% rename from src/bot/context.ts rename to apps/bot/src/bot/context.ts diff --git a/src/bot/features/admin.ts b/apps/bot/src/bot/features/admin.ts similarity index 100% rename from src/bot/features/admin.ts rename to apps/bot/src/bot/features/admin.ts diff --git a/src/bot/features/index.ts b/apps/bot/src/bot/features/index.ts similarity index 100% rename from src/bot/features/index.ts rename to apps/bot/src/bot/features/index.ts diff --git a/src/bot/features/language.ts b/apps/bot/src/bot/features/language.ts similarity index 100% rename from src/bot/features/language.ts rename to apps/bot/src/bot/features/language.ts diff --git a/src/bot/features/unhandled.ts b/apps/bot/src/bot/features/unhandled.ts similarity index 100% rename from src/bot/features/unhandled.ts rename to apps/bot/src/bot/features/unhandled.ts diff --git a/src/bot/features/welcome.ts b/apps/bot/src/bot/features/welcome.ts similarity index 100% rename from src/bot/features/welcome.ts rename to apps/bot/src/bot/features/welcome.ts diff --git a/src/bot/filters/index.ts b/apps/bot/src/bot/filters/index.ts similarity index 100% rename from src/bot/filters/index.ts rename to apps/bot/src/bot/filters/index.ts diff --git a/src/bot/filters/is-admin.ts b/apps/bot/src/bot/filters/is-admin.ts similarity index 100% rename from src/bot/filters/is-admin.ts rename to apps/bot/src/bot/filters/is-admin.ts diff --git a/src/bot/handlers/commands/setcommands.ts b/apps/bot/src/bot/handlers/commands/setcommands.ts similarity index 100% rename from src/bot/handlers/commands/setcommands.ts rename to apps/bot/src/bot/handlers/commands/setcommands.ts diff --git a/src/bot/handlers/error.ts b/apps/bot/src/bot/handlers/error.ts similarity index 100% rename from src/bot/handlers/error.ts rename to apps/bot/src/bot/handlers/error.ts diff --git a/src/bot/handlers/index.ts b/apps/bot/src/bot/handlers/index.ts similarity index 100% rename from src/bot/handlers/index.ts rename to apps/bot/src/bot/handlers/index.ts diff --git a/src/bot/helpers/keyboard.ts b/apps/bot/src/bot/helpers/keyboard.ts similarity index 100% rename from src/bot/helpers/keyboard.ts rename to apps/bot/src/bot/helpers/keyboard.ts diff --git a/src/bot/helpers/logging.ts b/apps/bot/src/bot/helpers/logging.ts similarity index 100% rename from src/bot/helpers/logging.ts rename to apps/bot/src/bot/helpers/logging.ts diff --git a/src/bot/i18n.ts b/apps/bot/src/bot/i18n.ts similarity index 100% rename from src/bot/i18n.ts rename to apps/bot/src/bot/i18n.ts diff --git a/src/bot/index.ts b/apps/bot/src/bot/index.ts similarity index 100% rename from src/bot/index.ts rename to apps/bot/src/bot/index.ts diff --git a/src/bot/keyboards/change-language.ts b/apps/bot/src/bot/keyboards/change-language.ts similarity index 100% rename from src/bot/keyboards/change-language.ts rename to apps/bot/src/bot/keyboards/change-language.ts diff --git a/src/bot/keyboards/index.ts b/apps/bot/src/bot/keyboards/index.ts similarity index 100% rename from src/bot/keyboards/index.ts rename to apps/bot/src/bot/keyboards/index.ts diff --git a/src/bot/middlewares/index.ts b/apps/bot/src/bot/middlewares/index.ts similarity index 100% rename from src/bot/middlewares/index.ts rename to apps/bot/src/bot/middlewares/index.ts diff --git a/src/bot/middlewares/update-logger.ts b/apps/bot/src/bot/middlewares/update-logger.ts similarity index 100% rename from src/bot/middlewares/update-logger.ts rename to apps/bot/src/bot/middlewares/update-logger.ts diff --git a/src/config.ts b/apps/bot/src/config.ts similarity index 100% rename from src/config.ts rename to apps/bot/src/config.ts diff --git a/src/logger.ts b/apps/bot/src/logger.ts similarity index 100% rename from src/logger.ts rename to apps/bot/src/logger.ts diff --git a/src/main.ts b/apps/bot/src/main.ts similarity index 100% rename from src/main.ts rename to apps/bot/src/main.ts diff --git a/src/server/index.ts b/apps/bot/src/server/index.ts similarity index 100% rename from src/server/index.ts rename to apps/bot/src/server/index.ts diff --git a/tsconfig.json b/apps/bot/tsconfig.json similarity index 100% rename from tsconfig.json rename to apps/bot/tsconfig.json diff --git a/web-app/.eslintrc.cjs b/apps/web-app/.eslintrc.cjs similarity index 100% rename from web-app/.eslintrc.cjs rename to apps/web-app/.eslintrc.cjs diff --git a/web-app/.gitignore b/apps/web-app/.gitignore similarity index 100% rename from web-app/.gitignore rename to apps/web-app/.gitignore diff --git a/web-app/.prettierrc.json b/apps/web-app/.prettierrc.json similarity index 100% rename from web-app/.prettierrc.json rename to apps/web-app/.prettierrc.json diff --git a/web-app/.vscode/extensions.json b/apps/web-app/.vscode/extensions.json similarity index 100% rename from web-app/.vscode/extensions.json rename to apps/web-app/.vscode/extensions.json diff --git a/web-app/README.md b/apps/web-app/README.md similarity index 100% rename from web-app/README.md rename to apps/web-app/README.md diff --git a/web-app/env.d.ts b/apps/web-app/env.d.ts similarity index 100% rename from web-app/env.d.ts rename to apps/web-app/env.d.ts diff --git a/web-app/index.html b/apps/web-app/index.html similarity index 100% rename from web-app/index.html rename to apps/web-app/index.html diff --git a/web-app/package-lock.json b/apps/web-app/package-lock.json similarity index 100% rename from web-app/package-lock.json rename to apps/web-app/package-lock.json diff --git a/web-app/package.json b/apps/web-app/package.json similarity index 100% rename from web-app/package.json rename to apps/web-app/package.json diff --git a/web-app/patches/@tiptap+extension-task-item+2.1.11.patch b/apps/web-app/patches/@tiptap+extension-task-item+2.1.11.patch similarity index 100% rename from web-app/patches/@tiptap+extension-task-item+2.1.11.patch rename to apps/web-app/patches/@tiptap+extension-task-item+2.1.11.patch diff --git a/web-app/postcss.config.js b/apps/web-app/postcss.config.js similarity index 100% rename from web-app/postcss.config.js rename to apps/web-app/postcss.config.js diff --git a/web-app/src/App.vue b/apps/web-app/src/App.vue similarity index 100% rename from web-app/src/App.vue rename to apps/web-app/src/App.vue diff --git a/web-app/src/assets/base.css b/apps/web-app/src/assets/base.css similarity index 100% rename from web-app/src/assets/base.css rename to apps/web-app/src/assets/base.css diff --git a/web-app/src/assets/main.css b/apps/web-app/src/assets/main.css similarity index 100% rename from web-app/src/assets/main.css rename to apps/web-app/src/assets/main.css diff --git a/web-app/src/components/MasonryGrid.vue b/apps/web-app/src/components/MasonryGrid.vue similarity index 100% rename from web-app/src/components/MasonryGrid.vue rename to apps/web-app/src/components/MasonryGrid.vue diff --git a/web-app/src/components/hashtags/HashtagItem.vue b/apps/web-app/src/components/hashtags/HashtagItem.vue similarity index 100% rename from web-app/src/components/hashtags/HashtagItem.vue rename to apps/web-app/src/components/hashtags/HashtagItem.vue diff --git a/web-app/src/components/hashtags/HashtagList.vue b/apps/web-app/src/components/hashtags/HashtagList.vue similarity index 100% rename from web-app/src/components/hashtags/HashtagList.vue rename to apps/web-app/src/components/hashtags/HashtagList.vue diff --git a/web-app/src/components/icons/IconClear.vue b/apps/web-app/src/components/icons/IconClear.vue similarity index 100% rename from web-app/src/components/icons/IconClear.vue rename to apps/web-app/src/components/icons/IconClear.vue diff --git a/web-app/src/components/icons/IconCloud.vue b/apps/web-app/src/components/icons/IconCloud.vue similarity index 100% rename from web-app/src/components/icons/IconCloud.vue rename to apps/web-app/src/components/icons/IconCloud.vue diff --git a/web-app/src/components/icons/IconCloudDownload.vue b/apps/web-app/src/components/icons/IconCloudDownload.vue similarity index 100% rename from web-app/src/components/icons/IconCloudDownload.vue rename to apps/web-app/src/components/icons/IconCloudDownload.vue diff --git a/web-app/src/components/icons/IconHighlight.vue b/apps/web-app/src/components/icons/IconHighlight.vue similarity index 100% rename from web-app/src/components/icons/IconHighlight.vue rename to apps/web-app/src/components/icons/IconHighlight.vue diff --git a/web-app/src/components/icons/IconListBullet.vue b/apps/web-app/src/components/icons/IconListBullet.vue similarity index 100% rename from web-app/src/components/icons/IconListBullet.vue rename to apps/web-app/src/components/icons/IconListBullet.vue diff --git a/web-app/src/components/icons/IconListChecklist.vue b/apps/web-app/src/components/icons/IconListChecklist.vue similarity index 100% rename from web-app/src/components/icons/IconListChecklist.vue rename to apps/web-app/src/components/icons/IconListChecklist.vue diff --git a/web-app/src/components/icons/IconListOrdered.vue b/apps/web-app/src/components/icons/IconListOrdered.vue similarity index 100% rename from web-app/src/components/icons/IconListOrdered.vue rename to apps/web-app/src/components/icons/IconListOrdered.vue diff --git a/web-app/src/components/icons/IconOffline.vue b/apps/web-app/src/components/icons/IconOffline.vue similarity index 100% rename from web-app/src/components/icons/IconOffline.vue rename to apps/web-app/src/components/icons/IconOffline.vue diff --git a/web-app/src/components/icons/IconPin.vue b/apps/web-app/src/components/icons/IconPin.vue similarity index 100% rename from web-app/src/components/icons/IconPin.vue rename to apps/web-app/src/components/icons/IconPin.vue diff --git a/web-app/src/components/icons/IconPlus.vue b/apps/web-app/src/components/icons/IconPlus.vue similarity index 100% rename from web-app/src/components/icons/IconPlus.vue rename to apps/web-app/src/components/icons/IconPlus.vue diff --git a/web-app/src/components/icons/IconRedo.vue b/apps/web-app/src/components/icons/IconRedo.vue similarity index 100% rename from web-app/src/components/icons/IconRedo.vue rename to apps/web-app/src/components/icons/IconRedo.vue diff --git a/web-app/src/components/icons/IconSearch.vue b/apps/web-app/src/components/icons/IconSearch.vue similarity index 100% rename from web-app/src/components/icons/IconSearch.vue rename to apps/web-app/src/components/icons/IconSearch.vue diff --git a/web-app/src/components/icons/IconTrashbin.vue b/apps/web-app/src/components/icons/IconTrashbin.vue similarity index 100% rename from web-app/src/components/icons/IconTrashbin.vue rename to apps/web-app/src/components/icons/IconTrashbin.vue diff --git a/web-app/src/components/icons/IconUndo.vue b/apps/web-app/src/components/icons/IconUndo.vue similarity index 100% rename from web-app/src/components/icons/IconUndo.vue rename to apps/web-app/src/components/icons/IconUndo.vue diff --git a/web-app/src/components/icons/IconUnpin.vue b/apps/web-app/src/components/icons/IconUnpin.vue similarity index 100% rename from web-app/src/components/icons/IconUnpin.vue rename to apps/web-app/src/components/icons/IconUnpin.vue diff --git a/web-app/src/components/notes/NoteEditor.vue b/apps/web-app/src/components/notes/NoteEditor.vue similarity index 100% rename from web-app/src/components/notes/NoteEditor.vue rename to apps/web-app/src/components/notes/NoteEditor.vue diff --git a/web-app/src/components/notes/NoteItem.vue b/apps/web-app/src/components/notes/NoteItem.vue similarity index 100% rename from web-app/src/components/notes/NoteItem.vue rename to apps/web-app/src/components/notes/NoteItem.vue diff --git a/web-app/src/components/notes/NoteItemSkeleton.vue b/apps/web-app/src/components/notes/NoteItemSkeleton.vue similarity index 100% rename from web-app/src/components/notes/NoteItemSkeleton.vue rename to apps/web-app/src/components/notes/NoteItemSkeleton.vue diff --git a/web-app/src/components/notes/NoteList.vue b/apps/web-app/src/components/notes/NoteList.vue similarity index 100% rename from web-app/src/components/notes/NoteList.vue rename to apps/web-app/src/components/notes/NoteList.vue diff --git a/web-app/src/components/notes/NoteListSkeleton.vue b/apps/web-app/src/components/notes/NoteListSkeleton.vue similarity index 100% rename from web-app/src/components/notes/NoteListSkeleton.vue rename to apps/web-app/src/components/notes/NoteListSkeleton.vue diff --git a/web-app/src/components/notes/NoteMassActions.vue b/apps/web-app/src/components/notes/NoteMassActions.vue similarity index 100% rename from web-app/src/components/notes/NoteMassActions.vue rename to apps/web-app/src/components/notes/NoteMassActions.vue diff --git a/web-app/src/components/search/SearchBar.vue b/apps/web-app/src/components/search/SearchBar.vue similarity index 100% rename from web-app/src/components/search/SearchBar.vue rename to apps/web-app/src/components/search/SearchBar.vue diff --git a/web-app/src/composables/useVisualViewport.ts b/apps/web-app/src/composables/useVisualViewport.ts similarity index 100% rename from web-app/src/composables/useVisualViewport.ts rename to apps/web-app/src/composables/useVisualViewport.ts diff --git a/web-app/src/composables/useWheelHorizontalScroll.ts b/apps/web-app/src/composables/useWheelHorizontalScroll.ts similarity index 100% rename from web-app/src/composables/useWheelHorizontalScroll.ts rename to apps/web-app/src/composables/useWheelHorizontalScroll.ts diff --git a/web-app/src/helpers/debug.ts b/apps/web-app/src/helpers/debug.ts similarity index 100% rename from web-app/src/helpers/debug.ts rename to apps/web-app/src/helpers/debug.ts diff --git a/web-app/src/helpers/device.ts b/apps/web-app/src/helpers/device.ts similarity index 100% rename from web-app/src/helpers/device.ts rename to apps/web-app/src/helpers/device.ts diff --git a/web-app/src/helpers/html.ts b/apps/web-app/src/helpers/html.ts similarity index 100% rename from web-app/src/helpers/html.ts rename to apps/web-app/src/helpers/html.ts diff --git a/web-app/src/helpers/random.ts b/apps/web-app/src/helpers/random.ts similarity index 100% rename from web-app/src/helpers/random.ts rename to apps/web-app/src/helpers/random.ts diff --git a/web-app/src/helpers/serialization.ts b/apps/web-app/src/helpers/serialization.ts similarity index 100% rename from web-app/src/helpers/serialization.ts rename to apps/web-app/src/helpers/serialization.ts diff --git a/web-app/src/helpers/styles.ts b/apps/web-app/src/helpers/styles.ts similarity index 100% rename from web-app/src/helpers/styles.ts rename to apps/web-app/src/helpers/styles.ts diff --git a/web-app/src/main.ts b/apps/web-app/src/main.ts similarity index 100% rename from web-app/src/main.ts rename to apps/web-app/src/main.ts diff --git a/web-app/src/router/index.ts b/apps/web-app/src/router/index.ts similarity index 100% rename from web-app/src/router/index.ts rename to apps/web-app/src/router/index.ts diff --git a/web-app/src/stores/config.ts b/apps/web-app/src/stores/config.ts similarity index 100% rename from web-app/src/stores/config.ts rename to apps/web-app/src/stores/config.ts diff --git a/web-app/src/stores/hashtags.ts b/apps/web-app/src/stores/hashtags.ts similarity index 100% rename from web-app/src/stores/hashtags.ts rename to apps/web-app/src/stores/hashtags.ts diff --git a/web-app/src/stores/notes.ts b/apps/web-app/src/stores/notes.ts similarity index 100% rename from web-app/src/stores/notes.ts rename to apps/web-app/src/stores/notes.ts diff --git a/web-app/src/stores/search.ts b/apps/web-app/src/stores/search.ts similarity index 100% rename from web-app/src/stores/search.ts rename to apps/web-app/src/stores/search.ts diff --git a/web-app/src/stores/sync.ts b/apps/web-app/src/stores/sync.ts similarity index 100% rename from web-app/src/stores/sync.ts rename to apps/web-app/src/stores/sync.ts diff --git a/web-app/src/views/NoteView.vue b/apps/web-app/src/views/NoteView.vue similarity index 100% rename from web-app/src/views/NoteView.vue rename to apps/web-app/src/views/NoteView.vue diff --git a/web-app/src/views/NotesView.vue b/apps/web-app/src/views/NotesView.vue similarity index 100% rename from web-app/src/views/NotesView.vue rename to apps/web-app/src/views/NotesView.vue diff --git a/web-app/src/views/SettingsView.vue b/apps/web-app/src/views/SettingsView.vue similarity index 100% rename from web-app/src/views/SettingsView.vue rename to apps/web-app/src/views/SettingsView.vue diff --git a/web-app/tailwind.config.js b/apps/web-app/tailwind.config.js similarity index 100% rename from web-app/tailwind.config.js rename to apps/web-app/tailwind.config.js diff --git a/web-app/tsconfig.app.json b/apps/web-app/tsconfig.app.json similarity index 100% rename from web-app/tsconfig.app.json rename to apps/web-app/tsconfig.app.json diff --git a/web-app/tsconfig.json b/apps/web-app/tsconfig.json similarity index 100% rename from web-app/tsconfig.json rename to apps/web-app/tsconfig.json diff --git a/web-app/tsconfig.node.json b/apps/web-app/tsconfig.node.json similarity index 100% rename from web-app/tsconfig.node.json rename to apps/web-app/tsconfig.node.json diff --git a/web-app/vite.config.mts b/apps/web-app/vite.config.mts similarity index 100% rename from web-app/vite.config.mts rename to apps/web-app/vite.config.mts