From 98a68ffa7df28fe099178dcc52ee1e765deae0e4 Mon Sep 17 00:00:00 2001 From: "Yash Pandey (YP)" Date: Mon, 27 Dec 2021 15:14:05 +0530 Subject: [PATCH 01/13] feat: Configured heroku dyno (#14) --- .nvmrc | 1 + Procfile | 1 + 2 files changed, 2 insertions(+) create mode 100644 .nvmrc create mode 100644 Procfile diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..58a4133 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +16.13.0 diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..b9d09aa --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: cd server && yarn && yarn start From ada7cf2244e9672ca1c8dfb2723b8c89c2864e49 Mon Sep 17 00:00:00 2001 From: Shubham Kushwaha <65639964+EricLiclair@users.noreply.github.com> Date: Thu, 30 Dec 2021 12:29:24 +0530 Subject: [PATCH 02/13] Adding Next & Mui : Theming + Initial Folder Structure (#15) * removed cra + added next * theming + views + initial folder structure * gitignore + readme * Delete .gitignore * Delete Code_of_CONDUCT.md Co-authored-by: Yash Pandey (YP) --- .gitignore | 1 + Code_of_CONDUCT.md | 127 - README.md | 2 +- client/.eslintrc.json | 3 + client/Dockerfile | 2 +- client/components/footer/index.jsx | 29 + client/components/index.js | 4 + client/components/navbar/index.jsx | 9 + client/next.config.js | 3 + client/package.json | 50 +- client/pages/404.js | 5 + client/pages/_app.js | 19 + client/pages/api/hello.js | 5 + client/pages/index.js | 7 + client/public/favicon.ico | Bin 3870 -> 25931 bytes client/public/index.html | 43 - client/public/logo192.png | Bin 5347 -> 0 bytes client/public/logo512.png | Bin 9664 -> 0 bytes client/public/manifest.json | 25 - client/public/robots.txt | 3 - client/public/vercel.svg | 4 + client/src/App.css | 38 - client/src/App.js | 25 - client/src/App.test.js | 8 - client/src/index.css | 13 - client/src/index.js | 17 - client/src/logo.svg | 1 - client/src/reportWebVitals.js | 13 - client/src/setupTests.js | 5 - client/styles/Home.module.css | 0 client/styles/globals.css | 16 + client/theme/theme.js | 74 + client/views/error/index.js | 11 + .../home/components/underconstruction.js | 13 + client/views/home/index.jsx | 22 + client/views/index.js | 6 + client/yarn.lock | 12656 +++------------- 37 files changed, 2527 insertions(+), 10732 deletions(-) delete mode 100644 Code_of_CONDUCT.md create mode 100644 client/.eslintrc.json create mode 100644 client/components/footer/index.jsx create mode 100644 client/components/index.js create mode 100644 client/components/navbar/index.jsx create mode 100644 client/next.config.js create mode 100644 client/pages/404.js create mode 100644 client/pages/_app.js create mode 100644 client/pages/api/hello.js create mode 100644 client/pages/index.js delete mode 100644 client/public/index.html delete mode 100644 client/public/logo192.png delete mode 100644 client/public/logo512.png delete mode 100644 client/public/manifest.json delete mode 100644 client/public/robots.txt create mode 100644 client/public/vercel.svg delete mode 100644 client/src/App.css delete mode 100644 client/src/App.js delete mode 100644 client/src/App.test.js delete mode 100644 client/src/index.css delete mode 100644 client/src/index.js delete mode 100644 client/src/logo.svg delete mode 100644 client/src/reportWebVitals.js delete mode 100644 client/src/setupTests.js create mode 100644 client/styles/Home.module.css create mode 100644 client/styles/globals.css create mode 100644 client/theme/theme.js create mode 100644 client/views/error/index.js create mode 100644 client/views/home/components/underconstruction.js create mode 100644 client/views/home/index.jsx create mode 100644 client/views/index.js diff --git a/.gitignore b/.gitignore index 00be6f6..df0d8dd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ node_modules !.env.dev build *.log +.next diff --git a/Code_of_CONDUCT.md b/Code_of_CONDUCT.md deleted file mode 100644 index 5ef1d8f..0000000 --- a/Code_of_CONDUCT.md +++ /dev/null @@ -1,127 +0,0 @@ -# Contributor Covenant Code of Conduct - -## Our Pledge - -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -personal appearance, race, religion, or sexual identity and orientation. - -We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. - -## Our Standards - -Examples of behavior that contributes to a positive environment for our -community include: - -* Demonstrating empathy and kindness toward other people -* Being respectful of differing opinions, viewpoints, and experiences -* Giving and gracefully accepting constructive feedback -* Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* Focusing on what is best not just for us as individuals, but for the - overall community - -Examples of unacceptable behavior include: - -* The use of sexualized language or imagery, and sexual attention or - advances of any kind -* Trolling, insulting or derogatory comments, and personal or political attacks -* Public or private harassment -* Publishing others' private information, such as a physical or email - address, without their explicit permission -* Other conduct which could reasonably be considered inappropriate in a - professional setting - -## Enforcement Responsibilities - -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. - -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. - -## Scope - -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. - -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders for enforcement at -[houseofgeeks@iiitranchi.ac.in](mailto:houseofgeeks@iiitranchi.ac.in) -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - -## Enforcement Guidelines - -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: - -### 1. Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. Warning - -**Community Impact**: A violation through a single incident or series -of actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or -permanent ban. - -### 3. Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within -the community. - -## Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.0, available at -https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. - -Community Impact Guidelines were inspired by [Mozilla's code of conduct -enforcement ladder](https://github.com/mozilla/diversity). - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. diff --git a/README.md b/README.md index 665534c..e881cb4 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ the Training and Placement Cell of yarn ``` -- Run `yarn start` to start the development server. +- Run `yarn dev` to start the development server. ## Contributing Guide diff --git a/client/.eslintrc.json b/client/.eslintrc.json new file mode 100644 index 0000000..bffb357 --- /dev/null +++ b/client/.eslintrc.json @@ -0,0 +1,3 @@ +{ + "extends": "next/core-web-vitals" +} diff --git a/client/Dockerfile b/client/Dockerfile index 538ecb8..f534c31 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -8,4 +8,4 @@ RUN yarn COPY . . EXPOSE 3000 -CMD [ "yarn", "start" ] +CMD [ "yarn", "dev" ] diff --git a/client/components/footer/index.jsx b/client/components/footer/index.jsx new file mode 100644 index 0000000..dfc8a87 --- /dev/null +++ b/client/components/footer/index.jsx @@ -0,0 +1,29 @@ +import { Box, Link, Typography } from '@mui/material' +import React from 'react' + +export default function Footer() { + return ( + + Footer + A property of {' '} + + IIIT Ranchi + +
+ Developed by{' '} + + House of Geeks + + + ) +} diff --git a/client/components/index.js b/client/components/index.js new file mode 100644 index 0000000..5009a2e --- /dev/null +++ b/client/components/index.js @@ -0,0 +1,4 @@ +// this directory is for all the globally used components (generally themed mui-components, navbar, footer, etc) +import Footer from "./footer"; +import Navbar from "./navbar"; +export { Navbar, Footer }; \ No newline at end of file diff --git a/client/components/navbar/index.jsx b/client/components/navbar/index.jsx new file mode 100644 index 0000000..31e3625 --- /dev/null +++ b/client/components/navbar/index.jsx @@ -0,0 +1,9 @@ +import { Typography, Box } from '@mui/material' +import React from 'react' +export default function Navbar() { + return ( + + Navbar + + ) +} diff --git a/client/next.config.js b/client/next.config.js new file mode 100644 index 0000000..0d60710 --- /dev/null +++ b/client/next.config.js @@ -0,0 +1,3 @@ +module.exports = { + reactStrictMode: true, +} diff --git a/client/package.json b/client/package.json index 0ed8465..3aca35d 100644 --- a/client/package.json +++ b/client/package.json @@ -1,39 +1,23 @@ { "name": "client", - "version": "0.1.0", "private": true, - "dependencies": { - "@testing-library/jest-dom": "^5.11.4", - "@testing-library/react": "^11.1.0", - "@testing-library/user-event": "^12.1.10", - "react": "^17.0.2", - "react-dom": "^17.0.2", - "react-scripts": "4.0.3", - "web-vitals": "^1.0.1" - }, "scripts": { - "start": "react-scripts start", - "build": "react-scripts build", - "test": "react-scripts test", - "eject": "react-scripts eject" + "dev": "next dev", + "build": "next build", + "start": "next start", + "lint": "next lint" }, - "eslintConfig": { - "extends": [ - "react-app", - "react-app/jest" - ] - }, - "browserslist": { - "production": [ - ">0.2%", - "not dead", - "not op_mini all" - ], - "development": [ - "last 1 chrome version", - "last 1 firefox version", - "last 1 safari version" - ] + "dependencies": { + "@emotion/react": "^11.7.0", + "@emotion/styled": "^11.6.0", + "@mui/icons-material": "^5.2.1", + "@mui/material": "^5.2.3", + "next": "12.0.7", + "react": "17.0.2", + "react-dom": "17.0.2" }, - "proxy": "http://localhost:5000" -} + "devDependencies": { + "eslint": "8.5.0", + "eslint-config-next": "12.0.7" + } +} \ No newline at end of file diff --git a/client/pages/404.js b/client/pages/404.js new file mode 100644 index 0000000..a02c30d --- /dev/null +++ b/client/pages/404.js @@ -0,0 +1,5 @@ +import { Error404 } from '../views' + +export default function Custom404() { + return +} diff --git a/client/pages/_app.js b/client/pages/_app.js new file mode 100644 index 0000000..af33d15 --- /dev/null +++ b/client/pages/_app.js @@ -0,0 +1,19 @@ +// styling +import '../styles/globals.css' + +// theming +import { ThemeProvider } from '@mui/material/styles'; +import theme from '../theme/theme'; + +// views +import { Footer, Navbar } from '../components'; + +function MyApp({ Component, pageProps }) { + return + + +