From b91913605baa1f7f07a346a82746f953606cdb63 Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Fri, 25 Aug 2023 20:54:13 +0530 Subject: [PATCH 01/31] footer bug solved --- package-lock.json | 2 +- package.json | 3 +-- src/Style.css | 3 ++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0559d55df..a200c4a6f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -22,7 +22,7 @@ "react-dom": "^18.2.0", "react-icons": "^4.10.1", "react-router-dom": "^6.15.0", - "react-scripts": "5.0.1", + "react-scripts": "^5.0.1", "react-tsparticles": "^2.12.2", "styled-components": "^6.0.7", "typewriter-effect": "^2.20.1", diff --git a/package.json b/package.json index 6ccfee6e1..7d200cf67 100644 --- a/package.json +++ b/package.json @@ -20,9 +20,8 @@ "react-icons": "^4.10.1", "react-router-dom": "^6.15.0", "react-scripts": "^5.0.1", - "styled-components": "^6.0.7", - "react-scripts": "5.0.1", "react-tsparticles": "^2.12.2", + "styled-components": "^6.0.7", "typewriter-effect": "^2.20.1", "web-vitals": "^2.1.4" }, diff --git a/src/Style.css b/src/Style.css index a2add2b30..2fb3e747c 100644 --- a/src/Style.css +++ b/src/Style.css @@ -149,7 +149,7 @@ button:focus { padding: 0.8rem 1rem !important; } -@media (max-width: 767px) { +@media (max-width: 768px) { .nav-link { padding: 0.7rem 1rem !important; } @@ -411,6 +411,7 @@ button:focus { bottom: 0 !important; padding-top: 10px !important; padding-bottom: 8px !important; + margin-top: auto; } .footer-copywright { From 43e4c47f2cd22ca4bfa2d2a58d8dac3b86451889 Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Sat, 26 Aug 2023 21:35:34 +0530 Subject: [PATCH 02/31] Merge branch 'main' of https://github.com/DIEMS-HUB/IETE-Website --- src/Style.css | 6 ++++-- src/components/Home2.js | 12 +++++++++++- src/index.css | 4 ++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/Style.css b/src/Style.css index 2fb3e747c..8d595940d 100644 --- a/src/Style.css +++ b/src/Style.css @@ -54,7 +54,7 @@ button:focus { /* Navbar Section */ /* --------- */ .sticky { - background-color: #2e1a1aa9 !important; + background-color: rgba(43, 41, 53, 0.663)!important; transition: all 0.3s ease-out 0s !important; box-shadow: 0px 10px 10px 0px rgba(29, 5, 5, 0.171) !important; backdrop-filter: blur(15px) !important; @@ -336,7 +336,9 @@ button:focus { } .home-about-body { - padding-top: 30px; + padding-left: 150px !important; + padding-right: 150px !important; + justify-content: center; font-size: 1.2em !important; text-align: center; } diff --git a/src/components/Home2.js b/src/components/Home2.js index 6427f63a2..4352c9374 100644 --- a/src/components/Home2.js +++ b/src/components/Home2.js @@ -8,6 +8,7 @@ import { import { FaLinkedinIn } from "react-icons/fa"; import About from "./About"; import Faculty from "./Faculty"; +import wrldmap from "../assets/undraw_connected_world_wuay.svg" function Home2() { return ( @@ -18,7 +19,16 @@ function Home2() {

What is IETE Student Forum ?

-

+ world map +


IETE ISF is a student-driven initiative affiliated with the Institution of Electronics and Telecommunication Engineers (IETE). It aims to empower students by fostering collaborations with leading industry players, organizing industry-centric events, workshops, seminars, and networking opportunities. By bringing students and industry experts together, IETE ISF facilitates knowledge exchange, career development, and innovation in line with the latest industry trends and practices. diff --git a/src/index.css b/src/index.css index 374d198a3..224dc3e60 100644 --- a/src/index.css +++ b/src/index.css @@ -1,7 +1,7 @@ -@import url("https://fonts.googleapis.com/css2?family=Nunito:wght@500&display=swap"); +@import url("https://fonts.googleapis.com/css2?family=Roboto:wght@500&display=swap"); body { margin: 0; - font-family: "Nunito", serif !important; + font-family: "Roboto", serif !important; -webkit-font-smoothing: antialiased; -moz-osx-font-smoothing: grayscale; background-image: linear-gradient(to left,rgb(23, 26, 30), rgb(33, 37, 41)); From 2af24ff8fe3903cef83020cdc4e19955ecfd904c Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Sat, 26 Aug 2023 21:39:14 +0530 Subject: [PATCH 03/31] Merge branch 'main' of https://github.com/Akshayp02/IETE-Website --- src/components/Faculty.js | 2 +- src/components/Home.js | 2 +- src/components/Projectcards.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/Faculty.js b/src/components/Faculty.js index e5d211089..842818a42 100644 --- a/src/components/Faculty.js +++ b/src/components/Faculty.js @@ -13,7 +13,7 @@ class Faculty extends Component {

A word from Faculty Coordinator

-

+


diff --git a/src/components/Home.js b/src/components/Home.js index 93f499f51..3ea54df01 100644 --- a/src/components/Home.js +++ b/src/components/Home.js @@ -25,7 +25,7 @@ function Home() {

Welcome to - Institute of Electronics and Telecommunication Engineers DIEMS ISF + < span className="main-name"> Institution of Electronics and Telecommunication Engineers DIEMS Student Forum

diff --git a/src/components/Projectcards.js b/src/components/Projectcards.js index f73f33786..58b1db336 100644 --- a/src/components/Projectcards.js +++ b/src/components/Projectcards.js @@ -8,7 +8,7 @@ function ProjectCards(props) { - {props.title} + {props.title} {props.description} From c54a2bc78d86f808b67dda08595caaa734dd0c56 Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Sat, 26 Aug 2023 21:39:49 +0530 Subject: [PATCH 04/31] style.css file added --- src/assets/undraw_connected_world_wuay.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/undraw_connected_world_wuay.svg b/src/assets/undraw_connected_world_wuay.svg index 7b767d466..a78292ccf 100644 --- a/src/assets/undraw_connected_world_wuay.svg +++ b/src/assets/undraw_connected_world_wuay.svg @@ -1 +1 @@ -connected world \ No newline at end of file + \ No newline at end of file From f18f63b738efe6de79fa1f8eeaeef9199742eca9 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Sat, 26 Aug 2023 22:07:30 +0530 Subject: [PATCH 05/31] done with #54 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0ffcd7c36..f23ae1601 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Empowering Tomorrow: By Students For Students Our mission is to educate through workshops, connect minds for innovation, and drive change. DIEMS IETE ISF nurtures a culture of curiosity, collaboration, and positive tech-driven transformation. -

What stack is WeMakeDevs built on?

+

What stack is IETE-Website built on?

react logo javascript logo From 436cbf3ec9632711d3b2acdc42541e217fb1229f Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Tue, 29 Aug 2023 22:24:37 +0530 Subject: [PATCH 06/31] build-test workflow added --- .github/workflows/build-test.yml | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 .github/workflows/build-test.yml diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml new file mode 100644 index 000000000..4c5a38fce --- /dev/null +++ b/.github/workflows/build-test.yml @@ -0,0 +1,38 @@ +name: Build and Test + +on: + push: + branches: + - main + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: 17 + + - name: Install frontend dependencies + run: npm install --prefix frontend + + - name: Build frontend + run: npm run build --prefix frontend + + - name: Set up backend Node.js + uses: actions/setup-node@v2 + with: + node-version: 17 + + - name: Install backend dependencies + run: npm install + working-directory: backend + + - name: Run backend tests + run: npm test + working-directory: backend From 540304b20dc5fa2f24abb22001ed19f6aaceee1f Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:51:38 +0530 Subject: [PATCH 07/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 4c5a38fce..df210e4de 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -16,7 +16,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v2 with: - node-version: 17 + node-version: 14 - name: Install frontend dependencies run: npm install --prefix frontend @@ -27,7 +27,7 @@ jobs: - name: Set up backend Node.js uses: actions/setup-node@v2 with: - node-version: 17 + node-version: 14 - name: Install backend dependencies run: npm install From f84034e8f0062e7e2efea95c1d2c43c318d058f9 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:53:23 +0530 Subject: [PATCH 08/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index df210e4de..b28738e6a 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -18,21 +18,11 @@ jobs: with: node-version: 14 - - name: Install frontend dependencies - run: npm install --prefix frontend - - - name: Build frontend - run: npm run build --prefix frontend - - - name: Set up backend Node.js - uses: actions/setup-node@v2 - with: - node-version: 14 - - - name: Install backend dependencies + - name: Install dependencies run: npm install - working-directory: backend - - name: Run backend tests + - name: Build + run: npm run build + + - name: Run tests run: npm test - working-directory: backend From 97c41ce63974ebd758757dccef5cbacaeacf1ef6 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:57:22 +0530 Subject: [PATCH 09/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index b28738e6a..df210e4de 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -18,11 +18,21 @@ jobs: with: node-version: 14 - - name: Install dependencies - run: npm install + - name: Install frontend dependencies + run: npm install --prefix frontend + + - name: Build frontend + run: npm run build --prefix frontend - - name: Build - run: npm run build + - name: Set up backend Node.js + uses: actions/setup-node@v2 + with: + node-version: 14 + + - name: Install backend dependencies + run: npm install + working-directory: backend - - name: Run tests + - name: Run backend tests run: npm test + working-directory: backend From 5c50f023d51d23b13766751a90d88ac0b5e74170 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Tue, 29 Aug 2023 22:59:55 +0530 Subject: [PATCH 10/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index df210e4de..aab527b37 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -22,7 +22,8 @@ jobs: run: npm install --prefix frontend - name: Build frontend - run: npm run build --prefix frontend + run: npm run build --prefix ./frontend + - name: Set up backend Node.js uses: actions/setup-node@v2 From 9862566f497da30724549f74c2132e6d2a3e2a10 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Tue, 29 Aug 2023 23:02:31 +0530 Subject: [PATCH 11/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index aab527b37..f11bef199 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -18,13 +18,12 @@ jobs: with: node-version: 14 - - name: Install frontend dependencies - run: npm install --prefix frontend - + - name: Print working directory + run: echo $PWD + - name: Build frontend - run: npm run build --prefix ./frontend + run: npm run build --prefix /full/path/to/frontend - - name: Set up backend Node.js uses: actions/setup-node@v2 with: From 209f11bd3c1ebbe3353728cc206c1c913f968831 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 07:07:40 +0530 Subject: [PATCH 12/31] Update_buildtest.yml --- .github/workflows/buildtest.yml | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index f11bef199..b28738e6a 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -18,21 +18,11 @@ jobs: with: node-version: 14 - - name: Print working directory - run: echo $PWD - - - name: Build frontend - run: npm run build --prefix /full/path/to/frontend - - - name: Set up backend Node.js - uses: actions/setup-node@v2 - with: - node-version: 14 - - - name: Install backend dependencies + - name: Install dependencies run: npm install - working-directory: backend - - name: Run backend tests + - name: Build + run: npm run build + + - name: Run tests run: npm test - working-directory: backend From 4845624c8181b14b777acaa5e987d52ae540897a Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:46:45 +0530 Subject: [PATCH 13/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index b28738e6a..b27c0850b 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -1,28 +1,28 @@ -name: Build and Test +name: CI/CD Workflow -on: - push: - branches: - - main +on: [push] # Trigger the workflow on every push to the repository jobs: - build-and-test: + build: runs-on: ubuntu-latest - + steps: - - name: Checkout code - uses: actions/checkout@v2 + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: 14 - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: 14 + - name: Install dependencies + run: npm install - - name: Install dependencies - run: npm install + - name: Lint code + run: npm run lint - - name: Build - run: npm run build + - name: Run tests + run: npm test - - name: Run tests - run: npm test + - name: Deploy + # Add your deployment steps here From 765eb45b2d850fb3ff69ffa234b64b6833f11798 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:49:26 +0530 Subject: [PATCH 14/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index b27c0850b..30084968a 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -1,4 +1,4 @@ -name: CI/CD Workflow +name: React Bootstrap CI/CD Workflow on: [push] # Trigger the workflow on every push to the repository @@ -18,11 +18,18 @@ jobs: - name: Install dependencies run: npm install - - name: Lint code - run: npm run lint + - name: Build React app + run: npm run build - name: Run tests run: npm test - - name: Deploy - # Add your deployment steps here + - name: Deploy to GitHub Pages + uses: JamesIves/github-pages-deploy-action@4.1.1 + with: + branch: gh-pages # Or the branch you want to deploy to + folder: build # Or the folder where your build artifacts are + + # Set any environment variables needed + + # Add more deployment steps as needed for your specific deployment platform From f7bf105a2b106c866968e12859efe88b15a99f12 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:55:09 +0530 Subject: [PATCH 15/31] Update Events.js --- src/components/Events.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/Events.js b/src/components/Events.js index f18a89b94..8c1af4a87 100644 --- a/src/components/Events.js +++ b/src/components/Events.js @@ -1,5 +1,5 @@ import React, { Component } from 'react'; -import { Container, Row } from 'react-bootstrap'; +import { Container } from 'react-bootstrap'; import underconst from "../assets/undraw_under_construction_-46-pa.svg" class Events extends Component { @@ -26,4 +26,4 @@ class Events extends Component { } } -export default Events; \ No newline at end of file +export default Events; From 88ee7ed0612f9be880f7632cd23451a6e4568f31 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:59:49 +0530 Subject: [PATCH 16/31] Update Home2.js --- src/components/Home2.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Home2.js b/src/components/Home2.js index 76e2791c2..fd1ce3acc 100644 --- a/src/components/Home2.js +++ b/src/components/Home2.js @@ -1,5 +1,5 @@ import React, { Component } from "react"; -import { Container, Row, Col } from "react-bootstrap"; +import { Container, Row } from "react-bootstrap"; // import myImg from "../../Assets/myImg.png"; import Card from "react-bootstrap/Card"; import About from "./About"; From 6f59ae19cecfc8b3e96adcfddd162a683acac38d Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:05:35 +0530 Subject: [PATCH 17/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 30084968a..5a257d02e 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -1,6 +1,6 @@ name: React Bootstrap CI/CD Workflow -on: [push] # Trigger the workflow on every push to the repository +on: [push] jobs: build: @@ -13,7 +13,7 @@ jobs: - name: Set up Node.js uses: actions/setup-node@v2 with: - node-version: 14 + node-version: 17 - name: Install dependencies run: npm install @@ -27,9 +27,6 @@ jobs: - name: Deploy to GitHub Pages uses: JamesIves/github-pages-deploy-action@4.1.1 with: - branch: gh-pages # Or the branch you want to deploy to - folder: build # Or the folder where your build artifacts are + branch: gh-pages + folder: build - # Set any environment variables needed - - # Add more deployment steps as needed for your specific deployment platform From 51c455523ecd607562efa558dc883e4e70f20bd8 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:11:33 +0530 Subject: [PATCH 18/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 5a257d02e..043901132 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -1,6 +1,6 @@ name: React Bootstrap CI/CD Workflow -on: [push] +on: workflow_dispatch jobs: build: From 3888e8144de10f2bebace66ff71360b336301ac1 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:40:00 +0530 Subject: [PATCH 19/31] Create test_build.yml --- .github/workflows/test_build.yml | 33 ++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 .github/workflows/test_build.yml diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml new file mode 100644 index 000000000..44c944754 --- /dev/null +++ b/.github/workflows/test_build.yml @@ -0,0 +1,33 @@ +name: Build and Test React Application + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ main ] + pull_request: + branches: [ main ] + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + build_test: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [ 14.x, 15.x] + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + - name: npm ci, build and test + run: | + npm ci + npm run build --if-present + npm test From a4669cb7cd41d6d8f229b60b4297cf2b70e5d69d Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:45:24 +0530 Subject: [PATCH 20/31] Update test_build.yml --- .github/workflows/test_build.yml | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 44c944754..9c8627626 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -1,33 +1,30 @@ name: Build and Test React Application -# Controls when the action will run. on: - # Triggers the workflow on push or pull request events but only for the main branch push: - branches: [ main ] + branches: [main] pull_request: - branches: [ main ] + branches: [main] -# A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: build_test: - # The type of runner that the job will run on runs-on: ubuntu-latest strategy: matrix: - node-version: [ 14.x, 15.x] + node-version: [14.x, 15.x] - # Steps represent a sequence of tasks that will be executed as part of the job steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 + - name: Check out code + uses: actions/checkout@v2 + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v2 with: node-version: ${{ matrix.node-version }} - - name: npm ci, build and test + + - name: Install dependencies, build, and test run: | npm ci npm run build --if-present - npm test + npm test From 5effa577576a4fa9e530fed0186023cc5d50e3e5 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:47:12 +0530 Subject: [PATCH 21/31] Update test_build.yml --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 9c8627626..6d936bd31 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [14.x, 15.x] + node-version: [15.x] steps: - name: Check out code From 6bbe33c21c30ce062e3c46d5a22e5a3416ff10d6 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:50:25 +0530 Subject: [PATCH 22/31] Update test_build.yml --- .github/workflows/test_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 6d936bd31..cf24c665e 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -12,7 +12,7 @@ jobs: strategy: matrix: - node-version: [15.x] + node-version: [17.x] steps: - name: Check out code From 79112ea183a96ba4cd30306ecb530005c1c69e1e Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:54:17 +0530 Subject: [PATCH 23/31] Update buildtest.yml --- .github/workflows/buildtest.yml | 50 ++++++++++++++++----------------- 1 file changed, 24 insertions(+), 26 deletions(-) diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml index 043901132..9c8627626 100644 --- a/.github/workflows/buildtest.yml +++ b/.github/workflows/buildtest.yml @@ -1,32 +1,30 @@ -name: React Bootstrap CI/CD Workflow +name: Build and Test React Application -on: workflow_dispatch +on: + push: + branches: [main] + pull_request: + branches: [main] jobs: - build: + build_test: runs-on: ubuntu-latest + strategy: + matrix: + node-version: [14.x, 15.x] + steps: - - name: Checkout code - uses: actions/checkout@v2 - - - name: Set up Node.js - uses: actions/setup-node@v2 - with: - node-version: 17 - - - name: Install dependencies - run: npm install - - - name: Build React app - run: npm run build - - - name: Run tests - run: npm test - - - name: Deploy to GitHub Pages - uses: JamesIves/github-pages-deploy-action@4.1.1 - with: - branch: gh-pages - folder: build - + - name: Check out code + uses: actions/checkout@v2 + + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v2 + with: + node-version: ${{ matrix.node-version }} + + - name: Install dependencies, build, and test + run: | + npm ci + npm run build --if-present + npm test From 8d8a702f04b370e9a63ceeb4e3ba24d168e18b16 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 30 Aug 2023 15:54:41 +0530 Subject: [PATCH 24/31] Update test_build.yml --- .github/workflows/test_build.yml | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index cf24c665e..8b1378917 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -1,30 +1 @@ -name: Build and Test React Application -on: - push: - branches: [main] - pull_request: - branches: [main] - -jobs: - build_test: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [17.x] - - steps: - - name: Check out code - uses: actions/checkout@v2 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: Install dependencies, build, and test - run: | - npm ci - npm run build --if-present - npm test From 05eb10ffe14b241530a88df4a44a3e0026bf266b Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Wed, 30 Aug 2023 15:59:52 +0530 Subject: [PATCH 25/31] Test and Build workflow --- .github/workflows/test_build.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 .github/workflows/test_build.yml diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml new file mode 100644 index 000000000..e69de29bb From 54821416b1c4ce62dc716a397ae4422a9e4072a3 Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Wed, 30 Aug 2023 16:07:01 +0530 Subject: [PATCH 26/31] Test and Build workflow --- .github/workflows/test_build.yml | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml index 8b1378917..b38b1d53f 100644 --- a/.github/workflows/test_build.yml +++ b/.github/workflows/test_build.yml @@ -1 +1,39 @@ +name: Build and Test + +on: + push: + branches: + - main + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: 17 + + - name: Install frontend dependencies + run: npm install --prefix frontend + + - name: Build frontend + run: npm run build --prefix frontend + + - name: Set up backend Node.js + uses: actions/setup-node@v2 + with: + node-version: 17 + + - name: Install backend dependencies + run: npm install + working-directory: backend + + - name: Run backend tests + run: npm test + working-directory: backend From ee3420a646a18934ba6d87b5389b5480744fe7f5 Mon Sep 17 00:00:00 2001 From: Akshayp02 Date: Wed, 30 Aug 2023 16:08:12 +0530 Subject: [PATCH 27/31] Test and Build --- .github/workflows/buildtest.yml | 30 ------------------------------ 1 file changed, 30 deletions(-) delete mode 100644 .github/workflows/buildtest.yml diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml deleted file mode 100644 index 9c8627626..000000000 --- a/.github/workflows/buildtest.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Build and Test React Application - -on: - push: - branches: [main] - pull_request: - branches: [main] - -jobs: - build_test: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [14.x, 15.x] - - steps: - - name: Check out code - uses: actions/checkout@v2 - - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v2 - with: - node-version: ${{ matrix.node-version }} - - - name: Install dependencies, build, and test - run: | - npm ci - npm run build --if-present - npm test From 4d8adeb650d560751a93b18e9ac6e9bbd1929575 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:11:29 +0530 Subject: [PATCH 28/31] Fixed authority page --- src/components/AboutInst.js | 63 ++++++++++++++++++++----------------- 1 file changed, 35 insertions(+), 28 deletions(-) diff --git a/src/components/AboutInst.js b/src/components/AboutInst.js index 9f45516d4..8f8f73345 100644 --- a/src/components/AboutInst.js +++ b/src/components/AboutInst.js @@ -50,7 +50,7 @@ class AboutInst extends Component { - - - - Dr. R. M. Autee - - Head of E&TC Department - - - +
+ + + + Dr. R. M. Autee + + HOD of E&TC + + + +
- - - - Dr. S. V. Lahane - - Dean Academics - - - +
+ + + + + Dr. S. V. Lahane + + Dean Academics + + + +
- - - - Dr. Ulhas Shiurkar - - Director - - - +
+ + + + Dr. Ulhas Shiurkar + + Director + + + +
From f5be9d52dc041b93413b6d246fabc1143050bcdf Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 6 Sep 2023 17:14:09 +0530 Subject: [PATCH 29/31] Fixed authority page --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4d29575de..8cb6328cf 100644 --- a/.gitignore +++ b/.gitignore @@ -10,7 +10,8 @@ # production /build - +/package-lock.json +/package.json # misc .DS_Store .env.local From 92448737a56381dcbe41b22209f4285df653ce02 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 6 Sep 2023 21:00:53 +0530 Subject: [PATCH 30/31] Fixed authority --- src/components/AboutInst.js | 64 +++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 28 deletions(-) diff --git a/src/components/AboutInst.js b/src/components/AboutInst.js index 9f45516d4..73e2d1682 100644 --- a/src/components/AboutInst.js +++ b/src/components/AboutInst.js @@ -50,7 +50,7 @@ class AboutInst extends Component { - - - - Dr. R. M. Autee - - Head of E&TC Department - - - +
+ + + +
+ Dr. R. M. Autee + + HOD Of E&TC + +
+ + +
- - - - Dr. S. V. Lahane - - Dean Academics - - - +
+ + + + Dr. S. V. Lahane + + Dean Academics + + + +
- - - - Dr. Ulhas Shiurkar - - Director - - - +
+ + + + Dr. Ulhas Shiurkar + + Director + + + +
From baa9f6e427dba60365819f810896ac0bc9bf3ac5 Mon Sep 17 00:00:00 2001 From: Akshay peherkar <95123298+Akshayp02@users.noreply.github.com> Date: Wed, 6 Sep 2023 21:04:50 +0530 Subject: [PATCH 31/31] Fixed authority --- .github/workflows/test_build.yml | 39 ++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 .github/workflows/test_build.yml diff --git a/.github/workflows/test_build.yml b/.github/workflows/test_build.yml new file mode 100644 index 000000000..b38b1d53f --- /dev/null +++ b/.github/workflows/test_build.yml @@ -0,0 +1,39 @@ +name: Build and Test + +on: + push: + branches: + - main + +jobs: + build-and-test: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Node.js + uses: actions/setup-node@v2 + with: + node-version: 17 + + - name: Install frontend dependencies + run: npm install --prefix frontend + + - name: Build frontend + run: npm run build --prefix frontend + + - name: Set up backend Node.js + uses: actions/setup-node@v2 + with: + node-version: 17 + + - name: Install backend dependencies + run: npm install + working-directory: backend + + - name: Run backend tests + run: npm test + working-directory: backend +