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.

Sign up for GitHub

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

Jump to bottom

Feature/Terminal Dashboard #31

Merged
merged 13 commits into from
Jan 24, 2024
Merged

Feature/Terminal Dashboard #31

merged 13 commits into from
Jan 24, 2024

Conversation

Huib8
Copy link
Collaborator

@Huib8 Huib8 commented Jan 17, 2024

No description provided.

@Chrinsieboy Chrinsieboy changed the base branch from master to dev January 17, 2024 13:43
@Chrinsieboy Chrinsieboy changed the title Feature/dashboard main pagina Feature/Terminal Dashboard Jan 17, 2024
@Huib8 Huib8 marked this pull request as ready for review January 18, 2024 12:58
Chrinsieboy
Chrinsieboy requested changes Jan 18, 2024
View reviewed changes
Copy link
Collaborator

@Chrinsieboy Chrinsieboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry huib maar...

src/app/Http/Controllers/dashboardTerminalController.php Outdated Show resolved Hide resolved
src/app/Http/Controllers/dashboardTerminalController.php Outdated Show resolved Hide resolved
src/app/Http/Controllers/dashboardTerminalController.php Outdated Show resolved Hide resolved
src/resources/vue/components/Tabs.vue Show resolved Hide resolved
src/resources/vue/components/ItemCard.vue Outdated Show resolved Hide resolved
src/resources/vue/components/terminal-scan.vue Outdated Show resolved Hide resolved
src/resources/vue/pages/index.vue Outdated Show resolved Hide resolved
src/resources/vue/pages/terminal-dashboard.vue Outdated Show resolved Hide resolved
src/resources/vue/pages/terminal-dashboard.vue Outdated Show resolved Hide resolved
src/routes/web.php Outdated Show resolved Hide resolved
@Huib8 Huib8 requested a review from Chrinsieboy January 18, 2024 14:45
Timtendo12
Timtendo12 requested changes Jan 19, 2024
View reviewed changes
src/app/Http/Controllers/dashboardTerminalController.php Outdated Show resolved Hide resolved
src/resources/vue/pages/terminal-dashboard.vue Outdated Show resolved Hide resolved
src/resources/vue/components/Tabs.vue Outdated Show resolved Hide resolved
Chrinsieboy
Chrinsieboy requested changes Jan 19, 2024
View reviewed changes
src/resources/vue/components/Tabs.vue Show resolved Hide resolved
src/resources/vue/components/icon.vue Outdated Show resolved Hide resolved
src/resources/vue/pages/terminal-dashboard.vue Outdated Show resolved Hide resolved
src/routes/web.php Outdated Show resolved Hide resolved
Timtendo12
Timtendo12 requested changes Jan 22, 2024
View reviewed changes
src/app/Http/Controllers/AppController.php Outdated Show resolved Hide resolved
src/resources/vue/components/Tabs.vue Show resolved Hide resolved
@DanericNetwork DanericNetwork self-requested a review January 22, 2024 10:07
Timtendo12
Timtendo12 previously approved these changes Jan 22, 2024
View reviewed changes
@Huib8
Copy link
Collaborator Author

Huib8 commented Jan 22, 2024 •
edited
Loading

afbeelding

afbeelding

Chrinsieboy
Chrinsieboy requested changes Jan 22, 2024
View reviewed changes
src/resources/vue/components/ItemCard.vue Outdated Show resolved Hide resolved
src/resources/vue/components/Tabs.vue Show resolved Hide resolved
src/routes/web.php Outdated Show resolved Hide resolved
@Huib8 Huib8 requested a review from Chrinsieboy January 22, 2024 14:45
Chrinsieboy
Chrinsieboy previously approved these changes Jan 22, 2024
View reviewed changes
Timtendo12
Timtendo12 previously approved these changes Jan 24, 2024
View reviewed changes
Copy link
Collaborator

@Timtendo12 Timtendo12 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍🏻

@Timtendo12 Timtendo12 dismissed stale reviews from Chrinsieboy and themself via 826b1fc January 24, 2024 08:57
@Timtendo12 Timtendo12 self-requested a review January 24, 2024 08:58
Timtendo12
Timtendo12 previously approved these changes Jan 24, 2024
View reviewed changes
@Timtendo12
Merge branch 'dev' of https://github.com/DanericNetwork/Biblio-App in…
e65f0f4 
…to feature/dashboard-main-pagina

# Conflicts:
#	src/resources/vue/components/icon.vue
#	src/resources/vue/components/terminal-scan.vue
#	src/resources/vue/pages/index.vue
#	src/routes/web.php
@Timtendo12 Timtendo12 force-pushed the feature/dashboard-main-pagina branch from 826b1fc to e65f0f4 Compare January 24, 2024 08:59
Chrinsieboy
Chrinsieboy approved these changes Jan 24, 2024
View reviewed changes
Copy link
Collaborator

@Chrinsieboy Chrinsieboy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚀

@Timtendo12 Timtendo12 self-requested a review January 24, 2024 09:00
@Timtendo12 Timtendo12 merged commit ac3d4e6 into dev Jan 24, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Chrinsieboy Chrinsieboy Chrinsieboy approved these changes

@Timtendo12 Timtendo12 Timtendo12 approved these changes

@DanericNetwork DanericNetwork Awaiting requested review from DanericNetwork

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Huib8 @Timtendo12 @Chrinsieboy