Commit c612b70c authored by Guillaume Cornut's avatar Guillaume Cornut Committed by Raphaël Flores
Browse files

fix: Minor fixes following MR feedback. GNP-5430.

parent f4984ae0
# Created by https://www.gitignore.io/api/java,sass,gradle,eclipse,java-web,intellij,visualstudiocode,kotlin,git,maven,macos,linux
# Edit at https://www.gitignore.io/?templates=java,sass,gradle,eclipse,java-web,intellij,visualstudiocode,kotlin,git,maven,macos,linux
# Created by https://www.gitignore.io/api/gradle,eclipse,intellij,visualstudiocode,kotlin,git,macos,linux
# Edit at https://www.gitignore.io/?templates=gradle,eclipse,intellij,visualstudiocode,kotlin,git,macos,linux
### Eclipse ###
......@@ -166,7 +166,7 @@ fabric.properties
# Sonarlint plugin
.idea/sonarlint
### Java ###
### Kotlin ###
# Compiled class file
*.class
......@@ -191,23 +191,6 @@ fabric.properties
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Java-Web ###
## ignoring target file
target/
### Kotlin ###
# Compiled class file
# Log file
# BlueJ files
# Mobile Tools for Java (J2ME)
# Package Files #
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
### Linux ###
*~
......@@ -251,23 +234,6 @@ Network Trash Folder
Temporary Items
.apdisk
### Maven ###
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
### Sass ###
.sass-cache/
*.css.map
*.sass.map
*.scss.map
### VisualStudioCode ###
.vscode/*
!.vscode/settings.json
......@@ -298,4 +264,4 @@ gradle-app.setting
### Gradle Patch ###
**/build/
# End of https://www.gitignore.io/api/java,sass,gradle,eclipse,java-web,intellij,visualstudiocode,kotlin,git,maven,macos,linux
# End of https://www.gitignore.io/api/gradle,eclipse,intellij,visualstudiocode,kotlin,git,macos,linux
image: urgi/docker-rare:latest
image: urgi/docker-browsers:latest
# Disable the Gradle daemon for Continuous Integration servers as correctness
# is usually a priority over speed in CI environments. Using a fresh
......
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<JSCodeStyleSettings>
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</JSCodeStyleSettings>
<TypeScriptCodeStyleSettings>
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="USE_DOUBLE_QUOTES" value="false" />
......
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
<option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
</state>
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="TsLintConfiguration" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/frontend/tslint.json" />
<component name="TsLintConfiguration" use-custom-config-file="true" custom-config-file-path="$PROJECT_DIR$/frontend/src/tslint.json" />
</project>
\ No newline at end of file
......@@ -47,6 +47,11 @@ ng serve
## GitLab CI
When creating merge requests on the ForgeMIA GitLab, the GitLab CI will
automatically run the tests of the project (no need to do anything).
If you want to run the GitLab CI locally, you have to follow this steps:
1. [Install gitlab-runner](https://docs.gitlab.com/runner/install/)
2. Run the following command (with the correct GnpIS security token):
......
# Created by https://www.gitignore.io/api/maven,java,java-web
# Edit at https://www.gitignore.io/?templates=maven,java,java-web
### Java ###
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Mobile Tools for Java (J2ME)
.mtj.tmp/
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
### Java-Web ###
## ignoring target file
target/
### Maven ###
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
# End of https://www.gitignore.io/api/maven,java,java-web
# Created by https://www.gitignore.io/api/angular
# Edit at https://www.gitignore.io/?templates=angular
# Created by https://www.gitignore.io/api/angular,sass
# Edit at https://www.gitignore.io/?templates=angular,sass
### Angular ###
## Angular ##
......@@ -10,13 +10,13 @@
/app/**/*.js
/app/**/*.js.map
# karma report
/karma-junit-tests-report
# dependencies
/node_modules
/bower_components
# IDEs and editors
/.idea
# misc
/.sass-cache
/connect.lock
......@@ -33,4 +33,10 @@ testem.log
#System Files
.DS_Store
# End of https://www.gitignore.io/api/angular
### Sass ###
.sass-cache/
*.css.map
*.sass.map
*.scss.map
# End of https://www.gitignore.io/api/angular,sass
# GnpisPlantDataSearc
# GnpIS Plant Data Search Frontend
This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.6.
......@@ -10,6 +10,8 @@ Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app w
Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
[See official doc for more info](https://github.com/angular/angular-cli/wiki/generate).
## Build
Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
......
......@@ -3838,12 +3838,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
......@@ -3858,17 +3860,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"core-util-is": {
"version": "1.0.2",
......@@ -3985,7 +3990,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"ini": {
"version": "1.3.5",
......@@ -3997,6 +4003,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
......@@ -4011,6 +4018,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
......@@ -4018,12 +4026,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
......@@ -4042,6 +4052,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"minimist": "0.0.8"
}
......@@ -4122,7 +4133,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
"dev": true
"dev": true,
"optional": true
},
"object-assign": {
"version": "4.1.1",
......@@ -4134,6 +4146,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"wrappy": "1"
}
......@@ -4255,6 +4268,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
"optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
......
......@@ -9,6 +9,6 @@
<link rel="icon" type="image/x-icon" href="favicon.ico">
</head>
<body>
<gpds-root></gpds-root>
<gpds-root></gpds-root>
</body>
</html>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment