Skip to content

Commit 7486784

Browse files
agneumagneum
committed
Merge branch '330-rename-web-ui' into 'master'
refactor: [ui] rename the web directory to ui (#330) Closes #330 See merge request postgres-ai/database-lab!444
2 parents f3c4575 + f5bc96c commit 7486784

File tree

376 files changed

+78
-71
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

376 files changed

+78
-71
lines changed

‎.gitlab-ci.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@ variables:
33
DOCKER_DRIVER: overlay2
44

55
include:
6+
- template: Security/SAST.gitlab-ci.yml
67
- local: 'engine/.gitlab-ci.yml'
7-
- local: 'web/.gitlab-ci.yml'
8+
- local: 'ui/.gitlab-ci.yml'

‎CONTRIBUTING.md

Lines changed: 14 additions & 7 deletions

‎LICENSE

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ Copyright © 2018-present, Postgres.ai (https://postgres.ai), Nikolay Samokhvalo
22

33
Portions of this software are licensed as follows:
44
- UI components:
5-
- All content that resides in the "./web/packages/platform" directory of this repository is licensed under the
6-
license defined in "./web/packages/platform/LICENSE"
7-
- All content that resides in the "./packages/ce" directory of this repository is licensed under the "AGPLv3"
5+
- All content that resides in the "./ui/packages/platform" directory of this repository is licensed under the
6+
license defined in "./ui/packages/platform/LICENSE"
7+
- All content that resides in the "./ui/packages/ce" directory of this repository is licensed under the "AGPLv3"
88
license defined in "./LICENSE"
9-
- All content that resides in the "./packages/shared" directory of this repository is licensed under the "AGPLv3"
9+
- All content that resides in the "./ui/packages/shared" directory of this repository is licensed under the "AGPLv3"
1010
license defined in "./LICENSE"
1111
- All third party components incorporated into the Database Lab Engine software are licensed under the original license
1212
provided by the owner of the applicable component.
1313
- Content outside of the above mentioned directories above is licensed under the "AGPLv3" license defined
1414
in "./LICENSE"
1515

1616
In plain language: this repository contains open-source software licensed under an OSI-approved license AGPLv3 (see
17-
https://opensource.org/) except "./web/packages/platform" that defines user interfaces and business logic for the
17+
https://opensource.org/) except "./ui/packages/platform" that defines user interfaces and business logic for the
1818
"Platform" version of Database Lab, which is not open source and can be used only with commercial license obtained
19-
from Postgres.ai (see https://postgres.ai/pricing).
19+
from Postgres.ai (see https://postgres.ai/pricing).

‎engine/pkg/util/config.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ import (
1414
)
1515

1616
const (
17-
swaggerDir = "swagger-ui"
18-
apiDir = "api"
19-
configDir = "configs"
20-
standardDir = "standard"
21-
metaDir = "meta"
17+
swaggerUIDir = "swagger-ui"
18+
apiDir = "api"
19+
configDir = "configs"
20+
standardDir = "standard"
21+
metaDir = "meta"
2222
)
2323

2424
// GetBinRootPath return path to root directory of the current binary module.
@@ -43,7 +43,7 @@ func GetSwaggerUIPath() (string, error) {
4343
return "", errors.Wrap(err, "cannot get binary root directory")
4444
}
4545

46-
return path.Join(dir, swaggerDir), nil
46+
return path.Join(dir, apiDir, swaggerUIDir), nil
4747
}
4848

4949
// GetAPIPath return swagger UI path.

‎engine/pkg/util/config_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestBinRootPath(t *testing.T) {
2424

2525
func TestSwaggerUIPath(t *testing.T) {
2626
_, filename, _, _ := runtime.Caller(0)
27-
expected := path.Dir(filename) + "/swagger-ui"
27+
expected := path.Dir(filename) + "/api/swagger-ui"
2828

2929
swaggerUIPath, err := GetSwaggerUIPath()
3030
require.Nil(t, err)

‎web/.dockerignore renamed to ‎ui/.dockerignore

File renamed without changes.

‎web/.gitignore renamed to ‎ui/.gitignore

File renamed without changes.

‎ui/.gitlab-ci.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
.only_ui: &only_ui
2+
rules:
3+
- changes:
4+
- ui/**/*
5+
6+
check_code_style:
7+
<<: *only_ui
8+
stage: test
9+
image: node:16.13.0
10+
script:
11+
- npm --prefix ui/ ci -ws
12+
- npm --prefix ui/ run lint -w packages/ce
13+
- npm --prefix ui/ run lint -w packages/platform
14+
15+
include:
16+
- local: 'ui/packages/ce/.gitlab-ci.yml'
17+
- local: 'ui/packages/platform/.gitlab-ci.yml'

‎web/.prettierrc renamed to ‎ui/.prettierrc

File renamed without changes.

‎web/.stylelintrc renamed to ‎ui/.stylelintrc

File renamed without changes.

0 commit comments

Comments
 (0)