Skip to content

[4.x] A fresh coat of paint #1295

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

Merged
merged 6 commits into from
Jan 25, 2023
Merged

[4.x] A fresh coat of paint #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff39e40
wip: Add a fresh coat of paint
jessarcher Jan 20, 2023
75dad9f
wip: Dark mode
jessarcher Jan 23, 2023
a8a5c53
Tweaks
jessarcher Jan 25, 2023
480d34c
Apply fixes from StyleCI
jessarcher Jan 25, 2023
0b59457
Compile Assets
jessarcher Jan 25, 2023
6cfd0d5
More tweaks
jessarcher Jan 25, 2023
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
5 changes: 3 additions & 2 deletions public/app-dark.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/app.css
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/app.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions public/mix-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=08317cb3c83c7035246fe3d474db3454",
"/app-dark.css": "/app-dark.css?id=3ae28ef5f7b987d68dc611118c646308",
"/app.css": "/app.css?id=7c970f699ed9cf60d80b273b4ad2ad61"
"/app.js": "/app.js?id=a8713c727883a44917711340bf6c817a",
"/app-dark.css": "/app-dark.css?id=b44bf369e5d39f6861be639ef866bf5a",
"/app.css": "/app.css?id=41c5661581f2614180d6d33c17470f08"
}
22 changes: 11 additions & 11 deletions resources/js/components/Alert.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,27 +76,27 @@
<div class="modal" id="alertModal" tabindex="-1" role="dialog" aria-labelledby="alertModalLabel" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-body text-center">
<p class="mt-3 mb-0">{{message}}</p>
<div class="modal-body">
<p class="m-0 py-4">{{message}}</p>
</div>


<div class="modal-footer justify-content-center">
<div class="modal-footer justify-content-start flex-row-reverse">

<button v-if="type == 'error'" class="btn btn-secondary btn-sm" @click="close">
CLOSE
<button v-if="type == 'error'" class="btn btn-primary" @click="close">
Close
</button>

<button v-if="type == 'success'" class="btn btn-secondary btn-sm" @click="close">
OK
<button v-if="type == 'success'" class="btn btn-primary" @click="close">
Okay
</button>


<button v-if="type == 'confirmation'" class="btn btn-danger btn-sm" @click="confirm">
YES
<button v-if="type == 'confirmation'" class="btn btn-danger" @click="confirm">
Yes
</button>
<button v-if="type == 'confirmation'" class="btn btn-secondary btn-sm" @click="cancel">
NO, CANCEL
<button v-if="type == 'confirmation'" class="btn" @click="cancel">
Cancel
</button>

</div>
Expand Down
26 changes: 16 additions & 10 deletions resources/js/components/IndexScreen.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,14 +267,20 @@
</script>

<template>
<div class="card">
<div class="card overflow-hidden">
<div class="card-header d-flex align-items-center justify-content-between">
<h5>{{this.title}}</h5>

<input type="text" class="form-control w-25"
v-if="!hideSearch && (tag || entries.length > 0)"
id="searchInput"
placeholder="Search Tag" v-model="tag" @input.stop="search">
<h2 class="h6 m-0">{{this.title}}</h2>

<div class="form-control-with-icon w-25" v-if="!hideSearch && (tag || entries.length > 0)">
<div class="icon-wrapper">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" class="icon">
<path fill-rule="evenodd" d="M9 3.5a5.5 5.5 0 100 11 5.5 5.5 0 000-11zM2 9a7 7 0 1112.452 4.391l3.328 3.329a.75.75 0 11-1.06 1.06l-3.329-3.328A7 7 0 012 9z" clip-rule="evenodd" />
</svg>
</div>
<input type="text" class="form-control w-100"
id="searchInput"
placeholder="Search Tag" v-model="tag" @input.stop="search">
</div>
</div>

<p v-if="recordingStatus !== 'enabled'" class="mt-0 mb-0 disabled-watcher d-flex align-items-center">
Expand Down Expand Up @@ -304,15 +310,15 @@
</div>


<table id="indexScreen" class="table table-hover table-sm mb-0 penultimate-column-right" v-if="ready && entries.length > 0">
<table id="indexScreen" class="table table-hover mb-0 penultimate-column-right" v-if="ready && entries.length > 0">
<thead>
<slot name="table-header"></slot>
</thead>


