Skip to content

Commit

Permalink
Fix/update README (#26)
Browse files Browse the repository at this point in the history
* Remove README from .github to fix overriding

* Update README for this project

* Fix image sizes

* Fix image sizes

* added Ainfo for Alice Fang

* Add Matthew's Profile Picture

* Update README.md

* added Ishaan's info

Co-authored-by: Alice Fang <[email protected]>
Co-authored-by: Matthew Walowski <[email protected]>
Co-authored-by: Amit Sawhney <[email protected]>
Co-authored-by: ishaansharma <[email protected]>
  • Loading branch information
5 people authored Jan 18, 2021
1 parent 73195e3 commit b5879e5
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 22 deletions.
1 change: 0 additions & 1 deletion .github/README.md

This file was deleted.

31 changes: 10 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
<h1 align="center">
<a href="https://uiuc.hack4impact.org"><img src="https://raw.githubusercontent.com/hack4impact-uiuc/uiuc.hack4impact.org/master/public/images/colored-logo.svg" alt="YMCA logo" width="150"></a>
<br/>
MERN Template
Member Database Tool
</br>
</h1>

<p align="center">
<img src="https://img.shields.io/circleci/build/github/hack4impact-uiuc/mern_template/main?style=flat-square">
<img src="https://img.shields.io/badge/license-MIT-blue?style=flat-square">
</p>

<h4 align="center">A project by <a href="https://uiuc.hack4impact.org/" target="_blank">Hack4Impact UIUC</a> in collaboration with <a href="https://pineapple.lol" target="_blank">pineapplelol.</a></h4>
<h4 align="center">A project by <a href="https://uiuc.hack4impact.org/" target="_blank">Hack4Impact UIUC</a> for Spring 2021 Tech Lead Training.</a></h4>

<p align="center">
<a href="#background">Background</a> •
Expand All @@ -22,13 +21,11 @@

## Background

MERN is one of the most widely used stacks for modern web development. Composed of [MongoDB](https://www.mongodb.com), [Express](https://expressjs.com), [React](https://reactjs.org), and [Node](https://nodejs.org/en/), MERN represents the full stack from the frontend to the backend.

This template is a starting repository for setting up a MERN project. It includes directories for both the frontend and backend, as well as linting and testing workflows and settings.
Tracks member information and notes for the org. [See full PRD here](https://docs.google.com/document/d/1mP3gnZC-b1jFvzx8X62Tq7y4x6jRPuFTHly-pVwRgls/edit?usp=sharing).

## Usage

The latest version of this application can be found at [pineapple.lol](https://pineapple.lol).
The latest version of this application can be found at [memberdb-tool.vercel.app](https://memberdb-tool.vercel.app).

To install and set up locally, follow the instructions in the [`/client`](https://github.com/hack4impact-uiuc/mern_template/tree/main/client) and [`/api`](https://github.com/hack4impact-uiuc/mern_template/tree/main/api) directories.

Expand All @@ -40,22 +37,14 @@ This application is built with React, Express, MongoDB, and tested with Cypress

<table align="center">
<tr>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/product/1014241/LINEStorePC/main.png" width="75px;" alt="Pusheen"/><br /><b>Pusheen</b></a><br /><sub>Product Manager</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637244/android/sticker.png" width="75px;" alt="Unicorn Pusheen"/><br /><b>Unicorn Pusheen</b></a><br /><sub>Technical Lead</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637275/android/sticker.png" width="75px;" alt="Pilot Pusheen"/><br /><b>Pilot Pusheen</b></a><br /><sub>Product Designer</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637273/android/sticker.png" width="75px;" alt="Angry Pusheen"/><br /><b>Angry Pusheen</b></a><br /><sub>Product Researcher</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637255/android/sticker.png" width="75px;" alt="Chef Pusheen"/><br /><b>Chef Pusheen</b></a><br /><sub>Software Developer</sub></td>
</tr>
<tr>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637245/android/sticker.png" width="75px;" alt="Sad Pusheen"/><br /><b>Sad Pusheen</b></a><br /><sub>Software Developer</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637258/android/sticker.png" width="75px;" alt="Silly Pusheen"/><br /><b>Silly Pusheen</b></a><br /><sub>Software Developer</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637256/android/sticker.png" width="75px;" alt="Coffee Pusheen"/><br /><b>Coffee Pusheen</b></a><br /><sub>Software Developer</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637246/android/sticker.png" width="75px;" alt="Chatty Pusheen"/><br /><b>Chatty Pusheen</b></a><br /><sub>Software Developer</sub></td>
<td align="center"><a href="https://neeraj.lol"><img src="https://stickershop.line-scdn.net/stickershop/v1/sticker/637251/android/sticker.png" width="75px;" alt="Cookie Pusheen"/><br /><b>Cookie Pusheen</b></a><br /><sub>Software Developer</sub></td>

<td align="center"><a href="https://www.linkedin.com/in/alicesf2/"><img src="https://media-exp1.licdn.com/dms/image/C4E03AQFT2hqGjVdINA/profile-displayphoto-shrink_200_200/0/1594157771622?e=1616025600&v=beta&t=NX191E0URDPlV6uXPuGROxDJI-UGKYAZmLb8oJyhwyo" width="125px;" alt="Pusheen"/><br /><b>Alice Fang</b></a><br /><sub>Technical Lead</sub></td>
<td align="center"><a href="https://www.linkedin.com/in/matthew-walowski/"><img src="https://media-exp1.licdn.com/dms/image/C5603AQGdnDuAv9d9YQ/profile-displayphoto-shrink_400_400/0/1610475936652?e=1616025600&v=beta&t=Sna8pEfgzUlOGtmuteSswIFvINzF8Bxk1VjMYvVztvw" width="125px;" alt="Matthew Walowski"/><br /><b>Matthew Walowski</b></a><br /><sub>Technical Lead</sub></td>
<td align="center"><a href="https://www.linkedin.com/in/jeffrey-tang/"><img src="https://raw.githubusercontent.com/hack4impact-uiuc/closegap/master/.github/team_pics/jeffrey.jpg" width="125px;" alt="Jeffrey Tang"/><br /><b>Jeffrey Tang</b></a><br /><sub>Technical Lead</sub></td>
<td align="center"><a href="https://www.linkedin.com/in/amit-m-sawhney/"><img src="https://media-exp1.licdn.com/dms/image/C4D03AQF6eWCL4Z8_qg/profile-displayphoto-shrink_400_400/0/1595738823858?e=1616025600&v=beta&t=T3w5-H_yOqKLRZqNmfW9tMb7wN939e6CMuXqL1HpF6U" width="125px;" alt="Angry Pusheen"/><br /><b>Amit Sawhney</b></a><br /><sub>Software Developer</sub></td>
<td align="center"><a href="www.linkedin.com/in/ishaan-r-sharma"><img src="https://media-exp1.licdn.com/dms/image/C5603AQFAVxJujLhpZg/profile-displayphoto-shrink_400_400/0/1610957839107?e=1616630400&v=beta&t=CbltImSSzDrs8_90ZnJ1pERoPe1D0mvE47giPB5yPI0" width="125px;" alt="Chef Pusheen"/><br /><b>Ishaan Sharma</b></a><br /><sub>Software Developer</sub></td>
</tr>
</table>

## License

[MIT](https://github.com/hack4impact-uiuc/ymca/blob/master/LICENSE) licensed. Copyright © 2020 [Hack4Impact UIUC](https://github.com/hack4impact-uiuc).
[MIT](https://github.com/hack4impact-uiuc/ymca/blob/master/LICENSE) licensed. Copyright © 2021 [Hack4Impact UIUC](https://github.com/hack4impact-uiuc).

1 comment on commit b5879e5

@vercel
Copy link

@vercel vercel bot commented on b5879e5 Jan 18, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.