Skip to content

Commit 4e8e85f

Browse files
oharstaoharsta
committed
Merge branch 'main' into feature/1197-eduid-website
2 parents cef8523 + 65c7bbe commit 4e8e85f

82 files changed

Lines changed: 1338 additions & 804 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/badges/branches.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎.github/badges/jacoco.svg‎

Lines changed: 1 addition & 1 deletion
Loading

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ log
2121
NOTES.md
2222
dep.tree
2323
application-test2.yml
24+
application-dev.yml
2425
api-docs.json
2526
dist
2627
account-gui/public/index.html

‎.run/BE - MyConextServerApplication (MyConext) - SkipIDP.run.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="BE - MyConextServerApplication (MyConext) - Skip IDP" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
3+
<option name="ACTIVE_PROFILES" value="test" />
4+
<module name="myconext-server" />
5+
<option name="SPRING_BOOT_MAIN_CLASS" value="myconext.MyConextServerApplication" />
6+
<method v="2">
7+
<option name="Make" enabled="true" />
8+
</method>
9+
</configuration>
10+
</component>

‎.run/BE - MyConextServerApplication (MyConext).run.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="BE - MyConextServerApplication (MyConext)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
3+
<option name="ACTIVE_PROFILES" value="dev" />
4+
<module name="myconext-server" />
5+
<option name="SPRING_BOOT_MAIN_CLASS" value="myconext.MyConextServerApplication" />
6+
<method v="2">
7+
<option name="Make" enabled="true" />
8+
</method>
9+
</configuration>
10+
</component>

‎.run/BE - MyConextServerApplication (ServiceDesk) - SkipIDP.run.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="BE - MyConextServerApplication (ServiceDesk) - Skip IDP" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
3+
<option name="ACTIVE_PROFILES" value="test,servicedesk" />
4+
<module name="myconext-server" />
5+
<option name="SPRING_BOOT_MAIN_CLASS" value="myconext.MyConextServerApplication" />
6+
<method v="2">
7+
<option name="Make" enabled="true" />
8+
</method>
9+
</configuration>
10+
</component>

‎.run/BE - MyConextServerApplication (Servicedesk).run.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="BE - MyConextServerApplication (Servicedesk)" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
3+
<option name="ACTIVE_PROFILES" value="dev,servicedesk" />
4+
<module name="myconext-server" />
5+
<option name="SPRING_BOOT_MAIN_CLASS" value="myconext.MyConextServerApplication" />
6+
<method v="2">
7+
<option name="Make" enabled="true" />
8+
</method>
9+
</configuration>
10+
</component>

‎.run/BE - TiqrApplication.run.xml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="BE - TiqrApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
3+
<module name="tiqr-mock" />
4+
<option name="SPRING_BOOT_MAIN_CLASS" value="tiqr.org.TiqrApplication" />
5+
<method v="2">
6+
<option name="Make" enabled="true" />
7+
</method>
8+
</configuration>
9+
</component>

‎.run/FE - Account-gui.run.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="FE - Account-gui" type="js.build_tools.npm">
3+
<package-json value="$PROJECT_DIR$/account-gui/package.json" />
4+
<command value="run" />
5+
<scripts>
6+
<script value="dev" />
7+
</scripts>
8+
<node-interpreter value="project" />
9+
<envs />
10+
<method v="2" />
11+
</configuration>
12+
</component>

‎.run/FE - MyConext-gui.run.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="FE - MyConext-gui" type="js.build_tools.npm">
3+
<package-json value="$PROJECT_DIR$/myconext-gui/package.json" />
4+
<command value="run" />
5+
<scripts>
6+
<script value="dev" />
7+
</scripts>
8+
<node-interpreter value="project" />
9+
<envs />
10+
<method v="2" />
11+
</configuration>
12+
</component>

0 commit comments

Comments
 (0)