relicts from rebase
This commit is contained in:
parent
7972ad66a8
commit
1c1475d61f
@ -0,0 +1,257 @@
|
||||
Index: .idea/modules.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/.idea/modules.xml b/.idea/modules.xml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1692006892000)
|
||||
+++ b/.idea/modules.xml (date 1692006892000)
|
||||
@@ -0,0 +1,8 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<project version="4">
|
||||
+ <component name="ProjectModuleManager">
|
||||
+ <modules>
|
||||
+ <module fileurl="file://$PROJECT_DIR$/.idea/minis-new.iml" filepath="$PROJECT_DIR$/.idea/minis-new.iml" />
|
||||
+ </modules>
|
||||
+ </component>
|
||||
+</project>
|
||||
\ No newline at end of file
|
||||
Index: .idea/.gitignore
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/.idea/.gitignore b/.idea/.gitignore
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1692006892000)
|
||||
+++ b/.idea/.gitignore (date 1692006892000)
|
||||
@@ -0,0 +1,5 @@
|
||||
+# Default ignored files
|
||||
+/shelf/
|
||||
+/workspace.xml
|
||||
+# Editor-based HTTP Client requests
|
||||
+/httpRequests/
|
||||
Index: .idea/vcs.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1694893180260)
|
||||
+++ b/.idea/vcs.xml (date 1694893180260)
|
||||
@@ -0,0 +1,7 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<project version="4">
|
||||
+ <component name="VcsDirectoryMappings">
|
||||
+ <mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
+ <mapping directory="$PROJECT_DIR$/private/minis-backend" vcs="Git" />
|
||||
+ </component>
|
||||
+</project>
|
||||
\ No newline at end of file
|
||||
Index: private/.idea/workspace.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/private/.idea/workspace.xml b/private/.idea/workspace.xml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1693329241698)
|
||||
+++ b/private/.idea/workspace.xml (date 1693329241698)
|
||||
@@ -0,0 +1,76 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<project version="4">
|
||||
+ <component name="AutoImportSettings">
|
||||
+ <option name="autoReloadType" value="SELECTIVE" />
|
||||
+ </component>
|
||||
+ <component name="ChangeListManager">
|
||||
+ <list default="true" id="b57a47a1-bc2c-4828-9edd-23c965fe646d" name="Changes" comment="">
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/.gitignore" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/build.gradle.kts" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/gradle.properties" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/gradle/wrapper/gradle-wrapper.jar" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/gradle/wrapper/gradle-wrapper.properties" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/gradlew" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/gradlew.bat" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/settings.gradle.kts" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/Application.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/models/Gottesdienste.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/models/Marks.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/models/Ministranten.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/plugins/Databases.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/plugins/HTTP.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/plugins/Security.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/plugins/Serialization.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/plugins/UsersSchema.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/service/Plan.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/views/GottesdiensteView.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/views/MarksView.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/views/MinistrantenView.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/kotlin/de/walamana/views/PlanView.kt" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/resources/logback.xml" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/main/resources/static/index.html" afterDir="false" />
|
||||
+ <change afterPath="$PROJECT_DIR$/minis-backend/src/test/kotlin/de/walamana/ApplicationTest.kt" afterDir="false" />
|
||||
+ </list>
|
||||
+ <option name="SHOW_DIALOG" value="false" />
|
||||
+ <option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
+ <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
+ <option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
+ </component>
|
||||
+ <component name="Git.Settings">
|
||||
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/minis-backend" />
|
||||
+ </component>
|
||||
+ <component name="MacroExpansionManager">
|
||||
+ <option name="directoryName" value="djm4dokj" />
|
||||
+ </component>
|
||||
+ <component name="ProjectId" id="2UfScqD97S0q0oqjpptv6lotAJ2" />
|
||||
+ <component name="ProjectViewState">
|
||||
+ <option name="hideEmptyMiddlePackages" value="true" />
|
||||
+ <option name="showLibraryContents" value="true" />
|
||||
+ </component>
|
||||
+ <component name="PropertiesComponent"><![CDATA[{
|
||||
+ "keyToString": {
|
||||
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
+ "WebServerToolWindowFactoryState": "false",
|
||||
+ "dart.analysis.tool.window.visible": "false",
|
||||
+ "last_opened_file_path": "/home/walamana/Downloads/minis-new/private/minis-backend",
|
||||
+ "show.migrate.to.gradle.popup": "false",
|
||||
+ "vue.rearranger.settings.migration": "true"
|
||||
+ }
|
||||
+}]]></component>
|
||||
+ <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
+ <component name="TaskManager">
|
||||
+ <task active="true" id="Default" summary="Default task">
|
||||
+ <changelist id="b57a47a1-bc2c-4828-9edd-23c965fe646d" name="Changes" comment="" />
|
||||
+ <created>1693329223616</created>
|
||||
+ <option name="number" value="Default" />
|
||||
+ <option name="presentableId" value="Default" />
|
||||
+ <updated>1693329223616</updated>
|
||||
+ <workItem from="1693329224874" duration="17000" />
|
||||
+ </task>
|
||||
+ <servers />
|
||||
+ </component>
|
||||
+ <component name="TypeScriptGeneratedFilesManager">
|
||||
+ <option name="version" value="3" />
|
||||
+ </component>
|
||||
+</project>
|
||||
\ No newline at end of file
|
||||
Index: .idea/minis-new.iml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/.idea/minis-new.iml b/.idea/minis-new.iml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1692006892000)
|
||||
+++ b/.idea/minis-new.iml (date 1692006892000)
|
||||
@@ -0,0 +1,12 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<module type="WEB_MODULE" version="4">
|
||||
+ <component name="NewModuleRootManager">
|
||||
+ <content url="file://$MODULE_DIR$">
|
||||
+ <excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
||||
+ <excludeFolder url="file://$MODULE_DIR$/temp" />
|
||||
+ <excludeFolder url="file://$MODULE_DIR$/tmp" />
|
||||
+ </content>
|
||||
+ <orderEntry type="inheritedJdk" />
|
||||
+ <orderEntry type="sourceFolder" forTests="false" />
|
||||
+ </component>
|
||||
+</module>
|
||||
\ No newline at end of file
|
||||
Index: private/.idea/modules.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/private/.idea/modules.xml b/private/.idea/modules.xml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1693329241690)
|
||||
+++ b/private/.idea/modules.xml (date 1693329241690)
|
||||
@@ -0,0 +1,8 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<project version="4">
|
||||
+ <component name="ProjectModuleManager">
|
||||
+ <modules>
|
||||
+ <module fileurl="file://$PROJECT_DIR$/.idea/private.iml" filepath="$PROJECT_DIR$/.idea/private.iml" />
|
||||
+ </modules>
|
||||
+ </component>
|
||||
+</project>
|
||||
\ No newline at end of file
|
||||
Index: .idea/codeStyles/codeStyleConfig.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1692007636000)
|
||||
+++ b/.idea/codeStyles/codeStyleConfig.xml (date 1692007636000)
|
||||
@@ -0,0 +1,5 @@
|
||||
+<component name="ProjectCodeStyleConfiguration">
|
||||
+ <state>
|
||||
+ <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
|
||||
+ </state>
|
||||
+</component>
|
||||
\ No newline at end of file
|
||||
Index: package.json
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/package.json b/package.json
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1692006882000)
|
||||
+++ b/package.json (date 1692006882000)
|
||||
@@ -0,0 +1,11 @@
|
||||
+{
|
||||
+ "name": "minis-new",
|
||||
+ "version": "1.0.0",
|
||||
+ "description": "",
|
||||
+ "main": "index.js",
|
||||
+ "scripts": {
|
||||
+ "test": "echo \"Error: no test specified\" && exit 1"
|
||||
+ },
|
||||
+ "author": "",
|
||||
+ "license": "ISC"
|
||||
+}
|
||||
Index: private/.idea/vcs.xml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/private/.idea/vcs.xml b/private/.idea/vcs.xml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1693329241706)
|
||||
+++ b/private/.idea/vcs.xml (date 1693329241706)
|
||||
@@ -0,0 +1,6 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<project version="4">
|
||||
+ <component name="VcsDirectoryMappings">
|
||||
+ <mapping directory="$PROJECT_DIR$/minis-backend" vcs="Git" />
|
||||
+ </component>
|
||||
+</project>
|
||||
\ No newline at end of file
|
||||
Index: private/.idea/private.iml
|
||||
IDEA additional info:
|
||||
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
|
||||
<+>UTF-8
|
||||
===================================================================
|
||||
diff --git a/private/.idea/private.iml b/private/.idea/private.iml
|
||||
new file mode 100644
|
||||
--- /dev/null (date 1693329241682)
|
||||
+++ b/private/.idea/private.iml (date 1693329241682)
|
||||
@@ -0,0 +1,9 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<module type="JAVA_MODULE" version="4">
|
||||
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||
+ <exclude-output />
|
||||
+ <content url="file://$MODULE_DIR$" />
|
||||
+ <orderEntry type="inheritedJdk" />
|
||||
+ <orderEntry type="sourceFolder" forTests="false" />
|
||||
+ </component>
|
||||
+</module>
|
||||
\ No newline at end of file
|
||||
diff --git a/private/.idea/.gitignore b/private/.idea/.gitignore
|
||||
new file mode 100644
|
||||
@ -0,0 +1,4 @@
|
||||
<changelist name="Uncommitted_changes_before_Update_at_16_09_23,_21_42_[Changes]" date="1694893326362" recycled="false" toDelete="true">
|
||||
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Uncommitted_changes_before_Update_at_16_09_23,_21_42_[Changes]/shelved.patch" />
|
||||
<option name="DESCRIPTION" value="Uncommitted changes before Update at 16.09.23, 21:42 [Changes]" />
|
||||
</changelist>
|
||||
111
.idea/workspace.xml
Normal file
111
.idea/workspace.xml
Normal file
@ -0,0 +1,111 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="AutoImportSettings">
|
||||
<option name="autoReloadType" value="SELECTIVE" />
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="044f5e0b-f7e9-49a6-8711-2e70fc13421a" name="Changes" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/private/minis-backend" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="FileTemplateManagerImpl">
|
||||
<option name="RECENT_TEMPLATES">
|
||||
<list>
|
||||
<option value="TypeScript File" />
|
||||
<option value="Vue Single File Component" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="Git.Settings">
|
||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
||||
<map>
|
||||
<entry key="$PROJECT_DIR$" value="main" />
|
||||
</map>
|
||||
</option>
|
||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||
</component>
|
||||
<component name="MarkdownSettingsMigration">
|
||||
<option name="stateVersion" value="1" />
|
||||
</component>
|
||||
<component name="ProjectColorInfo"><![CDATA[{
|
||||
"associatedIndex": 3
|
||||
}]]></component>
|
||||
<component name="ProjectId" id="2TyELB5Ejnv4MM7fb8KpvI1zA1V" />
|
||||
<component name="ProjectViewState">
|
||||
<option name="hideEmptyMiddlePackages" value="true" />
|
||||
<option name="showLibraryContents" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"RunOnceActivity.OpenProjectViewOnStart": "true",
|
||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||
"WebServerToolWindowFactoryState": "false",
|
||||
"dart.analysis.tool.window.visible": "false",
|
||||
"git-widget-placeholder": "main",
|
||||
"last_opened_file_path": "/home/walamana/Downloads/minis-new/public/src/components",
|
||||
"node.js.detected.package.eslint": "true",
|
||||
"node.js.detected.package.tslint": "true",
|
||||
"node.js.selected.package.eslint": "(autodetect)",
|
||||
"node.js.selected.package.tslint": "(autodetect)",
|
||||
"nodejs_package_manager_path": "npm",
|
||||
"settings.editor.selected.configurable": "preferences.sourceCode.Vue template",
|
||||
"show.migrate.to.gradle.popup": "false",
|
||||
"ts.external.directory.path": "/home/walamana/.local/share/JetBrains/Toolbox/apps/webstorm/plugins/javascript-impl/jsLanguageServicesImpl/external",
|
||||
"vue.rearranger.settings.migration": "true"
|
||||
}
|
||||
}]]></component>
|
||||
<component name="RecentsManager">
|
||||
<key name="CopyFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/public/src/components" />
|
||||
</key>
|
||||
<key name="MoveFile.RECENT_KEYS">
|
||||
<recent name="$PROJECT_DIR$/private" />
|
||||
<recent name="$PROJECT_DIR$/public" />
|
||||
</key>
|
||||
</component>
|
||||
<component name="RunManager">
|
||||
<configuration name="127.0.0.1:5173" type="JavascriptDebugType" temporary="true" nameIsGenerated="true" uri="http://127.0.0.1:5173/">
|
||||
<method v="2" />
|
||||
</configuration>
|
||||
<recent_temporary>
|
||||
<list>
|
||||
<item itemvalue="JavaScript Debug.127.0.0.1:5173" />
|
||||
</list>
|
||||
</recent_temporary>
|
||||
</component>
|
||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
||||
<component name="TaskManager">
|
||||
<task active="true" id="Default" summary="Default task">
|
||||
<changelist id="044f5e0b-f7e9-49a6-8711-2e70fc13421a" name="Changes" comment="" />
|
||||
<created>1692006861820</created>
|
||||
<option name="number" value="Default" />
|
||||
<option name="presentableId" value="Default" />
|
||||
<updated>1692006861820</updated>
|
||||
<workItem from="1692006862848" duration="1992000" />
|
||||
<workItem from="1692103466622" duration="6951000" />
|
||||
<workItem from="1693329006582" duration="96000" />
|
||||
<workItem from="1693329193330" duration="30000" />
|
||||
<workItem from="1693507301727" duration="9142000" />
|
||||
<workItem from="1694893166755" duration="393000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TypeScriptGeneratedFilesManager">
|
||||
<option name="version" value="3" />
|
||||
</component>
|
||||
<component name="Vcs.Log.Tabs.Properties">
|
||||
<option name="TAB_STATES">
|
||||
<map>
|
||||
<entry key="MAIN">
|
||||
<value>
|
||||
<State />
|
||||
</value>
|
||||
</entry>
|
||||
</map>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
Loading…
Reference in New Issue
Block a user