Merge pull request #44 from jogboms/develop

feat: 0.1.0

.gitignore

@@ -15,7 +15,7 @@ doc/api/
 .atom/
 .dart_tool/
 .idea
-.vscode/
 ios/.generated/
 packages
 .flutter-plugins
+.log

.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [{
+    "name": "Flutter",
+    "type": "dart",
+    "request": "launch",
+    "args": [
+      "--flavor=development"
+    ],
+    "program": "lib/main.dart"
+  }]
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "editor.codeActionsOnSave": {
+    "source.organizeImports": true
+  }
+}

README.md

@@ -1,8 +1,24 @@
+<img src="./assets/images/logo.png" style="margin: auto" width="90" />
+
 # TailorMade
 
-A Flutter experiment.
+A Flutter experiment for managing a Fashion designer's daily routine. Logo, Design & Concept by Me.
+
+> Android-only support
+
+## Tools
 
-## UI Shots (so far)
+1.  Firebase Auth
+2.  Firebase Cloud Firestore
+3.  Firebase Cloud Functions
+4.  Firebase Storage
+5.  RxDart
+6.  Redux
+7.  Redux Epics
+
+For a full description of OSS used, see pubspec.yaml
+
+## UI Shots
 
 <div style="text-align: center">
   <table>
@@ -64,6 +80,15 @@ A Flutter experiment.
       <td style="text-align: center">
         <img src="./screenshots/ss17.png" width="200" />
       </td>
+      <td style="text-align: center">
+        <img src="./screenshots/ss18.png" width="200" />
+      </td>
+      <td style="text-align: center">
+        <img src="./screenshots/ss19.png" width="200" />
+      </td>
+      <td style="text-align: center">
+        <img src="./screenshots/ss20.png" width="200" />
+      </td>
     </tr>
   </table>
 </div>

TASKS.todo

@@ -1,8 +1,9 @@
 PENDING:
+☐ remodel w/ authID
 ☐ delete-able payment
 ☐ delete-able images
 ☐ implement share payment + image
-
+☐ filter + search jobs & contacts
 
 COMPLETED:
   ✔ update stats db on creation @high @done(18-07-10 16:39)

android/.gitignore

@@ -8,3 +8,4 @@
 /build
 /captures
 GeneratedPluginRegistrant.java
+google-services.json

android/app/build.gradle

@@ -37,6 +37,19 @@ android {
             signingConfig signingConfigs.debug
         }
     }
