Merged conflicts from the main branch

Author: Madhavan7

.gitignore

@@ -1,16 +1,14 @@
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
 
-.idea/*
-.DS_Store
-
-# entities.userEntities.User-specific stuff
+# entities.user_entities.User-specific stuff
 .idea/**/workspace.xml
 .idea/**/tasks.xml
 .idea/**/usage.statistics.xml
 .idea/**/dictionaries
 .idea/**/shelf
-# AWS entities.userEntities.User-specific
+
+# AWS entities.user_entities.User-specific
 .idea/**/aws.xml
 
 # Generated files
@@ -116,4 +114,4 @@ gradle-app.setting
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
-replay_pid*
+replay_pid*

README.md

@@ -1,6 +1,6 @@
 # SOLID Chat
 
-## Our Progress (Last Updated on Nov 20)
+## Our Progress (Last Updated on Nov 21)
 
 Each of us have created one or more PRs and most of these have been merged into the main branch. Many members have functional UI's (and they are likely happy to demonstrate in tutorial) and others have a basic non-interactive UI and the inner layers of clean architecture. While they may not be able to do an interactive demo, screenshots of these user interfaces are included below.
 
@@ -11,6 +11,68 @@ Each of us have created one or more PRs and most of these have been merged into
 
 ![image](https://user-images.githubusercontent.com/18428059/202935072-ba09587d-c67d-4599-9986-9c652480356f.png)
 
+- Update on inner layers of the conversation history feature:
+  - The ConvHistInteractor, responsible for displaying a conversation history, was tested (see [here](https://github.com/CSC207-2022F-UofT/course-project-SOLID-chat/pull/32)). To focus testing on the interactor, a mock data access class was used. While the test does not currently pass, the structure of the test is there.
+
+### Profile display
+- By Parmis
+- Implemented by UserSearchUI, which allows a user to type in a user's username to view their features (user and username so far).
+- User information is captured using UserPresenter interface, which uses UserDatabse's interface UserRetriever to retrieve the user of interest, then UserReader reads features of the reader that are eventually presented:
+- ![img.png](images/img.png)
+- Here, Alex123 is not a user of the chat system:
+- ![img_1.png](images/img_1.png)
+- parmis is a user of the chat system though:
+- ![img_2.png](images/img_2.png)
+
+### Profile feature modification
+- By Parmis
+- Implemented by UserMdoificationUI, which allows a user to verify their authority to access their account by confirming their username and password, and then choosing the feature they wish to modify, and enter the new value for it. 
+- User information is captured using ChangeController interface, which uses UserDatabse's interface UserRetriever to retrieve the user of interest. Then, UserAuthenticationI confirms user's authority to make the change, then we use Changeable interface (use case) to make the changes to the User entity, and finally use UserModificationGateway to relay the changed info to UserDatabase:
+- ![img_3.png](images/img_3.png)
+- Here: Parmis's password is actually 123, so she doesn't get the chance to change her email:
+- ![img_4.png](images/img_4.png)
+- as you can see, her email is unchanged.
+- now she enters the right password and tries again:
+- ![img_5.png](images/img_5.png)
+- This time, change was successful. She could use this tool to similarly change her username or password too:
+- ![img_6.png](images/img_6.png)
+
+
+### App Screen UI
+- By Amy
+- The App Screen UI is the screen that acts as a proxy between the user's login screen and their individual chats
+- Upon logging in, a user will will be rendered with a view of app screen
+- App screen provides an ordered list of a user's chats and also allows a user to create new chats
+- Each chat button will also display a date indicating the date of the last message in a chat's conversation history, or no date if a chat has no messages 
+- ChatView (the window referenced above) will open upon clicking an existing chat to display the chats's GUI
+- With respect to ChatView, clicking on the +Private Chat and +Group Chat buttons will also open an instance of ChatView for a user to create a new chat
+
+<img width="214" alt="appscreen-nov 25" src="https://user-images.githubusercontent.com/71410005/204060542-82bb8432-09fc-4379-aee6-7a9039e58029.png">
+
+
+
+### User Registration and Login
+- By Madhav
+- The User will be prompted to include the credentials to create a new account. Then he will be asked to choose a method to deliver the verification code: 
+![image](https://user-images.githubusercontent.com/59711147/203239946-ba8e5650-5403-4dd5-9864-636599b68d60.png)
+![image](https://user-images.githubusercontent.com/59711147/203240033-fddf931f-cf13-4405-99c7-d770541adb10.png)
+If there is an account with the same username or password, an error message will show up(closing this message will allow the user to go back):
+![image](https://user-images.githubusercontent.com/59711147/203240205-2e33094e-5578-4782-b3dc-b8dcd524c349.png)
+![image](https://user-images.githubusercontent.com/59711147/203240317-d75bd4de-e8de-4720-bcb9-4016d3a27267.png)
+Now(after clicking enter and choosing to verify via email), an email with the verification code will show up, and user will be prompted to enter the verification code:
+![image](https://user-images.githubusercontent.com/59711147/203240493-5ef4c8c9-03e7-43c5-89fe-9dbda7b260fb.png)
+![image](https://user-images.githubusercontent.com/59711147/203240620-eef94fe0-47b8-43ba-9612-9ed711c365b1.png)
+If the incorrect verification code is entered, the following message shows up. Upon closing the message, the user can re-enter the correct verification code, upon which the login UI - asking for the username and password will show up:
+![image](https://user-images.githubusercontent.com/59711147/203241081-fc541b31-fb2b-4df5-a2e5-7c481cd980c5.png)
+![image](https://user-images.githubusercontent.com/59711147/203241122-7fade0d0-d354-4f6d-96ce-c55fafd2cf61.png)
+If the user enters the credentials of an account that does not exist, the following message shows up. A similar message shows up if the user enters an incorrect password for the username
+![image](https://user-images.githubusercontent.com/59711147/203241552-b442cc1a-36f0-4bd7-ba69-81f91b2db927.png)
+Finally, if the user enters the correct login credentials, his chats will show up(see # App Screen UI above):
+![image](https://user-images.githubusercontent.com/59711147/203241762-b549a6ca-1d90-4d3b-abde-6889f1219490.png)
+
+
+
+
 
 ## Template Readme
 This is a template repository for CSC 207 projects.