diff --git a/package-lock.json b/package-lock.json index d83b153..5b85cd7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,9 @@ "requires": true, "packages": { "": { + "dependencies": { + "dayjs": "^1.11.11" + }, "devDependencies": { "@formkit/auto-animate": "^0.8.2", "@inertiajs/vue3": "^1.0.14", @@ -1385,6 +1388,11 @@ "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", "dev": true }, + "node_modules/dayjs": { + "version": "1.11.11", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz", + "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==" + }, "node_modules/deepmerge": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz", diff --git a/package.json b/package.json index 0ed4c27..ae5f33d 100644 --- a/package.json +++ b/package.json @@ -21,5 +21,8 @@ "tailwindcss": "^3.4.0", "vite": "^5.0", "vue": "^3.3.13" + }, + "dependencies": { + "dayjs": "^1.11.11" } } diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index e69de29..0000000 diff --git a/public/favicon.png b/public/favicon.png new file mode 100644 index 0000000..e77ba37 Binary files /dev/null and b/public/favicon.png differ diff --git a/resources/js/Components/ApplicationMark.vue b/resources/js/Components/ApplicationMark.vue index e150674..eea97ac 100644 --- a/resources/js/Components/ApplicationMark.vue +++ b/resources/js/Components/ApplicationMark.vue @@ -1,6 +1,161 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/js/Components/AuthenticationCardLogo.vue b/resources/js/Components/AuthenticationCardLogo.vue index c5027ec..35d9a80 100644 --- a/resources/js/Components/AuthenticationCardLogo.vue +++ b/resources/js/Components/AuthenticationCardLogo.vue @@ -4,14 +4,464 @@ import { Link } from '@inertiajs/vue3'; - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/js/Components/NodeTasks/TaskGroup.vue b/resources/js/Components/NodeTasks/TaskGroup.vue index 40592d7..47c6e47 100644 --- a/resources/js/Components/NodeTasks/TaskGroup.vue +++ b/resources/js/Components/NodeTasks/TaskGroup.vue @@ -1,8 +1,8 @@ @@ -20,7 +23,7 @@ const retry = () => { - #{{ taskGroup.id }} Invoked by {{ taskGroup.invoker.name }} on {{ taskGroup.created_at }} + #{{ taskGroup.id }} Invoked by {{ taskGroup.invoker.name }} on {{ taskGroupDateRelative }} diff --git a/resources/js/Components/ValueCard.vue b/resources/js/Components/ValueCard.vue index 811620b..f979821 100644 --- a/resources/js/Components/ValueCard.vue +++ b/resources/js/Components/ValueCard.vue @@ -8,7 +8,7 @@ defineProps({ - + {{ $props.value }} {{ $props.label }} diff --git a/resources/js/Pages/Nodes/Create.vue b/resources/js/Pages/Nodes/Create.vue index 287e21a..1be6053 100644 --- a/resources/js/Pages/Nodes/Create.vue +++ b/resources/js/Pages/Nodes/Create.vue @@ -8,6 +8,7 @@ import InputLabel from "@/Components/InputLabel.vue"; import {router, useForm} from "@inertiajs/vue3"; import InputError from "@/Components/InputError.vue"; import FormSection from "@/Components/FormSection.vue"; +import TeamCard from "@/Components/TeamCard.vue"; const form = useForm({ name: '', @@ -52,15 +53,7 @@ const createNode = () => { - - - - - - {{ $page.props.auth.user.current_team.name }} - - - + diff --git a/resources/js/Pages/Nodes/Index.vue b/resources/js/Pages/Nodes/Index.vue index 03c0c4e..ba6c267 100644 --- a/resources/js/Pages/Nodes/Index.vue +++ b/resources/js/Pages/Nodes/Index.vue @@ -25,7 +25,7 @@ defineProps({ - + - { + :value="'export PTAH_TOKEN=' + $props.node.agent_token + ' && curl -sSL https://raw.githubusercontent.com/ptah-sh/ptah-agent/main/install.sh | bash' " disabled readonly> diff --git a/resources/js/Pages/Nodes/Partials/AgentStatus.vue b/resources/js/Pages/Nodes/Partials/AgentStatus.vue index 856a543..f58d31f 100644 --- a/resources/js/Pages/Nodes/Partials/AgentStatus.vue +++ b/resources/js/Pages/Nodes/Partials/AgentStatus.vue @@ -10,28 +10,30 @@ defineProps([ ]) - - - Agent Status - + + + Agent Status + - - - - - - - - - - - - - - + + Agent on your server is up and running. You can see the agent's version, available IP interfaces and upgrade the agent, if a new version is available. + - - Upgrade to 1.1.1 - - + + + + + + + + + + + + + + + Upgrade to 1.1.1 + + \ No newline at end of file diff --git a/resources/js/Pages/Nodes/Partials/ServerDetailsForm.vue b/resources/js/Pages/Nodes/Partials/ServerDetailsForm.vue index 8500f2c..90c6b41 100644 --- a/resources/js/Pages/Nodes/Partials/ServerDetailsForm.vue +++ b/resources/js/Pages/Nodes/Partials/ServerDetailsForm.vue @@ -22,6 +22,10 @@ const form = useForm({ Server Details + + You can change the name of your server. + + diff --git a/resources/js/app.js b/resources/js/app.js index fc20d8d..9edce95 100644 --- a/resources/js/app.js +++ b/resources/js/app.js @@ -12,6 +12,13 @@ import { ZiggyVue } from '../../vendor/tightenco/ziggy'; const appName = import.meta.env.VITE_APP_NAME || 'Laravel'; +import dayjs from 'dayjs'; +import RelativeTime from 'dayjs/plugin/relativeTime'; +import LocalizedFormat from 'dayjs/plugin/localizedFormat'; + +dayjs.extend(RelativeTime); +dayjs.extend(LocalizedFormat); + createInertiaApp({ title: (title) => `${title} - ${appName}`, resolve: (name) => resolvePageComponent(`./Pages/${name}.vue`, import.meta.glob('./Pages/**/*.vue')), diff --git a/resources/views/app.blade.php b/resources/views/app.blade.php index 334627a..c07be47 100644 --- a/resources/views/app.blade.php +++ b/resources/views/app.blade.php @@ -3,6 +3,7 @@ + {{ config('app.name', 'Laravel') }}
You can change the name of your server.