Skip to content

Commit

Permalink
Merge branch 'SumitPanda03:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
rks-031 authored Jan 28, 2024
2 parents 0c88d7b + 164c3aa commit 3e36152
Show file tree
Hide file tree
Showing 12 changed files with 221 additions and 97 deletions.
46 changes: 46 additions & 0 deletions .github/workflows/azure-static-web-apps-blue-bush-002442000.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Azure Static Web Apps CI/CD

on:
push:
branches:
- master
pull_request:
types: [opened, synchronize, reopened, closed]
branches:
- master

jobs:
build_and_deploy_job:
if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
runs-on: ubuntu-latest
name: Build and Deploy Job
steps:
- uses: actions/checkout@v3
with:
submodules: true
lfs: false
- name: Build And Deploy
id: builddeploy
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_BUSH_002442000 }}
repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
action: "upload"
###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
# For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
app_location: "/client" # App source code path
api_location: "" # Api source code path - optional
output_location: "dist" # Built app content directory - optional
###### End of Repository/Build Configurations ######

close_pull_request_job:
if: github.event_name == 'pull_request' && github.event.action == 'closed'
runs-on: ubuntu-latest
name: Close Pull Request Job
steps:
- name: Close Pull Request
id: closepullrequest
uses: Azure/static-web-apps-deploy@v1
with:
azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_BLUE_BUSH_002442000 }}
action: "close"
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<a href="https://github.com/rks-031/" style="text-decoration: none;">`Rajnish Kumar Singh`</a> <br/>
<a href="https://github.com/kundu-baivab" style="text-decoration: none;">`Baivab Kundu`</a> <br/>

Website Link: Loading...
Website Link: https://mlsa-iiitbh.vercel.app
<br/>
<br/>

Expand All @@ -16,5 +16,4 @@ MLSA IIIT Chapter opens doors to a vibrant community of like-minded individuals,
<li>FrontEnd: Vite + ReactJS </li>
<li>Backend: Node.js, Express.js </li>
<li>Database: MongoDB, Amazon AWS </li>
<li>Hosted On: .onrender</li>
</ul>
76 changes: 72 additions & 4 deletions client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,17 @@
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@vercel/analytics": "^1.1.2",
"@vercel/speed-insights": "^1.0.7",
"axios": "^1.5.1",
"bootstrap": "^5.3.2",
"cors": "^2.8.5",
"dotenv": "^16.3.1",
"jsonwebtoken": "^9.0.2",
"lottie-react": "^2.4.0",
"nodemon": "^3.0.1",
"react": "^18.2.0",
"react-bootstrap": "^2.9.1",
"react-bootstrap": "^2.10.0",
"react-dom": "^18.2.0",
"react-icons": "^4.11.0",
"react-lottie": "^1.2.4",
Expand Down
5 changes: 5 additions & 0 deletions client/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { BrowserRouter, Routes, Route } from "react-router-dom";
// import Opening from "./pages/Opening.js";
// import Upload from "./pages/Upload.js";
import { AuthWrapper } from "./auth/AuthWrapper.jsx";
import { SpeedInsights } from "@vercel/speed-insights/react"

function App() {
return (
Expand All @@ -26,6 +27,10 @@ function App() {
</Routes> */}
<AuthWrapper/>
</BrowserRouter>
<SpeedInsights />



</div>
);
}
Expand Down
4 changes: 4 additions & 0 deletions client/src/CSS_files/Application.css
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,10 @@ background: radial-gradient(circle, #457b9d 35%, rgb(1, 1, 2) 99%, rgb(55, 152,
.typed-content {
font-size: 16px;
}
.btns{
margin: auto;
width: 70vw;
}
}

@media screen and (max-width: 360px) {
Expand Down
15 changes: 14 additions & 1 deletion client/src/CSS_files/Chapter.css
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,19 @@
justify-content: center;
margin-top: 1%;
}
.loading-container {
display: flex;
justify-content: center;
text-align: center;
align-items: center;
color: rgb(185, 163, 62);
font-size: 400%;
margin-top: 25rem;
}

.spinner-border {
color: rgb(247, 237, 192); /* Set your desired spinner color */
}

.description {
margin-top: 35px;
Expand Down Expand Up @@ -82,7 +95,7 @@
color: #e0933a;
font-weight: bold;
margin: auto;
margin-top: 2%;
margin-top: 4%;
display: flex;
justify-content: center;
align-items: center;
Expand Down
4 changes: 2 additions & 2 deletions client/src/pages/Application.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ function Application() {
<br />
<button
type="button"
className="btn btn-secondary btn-lg btn-block my-3"
className="btn btn-secondary btn-lg btn-block my-3 btns"
>
Eligibility Criteria
</button>
Expand Down Expand Up @@ -70,7 +70,7 @@ function Application() {
</li>
</ol>
<br />
<button type="button" className="btn btn-secondary btn-lg btn-block">
<button type="button" className="btn btn-secondary btn-lg btn-block btns">
Application
</button>
<br />
Expand Down
Loading

0 comments on commit 3e36152

Please sign in to comment.