|
|
@@ -10,12 +10,24 @@
|
|
|
</component>
|
|
|
<component name="ChangeListManager">
|
|
|
<list default="true" id="8315de53-8c15-472c-a710-45938463dc02" name="Changes" comment="RIFFMASTER: add frontend files">
|
|
|
+ <change afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/proxy.conf.json" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/0.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/0.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/1.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/1.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/10.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/10.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/11.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/11.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/4.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/4.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/5.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/5.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/6.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/6.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/7.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/7.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/8.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/8.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/9.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/9.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack.old" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.angular/cache/16.0.4/angular-webpack/9163ed2c587ff4665fb17ea4ebc8750a69df1e73/index.pack.old" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/.idea/workspace.xml" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/angular.json" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/angular.json" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app-routing.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app-routing.module.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/app.module.ts" afterDir="false" />
|
|
|
- <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/login-page/login-page.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/login-page/login-page.component.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/Services/auth.service.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/Services/auth.service.ts" afterDir="false" />
|
|
|
<change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/login-page/login-page.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/login-page/login-page.component.ts" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.html" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../../Frontend/RiffMasterFront/src/app/main-page/main-page.component.ts" afterDir="false" />
|
|
|
</list>
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
|
@@ -27,6 +39,7 @@
|
|
|
<list>
|
|
|
<option value="Interface" />
|
|
|
<option value="Class" />
|
|
|
+ <option value="Jsp File" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
@@ -53,41 +66,42 @@
|
|
|
<option name="hideEmptyMiddlePackages" value="true" />
|
|
|
<option name="showLibraryContents" value="true" />
|
|
|
</component>
|
|
|
- <component name="PropertiesComponent">{
|
|
|
- "keyToString": {
|
|
|
- "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
- "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
- "SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
|
- "WebServerToolWindowFactoryState": "false",
|
|
|
- "last_opened_file_path": "C:/Users/Quba/Desktop/studia/WPFt/RiffMaster project/Frontend/RiffMasterFront",
|
|
|
- "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",
|
|
|
- "project.structure.last.edited": "Artifacts",
|
|
|
- "project.structure.proportion": "0.15",
|
|
|
- "project.structure.side.proportion": "0.2",
|
|
|
- "settings.editor.selected.configurable": "preferences.editor",
|
|
|
- "spring.configuration.checksum": "38008dd81c2f4d7985ecf6e0ce8af1d1",
|
|
|
- "vue.rearranger.settings.migration": "true"
|
|
|
+ <component name="PropertiesComponent"><![CDATA[{
|
|
|
+ "keyToString": {
|
|
|
+ "RunOnceActivity.OpenProjectViewOnStart": "true",
|
|
|
+ "RunOnceActivity.ShowReadmeOnStart": "true",
|
|
|
+ "SHARE_PROJECT_CONFIGURATION_FILES": "true",
|
|
|
+ "WebServerToolWindowFactoryState": "false",
|
|
|
+ "last_opened_file_path": "C:/Users/Kuba/Desktop/studia/WPFt/inne/oslo_boating_project/boat-reservation-logic",
|
|
|
+ "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",
|
|
|
+ "project.structure.last.edited": "Artifacts",
|
|
|
+ "project.structure.proportion": "0.15",
|
|
|
+ "project.structure.side.proportion": "0.2",
|
|
|
+ "settings.editor.selected.configurable": "reference.settings.project.maven.repository.indices",
|
|
|
+ "spring.configuration.checksum": "38008dd81c2f4d7985ecf6e0ce8af1d1",
|
|
|
+ "vue.rearranger.settings.migration": "true"
|
|
|
}
|
|
|
-}</component>
|
|
|
+}]]></component>
|
|
|
<component name="RecentsManager">
|
|
|
<key name="CopyFile.RECENT_KEYS">
|
|
|
+ <recent name="C:\Users\Kuba\Desktop\studia\WPFt\RiffMaster web application\Backend\Spring\src\main\java\pl\dmcs\jwoszczyk\RiffMaster" />
|
|
|
<recent name="C:\Users\Quba\Desktop\studia\WPFt\Spring\src\main\java\pl\dmcs\jwoszczyk" />
|
|
|
<recent name="C:\Users\Quba\Desktop\studia\WPFt\Spring\src\main\webapp\resources" />
|
|
|
<recent name="C:\Users\Quba\Desktop\studia\WPFt\Spring\src\main\java\pl\dmcs\jwoszczyk\configuration" />
|
|
|
<recent name="C:\Users\Quba\Desktop\studia\WPFt\Spring\src\main\webapp" />
|
|
|
- <recent name="C:\Users\Quba\Desktop\studia\WPFt\Spring\src\main" />
|
|
|
</key>
|
|
|
<key name="MoveFile.RECENT_KEYS">
|
|
|
+ <recent name="C:\Users\Kuba\Desktop\studia\WPFt\RiffMaster web application\Backend\Spring\src\main\webapp" />
|
|
|
<recent name="C:\Users\Quba\Desktop\studia\WPFt\Spring\src\main\webapp" />
|
|
|
</key>
|
|
|
<key name="CopyClassDialog.RECENTS_KEY">
|
|
|
+ <recent name="pl.dmcs.jwoszczyk.configuration" />
|
|
|
<recent name="pl.dmcs.jwoszczyk.domain" />
|
|
|
<recent name="pl.dmcs.jwoszczyk.service" />
|
|
|
- <recent name="pl.dmcs.jwoszczyk.configuration" />
|
|
|
<recent name="pl.dmcs.jwoszczyk.controller" />
|
|
|
<recent name="pl.dmcs.jwoszczyk.repository" />
|
|
|
</key>
|
|
|
@@ -211,6 +225,8 @@
|
|
|
<workItem from="1686583836581" duration="9870000" />
|
|
|
<workItem from="1686678540338" duration="5114000" />
|
|
|
<workItem from="1686746351506" duration="5669000" />
|
|
|
+ <workItem from="1686758960546" duration="5072000" />
|
|
|
+ <workItem from="1686767581715" duration="4619000" />
|
|
|
</task>
|
|
|
<task id="LOCAL-00001" summary="add basic hello world and transfering data to server">
|
|
|
<created>1679575346987</created>
|