api/src/Server.hx

@@ -6,8 +6,6 @@ import haxe.Json;
 import tink.sql.drivers.Sqlite;
 import db.Db;
 
-import model.MUser;
-
 
 typedef T_project = {
     name : String,
@@ -48,7 +46,7 @@ class Root {
         var yeet = "yote";
         var driver = new tink.sql.drivers.Sqlite();
         @await var db = new Db('daba2', driver);
-        @await var one = db.MUser.create();
+        @await var one = db.User.create();
         @await var two = db.User.insertOne({
             id: cast null,
             name: 'Alice',

api/src/db/Db.hx

@@ -3,7 +3,7 @@ package db;
 // import tink.sql.drivers.Sqlite;
 //import tink.sql.Database;
 import tink.sql.Types;
-import model.MUser;
+import model.User;
 
 // import db.Models.User;
 

api/src/model/MService.hx

@@ -1,8 +0,0 @@
-package model;
-
-import tink.sql.Types;
-
-typedef MService = {
-    @:autoIncrement @:primary public var id(default, null):Id<MService>;
-    public var name:VarChar<50>;
-}

api/src/model/MUser.hx

@@ -1,12 +0,0 @@
-package model;
-
-import tink.sql.Types;
-import model.MService;
-
-typedef MUser = {
-    @:autoIncrement @:primary public var id(default, null):Id<MUser>;
-    public var name:VarChar<50>;
-    public var email:VarChar<50>;
-    public var password:VarChar<50>;
-    public var services:Id<MService>;
-}

api/src/model/User.hx

@@ -0,0 +1,11 @@
+package model;
+
+import tink.sql.Types;
+
+
+typedef User = {
+    @:autoIncrement @:primary public var id(default, null):Id<User>;
+    public var name:VarChar<50>;
+    public var email:VarChar<50>;
+    public var password:VarChar<50>;
+}

api/src/model/services/DrivebyCool.hx

@@ -1,18 +0,0 @@
-package model.sites.drivebycool;
-
-import tink.sql.Types;
-
-
-typedef MSubscription = {
-    @:autoIncrement @:primary public var id(default, null):Id<MSubscription>;
-    public var subscriber:VarChar<50>;
-    public var project:Id<MUser>;
-    public var subscribers:Id<Subscription>;
-}
-
-typedef MProject = {
-    @:autoIncrement @:primary public var id(default, null):Id<MProject>;
-    public var name:VarChar<50>;
-    public var owner:Id<MUser>;
-    public var subscribers:Id<Subscription>;
-}

api/src/model/services/ProjectTracker.hx

@@ -1,14 +0,0 @@
-package model.services;
-
-typedef MMembership = {
-    @:autoIncrement @:primary public var id(default, null):Id<MMembership>;
-    public var project:Id<MProject>;
-    public var user:Id<MUser>;
-}
-
-typedef MProject = {
-    @:autoIncrement @:primary public var id(default, null):Id<MProject>;
-    public var name:VarChar<50>;
-    public var owner:Id<MUser>;
-    public var members:Id<MMembership>;
-}