update v1.4.2

Author: fenix-hub

main/scn/notifications/notification/notification.gd

@@ -23,6 +23,7 @@ func _connect_signals() -> void:
     go_to.connect("pressed", self, "goto_pressed")
 
 func _ready() -> void:
+    $Container/GoTo.hide()
     hide()
     _connect_signals()
 

main/scn/notifications/notification/notification.tscn

@@ -63,9 +63,23 @@ margin_top = 8.0
 margin_right = 1016.0
 margin_bottom = 101.0
 
+[node name="Notification" type="Label" parent="Container"]
+margin_right = 10.0
+margin_bottom = 10.0
+rect_min_size = Vector2( 10, 10 )
+size_flags_horizontal = 0
+size_flags_vertical = 0
+custom_styles/normal = SubResource( 2 )
+custom_fonts/font = SubResource( 3 )
+autowrap = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
+
 [node name="Icon" type="TextureRect" parent="Container"]
+margin_left = 18.0
 margin_top = 26.0
-margin_right = 40.0
+margin_right = 58.0
 margin_bottom = 66.0
 rect_min_size = Vector2( 40, 40 )
 size_flags_horizontal = 4
@@ -74,8 +88,8 @@ expand = true
 stretch_mode = 4
 
 [node name="Header" type="VBoxContainer" parent="Container"]
-margin_left = 48.0
-margin_right = 171.0
+margin_left = 66.0
+margin_right = 189.0
 margin_bottom = 93.0
 
 [node name="UserHeader" parent="Container/Header" instance=ExtResource( 1 )]
@@ -87,25 +101,10 @@ margin_right = 123.0
 margin_bottom = 93.0
 
 [node name="GoTo" type="ToolButton" parent="Container"]
-visible = false
-margin_left = 930.0
-margin_right = 990.0
+margin_left = 948.0
+margin_right = 1008.0
 margin_bottom = 93.0
 size_flags_horizontal = 10
 icon = ExtResource( 6 )
 
-[node name="Notification" type="Label" parent="Container"]
-margin_left = 179.0
-margin_right = 189.0
-margin_bottom = 10.0
-rect_min_size = Vector2( 10, 10 )
-size_flags_horizontal = 8
-size_flags_vertical = 0
-custom_styles/normal = SubResource( 2 )
-custom_fonts/font = SubResource( 3 )
-autowrap = true
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
 [node name="Tween" type="Tween" parent="."]

main/scn/notifications/notifications.gd

@@ -13,7 +13,7 @@ func manage_notification(resource : FirebaseResource) -> void:
     notification_node.connect("header_pressed", Activities.home, "_on_show_user_profile")
     notification_node.connect("show_post", Activities.home, "_on_open_post")
     notifications_list.add_child(notification_node)
-    notifications_list.move_child(notification_node, 0)
+#    notifications_list.move_child(notification_node, 0)
     notification_node.load_notification(resource)
 
 func view_notifications() -> void:

main/scn/signin/signin.gd

@@ -12,8 +12,6 @@ onready var update_picture : TextureRect = $UpdateProfile/VBox/UpdatePicture
 var extension : String
 var profile_picture : String
 
-var logged : bool = false
-
 var task : int = -1
 
 func _connect_signals():
@@ -22,6 +20,7 @@ func _connect_signals():
     signin_container.connect("logged", self, "_on_SignContainer_logged")
     signin_container.connect("logging", self, "_on_SignContainer_logging")
     signin_container.connect("signed", self, "_on_SignContainer_signed")
+    Firebase.Auth.connect("token_refresh_succeeded", self, "_on_auto_login")
     $UpdateProfile/VBox/UpdatePicture/CameraIcon.connect("pressed", self, "_on_CameraIcon_pressed")
     $UpdateProfile/VBox/ConfirmBtn.connect("pressed", self, "_on_ConfirmBtn_pressed")
 
@@ -63,17 +62,17 @@ func _on_SignContainer_error(message):
     Activities.show_error( message)
     Activities.loading( false)
 
+func _on_auto_login(auth):
+    if not UserData.is_logged:
+        _on_SignContainer_logged(auth)
+
 
 func _on_SignContainer_logged(login):
-    print("logged")
-    if logged:
-        emit_signal("show_error", "User already logged")
-        return
     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 == "":
-        Firebase.Auth.save_auth(login)
         UserData.user_id = login.localid
         UserData.user_email = login.email
         Activities.loading(false)
@@ -89,7 +88,6 @@ func _on_SignContainer_logged(login):
     Activities.loading(false)
     UserData.map_user(user_doc, user_picture)
     RequestsManager.update_user()
-    logged = true
     emit_signal("sign_in")
 
 func _on_SignContainer_signed(signup):
@@ -124,21 +122,17 @@ func _on_ChosePicture_file_selected(path):
 
 
 func _on_ConfirmBtn_pressed():
