Skip to content

Commit

Permalink
Merge pull request #1284 from Artsdatabanken/tittel
Browse files Browse the repository at this point in the history
Endrer tittel og kodenavn
  • Loading branch information
helemork authored Apr 10, 2019
2 parents ed75b3f + 2bcac0c commit ad33d1c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
5 changes: 2 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[![Build Status](https://travis-ci.org/Artsdatabanken/nin-innsyn.svg?branch=master)](https://travis-ci.org/Artsdatabanken/nin-innsyn)
[![Coverage Status](https://coveralls.io/repos/github/Artsdatabanken/nin-innsyn/badge.svg?branch=master)](https://coveralls.io/github/Artsdatabanken/nin-innsyn?branch=master)
[![Build Status](https://travis-ci.org/Artsdatabanken/nin-kart-frontend.svg?branch=master)](https://travis-ci.org/Artsdatabanken/nin-kart-frontend)
[![Coverage Status](https://coveralls.io/repos/github/Artsdatabanken/nin-kart-frontend/badge.svg?branch=master)](https://coveralls.io/github/Artsdatabanken/nin-kart-frontend?branch=master)
[![Open Source Love](https://badges.frapsoft.com/os/v2/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/)
[![MIT Licence](https://badges.frapsoft.com/os/mit/mit.svg?v=103)](https://opensource.org/licenses/mit-license.php)
[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg)](CONTRIBUTING.md#pull-requests)
Expand All @@ -9,7 +9,6 @@

![image](https://user-images.githubusercontent.com/17450081/55809911-0804fa80-5ae7-11e9-83e8-31c835f239c9.png)


## Nyttige lenker i prosjektet

- [Webklient](https://nin.artsdatabanken.no)
Expand Down
6 changes: 3 additions & 3 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ echo "Sending files to prod"
sshpass -p $scp_pass scp -o StrictHostKeyChecking=no $1.tar.gz $scp_user@158.38.128.51:/tmp/test
sleep 30
curl -X POST --data-urlencode "payload={\"channel\": \"$2\", \"username\": \"travis not the band\", \"text\": \"$3\", \"icon_emoji\": \":ghost:\"}" https://hooks.slack.com/services/$SLACK_TOKEN
else
else
#docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
docker login -u="$4" -p="$5"
docker build -t artsdatabanken/nin-innsyn:latest .
docker build -t artsdatabanken/nin-kart-frontend:latest .
docker images
docker push artsdatabanken/nin-innsyn:latest
docker push artsdatabanken/nin-kart-frontend:latest
fi
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"not op_mini all"
],
"bugs": {
"url": "https://github.com/Artsdatabanken/nin-innsyn/issues"
"url": "https://github.com/Artsdatabanken/nin-kart-frontend/issues"
},
"dependencies": {
"@artsdatabanken/typesystem": "^10.0.0",
Expand Down Expand Up @@ -71,7 +71,7 @@
]
},
"license": "MIT",
"name": "nin-innsyn",
"name": "nin-kart-frontend",
"private": true,
"scripts": {
"build": "react-scripts build",
Expand Down
2 changes: 1 addition & 1 deletion public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"short_name": "nin-innsyn",
"short_name": "Natur i Norge",
"name": "Natur i Norge",
"icons": [
{
Expand Down
2 changes: 1 addition & 1 deletion src/MainDrawer/MainDrawer.js
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ class MainDrawer extends Component {
handleClickLastNed = () => window.open("https://data.artsdatabanken.no/");
handleClickLastOpp = () =>
window.open(
"https://github.com/Artsdatabanken/nin-innsyn/blob/master/docs/BidraMedData.md"
"https://github.com/Artsdatabanken/nin-kart-frontend/blob/master/docs/BidraMedData.md"
);
handleClickLogo = () => window.open("https://artsdatabanken.no");
handleClickMap = () => this.props.history.push("/");
Expand Down

0 comments on commit ad33d1c

Please sign in to comment.