Skip to content

Commit 2b149d1

Browse files
authored
remove angular (#49)
- remove angular - improve readme for plugin validation
1 parent 7c1181d commit 2b149d1

File tree

182 files changed

+45
-74331
lines changed

Some content is hidden

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

182 files changed

+45
-74331
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ artifacts/
2525
work/
2626
ci/
2727
e2e-results/
28+
orchestracities-map-panel-1.4.0.zip
29+
orchestracities-map-panel-1.4.0
30+
plugin-validator
2831

2932
# Editors
3033
.idea

CONTRIBUTING.md

Lines changed: 40 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,75 +2,91 @@
22

33
## Requirements
44
- git
5-
- npm / yarn
5+
- node v14+ and yarn
66

77
## Install process
88

99
- Clone "map-plugin" from repo to the grafana plugins folder. (eg. grafana_data/plugins)
1010

1111
- Install plugin package dependencies
1212

13-
```sh
14-
$ npm install
15-
```
16-
or
1713
```
1814
$ yarn install
1915
```
2016

2117
If you are using Docker, the two steps above can be done as follows:
2218
```
2319
# First cd into this plugin's folder.
24-
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app node:8 npm install
25-
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app node:8 yarn install
20+
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app node:14 yarn install
2621
```
2722

23+
## Build process
24+
25+
1. Build plugin in development mode or run in watch mode
26+
27+
```bash
28+
yarn dev
29+
```
30+
31+
or
32+
33+
```bash
34+
yarn dev --watch
35+
```
36+
37+
2. Build plugin in production mode
38+
39+
```bash
40+
yarn build
41+
```
42+
2843
## Test / Run
2944

30-
- Start docker-compose.
45+
1. Launch services
3146

32-
```sh
33-
$ docker-compose up -d
47+
```bash
48+
docker-compose up -d
3449
```
3550

36-
Once the services are up and running, set-up the data as follows:
51+
2. Import database
52+
53+
```bash
54+
sh populate_db.sh
55+
```
3756

38-
- Populate the database:
57+
3. Set-up grafana
3958

40-
```sh
41-
$ sh create-table.sh
59+
```bash
60+
sh set-up-grafana.sh
4261
```
4362

44-
- Set-up grafana:
63+
4. In case of changes to code to restart grafana
4564

46-
```sh
47-
$ sh set-up-grafana.sh
65+
```bash
66+
yarn dev && docker-compose restart grafana
4867
```
4968

5069
**NOTE:** Unless you remove the docker volumes, you need to run the last two
5170
steps above only the first time)
5271

5372
At this point in time login in grafana using admin/admin and you should be
54-
able to see a dashboard called `Dashboard Map`. If there is an error regarding
55-
the datasource metadata, just go to the `datasource` menu, open the datasource
56-
and click `save & test`.
73+
able to see a dashboard called `Dashboard Map`.
74+
5775

5876
## Other Tasks
5977

6078
- `Compile the code` + restart grafana
6179
```sh
62-
$ yarn build && docker-compose restart grafana
80+
$ yarn dev && docker-compose restart grafana
6381
```
6482

6583
Or using docker:
6684
```
67-
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app node:8 yarn build
85+
docker run -it --rm -v "$PWD":/usr/src/app -w /usr/src/app node:14 yarn build
6886
docker-compose restart grafana
6987
```
7088

7189
## Notes
7290

7391
Default start page url: http://localhost:3000
7492
Default user/pass is admin/admin.
75-
76-
If you are trying to install packages and you get console permissions errors, it could be related with grafana changing owner from dist files.

README.md

Lines changed: 2 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ panel with several functionalities:
77
* Support for pop up visualizations of data from a specific point
88
* Multiple layers for the different queries
99

10-
![Example](example.png)
10+
![Example](https://github.com/orchestracities/grafana-map-plugin/raw/master/example.png)
1111

1212
## Usage with PostGis
1313

@@ -35,58 +35,7 @@ For more information about panels, refer to the documentation on [Panels](https:
3535

3636
## Set up dev environment
3737

38-
1. Launch services
39-
40-
```bash
41-
docker-compose up -d
42-
```
43-
44-
2. Import database
45-
46-
```bash
47-
sh populate_db.sh
48-
```
49-
50-
51-
3. Set-up grafana
52-
53-
```bash
54-
sh set-up-grafana.sh
55-
```
56-
57-
58-
4. In case of changes to code to restart grafana
59-
60-
```bash
61-
yarn dev && docker-compose restart grafana
62-
```
63-
64-
65-
## Getting started
66-
67-
1. Install dependencies
68-
69-
```bash
70-
yarn install
71-
```
72-
73-
2. Build plugin in development mode or run in watch mode
74-
75-
```bash
76-
yarn dev
77-
```
78-
79-
or
80-
81-
```bash
82-
yarn watch
83-
```
84-
85-
3. Build plugin in production mode
86-
87-
```bash
88-
yarn build
89-
```
38+
See [Contributing](https://github.com/orchestracities/grafana-map-plugin/blob/master/CONTRIBUTING.md)
9039

9140
## Learn more
9241

angular-version/.eslintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

angular-version/.eslintrc

Lines changed: 0 additions & 50 deletions
This file was deleted.

angular-version/.gitignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

angular-version/Gruntfile.js

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)