diff --git a/.github/workflows/dotnet.yml b/.github/workflows/backend-tests.yml similarity index 100% rename from .github/workflows/dotnet.yml rename to .github/workflows/backend-tests.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/build-frontend.yml similarity index 100% rename from .github/workflows/node.js.yml rename to .github/workflows/build-frontend.yml diff --git a/README.md b/README.md index 9bcbc87..772f725 100644 --- a/README.md +++ b/README.md @@ -44,7 +44,21 @@ - SQL Server or your chosen database system - IDEs: Visual Studio, Rider -### Setup Instructions +### Application Setup with Docker + +1. **Clone the repository**: + ```bash + git clone https://github.com/RizzyApp/rizzy.git + cd rizzy + ``` +2. **Docker setup**: +- Run the docker-compose.yml file in the terminal with the `docker compose up` command to create the application in Docker. +- Docker compose runs the entire server, frontend and database. + +3. **Access the app**: + Open your browser and navigate to `http://localhost:3000`. + +### Native Application Setup 1. **Clone the repository**: ```bash @@ -71,11 +85,7 @@ dotnet run ``` -3. **Docker setup**: - - Add docker to your services - - Run the docker-compose.yml file to create the database in Docker. - -4. **Frontend setup**: +3. **Frontend setup**: - Navigate to the frontend folder: ```bash cd .\client\ @@ -89,7 +99,7 @@ npm run dev ``` -5. **Access the app**: +4. **Access the app**: Open your browser and navigate to `http://localhost:5276`. --- diff --git a/client/public/image/CantUploadme.jpg b/client/public/image/CantUploadme.jpg deleted file mode 100644 index e69de29..0000000 diff --git a/client/public/image/bean-1.jpg b/client/public/image/bean-1.jpg deleted file mode 100644 index 9fb799e..0000000 Binary files a/client/public/image/bean-1.jpg and /dev/null differ diff --git a/client/public/image/bean-2.jpg b/client/public/image/bean-2.jpg deleted file mode 100644 index 1c52653..0000000 Binary files a/client/public/image/bean-2.jpg and /dev/null differ diff --git a/client/public/image/bean-3.jpg b/client/public/image/bean-3.jpg deleted file mode 100644 index b712bce..0000000 Binary files a/client/public/image/bean-3.jpg and /dev/null differ diff --git a/client/public/image/bean-4.jpg b/client/public/image/bean-4.jpg deleted file mode 100644 index 7688fd6..0000000 Binary files a/client/public/image/bean-4.jpg and /dev/null differ diff --git a/client/src/components/chat/ChatSideBar.jsx b/client/src/components/chat/ChatSideBar.jsx index 30695f4..7340169 100644 --- a/client/src/components/chat/ChatSideBar.jsx +++ b/client/src/components/chat/ChatSideBar.jsx @@ -61,7 +61,7 @@ const ChatSideBar = ({setSelectedUser, users}) => { onChange={(e) => setSearchQuery(e.target.value)} /> -
+
{filteredUsers.length > 0 ? (