jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix the redirection pre-setup

Browse Source
This commit is contained in:
Johannes Zellner
2025-07-22 18:03:40 +02:00
parent 2ec6e47086
commit 9e907f10b1
3 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dashboard/src/views/SetupView.vue
+23 -14
View File
@@ -1,7 +1,7 @@
<script setup>
import { ref, onMounted, useTemplateRef } from 'vue';
import { Spinner, Button, SingleSelect, FormGroup, TextInput, Notification } from '@cloudron/pankow';
import { ProgressBar, Button, SingleSelect, FormGroup, TextInput, Notification } from '@cloudron/pankow';
import { copyToClipboard } from '@cloudron/pankow/utils';
import { redirectIfNeeded } from '../utils.js';
import DomainsModel from '../models/DomainsModel.js';
@@ -144,20 +144,24 @@ onMounted(async () => {
<template>
<div class="container" v-if="ready">
<Notification/>
<Notification />
<Transition name="slide-up" mode="out-in">
<div class="view" v-if="waitingForDnsSetup" style="text-align: center; max-width: unset;">
<Spinner class="pankow-spinner-large"/>
<h3>{{ progressMessage }} ...</h3>
<div style="font-size: 13px">
Please wait while Cloudron is setting up the dashboard. Follow the logs on the server at <span class="highlight" @click="onCopyToClipboard('/home/yellowtent/platformdata/logs/box.log')">/home/yellowtent/platformdata/logs/box.log</span>
<div>
<h3>Please wait while Cloudron is setting up the dashboard</h3>
<ProgressBar mode="indeterminate" :show-label="false" :slim="true"/>
<h3>{{ progressMessage }}</h3>
</div>
<div style="position: absolute; bottom: 10px; text-align: center; width: 100%; font-size: 12px;">
<span v-show="taskMinutesActive >= 4">If setup appears stuck, it can be restarted by running <code @click="onCopyToClipboard('systemctl restart box')">systemctl restart box</code> and reloading this page.</span>
<br/>
<span v-show="taskMinutesActive >= 4">If setup appears stuck, it can be restarted by running <span class="highlight" @click="onCopyToClipboard('systemctl restart box')">systemctl restart box</span> and reloading this page.</span>
<br/>
You can follow the logs on the server at <code @click="onCopyToClipboard('/home/yellowtent/platformdata/logs/box.log')">/home/yellowtent/platformdata/logs/box.log</code>
</div>
</div>
<div class="view" v-else>
<div class="view" v-else style="max-width: 500px">
<h1>Cloudron Domain Setup</h1>
<div class="text-danger" v-if="formError.dnsWait">{{ formError.dnsWait }}</div>
@@ -225,8 +229,10 @@ onMounted(async () => {
</fieldset>
</form>
<Button @click="onSubmit()" style="margin-top: 12px" :disabled="busy || !isFormValid" :loading="busy">Next</Button>
<a href="/restore.html" style="margin-left: 10px;">Looking to restore?</a>
<div style="margin-top: 12px">
<Button @click="onSubmit()" :disabled="busy || !isFormValid" :loading="busy">Next</Button>
<a href="/restore.html" style="margin-left: 10px;">Looking to restore?</a>
</div>
</div>
</Transition>
</div>
@@ -247,13 +253,16 @@ h1 {
}
.view {
margin: 60px 0;
display: flex;
flex-direction: column;
height: 100%;
width: 100%;
max-width: 500px;
margin: 60px 0;
justify-content: center;
}
.highlight {
font-family: monospace;
.view code {
background-color: transparent;
cursor: copy;
}