diff --git a/DTaaS b/DTaaS new file mode 160000 index 000000000..6af358fe0 --- /dev/null +++ b/DTaaS @@ -0,0 +1 @@ +Subproject commit 6af358fe0cde4c4a1abf693981ba56983f699f62 diff --git a/client/.gitignore b/client/.gitignore index 645e95c58..1d64f2cc7 100644 --- a/client/.gitignore +++ b/client/.gitignore @@ -1 +1,3 @@ -playwright/.auth/ \ No newline at end of file +playwright/.auth/ + +./nohup.out \ No newline at end of file diff --git a/client/config/dev.js b/client/config/dev.js index a6f2ccc8d..19ba626e8 100644 --- a/client/config/dev.js +++ b/client/config/dev.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: 'dtaas', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/config/prod.js b/client/config/prod.js index 8b9957232..7a0d0e687 100644 --- a/client/config/prod.js +++ b/client/config/prod.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: 'dtaas', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/config/test.js b/client/config/test.js index d241e082a..93d8aa70e 100644 --- a/client/config/test.js +++ b/client/config/test.js @@ -5,7 +5,6 @@ if (typeof window !== 'undefined') { REACT_APP_URL_BASENAME: '', REACT_APP_URL_DTLINK: '/lab', REACT_APP_URL_LIBLINK: '', - REACT_APP_WORKBENCHLINK_TERMINAL: '/terminals/main', REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword', REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/', REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab', diff --git a/client/env.d.ts b/client/env.d.ts index 8b77ac590..9dc5a77c1 100644 --- a/client/env.d.ts +++ b/client/env.d.ts @@ -8,7 +8,7 @@ declare global { REACT_APP_URL_BASENAME: string; REACT_APP_URL_DTLINK: string; REACT_APP_URL_LIBLINK: string; - REACT_APP_WORKBENCHLINK_TERMINAL: string; + // REACT_APP_WORKBENCHLINK_TERMINAL: string; REACT_APP_WORKBENCHLINK_VNCDESKTOP: string; REACT_APP_WORKBENCHLINK_VSCODE: string; REACT_APP_WORKBENCHLINK_JUPYTERLAB: string; diff --git a/client/nohup.out b/client/nohup.out new file mode 100644 index 000000000..565751361 --- /dev/null +++ b/client/nohup.out @@ -0,0 +1,10 @@ + INFO Accepting connections at http://localhost:4000 +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [NestFactory] Starting Nest application... +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [InstanceLoader] AppModule dependencies initialized +12ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [InstanceLoader] ConfigHostModule dependencies initialized +4ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [InstanceLoader] ConfigModule dependencies initialized +1ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [InstanceLoader] GraphQLSchemaBuilderModule dependencies initialized +1ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [InstanceLoader] FilesModule dependencies initialized +45ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [InstanceLoader] GraphQLModule dependencies initialized +1ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [GraphQLModule] Mapped {/lib, POST} route +53ms +[Nest] 9173 - 01/17/2024, 10:26:20 PM  LOG [NestApplication] Nest application successfully started +2ms diff --git a/client/src/components/LinkIconsLib.tsx b/client/src/components/LinkIconsLib.tsx index d6e42df6f..bd93e10e4 100644 --- a/client/src/components/LinkIconsLib.tsx +++ b/client/src/components/LinkIconsLib.tsx @@ -1,5 +1,4 @@ import * as React from 'react'; -import TerminalOutlinedIcon from '@mui/icons-material/TerminalOutlined'; import DesktopWindowsOutlinedIcon from '@mui/icons-material/DesktopWindowsOutlined'; import CodeOutlinedIcon from '@mui/icons-material/CodeOutlined'; import ScienceOutlinedIcon from '@mui/icons-material/ScienceOutlined'; @@ -11,10 +10,6 @@ type LinkIconsType = { }; const LinkIcons: LinkIconsType = { - TERMINAL: { - icon: , - name: 'Terminal', - }, VNCDESKTOP: { icon: , name: 'Desktop', diff --git a/client/src/schema.gql b/client/src/schema.gql new file mode 100644 index 000000000..72a78cb5e --- /dev/null +++ b/client/src/schema.gql @@ -0,0 +1,58 @@ +# ------------------------------------------------------ +# THIS FILE WAS AUTOMATICALLY GENERATED (DO NOT MODIFY) +# ------------------------------------------------------ + +type Blob { + name: String! + type: String! +} + +type BlobEdge { + node: Blob! +} + +type BlobConnection { + edges: [BlobEdge!]! +} + +type TreeEntry { + name: String! + type: String! +} + +type TreeEdge { + node: TreeEntry! +} + +type TreeConnection { + edges: [TreeEdge!]! +} + +type Tree { + blobs: BlobConnection! + trees: TreeConnection! +} + +type RepositoryBlob { + name: String! + rawBlob: String! + rawTextBlob: String! +} + +type RepositoryBlobConnection { + nodes: [RepositoryBlob!]! +} + +type Repository { + tree: Tree! + blobs: RepositoryBlobConnection! +} + +type Project { + repository: Repository! +} + +type Query { + listDirectory(path: String!): Project! + readFile(path: String!): Project! +} \ No newline at end of file diff --git a/client/test/unitTests/Util/envUtil.test.ts b/client/test/unitTests/Util/envUtil.test.ts index 1c0edf925..13e8ebb04 100644 --- a/client/test/unitTests/Util/envUtil.test.ts +++ b/client/test/unitTests/Util/envUtil.test.ts @@ -34,7 +34,7 @@ describe('envUtil', () => { REACT_APP_URL_BASENAME: testBasename, REACT_APP_URL_DTLINK: testDT, REACT_APP_URL_LIBLINK: testLIB, - REACT_APP_WORKBENCHLINK_TERMINAL: testWorkbenchEndpoints[0], + // REACT_APP_WORKBENCHLINK_TERMINAL: testWorkbenchEndpoints[0], REACT_APP_WORKBENCHLINK_VNCDESKTOP: testWorkbenchEndpoints[1], REACT_APP_WORKBENCHLINK_VSCODE: testWorkbenchEndpoints[2], REACT_APP_WORKBENCHLINK_JUPYTERLAB: testWorkbenchEndpoints[3], diff --git a/deploy/config/lib b/deploy/config/lib index 51fb5d3b5..c05773a8c 100644 --- a/deploy/config/lib +++ b/deploy/config/lib @@ -1,6 +1,7 @@ PORT='4001' -MODE='local' -LOCAL_PATH ='filepath' -LOG_LEVEL='debug' -APOLLO_PATH='/lib' or '' -GRAPHQL_PLAYGROUND='false' or 'true' \ No newline at end of file + MODE='local' + LOCAL_PATH ='/mnt/d/Aryan/Coding/Web Dev/DTaaS/DTaaS/DTaaS/files' + LOG_LEVEL='debug' + APOLLO_PATH='lib' + GRAPHQL_PLAYGROUND='true' + \ No newline at end of file diff --git a/files/aryanbhosale/data/.gitkeep b/files/aryanbhosale/data/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/files/aryanbhosale/digital_twins/.gitkeep b/files/aryanbhosale/digital_twins/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/files/aryanbhosale/functions/.gitkeep b/files/aryanbhosale/functions/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/files/aryanbhosale/models/.gitkeep b/files/aryanbhosale/models/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/files/aryanbhosale/tools/.gitkeep b/files/aryanbhosale/tools/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/servers/config/gateway/dynamic/fileConfig.yml b/servers/config/gateway/dynamic/fileConfig.yml index 86c2d0ba7..8d80974b5 100644 --- a/servers/config/gateway/dynamic/fileConfig.yml +++ b/servers/config/gateway/dynamic/fileConfig.yml @@ -4,25 +4,13 @@ http: entryPoints: - http rule: 'Host(`localhost`)' - middlewares: - - basic-auth service: dtaas - user1: + aryanbhosale: entryPoints: - http - rule: 'Host(`localhost`) && PathPrefix(`/user1`)' - middlewares: - - basic-auth - service: user1 - - user2: - entryPoints: - - http - rule: 'Host(`localhost`) && PathPrefix(`/user2`)' - middlewares: - - basic-auth - service: user2 + rule: 'Host(`localhost`) && PathPrefix(`/aryanbhosale`)' + service: aryanbhosale libms: entryPoints: @@ -30,32 +18,18 @@ http: rule: 'Host(`localhost`) && PathPrefix(`/lib`)' service: libms - - # Middleware: Basic authentication - middlewares: - basic-auth: - basicAuth: - usersFile: "/etc/traefik/auth" - removeHeader: true - - services: dtaas: loadBalancer: servers: - url: "http://localhost:4000" - user1: + aryanbhosale: loadBalancer: servers: - url: "http://localhost:8090" - user2: - loadBalancer: - servers: - - url: "http://localhost:8091" - libms: loadBalancer: servers: - - url: "http://localhost:4001" \ No newline at end of file + - url: "http://localhost:4001"