diff --git a/.env b/.env index 1b7e45d..8de3084 100644 --- a/.env +++ b/.env @@ -1,9 +1,5 @@ -MYSQL_DATABASE="railway" -MYSQL_PUBLIC_URL="mysql://root:eIXppNyuzdrfoijMvKHncPsJOicPuUkf@switchback.proxy.rlwy.net:16829/railway" -MYSQL_ROOT_PASSWORD="eIXppNyuzdrfoijMvKHncPsJOicPuUkf" -MYSQL_URL="mysql://root:eIXppNyuzdrfoijMvKHncPsJOicPuUkf@mysql.railway.internal:3306/railway" -MYSQLDATABASE="railway" -MYSQLHOST="mysql.railway.internal" -MYSQLPASSWORD="eIXppNyuzdrfoijMvKHncPsJOicPuUkf" +MYSQLDATABASE="unimarket" +MYSQLHOST="127.0.0.1" +MYSQLPASSWORD="" MYSQLPORT="3306" MYSQLUSER="root" diff --git a/.kilo/plans/1786038462633-db-routes-fix.md b/.kilo/plans/1786038462633-db-routes-fix.md new file mode 100644 index 0000000..a6bc2ac --- /dev/null +++ b/.kilo/plans/1786038462633-db-routes-fix.md @@ -0,0 +1,75 @@ +# Fix database connection and route navigation + +## Context + +Two unrelated defects are breaking the app on Laragon (Windows, Apache, PHP, MySQL/MariaDB): + +1. **Database connection fails.** `config/database.php` reads `MYSQLHOST`/`MYSQLUSER`/`MYSQLPASSWORD`/etc. via `getenv()`. PHP under Apache/CGI on Laragon does **not** expose a project `.env` file to `getenv()` automatically — only the real OS environment. There is no `vlucas/phpdotenv` or `apache_setenv` call. The `.env` file at the project root is therefore ignored, so `getenv("MYSQLHOST")` returns `false`, and the PDO DSN is malformed (`host=;dbname=unimarket;port=3306;…`). +2. **Broken navigation links.** `index.php` links to `/public/customer/products/browse.php` and `/public/owner/dashboard.php`, but the actual folders live at `/customer/…` and `/owner/…` (no `public/` prefix). `includes/sidebar.php` references a `BASE_URL` constant that is never defined anywhere. Header/sidebar links will render as `/owner/products/list.php` (no host) or as the literal text `BASE_URLowner/…`. + +The `.env` file is otherwise correct: `MYSQLHOST=127.0.0.1`, `MYSQLUSER=root`, `MYSQLPASSWORD=` (empty), `MYSQLPORT=3306`, `MYSQLDATABASE=unimarket`. Database `unimarket` is created by `unimarket.sql`. + +## Decisions + +- **DB fix approach:** Add a small inline parser for `.env` in `config/database.php` (no new dependency). On first call it loads `/path/to/project/.env`, sets values into `$_SERVER`, `$_ENV`, and `putenv()`, then continues to use `getenv()`. This is the minimum change that keeps `getenv()` calls working everywhere else and avoids pulling in Composer. +- **Routes approach:** Fix the offending links to use the real paths (`/customer/…`, `/owner/…`, `/admin/…`) and define `BASE_URL` once. Do **not** rename folders or add a `public/` rewrite — that conflicts with the `guide.txt` layout. +- `Unimarket/includes/sidebar.php` is a duplicate/stale file; we will not edit it (it is not referenced by any page). It is flagged in the risks so the team can delete it. + +## Tasks + +### 1. `config/database.php` — load `.env` before reading env vars +- Add a function `loadEnv($path)` that: + - Returns silently if file missing or unreadable. + - Skips blank lines and `#` comments. + - For `KEY=value` lines, calls `putenv("$KEY=$value")`, sets `$_ENV[$KEY]`, and `$_SERVER[$KEY]`. + - Honors double-quoted values (strips quotes) and leaves empty values as `""`. +- Call `loadEnv(__DIR__ . '/../.env')` before the `getenv()` reads. +- Keep existing `try/catch` so a real connection failure still shows the message. + +### 2. `index.php` — fix two hero buttons +- Line 153: `/public/customer/products/browse.php` → `/customer/products/browse.php` +- Line 155: `/public/owner/dashboard.php` → `/owner/dashboard.php` + +### 3. `includes/sidebar.php` — define `BASE_URL` and fix trailing slashes +- At the top of the file (before any output), add a guard that defines `BASE_URL` if not already set: + ```php + if (!defined('BASE_URL')) { define('BASE_URL', '/'); } + ``` +- Note: header.php links use absolute paths starting with `/` already, so sidebar is the only place that needs the constant. The current three links render as `/owner/products/list.php` etc., which is what we want. +- (Optional but recommended) Remove the third link to `owner/reports.php` because `owner/reports.php` does **not** exist in the repo (see Risks). Decision: keep it for now — out of scope; this task is "fix what is broken", not "remove features". + +### 4. `Unimarket/includes/sidebar.php` — flag as stale +- Do not edit. List in Open Questions so the team decides whether to delete it. + +## Files to change + +- `config/database.php` — add `loadEnv()` and call it +- `index.php` — two href fixes +- `includes/sidebar.php` — add `BASE_URL` guard + +## Out of scope + +- `Unimarket/includes/sidebar.php` (duplicate, not referenced anywhere) +- Missing `owner/reports.php`, `owner/manage_orders.php`, `admin/reports.php` — those are separate feature gaps, not routing bugs +- Composer / phpdotenv adoption +- CSRF enforcement gaps and other security items +- `.htaccess` or `public/` rewrite + +## Validation + +Manual smoke test on Laragon (`http://unimarket.test` or `http://localhost/Unimarket/`): + +1. Hit `/index.php` — page loads, no `Database connection failed` banner. +2. Trending Products section renders up to 6 cards from the `products` table. +3. From a guest session, both header "Login"/"Register" links open the auth pages. +4. Log in as an owner; click "Go to Dashboard" hero button — lands on `/owner/dashboard.php` (not 404). +5. Log in as a customer; click "Browse Products" — lands on `/customer/products/browse.php`. +6. From the owner sidebar, "Products" and "Orders" links open their list pages without "BASE_URL" appearing in the URL or the rendered HTML. +7. Confirm by viewing source of any owner page that no literal string `BASE_URL` appears in `href` attributes. + +## Risks / open questions + +- **Stale duplicate file:** `Unimarket/includes/sidebar.php` mirrors `includes/sidebar.php` and still uses `BASE_URL`. Recommend deleting the entire `Unimarket/` subfolder — confirm with team before doing so. +- **Empty `MYSQLPASSWORD`:** Laragon default MySQL root has no password; the `getenv("MYSQLPASSWORD") ?: ''` works once `.env` is loaded. If a teammate's MySQL root *does* have a password, they must set `MYSQLPASSWORD="theirpass"` in `.env`. +- **`owner/reports.php` referenced but absent:** clicking the "Reports" sidebar link will 404. Flagged for the team; not fixed here. +- **No tests exist** in the repo, so validation is manual only. diff --git a/TODO.md b/TODO.md new file mode 100644 index 0000000..928977c --- /dev/null +++ b/TODO.md @@ -0,0 +1,14 @@ +# DESIGN +- tailwindcss cdn +- motion +- e-commerce design +- make it simple and premium +- responsive + +# LANDING PAGE +- fix font and colors (background , card) +- do not add margin in hero and final CTA left and right + +# LOGO TAB TITLE LOGO, HEADER & FOOTER +- make the logo black in light theme +- make the logo white in dark theme \ No newline at end of file diff --git a/Unimarket/includes/sidebar.php b/Unimarket/includes/sidebar.php deleted file mode 100644 index 124805d..0000000 --- a/Unimarket/includes/sidebar.php +++ /dev/null @@ -1,20 +0,0 @@ -
  • - - Products - -
    • -
  • - - Orders - -
    • -
  • - - Reports - -
    • - - - - - \ No newline at end of file diff --git a/assets/images/logo/logo.svg b/assets/images/logo/logo.svg new file mode 100644 index 0000000..074bcf5 --- /dev/null +++ b/assets/images/logo/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/assets/images/products/681df946dcc9a.jpg b/assets/images/products/681df946dcc9a.jpg deleted file mode 100644 index 3c56281..0000000 Binary files a/assets/images/products/681df946dcc9a.jpg and /dev/null differ diff --git a/assets/images/products/681ed7d113e20.png b/assets/images/products/681ed7d113e20.png deleted file mode 100644 index 339fdaf..0000000 Binary files a/assets/images/products/681ed7d113e20.png and /dev/null differ diff --git a/assets/images/products/68483b17f0058.jpg b/assets/images/products/68483b17f0058.jpg deleted file mode 100644 index ea92edf..0000000 Binary files a/assets/images/products/68483b17f0058.jpg and /dev/null differ diff --git a/assets/images/products/684ebd243b103.png b/assets/images/products/684ebd243b103.png deleted file mode 100644 index d635985..0000000 Binary files a/assets/images/products/684ebd243b103.png and /dev/null differ diff --git a/config/database.php b/config/database.php index d122ecb..48486cf 100644 --- a/config/database.php +++ b/config/database.php @@ -1,4 +1,27 @@ = 2 && $value[0] === '"' && substr($value, -1) === '"') { + $value = substr($value, 1, -1); + } + if ($key === '') continue; + putenv("$key=$value"); + $_ENV[$key] = $value; + $_SERVER[$key] = $value; + } +} + +loadEnv(__DIR__ . '/../.env'); + $host = getenv("MYSQLHOST"); $db = getenv("MYSQLDATABASE"); $user = getenv("MYSQLUSER"); diff --git a/includes/footer.php b/includes/footer.php index b5f98e6..a205561 100644 --- a/includes/footer.php +++ b/includes/footer.php @@ -1,53 +1,81 @@ - - - - - - - + + + + + + + diff --git a/includes/header.php b/includes/header.php index 5bac901..96166c1 100644 --- a/includes/header.php +++ b/includes/header.php @@ -1,795 +1,191 @@ - - - - - - <?php echo isset($page_title) ? $page_title . ' - ' : ''; ?>UniMarket - University Marketplace - - - - - - - - -
    -
    -

    Confirm Logout

    -

    Are you sure you want to logout?

    -
    - - -
    -
    -
    - -
    -
    - - - - - - - -
    -
    - - - - -
    -
    - + + + + +
    + + + + + + + + + - - -
    - + }; + setTimeout(() => document.addEventListener('click', close), 10); + } - + + setInterval(loadNotifications, 30000); + + + +
    diff --git a/includes/sidebar.php b/includes/sidebar.php index 124805d..e295969 100644 --- a/includes/sidebar.php +++ b/includes/sidebar.php @@ -1,15 +1,18 @@
  • - + Products
  • - + Orders
  • - + Reports
    • diff --git a/index.php b/index.php index 0425f87..7336f4f 100644 --- a/index.php +++ b/index.php @@ -1,249 +1,335 @@ - - UniMarket - University Marketplace - - - - - - - - -
    -
    -

    Welcome to UniMarket

    -

    The University Marketplace for Affordable Student Essentials, Books, Supplies & Campus Merchandise.

    - - - - - -
    -
    - -
    -
    -
    -
    🛍️
    -

    Campus Marketplace

    -

    Buy and sell products exclusively within your university community.

    -
    - -
    -
    🔄
    -

    Easy Pickup

    -

    Schedule convenient on-campus pickup times for your orders.

    -
    - -
    -
    🛒
    -

    Secure Transactions

    -

    Safe and reliable transactions between students and campus vendors.

    -
    -
    - - query("SELECT * FROM products ORDER BY created_at DESC LIMIT 6"); - $trending_products = $stmt->fetchAll(); - - if (!empty($trending_products)) { - echo '
    '; - echo '

    Trending Products

    '; - echo '
    '; - - foreach ($trending_products as $product) { - echo '
    '; - echo '
    '; - if ($product['image_path']) { - echo ''.htmlspecialchars($product['name']).''; - } else { - echo '
    No Image
    '; + + + + + + + + + + + +
    + +
    + Campus Background +
    +
    + +
    + +
    +
    + Exclusive Student Marketplace +
    +

    + Elevating the Campus
    Exchange Experience. +

    +

    + A curated marketplace for student essentials. Minimalist, secure, and designed exclusively for the university community. +

    +
    + + + Join the Community + + Sign In + + + + Browse Collection + + + + Manage Shop + + + +
    +
    + + + +
    +
    + + +
    +
    +
    +
    +
    + +
    +

    Curated Marketplace

    +

    Exclusive access to university-verified products and student essentials.

    +
    +
    +
    + +
    +

    Intuitive Pickup

    +

    Seamless on-campus coordination designed for the student schedule.

    +
    +
    +
    + +
    +

    Trust-Based Trade

    +

    Safe, community-driven transactions within a secure university environment.

    +
    +
    +
    +
    + + + query("SELECT * FROM products ORDER BY created_at DESC LIMIT 6"); + $trending_products = $stmt->fetchAll(); + } + } + } catch (Exception $e) { + error_log("Trending products error: " . $e->getMessage()); + } + + if (!empty($trending_products)): ?> +
    +
    +
    +
    +

    Latest Arrivals

    +

    Freshly listed essentials from your peers.

    +
    + +
    + +
    + +
    +
    + + <?= htmlspecialchars($product['name']) ?> + +
    No image available
    + +
    +
    +

    +

    ₱

    + + View Details + + Login to Purchase + +
    +
    + +
    +
    +
    + + + +
    +
    +

    Join the inner circle of campus trade.

    +

    Simpler, cleaner, and faster. The way university shopping should be.

    - Get Started + Get Started - Browse Products + Browse Products - Add New Product + List a Product
    -
    - + + + +