Skip to content

Commit 304004d

Browse files
authored
Announcement banner (#433)
* Add announcement directive with directus connection * Update documentation on env variables * Include announcement at top of the page * Close if no annoucement available * Adjust heights * Delay event emitting * Add missing env variables to action * Remove semi colons breaking build task * feat(sidebar): change displaying grouptags Grouptags are now an array therefore split the tags and display them with ng-repeat * Split tags during edit and register * fix(Sidebar): Fix height of sidebar Adjust sidebar height regarding announcement banner * refactor(css): Change content-container style Change style to be used with banner
1 parent 4e54247 commit 304004d

21 files changed

+1253
-925
lines changed

.env.sample

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
OPENSENSEMAP_API_URL=https://localhost:80000
1+
OPENSENSEMAP_API_URL=https://localhost:8000
22
OPENSENSEMAP_STYLE_URL=<YOUR_MAPBOX_STYLE_URL>
3-
OPENSENSEMAP_ACCESS_TOKEN=<YOUR_MAPBOX_ACCESS_TOKEN>
3+
OPENSENSEMAP_ACCESS_TOKEN=<YOUR_MAPBOX_ACCESS_TOKEN>
4+
OPENSENSEMAP_CMS_URL=<YOUR_DIRECTUS_CMS_URL>

.eslintrc.js

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,24 @@
11
module.exports = {
22
env: {
3-
browser: true
3+
browser: true,
44
},
55
globals: {
6-
"angular": 1,
7-
"L": 1,
8-
"moment": 1,
9-
"Promise": 1,
6+
angular: 1,
7+
L: 1,
8+
moment: 1,
9+
Promise: 1,
1010
},
11-
extends: [
12-
'@sensebox/eslint-config-sensebox',
13-
'plugin:angular/johnpapa'
14-
],
11+
extends: ["@sensebox/eslint-config-sensebox", "plugin:angular/johnpapa"],
1512
rules: {
1613
"angular/file-name": 0,
1714
"no-var": 0,
1815
"prefer-template": 0,
1916
"func-style": 0,
2017
"angular/function-type": 0,
2118
"wrap-iife": 0,
22-
"strict": ['error', 'function'],
19+
strict: ["error", "function"],
2320
"no-console": 1,
24-
"no-warning-comments": 1
25-
}
21+
"no-warning-comments": 1,
22+
// "comma-dangle": ["error"]
23+
},
2624
};

.github/workflows/build.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,12 @@ jobs:
9494
9595
if [ "$branch_name" = "master" || ${{ github.event_name == 'release' }} ]; then
9696
echo "OPENSENSEMAP_API_URL=https://api.opensensemap.org" >> $GITHUB_ENV
97+
echo "OPENSENSEMAP_CMS_URL=${{ secrets.OPENSENSEMAP_CMS_URL }}" >> $GITHUB_ENV
9798
echo "OPENSENSEMAP_STYLE_URL=${{ secrets.OPENSENSEMAP_STYLE_URL }}" >> $GITHUB_ENV
9899
echo "OPENSENSEMAP_ACCESS_TOKEN=${{ secrets.OPENSENSEMAP_ACCESS_TOKEN }}" >> $GITHUB_ENV
99100
else
100101
echo "OPENSENSEMAP_API_URL=https://api.testing.opensensemap.org" >> $GITHUB_ENV
102+
echo "OPENSENSEMAP_CMS_URL=${{ secrets.OPENSENSEMAP_CMS_URL }}" >> $GITHUB_ENV
101103
echo "OPENSENSEMAP_STYLE_URL=mapbox://styles/mapbox/streets-v11" >> $GITHUB_ENV
102104
echo "OPENSENSEMAP_ACCESS_TOKEN=${{ secrets.OPENSENSEMAP_ACCESS_TOKEN_TESTING }}" >> $GITHUB_ENV
103105
fi

0 commit comments

Comments
 (0)