First commit for private-chats-Feature

AnthyG · Apr 14, 2017 · e32cbec · e32cbec
1 parent 4fc0f95
commit e32cbec
Show file tree

Hide file tree

Showing 6 changed files with 1,295 additions and 121 deletions.
diff --git a/css/all.css b/css/all.css
@@ -1588,12 +1588,13 @@ ul.unstyled {
     padding-top: 4.4rem;
 }
 
-#main-tabs>div[tab="Home"] {
+#main-tabs>div[tab="Lobby"],
+#main-tabs>div[tab="PrivateChat"] {
     /*margin-top: 4.4rem;*/
     height: 100vh;
 }
 
-#messages {
+.message-list {
     margin-left: 0px;
     /*height: 75vh;
     overflow-y: overlay;
@@ -1610,11 +1611,11 @@ ul.unstyled {
     position: absolute;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content {
+.message-list>li>ul.times-messages>li>.tile>.tile-content {
     position: relative;
 }
 
-#messages[design-type]>li>ul.times-messages>li>.tile>.tile-content:before {
+.message-list[design-type]>li>ul.times-messages>li>.tile>.tile-content:before {
     content: " ";
     position: absolute;
     top: 0px;
@@ -1627,65 +1628,65 @@ ul.unstyled {
     z-index: 1;
 }
 
-#messages[design-type]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
+.message-list[design-type]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
     right: 0px;
     left: initial;
 }
 
-#messages[design-type="3"]>li>ul.times-messages>li>.tile>.tile-content:before {
+.message-list[design-type="3"]>li>ul.times-messages>li>.tile>.tile-content:before {
     top: 22px;
     left: 2px;
 }
 
-#messages[design-type="3"]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
+.message-list[design-type="3"]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
     right: 2px
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card {
     max-width: 50rem;
     padding-left: 1rem;
     padding-right: 1rem;
     /*width: 100%;*/
     display: table;
 }
 
-#messages>li>ul.times-messages>li:not([users-own-message="true"])>.tile>.tile-content>.card {
+.message-list>li>ul.times-messages>li:not([users-own-message="true"])>.tile>.tile-content>.card {
     margin-right: auto;
 }
 
