alexis.drai
/
EShop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🙈 Update gitignore

Browse Source
main
Alexis Drai 3 years ago
parent 51f6444e86
commit fe110224fa
16 changed files with 20 additions and 51 deletions
Show Stats Download Patch File Download Diff File

37
.idea/workspace.xml
Unescape View File

@ -4,23 +4,14 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="39201d7d-d87b-4c10-b0b0-e462b4f0b033" name="Changes" comment=":construction: Set up View and VM">
<change afterPath="$PROJECT_DIR$/resources/fxml/ProductCreationWindow.fxml" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/view/ProductCell.java" afterDir="false" />
<change afterPath="$PROJECT_DIR$/src/view/ProductCreationWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/view/MainWindow$1.class" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/view/MainWindow.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/view/MainWindow.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/viewmodel/ShopVM.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/viewmodel/ShopVM.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/resources/fxml/MainWindow.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/resources/fxml/MainWindow.fxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Garment.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Garment.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Product.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Product.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/model/Shop.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/model/Shop.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/view/MainWindow.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/view/MainWindow.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/viewmodel/GarmentVM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/viewmodel/GarmentVM.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/viewmodel/PerfumeVM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/viewmodel/PerfumeVM.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/viewmodel/ProductVM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/viewmodel/ProductVM.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/viewmodel/ShopVM.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/viewmodel/ShopVM.java" afterDir="false" />
<list default="true" id="39201d7d-d87b-4c10-b0b0-e462b4f0b033" name="Changes" comment=":construction: WIP">
<change beforePath="$PROJECT_DIR$/out/production/EShop/fxml/MainWindow.fxml" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/fxml/MainWindow.fxml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/model/Garment.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/model/Garment.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/model/Product.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/model/Product.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/model/Shop.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/model/Shop.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/viewmodel/GarmentVM.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/viewmodel/GarmentVM.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/viewmodel/PerfumeVM.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/viewmodel/PerfumeVM.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/out/production/EShop/viewmodel/ProductVM.class" beforeDir="false" afterPath="$PROJECT_DIR$/out/production/EShop/viewmodel/ProductVM.class" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -129,7 +120,14 @@
<option name="project" value="LOCAL" />
<updated>1665149326100</updated>
</task>
<option name="localTasksCounter" value="6" />
<task id="LOCAL-00006" summary=":construction: WIP">
<created>1665408691947</created>
<option name="number" value="00006" />
<option name="presentableId" value="LOCAL-00006" />
<option name="project" value="LOCAL" />
<updated>1665408691947</updated>
</task>
<option name="localTasksCounter" value="7" />
<servers />
</component>
<component name="Vcs.Log.Tabs.Properties">
@ -147,6 +145,7 @@
<MESSAGE value=":truck: Set up main window" />
<MESSAGE value=":necktie: Code the model" />
<MESSAGE value=":construction: Set up View and VM" />
<option name="LAST_COMMIT_MESSAGE" value=":construction: Set up View and VM" />
<MESSAGE value=":construction: WIP" />
<option name="LAST_COMMIT_MESSAGE" value=":construction: WIP" />
</component>
</project>

2
gitignore
Unescape View File

@ -51,6 +51,8 @@ cmake-build-*/
*.iws
# IntelliJ
out/*
*/out/
out/
# mpeltonen/sbt-idea plugin

BIN
out/production/EShop/data/Loadable.class
View File

Binary file not shown.

BIN
out/production/EShop/data/Stub.class
View File

Binary file not shown.

32
out/production/EShop/fxml/MainWindow.fxml
Unescape View File

@ -1,32 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<BorderPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml"
fx:controller="view.MainWindow">
<center>
<VBox>
<!-- drop down menu (choose category)-->
<ListView fx:id="productsVMLV"/>
<Button onAction="#addGarment" text="Add garment"/>
<Button onAction="#addPerfume" text="Add perfume"/>
<Button onAction="#removeProduct" text="Remove product"/>
</VBox>
</center>
<right>
<VBox>
<Label text="name"/>
<TextField fx:id="nameTF"/>
<Label text="price"/>
<TextField fx:id="priceTF"/>
<HBox fx:id="detailHBox"/>
</VBox>
</right>
</BorderPane>

BIN
out/production/EShop/launcher/Launcher.class
View File

Binary file not shown.

BIN
out/production/EShop/model/Garment.class
View File

Binary file not shown.

BIN
out/production/EShop/model/Perfume.class
View File

Binary file not shown.

BIN
out/production/EShop/model/Product.class
View File

Binary file not shown.

BIN
out/production/EShop/model/Shop.class
View File

Binary file not shown.

BIN
out/production/EShop/util/Size.class
View File

Binary file not shown.

BIN
out/production/EShop/view/MainWindow.class
View File

Binary file not shown.

BIN
out/production/EShop/viewmodel/GarmentVM.class
View File

Binary file not shown.

BIN
out/production/EShop/viewmodel/PerfumeVM.class
View File

Binary file not shown.

BIN
out/production/EShop/viewmodel/ProductVM.class
View File

Binary file not shown.

BIN
out/production/EShop/viewmodel/ShopVM.class
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save