Skip to content

Commit

Permalink
Main (#1793)
Browse files Browse the repository at this point in the history
* Bump acorn from 5.7.3 to 5.7.4 (#1684)

Bumps [acorn](https://github.com/acornjs/acorn) from 5.7.3 to 5.7.4.
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](acornjs/acorn@5.7.3...5.7.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bruk test API i test (#1691)

* Vis NiN-kart (#1692)

* Slack (#1693)

* Vis NiN-kart

* Fix: Post slack message

* Gå mot lookup.test.artsdatabanken.no i test (#1694)

* Use correct API url (#1695)

* Fix: Logoer vises ikke (#1696)

* Bump elliptic from 6.5.2 to 6.5.3 (#1689)

Bumps [elliptic](https://github.com/indutny/elliptic) from 6.5.2 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](indutny/elliptic@v6.5.2...v6.5.3)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bjørn Reppen <[email protected]>

* Bump websocket-extensions from 0.1.3 to 0.1.4 (#1687)

Bumps [websocket-extensions](https://github.com/faye/websocket-extensions-node) from 0.1.3 to 0.1.4.
- [Release notes](https://github.com/faye/websocket-extensions-node/releases)
- [Changelog](https://github.com/faye/websocket-extensions-node/blob/master/CHANGELOG.md)
- [Commits](faye/websocket-extensions-node@0.1.3...0.1.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bjørn Reppen <[email protected]>

* Bump lodash from 4.17.15 to 4.17.19 (#1688)

Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.19.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](lodash/lodash@4.17.15...4.17.19)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bjørn Reppen <[email protected]>

* Bump markdown-to-jsx from 6.11.0 to 6.11.4 (#1697)

Bumps [markdown-to-jsx](https://github.com/probablyup/markdown-to-jsx) from 6.11.0 to 6.11.4.
- [Release notes](https://github.com/probablyup/markdown-to-jsx/releases)
- [Commits](quantizor/markdown-to-jsx@6.11.0...6.11.4)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump http-proxy from 1.18.0 to 1.18.1 (#1699)

Bumps [http-proxy](https://github.com/http-party/node-http-proxy) from 1.18.0 to 1.18.1.
- [Release notes](https://github.com/http-party/node-http-proxy/releases)
- [Changelog](https://github.com/http-party/node-http-proxy/blob/master/CHANGELOG.md)
- [Commits](http-party/node-http-proxy@1.18.0...1.18.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Endrer konto for logging til sentry.io.

* Endrer konto for logging til sentry.io.

* Staying live

* Klikk (#1705)

* Popup-vindu

- Flere tilfeller av app crash ved klikk utenfor Norge
- Tilpasning for natursystem

* Bump all dependencies

 - Repair multiply
 - Repair Naturvernområder

* Info for punkt

* cleanup

* ok

* Overskrift

* geografi

* ok

* Drag av marker fungerer ikke

* ok

* ok

* ok

* ok

* ok

* ok

* ok

* ok

* Bump

 markdown-to-jsx  ^6.11.4  →  ^7.0.0
 husky             ^4.2.5  →  ^4.3.0

* ok

* Ikke vis arter på hovedmeny

* margins

* fix hamburger menu

* burger times

* Last info fra koordinater i URL ved oppstart

* Fix CTD

* TAbs

* spike

* Før Lukkbart vindu

* kartleggingsinformasjon

* Fix: Landskap: Klikk i kart Crash

* Fix build warnings

* Fix error: missing import

* Missing dependency Sentry

* Update lock file

* ListItemSecondaryAction - last item in ListItem

* Unique key prop in list

* input value should not be null

* getKoordinatStreng - swapped lat/lng

* ListItemSecondaryAction is last item

* hentPunktVektor() errorhandling

* ListItemSecondaryAction is last item

* Poisjon -> Posisjon

* Located hidden buttons..

* resized map

* Moved buttons to Leaflet map

* Ignore .vs-folder

* #1716 Displays info about multiple objects

* #1716 oops

* #1717 Hide nullvalues

* path-fixing

* #1716 Display uLKM info. Added more text

* #1720 Located text in overordnet

* #1720 removed console.log

* #1724 Show marker in map on startup

* #1716 Expanded need a valid id on element

* #1724 Bugfix

* Removed annoying dot on <li> of type MuiListItem

* #1716 Displays info from multiple NAT on click

* npm update - step 1

* npm update step 2

* npm update step 3

* npm update step 4

* Fixed visualization of splash-screen

* Fixed some problems with mobile layout

* #1728 visUpublisert - defaultvalue = 2

* Hide kartlag when activeTab is punkt & kartlegging

* #1732 Added uLKM to Naturtype

* #1732 cleanup

* #1734 Create unique key for each kartleggingsenhet

* #1736 Added logos

* Logo behind NiN-tagb

* #1739 Using data from mbtiles to set the bounds

* #1739 check path

* start detatching front page from main page

* splitting front page and map app

* main menu no longer uses context, but state from upper level.

* remove clutter related to unnecessary menu-handling

* healed main menu toggling

* tiny tweaks for test

* fixing errors

* moving all kartlagcontent into kartlag out of app.js

* remove nonworking headerthings, progress on detecting elements in punkt

* defined layer sections

* fix errors in console due to wrong inputs

* lots of rewrite, but turned out component was called two places and one lacked inputvariable.

* tangram crash now logs error instead of crashing app, and attempts to make new config when its missing

* upper level nav in place. Not optimally presented, but in place

* listitem replaced with heading with one button per function.

* back-arrow for current layer now takes user back to previous item

* cleanup compiling issues

* sorted out sections and button placements for widescreen

* sorted out content in punkt

* clean away some species data

* delete more species data

* corrected headerelement in contentbox for landskapstype

* remove unused inline css

* sorted levels of sectionelements for nature types

* normalize contained expands

* comment out unused code from gradients

* starting to fix close element issue sand turn button correct way

* comment out more variables

* help is back. not nice, but back.

* fixed main menu

* punkt now opens by outsidevariables, not internal.

* sidebar openicon

* add toggle switch component

* add 'intervall' in front of numbers and get full NiN-code in 'Kartlag'

* info tab now functions more as expected, detatched from surrounding stuff

* remove unused variables

* sorted out sources for information and levels in information tab

* remove unnecessary component between components

* fixed colouration and sections

* fixed relasjoner tab for information box

* move duplicate functions to helpers.js

* fixed up sted in punkt

* fix warnings

* fix bug

* move kartlegging tab into punkt tab where it belongs

* move file kartlegging and update relative imports

* remove no longer used items

* Travis syntax grump attempted fix

* Travis, be happy?

* remove build warning

* trying again...

* yolo

* remove wrap attempt, improve variables from graphic prophile instead

* remove species css, since species are removed

* remove anything popup, since it has been removed from app

* remove lots of unused code

* mobile buttons are happy again

* logofix

* fixed misplaced burger

* made box + css for cookiewarning.

* information tab and kartlag now functions more as expected.

* minor changes in box-logic

* big refactor and move settings elements from settings tab to navigation elements

* remove fullscreen-stuff which is not in use and make no sense as it should have been solved with css, not map-functions

* fixed marker toggling the punkt info box, not random floating button

* move change color into navigation menu

* remove warninges

* remove 'Kartlaginnstillinger'

* fix duplicate name

* marker title and removed more fullscreen-remnants

* gps location was added back and marker function improved

* dom buttons no longer generated by map upon every map draw (why!) ...

* click functions for map now work as expected

* bakgrunnskart selector re-added

* background adjustments back in place

* all background settings in place

* kill changes in future conflict file

* fixes #1292 - remove zoom on double click as it interferes with point marker

* remove 'bakgrunnskart' part form 'Kodelisteelement'

* select colour in background maps work again

* fix component rerender when colors and visibility change

* improve slider and create edit color buttons

* add step to transparency slider

* put backarow into component to increase readability

* move header and mobileopenbuttons into separate components to increase readabiliy

* Move and rename Meny -> CurrentElement

* remove old way of adding locality to kartlag-tab which is not in use

* moved favorites to separate component to increase readability

* remove duplicate commented out background layer code

* moved history element out of kartlag to separate component

* making more components of the buttons

* converted buttons to type layerbutton

* colourbox buttons look better

* nesting karlag layers in similar component with expand as per request

* move more items and delete more unused stuff

* remove opacity settings from map layers

* detached maplayerbutton into its own separate element for easier re-use

* delete old trash

* remove duplicates and fix imports

* move and delete and rename things so they make sense

* turning some items into the same items to more easily style them all later

* transforming favorites to match current layers in content

* started on breadcrumbs

* breadcrumbs!

* placement and type of items in kartlag is correct. but some bugs exist

* fixed bug in eye button object target

* moved elements to correct folder instead of nested deep in unlogical places

* fix remove active layer element

* hide button targets correct level again. altho visualisation is a tad off

* breadcrumbs no longer reverts every run, also has been compacted

* fix warnings

* Update deploy.sh

Sørger for deployment til testmiljøet.

* fixes favorite vs. current layer issues by affecting both

* remove unused reference

* adding adb-header. need tweaks

* nin-kart-header works

* mobile title is back

* remove unused csd

* fix header + forsidebug

* colour and design of main elements in kartlag

* subsections look decent

* some aesthetics here and there

* fullscreen for bigscreen works. Not pretty, but works.

* fullscreenmode works

* just don't look at the mobile version :|

* fullscreen should work as intended

* fixed ninkart tab situation isj

* ffs

* Upgrade dependencies

* Build using GitHub Actions

* Fix Eslint version conflict

* fix dependency issues

* fix App.test

* Remove unused dependencies

* Update dependencies

---------

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: myrdrahl <[email protected]>
Co-authored-by: Myrdrahl <[email protected]>
Co-authored-by: Terje Olsøybakk <[email protected]>
Co-authored-by: Helene Engeness Mørk <[email protected]>
Co-authored-by: Mats Sæter <[email protected]>
Co-authored-by: Mats <[email protected]>
Co-authored-by: Bjørn Reppen <[email protected]>
  • Loading branch information
9 people authored Nov 20, 2023
1 parent eefa7bd commit 1059aed
Show file tree
Hide file tree
Showing 191 changed files with 40,245 additions and 16,045 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/build-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: build and test PR

on:
pull_request:
branches:
- '*'
jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
- run: npm install --legacy-peer-deps
- run: npm run test
1 change: 1 addition & 0 deletions .github/workflows/deploy.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
tar czf $(basename $GITHUB_REPOSITORY).tar.gz -C build .
43 changes: 43 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
name: build and publish kommune

on:
push:
branches: [master]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version: "18.x"
- run: npm install --legacy-peer-deps
- run: npm update
- run: npm run build
- name: Check downloaded files
run: ./.github/workflows/filecheck.sh
- name: Checkout
uses: actions/checkout@v3
with:
path: "./destinationRepo"
token: ${{secrets.PUSH_TOKEN}}
- name: Run deployment script
run: ./.github/workflows/deploy.sh
shell: bash
- name: Create release
uses: ncipollo/release-action@v1
with:
artifacts: ${{ github.event.repository.name }}.tar.gz
tag: v_${{ github.run_number }}
workflow_dispatch:
runs-on: ubuntu-latest
steps:
- name: Fyrer NiN
uses: peter-evans/repository-dispatch@v2
with:
token: ${{ secrets.PAT }}
repository: artsdatabanken/nin-kart
event-type: fra_nin-kart
2 changes: 2 additions & 0 deletions .github/workflows/filecheck.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ls -l temp
ls -l build
1 change: 1 addition & 0 deletions .github/workflows/slack.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export curl -X POST -H 'Content-type: application/json' --data '{"text":"deploy nin-kart"}' $1
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@
npm-debug.log*
yarn-debug.log*
yarn-error.log*
.vscode/
.vscode/
.vs/
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

6 changes: 0 additions & 6 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,3 @@ if [ "${BRANCH}" == "test" ]
else
echo "This branch will not be deployed, since it's not the test branch."
fi
#Posting message to pull request in GitHub
#if [ "${TRAVIS_PULL_REQUEST}" != "false" ]
#then
#echo "Posting to github ..."
#curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST -d "{\"body\": \"${github_message}\"}" "https://api.github.com/repos/${TRAVIS_REPO_SLUG}/issues/${TRAVIS_PULL_REQUEST}/comments"
#fi
Loading

0 comments on commit 1059aed

Please sign in to comment.