Skip to content

Commit

Permalink
de filer som inte hade kommit med
Browse files Browse the repository at this point in the history
  • Loading branch information
@nilssonelin
nilssonelin committed May 10, 2021
1 parent b5392ab commit 9befc86
Show file tree
Hide file tree
Showing 4 changed files with 61 additions and 72 deletions.
Binary file modified out/production/iMatMini/imatmini/ProductPanel.class
View file
Binary file not shown.
102 changes: 39 additions & 63 deletions out/production/iMatMini/imatmini/iMatMini.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,77 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.geometry.Insets?>
<?import javafx.scene.control.Button?>
<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.ScrollPane?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.control.SplitPane?>
<?import javafx.scene.control.ToolBar?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.FlowPane?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.text.Font?>

<AnchorPane id="AnchorPane" prefHeight="560.0" prefWidth="720.0" xmlns="http://javafx.com/javafx/8.0.141" xmlns:fx="http://javafx.com/fxml/1" fx:controller="imatmini.iMatMiniController">
<AnchorPane id="AnchorPane" maxHeight="720.0" maxWidth="1280.0" prefHeight="720.0" prefWidth="1280.0" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1" fx:controller="imatmini.iMatMiniController">
<children>
<StackPane prefHeight="560.0" prefWidth="720.0">
<StackPane prefHeight="720.0" prefWidth="1281.0">
<children>
<AnchorPane fx:id="accountPane" prefHeight="200.0" prefWidth="200.0" style="-fx-background-color: rgba(0, 0, 0, 0.75);">
<AnchorPane prefHeight="719.0" prefWidth="1282.0">
<children>
<AnchorPane layoutX="138.0" layoutY="136.0" prefHeight="289.0" prefWidth="444.0" style="-fx-background-color: #e0e0e0;">
<children>
<Label layoutX="135.0" layoutY="56.0" text="Korttyp:" textAlignment="RIGHT" />
<Label layoutX="105.0" layoutY="98.0" text="Kortnummer:" textAlignment="RIGHT" />
<Label layoutX="36.0" layoutY="136.0" text="Kortinnehavarens namn:" textAlignment="RIGHT" />
<Label layoutX="84.0" layoutY="173.0" text="Giltighetsdatum:" textAlignment="RIGHT" />
<Label layoutX="154.0" layoutY="210.0" text="CVC:" textAlignment="RIGHT" />
<ComboBox fx:id="cardTypeCombo" layoutX="193.0" layoutY="51.0" prefWidth="150.0" />
<TextField fx:id="numberTextField" layoutX="193.0" layoutY="93.0" prefHeight="27.0" prefWidth="150.0" promptText="1234123412341234" />
<TextField fx:id="nameTextField" layoutX="193.0" layoutY="131.0" prefHeight="27.0" prefWidth="235.0" promptText="Förnamn Efternamn" />
<ComboBox fx:id="monthCombo" layoutX="193.0" layoutY="168.0" prefHeight="27.0" prefWidth="64.0" promptText="04" />
<ComboBox fx:id="yearCombo" layoutX="279.0" layoutY="168.0" prefHeight="27.0" prefWidth="64.0" promptText="18" />
<Label layoutX="266.0" layoutY="173.0" text="/" textAlignment="RIGHT" />
<TextField fx:id="cvcField" layoutX="196.0" layoutY="205.0" prefHeight="27.0" prefWidth="43.0" promptText="123" />
<Label fx:id="purchasesLabel" layoutX="14.0" layoutY="258.0" text="3747 tidigare inköp hos iMat" />
<Button layoutX="388.0" layoutY="253.0" mnemonicParsing="false" onAction="#handleDoneAction" text="Klar" />
<Label layoutX="14.0" layoutY="14.0" text="Kunduppgifter">
<font>
<Font name="System Bold" size="16.0" />
</font>
</Label>
</children>
</AnchorPane>
</children>
</AnchorPane>
<AnchorPane fx:id="shopPane" prefHeight="240.0" prefWidth="720.0" style="-fx-background-color: #FFF000;">
<children>
<AnchorPane prefHeight="102.0" prefWidth="720.0" style="-fx-background-color: #ff6600;">
<children>
<TextField fx:id="searchField" layoutX="150.0" layoutY="34.0" prefHeight="35.0" prefWidth="476.0" promptText="Sök vara">
<font>
<Font size="18.0" />
</font>
</TextField>
<Button layoutX="634.0" layoutY="38.0" mnemonicParsing="false" onAction="#handleSearchAction" text="Sök" AnchorPane.rightAnchor="30.0" />
<Button layoutX="27.0" layoutY="34.0" mnemonicParsing="false" onAction="#handleShowAccountAction" text="iMat Mini">
<font>
<Font size="18.0" />
</font>
</Button>
</children>
</AnchorPane>
<AnchorPane layoutY="501.0" prefHeight="59.0" prefWidth="720.0" style="-fx-background-color: #ff6600;">
<children>
<Button layoutX="14.0" layoutY="16.0" mnemonicParsing="false" onAction="#handleClearCartAction" text="Töm" />
<Button layoutX="663.0" layoutY="16.0" mnemonicParsing="false" onAction="#handleBuyItemsAction" text="Köp" />
<Label fx:id="itemsLabel" layoutX="139.0" layoutY="21.0" prefHeight="17.0" prefWidth="150.0" text="Antal varor: 3456" />
<Label fx:id="costLabel" layoutX="479.0" layoutY="21.0" text="Kostnad: 3456.60" />
</children>
</AnchorPane>
<ScrollPane hbarPolicy="NEVER" layoutY="102.0" prefHeight="398.0" prefWidth="720.0" vbarPolicy="ALWAYS" AnchorPane.bottomAnchor="60.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="102.0">
<content>
<FlowPane fx:id="productsFlowPane" prefHeight="395.0" prefWidth="718.0" style="-fx-background-color: #5e6d70;" vgap="4.0" />
</content>
</ScrollPane>
<SplitPane disable="true" dividerPositions="0.75" layoutY="54.0" prefHeight="667.0" prefWidth="1282.0" AnchorPane.topAnchor="65.0">
<items>
<AnchorPane maxWidth="960.0" minHeight="0.0" minWidth="0.0" prefHeight="709.0" prefWidth="958.0">
<children>
<ScrollPane prefHeight="666.0" prefWidth="960.0">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0" />
</content>
</ScrollPane>
</children>
</AnchorPane>
<AnchorPane maxWidth="320.0" minHeight="0.0" minWidth="0.0" prefHeight="160.0" prefWidth="100.0">
<children>
<ScrollPane layoutX="-3.0" layoutY="12.0" prefHeight="518.0" prefWidth="322.0" AnchorPane.topAnchor="0.0">
<content>
<AnchorPane minHeight="0.0" minWidth="0.0" prefHeight="200.0" prefWidth="200.0" />
</content>
</ScrollPane>
</children>
</AnchorPane>
</items>
</SplitPane>
<ToolBar prefHeight="65.0" prefWidth="1282.0" AnchorPane.topAnchor="0.0">
<items>
<Button mnemonicParsing="false" text="Button" />
<Button mnemonicParsing="false" text="Button" />
<Button mnemonicParsing="false" text="Button" />
<Button mnemonicParsing="false" text="Button" />
</items>
</ToolBar>
</children>
<StackPane.margin>
<Insets />
</StackPane.margin>
</AnchorPane>
</children>
</StackPane>
Expand Down
Binary file modified out/production/iMatMini/imatmini/iMatMiniController.class
View file
Binary file not shown.
31 changes: 22 additions & 9 deletions src/imatmini/ProductPanel.fxml
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.Button?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.control.TextField?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.text.Font?>

