Skip to content

Commit

Permalink
fixed minor issues
Browse files Browse the repository at this point in the history
Signed-off-by: itsroy69 <[email protected]>
  • Loading branch information
ItsRoy69 committed Jan 22, 2024
1 parent b647c7c commit d646ce5
Show file tree
Hide file tree
Showing 11 changed files with 118 additions and 411 deletions.
85 changes: 0 additions & 85 deletions .all-contributorsrc

This file was deleted.

4 changes: 1 addition & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# Contribution guidelines 🔐

<!-- **This time VestTech is participating in [JWOC 2K22](https://leaderboard.jwoc.tech/) and we have a set of guidelines to be followed.** -->

**Hello contributors , i want you to stick to the below listed contribution guidelines. Happy contributing.**

<br/>
Expand Down Expand Up @@ -41,4 +39,4 @@

<br/>

**You'll be needing to follow the [Setup Guidelines](https://github.com/WikiPortal/DoodleCollab/blob/main/rules/Setup.md) for more details on setting up the code in your local machine**
**You'll be needing to follow the [Setup Guidelines](https://github.com/WikiPortal/DoodleCollab/blob/main/Setup.md) for more details on setting up the code in your local machine**
Binary file removed DoodleCollab.mp4
Binary file not shown.
68 changes: 4 additions & 64 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
[![License: Apache-2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://opensource.org/licenses/Apache-2.0)
[![All Contributors](https://img.shields.io/badge/all_contributors-10-orange.svg?style=flat-square)](#contributors-)
<a href="https://github.com/WikiPortal/DoodleCollab" alt="GitHub contributors">

---
<h1 align="center">DoodleCollab</h1>
<div align="center">

Expand Down Expand Up @@ -50,72 +46,16 @@ This might be the debut repo for you, you can contribute to this repo, solve the

## Setup Steps 🔐

Follow these steps to set up the DoodleCollab app locally:

1. **Clone the repository:**
```bash
git clone https://github.com/WikiPortal/DoodleCollab.git
```

2. **Navigate to the project directory:**
```bash
cd DoodleCollab
```

3. **Install dependencies:**
```bash
npm install
```

4. **If vite is not installed:**
```bash
npm i vite
npm install --legacy-peer-deps
```

5. **Start the development server:**
```bash
npm run start
```

6. **Open your browser and visit [http://localhost:5173](http://localhost:5173):**
<br>

You can execute these commands one by one in a bash environment.
- *You can also have a look at the [Contributing Guidelines](CONTRIBUTING.md) for proper contributions*
- *Have a look at the [Setup Guidelines](rules/Setup.md) to setup the react app locally*
- *Click here [Workflow Guidelines](workflow.md) to see the workflow of the project.*
- *Have a look at the [Setup Guidelines](Setup.md) to setup the react app locally*

## Contributors ✨

Thanks goes to these wonderful people:
<table>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/AaadityaG"><img src="https://avatars.githubusercontent.com/u/114663382?v=4?s=100" width="100px;" alt="Aditya"/><br /><sub><b>Aditya</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=AaadityaG" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adityaslyf"><img src="https://avatars.githubusercontent.com/u/118926308?v=4?s=100" width="100px;" alt="Aditya Varshney"/><br /><sub><b>Aditya Varshney</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=adityaslyf" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://keyurgk.vercel.app/"><img src="https://avatars.githubusercontent.com/u/56074740?v=4?s=100" width="100px;" alt="Keyur G Kulkarni"/><br /><sub><b>Keyur G Kulkarni</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=KeyurGK" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Paarisha1"><img src="https://avatars.githubusercontent.com/u/147527266?v=4?s=100" width="100px;" alt="Paarisha1"/><br /><sub><b>Paarisha1</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=Paarisha1" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://bikram-ghuku.github.io/portfolio"><img src="https://avatars.githubusercontent.com/u/37508038?v=4?s=100" width="100px;" alt="Bikram Ghuku"/><br /><sub><b>Bikram Ghuku</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=Bikram-ghuku" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Souvik34"><img src="https://avatars.githubusercontent.com/u/98397984?v=4?s=100" width="100px;" alt="Souvik"/><br /><sub><b>Souvik</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=Souvik34" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/isayanpal"><img src="https://avatars.githubusercontent.com/u/102523492?v=4?s=100" width="100px;" alt="Sayan Snigdha Pal"/><br /><sub><b>Sayan Snigdha Pal</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=isayanpal" title="Code">💻</a></td>
</tr>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://itsroy69.github.io/Portfolio-Minimal/"><img src="https://avatars.githubusercontent.com/u/78967360?v=4?s=100" width="100px;" alt="Jyotirmoy Roy"/><br /><sub><b>Jyotirmoy Roy</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=ItsRoy69" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/davidkrupa"><img src="https://avatars.githubusercontent.com/u/126403373?v=4?s=100" width="100px;" alt="davidkrupa"/><br /><sub><b>davidkrupa</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=davidkrupa" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/praptisharma28"><img src="https://avatars.githubusercontent.com/u/123169861?v=4?s=100" width="100px;" alt="Prapti Sharma"/><br /><sub><b>Prapti Sharma</b></sub></a><br /><a href="https://github.com/WikiPortal/DoodleCollab/commits?author=praptisharma28" title="Code">💻</a></td>
</tr>
</tbody>
<tfoot>
<tr>
<td align="center" size="13px" colspan="7">
<img src="https://raw.githubusercontent.com/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg">
<a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a>
</img>
</td>
</tr>
</tfoot>
</table>

[![Contributor](https://contrib.rocks/image?repo=WikiPortal/DoodleCollab&username=contributors)](https://github.com/WikiPortal/DoodleCollab/graphs/contributors)

Contributions of any kind are welcome!🤗

## License 👮
Expand Down
163 changes: 106 additions & 57 deletions rules/Setup.md → Setup.md
Original file line number Diff line number Diff line change
@@ -1,57 +1,106 @@
# React app setup guidelines 🚀

**Hello contributor , i want you to stick to the below listed Setup guidelines to successfully setup the react app in your local system and get started with developing!!**

<br/>

- `Fork` the repo to your account.
- `git clone` to clone the repo

- Now you have the repo in your **local storage**
- You can access the `main` folder to get the webapp access
- Next to setup the react app `npm install`
- Once the node modules and other stuffs are installed , `npm run dev` to start the app in `http://localhost:5173/`
- Make changes **according** to the Tasks assigned to you
- Maintain the folder structure , keep small components like **Navbar, Footer** which stays in every page in `src\constants` folder
- keep other small components which stays in every page in `src\components` folder
- Keep big Pages like **Auth page, Home page** in the `src\pages` folder
- Styles of respective pages should be included in respective folder.
- You are also allowed to use GOOGLE FONTS for same fonts as of figma files.
- Other extra **Pictures, icons , svgs** are to be kept in `src\assets\`
- This website will be fully built in MERN Stack i.e MongoDB, ExpressJS, ReactJS, NodeJS.
- Once you are done with the changes , `git pull` to pull the latest version of the code
- `git add .` to stage for commits
- `git commit -s -m "message"` for commiting the code.
- **REMEMBER** --> YOU NEED TO PULL REQ ON `main` BRANCH !!
- Once done create a Pull Request and wait for the mentor to review.
- Don't forget to attach **`Screenshots, Proper Description and Issue Number` in the Pull request**

<br/>


# Docker setup guidelines 🚀

## Prerequisite

- Install NODE.JS v20

## Step 1 - Clone the repository

```
git clone https://github.com/WikiPortal/DoodleCollab
```

## Step 2 - install the node modules

```
npm install
```
## Step 3 - Run the app

```
npm run dev
```

## Step 4 - Open in browser

`visit localhost:5173 to run the app`
# React app setup guidelines 🚀

**Hello contributor , i want you to stick to the below listed Setup guidelines to successfully setup the react app in your local system and get started with developing!!**

<br/>

- `Fork` the repo to your account.
- `git clone` to clone the repo

- Now you have the repo in your **local storage**
- You can access the `main` folder to get the webapp access
- Next to setup the react app `npm install`
- Once the node modules and other stuffs are installed , `npm run dev` to start the app in `http://localhost:5173/`
- Make changes **according** to the Tasks assigned to you
- Maintain the folder structure , keep small components like **Navbar, Footer** which stays in every page in `src\constants` folder
- keep other small components which stays in every page in `src\components` folder
- Keep big Pages like **Auth page, Home page** in the `src\pages` folder
- Styles of respective pages should be included in respective folder.
- You are also allowed to use GOOGLE FONTS for same fonts as of figma files.
- Other extra **Pictures, icons , svgs** are to be kept in `src\assets\`
- This website will be fully built in MERN Stack i.e MongoDB, ExpressJS, ReactJS, NodeJS.
- Once you are done with the changes , `git pull` to pull the latest version of the code
- `git add .` to stage for commits
- `git commit -s -m "message"` for commiting the code.
- **REMEMBER** --> YOU NEED TO PULL REQ ON `main` BRANCH !!
- Once done create a Pull Request and wait for the mentor to review.
- Don't forget to attach **`Screenshots, Proper Description and Issue Number` in the Pull request**

<br/>


## Development Setup

Please follow the steps below to set up the development environment and contribute effectively.

### 1. Clone the Repository

```bash
git clone https://github.com/WikiPortal/DoodleCollab
cd DoodleCollab
```

### 2. Install Dependencies

```bash
npm install
```

### 3. Start the Development Server

```bash
npm run dev
```

Visit [http://localhost:5173](http://localhost:5173) in your browser to run the app.

---

## Server Setup

### 1. Locate the server folder

```bash
cd server
```

### 2. Install Dependencies

```bash
npm install
```

### 3. Run the Server

```bash
npm start
```

Visit [http://localhost:5000](http://localhost:5000) in your browser to run the server of the app.

---

### 4. Make Changes

Make changes according to the tasks assigned to you. Follow the project structure and guidelines mentioned in [contributing.md](CONTRIBUTING.md) and [setup.md](Setup.md).

### 5. Commit Changes

```bash
git pull
git add .
git commit -s -m "fix: Updated bla bla bla"
```

### 6. Create a Pull Request

Create a Pull Request on the `main` branch. Attach screenshots, a proper description, and the issue number in the Pull Request.


## Contribution Guidelines 🔐

For detailed contribution guidelines, please refer to [contributing.md](CONTRIBUTING.md).


Happy Contributing! 🎉

Binary file added src/assets/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions src/components/Faq.jsx → src/components/Faq/Faq.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react'
import { motion, AnimatePresence, easeInOut } from 'framer-motion';
import { questionsArray } from '../data/Questions';
import { questionsArray } from '../../data/Questions';

import './faq.css';

Expand Down Expand Up @@ -48,7 +48,7 @@ const Faq = () => {
transition={easeInOut}
>
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true" data-slot="icon" >
<path fill-rule="evenodd" d="M12 3.75a.75.75 0 0 1 .75.75v6.75h6.75a.75.75 0 0 1 0 1.5h-6.75v6.75a.75.75 0 0 1-1.5 0v-6.75H4.5a.75.75 0 0 1 0-1.5h6.75V4.5a.75.75 0 0 1 .75-.75Z" clip-rule="evenodd">
<path fillRule="evenodd" d="M12 3.75a.75.75 0 0 1 .75.75v6.75h6.75a.75.75 0 0 1 0 1.5h-6.75v6.75a.75.75 0 0 1-1.5 0v-6.75H4.5a.75.75 0 0 1 0-1.5h6.75V4.5a.75.75 0 0 1 .75-.75Z" clipRule="evenodd">
</path>
</svg>
</motion.div>
Expand Down
File renamed without changes.
Loading

0 comments on commit d646ce5

Please sign in to comment.