Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev Merge #43

Merged
merged 187 commits into from
Feb 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
187 commits
Select commit Hold shift + click to select a range
0da3212
added ERD SVG
Timtendo12 Nov 22, 2023
9b1b1f3
Create main.yml
Timtendo12 Nov 22, 2023
d7a26d5
Update main.yml
Timtendo12 Nov 22, 2023
7eb85c0
Added working directory
Timtendo12 Nov 22, 2023
c4f4932
Create main.yml (#2)
DanericNetwork Nov 22, 2023
3d5c69a
docs: added ERD SVG (#1)
DanericNetwork Nov 22, 2023
0b3eabd
docs; Create usecase-diagram.drawio
Chrinsieboy Nov 23, 2023
59b7fef
Fix: moved usecase diagram to docs directory
Chrinsieboy Nov 23, 2023
b068f1d
docs: added usecase diagram as svg and removed .drawio
Chrinsieboy Nov 23, 2023
34e0b30
Docs: added use case diagram
Chrinsieboy Nov 24, 2023
7e83f99
Updated ERD
Timtendo12 Nov 23, 2023
2cacf08
docs(WIP): added class diagram
Chrinsieboy Nov 24, 2023
d781480
docs(WIP): white background for class diagram for better reading
Chrinsieboy Nov 24, 2023
d0a1090
Feat(class diagram): added components
Chrinsieboy Nov 29, 2023
581c24f
feat(class diagram): added relations between modals and controller
Chrinsieboy Nov 29, 2023
4d3e083
fix: white background missing and formatting
Chrinsieboy Dec 4, 2023
6716dc2
docs: added design pictures
Huib8 Nov 30, 2023
315bf44
refactor: all png to svg and more like variants
Chrinsieboy Dec 4, 2023
391aea6
Added Migrations + Database seeder
Timtendo12 Dec 4, 2023
9517024
Feature: Added class diagram
Chrinsieboy Dec 7, 2023
79b0428
Added authentication endpoint.
Timtendo12 Dec 8, 2023
42303fc
Added permissions and roles
Timtendo12 Dec 8, 2023
e831528
deps: add pinia
Chrinsieboy Dec 7, 2023
dab2170
feat: add pinia to project
Chrinsieboy Dec 7, 2023
12b18be
docs: add example for pinia store
Chrinsieboy Dec 7, 2023
291ea76
fix: return does nothing
Chrinsieboy Dec 11, 2023
02ae1e0
feat: added pinia itemstore
Chrinsieboy Dec 11, 2023
e925e70
feat: added reservation store
Chrinsieboy Dec 11, 2023
e5f9c55
feat: added grants store
Chrinsieboy Dec 11, 2023
0a3f9bf
feat(WIP): item card skeleton
Chrinsieboy Dec 13, 2023
5663cb2
button, input en background vlak components
Huib8 Dec 14, 2023
6f9c0c9
deps: added sass
Chrinsieboy Dec 14, 2023
a25df14
feat: added sass globals and variables
Chrinsieboy Dec 14, 2023
7cb2437
feat: implementation of sass #13
DanericNetwork Dec 14, 2023
e981196
Merge remote-tracking branch 'origin/dev' into feature/item-card
DanericNetwork Dec 14, 2023
c06b3f8
Merge branch 'dev' into feature/button-and-input
Chrinsieboy Dec 14, 2023
b85a8e8
Refactor ItemCard component and add new component
DanericNetwork Dec 14, 2023
ad39880
Controllers
Timtendo12 Dec 14, 2023
b7e23ee
feat: icon component with star icons
DanericNetwork Dec 15, 2023
197716c
feat: .prettierrc.json file with tabWidth set to 2
DanericNetwork Dec 15, 2023
3bb3916
feat: rating component
DanericNetwork Dec 15, 2023
8a472b2
feat: icon component with new icons
DanericNetwork Dec 15, 2023
0a3e373
refactor: icons in ItemCard component
DanericNetwork Dec 15, 2023
e56c206
chore: remove ItemCard component from index.vue
DanericNetwork Dec 15, 2023
2fce95b
feat: added Box component
Chrinsieboy Dec 15, 2023
69424f3
feat: added Input component
Chrinsieboy Dec 15, 2023
f26781e
refactor: make `searchButton` more global, its now `Button`
Chrinsieboy Dec 18, 2023
9e98ed2
cleanup: removed `SearchBar` because it was refactored to `Input`
Chrinsieboy Dec 18, 2023
95280d6
refactor: terminal scan box all in one to re-use
Chrinsieboy Dec 18, 2023
a96c2d7
fix: index.vue back to standard content
Chrinsieboy Dec 18, 2023
0ca71af
Feat: added vscode settings for tabSize
Chrinsieboy Dec 18, 2023
e985d8d
model gemaakt. alleen kleur moet nog aangepast worden
Huib8 Dec 18, 2023
46545d0
model done
Huib8 Dec 18, 2023
a52b548
feat: ratings component (#17)
DanericNetwork Dec 20, 2023
8d8dc82
Refactor: ItemCard indents and removed duplicate component imports
DanericNetwork Dec 20, 2023
3382115
refactor: prettier configuration
DanericNetwork Dec 20, 2023
d474bb7
refactor: prettier configuration (#18)
DanericNetwork Dec 20, 2023
23445be
feat: added handleClick function
Chrinsieboy Dec 20, 2023
b1e5868
fix: class to much and buttonAction not working
Chrinsieboy Dec 20, 2023
9b6de71
fix: api duplicate
Chrinsieboy Dec 20, 2023
387bae0
docs: how to create a toast notification
DanericNetwork Dec 20, 2023
bac0930
feat: vue-toastification plugin
DanericNetwork Dec 20, 2023
ce746f1
Controllers (#16)
DanericNetwork Dec 20, 2023
5faefe0
feat: Button, Input and box are now available
Chrinsieboy Dec 20, 2023
57d305e
Fix warning condition in ItemCard.vue
DanericNetwork Dec 20, 2023
91a6b03
Refactor warning condition in ItemCard.vue
DanericNetwork Dec 20, 2023
b29f11c
Merge branch 'dev' into feature/item-card
Chrinsieboy Dec 20, 2023
e1c7bc9
Changes voor modal
Huib8 Dec 21, 2023
4be7720
cleanup: removed sass lines from app.js
Chrinsieboy Dec 21, 2023
17ae805
feat: added resolve and preprocessor
Chrinsieboy Dec 21, 2023
d75f9c4
feat: itemcard component (#15)
DanericNetwork Dec 21, 2023
e606e37
cleanup: removed duplicate
Chrinsieboy Dec 21, 2023
feb845f
fix: undo deletion
Chrinsieboy Dec 21, 2023
26e40ca
feat: added webpack.config
Chrinsieboy Dec 21, 2023
faeaacf
Merge branch 'dev' into feature/model
Huib8 Dec 21, 2023
55402f8
changes after review
Huib8 Jan 10, 2024
fd52e49
feat: added scan-icon
Chrinsieboy Jan 10, 2024
22751fc
fix: icon offset
Chrinsieboy Jan 10, 2024
1f77cde
fix: flex direction not variable
Chrinsieboy Jan 10, 2024
46312b6
fix: moved icon, fixed direction, added props and some styling
Chrinsieboy Jan 10, 2024
0c15317
feat: terminal startpage
Chrinsieboy Jan 10, 2024
f7625e3
changes after second review
Huib8 Jan 10, 2024
e026dd6
feat: admin page route
DanericNetwork Jan 10, 2024
f1cca32
feat: admin index page & charts
DanericNetwork Jan 10, 2024
0b2e139
bugfix: sass variablen not available
Chrinsieboy Jan 11, 2024
8d8428e
cleanup: removed comment
Chrinsieboy Jan 11, 2024
03bfca4
cleanup: removed console log
Chrinsieboy Jan 11, 2024
61aa5cd
fix: button content not variable
Chrinsieboy Jan 11, 2024
c2c2e35
style: 4 tabs to 2 tabs
Chrinsieboy Jan 11, 2024
1e03707
prettier used and formatted it
Huib8 Jan 11, 2024
3474226
Feature: Added item types enum + item seeder.
Timtendo12 Jan 11, 2024
709ce06
another file formatted
Huib8 Jan 11, 2024
777cba0
fix; indent space to 2
Chrinsieboy Jan 11, 2024
abbba76
Merge branch 'dev' into feature/model
Huib8 Jan 11, 2024
d089c49
Merge branch 'dev' into feature/public-terminal-start-page
Chrinsieboy Jan 11, 2024
79444f7
fix: removed non needed max width
Chrinsieboy Jan 11, 2024
9fd95a3
fix: icon to lowercase to fix build
Chrinsieboy Jan 11, 2024
5cba4f9
feat: Terminal Public Startpage
Chrinsieboy Jan 11, 2024
aa67ea4
dev: editorconfig tabsize
DanericNetwork Jan 11, 2024
0adaffb
feat: default item types
Chrinsieboy Jan 11, 2024
bf85e97
Merge branch 'dev' into feature/model
Huib8 Jan 11, 2024
a287236
feat: modal #20
DanericNetwork Jan 11, 2024
b7bd3ce
Merge branch 'dev' into features/admin-index-page
Chrinsieboy Jan 15, 2024
a80d726
Import via API.
Timtendo12 Jan 11, 2024
f670184
feat: add new icons
Chrinsieboy Jan 15, 2024
aec5313
feat: add admin layout
Chrinsieboy Jan 15, 2024
a02b934
fix: website standard width and height
Chrinsieboy Jan 15, 2024
3b784fc
fix: width, height and margin
Chrinsieboy Jan 15, 2024
3de6747
fix: padding in header
Chrinsieboy Jan 15, 2024
d9e2622
cleanup: remove unused items
Chrinsieboy Jan 15, 2024
cf83603
feat: add person icon
Chrinsieboy Jan 15, 2024
787a0d4
feat: implement props
Chrinsieboy Jan 15, 2024
b3b3ac0
refactor: rename `content` to `terminal-content` for no confusion
Chrinsieboy Jan 15, 2024
c6e8889
feature: added reservation search
Timtendo12 Jan 15, 2024
8445272
item search endpoint
Timtendo12 Jan 15, 2024
3e69360
fix: better colors
Chrinsieboy Jan 17, 2024
4b5304a
feat: add admin dashboard
Chrinsieboy Jan 17, 2024
8733676
feat: add props with mockdata
Chrinsieboy Jan 17, 2024
42eabf2
fix: different chart options and series
Chrinsieboy Jan 17, 2024
74b2ae8
feat: add `@layouts` to vite config
Chrinsieboy Jan 17, 2024
ba37be4
refactor: changed path to `@layouts`
Chrinsieboy Jan 17, 2024
10c8956
refactor: class `content` to `admin-content`
Chrinsieboy Jan 17, 2024
427f463
Feature: Added author to items
Timtendo12 Jan 17, 2024
bed0d74
Feature/Tabs added and added styling
Huib8 Jan 17, 2024
0568af0
feat: Added author to items #30
Chrinsieboy Jan 17, 2024
73d500b
Merge branch 'dev' into fix/admin-dashboard
Chrinsieboy Jan 17, 2024
83a7179
feat: admin page and layout #23
Chrinsieboy Jan 17, 2024
459efef
Merge branch 'dev' into fix/admin-dashboard
Chrinsieboy Jan 17, 2024
2304dbe
feat: return page with mock data
Chrinsieboy Jan 17, 2024
b591a1b
feat: adminpage, datamapping the mock data
Chrinsieboy Jan 17, 2024
a8c15d7
feat: add slot to the admin layout
Chrinsieboy Jan 17, 2024
026f682
fix: moved background and add Adminlayout
Chrinsieboy Jan 17, 2024
bc72723
feat: add href for home and active class
Chrinsieboy Jan 18, 2024
06750d3
fix: active color
Chrinsieboy Jan 18, 2024
d8f0358
feat: add active page nav
Chrinsieboy Jan 18, 2024
4d28752
Fix: admin layout #33
Chrinsieboy Jan 18, 2024
4de2680
changes added/fix
Huib8 Jan 18, 2024
c112041
Merge branch 'dev' of https://github.com/DanericNetwork/Biblio-App in…
Chrinsieboy Jan 18, 2024
2a54dea
Fix: Datamapping in Admin Dashboard (#32)
Timtendo12 Jan 18, 2024
8089475
Fix: Fixed the admin layout.
Timtendo12 Jan 18, 2024
3d4f65c
feat: return page with mock data
Chrinsieboy Jan 17, 2024
e0ad061
feat: adminpage, datamapping the mock data
Chrinsieboy Jan 17, 2024
50319ff
Fix: Conflict fix.
Timtendo12 Jan 18, 2024
301ba42
Merge branch 'dev' of https://github.com/DanericNetwork/Biblio-App in…
Timtendo12 Jan 18, 2024
7a2fe13
Fix: Fixed the admin layout. (#34)
Timtendo12 Jan 18, 2024
83ae5da
changes after review
Huib8 Jan 18, 2024
1f5a604
fix: console log removed
Huib8 Jan 18, 2024
2defd89
feat: add post to API
Chrinsieboy Jan 19, 2024
688b0a2
feat: add UserController
Chrinsieboy Jan 19, 2024
4e1628a
feat: add SearchUserRequest
Chrinsieboy Jan 19, 2024
a07ca4a
feat: search for id or librarypass barcode
Chrinsieboy Jan 19, 2024
5729b51
feat: add search users endpoint #35
Chrinsieboy Jan 19, 2024
2b3b7e4
changes after review
Huib8 Jan 19, 2024
9839725
chanched controller name
Huib8 Jan 19, 2024
353b013
changes tabs object
Huib8 Jan 19, 2024
62c4c1c
feat: add real data
Chrinsieboy Jan 22, 2024
7aaae21
fix: name always = John Doe and default count
Chrinsieboy Jan 22, 2024
2e5c3ed
fix: no default for userData
Chrinsieboy Jan 22, 2024
c0caf51
fix: better props
Chrinsieboy Jan 22, 2024
ab42f00
fix: default userData not needed
Chrinsieboy Jan 22, 2024
aa2073d
feat: get firstname and first letter of lastname
Chrinsieboy Jan 22, 2024
6614722
fix: Fixes job
Timtendo12 Jan 22, 2024
b102275
Feature: Admin dashboard item page with pagination
Timtendo12 Jan 22, 2024
291ce29
Feature: Admin dashboard item page with pagination (#37)
Timtendo12 Jan 22, 2024
00d071d
changes after review
Huib8 Jan 22, 2024
335442f
changes after review
Huib8 Jan 22, 2024
ff2d86a
changes after review
Huib8 Jan 22, 2024
8a4e439
fix: Fixes job (#38)
Timtendo12 Jan 22, 2024
0cdb17e
fix: color tabs changes, tabs rounded removed
Huib8 Jan 22, 2024
26ee2b7
fix: scrollbar color changes
Huib8 Jan 22, 2024
e65f0f4
Merge branch 'dev' of https://github.com/DanericNetwork/Biblio-App in…
Timtendo12 Jan 24, 2024
ac3d4e6
Feature/Terminal Dashboard (#31)
Timtendo12 Jan 24, 2024
b795ffd
fix: item card weird width and height fixed
Huib8 Jan 24, 2024
3786af0
fix: width and height item card (#39)
Timtendo12 Jan 24, 2024
765ac9f
feat: add userData to all pages and tabs in file
Chrinsieboy Jan 24, 2024
f453253
refactor: moved userAuth to InertiaRequests
Chrinsieboy Jan 24, 2024
619436d
Merge branch 'dev' into feature/admin-statistics
Chrinsieboy Jan 24, 2024
2fe4483
cleanup: duplicate on Item Model
Chrinsieboy Jan 24, 2024
68fe893
revert: back to original state
Chrinsieboy Jan 24, 2024
ca726bd
revert: back to original state
Chrinsieboy Jan 24, 2024
b5582ff
fix: not logged in means logging in
Chrinsieboy Jan 24, 2024
9b3dd2b
fix: feedback for redirect instead of location
Chrinsieboy Jan 24, 2024
8b95398
feat: admin statistics with database data #36
Chrinsieboy Jan 24, 2024
f39f1f9
Added and fixed book apis.
Timtendo12 Feb 1, 2024
55cac53
Fix: Did an oopsie :)
Timtendo12 Feb 1, 2024
f5359f3
added grants to items search
Timtendo12 Feb 1, 2024
ed0af1f
Added and fixed book apis. (#41)
Timtendo12 Feb 1, 2024
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
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ root = true
[*]
charset = utf-8
end_of_line = lf
indent_size = 4
indent_size = 2
indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true
Expand Down
30 changes: 30 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: Build Laravel and NPM Packages

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

jobs:
biblio-build:

runs-on: ubuntu-latest

steps:
- uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
with:
php-version: '8.1'
- uses: actions/checkout@v3
- name: Copy .env
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
working-directory: "./src/"
- name: Install Dependencies
run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
working-directory: "./src/"
- name: Install NPM Packages
run: npm install
working-directory: "./src/"
- name: Build NPM
run: npm run build
working-directory: "./src/"
6 changes: 6 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"tabWidth": 2,
"useTabs": false,
"semi": true,
"singleQuote": false
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.tabSize": 2
}
12 changes: 12 additions & 0 deletions docs/ERD_V-1_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions docs/class_diagram_V-1_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions docs/designs/design0-0.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions docs/designs/design1-0.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading