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

Integrate Waltz-Grid-Widget #257

Draft
wants to merge 31 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
8d0ffc9
Progress
Ingvord Jul 13, 2020
950fb86
Progress: avoid jsx
Ingvord Jul 13, 2020
7b78e6e
GridWidget now works- Add debug configuration for docker-compose- Add…
kapot65 Jul 20, 2020
d329cff
Merge branch 'integrate-grid-widget' of github.com:kapot65/waltz into…
kapot65 Jul 20, 2020
8d0e524
GridWidget now works- Add debug configuration for docker-compose- Add…
kapot65 Jul 21, 2020
b9da6a6
Progress: inherit from webix.view
Ingvord Jul 22, 2020
32e8972
Progress: add TangoDropTarget
Ingvord Jul 23, 2020
b88b005
Progress: fix missing index.html in .war
Ingvord Jul 23, 2020
d62cdcf
Progress: fix wrong production js/css path in .war
Ingvord Jul 23, 2020
ac585db
Merge branch 'integrate-grid-widget' of github.com:waltz-controls/wal…
kapot65 Jul 23, 2020
a0b2128
Updates for [email protected]
kapot65 Jul 24, 2020
315239c
Updates for [email protected] (#259)
kapot65 Jul 24, 2020
9846b1b
Merge branch 'integrate-grid-widget' of github.com:waltz-controls/wal…
kapot65 Jul 25, 2020
b8cfa19
Progress: impl device dnd
Ingvord Jul 27, 2020
29ed572
Update package.json
Ingvord Jul 28, 2020
6c9e588
update package-lock.json
Jul 28, 2020
76781e3
Update GridWidget version
kapot65 Jul 29, 2020
a26135a
Merge branch 'integrate-grid-widget' of github.com:waltz-controls/wal…
kapot65 Jul 29, 2020
0daf3f6
Progress: upgrade grid wdiget
Ingvord Jul 30, 2020
a7fc1cf
Progress: upgrade shared libs
Ingvord Jul 30, 2020
fb148ad
Merge pull request #260 from kapot65/integrate-grid-widget
Ingvord Jul 30, 2020
e7f265d
Progress:
Ingvord Jul 30, 2020
a8465cb
Progress: upgrade grid widget
Ingvord Jul 30, 2020
71f938b
Progress: upgrade grid widget; implement update
Ingvord Oct 13, 2020
ffbc3a8
Progress: save/restore state
Ingvord Oct 13, 2020
614ac38
force build
Nov 16, 2020
3f711d0
Merge branch 'master' into integrate-grid-widget
Nov 16, 2020
8d483ff
Merge branch 'master' into integrate-grid-widget
Nov 16, 2020
e12233f
Push history to GridWidget
kapot65 Nov 18, 2020
75ee135
Merge pull request #264 from kapot65/integrate-grid-widget
Ingvord Nov 18, 2020
915070e
add GitHub actions.yml
May 25, 2021
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
3 changes: 2 additions & 1 deletion .babelrc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"esmodules": true
}
}
]
],
"@babel/preset-react"
]
}
23 changes: 23 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
**/.classpath
**/.dockerignore
**/.env
**/.git
**/.gitignore
**/.project
**/.settings
**/.toolstarget
**/.vs
**/.vscode
**/*.*proj.user
**/*.dbmdl
**/*.jfm
**/azds.yaml
**/charts
**/docker-compose*
**/Dockerfile*
**/node_modules
**/npm-debug.log
**/obj
**/secrets.dev.yaml
**/values.dev.yaml
README.md
7 changes: 7 additions & 0 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: '10'
- run: npm install
- run: npm run war
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.vscode

# Created by .ignore support plugin (hsz.mobi)
### JetBrains template
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
Expand Down
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,20 @@ $> REST_API_PROTOCOL=[http|https] REST_API_HOST=[ip/fqdn] REST_API_PORT=[e.g. 10
npm run build
```

## Develop

1. Start Tango containers

```bash
docker-compose -f docker-compose.debug.yml up
```

2. Start development server

```bash
npm run-script start
```

## Implementation details

* [Webix](http://webix.com) is used for UI
Expand Down
50 changes: 50 additions & 0 deletions docker-compose.debug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
version: '3.2'
services:
tango-db:
image: tangocs/tango-db
ports:
- "9999:3306"
environment:
- MYSQL_ROOT_PASSWORD=root
- MYSQL_USER=tango
- MYSQL_PASSWORD=tango
- MYSQL_DATABASE=tango
tango-cs:
image: tangocs/tango-cs
ports:
- "10000:10000"
environment:
- TANGO_HOST=localhost:10000
- MYSQL_HOST=tango-db:3306
- MYSQL_USER=tango
- MYSQL_PASSWORD=tango
- MYSQL_DATABASE=tango
depends_on:
- tango-db
tango-rest:
image: tangocs/rest-server:rest-server-1.21
ports:
- "10001:10001"
environment:
- TANGO_HOST=tango-cs:10000
depends_on:
- tango-cs
tango-test:
image: tangocs/tango-test
restart: on-failure
environment:
- TANGO_HOST=tango-cs:10000
depends_on:
- tango-db
- tango-cs
command: "test"
user-context-server:
image: node
ports:
- "3000:3000"
volumes:
- ./:/root/waltz
working_dir: /root/waltz
command: npm run-script user-context-server
depends_on:
- tango-cs
Loading