Skip to content
Snippets Groups Projects

WishlistPage related basic service done.

Merged WishlistPage related basic service done.
sprint_1_offer_wishlist_page into sprint_1
Merged fz2907 requested to merge sprint_1_offer_wishlist_page into sprint_1
Compare
and
21 files
+ 548
− 125
Compare changes
  • Side-by-side
  • Inline
Files
21
.idea/workspace.xml
+ 80
− 41
@@ -4,18 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b729e076-3c33-49b4-9d1d-ab622bea054d" name="Changes" comment="WishListPage and OfferPage service done. Now move to backend service.">
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/OfferPageController.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/dbIdClass/UserOfferTableId.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/models/UserOfferModel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/UserOfferRepository.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/services/OfferPageService.java" afterDir="false" />
<list default="true" id="b729e076-3c33-49b4-9d1d-ab622bea054d" name="Changes" comment="Add the missing file">
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/models/UserOfferWishlistLookUpModel.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/UserOfferWishlistLookUpRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/ExampleRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/ExampleRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/components/OfferPage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/components/OfferPage.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/models/OfferFormModel.ts" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/models/OfferFormModel.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/services/OfferPageService.ts" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/services/OfferPageService.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/services/ServerHttpService.ts" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/services/ServerHttpService.ts" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/WishlistPageController.java" beforeDir="false" afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/WishlistPageController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/dbIdClass/WishlistItemTableId.java" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/models/WishlistItemModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/models/WishlistItemModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/WishlistItemRepository.java" beforeDir="false" afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/repositories/WishlistItemRepository.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/services/WishlistPageService.java" beforeDir="false" afterPath="$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/services/WishlistPageService.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/components/WishlistPage.vue" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/components/WishlistPage.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/services/WishlistService.ts" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/services/WishlistService.ts" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -44,13 +43,14 @@
<list>
<option value="Vue Single File Component" />
<option value="Class" />
<option value="Interface" />
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_BRANCH_BY_REPOSITORY">
<map>
<entry key="$PROJECT_DIR$" value="FlightTicket" />
<entry key="$PROJECT_DIR$" value="sprint_1" />
</map>
</option>
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -65,8 +65,8 @@
</option>
<option name="myId2Visible">
<map>
<entry key="com.haulmont.jpb.jpaInspector" value="true" />
<entry key="com.haulmont.jpb.jpaPalette" value="true" />
<entry key="com.haulmont.jpb.jpaInspector" value="false" />
<entry key="com.haulmont.jpb.jpaPalette" value="false" />
<entry key="com.haulmont.jpb.jpaStructure" value="false" />
</map>
</option>
@@ -79,31 +79,31 @@
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent"><![CDATA[{
"keyToString": {
"RequestMappingsPanelOrder0": "0",
"RequestMappingsPanelOrder1": "1",
"RequestMappingsPanelWidth0": "75",
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.OpenProjectViewOnStart": "true",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
"extract.method.default.visibility": "private",
"last_opened_file_path": "D:/Code/switchroom",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.standard": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
"node.js.selected.package.standard": "",
"node.js.selected.package.tslint": "(autodetect)",
"nodejs_package_manager_path": "npm",
"settings.editor.selected.configurable": "settings.javascript.linters.eslint",
"spring.configuration.checksum": "99fec119d6b1e29fa348378304c6feac",
"ts.external.directory.path": "C:\\Program Files\\JetBrains\\IntelliJ IDEA 2022.1\\plugins\\JavaScriptLanguage\\jsLanguageServicesImpl\\external",
"vue.rearranger.settings.migration": "true"
<component name="PropertiesComponent">{
&quot;keyToString&quot;: {
&quot;RequestMappingsPanelOrder0&quot;: &quot;0&quot;,
&quot;RequestMappingsPanelOrder1&quot;: &quot;1&quot;,
&quot;RequestMappingsPanelWidth0&quot;: &quot;75&quot;,
&quot;RequestMappingsPanelWidth1&quot;: &quot;75&quot;,
&quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
&quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
&quot;WebServerToolWindowFactoryState&quot;: &quot;false&quot;,
&quot;extract.method.default.visibility&quot;: &quot;private&quot;,
&quot;last_opened_file_path&quot;: &quot;D:/Code/switchroom&quot;,
&quot;node.js.detected.package.eslint&quot;: &quot;true&quot;,
&quot;node.js.detected.package.standard&quot;: &quot;true&quot;,
&quot;node.js.detected.package.tslint&quot;: &quot;true&quot;,
&quot;node.js.selected.package.eslint&quot;: &quot;(autodetect)&quot;,
&quot;node.js.selected.package.standard&quot;: &quot;&quot;,
&quot;node.js.selected.package.tslint&quot;: &quot;(autodetect)&quot;,
&quot;nodejs_package_manager_path&quot;: &quot;npm&quot;,
&quot;settings.editor.selected.configurable&quot;: &quot;settings.javascript.linters.eslint&quot;,
&quot;spring.configuration.checksum&quot;: &quot;99fec119d6b1e29fa348378304c6feac&quot;,
&quot;ts.external.directory.path&quot;: &quot;C:\\Program Files\\JetBrains\\IntelliJ IDEA 2022.1\\plugins\\JavaScriptLanguage\\jsLanguageServicesImpl\\external&quot;,
&quot;vue.rearranger.settings.migration&quot;: &quot;true&quot;
}
}]]></component>
<component name="RunManager">
}</component>
<component name="RunManager" selected="Spring Boot.SwitchRoomApplication">
<configuration name="SwitchRoomApplication" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
<module name="SwitchRoom.main" />
<option name="SPRING_BOOT_MAIN_CLASS" value="vt.CS5934.SwitchRoom.SwitchRoomApplication" />
@@ -111,6 +111,19 @@
<option name="Make" enabled="true" />
</method>
</configuration>
<configuration name="MySQL: Compose Deployment" type="docker-deploy" factoryName="docker-compose.yml" temporary="true" server-name="Docker">
<deployment type="docker-compose.yml">
<settings>
<option name="sourceFilePath" value="DataBaseFolder/MySQL/docker-compose.yml" />
</settings>
</deployment>
<method v="2" />
</configuration>
<recent_temporary>
<list>
<item itemvalue="Docker.MySQL: Compose Deployment" />
</list>
</recent_temporary>
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
@@ -121,7 +134,9 @@
<option name="presentableId" value="Default" />
<updated>1666106914172</updated>
<workItem from="1666119986712" duration="11363000" />
<workItem from="1666291741026" duration="20760000" />
<workItem from="1666291741026" duration="21503000" />
<workItem from="1666321431463" duration="9923000" />
<workItem from="1666369946833" duration="9884000" />
</task>
<task id="LOCAL-00001" summary="OfferPage.vue Done, starting WishListPage.vue">
<created>1666204743977</created>
@@ -179,7 +194,28 @@
<option name="project" value="LOCAL" />
<updated>1666291128623</updated>
</task>
<option name="localTasksCounter" value="9" />
<task id="LOCAL-00009" summary="OfferPage front and service connecting done.">
<created>1666320565262</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1666320565262</updated>
</task>
<task id="LOCAL-00010" summary="Change files so I can remerge the files">
<created>1666321888420</created>
<option name="number" value="00010" />
<option name="presentableId" value="LOCAL-00010" />
<option name="project" value="LOCAL" />
<updated>1666321888420</updated>
</task>
<task id="LOCAL-00011" summary="Add the missing file">
<created>1666322747091</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1666322747091</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -209,7 +245,10 @@
<MESSAGE value="WishListPage whole UI done." />
<MESSAGE value="WishListPage and OfferPage UI done.&#10;But ref&lt;FormInstance&gt; has problem, need to check." />
<MESSAGE value="WishListPage and OfferPage service done. Now move to backend service." />
<option name="LAST_COMMIT_MESSAGE" value="WishListPage and OfferPage service done. Now move to backend service." />
<MESSAGE value="OfferPage front and service connecting done." />
<MESSAGE value="Change files so I can remerge the files" />
<MESSAGE value="Add the missing file" />
<option name="LAST_COMMIT_MESSAGE" value="Add the missing file" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>