Skip to content
Snippets Groups Projects

WishListPage and OfferPage UI done.

Merged fz2907 requested to merge sprint_1 into FlightTicket
32 files
+ 2187
170
Compare changes
  • Side-by-side
  • Inline
Files
32
+ 167
8
@@ -4,12 +4,17 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="b729e076-3c33-49b4-9d1d-ab622bea054d" name="Changes" comment="">
<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$/FrontendFolder/switch-room/package-lock.json" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/package-lock.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/package.json" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/package.json" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/components/HelloWorld.vue" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/components/HelloWorld.vue" afterDir="false" />
<change beforePath="$PROJECT_DIR$/FrontendFolder/switch-room/src/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/FrontendFolder/switch-room/src/main.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" />
@@ -21,10 +26,24 @@
<ProjectState />
</projectState>
</component>
<component name="ExternalProjectsManager">
<system id="GRADLE">
<state>
<projects_view>
<tree_state>
<expand />
<select />
</tree_state>
</projects_view>
</state>
</system>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
<option value="Vue Single File Component" />
<option value="Class" />
<option value="Interface" />
</list>
</option>
</component>
@@ -39,12 +58,16 @@
<component name="JpbToolWindowState">
<option name="myId2FirstActivated">
<map>
<entry key="com.haulmont.jpb.jpaInspector" value="true" />
<entry key="com.haulmont.jpb.jpaPalette" value="true" />
<entry key="com.haulmont.jpb.jpaStructure" value="true" />
</map>
</option>
<option name="myId2Visible">
<map>
<entry key="com.haulmont.jpb.jpaStructure" 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>
</component>
@@ -58,21 +81,29 @@
</component>
<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;D:\\Code\\switchroom\\FrontendFolder\\switch-room\\node_modules\\typescript\\lib&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 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" />
@@ -80,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">
@@ -90,7 +134,88 @@
<option name="presentableId" value="Default" />
<updated>1666106914172</updated>
<workItem from="1666119986712" duration="11363000" />
<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>
<option name="number" value="00001" />
<option name="presentableId" value="LOCAL-00001" />
<option name="project" value="LOCAL" />
<updated>1666204743977</updated>
</task>
<task id="LOCAL-00002" summary="WishListPage router done">
<created>1666205293096</created>
<option name="number" value="00002" />
<option name="presentableId" value="LOCAL-00002" />
<option name="project" value="LOCAL" />
<updated>1666205293096</updated>
</task>
<task id="LOCAL-00003" summary="WishListPage side list UI done">
<created>1666212401922</created>
<option name="number" value="00003" />
<option name="presentableId" value="LOCAL-00003" />
<option name="project" value="LOCAL" />
<updated>1666212401922</updated>
</task>
<task id="LOCAL-00004" summary="WishListPage whole UI done.">
<created>1666221207173</created>
<option name="number" value="00004" />
<option name="presentableId" value="LOCAL-00004" />
<option name="project" value="LOCAL" />
<updated>1666221207173</updated>
</task>
<task id="LOCAL-00005" summary="WishListPage whole UI done.">
<created>1666222640794</created>
<option name="number" value="00005" />
<option name="presentableId" value="LOCAL-00005" />
<option name="project" value="LOCAL" />
<updated>1666222640794</updated>
</task>
<task id="LOCAL-00006" summary="WishListPage and OfferPage UI done.&#10;But ref&lt;FormInstance&gt; has problem, need to check.">
<created>1666242778588</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1666242778588</updated>
</task>
<task id="LOCAL-00007" summary="WishListPage and OfferPage service done. Now move to backend service.">
<created>1666291059267</created>
<option name="number" value="00007" />
<option name="presentableId" value="LOCAL-00007" />
<option name="project" value="LOCAL" />
<updated>1666291059267</updated>
</task>
<task id="LOCAL-00008" summary="WishListPage and OfferPage service done. Now move to backend service.">
<created>1666291128623</created>
<option name="number" value="00008" />
<option name="presentableId" value="LOCAL-00008" />
<option name="project" value="LOCAL" />
<updated>1666291128623</updated>
</task>
<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">
@@ -111,4 +236,38 @@
</map>
</option>
</component>
<component name="VcsManagerConfiguration">
<MESSAGE value="Half done on offer page (Front)" />
<MESSAGE value="OfferPage.vue Done" />
<MESSAGE value="OfferPage.vue Done, starting WishListPage.vue" />
<MESSAGE value="WishListPage router done" />
<MESSAGE value="WishListPage side list UI done" />
<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." />
<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>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/OfferPageController.java</url>
<line>63</line>
<option name="timeStamp" value="8" />
</line-breakpoint>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/BackendFolder/SwitchRoom/src/main/java/vt/CS5934/SwitchRoom/controllers/OfferPageController.java</url>
<line>46</line>
<option name="timeStamp" value="9" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
</component>
<component name="XSLT-Support.FileAssociations.UIState">
<expand />
<select />
</component>
</project>
\ No newline at end of file
Loading