Skip to content

Commit

Permalink
minor changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@akt0001c
akt0001c committed Dec 13, 2024
2 parents cf13452 + e91fe4e commit 140c56c
Show file tree
Hide file tree
Showing 29 changed files with 1,207 additions and 206 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/maven.yml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven

# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

name: Java CI with Maven

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
cache: maven
- name: Build with Maven
run: mvn -B package --file pom.xml

# Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
- name: Update dependency graph
uses: advanced-security/maven-dependency-submission-action@571e99aab1055c2e71a1e2309b9691de18d6b7d6
2 changes: 1 addition & 1 deletion CabManagementSystem/src/main/resources/application.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ server.port=8888
spring.datasource.url=jdbc:mysql://localhost:3306/safar
spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
spring.datasource.username=root
spring.datasource.password=ankitchoubey9807
spring.datasource.password=root


#ORM s/w specific properties
Expand Down
91 changes: 13 additions & 78 deletions FrontEnd/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@
<title>Safar</title>
<link rel="icon" href="/images/SAFAR.png" />
<link rel="stylesheet" href="./style/index.css">
<script src="https://kit.fontawesome.com/56d003bef3.js" crossorigin="anonymous"></script>

<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/css/bootstrap.min.css" rel="stylesheet"
integrity="sha384-9ndCyUaIbzAi2FUVXJi0CjmCapSmO7SnpJef0486qhLnuZ2cdeRhO02iuK6FUUVM"
crossorigin="anonymous">

<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Roboto|Varela+Round">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css">
<link rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css">
<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>

</head>

<body>
Expand All @@ -43,47 +41,12 @@
<div class="overlay"></div>


<!-- navbar section -->
<!-- <nav class="navbar navbar-expand-lg ">
<div class="container">
<a class="navbar-brand ms-5 me-5" href="#">
<img src="./images/SAFAR.png" alt="Bootstrap" width="70" height="70">
</a>
<button class="navbar-toggler" id="navbar-toggler1" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent"
aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon" id="homeBurgur"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav me-auto ms-5 fs-2 mb-2 mb-lg-0 ">
<li class="nav-item me-3">
<a class="nav-link active text-white" aria-current="page" href="#">Home</a>
</li>
<li class="nav-item me-3">
<a class="nav-link active text-white" href="#">Our Cars</a>
</li>
<li class="nav-item me-3">
<a class="nav-link active text-white" href="#">About Us</a>
</li>
<li class="nav-item me-3">
<a class="nav-link active text-white" href="#">Contact</a>
</li>
</ul>
<div class="navbar-text me-5 fs-3 text-white" id="userButton">
<a class="nav-link active text-white ancorOfloginsignUp" id="userIcon" href="#"><i
class="fa-regular fa-user"></i> User</a>
</div>
</div>
</div>
</nav> -->



<nav class="navbar navbar-expand-xl navbar-dark bg-dark sticky-top">
<a href="#" class="navbar-brand"><i class="fa fa-cube"></i>Suhana<b>Safar</b></a>
<a href="#" class="navbar-brand"><i class="fa fa-cube"></i>Suhana<b>Safar</b></a>
<a href="./Driver.html" id="add-driver">All Drivers</a>
<button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbarCollapse">
<span class="navbar-toggler-icon"></span>
</button>
Expand Down Expand Up @@ -115,32 +78,7 @@
</nav>


<!-- pop up section -->
<!-- <div class="popup">
<div class="two">
<span>
<img src="images/IMG_20230302_110344_591_-removebg-preview.png" alt="">
</span>
<span>
<p class="name" style="margin-top: -1rem; font-size: 1.5rem;">Sushil Kumar</p>
<p class="role" style="margin-top: -1rem; font-size: 1.5rem; color: red;">User</p>
</span>
</div>
<div class="two">
<p class="profile">
<span><i class="fa-regular fa-user"></i></span>
<span><a href="#">Profile</a></span>
</p>
<p class="profile">
<span><i class="fa-solid fa-user-gear"></i></span>
<span><a href="#">Setting</a></span>
</p>
<p class="profile">
<span><i class="fa-solid fa-arrow-right-from-bracket"></i></span>
<span><a href="Login.html">Login</a></span>
</p>
</div>
</div> -->



<!-- home section -->
Expand Down Expand Up @@ -286,22 +224,19 @@ <h3 class="f-title f_600 t_color f_size_18">Team Solutions</h3>
</footer>


<<<<<<< HEAD
=======
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"
integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz"
crossorigin="anonymous"></script>

<script src="./script/index.js" type="module"></script>
<!-- <script src="./scripts/index.js" type="module"></script> -->

>>>>>>> e4bf98595d20b3ffc63b4925c5130e5ddb710371
</body>

</html>


<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js"
integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz"
crossorigin="anonymous"></script>

