Skip to content

Commit

Permalink
update: charityPage
Browse files Browse the repository at this point in the history
  • Loading branch information
cathrkri committed Mar 11, 2026
1 parent 2816849 commit 40148b4
Show file tree
Hide file tree
Showing 2 changed files with 135 additions and 27 deletions.
162 changes: 135 additions & 27 deletions helpmehelpapplication/src/main/resources/fxml/charityPage.fxml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@
<?import javafx.scene.layout.ColumnConstraints?>
<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.Pane?>
<?import javafx.scene.layout.RowConstraints?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Arc?>
<?import javafx.scene.shape.Circle?>
<?import javafx.scene.shape.Rectangle?>
<?import javafx.scene.text.Font?>
Expand Down Expand Up @@ -162,7 +164,7 @@
GridPane.rowIndex="0">

<children>
<VBox alignment="TOP_CENTER" spacing="35.0">
<VBox alignment="TOP_CENTER" spacing="28.0">
<padding>
<Insets top="160.0" />
</padding>
Expand All @@ -186,9 +188,9 @@
</font>
</Hyperlink>

<VBox spacing="25.0">
<VBox spacing="22.0">
<padding>
<Insets top="40.0" />
<Insets top="55.0" />
</padding>

<children>
Expand Down Expand Up @@ -220,24 +222,27 @@
<GridPane prefWidth="900.0"
style="-fx-background-color: #F5F5F5;"
GridPane.columnIndex="1"
GridPane.rowIndex="0">
GridPane.rowIndex="0"
hgap="20.0"
vgap="18.0">

<columnConstraints>
<ColumnConstraints percentWidth="55.0" />
<ColumnConstraints percentWidth="45.0" />
</columnConstraints>

<rowConstraints>
<RowConstraints percentHeight="22.0" />
<RowConstraints percentHeight="43.0" />
<RowConstraints percentHeight="35.0" />
<RowConstraints percentHeight="24.0" />
<RowConstraints percentHeight="46.0" />
<RowConstraints percentHeight="30.0" />
</rowConstraints>

<children>

<!-- TOP LEFT INFO -->
<GridPane GridPane.columnIndex="0"
GridPane.rowIndex="0">
GridPane.rowIndex="0"
vgap="14.0">

<rowConstraints>
<RowConstraints percentHeight="45.0" />
Expand Down Expand Up @@ -305,7 +310,7 @@
pickOnBounds="true"
preserveRatio="true">
<image>
<Image url="@../images/img.png" />
<Image url="@../images/leggTilBilde.jpg" />
</image>
</ImageView>
</children>
Expand All @@ -317,14 +322,22 @@
GridPane.rowIndex="1">

<children>
<Rectangle arcHeight="25.0"
arcWidth="25.0"
fill="#F5F5F5"
height="360.0"
stroke="#8B8B8B"
strokeType="INSIDE"
width="780.0" />

<ScrollPane fitToWidth="true"
prefHeight="330.0"
prefHeight="340.0"
prefWidth="760.0"
style="-fx-background:#F5F5F5; -fx-background-color:#F5F5F5;">
<content>
<TextArea text="[Summary about the charity]"
wrapText="true"
prefHeight="330.0"
prefHeight="340.0"
prefWidth="760.0"
style="-fx-background-radius:25; -fx-border-radius:25; -fx-control-inner-background:#F5F5F5; -fx-font-size:16px;" />
</content>
Expand All @@ -335,7 +348,9 @@
<!-- STATS -->
<GridPane GridPane.columnIndex="0"
GridPane.columnSpan="2"
GridPane.rowIndex="2">
GridPane.rowIndex="2"
hgap="30.0"
style="-fx-padding: 10 0 0 0;">

<columnConstraints>
<ColumnConstraints percentWidth="33.33" />
Expand All @@ -345,61 +360,154 @@

<children>

<VBox alignment="CENTER" spacing="10.0" GridPane.columnIndex="0">
<!-- 97,4 % -->
<VBox alignment="CENTER" spacing="12.0" GridPane.columnIndex="0">
<children>
<Label text="Innsamlingsprosent">
<font>
<Font name="System Bold" size="16.0" />
</font>
</Label>
<StackPane>

<StackPane prefWidth="100.0" prefHeight="100.0"
minWidth="100.0" minHeight="100.0"
maxWidth="100.0" maxHeight="100.0"
alignment="CENTER">
<children>
<Circle fill="WHITE" radius="36.0" stroke="#D83A32" strokeWidth="8.0" />
<Label text="97,4%">

