Skip to content

Commit

Permalink
Merge pull request #352 from GIScience/release-v0.7.0
Browse files Browse the repository at this point in the history 
Release v0.7.0
  • Loading branch information
@TheGreatRefrigerator
TheGreatRefrigerator committed Feb 3, 2021
2 parents af590d1 + 43e4b9e commit 3b2571c
Show file tree
Hide file tree
Showing 31 changed files with 751 additions and 383 deletions.
2 changes: 0 additions & 2 deletions .travis.yml
View file
Expand Up @@ -12,7 +12,5 @@ script:
- npm install -g grunt-cli
- npm install
- node_modules/bower/bin/bower install
- cd bower_components/angularjs-slider && npm install && cd ../..
- cat bower_components/angularjs-slider/Gruntfile.js
- cp Gruntfile.default.js Gruntfile.js
- node_modules/.bin/grunt ci
93 changes: 68 additions & 25 deletions CHANGELOG.md
View file
Expand Up @@ -4,13 +4,47 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).

<!--## [Unreleased]
<!--
This is how a Changelog entry should look like:
## [version] - YYYY-MM-DD
### Added
### Fixed
- for new features.
### Changed
- existing functionality.
### Deprecated
### Removed-->
- soon-to-be removed features.
### Removed
- now removed features.
### Fixed
- any bug.
### Security
- in case of vulnerabilities. (Use for vulnerability fixes)
RELEASING:
1. Change Unreleased to new release number
2. Add today's Date
3. Change unreleased link to compare new release:
[unreleased]: https://github.com/GIScience/openrouteservice/compare/vnew...HEAD
4. Add new compare link below
[new]: https://github.com/GIScience/openrouteservice/compare/vlast...vnew
5. Git tag release commit with vX.X.X to enable links
6. Double check issue links are valid
7. Run 'grunt up' for patch, 'grunt up:minor' or 'grunt up:major' versions
8. Add version to docker-compose.yml (grunt version always adds 1 on top the current version ...)
-->

## [v0.7.0] - 2021-02-03

### Added
- link to new map client