+
+    flavorDimensions "flavor-type"
+
+    productFlavors {
+        development {
+            dimension "flavor-type"
+            applicationIdSuffix ".dev"
+            versionNameSuffix "-dev"
+        }
+        production {
+            dimension "flavor-type"
+        }
+    }
 }
 
 flutter {

android/app/src/main/res/drawable/launch_background.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Modify this file to customize your launch splash screen -->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@android:color/white" />
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" android:gravity="fill">
+  <!-- You can insert your own image assets here -->
+  <item android:drawable="@mipmap/pattern" />
 
-    <!-- You can insert your own image assets here -->
-    <!-- <item>
-        <bitmap
-            android:gravity="center"
-            android:src="@mipmap/launch_image" />
-    </item> -->
+  <item>
+    <bitmap android:gravity="center" android:src="@mipmap/logo" />
+  </item>
 </layer-list>

functions/functions/src/fn/auth.ts

@@ -0,0 +1,52 @@
+import { firestore as Firestore } from "firebase-admin";
+import { auth, EventContext } from "firebase-functions";
+import { ChangeState } from "../utils";
+
+export function _onAuth(onCreate: ChangeState) {
+  return async (user: auth.UserRecord, context: EventContext) => {
+    const db = Firestore();
+    const batch = db.batch();
+
+    const account = db.collection("accounts").doc(user.uid);
+    batch.set(account, {
+      storeName: user.displayName,
+      uid: user.uid,
+      email: user.email,
+      displayName: user.displayName,
+      phoneNumber: user.phoneNumber,
+      photoURL: user.photoURL
+    });
+
+    const stats = db.collection("stats").doc(user.uid);
+    batch.set(stats, {
+      contacts: {
+        total: 0
+      },
+      gallery: {
+        total: 0
+      },
+      jobs: {
+        total: 0,
+        pending: 0,
+        completed: 0
+      },
+      payments: {
+        total: 0,
+        pending: 0,
+        completed: 0
+      }
+    });
+
+    // Commit the batch
+    return batch.commit();
+  };
+}
+
+export function onAuthCreate(onCreate: ChangeState) {
+  const store = auth.user();
+
+  // return onCreate == ChangeState.Create
+  //   ? store.onCreate(_onAuth(onCreate))
+  //   : store.onDelete(_onAuth(onCreate));
+  return store.onCreate(_onAuth(onCreate));
+}

functions/functions/src/fn/stats_contacts.ts

@@ -1,15 +1,16 @@
 import { firestore as Firestore } from "firebase-admin";
 import { EventContext, firestore } from "firebase-functions";
 import { isArray } from "util";
+import { ChangeState } from "../utils";
 
-export function _onStatsContacts(onCreate: boolean) {
+export function _onStatsContacts(onCreate: ChangeState) {
   return async (
     snapshot: firestore.DocumentSnapshot,
     context: EventContext
   ) => {
     const db = Firestore();
-    const stats = db.doc("stats/current");
     const contact = snapshot.data();
+    const stats = db.doc(`stats/${contact.userID}`);
 
     const statsSnap = await stats.get();
 
@@ -25,10 +26,10 @@ export function _onStatsContacts(onCreate: boolean) {
   };
 }
 
-export function onStatsContacts(onCreate = true) {
+export function onStatsContacts(onCreate: ChangeState) {
   const store = firestore.document("contacts/{contactId}");
 
-  return onCreate
+  return onCreate === ChangeState.Created
     ? store.onCreate(_onStatsContacts(onCreate))
     : store.onDelete(_onStatsContacts(onCreate));
 }

functions/functions/src/fn/stats_jobs.ts

@@ -1,14 +1,35 @@
 import * as admin from "firebase-admin";
 import { Change, EventContext, firestore } from "firebase-functions";
+import { isArray } from "util";
+import { ChangeState } from "../utils";
 
-async function _onStatsJob(
+// TODO
+// Maybe not the best way to go about this
+async function _onStatsJobUpdate(
   change: Change<firestore.DocumentSnapshot>,
   context: EventContext
+) {
+  const jobs = change.before.exists ? change.before : change.after;
+
+  return _onStatsJob(jobs, context);
+}
+
+async function _onStatsJob(
+  snapshot: firestore.DocumentSnapshot,
+  context: EventContext
 ) {
   const db = admin.firestore();
-  const stats = db.doc("stats/current");
+  const _data = snapshot.data();
+
+  // Get user ID from Job
+  const userID = isArray(_data) ? _data[0].userID : _data.userID;
+
+  const stats = db.doc(`stats/${userID}`);
 
-  const jobsSnap = await db.collection("jobs").get();
+  const jobsSnap = await db
+    .collection("jobs")
+    .where("userID", "==", userID)
+    .get();
 
   let completedJob = 0,
     pendingJob = 0,
@@ -46,6 +67,14 @@ async function _onStatsJob(
   });
 }
 
-export const onStatsJob = firestore
-  .document("jobs/{jobId}")
-  .onWrite(_onStatsJob);
+export function onStatsJob(change: ChangeState) {
+  const store = firestore.document("jobs/{jobId}");
+
+  if (change === ChangeState.Created) {
+    return store.onCreate(_onStatsJob);
+  } else if (change === ChangeState.Updated) {
+    return store.onUpdate(_onStatsJobUpdate);
+  } else {
+    return store.onDelete(_onStatsJob);
+  }
+}

functions/functions/src/index.ts

@@ -1,21 +1,29 @@
 import { initializeApp } from "firebase-admin";
 import { config } from "firebase-functions";
+import { onAuthCreate } from "./fn/auth";
 import { onContactStats } from "./fn/contact_stats";
 import { onJobPayments } from "./fn/job_payments";
 import { onPaymentGallery } from "./fn/payment_gallery";
 import { onStatsContacts } from "./fn/stats_contacts";
 import { onStatsJob } from "./fn/stats_jobs";
+import { ChangeState } from "./utils";
 
 initializeApp(config().firebase);
 
+export const AuthCreate = onAuthCreate(ChangeState.Created);
+
 export const PaymentGallery = onPaymentGallery;
 
 export const JobPayments = onJobPayments;
 
-export const StatsJobs = onStatsJob;
+export const StatsJobsCreate = onStatsJob(ChangeState.Created);
+
+export const StatsJobsUpdate = onStatsJob(ChangeState.Updated);
+
+export const StatsJobsDelete = onStatsJob(ChangeState.Deleted);
 
-export const StatsContactsCreate = onStatsContacts();
+export const StatsContactsCreate = onStatsContacts(ChangeState.Created);
 
-export const StatsContactsDelete = onStatsContacts(false);
+export const StatsContactsDelete = onStatsContacts(ChangeState.Deleted);
 
 export const ContactStats = onContactStats;

functions/functions/src/utils.ts

@@ -0,0 +1,5 @@
+export enum ChangeState {
+  Created,
+  Updated,
+  Deleted
+}