-    if logged:
-        emit_signal("show_error", "User already logged")
-        return
     if update_picture.texture != null and not update_username.get_text() in [""," "]:
         Activities.loading( true)
         UserData.user_name = update_username.get_text()
         UserData.last_logged = OS.get_datetime()
-        UserData.is_logged = logged
+        UserData.is_logged = true
         var update_task : FirestoreTask = RequestsManager.update_user()
         yield(update_task, "update_document" )
         var put_file : StorageTask = RequestsManager.update_user_picture(profile_picture)
         yield(put_file, "task_finished")
         animate_UpdateProfile(false)
         Activities.loading( false)
-        logged = true
         emit_signal("sign_in")
 
 func _on_SignContainer_logging():

main/scn/signin/signin.tscn

@@ -10,28 +10,28 @@
 [ext_resource path="res://main/res/imgs/avatar.svg" type="Texture" id=8]
 [ext_resource path="res://main/scn/buttons/firebase_btn/button.tscn" type="PackedScene" id=9]
 
-[sub_resource type="DynamicFont" id=8]
+[sub_resource type="DynamicFont" id=1]
 size = 30
 font_data = ExtResource( 1 )
 
-[sub_resource type="DynamicFont" id=5]
+[sub_resource type="DynamicFont" id=2]
 size = 49
 font_data = ExtResource( 2 )
 
-[sub_resource type="StyleBoxFlat" id=6]
+[sub_resource type="StyleBoxFlat" id=3]
 content_margin_left = 15.0
 content_margin_right = 15.0
 content_margin_top = 15.0
 content_margin_bottom = 15.0
 bg_color = Color( 1, 0.886275, 0.639216, 0 )
 
-[sub_resource type="VisualShaderNodeTexture" id=9]
+[sub_resource type="VisualShaderNodeTexture" id=4]
 texture = ExtResource( 8 )
 
-[sub_resource type="VisualShaderNodeTexture" id=10]
+[sub_resource type="VisualShaderNodeTexture" id=5]
 source = 2
 
-[sub_resource type="VisualShader" id=3]
+[sub_resource type="VisualShader" id=6]
 code = "shader_type canvas_item;
 uniform sampler2D tex_frg_2;
 
@@ -71,15 +71,15 @@ void light() {
 graph_offset = Vector2( -441, 170 )
 mode = 1
 flags/light_only = false
-nodes/fragment/2/node = SubResource( 9 )
+nodes/fragment/2/node = SubResource( 4 )
 nodes/fragment/2/position = Vector2( -80, 300 )
-nodes/fragment/3/node = SubResource( 10 )
+nodes/fragment/3/node = SubResource( 5 )
 nodes/fragment/3/position = Vector2( 20, 120 )
 nodes/fragment/connections = PoolIntArray( 2, 1, 0, 1, 3, 0, 0, 0 )
 
 [sub_resource type="ShaderMaterial" id=7]
 resource_local_to_scene = true
-shader = SubResource( 3 )
+shader = SubResource( 6 )
 
 [node name="SignIn" type="CenterContainer"]
 anchor_right = 1.0
@@ -120,7 +120,7 @@ custom_constants/separation = 0
 [node name="Label" type="Label" parent="SignContainer/VBoxContainer/VBoxContainer"]
 margin_right = 320.0
 margin_bottom = 36.0
-custom_fonts/font = SubResource( 8 )
+custom_fonts/font = SubResource( 1 )
 custom_colors/font_color_shadow = Color( 0.432587, 0.449886, 0.878906, 1 )
 custom_constants/shadow_offset_x = 2
 custom_constants/shadow_offset_y = 2
@@ -133,7 +133,7 @@ margin_right = 320.0
 margin_bottom = 96.0
 rect_min_size = Vector2( 0, 60 )
 rect_clip_content = false
-custom_fonts/normal_font = SubResource( 5 )
+custom_fonts/normal_font = SubResource( 2 )
 custom_colors/font_color_shadow = Color( 0.341176, 0.356863, 0.811765, 1 )
 custom_constants/shadow_offset_x = 3
 custom_constants/shadow_offset_y = 3
@@ -152,7 +152,7 @@ margin_right = 320.0
 margin_bottom = 372.0
 size_flags_horizontal = 3
 size_flags_vertical = 3
-custom_styles/panel = SubResource( 6 )
+custom_styles/panel = SubResource( 3 )
 
 [node name="UpdateProfile" type="PanelContainer" parent="."]
 margin_left = 377.0
@@ -206,5 +206,7 @@ size_flags_vertical = 10
 text = "Confirm"
 
 [node name="ChosePicture" parent="." instance=ExtResource( 5 )]
+current_dir = "/COMPUTER/GodotEngine/FirebaseDemo-SociaDot"
+current_path = "/COMPUTER/GodotEngine/FirebaseDemo-SociaDot/"
 
 [node name="Tween" type="Tween" parent="."]