Skip to content

Commit

Permalink
Merge branch 'main' into fix-issue-#192
Browse files Browse the repository at this point in the history
  • Loading branch information
thecuriousteam authored Aug 9, 2024
2 parents 05407b5 + 12ded00 commit dad6758
Show file tree
Hide file tree
Showing 36 changed files with 1,381 additions and 156 deletions.
37 changes: 37 additions & 0 deletions .github/workflows/auto-comment-pr-merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: Auto Comment on PR Merge

on:
pull_request_target:
types: [closed]

permissions:
issues: write
pull-requests: write

jobs:
comment:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest

steps:
- name: Add Comment to Merged PR
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
COMMENT=$(cat <<EOF
{
"body": "Congratulations, Your pull request has been successfully merged 🥳🎉 Thank you for your contribution to the project 🚀 Keep Contributing!! ✨"
}
EOF
)
RESPONSE=$(curl -s -o response.json -w "%{http_code}" \
-X POST \
-H "Authorization: token $GITHUB_TOKEN" \
-H "Accept: application/vnd.github.v3+json" \
https://api.github.com/repos/${{ github.repository }}/issues/${{ github.event.pull_request.number }}/comments \
-d "$COMMENT")
cat response.json
if [ "$RESPONSE" -ne 201 ]; then
echo "Failed to add comment"
exit 1
fi
70 changes: 59 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ Curious Connect is your go-to platform for revolutionizing virtual collaboration
</p>

## 📑Table of Contents

- [Getting Started](#getting-started)
- [How Can I Contribute?](#how-can-i-contribute)
- [Team Onboarding](#team-onboarding)
Expand All @@ -24,17 +23,33 @@ Curious Connect is your go-to platform for revolutionizing virtual collaboration
## 🚀Getting Started

### Prerequisites
- Ensure you have an IDE installed on your local machine.

1). Fork the repository on GitHub.
2). Clone your forked repository locally:
`git clone https://github.com/Curious-Ecosystem/Curious-Connect.git`
3). Change your directory to the project: `cd CURIOUS-CONNECT`
4). For the instructions in the [Project Setup](docs/Project_Setup.md) documentation to install the rquired dependencies and set up your development environment.

By following these steps, you'll have a local copy of the Curious Connect project ready for development. For more detailed information, refer to our [Documentation](docs/Overview.md)


- Ensure you have an IDE installed on your local machine.
- Fork the repository
- Clone your forked repository locally:
```bash
git clone https://github.com/Curious-Ecosystem/Curious-Connect.git

```
- Change your directory to the project:
```bash
cd CURIOUS-CONNECT

```

- For the instructions in the [Project Setup](docs/Project_Setup.md) documentation to install the rquired dependencies and set up your development environment.

- Install the necessary dependencies:
```bash
npm install
```
- Start the NodeJS server:

- Start the development server
```bash
npm start
```
- Open your browser and navigate to http://localhost:3000 to view the website
## 🤝How Can I Contribute?

### 🌟Team Onboarding
Expand All @@ -43,6 +58,7 @@ By following these steps, you'll have a local copy of the Curious Connect projec
### 📜Contributing Guidelines

- Before you start contributing, please take a moment to read our [Contributing guidelines](./CONTRIBUTING.md) to ensure a smooth and effective contribution process.
- Then Start the Journey of Open Source

## 📝Code of Conduct

Expand All @@ -58,6 +74,38 @@ This project is licensed under the [BSD 4-Clause](./LICENSE.md) license.
## Our Contributors
We appreciate your contributions and look forward to collaborating with you!

## Issue Resolved By

### 1 [Aman Kumar Gupta :](https://github.com/AmanGupta2626)

<ol>
<li>Implemented Footer Section </li>
<li>Implemented FAQ Section </li>
<li>Implemented Signin/signup page </li>
<li>Implemented authentication using firebase </li>
<li>Added caption part which convert speech to text </li>

### 1. [Sheetal Tyagi :](https://github.com/Sheetal-04)

<ol>
<li>Implemented Meeting Cards.<li>
<li>Implemented Scrollbar based on theme<li>
<li>Implemented Smooth Scrolling<li>
</ol>

## Issue Resolved By
### 1. [Domeshwer Sahu :](https://github.com/domesh-is-Coding)
<ol>
<li>User Avatar for Meeting Participants</li>
<li>UI for Multiple Participants</li>
<li>Implemented Random Avatar Color For Each Participants</li>
<li>Merged Joining Window with Meeting Room UI</li>
<li>Enhanced Functionalities of Joining Window</li>
<li>Added Feature for Selecting User Media (i.e. Camera & Microphone) Dynamically.</li>
<li>Enhanced Functionalities of Meeting Room Page.</li>

</ol>


<h2 align = "center">Our Contributors❤️</h2>
<div align = "center">
Expand Down
2 changes: 2 additions & 0 deletions frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
</head>
<body>
<div id="root"></div>