### Changed
- generation of slider styles
- running the app: It is now dockerized (
Thanks to [@stefanocudini](https://github.com/stefanocudini)!
See [PR $345](https://github.com/GIScience/openrouteservice-app/pull/345))

## [v0.6.0] - 2020-08-10

Expand Down Expand Up @@ -369,25 +403,34 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
### Fixed
- hiding wrong Isochrones ([#160](https://github.com/GIScience/openrouteservice-app/issues/160))

<!--
### Added
new features.
### Changed
something in existing functionality.
### Deprecated
a soon-to-be removed feature.
### Removed
a now removed feature.
### Fixed
a bug.
### Security
in case of vulnerabilities.
-->
[unreleased]: https://github.com/GIScience/openrouteservice/compare/v0.7.0...HEAD
[0.7.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.6.0...v0.7.0
[v0.6.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.4...v0.6.0
[v0.5.4]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.3...v0.5.4
[v0.5.3]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.2...v0.5.3
[v0.5.2]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.1...v0.5.2
[v0.5.1]: https://github.com/GIScience/openrouteservice-app/compare/v0.5.0...v0.5.1
[v0.5.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.4.3...v0.5.0
[v0.4.3]: https://github.com/GIScience/openrouteservice-app/compare/v0.4.2...v0.4.3
[v0.4.2]: https://github.com/GIScience/openrouteservice-app/compare/v0.4.1...v0.4.2
[v0.4.1]: https://github.com/GIScience/openrouteservice-app/compare/v0.4.0...v0.4.1
[v0.4.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.12...v0.4.0
[v0.3.12]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.11...v0.3.12
[v0.3.11]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.10...v0.3.11
[v0.3.10]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.9...v0.3.10
[v0.3.9]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.8...v0.3.9
[v0.3.8]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.7...v0.3.8
[v0.3.7]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.6...v0.3.7
[v0.3.6]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.5...v0.3.6
[v0.3.5]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.4...v0.3.5
[v0.3.4]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.3...v0.3.4
[v0.3.3]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.2...v0.3.3
[v0.3.2]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.1...v0.3.2
[v0.3.1]: https://github.com/GIScience/openrouteservice-app/compare/v0.3.0...v0.3.1
[v0.3.0]: https://github.com/GIScience/openrouteservice-app/compare/v0.2.9...v0.3.0
[v0.2.9]: https://github.com/GIScience/openrouteservice-app/compare/v0.2.8...v0.2.9
[v0.2.8]: https://github.com/GIScience/openrouteservice-app/compare/0.2.7...v0.2.8
[0.2.7]: https://github.com/GIScience/openrouteservice-app/compare/0.2.6...0.2.7
[0.2.6]: https://github.com/GIScience/openrouteservice-app/compare/0.2.5...0.2.6
[0.2.5]: https://github.com/GIScience/openrouteservice-app/compare/0.2.4...0.2.5
[0.2.4]: https://github.com/GIScience/openrouteservice-app/compare/0.2.3...0.2.4
22 changes: 22 additions & 0 deletions Dockerfile
View file
@@ -0,0 +1,22 @@
FROM timbru31/node-alpine-git:12

# copy required files
COPY [".bowerrc", "bower.json", "bs-config.js", "main.js", "package.json", "package-lock.json", "/ors-classic-maps/"]

RUN cd /ors-classic-maps
WORKDIR /ors-classic-maps

# install npm dependencies
RUN npm install

# install bower dependencies
RUN node_modules/bower/bin/bower install --allow-root

# move default Gruntfile to correct place
COPY Gruntfile.default.js /ors-classic-maps/Gruntfile.js

# copy app after installing dependencies
COPY app /ors-classic-maps/app

# Expose app ports
EXPOSE 3035 3005
51 changes: 7 additions & 44 deletions Gruntfile.default.js
View file
Expand Up @@ -36,31 +36,6 @@ module.exports = function(grunt) {
"node_modules/leaflet.heightgraph/dist/**"
],
dest: "build"
},
// copies the slider variables into the related bower_component
sliderLess: {
expand: true,
cwd: "./",
src: ["app/less/angularjs-slider.variables.less"],
dest: "bower_components/angularjs-slider/src/",
rename: function(dest) {
return dest + "variables.less";
}
}
},
// compiles slider less to css
run_grunt: {
options:{
debug: true,
verbose: true
},
sliderMakeCss: {
src: "bower_components/angularjs-slider/Gruntfile.js",
options: {
log: true,
gruntCli: "../../node_modules/.bin/grunt",
task: "css"
}
}
},
watch: {
Expand All @@ -69,14 +44,13 @@ module.exports = function(grunt) {
},
less: {
files: [
"app/less/**/*.less",
"!app/less/angularjs-slider.variables.less"
"app/less/**/*.less"
],
tasks: ["less:development"]
},
less_sliders: {
files: ["app/less/angularjs-slider.variables.less"],
tasks: ["copy:sliderLess", "grunt:sliderMakeCss"]
tasks: ["less:development"]
},
js: {
files: ["app/**/*.js"]
Expand Down Expand Up @@ -192,11 +166,9 @@ module.exports = function(grunt) {
connect: {
dev: {
options: {
hostname: "localhost",
hostname: "0.0.0.0",
port: 3005,
//base: "src",
livereload: true,
open: true,
middleware: function(connect) {
// MARQ24 added proxy to avoid CORS when running OWN backend via SpringBoot
// this will require the usage of NodeJS 13.x
Expand All @@ -221,13 +193,10 @@ module.exports = function(grunt) {
},
build: {
options: {
hostname: "localhost",
hostname: "0.0.0.0",
port: 3035,
open: true,
base: "./build",
middleware: function(connect) {
middleware: function() {
return [
//modRewrite(['^[^\\.]*$ /index.html [L]']),
modRewrite([
"!\\.html|\\.js|\\.txt|\\.ico|\\.svg|\\.map|\\.woff2|\\.woff|\\.ttf|\\.css|\\.png$ /index.html [L]"
]),
Expand Down Expand Up @@ -357,7 +326,8 @@ module.exports = function(grunt) {
"app/less/ors-panel-routing.less",
"app/css/ors-sidebar-outlet.css":
"app/less/ors-sidebar-outlet.less",
"app/css/ors-tooltips.css": "app/less/ors-tooltips.less"
"app/css/ors-tooltips.css": "app/less/ors-tooltips.less",
"app/css/ors-ng-sliders.css": "app/less/ors-ng-sliders.less"
}
}
},
Expand All @@ -380,8 +350,6 @@ module.exports = function(grunt) {
"browserify:turf",
"less:development",
"prettier",
"copy:sliderLess",
"run_grunt:sliderMakeCss",
"ngtemplates",
"clean:task_rm_build",
"copy:build",
Expand All @@ -404,8 +372,6 @@ module.exports = function(grunt) {
grunt.registerTask("dev", "Run local server for development purposes", [
"less:development",
"prettier",
"copy:sliderLess",
"run_grunt:sliderMakeCss",
"browserify:turf",
"ngtemplates",
"ngconstant:ors",
Expand All @@ -416,7 +382,6 @@ module.exports = function(grunt) {
"browserify:turf",
"less:development",
"prettier",
"copy:sliderLess",
"ngtemplates",
"clean:task_rm_build",
"copy:build",
Expand All @@ -440,8 +405,6 @@ module.exports = function(grunt) {
[
"less:development",
"prettier",
"copy:sliderLess",
"run_grunt:sliderMakeCss",
"browserify:turf",
"ngtemplates",
"ngconstant:local",
Expand Down

0 comments on commit 3b2571c

Please sign in to comment.