-#messages>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content>.card {
+.message-list>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content>.card {
     margin-left: auto;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body {
     /*white-space: pre-line;*/
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:first-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:first-child {
     margin-top: 0;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:last-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:last-child {
     margin-bottom: 0px;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>p:only-child>img.emojione:only-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>p:only-child>img.emojione:only-child {
     font-size: xx-large;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-footer:last-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-footer:last-child {
     padding-bottom: 0;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card .tile-subtitle>a.message-timestamp {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card .tile-subtitle>a.message-timestamp {
     color: #1c2429;
 }
 
 .times-messages {
     margin-left: 0px;
 }
 
-#messagesAt {
+.message-listAt {
     top: 50px;
     left: 50%;
     z-index: 998;
@@ -1774,7 +1775,7 @@ body>*>*>*>*::-webkit-scrollbar-thumb {
     background-color: pink !important;
 }
 
-#messages::-webkit-scrollbar-thumb {
+.message-list::-webkit-scrollbar-thumb {
     background: purple !important;
 }
 

diff --git a/css/zstyle.css b/css/zstyle.css
@@ -76,12 +76,13 @@ ul.unstyled {
     padding-top: 4.4rem;
 }
 
-#main-tabs>div[tab="Home"] {
+#main-tabs>div[tab="Lobby"],
+#main-tabs>div[tab="PrivateChat"] {
     /*margin-top: 4.4rem;*/
     height: 100vh;
 }
 
-#messages {
+.message-list {
     margin-left: 0px;
     /*height: 75vh;
     overflow-y: overlay;
@@ -98,11 +99,11 @@ ul.unstyled {
     position: absolute;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content {
+.message-list>li>ul.times-messages>li>.tile>.tile-content {
     position: relative;
 }
 
-#messages[design-type]>li>ul.times-messages>li>.tile>.tile-content:before {
+.message-list[design-type]>li>ul.times-messages>li>.tile>.tile-content:before {
     content: " ";
     position: absolute;
     top: 0px;
@@ -115,65 +116,65 @@ ul.unstyled {
     z-index: 1;
 }
 
-#messages[design-type]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
+.message-list[design-type]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
     right: 0px;
     left: initial;
 }
 
-#messages[design-type="3"]>li>ul.times-messages>li>.tile>.tile-content:before {
+.message-list[design-type="3"]>li>ul.times-messages>li>.tile>.tile-content:before {
     top: 22px;
     left: 2px;
 }
 
-#messages[design-type="3"]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
+.message-list[design-type="3"]>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content:before {
     right: 2px
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card {
     max-width: 50rem;
     padding-left: 1rem;
     padding-right: 1rem;
     /*width: 100%;*/
     display: table;
 }
 
-#messages>li>ul.times-messages>li:not([users-own-message="true"])>.tile>.tile-content>.card {
+.message-list>li>ul.times-messages>li:not([users-own-message="true"])>.tile>.tile-content>.card {
     margin-right: auto;
 }
 
-#messages>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content>.card {
+.message-list>li>ul.times-messages>li[users-own-message="true"]>.tile>.tile-content>.card {
     margin-left: auto;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body {
     /*white-space: pre-line;*/
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:first-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:first-child {
     margin-top: 0;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:last-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>*:last-child {
     margin-bottom: 0px;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>p:only-child>img.emojione:only-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-body>p:only-child>img.emojione:only-child {
     font-size: xx-large;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card>.card-footer:last-child {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card>.card-footer:last-child {
     padding-bottom: 0;
 }
 
-#messages>li>ul.times-messages>li>.tile>.tile-content>.card .tile-subtitle>a.message-timestamp {
+.message-list>li>ul.times-messages>li>.tile>.tile-content>.card .tile-subtitle>a.message-timestamp {
     color: #1c2429;
 }
 
 .times-messages {
     margin-left: 0px;
 }
 
-#messagesAt {
+.message-listAt {
     top: 50px;
     left: 50%;
     z-index: 998;
@@ -262,7 +263,7 @@ body>*>*>*>*::-webkit-scrollbar-thumb {
     background-color: pink !important;
 }
 
-#messages::-webkit-scrollbar-thumb {
+.message-list::-webkit-scrollbar-thumb {
     background: purple !important;
 }
 

diff --git a/dbschema.json b/dbschema.json
@@ -1,6 +1,6 @@
 {
-    "db_name": "Da_Net",
-    "db_file": "data/da_net.db",
+    "db_name": "ThunderWave",
+    "db_file": "data/ThunderWave.db",
     "version": 2,
     "maps": {
         "users/.+/data.json": {
@@ -11,10 +11,15 @@
                 {
                     "node": "images",
                     "table": "images"
+                },
+                {
+                    "node": "private_messages",
+                    "table": "private_messages"
                 }
             ],
             "to_keyvalue": [
-                "last_seen"
+                "last_seen",
+                "public_key"
             ]
         },
         "users/.+/content.json": {
@@ -37,23 +42,32 @@
         },
         "messages": {
             "cols": [
-                ["message_id", "INTEGER PRIMARY KEY"],
+                ["message_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
                 ["body", "TEXT"],
                 ["date_added", "INTEGER"],
                 ["json_id", "INTEGER REFERENCES json (json_id)"]
             ],
             "indexes": ["CREATE UNIQUE INDEX message_key ON messages(json_id, date_added)"],
-            "schema_changed": 16
+            "schema_changed": 17
+        },
+        "private_messages": {
+            "cols": [
+                ["message_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
+                ["message", "TEXT"],
+                ["json_id", "INTEGER REFERENCES json (json_id)"]
+            ],
+            "indexes": ["CREATE UNIQUE INDEX private_message_key ON private_messages(json_id, message_id)"],
+            "schema_changed": 6
         },
         "images": {
             "cols": [
-                ["image_id", "INTEGER PRIMARY KEY"],
+                ["image_id", "INTEGER PRIMARY KEY AUTOINCREMENT"],
                 ["file_name", "TEXT"],
                 ["date_added", "INTEGER"],
                 ["json_id", "INTEGER REFERENCES json (json_id)"]
             ],
             "indexes": ["CREATE UNIQUE INDEX image_key ON images(json_id, date_added)"],
-            "schema_changed": 6
+            "schema_changed": 7
         }
     }
 }