<script type="module" src="/src/main.jsx"></script>
<script src="https://cdn.lordicon.com/lordicon.js"></script>
</body>
</html>
5 changes: 5 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,24 @@
"preview": "vite preview"
},
"dependencies": {
"@chakra-ui/react": "^2.8.2",
"@material-tailwind/react": "^2.1.9",
"@remixicon/react": "^4.2.0",
"express": "^4.19.2",
"firebase": "^10.12.0",
"flowbite": "^2.3.0",
"flowbite-react": "^0.9.0",
"framer-motion": "^11.2.6",
"mongoose": "^8.3.5",
"prettier": "^3.2.5",
"react": "^18.2.0",
"react-datepicker": "^6.9.0",
"react-dom": "^18.2.0",
"react-hot-toast": "^2.4.1",
"react-icons": "^5.2.1",
"react-multi-carousel": "^2.8.5",
"react-router-dom": "^6.23.1",
"react-simple-typewriter": "^5.0.1",
"react-slick": "^0.30.2",
"slick-carousel": "^1.8.1"
},
Expand Down
3 changes: 3 additions & 0 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import TermsOfService from './Components/common/Footer/LegalSection/TermsOfServi
import CreateMeeting from './Pages/Create-Meeting-Page';
import MeetingDetails from './Components/Pages/Meeting-Page/Meeting-Details';
import MeetingAvailability from './Components/Pages/Meeting-Page/Meeting-Availability';
import ErrorPage from './Pages/Error-Page';
import Navbar from './Components/Pages/Landing-Page/Navbar';

const App = () => {
Expand Down Expand Up @@ -38,6 +39,8 @@ const App = () => {
path='/meetingDetails/meetingAvailaibility'
element={<MeetingAvailability />}
/>
{/* Error */}
<Route path='*' element={<ErrorPage />} />
</Routes>
<Footer />
</Router>
Expand Down
25 changes: 25 additions & 0 deletions frontend/src/Components/Pages/Error-Page/ErrorPage.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react';
import backgroundImage from '../../../assets/Landing-Page-Assets/ErrorImage.png';

const Error = () => {
return (
<div
className="flex justify-center items-center h-screen bg-cover bg-center text-center text-black"
style={{ backgroundImage: `url(${backgroundImage})` }}
>
<div className="p-5 rounded-lg md:p-20 w-11/12 md:w-auto bg-opacity-75">
<p className="text-white text-2xl md:text-4xl mb-8">Coming soon ...</p>
<div className="text-white mt-8 flex justify-center gap-7">
<a
href="/"
className="flex justify-center items-center text-lg px-5 py-3 font-semibold tracking-wide leading-5 text-white whitespace-nowrap hover:border hover:bg-transparent cursor-pointer hover:border-[#408ACD] bg-[#408ACD] rounded-[10px]"
>
Home Page
</a>
</div>
</div>
</div>
);
};

export default Error;
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
import React from 'react';
import img from '../../../assets/Landing-Page-Assets/hero-mobile.png';
import JoinWithCode from './JoinWithCode';

// Design Hero section here and call this hero section in "frontend/src/Pages/Landing-Page.jsx"

const HeroSectionMobileView = () => {
return (
<div>
<div className='justify-center tracking-wide items-center text-cyan-50 font-bold flex flex-col md:flex-row lg:pl-20 lg:pr-20 gap-2'>
<div className='lg:w-[70%] w-full flex flex-col p-5 justify-center text-center'>
<h1 className='text-lg md:text-3xl font-bold leading-5 p-1 mt-2'>
CONNECT
</h1>
<h1 className='text-lg md:text-3xl font-bold leading-5 p-1'>
COLLABORATE
</h1>
<h1 className='text-lg md:text-3xl font-bold leading-5 p-1 mb-2'>
CONFERENCE
</h1>

{/* paragraph */}
<div>
<p className='text-xs text-gray-500 md:text-md text-center leading-4 px-0 font-poppins'>
Start your next video call with a single click. No download,
plug-in, or login is required. Just get straight to talking,
messaging, and sharing your screen.
</p>
</div>

{/* image div */}
<div className='w-full flex justify-center p-3 object-contain'>
<svg
width='101'
height='85'
viewBox='0 0 111 95'
className='top-0 left-0 absolute z-0 mr-[41vw]'
fill='none'
xmlns='http://www.w3.org/2000/svg'>
<path
d='M0 92C42.8301 77.457 89.8459 24.6071 108 -6.97969e-06'
stroke='#408ACD'
stroke-opacity='0.65'
stroke-width='5'
/>
</svg>

<svg
width='101'
height='131'
viewBox='0 0 111 141'
className='top-2 left-0 absolute z-0 mr-[41vw]'
fill='none'
xmlns='http://www.w3.org/2000/svg'>
<path
d='M0 138C61.4814 109.165 97.4919 34.5593 107.812 0.860839'
stroke='#408ACD'
stroke-opacity='0.19'
stroke-width='5'
/>
</svg>

<img src={img} alt='home' className='w-[520px] mt-2 z-10' />
<div
className='shadow-md shadow-black right-0 top-0 w-[5.5rem] h-[5.5rem] z-0 absolute shadow-[rgba(0, 0, 0, 0.25)] shadow-[0px 4px 4px] rounded-bl-[10px] border-[1px] border-r-0 border-t-0 border-[#0D7A9F] border-[solid] opacity-60'
style={{
background: 'rgb(7,153,200)',
background:
'linear-gradient(216deg, rgba(7,153,200,1) 0%, rgba(17,63,81,0.3086484593837535) 91%)',
}}></div>
</div>

{/* buttons */}
<div className='flex gap-4 mt-0 m-2 justify-center'>
<button
className='text-md p-2 px-3 rounded-lg'
style={{ backgroundColor: '#1489F6' }}>
Sign In
</button>
<button
className='text-md p-2 px-3 rounded-lg'
style={{ backgroundColor: '#1489F6' }}>
Sign Up
</button>
</div>
</div>
</div>
<div>
<JoinWithCode />
</div>
</div>
);
};

export default HeroSectionMobileView;
Loading

0 comments on commit dad6758

Please sign in to comment.