Skip to content
Merged

v1.0 #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
dfd0c52
Feature/refactoring (#9)
mresidovic1 Apr 3, 2025
5935c97
Feature/login page layout (#11)
mresidovic1 Apr 3, 2025
c5a422b
Feature/google o auth (#12)
mresidovic1 Apr 3, 2025
d0ebb46
Izvršene promjene nastale uslijed pogrešnog razumijevanja taska. (#13)
edelmo1 Apr 4, 2025
a92a84b
Dodavanje komponenti za listu korisnika (#14)
DinelaP Apr 4, 2025
a158f74
Add email validation using Zod schema (#18)
fbakovic1 Apr 4, 2025
c17fc69
Feature: admin creates user - buyer/seller (#17)
ahajdarevi5 Apr 4, 2025
0ca07ca
Feature: list pending users (#16)
ahajdarevi5 Apr 4, 2025
08c8e53
Dodavanje detalja profila (#19)
AdnaAlihodzic Apr 5, 2025
de4cf4d
feature(admin-panel) (#21)
mresidovic1 Apr 5, 2025
91cabfe
feature(notifications-page) (#23)
mresidovic1 Apr 6, 2025
16e8cc1
Feature/backend (#24)
Dzombi Apr 6, 2025
98bc0ec
Feature/deployment (#25)
lilhast1 Apr 7, 2025
a498cac
Create frontend-ci.yml (#26)
lilhast1 Apr 7, 2025
31a3875
Create frontend-ci.yml (#27)
lilhast1 Apr 7, 2025
8c43026
Hotfix/page title (#28)
mbjelobrk1 Apr 8, 2025
35c9386
Prva verzija modala (#42)
edelmo1 Apr 9, 2025
6517701
feature(stores-page): Implemented stores page including store card, a…
mresidovic1 Apr 10, 2025
f5ea5c8
Modal za editovanje prodavnice (#44)
edelmo1 Apr 10, 2025
f735f8f
Fix/api.js (#48)
lilhast1 Apr 11, 2025
03d37d7
Feature/kategorija proizvoda (#47)
DinelaP Apr 11, 2025
0a6c5f6
added filtering by role and availability + ui fix (#49)
ahajdarevi5 Apr 11, 2025
78bc7c8
feature(categories) (#50)
mresidovic1 Apr 11, 2025
12aa430
feature(user-management) (#51)
mresidovic1 Apr 12, 2025
9197c85
aj da vidimo (#53)
lilhast1 Apr 12, 2025
b23bd56
Feature/apimerge2 (#56)
lilhast1 Apr 13, 2025
3150177
vicemo (#57)
lilhast1 Apr 13, 2025
dc1e3c4
Bugfix/reload (#58)
lilhast1 Apr 14, 2025
2e0f9f0
Feature/mockapi (#68)
mbjelobrk1 Apr 15, 2025
d02ea3b
Connection/front back (#71)
edelmo1 Apr 18, 2025
cc8950b
Orders (#73)
DinelaP Apr 18, 2025
532fa2a
Manage s (#75)
fbakovic1 Apr 19, 2025
ac53ad5
feature(orders-page) (#76)
mresidovic1 Apr 19, 2025
4b3f5e4
feature(integration)
mresidovic1 Apr 19, 2025
259585b
Merge pull request #77 from Software-Engineering-Group-Bazaar/feature…
edelmo1 Apr 20, 2025
269cd04
nesto uradjeno dosta primjeceno (#78)
lilhast1 Apr 20, 2025
d81b7a3
fix(order) (#83)
mresidovic1 Apr 20, 2025
8e0dfb1
Fix issue #81, not updating store status (#86)
fbakovic1 Apr 21, 2025
1fc8570
Bugfix/export import (#85)
edelmo1 Apr 21, 2025
1c09714
feature(edit-product) (#87)
mresidovic1 Apr 21, 2025
ba9baf5
boo js (#88)
lilhast1 Apr 21, 2025
5c504e6
feature(analytics)
mresidovic1 May 2, 2025
41e3040
Merge pull request #97 from Software-Engineering-Group-Bazaar/feature…
edelmo1 May 2, 2025
37b9f74
ui design for adCard component (#98)
ahajdarevi5 May 3, 2025
4a87dc8
Feature/create ad modal (#99)
mbjelobrk1 May 3, 2025
8e20c8b
feature(advertisements) (#100)
mresidovic1 May 3, 2025
f81de6c
Feature/analytics2 (#102)
edelmo1 May 4, 2025
6793e64
feature(analytics):fix (#103)
mresidovic1 May 4, 2025
4c9c376
Feature/advertismentintegration (#104)
mbjelobrk1 May 4, 2025
c2c83b8
Feature/stres (#105)
lilhast1 May 4, 2025
5b20b79
feature(ad):fix (#106)
mresidovic1 May 4, 2025
d196cc6
Feature/ad fix (#107)
mresidovic1 May 5, 2025
a528056
Feature/edit ad (#108)
mresidovic1 May 5, 2025
219f73a
Feature/edit ad (#109)
lilhast1 May 5, 2025
b18d5cf
hotfix (#110)
mresidovic1 May 5, 2025
0a4c48b
dodana 2 grafa (#119)
edelmo1 May 9, 2025
c5b1422
feature(graphs)
mresidovic1 May 9, 2025
ff68a90
Merge pull request #120 from Software-Engineering-Group-Bazaar/featur…
DinelaP May 9, 2025
e85ee94
Calendar/DealsChart/SalesChart (#121)
DinelaP May 10, 2025
1e94941
Povezivanje dijagrama (#122)
edelmo1 May 10, 2025
5a9784d
layout(analytics) (#123)
mresidovic1 May 10, 2025
7898e90
feature(ad-analytics) (#124)
mresidovic1 May 11, 2025
0d5a0d3
Feature/fixcreateadmodal (#125)
mbjelobrk1 May 11, 2025
821724d
Realtime klik (#126)
mbjelobrk1 May 11, 2025
425de00
Feature/analytics individual products (#128)
DinelaP May 11, 2025
8a73349
layout(fix) (#130)
mresidovic1 May 12, 2025
679e128
podniz se salje (#131)
lilhast1 May 12, 2025
0de9eba
Feature/seller analytics (#132)
lilhast1 May 12, 2025
be23f27
Feature/seller analytics (#133)
lilhast1 May 12, 2025
2d9d5db
nkntm (#134)
lilhast1 May 12, 2025
6f94a6f
Dodana sekcija za tikete i ticket komponenta (#146)
edelmo1 May 15, 2025
1b668a6
layout(chat) (#147)
mresidovic1 May 15, 2025
d58b6ad
layout(analytics): fix (#144)
mresidovic1 May 16, 2025
db8a69c
Kartica za rute i konfirmacija napravljeni i uvezani (#149)
mbjelobrk1 May 16, 2025
6bb19a2
Popravljen bug (#145)
edelmo1 May 16, 2025
1060dd2
feature(tickets-chat) (#150)
mresidovic1 May 16, 2025
2e09d91
Feature/createroute (#152)
mbjelobrk1 May 18, 2025
b796723
Feature/routes page (#151)
DinelaP May 18, 2025
8a55c0c
fix(chathub) (#154)
mresidovic1 May 18, 2025
2b00322
Chathub/hotfix (#155)
mresidovic1 May 18, 2025
2c93bd6
poravnati Orders Revenue by Regions i Conversions Revenue
fbakovic1 May 18, 2025
2b1d669
Feature/spajanjerute (#158)
mbjelobrk1 May 19, 2025
e2d34f3
hotfix(maps) (#159)
mresidovic1 May 19, 2025
a4a56d4
cors
lilhast1 May 19, 2025
1b1653e
issue #111
fbakovic1 May 19, 2025
8a5aa00
nesto sumnjam u ovo, google me corsa (#161)
lilhast1 May 19, 2025
2eb7cc9
Bugfix/idfk (#162)
lilhast1 May 19, 2025
85ed9db
remove .data RoutesPage:95
lilhast1 May 19, 2025
18ab9c1
pokusaj (#163)
lilhast1 May 19, 2025
6294472
Bugfix/hailmary (#164)
lilhast1 May 19, 2025
2d92274
Bugfix/hailmary (#165)
lilhast1 May 19, 2025
096324f
Fix/createfinal (#166)
mbjelobrk1 May 20, 2025
03f0721
Merge poravnati Orders Revenue by Regions i Conversions Revenue #156…
lilhast1 May 21, 2025
62a7cee
Dodane adrese (#169)
edelmo1 May 23, 2025
a8dea55
Feature/taxirevenue (#170)
mbjelobrk1 May 25, 2025
ba5b7cd
analitika za prodavnice (#171)
ahajdarevi5 May 25, 2025
a4b0f5a
Decimal i rerender popravljeni (#172)
mbjelobrk1 May 25, 2025
e72c7ec
fix (#173)
ahajdarevi5 May 25, 2025
040f38c
Feature/translation (#174)
fbakovic1 Jun 2, 2025
8bcf73f
Feature/translation (#175)
fbakovic1 Jun 2, 2025
65d6269
uset (#176)
lilhast1 Jun 2, 2025
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
4 changes: 4 additions & 0 deletions .env
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
VITE_API_BASE_URL=http://localhost:5054
VITE_API_FLAG=prod
VITE_GOOGLE_MAPS_API_KEY=stavitekljuclog

58 changes: 58 additions & 0 deletions .github/workflows/frontend-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Frontend CI Checks

# Controls when the workflow will run
on:
# Triggers the workflow on push events but only for the main branch
push:
branches: [develop]
# Triggers the workflow on pull request events targeting the main branch
pull_request:
branches: [develop]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

jobs:
build-and-lint: # You can name the job anything descriptive
runs-on: ubuntu-latest # Use a Linux runner

strategy:
matrix:
node-version: [20.15.1] # Specify the Node.js version(s) you use
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
# 1. Get the code from the repository
- name: Checkout code
uses: actions/checkout@v4 # Use the standard checkout action

# 2. Setup Node.js environment
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm' # Cache npm dependencies for faster builds

# 3. Install dependencies (use 'ci' for clean installs in CI)
- name: Install dependencies
run: npm ci # 'npm ci' is generally preferred over 'npm install' in CI

# 4. Run linters (if you have ESLint configured)
# Make sure you have a lint script in your package.json
# - name: Run linter (ESLint)
# run: npm run lint # Adjust if your lint script has a different name

# 5. Run formatter check (if you use Prettier)
# Make sure you have a format check script in package.json (e.g., "prettier --check .")
# - name: Check formatting (Prettier) # Optional: Uncomment if using Prettier check
# run: npm run format:check # Adjust script name as needed

# 6. Build the project (catches syntax errors, type errors if TS, build config issues)
- name: Build project
run: npm run build --if-present # Runs 'npm run build' if the script exists


# 7. Run tests (if you have tests configured - Vitest, Jest, etc.)
# Make sure you have a test script in package.json (e.g., "vitest run")
# - name: Run tests # Optional: Uncomment if using tests
# run: npm run test # Adjust script name as needed
8 changes: 2 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
.vscode

node_modules
dist
Expand Down Expand Up @@ -98,12 +99,7 @@ web_modules/
# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.development.local
.env.test.local
.env.production.local
.env.local


# parcel-bundler cache (https://parceljs.org/)
.cache
Expand Down
8 changes: 8 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"semi": true,
"singleQuote": true,
"jsxSingleQuote": true,
"trailingComma": "es5",
"tabWidth": 2,
"printWidth": 80
}
28 changes: 28 additions & 0 deletions TODO.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
## storeId i buyerId

prioritet: 0

Provuci kroz komponente ideve a ne nazive da se poziv uradi uspjesno,
Naravno korisnku prikazujete nazive ali id se salje bekendu.

## import/export csv i xlsx

prioritet: 0

Nesto tu steka

## active store reload

prioritet: 1
Ne updatea se vDOM

## active product preko tackice

prioritet: 1
Fali categoryId

## edit store

prioritet: 2

nije dodana lista regiona i mjesta
7 changes: 7 additions & 0 deletions headers.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[functions]
directory = "netlify/functions" # Or your functions directory

[[redirects]]
from = "/api/netlify/directions" # Client will call this path
to = "/.netlify/functions/extRoute"
status = 200
16 changes: 14 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React</title>
<link
href="https://fonts.googleapis.com/css2?family=Great+Vibes&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;400;600&display=swap"
rel="stylesheet"
/>
<link
href="https://fonts.googleapis.com/css2?family=Manrope:wght@400;500;600;700&display=swap"
rel="stylesheet"
/>
<title>Bazaar Web Panel</title>
</head>
<body>
<div id="root"></div>
Expand Down
5 changes: 5 additions & 0 deletions netlify/functions/extRoute.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
const axios = require('axios');

exports.handler = async (event, context) => {
return await axios.get(event.url);
};
Loading