<fx:root prefHeight="100.0" prefWidth="695.0" style="-fx-background-color: #ffffff;" type="javafx.scene.layout.AnchorPane" xmlns="http://javafx.com/javafx/15.0.1" xmlns:fx="http://javafx.com/fxml/1">
<fx:root maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="66.0" prefWidth="320.0" style="-fx-background-color: #ffffff;" type="javafx.scene.layout.AnchorPane" xmlns="http://javafx.com/javafx/16" xmlns:fx="http://javafx.com/fxml/1">
<children>
<ImageView fx:id="imageView" fitHeight="75.0" fitWidth="100.0" layoutX="14.0" layoutY="19.0" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="14.0" AnchorPane.leftAnchor="14.0" AnchorPane.topAnchor="14.0" />
<Button layoutX="614.0" layoutY="38.0" mnemonicParsing="false" onAction="#handleAddAction" text="Lägg till" AnchorPane.rightAnchor="14.0" />
<Label fx:id="nameLabel" layoutX="133.0" layoutY="14.0" text="Mellanmjök fin produkt för allt möjligt" AnchorPane.leftAnchor="133.0">
<ImageView fx:id="imageView" fitHeight="44.0" fitWidth="62.0" layoutX="6.0" layoutY="11.0" pickOnBounds="true" preserveRatio="true" AnchorPane.bottomAnchor="11.0" AnchorPane.leftAnchor="6.0" AnchorPane.topAnchor="11.0">
<image>
<Image url="@../../../../.dat215/imat/images/product_1.jpg" />
</image></ImageView>
<Label fx:id="nameLabel" layoutX="72.0" layoutY="9.0" prefHeight="19.0" prefWidth="82.0" text="Mellanmjök fin produkt för allt möjligt" AnchorPane.leftAnchor="72.0">
<font>
<Font size="18.0" />
<Font size="16.0" />
</font>
</Label>
<Label fx:id="prizeLabel" layoutX="133.0" layoutY="57.0" text="437,50 per förpackning" />
<Label fx:id="ecoLabel" layoutX="528.0" layoutY="57.0" text="Ekologisk" textFill="#5cc343">
<Label fx:id="prizeLabel" layoutX="246.0" layoutY="22.0" prefHeight="18.0" prefWidth="58.0" text="437,50 per förpackning">
<font>
<Font name="System Bold" size="13.0" />
<Font size="16.0" />
</font></Label>
<ImageView fitHeight="18.0" fitWidth="18.0" layoutX="71.0" layoutY="39.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../../Bilder%20till%20iMat/minus.png" />
</image>
</ImageView>
<ImageView fitHeight="20.0" fitWidth="19.0" layoutX="134.0" layoutY="39.0" pickOnBounds="true" preserveRatio="true">
<image>
<Image url="@../../../Bilder%20till%20iMat/minus.png" />
</image>
</ImageView>
<TextField layoutX="95.0" layoutY="35.0" prefHeight="26.0" prefWidth="32.0" />
</children>
</fx:root>

0 comments on commit 9befc86

Please sign in to comment.