Update (#9)

* update 2021.04.14

* Cleaned

* update v1.4

* update v1.4.2

* update v1.4.5

Author: fenix-hub

main/scn/app/main.gd

@@ -27,6 +27,9 @@ func _ready():
             if child is Control: child.hide()
     if OS.get_name() in ["HTML5"]:
         topbar.hide()
+        get_parent().rect_position = Vector2(0,0)
+        get_parent().rect_size = OS.window_size
+        get_parent().rect_clip_content = true
     loading.set_loading(false)
     Activities.signin = Activities.signin_scene.instance()
     activities.add_child(Activities.signin)
@@ -48,17 +51,17 @@ func _on_signin_completed():
     activities.add_child(Activities.home)
 
 func _on_show_error(error : String):
-    error_container.set_size(Vector2())
+    error_lbl.set_size(Vector2())
     error_lbl.set_text(error)
-    animator.interpolate_property(error_container, "rect_position", 
-    Vector2(rect_size.x/2 - error_container.rect_size.x/2, rect_size.y + 10), 
-    Vector2(rect_size.x/2 - error_container.rect_size.x/2, rect_size.y - error_container.rect_size.y), 
+    animator.interpolate_property(error_lbl, "rect_position", 
+    Vector2(rect_size.x/2 - error_lbl.rect_size.x/2, rect_size.y + 10), 
+    Vector2(rect_size.x/2 - error_lbl.rect_size.x/2, rect_size.y - $Main.rect_position.y - error_lbl.rect_size.y - 20), 
     0.3, Tween.TRANS_QUAD, Tween.EASE_OUT)
     animator.start()
     yield(get_tree().create_timer(9), "timeout")
-    animator.interpolate_property(error_container, "rect_position", 
-    error_container.rect_position, 
-    Vector2(rect_size.x/2 - error_container.rect_size.x/2, rect_size.y + 10), 
+    animator.interpolate_property(error_lbl, "rect_position", 
+    error_lbl.rect_position, 
+    Vector2(rect_size.x/2 - error_lbl.rect_size.x/2, rect_size.y + 10), 
     0.3, Tween.TRANS_QUAD, Tween.EASE_OUT)
     animator.start()
 
@@ -75,11 +78,15 @@ func _on_TopBar_minimize():
 
 func _on_TopBar_resize():
     if OS.get_window_size().x <= 1024:
-        OS.set_window_size(OS.get_screen_size(0) - Vector2(0, 50))
+        get_parent().rect_position = Vector2(0,0)
         OS.set_window_position(Vector2.ZERO)
+        get_parent().rect_size+=Vector2(8,8)*2
+        OS.set_window_size(OS.get_screen_size(0) - Vector2(0, 50))
     else:
-        OS.set_window_size(Vector2(1024, 600))
+        get_parent().rect_position = Vector2(8,8)
         OS.set_window_position(OS.get_screen_size(0)/2 - OS.get_window_size()/2)        
+        get_parent().rect_size-=Vector2(8,8)*2
+        OS.set_window_size(Vector2(1024, 600))
 
 func _on_TopBar_moving_from_pos(event_pos : Vector2, offset : Vector2):
     if OS.get_window_size().x > 1024:

main/scn/app/main.tscn

@@ -8,14 +8,15 @@
 [ext_resource path="res://main/scripts/loading.gd" type="Script" id=8]
 
 [sub_resource type="StyleBoxFlat" id=1]
-bg_color = Color( 0.172549, 0.172549, 0.172549, 1 )
+bg_color = Color( 0.14902, 0.14902, 0.14902, 1 )
 border_blend = true
 corner_radius_top_left = 10
 corner_radius_top_right = 10
 corner_radius_bottom_right = 10
 corner_radius_bottom_left = 10
 corner_detail = 20
-shadow_color = Color( 0, 0, 0, 0.156863 )
+shadow_color = Color( 0, 0, 0, 0.0784314 )
+shadow_size = 5
 
 [sub_resource type="StyleBoxFlat" id=2]
 bg_color = Color( 0, 1, 0.486275, 1 )
@@ -79,7 +80,7 @@ content_margin_left = 10.0
 content_margin_right = 10.0
 content_margin_top = 7.0
 content_margin_bottom = 6.0
-bg_color = Color( 0, 0, 0, 0.313726 )
+bg_color = Color( 0, 0, 0, 0.745098 )
 corner_radius_top_left = 5
 corner_radius_top_right = 5
 corner_radius_bottom_right = 5
@@ -92,17 +93,21 @@ shadow_offset = Vector2( 0, 1 )
 [node name="AppContainer" type="PanelContainer"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-rect_clip_content = true
+margin_left = 8.0
+margin_top = 8.0
+margin_right = -8.0
+margin_bottom = -8.0
 custom_styles/panel = SubResource( 1 )
 __meta__ = {
 "_edit_use_anchors_": false
 }
 
 [node name="MainContainer" type="VBoxContainer" parent="."]
-margin_right = 1024.0
-margin_bottom = 600.0
+margin_right = 1008.0
+margin_bottom = 584.0
 grow_horizontal = 2
 grow_vertical = 2
+rect_clip_content = true
 size_flags_horizontal = 3
 size_flags_vertical = 3
 theme = ExtResource( 1 )
@@ -114,7 +119,7 @@ __meta__ = {
 }
 
 [node name="TopBar" type="HBoxContainer" parent="MainContainer"]
-margin_right = 1024.0
+margin_right = 1008.0
 margin_bottom = 35.0
 rect_min_size = Vector2( 0, 35 )
 size_flags_horizontal = 3
@@ -139,16 +144,16 @@ stretch_mode = 6
 [node name="Name" type="Label" parent="MainContainer/TopBar"]
 margin_left = 35.0
 margin_top = 4.0
-margin_right = 961.0
+margin_right = 945.0
 margin_bottom = 31.0
 mouse_filter = 1
 size_flags_horizontal = 3
 text = "socia.dot"
 
 [node name="MinimizeBtn" type="Button" parent="MainContainer/TopBar"]
-margin_left = 961.0
+margin_left = 945.0
 margin_top = 11.0
-margin_right = 974.0
+margin_right = 958.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 13, 13 )
 mouse_filter = 1
@@ -162,16 +167,16 @@ custom_styles/normal = SubResource( 3 )
 custom_fonts/font = SubResource( 4 )
 
 [node name="VSeparator4" type="VSeparator" parent="MainContainer/TopBar"]
-margin_left = 974.0
-margin_right = 981.0
+margin_left = 958.0
+margin_right = 965.0
 margin_bottom = 35.0
 mouse_filter = 1
 custom_constants/separation = 7
 
 [node name="ResizeBtn" type="Button" parent="MainContainer/TopBar"]
-margin_left = 981.0
+margin_left = 965.0
 margin_top = 11.0
-margin_right = 994.0
+margin_right = 978.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 13, 13 )
 mouse_filter = 1
@@ -185,16 +190,16 @@ custom_styles/normal = SubResource( 6 )
 custom_fonts/font = SubResource( 4 )
 
 [node name="VSeparator3" type="VSeparator" parent="MainContainer/TopBar"]
-margin_left = 994.0
-margin_right = 1001.0
+margin_left = 978.0
+margin_right = 985.0
 margin_bottom = 35.0
 mouse_filter = 1
 custom_constants/separation = 7
 
 [node name="ExitBtn" type="Button" parent="MainContainer/TopBar"]
-margin_left = 1001.0
+margin_left = 985.0
 margin_top = 11.0
-margin_right = 1014.0
+margin_right = 998.0
 margin_bottom = 24.0
 rect_min_size = Vector2( 13, 13 )
 mouse_filter = 1
@@ -208,8 +213,8 @@ custom_styles/normal = SubResource( 8 )
 custom_fonts/font = SubResource( 4 )
 
 [node name="VSeparator2" type="VSeparator" parent="MainContainer/TopBar"]
-margin_left = 1014.0
-margin_right = 1024.0
+margin_left = 998.0
+margin_right = 1008.0
 margin_bottom = 35.0
 mouse_filter = 1
 custom_constants/separation = 10
@@ -218,19 +223,12 @@ custom_constants/separation = 10
 
 [node name="Main" type="Control" parent="MainContainer"]
 margin_top = 35.0
-margin_right = 1024.0
-margin_bottom = 600.0
+margin_right = 1008.0
+margin_bottom = 584.0
+rect_clip_content = true
 size_flags_horizontal = 3
 size_flags_vertical = 3
 
-[node name="ColorRect" type="ColorRect" parent="MainContainer/Main"]
-anchor_right = 1.0
-anchor_bottom = 1.0
-color = Color( 0.12549, 0.12549, 0.12549, 1 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="Activities" type="Control" parent="MainContainer/Main"]
 anchor_right = 1.0
 anchor_bottom = 1.0
@@ -241,6 +239,7 @@ __meta__ = {
 }
 
 [node name="Loading" type="Control" parent="MainContainer/Main"]
+visible = false
 anchor_right = 1.0
 anchor_bottom = 1.0
 rect_clip_content = true
@@ -281,38 +280,6 @@ __meta__ = {
 [node name="Timer" type="Timer" parent="MainContainer/Main/Loading"]
 wait_time = 0.7
 
-[node name="ErrorContainer" type="AspectRatioContainer" parent="MainContainer/Main"]
-anchor_left = 0.5
-anchor_top = 1.0
-anchor_right = 0.5
-anchor_bottom = 1.0
-margin_left = -250.0
-margin_top = 8.0
-margin_right = 250.0
-margin_bottom = 40.0
-size_flags_horizontal = 0
-size_flags_vertical = 0
-alignment_vertical = 0
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="ERROR" type="Label" parent="MainContainer/Main/ErrorContainer"]
-margin_right = 500.0
-margin_bottom = 32.0
-grow_horizontal = 2
-rect_min_size = Vector2( 500, 0 )
-size_flags_horizontal = 3
-custom_styles/normal = SubResource( 9 )
-custom_colors/font_color = Color( 1, 0, 0.235294, 1 )
-align = 1
-autowrap = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Tween" type="Tween" parent="MainContainer/Main"]
-
 [node name="AppInfo" type="HBoxContainer" parent="MainContainer/Main"]
 modulate = Color( 1, 1, 1, 0.235294 )
 anchor_top = 1.0
@@ -331,7 +298,28 @@ margin_bottom = 27.0
 
 [node name="UserId" type="Label" parent="MainContainer/Main/AppInfo"]
 margin_left = 18.0
-margin_right = 1024.0
+margin_right = 1008.0
 margin_bottom = 27.0
 size_flags_horizontal = 3
 align = 2
+
+[node name="ERROR" type="Label" parent="MainContainer/Main"]
+anchor_top = 1.0
+anchor_right = 1.0
+anchor_bottom = 1.0
+margin_left = 222.0
+margin_top = 19.0
+margin_right = -222.0
+margin_bottom = 51.0
+grow_horizontal = 2
+rect_min_size = Vector2( 500, 0 )
+size_flags_horizontal = 3
+custom_styles/normal = SubResource( 9 )
+custom_colors/font_color = Color( 1, 0, 0.235294, 1 )
+align = 1
+autowrap = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
+[node name="Tween" type="Tween" parent="MainContainer/Main"]

main/scn/notifications/notification/notification.tscn

@@ -103,7 +103,6 @@ margin_bottom = 93.0
 [node name="GoTo" type="ToolButton" parent="Container"]
 margin_left = 948.0
 margin_right = 1008.0
-visible = false
 margin_bottom = 93.0
 size_flags_horizontal = 10
 icon = ExtResource( 6 )

main/scn/post/post.gd

@@ -22,7 +22,7 @@ var comments : int
 var post : PostsManager.Post        setget set_post
 var user : UsersManager.User        
 
-var db_reference : FirebaseDatabaseReference
+var post_db_reference : FirebaseDatabaseReference
 
 func _connect_signals():
     post_image.connect("gui_input", self, "_on_Image_gui_input")
@@ -69,9 +69,9 @@ func set_menu(user : String) -> void:
 func set_post_id(p : String):
     id = p
     name = p
-    db_reference = Firebase.Database.get_database_reference("sociadot/posts/"+p)
-    db_reference.connect("new_data_update", self, "_on_db_data")
-    db_reference.connect("patch_data_update", self, "_on_db_data")
+    post_db_reference = Firebase.Database.get_database_reference("sociadot/posts/"+id)
+    post_db_reference.connect("new_data_update", self, "_on_db_data")
+    post_db_reference.connect("patch_data_update", self, "_on_db_data")
 
 func set_user_id(id : String):
     user_id = id
@@ -162,7 +162,7 @@ func _on_LikeBtn_pressed():
         var love_particle : CPUParticles2D = Activities.love_particle_scene.instance()
         love_particle.add_to_control($PostContainer/ActionButtons/LikeBtn)
         RequestsManager.send_notification(UserData.user_id, user_id, "like", {post_id = id})
-    RequestsManager.update_post_likes(likes, db_reference)
+    RequestsManager.update_post_likes(likes, post_db_reference)
 
 
 func _on_db_data(resource : FirebaseResource):

main/scn/signin/signin.gd

@@ -72,6 +72,7 @@ func _on_auto_login(auth):
 func _on_SignContainer_logged(login):
     UserData.is_logged = true
     Firebase.Auth.save_auth(login)
+    UserData.is_logged = true
     var firestore_task : FirestoreTask = RequestsManager.get_user(login.localid)
     var user_doc : FirestoreDocument = yield(firestore_task, "get_document")
     if user_doc.doc_fields.username == "":

project.godot

@@ -252,6 +252,7 @@ UsersManager="*res://main/scripts/users_manager.gd"
 [debug]
 
 gdscript/warnings/enable=false
+gdscript/completion/autocomplete_setters_and_getters=true
 
 [display]
 
@@ -280,6 +281,10 @@ environment_variables/clientId=""
 environment_variables/clientSecret=""
 environment_variables/domainUriPrefix=""
 
+[global]
+
+shadow=true
+
 [gui]
 
 theme/use_hidpi=true