Fix: Simplify integration and fix admin template
- Removed settings/navigation from appinfo/info.xml - These sections can cause routing conflicts - App now relies purely on routes.php - Simplified Application.php - Removed manual service/controller registration - Let Nextcloud DI framework handle it automatically - Fixed admin template to use Nextcloud standards - Removed non-standard style() call - Added proper l10n support with p($l->t(...)) - Clean template structure - Created css/admin.css - Nextcloud-compatible styling - Matches design language - Created js/admin.js - Handles Save Configuration button - Handles Test Connection button - Uses OC, OC.Notification APIs This should fix admin page not appearing issue. Users can access via: Settings → Administration → Additional Settings
This commit is contained in:
@@ -18,7 +18,7 @@ class Application extends App {
|
|||||||
public function __construct(array $urlParams = []) {
|
public function __construct(array $urlParams = []) {
|
||||||
parent::__construct(self::APP_ID, $urlParams);
|
parent::__construct(self::APP_ID, $urlParams);
|
||||||
|
|
||||||
// Load scripts and styles
|
// Load scripts and styles for admin page
|
||||||
Util::addStyle(self::APP_ID, 'admin');
|
Util::addStyle(self::APP_ID, 'admin');
|
||||||
Util::addScript(self::APP_ID, 'admin');
|
Util::addScript(self::APP_ID, 'admin');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -24,15 +24,4 @@
|
|||||||
<nextcloud min-version="25" max-version="26"/>
|
<nextcloud min-version="25" max-version="26"/>
|
||||||
<php min-version="7.4"/>
|
<php min-version="7.4"/>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<settings>
|
|
||||||
<admin>OCA\AnalyticsHub\Controller\Admin</admin>
|
|
||||||
</settings>
|
|
||||||
<navigation>
|
|
||||||
<admin>analyticshub.admin.index</admin>
|
|
||||||
</navigation>
|
|
||||||
<repair-steps>
|
|
||||||
<step>Repair steps not needed</step>
|
|
||||||
<repair-step>Or remove and reinstall</repair-step>
|
|
||||||
<repair-step>Check Nextcloud logs for errors</repair-step>
|
|
||||||
</repair-steps>
|
|
||||||
</info>
|
</info>
|
||||||
|
|||||||
60
analyticshub/css/admin.css
Normal file
60
analyticshub/css/admin.css
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
#analytics-hub-settings {
|
||||||
|
max-width: 800px;
|
||||||
|
margin: 0 auto;
|
||||||
|
padding: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__section {
|
||||||
|
margin-bottom: 30px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__field {
|
||||||
|
margin-bottom: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__field label {
|
||||||
|
display: block;
|
||||||
|
font-weight: 600;
|
||||||
|
margin-bottom: 8px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__field input {
|
||||||
|
width: 100%;
|
||||||
|
padding: 10px;
|
||||||
|
border: 1px solid #ccc;
|
||||||
|
border-radius: 4px;
|
||||||
|
font-size: 14px;
|
||||||
|
box-sizing: border-box;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__hint {
|
||||||
|
font-size: 13px;
|
||||||
|
color: #666;
|
||||||
|
margin-top: 8px;
|
||||||
|
line-height: 1.4;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__actions {
|
||||||
|
display: flex;
|
||||||
|
gap: 10px;
|
||||||
|
margin-top: 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__actions button {
|
||||||
|
padding: 12px 24px;
|
||||||
|
border: none;
|
||||||
|
border-radius: 6px;
|
||||||
|
font-size: 14px;
|
||||||
|
font-weight: 600;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__actions .primary {
|
||||||
|
background-color: #0078d4;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
|
|
||||||
|
.analytics-hub-settings__actions .secondary {
|
||||||
|
background-color: #6c757d;
|
||||||
|
color: white;
|
||||||
|
}
|
||||||
66
analyticshub/js/admin.js
Normal file
66
analyticshub/js/admin.js
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
(function() {
|
||||||
|
'use strict';
|
||||||
|
|
||||||
|
const saveButton = document.getElementById('analytics-hub-save');
|
||||||
|
const testButton = document.getElementById('analytics-hub-test');
|
||||||
|
|
||||||
|
if (saveButton) {
|
||||||
|
saveButton.addEventListener('click', function() {
|
||||||
|
// Collect form data
|
||||||
|
const data = {
|
||||||
|
google_client_id: document.getElementById('google_client_id').value,
|
||||||
|
google_client_secret: document.getElementById('google_client_secret').value,
|
||||||
|
google_refresh_token: document.getElementById('google_refresh_token').value,
|
||||||
|
anthropic_api_key: document.getElementById('anthropic_api_key').value
|
||||||
|
};
|
||||||
|
|
||||||
|
// Send save request
|
||||||
|
fetch(OC.generateUrl('/apps/analyticshub/admin/save'), {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'requesttoken': OC.requestToken
|
||||||
|
},
|
||||||
|
body: JSON.stringify(data)
|
||||||
|
})
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.success) {
|
||||||
|
OC.Notification.showTemporary(t('analyticshub', 'Configuration saved successfully'));
|
||||||
|
} else {
|
||||||
|
OC.Notification.showTemporary(t('analyticshub', 'Error: ' + data.error));
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
OC.Notification.showTemporary(t('analyticshub', 'Error saving configuration'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (testButton) {
|
||||||
|
testButton.addEventListener('click', function() {
|
||||||
|
// Test connections
|
||||||
|
fetch(OC.generateUrl('/apps/analyticshub/admin/status'), {
|
||||||
|
method: 'GET',
|
||||||
|
headers: {
|
||||||
|
'requesttoken': OC.requestToken
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.then(response => response.json())
|
||||||
|
.then(data => {
|
||||||
|
if (data.success) {
|
||||||
|
const status = data.data;
|
||||||
|
const message = [
|
||||||
|
'App Status: ' + status.status,
|
||||||
|
'Google Analytics: ' + status.google_analytics,
|
||||||
|
'LLM Service: ' + status.llm_service
|
||||||
|
].join('\n');
|
||||||
|
alert(message);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.catch(error => {
|
||||||
|
OC.Notification.showTemporary(t('analyticshub', 'Error getting status'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
})();
|
||||||
@@ -1,18 +1,16 @@
|
|||||||
<?php
|
<?php
|
||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
style('display:none');
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<div id="analytics-hub-settings" class="section analytics-hub-settings">
|
<div id="analytics-hub-settings" class="section">
|
||||||
<h2>Mini-CMO Analytics Hub</h2>
|
<h2><?php p($l->t('Mini-CMO Analytics Hub')); ?></h2>
|
||||||
<p>AI-powered Google Analytics 4 reporting with automated daily reports.</p>
|
<p><?php p($l->t('AI-powered Google Analytics 4 reporting with automated daily reports.')); ?></p>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__section">
|
<div class="analytics-hub-settings__section">
|
||||||
<h3>Google Analytics Configuration</h3>
|
<h3><?php p($l->t('Google Analytics Configuration')); ?></h3>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__field">
|
<div class="analytics-hub-settings__field">
|
||||||
<label for="google_client_id">Google Client ID</label>
|
<label for="google_client_id"><?php p($l->t('Google Client ID')); ?></label>
|
||||||
<input
|
<input
|
||||||
type="text"
|
type="text"
|
||||||
id="google_client_id"
|
id="google_client_id"
|
||||||
@@ -23,7 +21,7 @@ style('display:none');
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__field">
|
<div class="analytics-hub-settings__field">
|
||||||
<label for="google_client_secret">Google Client Secret</label>
|
<label for="google_client_secret"><?php p($l->t('Google Client Secret')); ?></label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
id="google_client_secret"
|
id="google_client_secret"
|
||||||
@@ -34,7 +32,7 @@ style('display:none');
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__field">
|
<div class="analytics-hub-settings__field">
|
||||||
<label for="google_refresh_token">Refresh Token</label>
|
<label for="google_refresh_token"><?php p($l->t('Refresh Token')); ?></label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
id="google_refresh_token"
|
id="google_refresh_token"
|
||||||
@@ -43,17 +41,16 @@ style('display:none');
|
|||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
/>
|
/>
|
||||||
<p class="analytics-hub-settings__hint">
|
<p class="analytics-hub-settings__hint">
|
||||||
After OAuth consent, paste only the refresh token here.
|
<?php p($l->t('After OAuth consent, paste only the refresh token here. The access token is refreshed automatically each run.')); ?>
|
||||||
The access token is refreshed automatically each run.
|
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__section">
|
<div class="analytics-hub-settings__section">
|
||||||
<h3>Anthropic Claude API</h3>
|
<h3><?php p($l->t('Anthropic Claude API')); ?></h3>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__field">
|
<div class="analytics-hub-settings__field">
|
||||||
<label for="anthropic_api_key">API Key</label>
|
<label for="anthropic_api_key"><?php p($l->t('API Key')); ?></label>
|
||||||
<input
|
<input
|
||||||
type="password"
|
type="password"
|
||||||
id="anthropic_api_key"
|
id="anthropic_api_key"
|
||||||
@@ -62,81 +59,20 @@ style('display:none');
|
|||||||
autocomplete="off"
|
autocomplete="off"
|
||||||
/>
|
/>
|
||||||
<p class="analytics-hub-settings__hint">
|
<p class="analytics-hub-settings__hint">
|
||||||
Enter your Anthropic API key for AI-powered report generation.
|
<?php p($l->t('Enter your Anthropic API key for AI-powered report generation. Model: claude-sonnet-4-5-20250929 (cost-effective)')); ?>
|
||||||
Model: claude-sonnet-4-5-20250929 (cost-effective)
|
</p>
|
||||||
Cost: ~$0.015 per report (3K tokens)
|
<p class="analytics-hub-settings__hint">
|
||||||
|
<?php p($l->t('Cost: ~$0.015 per report (3K tokens)')); ?>
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="analytics-hub-settings__actions">
|
<div class="analytics-hub-settings__actions">
|
||||||
<button id="analytics-hub-save" class="primary">
|
<button id="analytics-hub-save" class="primary">
|
||||||
Save Configuration
|
<?php p($l->t('Save Configuration')); ?>
|
||||||
</button>
|
</button>
|
||||||
<button id="analytics-hub-test" class="secondary">
|
<button id="analytics-hub-test" class="secondary">
|
||||||
Test Connection
|
<?php p($l->t('Test Connection')); ?>
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<style>
|
|
||||||
.analytics-hub-settings {
|
|
||||||
max-width: 800px;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__section {
|
|
||||||
margin-bottom: 30px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__field {
|
|
||||||
margin-bottom: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__field label {
|
|
||||||
display: block;
|
|
||||||
font-weight: 600;
|
|
||||||
margin-bottom: 8px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__field input {
|
|
||||||
width: 100%;
|
|
||||||
padding: 10px;
|
|
||||||
border: 1px solid #ccc;
|
|
||||||
border-radius: 4px;
|
|
||||||
font-size: 14px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__hint {
|
|
||||||
font-size: 13px;
|
|
||||||
color: #666;
|
|
||||||
margin-top: 8px;
|
|
||||||
line-height: 1.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__actions {
|
|
||||||
display: flex;
|
|
||||||
gap: 10px;
|
|
||||||
margin-top: 20px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__actions button {
|
|
||||||
padding: 12px 24px;
|
|
||||||
border: none;
|
|
||||||
border-radius: 6px;
|
|
||||||
font-size: 14px;
|
|
||||||
font-weight: 600;
|
|
||||||
cursor: pointer;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__actions .primary {
|
|
||||||
background-color: #0078d4;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
|
|
||||||
.analytics-hub-settings__actions .secondary {
|
|
||||||
background-color: #6c757d;
|
|
||||||
color: white;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
|
|||||||
Reference in New Issue
Block a user