Merge pull request #10 from Luuk2016/develop

Last changes

ikwambe-foundation-ios/Assets.xcassets/child-water-2.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "child-water-2.jpg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/child-water.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "child-water.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/current-situation-1.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "current-situation-1.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/current-situation-2.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "current-situation-2.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/foundation-feliciana.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "feliciana.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/foundation-jeroen.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "jeroen.jpg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/foundation-max.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "max.jpeg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/foundation-pascalle.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "pascalle.jpeg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/foundation-stephen.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "stephen.jpg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/ikwambe-people.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ikwambe-people-1.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/ikwambe-stories.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "ikwambe-stories.jpg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Assets.xcassets/people-behind-the-foundation.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "people-behind-the-foundation.jpg",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ikwambe-foundation-ios/Info.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UIStatusBarStyle</key>
+	<string>UIStatusBarStyleDefault</string>
+	<key>UIViewControllerBasedStatusBarAppearance</key>
+	<false/>
+</dict>
+</plist>

ikwambe-foundation-ios/Localizable.strings

@@ -0,0 +1,153 @@
+/* 
+  Localizable.strings
+  ikwambe-foundation-ios
+
+  Created by Luuk Kenselaar on 09/12/2021.
+
+*/
+
+"water-pump" = "Water pump";
+
+"help-to-build" = "Help to build a water pump";
+
+"by-making-a-donation" = "By making a donation to the foundation, you can help us with building a water pump.";
+
+"at-this-moment" = "At this moment, drinking water isn't available in the village of Ikwambe";
+
+"stories-from-ikwambe" = "Stories from Ikwambe";
+
+"first-name" = "First name";
+
+"last-name" = "Last name";
+
+"email" = "Email address";
+
+"password" = "Password";
+
+"confirm-password" = "Confirm your password";
+
+"register" = "Register";
+
+"login" = "Login";
+
+"message" = "Message";
+
+"login-failed" = "Login has failed, please try again";
+
+"welcome-back" = "Welcome back!";
+
+"do-i-need-account" = "Do I need an account?";
+
+"account-explanation" = "An account is fully optional. \nWith an account you can keep track of your donations.";
+
+"stay-up-to-date" = "Stay up-to-date";
+
+"receive-notifications" = "Receive push notifications";
+
+"my-donations" = "My donations";
+
+"no-donations-found" = "No donations have been found";
+
+"profile" = "Profile";
+
+"refresh" = "Refresh";
+
+"logout" = "Logout";
+
+"loading-donations" = "Loading donations";
+
+"build-a-water-pump" = "Build a water pump";
+
+"overview" = "Overview";
+
+"project-overview" = "It is the first step towards the big challenges. Ikwambe is a small village in Tanzania. There is no water source at all, no dispenser, no electricity. But people live there and must survive every day.";
+
+"milestones" = "Milestones";
+
+"project-milestones" = "Project milestones";
+
+"donations" = "Donations";
+
+"the-current-situation" = "The current situation";
+
+"current-situation" = "Current situation";
+
+"read-more" = "Read more";
+
+"thank-you-for-helping" = "Thank you for helping";
+
+"your-money" = "Your money will be used to\nsupport the build of the \nwater pump.";
+
+"keep-me-up-to-date" = "Keep me up-to-date";
+
+"spread-the-word" = "Spread the word";
+
+"continue" = "Continue";
+
+"donate" = "Donate";
+
+"summary" = "Summary";
+
+"you-donated" = "You donated";
+
+"leave-a-message" = "Leave a message behind (optional)";
+
+"please-note-public" = "Please note that this will be public";
+
+"your-name" = "Your name";
+
+"your-message" = "Your message";
+
+"by-donating" = "By donating, you will help to bring clean water to Ikwambe. Please select an amount below:";
+
+"other" = "Other";
+
+"loading-payment" = "Loading payment, please wait";
+
+"who-we-are" = "Who we are";
+
+"who-we-are-text" = "The initiative to help out the villages of Ikwambe and Nangonji came from our own chairwoman, Feliciana.\n\nFeliciana was born and raised in Ikwambe, therefor she has experienced the problems that exist in the village";
+
+"our-board-members" = "Our board members";
+
+"loading-image" = "Loading image";
+
+"a-story-by" = "A story by ";
+
+"stories-from-ikwambe" = "Stories from Ikwambe";
+
+"stories-from-ikwambe-text" = "Be surprised by the most unique, moving or telling stories of the Ikwambe Foundation.\nRead their stories here.";
+
+"loading-stories" = "Loading stories";
+
+"x-people-are-already-helping" = "people are already helping";
+
+"help-now" = "Help now";
+
+"loading-project" = "Loading project";
+
+"the-people-behind-the-foundation" = "The people behind the foundation";
+
+"current-situation-story" = "Ikwambe has so called seasonal rivers, in the dry season there is very limited access to water
+
+Furthermore there is limited access to clean water all year long.
+
+Few people can boil (dirty) water for drinking. The rest use it only for other domestic purposes.
+
+The other option is to walk 3 to 5 km (to and from) to the neighboring village of Sululu, where there is a pumping well.
+
+However, the villagers are limited by the amount of water they can carry.
+
+Obtaining this water is the work of women and children.";
+
+"milestone-1" = "[Milestone 1]";
+
+"milestone-1-text" = "€6.875: When we reach this goal we can start with:";
+
+"milestone-2" = "[Milestone 2]";
+
+"milestone-2-text" = "€13.750: When we reach this goal we can start with:";
+
+"milestone-3" = "[Milestone 3]";
+
+"milestone-3-text" = "€20.635: When we reach this goal we can start with:";

ikwambe-foundation-ios/ikwambe_foundation_iosApp.swift

@@ -9,9 +9,36 @@ import SwiftUI
 
 @main
 struct ikwambe_foundation_iosApp: App {
+    init() {
+        UINavigationBar.appearance().setBackgroundImage(UIImage(), for: .default)
+    }
     var body: some Scene {
         WindowGroup {
-            ContentView()
+            TabView {
+                NavigationView {
+                    ContentView()
+                }.tabItem {
+                    Label("The Foundation", systemImage: "house.fill")
+                }
+
+                NavigationView {
+                    ProjectView()
+                }.tabItem {
+                    Label("Projects", systemImage: "heart")
+                }
+
+                NavigationView {
+                    StoriesListView()
+                }.tabItem {
+                    Label("Stories", systemImage: "person.2")
+                }
+
+                NavigationView {
+                    ProfileView()
+                }.tabItem {
+                    Label("Profile", systemImage: "person")
+                }
+            }
         }
     }
 }

ikwambe-foundation-ios/model/donation/CreateDonationRequest.swift

@@ -0,0 +1,16 @@
+//
+//  CreateDonationRequest.swift
+//  ikwambe-foundation-ios
+//
+//  Created by Luuk Kenselaar on 12/01/2022.
+//
+
+import Foundation
+
+struct CreateDonationRequest: Encodable {
+    let userId: String
+    let projectId: String
+    let transactionId: String
+    let comment: String
+    let name: String
+}