<Pane prefWidth="100.0" prefHeight="100.0"
minWidth="100.0" minHeight="100.0"
maxWidth="100.0" maxHeight="100.0">
<children>
<Circle centerX="50.0"
centerY="50.0"
radius="38.0"
fill="TRANSPARENT"
stroke="#F1DADA"
strokeWidth="8.0" />

<Arc centerX="50.0"
centerY="50.0"
radiusX="38.0"
radiusY="38.0"
startAngle="90.0"
length="-350.64"
stroke="#D83A32"
strokeWidth="8.0"
strokeLineCap="BUTT"
fill="TRANSPARENT"
type="OPEN" />
</children>
</Pane>

<Label text="97,4%" StackPane.alignment="CENTER">
<font>
<Font name="System Bold" size="14.0" />
<Font name="System Bold" size="16.0" />
</font>
</Label>

</children>
</StackPane>
</children>
</VBox>

<VBox alignment="CENTER" spacing="10.0" GridPane.columnIndex="1">
<!-- 3,2 % -->
<VBox alignment="CENTER" spacing="12.0" GridPane.columnIndex="1">
<children>
<Label text="Administrasjonsprosent">
<font>
<Font name="System Bold" size="16.0" />
</font>
</Label>
<StackPane>

<StackPane prefWidth="100.0" prefHeight="100.0"
minWidth="100.0" minHeight="100.0"
maxWidth="100.0" maxHeight="100.0"
alignment="CENTER">
<children>
<Circle fill="WHITE" radius="36.0" stroke="#F1DADA" strokeWidth="8.0" />
<Label text="3,2%">

<Pane prefWidth="100.0" prefHeight="100.0"
minWidth="100.0" minHeight="100.0"
maxWidth="100.0" maxHeight="100.0">
<children>
<Circle centerX="50.0"
centerY="50.0"
radius="38.0"
fill="TRANSPARENT"
stroke="#F1DADA"
strokeWidth="8.0" />

<Arc centerX="50.0"
centerY="50.0"
radiusX="38.0"
radiusY="38.0"
startAngle="90.0"
length="-11.52"
stroke="#D83A32"
strokeWidth="8.0"
strokeLineCap="BUTT"
fill="TRANSPARENT"
type="OPEN" />
</children>
</Pane>

<Label text="3,2%" StackPane.alignment="CENTER">
<font>
<Font name="System Bold" size="14.0" />
<Font name="System Bold" size="16.0" />
</font>
</Label>

</children>
</StackPane>
</children>
</VBox>

<VBox alignment="CENTER" spacing="10.0" GridPane.columnIndex="2">
<!-- 93,3 % -->
<VBox alignment="CENTER" spacing="12.0" GridPane.columnIndex="2">
<children>
<Label text="Formålsprosent">
<font>
<Font name="System Bold" size="16.0" />
</font>
</Label>
<StackPane>

<StackPane prefWidth="100.0" prefHeight="100.0"
minWidth="100.0" minHeight="100.0"
maxWidth="100.0" maxHeight="100.0"
alignment="CENTER">
<children>
<Circle fill="WHITE" radius="36.0" stroke="#D83A32" strokeWidth="8.0" />
<Label text="93,3%">

<Pane prefWidth="100.0" prefHeight="100.0"
minWidth="100.0" minHeight="100.0"
maxWidth="100.0" maxHeight="100.0">
<children>
<Circle centerX="50.0"
centerY="50.0"
radius="38.0"
fill="TRANSPARENT"
stroke="#F1DADA"
strokeWidth="8.0" />

<Arc centerX="50.0"
centerY="50.0"
radiusX="38.0"
radiusY="38.0"
startAngle="90.0"
length="-335.88"
stroke="#D83A32"
strokeWidth="8.0"
strokeLineCap="BUTT"
fill="TRANSPARENT"
type="OPEN" />
</children>
</Pane>

<Label text="93,3%" StackPane.alignment="CENTER">
<font>
<Font name="System Bold" size="14.0" />
<Font name="System Bold" size="16.0" />
</font>
</Label>

</children>
</StackPane>
</children>
Expand Down
Binary file added helpmehelpapplication/src/main/resources/images/leggTilBilde.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 40148b4

Please sign in to comment.