Skip to content
Snippets Groups Projects
Commit 85f77607 authored by Matthias Konitzny's avatar Matthias Konitzny :fire:
Browse files

Fixed PHP paths. Moved all the remaining code to /src.

parent 944f6e47
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,6 @@ const replace = require("gulp-replace"); ...@@ -6,7 +6,6 @@ const replace = require("gulp-replace");
const zip = require("gulp-zip"); const zip = require("gulp-zip");
const del = require("del"); const del = require("del");
const fs = require("fs"); const fs = require("fs");
const path = require("path");
const dir = { const dir = {
src: ".", src: ".",
...@@ -44,12 +43,7 @@ function copyPHP() { ...@@ -44,12 +43,7 @@ function copyPHP() {
) )
) )
.pipe(replace("Version: 1.0", `Version: ${version}`)) .pipe(replace("Version: 1.0", `Version: ${version}`))
.pipe( .pipe(gulp.dest(php.build));
gulp.dest(function (file) {
file.path = path.basename(file.path);
return php.build;
})
);
} }
function copyWebpackContent() { function copyWebpackContent() {
......
...@@ -14,14 +14,19 @@ function ks_add_graph($atts = []): string ...@@ -14,14 +14,19 @@ function ks_add_graph($atts = []): string
{ {
$div = '<div id="3d-graph"></div>'; // The id "3d-graph" indicates, that the javascript associated with this should automatically be executed $div = '<div id="3d-graph"></div>'; // The id "3d-graph" indicates, that the javascript associated with this should automatically be executed
$script_path = 'build' . DIRECTORY_SEPARATOR . $GLOBALS['build'] . DIRECTORY_SEPARATOR . 'frontend.js'; ks_load_styles("frontend.css");
ks_load_styles(); wp_enqueue_script("ks-runtime-js", plugins_url(get_script_path("runtime.js"), __FILE__), array('jquery'), false);
wp_enqueue_script("ks-display-js", plugins_url($script_path, __FILE__), array('jquery'), false); wp_enqueue_script("ks-vendors-js", plugins_url(get_script_path("vendors.js"), __FILE__), array('jquery'), false);
wp_enqueue_script("ks-display-js", plugins_url(get_script_path("frontend.js"), __FILE__), array('jquery'), false);
ks_localize("ks-display-js", $atts); ks_localize("ks-display-js", $atts);
return $div; return $div;
} }
function get_script_path($script_name) {
return 'build' . DIRECTORY_SEPARATOR . $GLOBALS['build'] . DIRECTORY_SEPARATOR . $script_name;
}
function parse_atts($atts) function parse_atts($atts)
{ {
return shortcode_atts(array( return shortcode_atts(array(
...@@ -63,20 +68,20 @@ function ks_add_editor($atts = []) ...@@ -63,20 +68,20 @@ function ks_add_editor($atts = [])
{ {
ks_add_editor_dependencies(); ks_add_editor_dependencies();
ks_localize("ks-editor-js", $atts); ks_localize("ks-editor-js", $atts);
ks_load_styles(); ks_load_styles("backend.css");
require_once(__DIR__ . '/editor/editor.php'); require_once(__DIR__ . '/src/editor/editor.php');
} }
function ks_add_editor_dependencies() function ks_add_editor_dependencies()
{ {
$script_path = 'build' . DIRECTORY_SEPARATOR . $GLOBALS['build'] . DIRECTORY_SEPARATOR . 'backend.js'; wp_enqueue_script("ks-runtime-js", plugins_url(get_script_path("runtime.js"), __FILE__), array('jquery'), false);
wp_enqueue_script("ks-editor-js", plugins_url($script_path, __FILE__), array('jquery'), false); wp_enqueue_script("ks-vendors-js", plugins_url(get_script_path("vendors.js"), __FILE__), array('jquery'), false);
wp_enqueue_script("ks-editor-js", plugins_url(get_script_path("backend.js"), __FILE__), array('jquery'), false);
} }
function ks_load_styles() { function ks_load_styles($styles_name) {
$styles_path = 'build' . DIRECTORY_SEPARATOR . $GLOBALS['build'] . DIRECTORY_SEPARATOR . 'graph.css'; $styles_path = 'build' . DIRECTORY_SEPARATOR . $GLOBALS['build'] . DIRECTORY_SEPARATOR . $styles_name;
wp_enqueue_style('ks-style', plugins_url($styles_path, __FILE__)); wp_enqueue_style('ks-style', plugins_url($styles_path, __FILE__));
} }
...@@ -124,8 +129,8 @@ function kg_editor_admin_add_page() ...@@ -124,8 +129,8 @@ function kg_editor_admin_add_page()
} }
require_once(__DIR__ . "/knowledge-space-database.php"); require_once(__DIR__ . "/src/knowledge-space-database.php");
require_once(__DIR__ . '/datasets/datasets.php'); require_once(__DIR__ . '/src/datasets.php');
//add_action('wp_enqueue_scripts', 'kg_load_css'); //add_action('wp_enqueue_scripts', 'kg_load_css');
add_shortcode('knowledge-space', 'ks_add_graph'); add_shortcode('knowledge-space', 'ks_add_graph');
......
File moved
File moved
import { State } from "./state"; import { State } from "./state";
import * as Graph from "./graph"; import * as Graph from "./graph";
import { loadGraphJson } from "../../../datasets/datasets"; import { loadGraphJson } from "../../datasets";
import ForceGraph from "force-graph"; import ForceGraph from "force-graph";
import * as Interactions from "./interactions"; import * as Interactions from "./interactions";
import { setSpace, SPACE } from "../../config"; import { setSpace, SPACE } from "../../config";
......
...@@ -25,7 +25,7 @@ function ks_install() ...@@ -25,7 +25,7 @@ function ks_install()
} }
$charset_collate = $wpdb->get_charset_collate(); $charset_collate = $wpdb->get_charset_collate();
require_once(__DIR__ . '/../../../wp-admin/includes/upgrade.php'); require_once(__DIR__ . '/../../../../wp-admin/includes/upgrade.php');
global $SPACES_TABLE; global $SPACES_TABLE;
$sql = "CREATE TABLE $SPACES_TABLE ( $sql = "CREATE TABLE $SPACES_TABLE (
......
<?php <?php
require_once(__DIR__ . "/../knowledge-space-database.php"); require_once(__DIR__ . "/knowledge-space-database.php");
function ks_insert_or_update_graph($name, $graph) function ks_insert_or_update_graph($name, $graph)
{ {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment