Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove terminal icon from Workbench page #458

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,23 +45,23 @@ repos:
# stages: [pre-push]

- repo: https://github.com/pre-commit/mirrors-prettier
rev: v3.1.0
rev: v4.0.0-alpha.8
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please select a stage version if it is available.

hooks:
- id: prettier
args: ["--ignore-path", "../.gitignore", "--write"]
files: '^(client|servers/execution/runner|servers/lib)/.*\.(ts|tsx|css|scss)$'
stages: [pre-commit]

- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.54.0
rev: v9.0.0-alpha.1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please select a stage version if it is available

hooks:
- id: eslint
args: ["--fix"]
files: "^(client|servers/execution/runner|servers/lib)/.*"
stages: [pre-commit]

- repo: https://github.com/igorshubovych/markdownlint-cli
rev: v0.37.0
rev: v0.38.0
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

something like this

hooks:
- id: markdownlint
files: '.*\.md$'
Expand Down
1 change: 1 addition & 0 deletions DTaaS
Submodule DTaaS added at 6af358
2 changes: 1 addition & 1 deletion client/config/dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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_TERMINAL: '/terminals/main',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you can remove this line in all the config files

REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword',
REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/',
REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab',
Expand Down
2 changes: 1 addition & 1 deletion client/config/prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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_TERMINAL: '/terminals/main',
REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword',
REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/',
REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab',
Expand Down
2 changes: 1 addition & 1 deletion client/config/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ 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_TERMINAL: '/terminals/main',
REACT_APP_WORKBENCHLINK_VNCDESKTOP: '/tools/vnc/?password=vncpassword',
REACT_APP_WORKBENCHLINK_VSCODE: '/tools/vscode/',
REACT_APP_WORKBENCHLINK_JUPYTERLAB: '/lab',
Expand Down
2 changes: 1 addition & 1 deletion client/env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 10 additions & 0 deletions client/nohup.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
INFO Accepting connections at http://localhost:4000
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please do not add this file

[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
10 changes: 5 additions & 5 deletions client/src/components/LinkIconsLib.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import * as React from 'react';
import TerminalOutlinedIcon from '@mui/icons-material/TerminalOutlined';
// import TerminalOutlinedIcon from '@mui/icons-material/TerminalOutlined';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please remove the commented lines

import DesktopWindowsOutlinedIcon from '@mui/icons-material/DesktopWindowsOutlined';
import CodeOutlinedIcon from '@mui/icons-material/CodeOutlined';
import ScienceOutlinedIcon from '@mui/icons-material/ScienceOutlined';
Expand All @@ -11,10 +11,10 @@ type LinkIconsType = {
};

const LinkIcons: LinkIconsType = {
TERMINAL: {
icon: <TerminalOutlinedIcon />,
name: 'Terminal',
},
// TERMINAL: {
// icon: <TerminalOutlinedIcon />,
// name: 'Terminal',
// },
VNCDESKTOP: {
icon: <DesktopWindowsOutlinedIcon />,
name: 'Desktop',
Expand Down
58 changes: 58 additions & 0 deletions client/src/schema.gql
Original file line number Diff line number Diff line change
@@ -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!
}
2 changes: 1 addition & 1 deletion client/test/unitTests/Util/envUtil.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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],
Expand Down
11 changes: 6 additions & 5 deletions deploy/config/lib
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PORT='4001'
MODE='local'
LOCAL_PATH ='filepath'
LOG_LEVEL='debug'
APOLLO_PATH='/lib' or ''
GRAPHQL_PLAYGROUND='false' or 'true'
MODE='local'
LOCAL_PATH ='/mnt/d/Aryan/Coding/Web Dev/DTaaS/DTaaS/DTaaS/files'
LOG_LEVEL='debug'
APOLLO_PATH='lib'
GRAPHQL_PLAYGROUND='true'

Empty file.
Empty file.
Empty file.
Empty file.
Empty file.
36 changes: 5 additions & 31 deletions servers/config/gateway/dynamic/fileConfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,32 @@ 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:
- 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"
- url: "http://localhost:4001"
Loading