Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
156 commits
Select commit Hold shift + click to select a range
9982488
feat: add navbar, home page hero section, and routing
nafanpe May 25, 2026
292393c
feat: search bar and filters
nafanpe May 26, 2026
52c597a
backend initilized
malik-dinar May 27, 2026
cdcdd11
git ignore updated
malik-dinar May 27, 2026
716a9dc
feat:Add Venue Grid and Responsiveness
nafanpe May 27, 2026
640e996
feat:Add Filter Dropdown
nafanpe Jun 1, 2026
53bd6d9
feat:Login Page UI Only
nafanpe Jun 3, 2026
4c2d4bd
Merge pull request #1 from nafanpe/dev-fe
nafanpe Jun 3, 2026
6a071d9
Add JWT authentication, signup/login APIs, and PostgreSQL connection
malik-dinar Jun 3, 2026
f0d759c
Merge pull request #2 from nafanpe/dev-be
malik-dinar Jun 4, 2026
e12ab3c
refactor: Add Logic to Auth page
nafanpe Jun 7, 2026
5166005
Add Authentication Page Logic
nafanpe Jun 7, 2026
c89cd69
role added, venue schema added
malik-dinar Jun 10, 2026
95c45a0
venue images and amenities schema added
malik-dinar Jun 11, 2026
a8f1628
venue APIs
malik-dinar Jun 12, 2026
480cb19
venue amenities add api
malik-dinar Jun 13, 2026
ade72d4
added venue images, cloudinary
malik-dinar Jun 13, 2026
9d9114c
feat: Added Dynamics, Owner Landing Page, responsiveness
nafanpe Jun 14, 2026
acf0595
fix: image on auth
nafanpe Jun 14, 2026
4fe2b77
venue status, venue active inactive
malik-dinar Jun 16, 2026
5b3d434
feat: Add Calender/Session UI in VenueListing Page
nafanpe Jun 17, 2026
5b4e0d8
test: Make 1st card small
nafanpe Jun 17, 2026
b7937b7
edit venue
malik-dinar Jun 17, 2026
f79838b
refactor: Add axios
nafanpe Jun 18, 2026
fc36aae
venue avaialability added
malik-dinar Jun 18, 2026
13d9133
feat: Add Host Dashboard
nafanpe Jun 18, 2026
f194791
venue isactive and is_avialable added in get APIs
malik-dinar Jun 18, 2026
8df1912
Host Dashbaord fixes
nafanpe Jun 19, 2026
aef149f
Merge pull request #4 from nafanpe/dev-fe
nafanpe Jun 19, 2026
1fab811
payment, booking schema added, razorpay apis
malik-dinar Jun 19, 2026
ee56ca1
Merge pull request #5 from nafanpe/dev-be
malik-dinar Jun 19, 2026
b102e0f
save current progess before pulling backend changes
nafanpe Jun 19, 2026
feb429d
"Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into de…
nafanpe Jun 19, 2026
bb50511
order, payment
malik-dinar Jun 21, 2026
d8eeca2
Merge pull request #6 from nafanpe/dev-be
malik-dinar Jun 21, 2026
5027ecd
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jun 21, 2026
ef2339c
booking, order
malik-dinar Jun 24, 2026
1cc4c34
Merge pull request #7 from nafanpe/dev-be
malik-dinar Jun 25, 2026
6746a43
latest udpates
nafanpe Jun 27, 2026
322e5e4
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jun 27, 2026
68dbe5b
changes to owner dashboard
nafanpe Jun 29, 2026
b4878bf
payment API updation
malik-dinar Jun 29, 2026
818272a
Merge pull request #8 from nafanpe/dev-be
malik-dinar Jun 29, 2026
d4d6f60
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jun 29, 2026
e685df2
get all venues
malik-dinar Jun 30, 2026
b093c43
feat: razorpay payment integration
nafanpe Jun 30, 2026
d9215b0
Merge pull request #9 from nafanpe/dev-be
malik-dinar Jun 30, 2026
a10a085
Merge pull request #10 from nafanpe/dev-fe
nafanpe Jun 30, 2026
3ef4b2e
get venues by user
malik-dinar Jun 30, 2026
b7912f1
Merge pull request #11 from nafanpe/dev-be
malik-dinar Jun 30, 2026
834f994
feat: Venue Management at Admin dashboard
nafanpe Jun 30, 2026
e382794
Add hero Update
nafanpe Jun 30, 2026
8f95344
add animation to hero
nafanpe Jul 1, 2026
719e09b
fix for hero animation
nafanpe Jul 1, 2026
17ce83c
fix for hero animation2
nafanpe Jul 1, 2026
3128a52
fix for hero animation3
nafanpe Jul 1, 2026
79f5a12
fix for hero anime
nafanpe Jul 1, 2026
345f643
fix for hero anime2
nafanpe Jul 1, 2026
0fd424a
payment fix
malik-dinar Jul 1, 2026
7944c14
change payload for verification
nafanpe Jul 1, 2026
9a4849b
payment time bug fix
malik-dinar Jul 1, 2026
88ca5c7
fix hero anime
nafanpe Jul 1, 2026
852ee5a
booking date
malik-dinar Jul 1, 2026
e75e8c2
Merge pull request #12 from nafanpe/dev-be
malik-dinar Jul 1, 2026
7461ab2
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 1, 2026
376c913
booking date 2
malik-dinar Jul 1, 2026
bdda7eb
Merge pull request #13 from nafanpe/dev-be
malik-dinar Jul 1, 2026
b964021
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 1, 2026
a732981
All bookings
malik-dinar Jul 1, 2026
f3f0f07
offline booking
malik-dinar Jul 1, 2026
9e42e6f
Merge pull request #14 from nafanpe/dev-be
malik-dinar Jul 1, 2026
77b6a0e
cancel message update
malik-dinar Jul 1, 2026
3dd2b65
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 1, 2026
ab3880a
new updates
nafanpe Jul 3, 2026
20c34ec
newer version
nafanpe Jul 3, 2026
ad6f61b
Merge pull request #16 from nafanpe/dev-fe
nafanpe Jul 3, 2026
7b3b2c5
fix deployment
nafanpe Jul 3, 2026
4dfc51c
fix deployment2
nafanpe Jul 3, 2026
47dae67
Merge pull request #17 from nafanpe/dev-fe
nafanpe Jul 3, 2026
92030ca
user data added in bookings
malik-dinar Jul 3, 2026
bc18ec6
venue data added in booking apis
malik-dinar Jul 3, 2026
51c399a
Merge pull request #18 from nafanpe/dev-be
malik-dinar Jul 3, 2026
7518522
get images update images
malik-dinar Jul 3, 2026
293523f
Merge pull request #19 from nafanpe/dev-be
malik-dinar Jul 3, 2026
becc7e7
booking type added in venue listing
malik-dinar Jul 3, 2026
3a361d4
venue availabilty update API added
malik-dinar Jul 3, 2026
6f32043
Merge pull request #20 from nafanpe/dev-be
malik-dinar Jul 3, 2026
d5090ca
total revenue API added
malik-dinar Jul 3, 2026
91e6981
Merge pull request #21 from nafanpe/dev-be
malik-dinar Jul 3, 2026
e47ffc0
get all bookings updated
malik-dinar Jul 6, 2026
4f299d2
get all bookings, venue price added
malik-dinar Jul 6, 2026
9d06823
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-be
malik-dinar Jul 6, 2026
3d0275a
feat: user dashboard, bug fixes
nafanpe Jul 6, 2026
a0856a8
search api bug fixed
malik-dinar Jul 6, 2026
e4b9ac9
Merge pull request #22 from nafanpe/dev-be
malik-dinar Jul 6, 2026
bfeecd1
feat: user dashboard, bug fixes
nafanpe Jul 6, 2026
3dc9382
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 6, 2026
2545e21
Merge pull request #23 from nafanpe/dev-fe
nafanpe Jul 6, 2026
055e94e
Merge pull request #24 from nafanpe/dev-fe
nafanpe Jul 6, 2026
2e763a0
user data added in booking API
malik-dinar Jul 6, 2026
1707655
Merge pull request #25 from nafanpe/dev-be
malik-dinar Jul 6, 2026
f70ec2a
latest updates
nafanpe Jul 7, 2026
1f3b264
latest updates
nafanpe Jul 7, 2026
ad60b7a
add vercel as origin
nafanpe Jul 7, 2026
a8503c6
feat: Search bar
nafanpe Jul 8, 2026
e671026
Merge pull request #26 from nafanpe/dev-fe
nafanpe Jul 8, 2026
30c1f46
already booked api
malik-dinar Jul 8, 2026
5f2bd8c
Merge pull request #27 from nafanpe/dev-be
malik-dinar Jul 8, 2026
7bdcd19
alreeady booked bug fix
malik-dinar Jul 9, 2026
f9d14e6
Merge pull request #28 from nafanpe/dev-be
malik-dinar Jul 9, 2026
21b8663
Latest Updates Before Shadcn
nafanpe Jul 9, 2026
7b081b8
email function added
malik-dinar Jul 11, 2026
702e473
Merge pull request #29 from nafanpe/dev-be
malik-dinar Jul 11, 2026
b66d49b
is approved status added
malik-dinar Jul 13, 2026
0277621
Merge pull request #31 from nafanpe/dev-be
malik-dinar Jul 13, 2026
0b95328
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 14, 2026
6d84ae7
is_approved_status passed
malik-dinar Jul 15, 2026
0164bb1
Merge pull request #32 from nafanpe/dev-be
malik-dinar Jul 15, 2026
3bee138
feat: shadcn animations
nafanpe Jul 15, 2026
a4aade6
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 15, 2026
5e3dec2
Merge pull request #33 from nafanpe/dev-fe
nafanpe Jul 15, 2026
46eb488
Merge branch 'dev' of https://github.com/nafanpe/BookMyVenue into dev-fe
nafanpe Jul 21, 2026
1dd6365
latest changes
nafanpe Jul 21, 2026
e8f7a18
add online/offline indicator in ownerDashboard
nafanpe Jul 21, 2026
c524526
Merge pull request #34 from nafanpe/dev-fe
nafanpe Jul 21, 2026
fef5112
fixed total earning bug
malik-dinar Jul 21, 2026
5201fd8
Merge pull request #35 from nafanpe/dev-be
malik-dinar Jul 21, 2026
a1cbf26
order reject reason
malik-dinar Jul 21, 2026
a4dc825
refund amount added in total earnings
malik-dinar Jul 21, 2026
ebfffd9
Merge pull request #36 from nafanpe/dev-be
malik-dinar Jul 21, 2026
0ae0135
feat: offline booking
nafanpe Jul 22, 2026
97ce701
Merge pull request #37 from nafanpe/dev-fe
nafanpe Jul 22, 2026
1622cc0
email content updated
malik-dinar Jul 22, 2026
6e990c5
Merge pull request #38 from nafanpe/dev-be
malik-dinar Jul 22, 2026
2ef4451
dashboard updated, email conent updated
malik-dinar Jul 22, 2026
af47bad
Merge pull request #39 from nafanpe/dev-be
malik-dinar Jul 22, 2026
cf5822d
Merge pull request #40 from nafanpe/dev
malik-dinar Jul 22, 2026
b024a55
Update CORS for Render frontend
malik-dinar Jul 22, 2026
dbc01c5
Merge pull request #41 from nafanpe/dev-be
malik-dinar Jul 22, 2026
f04b5ed
Merge pull request #42 from nafanpe/dev
malik-dinar Jul 22, 2026
422c818
smtp changed,resend mail added
malik-dinar Jul 22, 2026
140719d
Merge pull request #43 from nafanpe/dev-be
malik-dinar Jul 22, 2026
4e83dfb
Merge pull request #44 from nafanpe/dev
malik-dinar Jul 22, 2026
caafa6f
smtp reverted
malik-dinar Jul 22, 2026
720a8f3
Merge pull request #46 from nafanpe/dev-be
malik-dinar Jul 22, 2026
03fc964
venue id added in total reveneue
malik-dinar Jul 22, 2026
fc696b8
Merge pull request #47 from nafanpe/dev-be
malik-dinar Jul 22, 2026
553f1b8
venue id added in total reveneue id
malik-dinar Jul 22, 2026
69cdbbc
Merge pull request #48 from nafanpe/dev-be
malik-dinar Jul 22, 2026
d7e791d
venue id added in total reveneue id
malik-dinar Jul 22, 2026
8fa7095
Merge pull request #49 from nafanpe/dev-be
malik-dinar Jul 22, 2026
7d3d111
venue id added in total revenue
malik-dinar Jul 22, 2026
3447dc0
Merge pull request #50 from nafanpe/dev-be
malik-dinar Jul 22, 2026
e8a0316
Venue added
malik-dinar Jul 22, 2026
03fc79c
Merge pull request #51 from nafanpe/dev-be
malik-dinar Jul 22, 2026
62762cb
Merge pull request #52 from nafanpe/dev
malik-dinar Jul 22, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
87 changes: 87 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
# =========================
# Logs
# =========================
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

