Skip to content

Commit

Permalink
updated code and added screenshots
Browse files Browse the repository at this point in the history
  • Loading branch information
HarshitPachori committed Jun 6, 2024
1 parent 15eaa79 commit 9823ac6
Show file tree
Hide file tree
Showing 29 changed files with 25 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public interface UserRepository extends JpaRepository<User, Long> {
public List<Ride> getCompletedRides(
@Param("userId") Long userId);

@Query("select r from Ride r where r.status=ACCEPTED and r.user.id=:userId")
@Query("select r from Ride r where r.status=ACCEPTED or status=STARTED and r.user.id=:userId")
public List<Ride> getCurrentRides(@Param("userId") Long userId);

@Query("select r from Ride r where r.status=REQUESTED and r.user.id=:userId")
Expand Down
7 changes: 6 additions & 1 deletion ride_fast_frontend/components/Auth/RegisterForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,13 @@ import { CircularProgressBar } from "../CustomLoader";
const validationSchema = yup.object().shape({
fullName: yup.string().required("fullname is required"),
mobile: yup.string().required("mobile is required"),
email: yup.string().email("invalid email").required("email is required"),
email: yup
.string()
.email("invalid email")
.required("email is required")
.notOneOf(["[email protected]"], "You cannot pick this email"),
password: yup

.string()
.min(8, "password should be of atleast 8 characters")
.required("password is required"),
Expand Down
2 changes: 1 addition & 1 deletion ride_fast_frontend/components/BookRide/BookRide.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ function BookRide() {
type="submit"
color="secondary"
>
Find Driver
Book Your Ride
</Button>
</form>
</div>
Expand Down
2 changes: 1 addition & 1 deletion ride_fast_frontend/components/BookRide/DrawerList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function DrawerList({ anchor }: { anchor: string }) {
return (
<Box sx={{ width: anchor === "top" || anchor === "bottom" ? "auto" : 250 }}>
<List>
{["Book Your Ride", "Rate Card", "Support"].map((text, index) => (
{["Book Your Ride", ].map((text, index) => (
<ListItem key={text} disablePadding>
<ListItemButton>
<ListItemIcon>
Expand Down
15 changes: 12 additions & 3 deletions ride_fast_frontend/components/Profile/Profile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -77,15 +77,24 @@ function Profile() {
<div className="border mt-5">
<div className="flex items-center p-3 border-b">
<AccountBalanceWallet className="text-green-600" />
<p className="ml-4">RideFast Money</p>
<div className="ml-4 flex justify-between w-full">
<p className="text-gray-900">RideFast Money</p>
<p className="text-gray-600">Coming soon...</p>
</div>
</div>
<div className="flex items-center p-3 border-b">
<ContactPhone className="text-green-600" />
<p className="ml-4">Emergency Contact</p>
<div className="ml-4 flex flex-row justify-between w-full">
<p className="text-gray-900">Emergency Contact</p>
<p className="text-gray-600">+91-9119022603</p>
</div>
</div>
<div className="flex items-center p-3 border-b">
<Wifi className="text-green-600" />
<p className="ml-4">RideFast Wifi Credentials</p>
<div className="ml-4 flex justify-between w-full">
<p className="text-gray-900">RideFast Wifi Credentials</p>
<p className="text-gray-600">Coming soon...</p>
</div>
</div>
</div>
<div>
Expand Down
4 changes: 2 additions & 2 deletions ride_fast_frontend/components/RideDetail/RideDetail.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -144,10 +144,10 @@ function RideDetail({ id }: { id: number }) {
router.push(`/ride/${ride.rideId}/payment`);
}}
variant="contained"
color="secondary"
className="bg-blue-800"
sx={{
width: "100%",
padding: ".5rem 0rem",
width: "100%",
}}
>
Pay Now
Expand Down
3 changes: 2 additions & 1 deletion ride_fast_frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
"dev": "next dev",
"build": "next build",
"start": "next start",
"lint": "next lint"
"lint": "next lint",
"d": "next dev"
},
"dependencies": {
"@emotion/react": "^11.11.4",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 9823ac6

Please sign in to comment.