Revert "Update (#5)" (#6)

This reverts commit f56974a.

Author: fenix-hub

main/res/icons/arrow_forward_white_36dp.svg

@@ -64,10 +64,6 @@ func _on_show_error(error : String):
 
 # ..... top bar signals
 func _on_TopBar_close():
-    UserData.is_logged = false
-    UserData.last_logged = OS.get_datetime()
-    loading.set_loading(true)
-    yield(RequestsManager.update_user(), "task_finished")
     get_tree().quit()
 
 func _on_TopBar_minimize():

main/res/icons/arrow_forward_white_36dp.svg.import

@@ -1,8 +1,5 @@
 extends HBoxContainer
 
-signal pressed(user_id, user_name)
-
-var user_id : String
 var user_name : String
 var user_picture : ImageTexture
 
@@ -23,11 +20,9 @@ func load_from_user(user_obj : UsersManager.User):
         user_obj.connect("update_picture", self, "set_picture")
     set_picture(user_obj.picture)
     set_user_name(user_obj.username)
-    user_id = user_obj.id
 
 func load_from_document(document : FirestoreDocument):
     set_user_name(document.doc_fields.username)
-    user_id = document.doc_fields.localid
 
 func set_picture(picture : ImageTexture):
     user_picture = picture
@@ -38,7 +33,3 @@ func set_picture(picture : ImageTexture):
 func set_user_name(_name : String):
     user_name = _name
     $Name.set_text(_name)
-
-
-func _on_Name_pressed() -> void:
-    emit_signal("pressed", user_id, user_name)

main/scn/app/main.gd

@@ -8,7 +8,6 @@
 margin_right = 168.0
 margin_bottom = 60.0
 size_flags_vertical = 4
-custom_constants/separation = 15
 script = ExtResource( 3 )
 __meta__ = {
 "_edit_use_anchors_": false
@@ -25,11 +24,9 @@ expand = true
 stretch_mode = 1
 
 [node name="Name" type="LinkButton" parent="."]
-margin_left = 75.0
+margin_left = 68.0
 margin_top = 17.0
-margin_right = 123.0
+margin_right = 116.0
 margin_bottom = 42.0
 size_flags_vertical = 4
 text = "user"
-
-[connection signal="pressed" from="Name" to="." method="_on_Name_pressed"]

main/scn/header/header.gd

@@ -64,7 +64,6 @@ func _on_ConnecBtn_pressed():
     yield(friend_task, "update_document")
     if check_friend():
         emit_signal("connected", user, $ConnecBtn)
-        RequestsManager.send_notification(UserData.user_id, user_id, "connect")
     else:
         emit_signal("disconnect", user)
 

main/scn/header/header.tscn

@@ -9,31 +9,25 @@ onready var users_list_section : VBoxContainer = sections_container.get_node("Us
 onready var settings_section : VBoxContainer = sections_container.get_node("Settings")
 onready var profile_section : VBoxContainer = sections_container.get_node("Profile")
 
-onready var notifications_section : VBoxContainer = sections_container.get_node("Notifications")
-
-
 onready var post_box : VBoxContainer = posts_section.get_node("ScrollPost/PostContainer")
 onready var profile_post_container : VBoxContainer = profile_section.get_node("ScrollPost/PostContainer")
 
 onready var menu : VBoxContainer = $HomeContainer/Menu
 onready var side_bar : VBoxContainer = $HomeContainer/SideBar
 onready var friend_list : VBoxContainer = side_bar.get_node("FriendList")
 
-onready var notification_lbl : Label = $HomeContainer/Menu/NotificationsBtn/Notification
 
 onready var chat_container : GridContainer = $AspectRatioContainer/ChatContainer
 
 onready var show_post : Control = $ShowPost
 
+onready var notification_lbl : Label = $HomeContainer/Menu/NotificationsBtn/Notification
 
 var fr_posts : FirestoreCollection = Firebase.Firestore.collection("posts")
 
 var friend_posts : Array = []
 
 var posts_db_reference : FirebaseDatabaseReference 
-var notifications_db_reference : FirebaseDatabaseReference
-
-var window_size : Vector2
 
 var window_size : Vector2
 
@@ -49,8 +43,6 @@ func _connect_signals():
     $HomeContainer/Menu/UsersListBtn.connect("pressed", self, "_on_UsersListBtn_pressed")
     $HomeContainer/Menu/NotificationsBtn.connect("pressed", self, "_on_NotificationsBtn_pressed")
     $HomeContainer/Menu/SettingsBtn.connect("pressed", self, "_on_SettingsBtn_pressed")
-    
-    notifications_section.connect("visibility_changed", self, "_on_notification_section_visibility")
 
 func _ready():
     _connect_signals()
@@ -65,7 +57,8 @@ func _ready():
     animate_Home(true)
     load_posts()
     friend_list.load_friend_list()
-    connect_notifications()
+
+
 
 func animate_Home(display : bool):
     if display:
@@ -107,14 +100,6 @@ func load_posts():
         posts_db_reference = Firebase.Database.get_database_reference("sociadot/posts")
         posts_db_reference.connect("new_data_update", self, "_on_new_post")
 
-func connect_notifications() -> void:
-    notifications_db_reference = Firebase.Database.get_database_reference("sociadot/notifications/"+UserData.user_id)
-    notifications_db_reference.connect("new_data_update", self, "_on_new_notification")
-
-func _on_new_notification(notification : FirebaseResource):
-    notifications_section.manage_notification(notification)
-    if not notification.data.viewed:
-        notification_lbl.show()
 
 func check_friend_posts_list(post_doc : FirestoreDocument) -> bool:
     for post in friend_posts:
@@ -246,12 +231,7 @@ func _on_open_post(post : PostsManager.Post):
     show_post.show_post(post, UsersManager.get_user_by_id(post.user_id))
 
 func _on_NotificationsBtn_pressed():
-    show_section(notifications_section)
-    notification_lbl.hide()
-
-func _on_notification_section_visibility():
-    if not notifications_section.visible:
-        notifications_section.view_notifications()
+    pass
 
 func _on_Home_item_rect_changed():
     update_chat_container()

main/scn/header/interactive/interactive_header.gd

@@ -13,16 +13,24 @@
 [ext_resource path="res://main/scn/profile/profile.tscn" type="PackedScene" id=11]
 [ext_resource path="res://main/res/icons/notifications_none_white_24dp.svg" type="Texture" id=12]
 [ext_resource path="res://main/scn/show_post/show_post.tscn" type="PackedScene" id=13]
-[ext_resource path="res://main/scn/notifications/notifications.gd" type="Script" id=14]
 [ext_resource path="res://main/res/icons/groups_white_24dp.svg" type="Texture" id=15]
 [ext_resource path="res://main/res/icons/settings-24px.svg" type="Texture" id=16]
 [ext_resource path="res://main/scn/settings/settings.tscn" type="PackedScene" id=17]
-[ext_resource path="res://main/scn/labels_icons/color_round_s.tscn" type="PackedScene" id=18]
 
 [sub_resource type="StyleBoxEmpty" id=1]
 
 [sub_resource type="StyleBoxEmpty" id=2]
 
+[sub_resource type="StyleBoxFlat" id=3]
+bg_color = Color( 1, 0.352941, 0.247059, 1 )
+corner_radius_top_left = 40
+corner_radius_top_right = 40
+corner_radius_bottom_right = 40
+corner_radius_bottom_left = 40
+corner_detail = 20
+
+[sub_resource type="DynamicFont" id=4]
+
 [sub_resource type="DynamicFont" id=5]
 size = 25
 font_data = ExtResource( 2 )
@@ -128,7 +136,19 @@ texture_active = ExtResource( 12 )
 texture_inactive = ExtResource( 12 )
 color = Color( 1, 0.627451, 0.294118, 1 )
 
-[node name="Notification" parent="HomeContainer/Menu/NotificationsBtn" instance=ExtResource( 18 )]
+[node name="Notification" type="Label" parent="HomeContainer/Menu/NotificationsBtn"]
+visible = false
+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( 3 )
+custom_fonts/font = SubResource( 4 )
+autowrap = true
+__meta__ = {
+"_edit_use_anchors_": false
+}
 
 [node name="SettingsBtn" parent="HomeContainer/Menu" instance=ExtResource( 10 )]
 margin_left = 15.0
@@ -203,42 +223,6 @@ size_flags_horizontal = 3
 size_flags_vertical = 3
 custom_constants/separation = 30
 
-[node name="Notifications" type="VBoxContainer" parent="HomeContainer/Sections"]
-visible = false
-margin_top = 302.0
-margin_right = 564.0
-margin_bottom = 600.0
-size_flags_vertical = 3
-script = ExtResource( 14 )
-__meta__ = {
-"_edit_use_anchors_": false
-}
-
-[node name="Label" type="Label" parent="HomeContainer/Sections/Notifications"]
-margin_right = 564.0
-margin_bottom = 39.0
-custom_fonts/font = SubResource( 5 )
-text = "Notifications"
-align = 1
-
-[node name="ScrollNotifications" type="ScrollContainer" parent="HomeContainer/Sections/Notifications"]
-margin_top = 43.0
-margin_right = 564.0
-margin_bottom = 298.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-custom_styles/bg = SubResource( 6 )
-scroll_horizontal_enabled = false
-
-[node name="NotificationsContainer" type="VBoxContainer" parent="HomeContainer/Sections/Notifications/ScrollNotifications"]
-margin_left = 10.0
-margin_top = 10.0
-margin_right = 554.0
-margin_bottom = 245.0
-size_flags_horizontal = 3
-size_flags_vertical = 3
-custom_constants/separation = 5
-
 [node name="Profile" parent="HomeContainer/Sections" instance=ExtResource( 11 )]
 visible = false
 anchor_right = 0.0