# =========================
# Node / React
# =========================
node_modules/
dist/
dist-ssr/
coverage/
.cache/

# =========================
# Python
# =========================
__pycache__/
*.py[cod]
*$py.class

# Virtual environments
venv/
.venv/
env/

# Python build files
build/
develop-eggs/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
wheels/
*.egg-info/
.installed.cfg
*.egg

# =========================
# Environment files
# =========================
.env
.env.local
.env.development.local
.env.test.local
.env.production.local
*.local

# =========================
# Editor / IDE
# =========================
.vscode/*
!.vscode/extensions.json

.idea/
.DS_Store

# Visual Studio
*.suo
*.ntvs*
*.njsproj
*.sln

# Vim
*.sw?

# =========================
# Lint / Cache
# =========================
.eslintcache
.pytest_cache/
.mypy_cache/

# =========================
# OS generated
# =========================
Thumbs.db
149 changes: 149 additions & 0 deletions BACKEND/alembic.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
# A generic, single database configuration.

[alembic]
# path to migration scripts.
# this is typically a path given in POSIX (e.g. forward slashes)
# format, relative to the token %(here)s which refers to the location of this
# ini file
script_location = %(here)s/alembic

# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
# Uncomment the line below if you want the files to be prepended with date and time
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
# for all available tokens
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
# Or organize into date-based subdirectories (requires recursive_version_locations = true)
# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s

# sys.path path, will be prepended to sys.path if present.
# defaults to the current working directory. for multiple paths, the path separator
# is defined by "path_separator" below.
prepend_sys_path = .


# timezone to use when rendering the date within the migration file
# as well as the filename.
# If specified, requires the tzdata library which can be installed by adding
# `alembic[tz]` to the pip requirements.
# string value is passed to ZoneInfo()
# leave blank for localtime
# timezone =

# max length of characters to apply to the "slug" field
# truncate_slug_length = 40

# set to 'true' to run the environment during
# the 'revision' command, regardless of autogenerate
# revision_environment = false

# set to 'true' to allow .pyc and .pyo files without
# a source .py file to be detected as revisions in the
# versions/ directory
# sourceless = false

# version location specification; This defaults
# to <script_location>/versions. When using multiple version
# directories, initial revisions must be specified with --version-path.
# The path separator used here should be the separator specified by "path_separator"
# below.
# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions

# path_separator; This indicates what character is used to split lists of file
# paths, including version_locations and prepend_sys_path within configparser
# files such as alembic.ini.
# The default rendered in new alembic.ini files is "os", which uses os.pathsep
# to provide os-dependent path splitting.
#
# Note that in order to support legacy alembic.ini files, this default does NOT
# take place if path_separator is not present in alembic.ini. If this
# option is omitted entirely, fallback logic is as follows:
#
# 1. Parsing of the version_locations option falls back to using the legacy
# "version_path_separator" key, which if absent then falls back to the legacy
# behavior of splitting on spaces and/or commas.
# 2. Parsing of the prepend_sys_path option falls back to the legacy
# behavior of splitting on spaces, commas, or colons.
#
# Valid values for path_separator are:
#
# path_separator = :
# path_separator = ;
# path_separator = space
# path_separator = newline
#
# Use os.pathsep. Default configuration used for new projects.
path_separator = os

# set to 'true' to search source files recursively
# in each "version_locations" directory
# new in Alembic version 1.10
# recursive_version_locations = false

# the output encoding used when revision files
# are written from script.py.mako
# output_encoding = utf-8

# database URL. This is consumed by the user-maintained env.py script only.
# other means of configuring database URLs may be customized within the env.py
# file.
sqlalchemy.url = driver://user:pass@localhost/dbname


[post_write_hooks]
# post_write_hooks defines scripts or Python functions that are run
# on newly generated revision scripts. See the documentation for further
# detail and examples

# format using "black" - use the console_scripts runner, against the "black" entrypoint
# hooks = black
# black.type = console_scripts
# black.entrypoint = black
# black.options = -l 79 REVISION_SCRIPT_FILENAME

# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
# hooks = ruff
# ruff.type = module
# ruff.module = ruff
# ruff.options = check --fix REVISION_SCRIPT_FILENAME

# Alternatively, use the exec runner to execute a binary found on your PATH
# hooks = ruff
# ruff.type = exec
# ruff.executable = ruff
# ruff.options = check --fix REVISION_SCRIPT_FILENAME

# Logging configuration. This is also consumed by the user-maintained
# env.py script only.
[loggers]
keys = root,sqlalchemy,alembic

[handlers]
keys = console

[formatters]
keys = generic

[logger_root]
level = WARNING
handlers = console
qualname =

[logger_sqlalchemy]
level = WARNING
handlers =
qualname = sqlalchemy.engine

[logger_alembic]
level = INFO
handlers =
qualname = alembic

[handler_console]
class = StreamHandler
args = (sys.stderr,)
level = NOTSET
formatter = generic

[formatter_generic]
format = %(levelname)-5.5s [%(name)s] %(message)s
datefmt = %H:%M:%S
1 change: 1 addition & 0 deletions BACKEND/alembic/README
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Generic single-database configuration.
90 changes: 90 additions & 0 deletions BACKEND/alembic/env.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
from logging.config import fileConfig

from sqlalchemy import engine_from_config
from sqlalchemy import pool

from alembic import context
from app.db.database import Base

# this is the Alembic Config object, which provides
# access to the values within the .ini file in use.
config = context.config
from app.core.config import settings

config.set_main_option(
"sqlalchemy.url",
settings.DATABASE_URL
)

# Interpret the config file for Python logging.
# This line sets up loggers basically.
if config.config_file_name is not None:
fileConfig(config.config_file_name)

# add your model's MetaData object here
# for 'autogenerate' support
# from myapp import mymodel
from app.model.user import User
from app.model.venue import Venue
from app.model.venue_amenities import VenueAmenities
from app.model.venue_images import VenueImages

# target_metadata = mymodel.Base.metadata
target_metadata = Base.metadata

# other values from the config, defined by the needs of env.py,
# can be acquired:
# my_important_option = config.get_main_option("my_important_option")
# ... etc.


def run_migrations_offline() -> None:
"""Run migrations in 'offline' mode.

This configures the context with just a URL
and not an Engine, though an Engine is acceptable
here as well. By skipping the Engine creation
we don't even need a DBAPI to be available.

Calls to context.execute() here emit the given string to the
script output.

"""
url = config.get_main_option("sqlalchemy.url")
context.configure(
url=url,
target_metadata=target_metadata,
literal_binds=True,
dialect_opts={"paramstyle": "named"},
)

with context.begin_transaction():
context.run_migrations()


def run_migrations_online() -> None:
"""Run migrations in 'online' mode.

In this scenario we need to create an Engine
and associate a connection with the context.

"""
connectable = engine_from_config(
config.get_section(config.config_ini_section, {}),
prefix="sqlalchemy.",
poolclass=pool.NullPool,
)

with connectable.connect() as connection:
context.configure(
connection=connection, target_metadata=target_metadata
)

with context.begin_transaction():
context.run_migrations()


if context.is_offline_mode():
run_migrations_offline()
else:
run_migrations_online()
28 changes: 28 additions & 0 deletions BACKEND/alembic/script.py.mako
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
"""${message}

Revision ID: ${up_revision}
Revises: ${down_revision | comma,n}
Create Date: ${create_date}

"""
from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa
${imports if imports else ""}

# revision identifiers, used by Alembic.
revision: str = ${repr(up_revision)}
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}


def upgrade() -> None:
"""Upgrade schema."""
${upgrades if upgrades else "pass"}


def downgrade() -> None:
"""Downgrade schema."""
${downgrades if downgrades else "pass"}
36 changes: 36 additions & 0 deletions BACKEND/alembic/versions/136fe88b327a_add_venue_fields.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
"""add venue fields

Revision ID: 136fe88b327a
Revises:
Create Date: 2026-06-12 14:27:25.878941

"""
from typing import Sequence, Union

from alembic import op
import sqlalchemy as sa


# revision identifiers, used by Alembic.
revision: str = '136fe88b327a'
down_revision: Union[str, Sequence[str], None] = None
branch_labels: Union[str, Sequence[str], None] = None
depends_on: Union[str, Sequence[str], None] = None


def upgrade() -> None:
"""Upgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.add_column('venues', sa.Column('venue_price', sa.Integer(), nullable=False))
op.add_column('venues', sa.Column('venue_availabilty', sa.String(length=255), nullable=False))
op.add_column('venues', sa.Column('is_available', sa.String(length=255), nullable=False))
# ### end Alembic commands ###


def downgrade() -> None:
"""Downgrade schema."""
# ### commands auto generated by Alembic - please adjust! ###
op.drop_column('venues', 'is_available')
op.drop_column('venues', 'venue_availabilty')
op.drop_column('venues', 'venue_price')
# ### end Alembic commands ###
Loading