From fb1c9a499fea8232bfc6e2b427a8d0c9b91560f5 Mon Sep 17 00:00:00 2001 From: LordMathis Date: Tue, 12 Nov 2024 21:25:02 +0100 Subject: [PATCH] Rename root folders --- Dockerfile | 8 ++++---- README.md | 12 ++++++------ {frontend => app}/.eslintrc.json | 0 {frontend => app}/.prettierrc.json | 0 {frontend => app}/package-lock.json | 0 {frontend => app}/package.json | 0 {frontend => app}/src/App.jsx | 0 {frontend => app}/src/App.scss | 0 {frontend => app}/src/components/auth/LoginPage.jsx | 0 .../src/components/editor/ContentView.jsx | 0 {frontend => app}/src/components/editor/Editor.jsx | 0 .../src/components/editor/MarkdownPreview.jsx | 0 .../src/components/files/FileActions.jsx | 0 {frontend => app}/src/components/files/FileTree.jsx | 0 {frontend => app}/src/components/layout/Header.jsx | 0 {frontend => app}/src/components/layout/Layout.jsx | 0 .../src/components/layout/MainContent.jsx | 0 {frontend => app}/src/components/layout/Sidebar.jsx | 0 .../components/modals/account/DeleteAccountModal.jsx | 0 .../components/modals/account/EmailPasswordModal.jsx | 0 .../src/components/modals/file/CreateFileModal.jsx | 0 .../src/components/modals/file/DeleteFileModal.jsx | 0 .../src/components/modals/git/CommitMessageModal.jsx | 0 .../src/components/modals/user/CreateUserModal.jsx | 0 .../src/components/modals/user/DeleteUserModal.jsx | 0 .../src/components/modals/user/EditUserModal.jsx | 0 .../modals/workspace/CreateWorkspaceModal.jsx | 0 .../modals/workspace/DeleteWorkspaceModal.jsx | 0 .../src/components/navigation/UserMenu.jsx | 0 .../src/components/navigation/WorkspaceSwitcher.jsx | 0 .../src/components/settings/AccordionControl.jsx | 0 .../components/settings/account/AccountSettings.jsx | 0 .../settings/account/DangerZoneSettings.jsx | 0 .../components/settings/account/ProfileSettings.jsx | 0 .../components/settings/account/SecuritySettings.jsx | 0 .../src/components/settings/admin/AdminDashboard.jsx | 0 .../src/components/settings/admin/AdminStatsTab.jsx | 0 .../src/components/settings/admin/AdminUsersTab.jsx | 0 .../components/settings/admin/AdminWorkspacesTab.jsx | 0 .../settings/workspace/AppearanceSettings.jsx | 0 .../settings/workspace/DangerZoneSettings.jsx | 0 .../components/settings/workspace/EditorSettings.jsx | 0 .../settings/workspace/GeneralSettings.jsx | 0 .../components/settings/workspace/GitSettings.jsx | 0 .../settings/workspace/WorkspaceSettings.jsx | 0 {frontend => app}/src/contexts/AuthContext.jsx | 0 {frontend => app}/src/contexts/ModalContext.jsx | 0 {frontend => app}/src/contexts/WorkspaceContext.jsx | 0 {frontend => app}/src/hooks/useAdminData.js | 0 {frontend => app}/src/hooks/useFileContent.js | 0 {frontend => app}/src/hooks/useFileList.js | 0 {frontend => app}/src/hooks/useFileNavigation.js | 0 {frontend => app}/src/hooks/useFileOperations.js | 0 {frontend => app}/src/hooks/useGitOperations.js | 0 {frontend => app}/src/hooks/useLastOpenedFile.js | 0 {frontend => app}/src/hooks/useProfileSettings.js | 0 {frontend => app}/src/hooks/useUserAdmin.js | 0 {frontend => app}/src/index.html | 0 {frontend => app}/src/index.jsx | 0 {frontend => app}/src/services/adminApi.js | 0 {frontend => app}/src/services/api.js | 0 {frontend => app}/src/services/authApi.js | 0 {frontend => app}/src/utils/constants.js | 0 {frontend => app}/src/utils/fileHelpers.js | 0 {frontend => app}/src/utils/formatBytes.js | 0 {frontend => app}/src/utils/remarkWikiLinks.js | 0 {frontend => app}/vite.config.js | 0 {backend => server}/.golangci.yml | 0 {backend => server}/cmd/server/main.go | 0 {backend => server}/go.mod | 0 {backend => server}/go.sum | 0 {backend => server}/internal/api/routes.go | 0 {backend => server}/internal/auth/jwt.go | 0 {backend => server}/internal/auth/middleware.go | 0 {backend => server}/internal/auth/session.go | 0 {backend => server}/internal/config/config.go | 2 +- {backend => server}/internal/crypto/crypto.go | 0 {backend => server}/internal/db/admin.go | 0 {backend => server}/internal/db/db.go | 0 {backend => server}/internal/db/migrations.go | 0 {backend => server}/internal/db/system_settings.go | 0 {backend => server}/internal/db/users.go | 0 {backend => server}/internal/db/workspaces.go | 0 {backend => server}/internal/filesystem/files.go | 0 .../internal/filesystem/filesystem.go | 0 {backend => server}/internal/filesystem/git.go | 0 {backend => server}/internal/filesystem/workspace.go | 0 {backend => server}/internal/gitutils/git.go | 0 .../internal/handlers/admin_handlers.go | 0 .../internal/handlers/auth_handlers.go | 0 .../internal/handlers/file_handlers.go | 0 .../internal/handlers/git_handlers.go | 0 {backend => server}/internal/handlers/handlers.go | 0 .../internal/handlers/static_handler.go | 0 .../internal/handlers/user_handlers.go | 0 .../internal/handlers/workspace_handlers.go | 0 {backend => server}/internal/httpcontext/context.go | 0 {backend => server}/internal/middleware/context.go | 0 {backend => server}/internal/models/user.go | 0 {backend => server}/internal/models/workspace.go | 0 {backend => server}/internal/user/user.go | 0 101 files changed, 11 insertions(+), 11 deletions(-) rename {frontend => app}/.eslintrc.json (100%) rename {frontend => app}/.prettierrc.json (100%) rename {frontend => app}/package-lock.json (100%) rename {frontend => app}/package.json (100%) rename {frontend => app}/src/App.jsx (100%) rename {frontend => app}/src/App.scss (100%) rename {frontend => app}/src/components/auth/LoginPage.jsx (100%) rename {frontend => app}/src/components/editor/ContentView.jsx (100%) rename {frontend => app}/src/components/editor/Editor.jsx (100%) rename {frontend => app}/src/components/editor/MarkdownPreview.jsx (100%) rename {frontend => app}/src/components/files/FileActions.jsx (100%) rename {frontend => app}/src/components/files/FileTree.jsx (100%) rename {frontend => app}/src/components/layout/Header.jsx (100%) rename {frontend => app}/src/components/layout/Layout.jsx (100%) rename {frontend => app}/src/components/layout/MainContent.jsx (100%) rename {frontend => app}/src/components/layout/Sidebar.jsx (100%) rename {frontend => app}/src/components/modals/account/DeleteAccountModal.jsx (100%) rename {frontend => app}/src/components/modals/account/EmailPasswordModal.jsx (100%) rename {frontend => app}/src/components/modals/file/CreateFileModal.jsx (100%) rename {frontend => app}/src/components/modals/file/DeleteFileModal.jsx (100%) rename {frontend => app}/src/components/modals/git/CommitMessageModal.jsx (100%) rename {frontend => app}/src/components/modals/user/CreateUserModal.jsx (100%) rename {frontend => app}/src/components/modals/user/DeleteUserModal.jsx (100%) rename {frontend => app}/src/components/modals/user/EditUserModal.jsx (100%) rename {frontend => app}/src/components/modals/workspace/CreateWorkspaceModal.jsx (100%) rename {frontend => app}/src/components/modals/workspace/DeleteWorkspaceModal.jsx (100%) rename {frontend => app}/src/components/navigation/UserMenu.jsx (100%) rename {frontend => app}/src/components/navigation/WorkspaceSwitcher.jsx (100%) rename {frontend => app}/src/components/settings/AccordionControl.jsx (100%) rename {frontend => app}/src/components/settings/account/AccountSettings.jsx (100%) rename {frontend => app}/src/components/settings/account/DangerZoneSettings.jsx (100%) rename {frontend => app}/src/components/settings/account/ProfileSettings.jsx (100%) rename {frontend => app}/src/components/settings/account/SecuritySettings.jsx (100%) rename {frontend => app}/src/components/settings/admin/AdminDashboard.jsx (100%) rename {frontend => app}/src/components/settings/admin/AdminStatsTab.jsx (100%) rename {frontend => app}/src/components/settings/admin/AdminUsersTab.jsx (100%) rename {frontend => app}/src/components/settings/admin/AdminWorkspacesTab.jsx (100%) rename {frontend => app}/src/components/settings/workspace/AppearanceSettings.jsx (100%) rename {frontend => app}/src/components/settings/workspace/DangerZoneSettings.jsx (100%) rename {frontend => app}/src/components/settings/workspace/EditorSettings.jsx (100%) rename {frontend => app}/src/components/settings/workspace/GeneralSettings.jsx (100%) rename {frontend => app}/src/components/settings/workspace/GitSettings.jsx (100%) rename {frontend => app}/src/components/settings/workspace/WorkspaceSettings.jsx (100%) rename {frontend => app}/src/contexts/AuthContext.jsx (100%) rename {frontend => app}/src/contexts/ModalContext.jsx (100%) rename {frontend => app}/src/contexts/WorkspaceContext.jsx (100%) rename {frontend => app}/src/hooks/useAdminData.js (100%) rename {frontend => app}/src/hooks/useFileContent.js (100%) rename {frontend => app}/src/hooks/useFileList.js (100%) rename {frontend => app}/src/hooks/useFileNavigation.js (100%) rename {frontend => app}/src/hooks/useFileOperations.js (100%) rename {frontend => app}/src/hooks/useGitOperations.js (100%) rename {frontend => app}/src/hooks/useLastOpenedFile.js (100%) rename {frontend => app}/src/hooks/useProfileSettings.js (100%) rename {frontend => app}/src/hooks/useUserAdmin.js (100%) rename {frontend => app}/src/index.html (100%) rename {frontend => app}/src/index.jsx (100%) rename {frontend => app}/src/services/adminApi.js (100%) rename {frontend => app}/src/services/api.js (100%) rename {frontend => app}/src/services/authApi.js (100%) rename {frontend => app}/src/utils/constants.js (100%) rename {frontend => app}/src/utils/fileHelpers.js (100%) rename {frontend => app}/src/utils/formatBytes.js (100%) rename {frontend => app}/src/utils/remarkWikiLinks.js (100%) rename {frontend => app}/vite.config.js (100%) rename {backend => server}/.golangci.yml (100%) rename {backend => server}/cmd/server/main.go (100%) rename {backend => server}/go.mod (100%) rename {backend => server}/go.sum (100%) rename {backend => server}/internal/api/routes.go (100%) rename {backend => server}/internal/auth/jwt.go (100%) rename {backend => server}/internal/auth/middleware.go (100%) rename {backend => server}/internal/auth/session.go (100%) rename {backend => server}/internal/config/config.go (98%) rename {backend => server}/internal/crypto/crypto.go (100%) rename {backend => server}/internal/db/admin.go (100%) rename {backend => server}/internal/db/db.go (100%) rename {backend => server}/internal/db/migrations.go (100%) rename {backend => server}/internal/db/system_settings.go (100%) rename {backend => server}/internal/db/users.go (100%) rename {backend => server}/internal/db/workspaces.go (100%) rename {backend => server}/internal/filesystem/files.go (100%) rename {backend => server}/internal/filesystem/filesystem.go (100%) rename {backend => server}/internal/filesystem/git.go (100%) rename {backend => server}/internal/filesystem/workspace.go (100%) rename {backend => server}/internal/gitutils/git.go (100%) rename {backend => server}/internal/handlers/admin_handlers.go (100%) rename {backend => server}/internal/handlers/auth_handlers.go (100%) rename {backend => server}/internal/handlers/file_handlers.go (100%) rename {backend => server}/internal/handlers/git_handlers.go (100%) rename {backend => server}/internal/handlers/handlers.go (100%) rename {backend => server}/internal/handlers/static_handler.go (100%) rename {backend => server}/internal/handlers/user_handlers.go (100%) rename {backend => server}/internal/handlers/workspace_handlers.go (100%) rename {backend => server}/internal/httpcontext/context.go (100%) rename {backend => server}/internal/middleware/context.go (100%) rename {backend => server}/internal/models/user.go (100%) rename {backend => server}/internal/models/workspace.go (100%) rename {backend => server}/internal/user/user.go (100%) diff --git a/Dockerfile b/Dockerfile index 090ff7f..44dab48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,18 +1,18 @@ # Stage 1: Build the frontend FROM node:20 AS frontend-builder WORKDIR /app -COPY frontend/package*.json ./ +COPY app/package*.json ./ RUN npm ci -COPY frontend . +COPY app . RUN npm run build # Stage 2: Build the backend FROM golang:1.23 AS backend-builder WORKDIR /app RUN apt-get update && apt-get install -y gcc musl-dev -COPY backend/go.mod backend/go.sum ./ +COPY server/go.mod server/go.sum ./ RUN go mod download -COPY backend . +COPY server . RUN CGO_ENABLED=1 GOOS=linux go build -o novamd ./cmd/server # Stage 3: Final stage diff --git a/README.md b/README.md index b27ef8f..4f64e2a 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Set the following environment variables: - `CGO_ENABLED=1`: This is necessary for the go-sqlite3 package - `NOVAMD_DB_PATH`: Path to the SQLite database file (default: "./sqlite.db") - `NOVAMD_WORKDIR`: Directory for storing Markdown files (default: "./data") -- `NOVAMD_STATIC_PATH`: Path to the frontend build files (default: "../frontend/dist") +- `NOVAMD_STATIC_PATH`: Path to the frontend build files (default: "../app/dist") - `NOVAMD_PORT`: Port to run the server on (default: "8080") - `NOVAMD_ADMIN_EMAIL`: Admin user email - `NOVAMD_ADMIN_PASSWORD`: Admin user password @@ -39,7 +39,7 @@ openssl rand -base64 32 ## Running the Backend -1. Navigate to the `backend` directory +1. Navigate to the `server` directory 2. Ensure all environment variables are set 3. Run the server: ``` @@ -48,7 +48,7 @@ openssl rand -base64 32 ## Running the Frontend -1. Navigate to the `frontend` directory +1. Navigate to the `app` directory 2. Install dependencies: ``` npm install @@ -61,14 +61,14 @@ openssl rand -base64 32 ## Building for Production -1. Build the frontend: +1. Build the frontend app: ``` - cd frontend + cd app npm run build ``` 2. Build the backend: ``` - cd backend + cd server go build -o novamd ./cmd/server ``` 3. Set the `NOVAMD_STATIC_PATH` environment variable to point to the frontend build directory diff --git a/frontend/.eslintrc.json b/app/.eslintrc.json similarity index 100% rename from frontend/.eslintrc.json rename to app/.eslintrc.json diff --git a/frontend/.prettierrc.json b/app/.prettierrc.json similarity index 100% rename from frontend/.prettierrc.json rename to app/.prettierrc.json diff --git a/frontend/package-lock.json b/app/package-lock.json similarity index 100% rename from frontend/package-lock.json rename to app/package-lock.json diff --git a/frontend/package.json b/app/package.json similarity index 100% rename from frontend/package.json rename to app/package.json diff --git a/frontend/src/App.jsx b/app/src/App.jsx similarity index 100% rename from frontend/src/App.jsx rename to app/src/App.jsx diff --git a/frontend/src/App.scss b/app/src/App.scss similarity index 100% rename from frontend/src/App.scss rename to app/src/App.scss diff --git a/frontend/src/components/auth/LoginPage.jsx b/app/src/components/auth/LoginPage.jsx similarity index 100% rename from frontend/src/components/auth/LoginPage.jsx rename to app/src/components/auth/LoginPage.jsx diff --git a/frontend/src/components/editor/ContentView.jsx b/app/src/components/editor/ContentView.jsx similarity index 100% rename from frontend/src/components/editor/ContentView.jsx rename to app/src/components/editor/ContentView.jsx diff --git a/frontend/src/components/editor/Editor.jsx b/app/src/components/editor/Editor.jsx similarity index 100% rename from frontend/src/components/editor/Editor.jsx rename to app/src/components/editor/Editor.jsx diff --git a/frontend/src/components/editor/MarkdownPreview.jsx b/app/src/components/editor/MarkdownPreview.jsx similarity index 100% rename from frontend/src/components/editor/MarkdownPreview.jsx rename to app/src/components/editor/MarkdownPreview.jsx diff --git a/frontend/src/components/files/FileActions.jsx b/app/src/components/files/FileActions.jsx similarity index 100% rename from frontend/src/components/files/FileActions.jsx rename to app/src/components/files/FileActions.jsx diff --git a/frontend/src/components/files/FileTree.jsx b/app/src/components/files/FileTree.jsx similarity index 100% rename from frontend/src/components/files/FileTree.jsx rename to app/src/components/files/FileTree.jsx diff --git a/frontend/src/components/layout/Header.jsx b/app/src/components/layout/Header.jsx similarity index 100% rename from frontend/src/components/layout/Header.jsx rename to app/src/components/layout/Header.jsx diff --git a/frontend/src/components/layout/Layout.jsx b/app/src/components/layout/Layout.jsx similarity index 100% rename from frontend/src/components/layout/Layout.jsx rename to app/src/components/layout/Layout.jsx diff --git a/frontend/src/components/layout/MainContent.jsx b/app/src/components/layout/MainContent.jsx similarity index 100% rename from frontend/src/components/layout/MainContent.jsx rename to app/src/components/layout/MainContent.jsx diff --git a/frontend/src/components/layout/Sidebar.jsx b/app/src/components/layout/Sidebar.jsx similarity index 100% rename from frontend/src/components/layout/Sidebar.jsx rename to app/src/components/layout/Sidebar.jsx diff --git a/frontend/src/components/modals/account/DeleteAccountModal.jsx b/app/src/components/modals/account/DeleteAccountModal.jsx similarity index 100% rename from frontend/src/components/modals/account/DeleteAccountModal.jsx rename to app/src/components/modals/account/DeleteAccountModal.jsx diff --git a/frontend/src/components/modals/account/EmailPasswordModal.jsx b/app/src/components/modals/account/EmailPasswordModal.jsx similarity index 100% rename from frontend/src/components/modals/account/EmailPasswordModal.jsx rename to app/src/components/modals/account/EmailPasswordModal.jsx diff --git a/frontend/src/components/modals/file/CreateFileModal.jsx b/app/src/components/modals/file/CreateFileModal.jsx similarity index 100% rename from frontend/src/components/modals/file/CreateFileModal.jsx rename to app/src/components/modals/file/CreateFileModal.jsx diff --git a/frontend/src/components/modals/file/DeleteFileModal.jsx b/app/src/components/modals/file/DeleteFileModal.jsx similarity index 100% rename from frontend/src/components/modals/file/DeleteFileModal.jsx rename to app/src/components/modals/file/DeleteFileModal.jsx diff --git a/frontend/src/components/modals/git/CommitMessageModal.jsx b/app/src/components/modals/git/CommitMessageModal.jsx similarity index 100% rename from frontend/src/components/modals/git/CommitMessageModal.jsx rename to app/src/components/modals/git/CommitMessageModal.jsx diff --git a/frontend/src/components/modals/user/CreateUserModal.jsx b/app/src/components/modals/user/CreateUserModal.jsx similarity index 100% rename from frontend/src/components/modals/user/CreateUserModal.jsx rename to app/src/components/modals/user/CreateUserModal.jsx diff --git a/frontend/src/components/modals/user/DeleteUserModal.jsx b/app/src/components/modals/user/DeleteUserModal.jsx similarity index 100% rename from frontend/src/components/modals/user/DeleteUserModal.jsx rename to app/src/components/modals/user/DeleteUserModal.jsx diff --git a/frontend/src/components/modals/user/EditUserModal.jsx b/app/src/components/modals/user/EditUserModal.jsx similarity index 100% rename from frontend/src/components/modals/user/EditUserModal.jsx rename to app/src/components/modals/user/EditUserModal.jsx diff --git a/frontend/src/components/modals/workspace/CreateWorkspaceModal.jsx b/app/src/components/modals/workspace/CreateWorkspaceModal.jsx similarity index 100% rename from frontend/src/components/modals/workspace/CreateWorkspaceModal.jsx rename to app/src/components/modals/workspace/CreateWorkspaceModal.jsx diff --git a/frontend/src/components/modals/workspace/DeleteWorkspaceModal.jsx b/app/src/components/modals/workspace/DeleteWorkspaceModal.jsx similarity index 100% rename from frontend/src/components/modals/workspace/DeleteWorkspaceModal.jsx rename to app/src/components/modals/workspace/DeleteWorkspaceModal.jsx diff --git a/frontend/src/components/navigation/UserMenu.jsx b/app/src/components/navigation/UserMenu.jsx similarity index 100% rename from frontend/src/components/navigation/UserMenu.jsx rename to app/src/components/navigation/UserMenu.jsx diff --git a/frontend/src/components/navigation/WorkspaceSwitcher.jsx b/app/src/components/navigation/WorkspaceSwitcher.jsx similarity index 100% rename from frontend/src/components/navigation/WorkspaceSwitcher.jsx rename to app/src/components/navigation/WorkspaceSwitcher.jsx diff --git a/frontend/src/components/settings/AccordionControl.jsx b/app/src/components/settings/AccordionControl.jsx similarity index 100% rename from frontend/src/components/settings/AccordionControl.jsx rename to app/src/components/settings/AccordionControl.jsx diff --git a/frontend/src/components/settings/account/AccountSettings.jsx b/app/src/components/settings/account/AccountSettings.jsx similarity index 100% rename from frontend/src/components/settings/account/AccountSettings.jsx rename to app/src/components/settings/account/AccountSettings.jsx diff --git a/frontend/src/components/settings/account/DangerZoneSettings.jsx b/app/src/components/settings/account/DangerZoneSettings.jsx similarity index 100% rename from frontend/src/components/settings/account/DangerZoneSettings.jsx rename to app/src/components/settings/account/DangerZoneSettings.jsx diff --git a/frontend/src/components/settings/account/ProfileSettings.jsx b/app/src/components/settings/account/ProfileSettings.jsx similarity index 100% rename from frontend/src/components/settings/account/ProfileSettings.jsx rename to app/src/components/settings/account/ProfileSettings.jsx diff --git a/frontend/src/components/settings/account/SecuritySettings.jsx b/app/src/components/settings/account/SecuritySettings.jsx similarity index 100% rename from frontend/src/components/settings/account/SecuritySettings.jsx rename to app/src/components/settings/account/SecuritySettings.jsx diff --git a/frontend/src/components/settings/admin/AdminDashboard.jsx b/app/src/components/settings/admin/AdminDashboard.jsx similarity index 100% rename from frontend/src/components/settings/admin/AdminDashboard.jsx rename to app/src/components/settings/admin/AdminDashboard.jsx diff --git a/frontend/src/components/settings/admin/AdminStatsTab.jsx b/app/src/components/settings/admin/AdminStatsTab.jsx similarity index 100% rename from frontend/src/components/settings/admin/AdminStatsTab.jsx rename to app/src/components/settings/admin/AdminStatsTab.jsx diff --git a/frontend/src/components/settings/admin/AdminUsersTab.jsx b/app/src/components/settings/admin/AdminUsersTab.jsx similarity index 100% rename from frontend/src/components/settings/admin/AdminUsersTab.jsx rename to app/src/components/settings/admin/AdminUsersTab.jsx diff --git a/frontend/src/components/settings/admin/AdminWorkspacesTab.jsx b/app/src/components/settings/admin/AdminWorkspacesTab.jsx similarity index 100% rename from frontend/src/components/settings/admin/AdminWorkspacesTab.jsx rename to app/src/components/settings/admin/AdminWorkspacesTab.jsx diff --git a/frontend/src/components/settings/workspace/AppearanceSettings.jsx b/app/src/components/settings/workspace/AppearanceSettings.jsx similarity index 100% rename from frontend/src/components/settings/workspace/AppearanceSettings.jsx rename to app/src/components/settings/workspace/AppearanceSettings.jsx diff --git a/frontend/src/components/settings/workspace/DangerZoneSettings.jsx b/app/src/components/settings/workspace/DangerZoneSettings.jsx similarity index 100% rename from frontend/src/components/settings/workspace/DangerZoneSettings.jsx rename to app/src/components/settings/workspace/DangerZoneSettings.jsx diff --git a/frontend/src/components/settings/workspace/EditorSettings.jsx b/app/src/components/settings/workspace/EditorSettings.jsx similarity index 100% rename from frontend/src/components/settings/workspace/EditorSettings.jsx rename to app/src/components/settings/workspace/EditorSettings.jsx diff --git a/frontend/src/components/settings/workspace/GeneralSettings.jsx b/app/src/components/settings/workspace/GeneralSettings.jsx similarity index 100% rename from frontend/src/components/settings/workspace/GeneralSettings.jsx rename to app/src/components/settings/workspace/GeneralSettings.jsx diff --git a/frontend/src/components/settings/workspace/GitSettings.jsx b/app/src/components/settings/workspace/GitSettings.jsx similarity index 100% rename from frontend/src/components/settings/workspace/GitSettings.jsx rename to app/src/components/settings/workspace/GitSettings.jsx diff --git a/frontend/src/components/settings/workspace/WorkspaceSettings.jsx b/app/src/components/settings/workspace/WorkspaceSettings.jsx similarity index 100% rename from frontend/src/components/settings/workspace/WorkspaceSettings.jsx rename to app/src/components/settings/workspace/WorkspaceSettings.jsx diff --git a/frontend/src/contexts/AuthContext.jsx b/app/src/contexts/AuthContext.jsx similarity index 100% rename from frontend/src/contexts/AuthContext.jsx rename to app/src/contexts/AuthContext.jsx diff --git a/frontend/src/contexts/ModalContext.jsx b/app/src/contexts/ModalContext.jsx similarity index 100% rename from frontend/src/contexts/ModalContext.jsx rename to app/src/contexts/ModalContext.jsx diff --git a/frontend/src/contexts/WorkspaceContext.jsx b/app/src/contexts/WorkspaceContext.jsx similarity index 100% rename from frontend/src/contexts/WorkspaceContext.jsx rename to app/src/contexts/WorkspaceContext.jsx diff --git a/frontend/src/hooks/useAdminData.js b/app/src/hooks/useAdminData.js similarity index 100% rename from frontend/src/hooks/useAdminData.js rename to app/src/hooks/useAdminData.js diff --git a/frontend/src/hooks/useFileContent.js b/app/src/hooks/useFileContent.js similarity index 100% rename from frontend/src/hooks/useFileContent.js rename to app/src/hooks/useFileContent.js diff --git a/frontend/src/hooks/useFileList.js b/app/src/hooks/useFileList.js similarity index 100% rename from frontend/src/hooks/useFileList.js rename to app/src/hooks/useFileList.js diff --git a/frontend/src/hooks/useFileNavigation.js b/app/src/hooks/useFileNavigation.js similarity index 100% rename from frontend/src/hooks/useFileNavigation.js rename to app/src/hooks/useFileNavigation.js diff --git a/frontend/src/hooks/useFileOperations.js b/app/src/hooks/useFileOperations.js similarity index 100% rename from frontend/src/hooks/useFileOperations.js rename to app/src/hooks/useFileOperations.js diff --git a/frontend/src/hooks/useGitOperations.js b/app/src/hooks/useGitOperations.js similarity index 100% rename from frontend/src/hooks/useGitOperations.js rename to app/src/hooks/useGitOperations.js diff --git a/frontend/src/hooks/useLastOpenedFile.js b/app/src/hooks/useLastOpenedFile.js similarity index 100% rename from frontend/src/hooks/useLastOpenedFile.js rename to app/src/hooks/useLastOpenedFile.js diff --git a/frontend/src/hooks/useProfileSettings.js b/app/src/hooks/useProfileSettings.js similarity index 100% rename from frontend/src/hooks/useProfileSettings.js rename to app/src/hooks/useProfileSettings.js diff --git a/frontend/src/hooks/useUserAdmin.js b/app/src/hooks/useUserAdmin.js similarity index 100% rename from frontend/src/hooks/useUserAdmin.js rename to app/src/hooks/useUserAdmin.js diff --git a/frontend/src/index.html b/app/src/index.html similarity index 100% rename from frontend/src/index.html rename to app/src/index.html diff --git a/frontend/src/index.jsx b/app/src/index.jsx similarity index 100% rename from frontend/src/index.jsx rename to app/src/index.jsx diff --git a/frontend/src/services/adminApi.js b/app/src/services/adminApi.js similarity index 100% rename from frontend/src/services/adminApi.js rename to app/src/services/adminApi.js diff --git a/frontend/src/services/api.js b/app/src/services/api.js similarity index 100% rename from frontend/src/services/api.js rename to app/src/services/api.js diff --git a/frontend/src/services/authApi.js b/app/src/services/authApi.js similarity index 100% rename from frontend/src/services/authApi.js rename to app/src/services/authApi.js diff --git a/frontend/src/utils/constants.js b/app/src/utils/constants.js similarity index 100% rename from frontend/src/utils/constants.js rename to app/src/utils/constants.js diff --git a/frontend/src/utils/fileHelpers.js b/app/src/utils/fileHelpers.js similarity index 100% rename from frontend/src/utils/fileHelpers.js rename to app/src/utils/fileHelpers.js diff --git a/frontend/src/utils/formatBytes.js b/app/src/utils/formatBytes.js similarity index 100% rename from frontend/src/utils/formatBytes.js rename to app/src/utils/formatBytes.js diff --git a/frontend/src/utils/remarkWikiLinks.js b/app/src/utils/remarkWikiLinks.js similarity index 100% rename from frontend/src/utils/remarkWikiLinks.js rename to app/src/utils/remarkWikiLinks.js diff --git a/frontend/vite.config.js b/app/vite.config.js similarity index 100% rename from frontend/vite.config.js rename to app/vite.config.js diff --git a/backend/.golangci.yml b/server/.golangci.yml similarity index 100% rename from backend/.golangci.yml rename to server/.golangci.yml diff --git a/backend/cmd/server/main.go b/server/cmd/server/main.go similarity index 100% rename from backend/cmd/server/main.go rename to server/cmd/server/main.go diff --git a/backend/go.mod b/server/go.mod similarity index 100% rename from backend/go.mod rename to server/go.mod diff --git a/backend/go.sum b/server/go.sum similarity index 100% rename from backend/go.sum rename to server/go.sum diff --git a/backend/internal/api/routes.go b/server/internal/api/routes.go similarity index 100% rename from backend/internal/api/routes.go rename to server/internal/api/routes.go diff --git a/backend/internal/auth/jwt.go b/server/internal/auth/jwt.go similarity index 100% rename from backend/internal/auth/jwt.go rename to server/internal/auth/jwt.go diff --git a/backend/internal/auth/middleware.go b/server/internal/auth/middleware.go similarity index 100% rename from backend/internal/auth/middleware.go rename to server/internal/auth/middleware.go diff --git a/backend/internal/auth/session.go b/server/internal/auth/session.go similarity index 100% rename from backend/internal/auth/session.go rename to server/internal/auth/session.go diff --git a/backend/internal/config/config.go b/server/internal/config/config.go similarity index 98% rename from backend/internal/config/config.go rename to server/internal/config/config.go index 56485d0..90049d3 100644 --- a/backend/internal/config/config.go +++ b/server/internal/config/config.go @@ -31,7 +31,7 @@ func DefaultConfig() *Config { return &Config{ DBPath: "./novamd.db", WorkDir: "./data", - StaticPath: "../frontend/dist", + StaticPath: "../app/dist", Port: "8080", RateLimitRequests: 100, RateLimitWindow: time.Minute * 15, diff --git a/backend/internal/crypto/crypto.go b/server/internal/crypto/crypto.go similarity index 100% rename from backend/internal/crypto/crypto.go rename to server/internal/crypto/crypto.go diff --git a/backend/internal/db/admin.go b/server/internal/db/admin.go similarity index 100% rename from backend/internal/db/admin.go rename to server/internal/db/admin.go diff --git a/backend/internal/db/db.go b/server/internal/db/db.go similarity index 100% rename from backend/internal/db/db.go rename to server/internal/db/db.go diff --git a/backend/internal/db/migrations.go b/server/internal/db/migrations.go similarity index 100% rename from backend/internal/db/migrations.go rename to server/internal/db/migrations.go diff --git a/backend/internal/db/system_settings.go b/server/internal/db/system_settings.go similarity index 100% rename from backend/internal/db/system_settings.go rename to server/internal/db/system_settings.go diff --git a/backend/internal/db/users.go b/server/internal/db/users.go similarity index 100% rename from backend/internal/db/users.go rename to server/internal/db/users.go diff --git a/backend/internal/db/workspaces.go b/server/internal/db/workspaces.go similarity index 100% rename from backend/internal/db/workspaces.go rename to server/internal/db/workspaces.go diff --git a/backend/internal/filesystem/files.go b/server/internal/filesystem/files.go similarity index 100% rename from backend/internal/filesystem/files.go rename to server/internal/filesystem/files.go diff --git a/backend/internal/filesystem/filesystem.go b/server/internal/filesystem/filesystem.go similarity index 100% rename from backend/internal/filesystem/filesystem.go rename to server/internal/filesystem/filesystem.go diff --git a/backend/internal/filesystem/git.go b/server/internal/filesystem/git.go similarity index 100% rename from backend/internal/filesystem/git.go rename to server/internal/filesystem/git.go diff --git a/backend/internal/filesystem/workspace.go b/server/internal/filesystem/workspace.go similarity index 100% rename from backend/internal/filesystem/workspace.go rename to server/internal/filesystem/workspace.go diff --git a/backend/internal/gitutils/git.go b/server/internal/gitutils/git.go similarity index 100% rename from backend/internal/gitutils/git.go rename to server/internal/gitutils/git.go diff --git a/backend/internal/handlers/admin_handlers.go b/server/internal/handlers/admin_handlers.go similarity index 100% rename from backend/internal/handlers/admin_handlers.go rename to server/internal/handlers/admin_handlers.go diff --git a/backend/internal/handlers/auth_handlers.go b/server/internal/handlers/auth_handlers.go similarity index 100% rename from backend/internal/handlers/auth_handlers.go rename to server/internal/handlers/auth_handlers.go diff --git a/backend/internal/handlers/file_handlers.go b/server/internal/handlers/file_handlers.go similarity index 100% rename from backend/internal/handlers/file_handlers.go rename to server/internal/handlers/file_handlers.go diff --git a/backend/internal/handlers/git_handlers.go b/server/internal/handlers/git_handlers.go similarity index 100% rename from backend/internal/handlers/git_handlers.go rename to server/internal/handlers/git_handlers.go diff --git a/backend/internal/handlers/handlers.go b/server/internal/handlers/handlers.go similarity index 100% rename from backend/internal/handlers/handlers.go rename to server/internal/handlers/handlers.go diff --git a/backend/internal/handlers/static_handler.go b/server/internal/handlers/static_handler.go similarity index 100% rename from backend/internal/handlers/static_handler.go rename to server/internal/handlers/static_handler.go diff --git a/backend/internal/handlers/user_handlers.go b/server/internal/handlers/user_handlers.go similarity index 100% rename from backend/internal/handlers/user_handlers.go rename to server/internal/handlers/user_handlers.go diff --git a/backend/internal/handlers/workspace_handlers.go b/server/internal/handlers/workspace_handlers.go similarity index 100% rename from backend/internal/handlers/workspace_handlers.go rename to server/internal/handlers/workspace_handlers.go diff --git a/backend/internal/httpcontext/context.go b/server/internal/httpcontext/context.go similarity index 100% rename from backend/internal/httpcontext/context.go rename to server/internal/httpcontext/context.go diff --git a/backend/internal/middleware/context.go b/server/internal/middleware/context.go similarity index 100% rename from backend/internal/middleware/context.go rename to server/internal/middleware/context.go diff --git a/backend/internal/models/user.go b/server/internal/models/user.go similarity index 100% rename from backend/internal/models/user.go rename to server/internal/models/user.go diff --git a/backend/internal/models/workspace.go b/server/internal/models/workspace.go similarity index 100% rename from backend/internal/models/workspace.go rename to server/internal/models/workspace.go diff --git a/backend/internal/user/user.go b/server/internal/user/user.go similarity index 100% rename from backend/internal/user/user.go rename to server/internal/user/user.go