<transition-group tag="tbody" name="list">
<tr v-if="hasNewEntries" key="newEntries" class="dontanimate">
<td colspan="100" class="text-center card-bg-secondary py-1">
<td colspan="100" class="text-center card-bg-secondary py-2">
<small><a href="#" v-on:click.prevent="loadNewEntries" v-if="!loadingNewEntries">Load New Entries</a></small>

<small v-if="loadingNewEntries">Loading...</small>
Expand All @@ -326,7 +332,7 @@


<tr v-if="hasMoreEntries" key="olderEntries" class="dontanimate">
<td colspan="100" class="text-center card-bg-secondary py-1">
<td colspan="100" class="text-center card-bg-secondary py-2">
<small><a href="#" v-on:click.prevent="loadOlderEntries" v-if="!loadingMoreEntries">Load Older Entries</a></small>

<small v-if="loadingMoreEntries">Loading...</small>
Expand Down
26 changes: 13 additions & 13 deletions resources/js/components/PreviewScreen.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,9 +130,9 @@

<template>
<div>
<div class="card">
<div class="card overflow-hidden">
<div class="card-header d-flex align-items-center justify-content-between">
<h5>{{this.title}}</h5>
<h2 class="h6 m-0">{{this.title}}</h2>
</div>


Expand All @@ -150,18 +150,18 @@
</div>


<div class="table-responsive">
<div class="table-responsive border-top">
<table v-if="ready && entry" class="table mb-0 card-bg-secondary table-borderless">
<tbody>
<tr>
<td class="table-fit font-weight-bold">Time</td>
<td class="table-fit text-muted">Time</td>
<td>
{{localTime(entry.created_at)}} ({{timeAgo(entry.created_at)}})
</td>
</tr>

<tr>
<td class="table-fit font-weight-bold">Hostname</td>
<td class="table-fit text-muted">Hostname</td>
<td>
{{entry.content.hostname}}
</td>
Expand All @@ -170,7 +170,7 @@
<slot name="table-parameters" :entry="entry"></slot>

<tr v-if="!entryPoint && job">
<td class="table-fit font-weight-bold">Job</td>
<td class="table-fit text-muted">Job</td>
<td>
<router-link :to="{name:'job-preview', params:{id: job.id}}" class="control-action">
View Job
Expand All @@ -179,7 +179,7 @@
</tr>

<tr v-if="!entryPoint && request">
<td class="table-fit font-weight-bold">Request</td>
<td class="table-fit text-muted">Request</td>
<td>
<router-link :to="{name:'request-preview', params:{id: request.id}}" class="control-action">
View Request
Expand All @@ -188,7 +188,7 @@
</tr>

<tr v-if="!entryPoint && command">
<td class="table-fit font-weight-bold">Command</td>
<td class="table-fit text-muted">Command</td>
<td>
<router-link :to="{name:'command-preview', params:{id: command.id}}" class="control-action">
View Command
Expand All @@ -197,13 +197,13 @@
</tr>

<tr v-if="entry.tags.length">
<td class="table-fit font-weight-bold">Tags</td>
<td class="table-fit text-muted">Tags</td>
<td>
<router-link
v-for="tag in entry.tags"
:key="tag"
:to="{name:resource, query: {tag: tag}}"
class="badge badge-info mr-1 font-weight-light">
class="badge badge-info mr-1">
{{tag}}
</router-link>
</td>
Expand All @@ -224,15 +224,15 @@

<table class="table mb-0 card-bg-secondary table-borderless">
<tr>
<td class="table-fit font-weight-bold">ID</td>
<td class="table-fit text-muted">ID</td>

<td>
{{entry.content.user.id}}
</td>
</tr>

<tr v-if="entry.content.user.name">
<td class="table-fit font-weight-bold align-middle">Name</td>
<td class="table-fit text-muted align-middle">Name</td>

<td class="align-middle">
<img :src="entry.content.user.avatar" :alt="entry.content.user.name" class="mr-2 rounded-circle" height="40" width="40" v-if="entry.content.user.avatar">
Expand All @@ -241,7 +241,7 @@
</tr>

<tr v-if="entry.content.user.email">
<td class="table-fit font-weight-bold">Email Address</td>
<td class="table-fit text-muted">Email Address</td>

<td>
{{entry.content.user.email}}
Expand Down
Loading