v0.0.3 twa sys

TWA-App/wwwroot/js/libs/js-AElementFixed.js

@@ -28,10 +28,10 @@ export default class AElementFixed extends window.AObject {
         this._snapLoopId = null;   // rAF: monitor chạm đáy CHA khi đang snap
         this._needIntroPose = true;// hiệu ứng intro khi snap
         this._snapWidth = null;    // lock width (px) khi portal
-        this._isInit = false;
+
         this._bind();
+        this._initObservers();
         this._onResize();
-     
     }
 
     update(opts = {}) {
@@ -59,17 +59,10 @@ export default class AElementFixed extends window.AObject {
 
     _onResize() {
         const desktop = window.innerWidth >= this.o.breakpoint;
-        if (desktop) {
+        if (!desktop) {
-            if (!this._isInit) {
-                this._initObservers();
-                this._isInit = true;
-            }
-        } else {
-            this._isInit = false;
             this._stopInViewLoop();
             this._stopSnapMonitor();
             this._unsnapAbsolute();
-            this._teardownObservers();
         }
     }
 
@@ -109,6 +102,7 @@ export default class AElementFixed extends window.AObject {
                     const vpBottom = e.rootBounds ? e.rootBounds.bottom : document.documentElement.clientHeight;
                     const EPS = 0.75;
                     if (e.isIntersecting) {
+                        console.log(e.target.style.bottom);
                         if (e.target.style.bottom === '0px') {
                             this._startInViewLoop();
 
@@ -264,7 +258,7 @@ export default class AElementFixed extends window.AObject {
         this.el.style.left = '';
         this.el.style.top = '';
         this.el.style.bottom = '';
-        this.el.style.width = '';
+
         this._restoreToHostBeforeProbe();
     }
 }

TWASys-App/DBModels/SotrageModel/Files.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class Files
     {

TWASys-App/DBModels/SotrageModel/Folder.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class Folder
     {

TWASys-App/DBModels/SotrageModel/Folders_has_StorageArea.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class Folders_has_StorageArea
     {

TWASys-App/DBModels/SotrageModel/LocalServer.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class LocalServer
     {

TWASys-App/DBModels/SotrageModel/MicrosoftAccount.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class MicrosoftAccount
     {

TWASys-App/DBModels/SotrageModel/RefreshToken.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class RefreshToken
     {

TWASys-App/DBModels/SotrageModel/RefreshToken_Log.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class RefreshToken_Log
     {

TWASys-App/DBModels/SotrageModel/ServerAuthorization.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class ServerAuthorization
     {
@@ -12,11 +12,11 @@ namespace TWASys_App.DBModels
         [ForeignKey("IdStorageServer")]
         public long IdStorageServer { get; set; }
         public DateTime CreateDate { get; set; }
-        public int Count { get; set; }
+        public int Count { get; set; }     
         public int Status { get; set; }
 
         [NotMapped()]
-        public ICollection<ServerAuthorization_has_Token> Tokens { get; set; } = new List<ServerAuthorization_has_Token>();
+        public ICollection<Token> Tokens { get; set; } = new List<Token>();
 
         [NotMapped()]
         public ICollection<RefreshToken> RefreshTokens { get; set; } = new List<RefreshToken>();   

TWASys-App/DBModels/SotrageModel/ServerAuthorization_has_Token.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class ServerAuthorization_has_Token
     {

TWASys-App/DBModels/SotrageModel/StorageArea.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class StorageArea
     {

TWASys-App/DBModels/SotrageModel/StorageArea_has_StorageServer.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class StorageArea_has_StorageServer
     {

TWASys-App/DBModels/SotrageModel/StorageServer.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class StorageServer
     {

TWASys-App/DBModels/SotrageModel/StorageServer_has_LocalServer.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class StorageServer_has_LocalServer
     {

TWASys-App/DBModels/SotrageModel/StorageServer_has_MicrosoftAccount.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class StorageServer_has_MicrosoftAccount
     {

TWASys-App/DBModels/SotrageModel/StorageServers_ValidationDomain.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class StorageServers_ValidationDomain
     {

TWASys-App/DBModels/SotrageModel/SyncFile_Log.cs

@@ -1,7 +1,7 @@
 using Microsoft.AspNetCore.Mvc.Filters;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class SyncFile_Log
     {

TWASys-App/DBModels/SotrageModel/Token.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class Token
     {

TWASys-App/DBModels/SotrageModel/TypeStorageServer.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class TypeStorageServer
     {

TWASys-App/DBModels/SotrageModel/ValidationDomain.cs

@@ -1,7 +1,7 @@
-    using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace TWASys_App.DBModels
+namespace TWASys_App.DBModels.SotrageModel
 {
     public class ValidationDomain
     {

TWASys-App/Models/StorageModel.cs

@@ -6,10 +6,12 @@ using Microsoft.AspNetCore.Razor.Language.Intermediate;
 using Microsoft.VisualBasic;
 using MySqlConnector;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System.Data.Common;
 using System.Xml.Linq;
 using TWASys_App.Dapper.AExtentions;
 using TWASys_App.DBModels;
+using TWASys_App.DBModels.SotrageModel;
 
 namespace TWASys_App.Models
 {
@@ -24,7 +26,7 @@ namespace TWASys_App.Models
 
         public ICollection<ValidationDomain> ValidationDomains { set; get; } = new List<ValidationDomain>();
 
-        public int Size { set; get; };
+        public int Size { set; get; }
         public string IpPublic { set; get; } = "";
 
         public string IpPrivatev4 { set; get; } = "";
@@ -208,6 +210,37 @@ namespace TWASys_App.Models
             throw new NotImplementedException();
         }
 
+        private void ProccessToken(Dictionary<long, ServerAuthorization> dict, IList<dynamic> tokens, bool isToken =true)
+        {
+            foreach (dynamic token in tokens)
+            {
+                if (dict.ContainsKey(token.idServerAuthorization))
+                {
+                    ServerAuthorization tm;
+                    if (dict.TryGetValue(token.idServerAuthorization, out tm))
+                    {
+                        if (isToken)
+                        {
+                            tm.Tokens.Add(new Token { IdToken = token.idToken, AccessToken = token.accessToken, CreateDate = token.createDate, ExpireDate = token.expireDate });
+                        }
+                        else
+                        {
+                            tm.RefreshTokens.Add(new RefreshToken { });
+                        }
+                    }
+                }
+                else
+                {
+                    var tmp = new ServerAuthorization
+                    {
+                        IdServerAuthorization = token.idServerAuthorization
+                    };
+                    tmp.Tokens.Add(new Token { IdToken = token.idToken, AccessToken = token.accessToken });
+                    dict.TryAdd(token.idServerAuthorization, tmp);
+                }
+            }
+        }
+
         public async Task<MessageHeader> UpdateStorageSize()
         {
             var fMess = new MessageHeader();
@@ -228,7 +261,9 @@ namespace TWASys_App.Models
                             SELECT
                               sa.idServerAuthorization,
                               st.idToken,
-                              t.accessToken
+                              t.accessToken,
+                              t.createDate,
+                              t.expireDate
                             FROM sa_need sa
                             JOIN maxc m ON m.idServerAuthorization = sa.idServerAuthorization
                             JOIN ServerAuthorization_has_Token st 
@@ -254,8 +289,13 @@ namespace TWASys_App.Models
                 await con.OpenAsync();
                 using var trans = await con.BeginTransactionAsync();
                 using var multi = await con.QueryMultipleAsync(sql, new { size = Size, id = IdStorageServer }, trans);
+               
                 IList<dynamic> tokens = (await multi.ReadAsync()).AsList();
                 IList<dynamic> rTokens = (await multi.ReadAsync()).AsList();
+                Dictionary<long, ServerAuthorization> dict = new Dictionary<long, ServerAuthorization>();
+                ProccessToken(dict, tokens);
+                ProccessToken(dict, rTokens, false);
+
                 using (var writer = new StreamWriter(Path.GetFullPath("Json/dataServer.json"), false))
                 {
                     await writer.WriteAsync(JsonConvert.SerializeObject(new

TWASys-App/Models/TypeStorageServerModel.cs

@@ -6,6 +6,7 @@ using MySqlConnector;
 using Newtonsoft.Json;
 using System.ComponentModel.DataAnnotations;
 using System.Data.Common;
+using TWASys_App.DBModels.SotrageModel;
 
 namespace TWASys_App.Models
 {

TWASys-App/Models/ValidationDomainModel.cs

@@ -6,6 +6,7 @@ using Microsoft.AspNetCore.Mvc;
 using MySqlConnector;
 using Newtonsoft.Json;
 using System.Data.Common;
+using TWASys_App.DBModels.SotrageModel;
 
 namespace TWASys_App.Models
 {

TWASys-App/TWASys-App.csproj

@@ -53,4 +53,8 @@
 		</None>
 	</ItemGroup>
 
+	<ItemGroup>
+	  <Folder Include="DBModels\WebAppModel\" />
+	</ItemGroup>
+
 </Project>