<script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js"></script>

<script src="https://kit.fontawesome.com/56d003bef3.js" crossorigin="anonymous"></script>
<script src="./script/index.js"></script>
135 changes: 89 additions & 46 deletions FrontEnd/profile.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,36 @@
}
</style>
<body>

<!-- Add Money Popup -->
<div id="addMoneyPopup" class="popup hidden">
<div class="popup-content">
<h2>Add Money</h2>
<label for="amount">Enter Amount:</label>
<input type="number" id="amount" placeholder="Amount" />
<button id="confirmAddMoney">Confirm</button>
<button id="closePopup">Close</button>
</div>
</div>


<!-- As a link -->
<nav class="navbar mb-2">
<nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top mb-2 ">
<div class="container-fluid">
<a class="navbar-brand" href="index.html"><i class="fa fa-cube"></i>Suhana<b>Safar</b></a>
</div>
</nav>




<aside>
<div id="my-details-btn"> My details </div>
<div id="wallet-btn">wallet</div>
<div id="transaction-btn">Transactions</div>
<div id="booking-btn">Bookings</div>
</aside>

<h1 id="heading">MY PROFILE</h1>
<div id="profile-data">
<div>
<i class="fa fa-user-circle"></i>
</div>

<section>
<div id="details-section">
<table>
<tr>
Expand Down Expand Up @@ -63,61 +76,91 @@ <h1 id="heading">MY PROFILE</h1>


</div>
</div>


<!--Wallet div-->

<div id="wallet-section">

<h2 id="wallet-heading">WALLET SECTION</h2>
<div id="wallet">
<h3>Balance: <span id="balance-box"></span></h3>
<h3>Status: <span id="status-box"></span></h3>
<div>
<button id="status-btn">Disable</button>
<button id="addMoney-btn">Add Money</button>
</div>

</div>

</div>

<!---Transaction section -->

<div id="transaction-section">

<h1 id="trans-head">TRANSACTIONS</h1>
<div id="transactions-div">

<table>
<thead>
<th>Transaction Id</th>
<th>Created At</th>
<th>Transaction Amount</th>
<th>Transaction Type</th>
<th>Balance</th>
</thead>
<tbody id="transaction-div-body"></tbody>
</table>


</div>

</div>

<div id="wallet">
<h3>Balance: <span id="balance-box"></span></h3>
<h3>Status: <span id="status-box"></span></h3>
<div>
<button id="status-btn">Disable</button>
<button id="addMoney-btn">Add Money</button>
<!--Booking section-->

<div id="booking-section">

<h1 class="sub-heading">ALL BOOKINGS</h1>
<div id="booking-div">
<table id="booking-table">
<thead>
<th>Booking Id</th>
<th>Starting Point</th>
<th>Ending Point</th>
<th>Booking DateTime</th>
<th>Status</th>
<th>Travel Distance</th>
<th>Bill Amount</th>
<th>Complete Ride</th>
</thead>
<tbody id="booking-table-body"></tbody>
</table>
</div>

</div>

</div>

</section>


<footer></footer>






<h1 id="trans-head">TRANSACTIONS</h1>
<div id="transactions-div">

<table>
<thead>
<th>Transaction Id</th>
<th>Created At</th>
<th>Transaction Amount</th>
<th>Transaction Type</th>
<th>Balance</th>
</thead>
<tbody id="transaction-div-body"></tbody>
</table>


</div>







<h1 class="sub-heading">ALL BOOKINGS</h1>
<div id="booking-div">
<table id="booking-table">
<thead>
<th>Booking Id</th>
<th>Starting Point</th>
<th>Ending Point</th>
<th>Booking DateTime</th>
<th>Status</th>
<th>Travel Distance</th>
<th>Bill Amount</th>
<th>Complete Ride</th>
</thead>
<tbody id="booking-table-body"></tbody>
</table>
</div>
</body>
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.0/dist/js/bootstrap.bundle.min.js" integrity="sha384-geWF76RCwLtnZ8qwWowPQNguL3RmwHVBC9FhGdlKrxdiJJigb/j/68SIy3Te4Bkz" crossorigin="anonymous"></script>
</html>
Expand Down
8 changes: 8 additions & 0 deletions FrontEnd/script/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ let bookCab = document.getElementById("subBtn");
let usern = document.getElementById('userN');
const names = localStorage.getItem("username");

const addDriver= document.querySelector("#add-driver");
if (names != undefined) {
usern.innerHTML = names;
} else {
Expand All @@ -27,6 +28,13 @@ window.onload = () => {
}
console.log(userData);

if(userData.role==="ROLE_ADMIN")
{
addDriver.style.display="block";
}
else
addDriver.style.display="none";



}
Expand Down
Loading

0 comments on commit 140c56c

Please sign in to comment.