Compare commits
7 Commits
feature/se
...
feature/wp
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5f0e25384 | ||
|
|
04de33e5f7 | ||
|
|
37dfea25e1 | ||
|
|
e2166bc25f | ||
|
|
b5e8f039bf | ||
|
|
67bfdf47a5 | ||
|
|
9f898f68db |
@@ -150,7 +150,7 @@ steps:
|
||||
- echo "$KUBECONFIG_CONTENT" | tr -d '[:space:]' | base64 -d > ~/.kube/config
|
||||
- chmod 600 ~/.kube/config
|
||||
- kubectl set image deployment/scraper scraper=code.cannabrands.app/creationshop/dispensary-scraper:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
|
||||
- kubectl set image deployment/scraper-worker scraper-worker=code.cannabrands.app/creationshop/dispensary-scraper:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
|
||||
- kubectl set image deployment/scraper-worker worker=code.cannabrands.app/creationshop/dispensary-scraper:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
|
||||
- kubectl set image deployment/cannaiq-frontend cannaiq-frontend=code.cannabrands.app/creationshop/cannaiq-frontend:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
|
||||
- kubectl set image deployment/findadispo-frontend findadispo-frontend=code.cannabrands.app/creationshop/findadispo-frontend:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
|
||||
- kubectl set image deployment/findagram-frontend findagram-frontend=code.cannabrands.app/creationshop/findagram-frontend:${CI_COMMIT_SHA:0:8} -n dispensary-scraper
|
||||
|
||||
29
CLAUDE.md
29
CLAUDE.md
@@ -1195,3 +1195,32 @@ Every analytics v2 endpoint must:
|
||||
---
|
||||
|
||||
# END Analytics V2 spec extension
|
||||
|
||||
---
|
||||
|
||||
## WordPress Plugin Versioning
|
||||
|
||||
The WordPress plugin version is tracked in `wordpress-plugin/VERSION`.
|
||||
|
||||
**Current version:** Check `wordpress-plugin/VERSION` for the latest version.
|
||||
|
||||
**Versioning rules:**
|
||||
- **Minor bumps (x.x.N)**: Bug fixes, small improvements - default for most changes
|
||||
- **Middle bumps (x.N.0)**: New features, significant improvements
|
||||
- **Major bumps (N.0.0)**: Breaking changes, major rewrites - only when user explicitly requests
|
||||
|
||||
**When making WP plugin changes:**
|
||||
1. Read `wordpress-plugin/VERSION` to get current version
|
||||
2. Bump the version number (minor by default)
|
||||
3. Update both files:
|
||||
- `wordpress-plugin/VERSION`
|
||||
- Plugin header `Version:` in `cannaiq-menus.php` and/or `crawlsy-menus.php`
|
||||
- The `define('..._VERSION', '...')` constant in each plugin file
|
||||
|
||||
**Plugin files:**
|
||||
| File | Brand | API URL |
|
||||
|------|-------|---------|
|
||||
| `cannaiq-menus.php` | CannaIQ | `https://cannaiq.co/api/v1` |
|
||||
| `crawlsy-menus.php` | Crawlsy (legacy) | `https://cannaiq.co/api/v1` |
|
||||
|
||||
Both plugins use the same API endpoint. The Crawlsy version exists for backward compatibility with existing installations.
|
||||
|
||||
BIN
backend/public/downloads/cannaiq-menus-1.5.4.zip
Normal file
BIN
backend/public/downloads/cannaiq-menus-1.5.4.zip
Normal file
Binary file not shown.
@@ -32,6 +32,37 @@ app.use('/images', express.static(LOCAL_IMAGES_PATH));
|
||||
// Serve static downloads (plugin files, etc.)
|
||||
// Uses ./public/downloads relative to working directory (works for both Docker and local dev)
|
||||
const LOCAL_DOWNLOADS_PATH = process.env.LOCAL_DOWNLOADS_PATH || './public/downloads';
|
||||
|
||||
// Dynamic "latest" redirect for WordPress plugin - finds highest version automatically
|
||||
app.get('/downloads/cannaiq-menus-latest.zip', (req, res) => {
|
||||
const fs = require('fs');
|
||||
const path = require('path');
|
||||
try {
|
||||
const files = fs.readdirSync(LOCAL_DOWNLOADS_PATH);
|
||||
const pluginFiles = files
|
||||
.filter((f: string) => f.match(/^cannaiq-menus-\d+\.\d+\.\d+\.zip$/))
|
||||
.sort((a: string, b: string) => {
|
||||
const vA = a.match(/(\d+)\.(\d+)\.(\d+)/);
|
||||
const vB = b.match(/(\d+)\.(\d+)\.(\d+)/);
|
||||
if (!vA || !vB) return 0;
|
||||
for (let i = 1; i <= 3; i++) {
|
||||
const diff = parseInt(vB[i]) - parseInt(vA[i]);
|
||||
if (diff !== 0) return diff;
|
||||
}
|
||||
return 0;
|
||||
});
|
||||
|
||||
if (pluginFiles.length > 0) {
|
||||
const latestFile = pluginFiles[0];
|
||||
res.redirect(302, `/downloads/${latestFile}`);
|
||||
} else {
|
||||
res.status(404).json({ error: 'No plugin versions found' });
|
||||
}
|
||||
} catch (err) {
|
||||
res.status(500).json({ error: 'Failed to find latest plugin' });
|
||||
}
|
||||
});
|
||||
|
||||
app.use('/downloads', express.static(LOCAL_DOWNLOADS_PATH));
|
||||
|
||||
// Simple health check for load balancers/K8s probes
|
||||
|
||||
@@ -20,7 +20,7 @@ import {
|
||||
} from 'lucide-react';
|
||||
|
||||
const API_URL = import.meta.env.VITE_API_URL || '';
|
||||
const PLUGIN_DOWNLOAD_URL = `${API_URL}/downloads/cannaiq-menus-1.5.3.zip`;
|
||||
const PLUGIN_DOWNLOAD_URL = `${API_URL}/downloads/cannaiq-menus-latest.zip`;
|
||||
import { api } from '../lib/api';
|
||||
|
||||
interface VersionInfo {
|
||||
|
||||
@@ -23,7 +23,7 @@ export default function LandingPage() {
|
||||
<Link to="/login" className="px-8 py-3 bg-white text-emerald-700 font-semibold rounded-lg hover:bg-gray-100 transition-colors shadow-lg">
|
||||
Sign In
|
||||
</Link>
|
||||
<a href="/downloads/cannaiq-menus-1.5.3.zip" className="px-8 py-3 border-2 border-white text-white font-semibold rounded-lg hover:bg-white hover:text-emerald-700 transition-colors">
|
||||
<a href="/downloads/cannaiq-menus-latest.zip" className="px-8 py-3 border-2 border-white text-white font-semibold rounded-lg hover:bg-white hover:text-emerald-700 transition-colors">
|
||||
Download WordPress Plugin
|
||||
</a>
|
||||
</div>
|
||||
@@ -84,10 +84,10 @@ export default function LandingPage() {
|
||||
<div className="text-emerald-400">[cannaiq_product id="123"]</div>
|
||||
</div>
|
||||
<a
|
||||
href="/downloads/cannaiq-menus-1.5.3.zip"
|
||||
href="/downloads/cannaiq-menus-latest.zip"
|
||||
className="inline-block px-8 py-3 bg-emerald-600 text-white font-semibold rounded-lg hover:bg-emerald-700 transition-colors shadow-lg"
|
||||
>
|
||||
Download CannaIQ Menus v1.5.3
|
||||
Download CannaIQ Menus Plugin
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -121,12 +121,13 @@ export default function StateHeatmap() {
|
||||
try {
|
||||
const response = await api.get(`/api/analytics/national/heatmap?metric=${selectedMetric}`);
|
||||
// Response structure: { success, data: { metric, heatmap } }
|
||||
if (response.data?.data?.heatmap) {
|
||||
setHeatmapData(response.data.data.heatmap);
|
||||
} else if (response.data?.heatmap) {
|
||||
// Fallback for direct structure
|
||||
setHeatmapData(response.data.heatmap);
|
||||
}
|
||||
let rawData = response.data?.data?.heatmap || response.data?.heatmap || [];
|
||||
// Ensure values are numbers (PostgreSQL bigint can come as strings)
|
||||
const parsedData = rawData.map((d: any) => ({
|
||||
...d,
|
||||
value: typeof d.value === 'string' ? parseFloat(d.value) : (d.value || 0),
|
||||
}));
|
||||
setHeatmapData(parsedData);
|
||||
} catch (err: any) {
|
||||
setError(err.message || 'Failed to load heatmap data');
|
||||
} finally {
|
||||
|
||||
1
wordpress-plugin/VERSION
Normal file
1
wordpress-plugin/VERSION
Normal file
@@ -0,0 +1 @@
|
||||
1.5.4
|
||||
@@ -36,9 +36,16 @@ zip -r "${OUTPUT_DIR}/${OUTPUT_FILE}" . \
|
||||
-x "assets/css/crawlsy-menus.css" \
|
||||
-x "assets/js/crawlsy-menus.js"
|
||||
|
||||
# Create/update the "latest" symlink
|
||||
cd "${OUTPUT_DIR}"
|
||||
rm -f cannaiq-menus-latest.zip
|
||||
ln -s "${OUTPUT_FILE}" cannaiq-menus-latest.zip
|
||||
|
||||
echo ""
|
||||
echo "Build complete!"
|
||||
echo " File: ${OUTPUT_DIR}/${OUTPUT_FILE}"
|
||||
echo " Size: $(ls -lh "${OUTPUT_DIR}/${OUTPUT_FILE}" | awk '{print $5}')"
|
||||
echo ""
|
||||
echo "Download URL: https://cannaiq.co/downloads/cannaiq-menus-${VERSION}.zip"
|
||||
echo "Download URLs:"
|
||||
echo " Versioned: https://cannaiq.co/downloads/cannaiq-menus-${VERSION}.zip"
|
||||
echo " Latest: https://cannaiq.co/downloads/cannaiq-menus-latest.zip"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Plugin Name: CannaIQ Menus
|
||||
* Plugin URI: https://cannaiq.co
|
||||
* Description: Display cannabis product menus from CannaIQ with Elementor integration. Real-time menu data updated daily.
|
||||
* Version: 1.5.3
|
||||
* Version: 1.5.4
|
||||
* Author: CannaIQ
|
||||
* Author URI: https://cannaiq.co
|
||||
* License: GPL v2 or later
|
||||
@@ -15,7 +15,7 @@ if (!defined('ABSPATH')) {
|
||||
exit; // Exit if accessed directly
|
||||
}
|
||||
|
||||
define('CANNAIQ_MENUS_VERSION', '1.5.3');
|
||||
define('CANNAIQ_MENUS_VERSION', '1.5.4');
|
||||
define('CANNAIQ_MENUS_API_URL', 'https://cannaiq.co/api/v1');
|
||||
define('CANNAIQ_MENUS_PLUGIN_DIR', plugin_dir_path(__FILE__));
|
||||
define('CANNAIQ_MENUS_PLUGIN_URL', plugin_dir_url(__FILE__));
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
* Plugin Name: Crawlsy Menus
|
||||
* Plugin URI: https://creationshop.io
|
||||
* Description: Display cannabis product menus from Crawlsy with Elementor integration
|
||||
* Version: 1.5.2
|
||||
* Version: 1.5.4
|
||||
* Author: Creationshop
|
||||
* Author URI: https://creationshop.io
|
||||
* License: GPL v2 or later
|
||||
@@ -15,7 +15,7 @@ if (!defined('ABSPATH')) {
|
||||
exit; // Exit if accessed directly
|
||||
}
|
||||
|
||||
define('CRAWLSY_MENUS_VERSION', '1.5.2');
|
||||
define('CRAWLSY_MENUS_VERSION', '1.5.4');
|
||||
define('CRAWLSY_MENUS_API_URL', 'https://cannaiq.co/api/v1');
|
||||
define('CRAWLSY_MENUS_PLUGIN_DIR', plugin_dir_path(__FILE__));
|
||||
define('CRAWLSY_MENUS_PLUGIN_URL', plugin_dir_url(__FILE__));
|
||||
|
||||
Reference in New Issue
Block a user