From e0ae51b3549f6f60cb0a36f2db5ecff777ae0f63 Mon Sep 17 00:00:00 2001 From: shrushtidoshi22 Date: Mon, 30 Sep 2024 12:52:56 +0530 Subject: [PATCH 01/13] Add review page html to react conversion --- ui/src/App.js | 2 + ui/src/components/Header.jsx | 79 +++++++++++++++++----------------- ui/src/pages/AddReviewPage.jsx | 74 +++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+), 39 deletions(-) create mode 100644 ui/src/pages/AddReviewPage.jsx diff --git a/ui/src/App.js b/ui/src/App.js index 765c6e4..cc37797 100644 --- a/ui/src/App.js +++ b/ui/src/App.js @@ -7,6 +7,7 @@ import RegisterPage from './pages/RegisterPage'; import AboutPage from './pages/AboutPage'; import BootcampsPage from './pages/BootcampsPage'; import AddBootcampPage from './pages/AddBootcampPage'; +import AddReviewPage from './pages/AddReviewPage'; function App() { return ( @@ -20,6 +21,7 @@ function App() { } /> } /> } /> + } /> diff --git a/ui/src/components/Header.jsx b/ui/src/components/Header.jsx index 0b9f789..5df2e97 100644 --- a/ui/src/components/Header.jsx +++ b/ui/src/components/Header.jsx @@ -13,7 +13,8 @@ function Header() { const [getHeader, SetHeader] = useState(false); useEffect(() => { - if (window.location.href.includes('bootcamps')) { + const currentUrl = window.location.href; + if (currentUrl.includes('bootcamps') || currentUrl.includes('review')) { SetHeader(true); } else { SetHeader(false); @@ -26,45 +27,45 @@ function Header() { {/**/} {getHeader === true ? - - - {/* */} - DevCamp - - - - + + + : diff --git a/ui/src/pages/AddReviewPage.jsx b/ui/src/pages/AddReviewPage.jsx new file mode 100644 index 0000000..1cff1c0 --- /dev/null +++ b/ui/src/pages/AddReviewPage.jsx @@ -0,0 +1,74 @@ +import { AiOutlineLeft } from "react-icons/ai"; +import { Link } from 'react-router-dom'; +import React, { useState } from 'react'; + +const AddReviewPage = () => { + const [rating, setRating] = useState(8); + const handleRatingChange = (event) => { + setRating(event.target.value); + }; + return ( +
+
+
+
+
+
+ + Bootcamp Info + +

DevWorks Bootcamp

+

Write a Review

+

+ You must have attended and graduated this bootcamp to review +


+
+
+ + +
+
+ +
+
+ +
+
+ +
+
+
+
+
+
+
+
+ ); +}; + +export default AddReviewPage; \ No newline at end of file From 3c348f7eba84db206e7303dcc0350c2935b14da8 Mon Sep 17 00:00:00 2001 From: shrushtidoshi22 Date: Tue, 1 Oct 2024 12:53:55 +0530 Subject: [PATCH 02/13] Changes made as instructed to AddBootCampPage and AddReviewPage --- ui/src/App.js | 4 +- ui/src/pages/AddBootcampPage.jsx | 2 +- ui/src/pages/AddReviewPage.jsx | 131 +++++++++++++++++-------------- 3 files changed, 73 insertions(+), 64 deletions(-) diff --git a/ui/src/App.js b/ui/src/App.js index cc37797..872a7ba 100644 --- a/ui/src/App.js +++ b/ui/src/App.js @@ -21,8 +21,8 @@ function App() { } /> } /> } /> - } /> - + }/> + ); diff --git a/ui/src/pages/AddBootcampPage.jsx b/ui/src/pages/AddBootcampPage.jsx index 594148d..0c3d332 100644 --- a/ui/src/pages/AddBootcampPage.jsx +++ b/ui/src/pages/AddBootcampPage.jsx @@ -155,7 +155,7 @@ const AddBootcampPage = () => { {/*Cancel { + const { bootcampId } = useParams(); // Get bootcampId from URL parameters const [rating, setRating] = useState(8); - const handleRatingChange = (event) => { - setRating(event.target.value); - }; + + const handleRatingChange = (event) => { + setRating(event.target.value); + }; + return ( -
-
-
-
-
-
- - Bootcamp Info - -

DevWorks Bootcamp

-

Write a Review

-

- You must have attended and graduated this bootcamp to review -


-
-
- - -
-
- -
-
- -
-
- +
+
+
+
+
+
+ {/* Update Link to go back to the specific bootcamp details */} + + Bootcamp Info + + +

DevWorks Bootcamp

+

Write a Review

+

+ You must have attended and graduated this bootcamp to review. +

+
+ +
+ + +
+ +
+ +
+ +
+ +
+ +
+ +
+
- +
-
-
-
+ ); }; -export default AddReviewPage; \ No newline at end of file +export default AddReviewPage; From ed0802986f2c69b2b02b67ef398d1b7135b1bdad Mon Sep 17 00:00:00 2001 From: Prasad Honrao Date: Tue, 1 Oct 2024 11:23:33 +0100 Subject: [PATCH 03/13] Update page title in index.html and fix route path for adding reviews --- ui/public/index.html | 2 +- ui/src/App.js | 5 +- ui/src/components/Header.jsx | 111 +++++++++++++++++++---------------- 3 files changed, 65 insertions(+), 53 deletions(-) diff --git a/ui/public/index.html b/ui/public/index.html index ddd2b04..d021417 100644 --- a/ui/public/index.html +++ b/ui/public/index.html @@ -5,7 +5,7 @@ - MERN Bootcamp + DevCamper | Find a coding bootcamp diff --git a/ui/src/App.js b/ui/src/App.js index 872a7ba..a21dbfe 100644 --- a/ui/src/App.js +++ b/ui/src/App.js @@ -1,5 +1,4 @@ import { BrowserRouter as Router, Route, Routes } from 'react-router-dom'; -import Header from './components/Header'; import Layout from './components/Layout'; import HomePage from './pages/HomePage'; import LoginPage from './pages/LoginPage'; @@ -21,8 +20,8 @@ function App() { } /> } /> } /> - }/> - + } /> + ); diff --git a/ui/src/components/Header.jsx b/ui/src/components/Header.jsx index 5df2e97..6b33af9 100644 --- a/ui/src/components/Header.jsx +++ b/ui/src/components/Header.jsx @@ -1,15 +1,18 @@ +// React and Hooks Imports +import { useEffect, useState } from 'react'; + +// Third-Party Library Imports import { Link } from 'react-router-dom'; import Container from 'react-bootstrap/Container'; import Nav from 'react-bootstrap/Nav'; import Navbar from 'react-bootstrap/Navbar'; import NavDropdown from 'react-bootstrap/NavDropdown'; -import { FaGraduationCap, FaSignInAlt, FaUserPlus, FaLaptopCode, FaSignOutAlt, FaUser, FaSearch } from 'react-icons/fa'; -import "../styles/bootstrap.css"; -import { useEffect, useState } from 'react'; -import { Image } from 'react-bootstrap'; +import { FaSignInAlt, FaUserPlus, FaSignOutAlt, FaUser, FaSearch } from 'react-icons/fa'; -function Header() { +// Local Imports +import '../styles/bootstrap.css'; +function Header() { const [getHeader, SetHeader] = useState(false); useEffect(() => { @@ -21,57 +24,66 @@ function Header() { } }, []); - return ( <> {/**/} - {getHeader === true ? + {getHeader === true ? ( - - - {/* */} - DevCamp - - - - + + + + ) : ( {/* */} - DevCamp + DevCamp @@ -89,9 +101,10 @@ function Header() { - } + + )} ); } -export default Header; \ No newline at end of file +export default Header; From a039be79a05d50bd8ddab860a3a7c05477bb655d Mon Sep 17 00:00:00 2001 From: Prasad Honrao Date: Wed, 2 Oct 2024 12:52:05 +0100 Subject: [PATCH 04/13] Add code of conduct file --- CODE_OF_CONDUCT.md | 128 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 128 insertions(+) create mode 100644 CODE_OF_CONDUCT.md diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..ff53dbf --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,128 @@ +# 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, +nationality, 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 responsible for enforcement at +honrao.prasad@gmail.com. +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. From 444378fa47934aa6a0b4a60a20f0ab0b36f8e6ff Mon Sep 17 00:00:00 2001 From: Prasad Honrao Date: Wed, 2 Oct 2024 20:46:12 +0100 Subject: [PATCH 05/13] Add UI CI/CD workflow --- .github/workflows/ui-ci-cd.yml | 64 ++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 .github/workflows/ui-ci-cd.yml diff --git a/.github/workflows/ui-ci-cd.yml b/.github/workflows/ui-ci-cd.yml new file mode 100644 index 0000000..8cda74b --- /dev/null +++ b/.github/workflows/ui-ci-cd.yml @@ -0,0 +1,64 @@ +name: UI - CI/CD + +on: + push: + branches: + - development + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - name: Set up Node.js version + uses: actions/setup-node@v3 + with: + node-version: '20.x' + + - name: npm install, build, and test + run: | + npm install + npm run build --if-present + npm run test --if-present + working-directory: ./ui + + - name: Zip artifact for deployment + run: zip release.zip ./* -r + working-directory: ./ui + + - name: Upload artifact for deployment job + uses: actions/upload-artifact@v4 + with: + name: node-app + path: .ui/release.zip + + deploy: + runs-on: ubuntu-latest + needs: build + environment: + name: 'dev' + + steps: + - name: Download artifact from build job + uses: actions/download-artifact@v2 + with: + name: node-app + path: . + + - name: Unzip artifact + run: unzip release.zip + + - name: 'Login to Azure' + uses: azure/login@v1 + with: + creds: ${{ secrets.Azure_Service_Principal }} + + - name: 'Deploy to Azure Web App' + uses: azure/webapps-deploy@v2 + with: + app-name: 'devcamper-webapp' # Replace with your Azure App Service name + slot-name: 'dev' # Specify the slot name (e.g., 'dev' for development slot) + package: . # Ensure this points to the correct directory or file From d640d5bc40a9d0586bd9dc6a8661bdbac012de35 Mon Sep 17 00:00:00 2001 From: Prasad Honrao Date: Wed, 2 Oct 2024 20:48:43 +0100 Subject: [PATCH 06/13] Refactor Header component imports --- ui/src/components/Header.jsx | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/ui/src/components/Header.jsx b/ui/src/components/Header.jsx index 3c57925..085e33c 100644 --- a/ui/src/components/Header.jsx +++ b/ui/src/components/Header.jsx @@ -3,17 +3,6 @@ import { Link } from 'react-router-dom'; import { Nav, NavDropdown, Navbar, Container } from 'react-bootstrap'; import { FaSignInAlt, FaUserPlus, FaSignOutAlt, FaUser, FaSearch } from 'react-icons/fa'; -// React and Hooks Imports -import { useEffect, useState } from 'react'; - -// Third-Party Library Imports -import { Link } from 'react-router-dom'; -import Container from 'react-bootstrap/Container'; -import Nav from 'react-bootstrap/Nav'; -import Navbar from 'react-bootstrap/Navbar'; -import NavDropdown from 'react-bootstrap/NavDropdown'; -import { FaSignInAlt, FaUserPlus, FaSignOutAlt, FaUser, FaSearch } from 'react-icons/fa'; - // Local Imports import '../styles/bootstrap.css'; From 0fda490e8254cce312378770725ac8919b81fa5b Mon Sep 17 00:00:00 2001 From: Prasad Honrao Date: Wed, 2 Oct 2024 20:53:01 +0100 Subject: [PATCH 07/13] Refactor anchor href to root path to fix build error --- ui/src/pages/BootcampsPage.jsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ui/src/pages/BootcampsPage.jsx b/ui/src/pages/BootcampsPage.jsx index bdec770..905103d 100644 --- a/ui/src/pages/BootcampsPage.jsx +++ b/ui/src/pages/BootcampsPage.jsx @@ -85,7 +85,7 @@ const BrowseBootcampsPage = () => {
- + Devworks Bootcamp 8.8 @@ -105,7 +105,7 @@ const BrowseBootcampsPage = () => {
- + ModernTech Bootcamp 7.5 @@ -124,7 +124,7 @@ const BrowseBootcampsPage = () => {
- + Codemasters 9.2 @@ -144,7 +144,7 @@ const BrowseBootcampsPage = () => {
- + DevCentral Bootcamp 6.4 @@ -160,27 +160,27 @@ const BrowseBootcampsPage = () => {