Skip to content

K
kus-admin
Commit ef36edad by Иван Кубота
Options

clean out and refactor

parent 72c40ff0
Showing with 154 additions and 2308 deletions
data/tags.json deleted 100644 → 0
[
{
"id": 1,
"name": "мучное"
},
{
"id": 2,
"name": "мясо"
},
{
"id": 3,
"name": "сыр"
},
{
"id": 4,
"name": "сахар"
},
{
"id": 5,
"name": "варенье"
},
{
"id": 6,
"name": "сладкое"
},
{
"id": 7,
"name": "шоколад"
},
{
"id": 8,
"name": "морепродукты"
},
{
"id": 9,
"name": "овощи"
},
{
"id": 10,
"name": "шампунь"
},
{
"id": 11,
"name": "гигиена"
},
{
"id": 12,
"name": "чай"
},
{
"id": 13,
"name": "крупа"
},
{
"id": 14,
"name": "булгур"
},
{
"id": 15,
"name": "киноа"
},
{
"id": 16,
"name": "рис"
},
{
"id": 17,
"name": "молочный продукт"
},
{
"id": 18,
"name": "молочное"
},
{
"id": 19,
"name": "риет"
},
{
"id": 20,
"name": "харам"
},
{
"id": 21,
"name": "кускус"
},
{
"id": 22,
"name": "напиток"
},
{
"id": 23,
"name": "вода"
},
{
"id": 24,
"name": "паштет"
},
{
"id": 25,
"name": "салат"
},
{
"id": 26,
"name": "рыба"
},
{
"id": 27,
"name": "травы"
},
{
"id": 28,
"name": "канцтовары"
},
{
"id": 29,
"name": "суп"
},
{
"id": 30,
"name": "блины"
},
{
"id": 31,
"name": "ветчина"
},
{
"id": 32,
"name": "свинина"
},
{
"id": 33,
"name": "курица"
},
{
"id": 34,
"name": "яйцо"
},
{
"id": 35,
"name": "малина"
},
{
"id": 36,
"name": "черника"
},
{
"id": 38,
"name": "смородина"
},
{
"id": 39,
"name": "постное"
},
{
"id": 40,
"name": "слива"
},
{
"id": 41,
"name": "сернослив"
},
{
"id": 42,
"name": "свекла"
},
{
"id": 43,
"name": "яблоко"
},
{
"id": 44,
"name": "арахис"
},
{
"id": 45,
"name": "мята"
},
{
"id": 46,
"name": "котлеты"
},
{
"id": 47,
"name": "креветки"
},
{
"id": 48,
"name": "макароны"
},
{
"id": 49,
"name": "капуста"
},
{
"id": 50,
"name": "хлеб"
},
{
"id": 51,
"name": "борщ"
},
{
"id": 52,
"name": "первое"
},
{
"id": 53,
"name": "готовая еда"
},
{
"id": 54,
"name": "кунжут"
},
{
"id": 55,
"name": "кальмар"
},
{
"id": 56,
"name": "лосось"
},
{
"id": 57,
"name": "индейка"
},
{
"id": 58,
"name": "колбаса"
},
{
"id": 59,
"name": "зелень"
},
{
"id": 60,
"name": "зеленый горошек"
},
{
"id": 61,
"name": "кукуруза"
},
{
"id": 62,
"name": "лук"
},
{
"id": 63,
"name": "перец"
},
{
"id": 64,
"name": "сельдерей"
}
]
\ No newline at end of file
db.js deleted 100644 → 0
This diff is collapsed. Click to expand it.
f.html deleted 100644 → 0
{"type":"https:\/\/tools.ietf.org\/html\/rfc2616#section-10","title":"An error occurred","detail":"Not Found Quiz","trace":[{"namespace":"","short_class":"","class":"","type":"","function":"","file":"\/home\/forge\/api.local.vkusvill.testin.ru\/src\/Controller\/CreateQuizAttempt.php","line":53,"args":[]},{"namespace":"App\\Controller","short_class":"CreateQuizAttempt","class":"App\\Controller\\CreateQuizAttempt","type":"-\u003E","function":"__invoke","file":"\/home\/forge\/api.local.vkusvill.testin.ru\/vendor\/symfony\/http-kernel\/HttpKernel.php","line":151,"args":[]},{"namespace":"Symfony\\Component\\HttpKernel","short_class":"HttpKernel","class":"Symfony\\Component\\HttpKernel\\HttpKernel","type":"-\u003E","function":"handleRaw","file":"\/home\/forge\/api.local.vkusvill.testin.ru\/vendor\/symfony\/http-kernel\/HttpKernel.php","line":68,"args":[]},{"namespace":"Symfony\\Component\\HttpKernel","short_class":"HttpKernel","class":"Symfony\\Component\\HttpKernel\\HttpKernel","type":"-\u003E","function":"handle","file":"\/home\/forge\/api.local.vkusvill.testin.ru\/vendor\/symfony\/http-kernel\/Kernel.php","line":198,"args":[]},{"namespace":"Symfony\\Component\\HttpKernel","short_class":"Kernel","class":"Symfony\\Component\\HttpKernel\\Kernel","type":"-\u003E","function":"handle","file":"\/home\/forge\/api.local.vkusvill.testin.ru\/public\/index.php","line":32,"args":[]}]}
\ No newline at end of file
generate.sh deleted 100644 → 0
cd /home/forge/kus-quizard
node . -r -n
\ No newline at end of file
index.js
......@@ -4,7 +4,6 @@ const APP_HOST = env.APP_HOST || "127.0.0.1";
const APP_PORT = env.APP_PORT || 4000;
const DB_PATH = env.DB_PATH || "./db/users.json";
const data = require("./db.js");
const App = require('express');
const Router = require('node-async-router');
......@@ -32,7 +31,7 @@ const serveBundle = async function(tpl, res){
}
const cacheEntry = posixName;//+new Date()+'_'+Math.random().toString(36).substr(2)
res.end(tpl
.replace('$DATA$', JSON.stringify(data))
//.replace('$DATA$', JSON.stringify(data))
.replace('$BUNDLE$',
'<script src="'+cacheEntry+'"></script>')
);
......@@ -99,7 +98,7 @@ var transformServe = function(dir) {
if (req.url.substr(-5) === '.scss') {
// not secure
console.log('scss', dir, req.url, __dirname)
//console.log('scss', dir, req.url, __dirname)
fs.readFile(path.join(__dirname,dir,req.url), function(err, data){
if( err ){
next();
......@@ -108,7 +107,7 @@ var transformServe = function(dir) {
file: path.join(__dirname,dir,req.url),
sourceMap: true,
importer: function(url, prev, done) {
console.log(url, prev, done)
//console.log(url, prev, done)
// url is the path in import as is, which LibSass encountered.
// prev is the previously resolved path.
// done is an optional callback, either consume it or return value synchronously.
......@@ -122,7 +121,7 @@ var transformServe = function(dir) {
contents: fs.readFileSync(name)+''
});
console.log({name, __dirname, dir, url, prev})
//console.log({name, __dirname, dir, url, prev})
},10);
// OR
//var result = someSyncFunction(url, prev);
......@@ -135,7 +134,7 @@ var transformServe = function(dir) {
}
res.header('Content-Type', 'text/css');
res.end(result.css)
debugger
//debugger
/*...*/ });
}
});
......@@ -143,7 +142,6 @@ var transformServe = function(dir) {
console.log('Serve jsx', dir, req.url)
fs.readFile(path.join(dir, req.url), function(err, data){
if( err ){
console.log('No jsx', err)
next();
}else{
......@@ -157,7 +155,6 @@ var transformServe = function(dir) {
cache[ req.url + '.map' ] = JSON.stringify( result.map );
res.set( 'SourceMap', req.url + '.map' );
res.end( result.code );
debugger;
}
})
}
......@@ -172,30 +169,29 @@ var transformServe = function(dir) {
app.use(transformServe('public'));
app.use(transformServe('src'));
var lives = [];
app.use('/', function(req, res, next) {
console.log(req.originalUrl)
if(req.originalUrl === '/'){
fs.readFile(dir(pack.src, pack.entry.html), function(err, data) {
if(err){
res.end(JSON.stringify(err, null, 2 ));
app.use('/', function(req, res, next){
console.log( req.originalUrl )
if( req.originalUrl === '/' ){
fs.readFile( dir( pack.src, pack.entry.html ), function( err, data ){
if( err ){
res.end( JSON.stringify( err, null, 2 ) );
}else{
serveBundle(data+'', res);
serveBundle( data + '', res );
}
});
} );
}else if(req.originalUrl === '/[live]'){
lives.push(res);
}else{
if(req.originalUrl in cache){
}else if( req.originalUrl === '/[live]' ){
lives.push( res );
}else if( req.originalUrl in cache ){
res( cache[ req.originalUrl ] );
}else{
next();
}
}
});
app.use(App.static(dir(pack.public)))
//app.use(App.static(dir(pack.src)))
app.use(App.static(dir(pack.public)));
app.use(App.static(dir(pack.src)))
......@@ -236,7 +232,7 @@ let debounceUpdate = function(filename){
}
};
var watch = require('recursive-watch');
watch('./public', function(filename){
watch('./src', function(filename){
if(filename.indexOf('_tmp_')>-1)
return;
......
jsx.js deleted 100644 → 0
var fs = require('fs')
var xx =require("@babel/core").transform(
fs.readFileSync('./public/js/view/page/export.jsx'),
{
"plugins": [
["@babel/plugin-transform-react-jsx", {
"pragma": "D.h", // default pragma is React.createElement
"pragmaFrag": "D.f", // default is React.Fragment
"throwIfNamespace": false // defaults to true
}]
]
}, function(c,d,e) {
console.log(d.code.replace(/\\u([\d\w]{4})/gi, (m, g) => String.fromCharCode(parseInt(g, 16))))
debugger
});
/*
,
"pragma": "Zrx.h",
"pragmaFrag": "Zrx.Fragment",
"throwIfNamespace": false
*/
\ No newline at end of file
lalk.json deleted 100644 → 0
{
"question": "Выберите лишний ингредиент, НЕ входящий в продукт \"Салат винегрет с маринованной капустой\"",
"answers": [
{
"correct": false,
"text": "горошек зелёный консервированный"
},
{
"correct": true,
"text": "шампиньоны"
},
{
"correct": false,
"text": "масло подсолнечное нерафинированно"
},
{
"correct": false,
"text": "капуста маринованная"
},
{
"correct": false,
"text": "огурцы консервированные"
},
{
"correct": false,
"text": "свекла столовая отварная,"
}
],
"log": [
"Random seed: bxa9uo",
"Quiz generate radio „Do not contain“",
"Have >= 2 components: 75",
"Matched product: Салат винегрет с маринованной капустой",
"Have 7 components. Took 5:",
" > огурцы консервированные",
" > горошек зелёный консервированный",
" > масло подсолнечное нерафинированно",
" > капуста маринованная",
" > свекла столовая отварная,",
"\nTags: Салаты и закуски",
"Matched 4 component donors.",
"Nearest candidate have got 1 similar tag.",
"Filtered candidates with [1] similar tags.",
"Use Салат «Грин Энерджи» as donor.",
"Because it has 1 similar tags: Салаты и закуски",
"\n << шампиньоны"
],
"type": "radio",
"image": "",
"category": 1
}
\ No newline at end of file
package.json
......@@ -3,8 +3,6 @@
"version": "0.1.0",
"main": "bin/index.js",
"dependencies": {
"@babel/plugin-transform-modules-commonjs": "^7.8.3",
"csv-parser": "^2.3.2",
"express": "^4.17.1",
"node-async-router": "^0.0.2",
"node-sass": "^4.13.1",
......@@ -20,6 +18,7 @@
"devDependencies": {
"@babel/core": "^7.8.3",
"@babel/plugin-transform-modules-amd": "^7.8.3",
"@babel/plugin-transform-modules-commonjs": "^7.8.3",
"@babel/plugin-transform-react-jsx": "^7.8.3"
},
"plugins": [
......
public/controller/reqold.js deleted 100644 → 0
;(function(Path) {
'use strict';
var log = console.log;
/*var log = function() {
console.log.apply(console, ['Define'].concat([].slice.call(arguments)));
};*/
var head = document.getElementsByTagName('head')[0];
var cssLoader = function(fileName) {
var link = document.createElement('link');
link.setAttribute('rel', 'stylesheet');
link.setAttribute('type', 'text/css');
link.setAttribute('href', fileName);
head.appendChild(link);
return true;
};
var jsLoader = function(fileName) {
fileName = fileName.replace(/src\//,'');
var script = document.createElement('script');
script.setAttribute('type', script.type = 'text/javascript');
script.onload = function(){
};
script.setAttribute('src', script.src = fileName);
head.appendChild(script);
};
var InstantLoaders = [
{name: '.scss', loader: cssLoader},
{name: '.css', loader: cssLoader},
{name: '.jsx', loader: jsLoader},
{name: '.js', loader: jsLoader},
];
var Ready = function() {}; Ready.prototype = {ready: true};
var Wait = function(fileName) {this.fileName = fileName; this.wait = [];};
Wait.prototype = {
fileName: '',
ready: false,
resolving: 0,
checkInstantLoad: function() {
for( var i = 0, _i = InstantLoaders.length; i < _i; i++ ){
const instantLoader = InstantLoaders[ i ];
if(this.fileName.substr(-instantLoader.name.length).toLowerCase()===instantLoader.name){
if(instantLoader.loader(this.fileName)) {
return true;
}
break;
}
}
return false;
}
};
var wait = {
exports: Ready()
};
var defined = {
};
var resolve = function(base, file) {
return Path.resolve(Path.dirname(base), file);
};
var exec = function(def) {
var exports = {};
def.fn.apply(null, def.deps.map(function(dep) {
if(dep === 'exports'){
return exports;
}
return defined[resolve(def.fileName, dep)];
}));
defined[def.fileName] = exports;
var waiters = wait[def.fileName].wait;
if(wait[def.fileName] instanceof Wait){
wait[ def.fileName ] = new Ready();
for( var i = 0, _i = waiters.length; i < _i; i++ ){
var waitElement = waiters[ i ];
if( waitElement instanceof Wait ){
waitElement.resolving--;
}
}
for( var i = 0, _i = waiters.length; i < _i; i++ ){
var waitElement = waiters[ i ];
if( waitElement.resolving === 0 ){
exec( waitElement.def )
}
}
}
};
window.define = function(fileName, deps, fn) {
fileName = Path.trim(fileName);
defined[fileName] = {fileName:fileName, deps: deps, fn:fn};
deps = deps.map(function(dep) {
return dep === 'exports' ? 'exports': resolve(fileName, dep);
});
var unresolved = deps.filter(function(dep) {
if(dep === 'exports'){
return false;
}
var resolvedName = dep;
var waiter = wait[resolvedName];
if(!wait[resolvedName]){
waiter = wait[resolvedName] = new Wait(resolvedName)
}
if(!waiter.ready){
waiter.wait.push( fileName );
if( waiter.checkInstantLoad() ){
wait[ resolvedName ] = new Ready();
}
}
return !wait[resolvedName].ready;
});
if(!(fileName in wait)){
wait[fileName] = new Wait(fileName);
}
var waiter = wait[fileName];
if(unresolved.length === 0){
log(fileName, 'deps fullfilled');
exec(defined[fileName])
}else{
log(fileName, 'is waiting for', unresolved);
for( var i = 0, _i = unresolved.length; i < _i; i++ ){
var unresolvedElement = unresolved[ i ];
waiter.wait.push(resolve(fileName, unresolvedElement));
waiter.resolving++;
}
}
};
window.define.wait = wait;
window.define.defined = defined;
})(window.__Path);
\ No newline at end of file
public/js/controller/exportLogic.js deleted 100644 → 0
function sqlEscape(str) {
return (str+'').replace(/[\0\x08\x09\x1a\n\r"'\\\%]/g, function (char) {
switch (char) {
case "\0":
return "\\0";
case "\x08":
return "\\b";
case "\x09":
return "\\t";
case "\x1a":
return "\\z";
case "\n":
return "\\n";
case "\r":
return "\\r";
case "\"":
case "'":
case "\\":
case "%":
return "\\"+char; // prepends a backslash to backslash, percent,
// and double/single quotes
default:
return char;
}
});
}
const indexKey = {
connections: 'cid',
tags: 'id'//'iID'
},
yamlEscape = function(a) {
return typeof a === 'number'? a : '\''+(a+'').replace(/'/,'\'\'')+'\''
};
const formatters = {
json: function(data) {
return JSON.stringify(data, null, 2);
},
csv: toCSV,
sql: function(data) {
if(data.length){
const item = data[0], header = [];
for(let key in item){
header.push(key);
}
const rows = data.map(item=>header.map(key=>item[key]));
return [ 'INSERT INTO `' + store.get( 'exportTableName' ) + '` (' + header.map( sqlEscape ).map( a => '`' + a + '`' ).join( ', ' ) + ') VALUES' ].concat(
rows.map( row => '(' + row.map( sqlEscape ).map( a => '\'' + a + '\'' ).join( ', ' ) + ')' ).join( ',\n' )
).join( '\n' ) + ';';
}else{
return ';'
}
},
yaml: function(data, exportData) {
const index = indexKey[exportData]
return data
.map(item=>
[exportData.substr(0,exportData.length-1)+item[index]+':'].concat(
Object.keys(item)
.filter(key=>key !== index)
.map(key=>' '+key+': '+ yamlEscape(item[key]))
).join('\n')
).join('\n')
}
};
const exportLogic = function(exportEl) {
store.sub(['exportData', 'exportFormat', 'lastUpdate'], function(exportData, exportFormat) {
var arr = [];
var fullData = dP[exportData];
for(var k in fullData){
arr.push(fullData[k]);
}
exportEl.value = exportFormat in formatters ? formatters[exportFormat](arr, exportData): 'Create formatter '+exportFormat;
});
return exportEl;
};
\ No newline at end of file
public/js/controller/quizBits/checkbox.js deleted 100644 → 0
let ComponentsOfProduct;
quizTypes.checkbox = [ ComponentsOfProduct = {
probability: 10,
correct: {min: 2, max: 4},
wrong: {min: 1, max: 4},
answers: {min: 3, max: 6},
doNotLogUnique: true,
questionCmpAmount: 2,
type: 'Select components of product',
products: {from: 3, to: 7},
minSimilarTags: 1,
from: qB.prebuild.similarTaggedProducts.fn,
question(income, log){
return `Какие ингредиенты входят в продукт ${lapk(income.correct.title)}`
},
answer(income, log){
const correct = shuffle(income.allUniq)
.slice(0, rand(this.correct.min, this.correct.max))
.map(i=>new Answer.Correct(textFormat(i.name))),
componentsNotInCorrect = qB.getComponentsNotInCorrect(income),
maxWrongs = Math.min(this.wrong.max, this.answers.max-correct.length),
wrongCount = rand(this.wrong.min, maxWrongs),
wrongs = componentsNotInCorrect
.slice(0, wrongCount)
.map(i=>new Answer.Wrong(textFormat(i.name)));
log.push('');
log.push(`Took ${correct.length} correct:`);
correct.forEach(a=>log.push(` > ${a.text}`))
log.push('');
log.push(`And ${wrongs.length} wrong:`);
wrongs.forEach(a=>log.push(` > ${a.text}`))
return shuffle(correct.concat(wrongs));
}
},
Object.assign({}, ComponentsOfProduct, {
probability: 4,
correct: {min: 2, max: 4},
wrong: {min: 2, max: 4},
answers: {min: 4, max: 8},
realMaxAnswers: 6,
question(income, log){
return `Какие ингредиенты НЕ входят в продукт ${lapk(income.correct.title)}`
},
answer(income, log){
log.push('Generate Answers by `Select components of product` subroutine');
const result = ComponentsOfProduct.answer.call(this, income, log);
log.push('Reversing');
const reversed = result
.map(a=>a instanceof Answer.Correct ? new Answer.Wrong(a.text) : new Answer.Correct(a.text));
const right = reversed.filter(a=>a instanceof Answer.Correct),
wrong = reversed.filter(a=>a instanceof Answer.Wrong);
return shuffle(right.concat(wrong.slice(0, Math.min(this.wrong.max, this.realMaxAnswers - right.length))));
}
}),
{
probability: 10,
correct: {min: 2, max: 4},
wrong: {min: 1, max: 3},
answers: {min: 4, max: 6},
doNotLogUnique: true,
questionCmpAmount: 2,
type: 'Select components of product',
products: {from: 2, to: 4},
minSimilarTags: 1,
from(log){
const products = qB.randomProduct({
minComponents: 1,
amount: this.products,
connectedByTags: true,
minSimilarTags: this.minSimilarTags,
doNotTrim: true
}, log),
componentsWithProducts = qB.getComponentsWithSharedProducts(products, 2);
log.push('Shared products count: '+componentsWithProducts.length);
if(componentsWithProducts.length === 0)
return false;
const bounded = componentsWithProducts.filter(cp=>
cp.products.length >= this.correct.min &&
products.length - cp.products.length >= this.wrong.min
);
log.push('After bounding by correct/wrong/full count '+bounded.length+' left');
if(bounded.length === 0){
log.push('Does not meet count criteria');
return false;
}
const chosen = rand(bounded);
log.push('Chosen component: '+chosen.component.name);
return {
baseProduct: chosen.products[0],
component: chosen.component,
correct: chosen.products,
wrong: products.filter(p=>chosen.products.indexOf(p)===-1)
};
},
question(income, log){
return `В какие продукты входит следующий ингредиент ${lapk(textFormat(income.component.name))}`
},
answer(income, log){
const correct = income.correct
.slice(0, rand(this.correct))
.map(p=>new Answer.Correct(p.title)),
wrong = income.wrong
.slice(0, Math.min(rand(this.wrong), this.answers.max - correct.length))
.map(p=>new Answer.Wrong(p.title));
log.push('');
log.push(`Get ${correct.length} correct products:`);
correct.map(c=>log.push(` > ${c.text}`));
log.push('');
log.push(`Get ${correct.length} wrong products:`);
wrong.map(c=>log.push(` > ${c.text}`));
return shuffle(correct.concat(wrong));
}
}
];
\ No newline at end of file
public/js/controller/quizBits/checkboxPhoto.js deleted 100644 → 0
quizTypes.checkboxPhoto = [
{
questionMinComponentsCount: 2,
probability: 8,
type: 'What components are in it',
answers: {min: 3, max: 6},
correct: {min: 2, max: 4},
wrong: {min: 1, max: 4},
from: qB.prebuild.similarTaggedProductWithPhotoAndComponents.fn,
question(income, log){
return 'Какие ингредиенты входят в продукт, изображенный на картинке?'
},
answer( income, log ){
let corrects = income.allCorrect
.slice(0, rand(this.correct))
.map(a=>new Answer.Correct(textFormat(a.name))),
wrongs = income.allWrong
.slice(0, rand(this.wrong))
.map(a=>new Answer.Wrong(textFormat(a.name)));
return shuffle(
corrects
.concat(wrongs)
.slice(
0,
Math.min(
this.answers.max,
corrects.length+wrongs.length)));
}
},
{
questionMinComponentsCount: 2,
probability: 3,
type: 'What components are NOT in it',
answers: {min: 3, max: 6},
correct: {min: 2, max: 4},
wrong: {min: 1, max: 4},
from: qB.prebuild.similarTaggedProductWithPhotoAndComponents.fn,
question(income, log){
return 'Какие ингредиенты НЕ входят в продукт, изображенный на картинке?'
},
answer( income, log ){
let corrects = income.allWrong
.slice(0, rand(this.correct))
.map(a=>new Answer.Correct(textFormat(a.name))),
wrongs = income.allCorrect
.slice(0, rand(this.wrong))
.map(a=>new Answer.Wrong(textFormat(a.name)));
return shuffle(
corrects
.concat(wrongs)
.slice(
0,
Math.min(
this.answers.max,
corrects.length+wrongs.length)));
}
}
];
\ No newline at end of file
public/js/controller/quizBits/main.js deleted 100644 → 0
const qB = {
randomProduct: function({
minComponents,
amount,
single,
connectedByTags,
minSimilarTags,
doNotTrim,
withPhoto
}, log) {
let filtered = Object.values(dP.products);
filtered = filtered
.filter((p)=>p.getComponents().length >= minComponents);
log.push(`Have >= ${minComponents} components: `+filtered.length);
if(!filtered.length)
return;
if(single){
amount = 1;
}
let minAmount, maxAmount;
if(typeof amount !== 'number'){
minAmount = amount.from;
maxAmount = amount.to;
}else{
minAmount = maxAmount = amount;
}
let similarClusters = [];
if(connectedByTags){
let tagsHash = {};
filtered.forEach(p => {
p.getTags().forEach(({id})=>
(tagsHash[id] || (tagsHash[id] = [])).push(p)
);
});
let similarTags = {};
filtered.forEach(p => {
const tags = p.getTags(),
tagsStr = tags.map(({id})=>id).sort().join(',');
if(tagsStr in similarTags)
return;
let similar = filtered
.map(subP =>
({
similar: subP.getTags().filter(subT => tags.indexOf(subT)>-1).length,
p: subP
})
)
.filter(i=>i.similar>0)
.sort((a, b)=>b.similar - a.similar);
if(similar.length){
let maxCount = similar[ 0 ].similar;
let minCount = minSimilarTags || Math.round( maxCount - maxCount / 4 );
similarTags[ tagsStr ] = similar
.filter( s => s.similar >= minCount )
.map(s=>s.p)
}
});
similarClusters = Object.keys(similarTags)
.map(k=>({k, v:similarTags[k]}))
.filter( a => a.v.length >= minAmount);
log.push(`Clusters that have >= ${minSimilarTags} similar tags: `+Object.values(similarClusters).length);
let randed = rand(similarClusters);
log.push(`Used cluster tags: ${randed.k.split(',').map(id=>dP.tagsHash[id].name).join(', ')}`);
filtered = randed.v;
}
let result;
if(single){
result = rand(filtered);
log.push('Matched product: '+result.title);
}else{
if(filtered.length < minAmount){
log.push(`Not enough components meeting criteria`);
return false;
}
result = shuffle(filtered).slice(0, doNotTrim?filtered.length:rand(minAmount, maxAmount));
log.push('Base products:');
result.forEach(p => log.push(` > ${p.title}`))
log.push('');
}
return result;
},
subdivideComponents: function(from, sub) {
const hash = {};
from.forEach(c=>hash[normalizeText(c.name)] = c);
sub.forEach(c=>delete hash[normalizeText(c.name)]);
return Object.values(hash);
},
getUniqComponents: function(products) {
return Object.values(qB.getUniqComponentsHash(products));
},
getUniqComponentsHash: function(products) {
const hash = {};
products.forEach(
p=>
p
.getComponents()
.forEach(c=>
hash[normalizeText(c.name)] = c
)
);
return hash;
},
getComponentsWithSharedProducts: function(
products,
minSharedProductCount,
maxSharedProductCount
) {
const hash = {};
minSharedProductCount = minSharedProductCount || 0;
maxSharedProductCount = maxSharedProductCount || Infinity;
products.forEach(
p=>
p
.getComponents()
.forEach(c=> {
const name = normalizeText( c.name );
(hash[ name ] || (hash[name] = [])).push({c, p});
})
);
return Object
.values(hash)
.filter(i =>
i.length >= minSharedProductCount &&
i.length <= maxSharedProductCount
)
.map(i=>({component: i[0].c, products: i.map(({p})=>p)}));
},
getComponentsNotInCorrect: function(income) {
return shuffle(
qB.subdivideComponents(
qB.getUniqComponents(income.wrong),
income.correct.getComponents()
)
);
},
getProductsWithTags: function({
products,
tags,
minMatch
}){
if(minMatch === void 0){
minMatch = tags.length;
}
const tHash = tags.reduce((s, t)=>{s[t.id] = t; return s;}, {});
products = products || Object.values( dP.products );
return products
.filter(
p => p.getTags()
.filter(t=>t.id in tHash).length >= minMatch
);
},
prebuild: {
similarTaggedProductWithPhotoAndComponents: {
fn: function(log) {
this.getEmAll = true;
this.products = {min: 2};
const possibilities = shuffle(
qB.prebuild.similarTaggedProductWithPhoto.fn.call(this, log)
);
if(!possibilities || !possibilities.length)
return false;
for( let i = 0, _i = possibilities.length; i < _i; i++ ){
const possibility = possibilities[ i ];
const components = possibility.correct.getComponents();
const other = qB.getUniqComponentsHash(possibility.all.filter( sP => sP !== possibility.correct ))
components.forEach(c=>delete other[normalizeText(c.name)]);
if(Object.keys(other).length >= this.answers.min){
log.push('Take '+possibility.baseProduct.title+' with uniq components:');
components.forEach(c=>
log.push(` > ${c.name}`)
);
log.push('');
log.push('Other components in group tagged as '+
possibility.baseProduct.getTags().map(t=>t.name).join(', ')+':'
);
Object.values( other ).forEach(c=>
log.push(` > ${c.name}`)
);
const c = rand( components )
return {
allCorrect: components,
baseProduct: possibility.baseProduct,
correct: c,
wrong: shuffle( Object.values( other ) ).slice( 0, rand( this.answers.min - 1, this.answers.max - 1 ) ),
allWrong: Object.values( other )
};
}
}
return false;
}
},
similarTaggedProductWithPhoto: {
questionMinComponentsCount: Number,
products: {min: Number, max: Number},
fn: function(log) {
let allProducts = Object.values(dP.products);
let products = Object.values(dP.products)
.filter(p=>p.image)
.filter(p=>p.getComponents().length>=this.questionMinComponentsCount)
log.push( `Products with image and >= ${this.questionMinComponentsCount} components count: ${products.length}` );
if(products.length === 0){
rand(Object.values(dP.products)).image = 'https://robohash.org/'+Math.random().toString(36)
return false;
}
const possibility = products.map(p=>{
const similar = qB.getProductsWithTags({
products: allProducts,
tags: p.getTags(),
minMatch: 1
});
if(similar.length+1 >= this.products.min ){
return {
correct: p,
baseProduct: p,
wrong: similar.filter( sP => sP !== p ).slice(0,rand( this.products.min - 1,this.products.max - 1)),
all: similar
};
}else{
return false;
}
})
.filter(Boolean);
log.push( `Possible count: ${possibility.length}` );
return this.getEmAll ? possibility : rand(possibility);
}
},
similarTaggedProducts: {
// minimal components in product
questionCmpAmount: 4,
// amount of matched products
products: {from: 4, to: 8},
// product similarity (minimal matched tags count)
minSimilarTags: 2,
fn(log){
let products = qB.randomProduct({
minComponents: this.questionCmpAmount,
amount: this.products,
connectedByTags: true,
minSimilarTags: this.minSimilarTags
}, log);
for( let i = 0, _i = products.length; i < _i; i++ ){
const product = products[ i ];
/* if(this.withPhoto && !product.image)
continue;*/
const cmps = product
.getComponents()
.filter(cmp => products.filter(p=>p.containsComponent(cmp)).length === 1)
if(cmps.length>=this.questionCmpAmount){
if(this.doNotLogUnique){
log.push( `Product ${lapk( product.title )} have ${cmps.length} uniq components:` );
}else{
log.push( `Product ${lapk( product.title )} have >= ${this.questionCmpAmount} uniq components (${cmps.length}):` );
}
const shuffled = shuffle(cmps.slice()),
used = shuffled.slice(0, this.questionCmpAmount);
cmps.forEach(c=>log.push(`${!this.doNotLogUnique && used.indexOf(c)>-1?'+':' '} > ${c.name}`));
let wrong = products.slice();
wrong.splice(i,1);
return {
baseProduct: product,
correct: product,
wrong: wrong,
uniq: used,
allUniq: shuffled
}
}
}
return false;
}
}
}
};
\ No newline at end of file
public/js/controller/quizBits/radio.js deleted 100644 → 0
quizTypes.radio = [
{
questionCmpAmount: 4,
probability: 10,
type: 'Product contains 4 components',
products: {from: 4, to: 8},
minSimilarTags: 1,
from: qB.prebuild.similarTaggedProducts.fn,
question(income, log){
return 'В какой из продуктов входят данные ингредиенты: '+income.uniq.map(a=> textFormat(a.name)).join(', ');//products.map(p=>p.title)
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(income.correct.title))]
.concat(income.wrong.map(p=>new Answer.Wrong(textFormat(p.title)))))
}
},
{
questionCmpAmount: 2,
probability: 8,
type: 'Component in product',
products: {from: 4, to: 6},
minSimilarTags: 1,
from: qB.prebuild.similarTaggedProducts.fn,
question(income, log){
return `Выберите один ингредиент, который входит в продукт ${lapk(income.correct.title)}`
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(shuffle(income.uniq)[0].name))]
.concat(
shuffle(
qB.subdivideComponents( qB.getUniqComponents(income.wrong), income.correct.getComponents() )
)
.slice(0, rand(this.products.from-1, this.products.to-1))
.map(c=>new Answer.Wrong(textFormat(c.name)))
)
)
}
},
{
questionCmpAmount: 0,
probability: 8,
type: 'Select product description',
products: {from: 3, to: 5},
minSimilarTags: 1,
from: qB.prebuild.similarTaggedProducts.fn,
question(income, log){
return `Какое из этих описаний относится к продукту ${lapk(income.correct.title)}`
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(income.correct.description))]
.concat(
income.wrong.map(
p => new Answer.Wrong(textFormat(p.description))
)
))
}
},
{
questionCmpAmount: 0,
probability: 8,
type: 'Select product that matches description',
products: {from: 4, to: 6},
minSimilarTags: 1,
from: qB.prebuild.similarTaggedProducts.fn,
question(income, log){
return `К какому из продуктов относится это описание:\n${textFormat(income.correct.description)}`
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(income.correct.title))]
.concat(
income.wrong.map(
p => new Answer.Wrong(textFormat(p.title))
)
))
}
},
{
probability: 10,
answers: {from: 3, to: 6},
question: ({product})=> `Выберите лишний ингредиент, НЕ входящий в продукт "${product.title}"`,
type: 'Do not contain',
from: (log)=>{
const product = qB.randomProduct({ minComponents: 2, single: true }, log);
return {baseProduct: product, product}
},
answer( {product}, log ){
const out =
shuffle(
dP.Product.getComponents(product)
.map(i=>({correct: false, text: i.name}))
)
.slice(0, rand(this.answers.from - 1, this.answers.to - 1)),
// get tags
tags = product.tags,
donors = [];
log.push(`Have ${dP.Product.getComponents(product).length} components. Took ${out.length}:`);
out.forEach(function(a) {
log.push(' > '+ a.text)
});
log.push('\nTags: '+dP.Product.getTags(product).map(t=>t.name).join(', '));
Object.keys(dP.products)
.map(k=>dP.products[k])
.forEach(item => {
if(item.id === product.id)
return;
const matchedCount = tags.filter(tid=>item.tags.indexOf(tid)>-1).length;
if(matchedCount>0){
donors.push({
count: matchedCount,
item,
title: item.title,
component: dP.Product.getComponents(item).map(a=>a.name)
});
}
});
log.push('Matched '+donors.length+' component donors.');
donors.sort((a,b)=>b.count-a.count);
if(!donors.length){
log.push('Not enough');
return false;
}
const maxCount = donors[0].count;
const minCount = Math.round(maxCount - maxCount/4);
const alreadyExist = out.reduce((store, i)=>{
store[normalizeText(i.text)] = true;
return store;
}, {'соль': true,'сольпощово': true, 'сохор': true});
log.push('Nearest candidate have got '+ maxCount +' similar tag.');
const may = ([].concat.apply(
[],
donors
.filter(i=>i.count > 0 && i.count >= minCount)
.map(i=>
i.component
.filter(c=>{
if(!c.trim())
return false;
const normalized = normalizeText(c);
if(normalized in alreadyExist)
return false;
alreadyExist[normalized] = true;
return true;
})
.map(x => ({count: i.count, item: i.item, text: x}))
)
));
log.push('Filtered candidates with ['+ (minCount===maxCount? minCount : minCount+' - '+ maxCount) +'] similar tags.');
if(may.length<2)
return false;
const answer = rand(may);
log.push('Use '+ answer.item.title +' as donor.');
log.push('Because it has '+ answer.count +' similar tags: '+ dP.Product.getTags(answer.item).map(t=>t.name).join(', '));
out.push({correct: true, text: answer.text});
log.push('\n << '+ answer.text);
return out;
}
}];
\ No newline at end of file
public/js/controller/quizBits/radioPhoto.js deleted 100644 → 0
quizTypes.radioPhoto = [
{
questionMinComponentsCount: 0,
probability: 10,
type: 'What is it',
products: {min: 4, max: 6},
from: qB.prebuild.similarTaggedProductWithPhoto.fn,
question(income, log){
return 'Какой продукт изображен на картинке?'
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(income.correct.title))]
.concat(income.wrong.map(p=>new Answer.Wrong(textFormat(p.title)))))
}
},
{
questionMinComponentsCount: 0,
probability: 8,
type: 'What describes it better',
products: {min: 3, max: 5},
from: qB.prebuild.similarTaggedProductWithPhoto.fn,
question(income, log){
return 'Какое из этих описаний относится к продукту, изображенному на картинке?'
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(income.correct.description))]
.concat(income.wrong.map(p=>new Answer.Wrong(textFormat(p.description)))))
}
},
{
questionMinComponentsCount: 2,
probability: 3,
type: 'What component is in it',
answers: {min: 4, max: 6},
from: qB.prebuild.similarTaggedProductWithPhotoAndComponents.fn,
question(income, log){
return 'Выберите один ингредиент, который входит в продукт, изображенный на картинке'
},
answer( income, log ){
return shuffle(
[new Answer.Correct(textFormat(income.correct.name))]
.concat(income.wrong.map(p=>new Answer.Wrong(textFormat(p.name)))))
}
}
];
\ No newline at end of file
public/js/controller/quizGenerator.js deleted 100644 → 0
const lapk = (text)=>`„${text}“`;
const rand = function(a, b){
if(Array.isArray(a)){
return a[Math.random.seeded()*a.length|0];
}
if(typeof a === 'object' && 'max' in a){
b = a.max;
a = a.min || 0;
}
a = Math.ceil(a);
b = Math.floor(b);
return Math.floor(Math.random.seeded() * (b - a + 1)) + a;
return (r-a)*(b-a)|0;
},
probabilityRand = function(items) {
let sum = 0;
for( let i = 0, _i = items.length; i < _i; i++ ){
const item = items[ i ];
sum += item.probability |0;
}
const theRandom = Math.random.seeded();
let total = 0;
for( let i = 0, _i = items.length; i < _i; i++ ){
const item = items[ i ];
total += item.probability/sum;
if(theRandom < total)
return item;
}
};
const normalizeText = function(text) {
return text.trim().toLowerCase().replace(/[^а-я]/g,'').replace(/[аоуеэюёиыя]+/g,'о')
};
const quizTypes = {
checkbox: [],
checkboxPhoto: {
},
radio: [],
radioPhoto: {
}
};
const shuffle = function (a) {
for (let i = a.length - 1; i > 0; i--) {
const j = Math.floor(Math.random.seeded() * (i + 1));
[a[i], a[j]] = [a[j], a[i]];
}
return a;
};
const standardGenerator = function(random) {
const initialSeed = Math.random.seeded.getStringSeed();
const log = quizGenerator.log = ['Random seed: '+initialSeed];
const questionID = random(Object.values(dP.standardQuestions)),
q = dP.standardQuestions[questionID];
log.push('Creating standard question.');
log.push('It would be question number '+questionID);
log.push('');
log.push('Title '+q.title);
q.answers.forEach(
a =>
log.push((a.correct?'+':' ')+` > ${a.title}`));
return {
type: q.multiple ? 'checkbox': 'radio',
categoryId: 2,
productId: q.cardInfoID,
question: textFormat(q.title),
answers: shuffle(q.answers.map(a =>
a.correct ?
new Answer.Correct(a.title) :
new Answer.Wrong(a.title))),
image: !q.image?null:q.image,
log
};
};
const quizGenerator = function(type, photo, subType) {
return _quizGenerator(type, photo, subType);
},
_quizGenerator = function(type, photo, subType, attempt) {
attempt = attempt || 0;
const initialSeed = Math.random.seeded.getStringSeed();
let log;
if(attempt === 0){
const types = quizTypes[type+(photo?'Photo':'')];
subType = probabilityRand(types);
log = quizGenerator.log = ['Random seed: '+initialSeed,'Quiz generate '+type+(photo ? ' with photo':'') +' '+(subType?`${lapk(subType.type)}`:'. FAIL')];
}else if(attempt<30){
log = quizGenerator.log;
log.push('\nATTEMPT FAILED!\n\n'+
'------------------------\n' +
' ATTEMPT '+ (attempt+1)+'\n'+
'------------------------\n\n'
)
}else{
throw new Error('Too much errors')
}
const cfg = subType;
if(!cfg)
return {answers: [], log};
const source = cfg.from.call(cfg, log);
if(source === false){
// давай по новой
return _quizGenerator( type, photo, subType, attempt + 1 );
}
let answers = shuffle(cfg.answer.call(cfg, source, log));
if(answers === false){
// давай по новой
return _quizGenerator( type, photo, subType, attempt + 1 );
}
return {
seed: initialSeed,
type,
categoryId: 1,
productId: source.baseProduct.id,
question: cfg.question.call(cfg, source, log),
answers,
image: !photo?null:source.baseProduct.image,
log,
}
};
public/js/helpers/answer.js deleted 100644 → 0
const Answer = {
Correct: function(val) {
this.correct = true;
this.text = val;
},
Wrong: function(val) {
this.correct = false;
this.text = val;
}
};
\ No newline at end of file
public/js/model/product.js deleted 100644 → 0
dP.Product = {
getByID: function(id) {
return dP.products[id];
},
getComponents: function(product) {
return dP.componentsListHashByProduct[ product.id ] || [];
},
getTags: function(product) {
return product.tags.map(dP.Tag.getByID);
},
get: function() {
},
ctor: function(data) {
this.tags = [];
Object.assign(this, data);
}
};
dP.Product.ctor.prototype = {
getComponents(){return dP.Product.getComponents(this);},
getTags(){return dP.Product.getTags(this);},
containsComponent(cmp, fuzzy){
if(!fuzzy)
return this.getComponents().indexOf(cmp)>-1;
const normalized = normalizeText(cmp.name);
return this.getComponents().filter(sCmp=>normalized === normalizeText(sCmp.name) ).length > 0;
}
};
\ No newline at end of file
public/js/model/provider.js deleted 100644 → 0
const useSubSub = true;
const dataProvider = {
maxConnection: 0,
maxTagID: 0,
slice: {},
standardQuestions: {},
tags: [],
connections: {},
products: {}
},
dP = dataProvider,
initDataProvider = function(data) {
Object.assign(dP, data);
let key;
for(key in data.products){
data.products[key] = new dP.Product.ctor(data.products[key])
}
Object.assign(dP, {
componentsList: [],
componentsListHashByProduct: {}
});
for(key in data.components){
const cmp = data.components[key];
cmp.tags = [];
dP.componentsList.push(cmp);
(dP.componentsListHashByProduct[cmp.id] || (dP.componentsListHashByProduct[cmp.id] = [])).push(cmp);
}
if(useSubSub){
data.tags = [];
data.connections = [];
dP.tagsHash = {};
Object.values( data.products ).forEach( function( item ){
const tag = dP.Tag.getOrCreate( item.subsubcat );
dP.Tag.connectToProduct( dP.Product.getByID( item.id ), tag );
} );
}else{
dP.tagsHash = data.tags.reduce( ( store, item ) => {
dP.maxTagID = Math.max( dP.maxTagID, item.id );
store[ item.id ] = item;
return store
}, {} );
data.connections.forEach( ( connection ) => {
dP.maxConnection = Math.max( dP.maxConnection, connection.cid );
if( connection.type === 0 ){
data.products[ connection.eid ].tags.push( connection.tag )
}
} );
}
};
public/js/model/slice/productTable.js deleted 100644 → 0
dP.slice.productTable = {
getItems: function() {
return Object.keys(dP.products)
.map(k=>dP.products[k])
.map(item=>{
dP.slice.productTable.updateFilterCache(item);
return item;
})
},
updateFilterCache: function(item) {
item._titleFilter = item.title.toLowerCase();
item._componentsFilter = (dP.componentsListHashByProduct[item.id] || []).map(a=>a.name).join(' ');
item._tagsFilter = (item.tags || []).map(t=>dP.tagsHash[t].name).join(' ');
}
};
\ No newline at end of file
public/js/model/tag.js deleted 100644 → 0
dP.Tag = {
getOrCreate: function(val) {
const matched = dP.Tag.getByName(val);
if(matched)
return matched;
// create
const tagID = ++dP.maxTagID,
item = {
id: tagID,
name: val
};
dP.tagsHash[tagID] = item;
dP.tags.push(item);
return item;
},
remove: function(tagID) {
dP.tags.splice(dP.tags.indexOf(dP.tagsHash[tagID]), 1);
delete dP.tagsHash[tagID];
},
getByID: function(tagID) {
return dP.tagsHash[tagID]
},
getByName: function(name) {
return dP.tags.filter(a=>a.name === name)[0];
},
disconnectFromProduct: function(product, tag) {
const tagID = tag.id;
if(product.tags.indexOf(tagID) > -1){
product.tags.splice( product.tags.indexOf(tagID), 1 );
const connection = dP.connections
.filter(connection =>
connection.tag === tagID &&
connection.type === 0 &&
connection.eid === product.id
)[0];
if(!connection)
return;
if(connection.cid === dP.maxConnection-1)
dP.maxConnection--;
dP.connections.splice(
dP.connections.indexOf(
connection
) ,1);
dP.Tag.removeIfNoConnections(tag);
dP.slice.productTable.updateFilterCache(product);
}
},
connectToProduct: function(product, tag) {
const tagID = tag.id;
if(product.tags.indexOf(tagID) === -1){
product.tags.push( tagID );
dP.connections.push({
cid: ++dP.maxConnection,
type: 0,
eid: product.id,
tag: tagID
});
dP.slice.productTable.updateFilterCache(product);
}
},
removeIfNoConnections: function({tagID}) {
if(dP.connections.filter(connection=>connection.tag === tagID).length === 0){
dP.Tag.remove(tagID)
}
}
};
\ No newline at end of file
public/js/pcg-base.js deleted 100644 → 0
// Pico pico graph!
var PCG = window['PCG'] = function(cfg) {
if(cfg.consts){
this.consts = PCG.apply(PCG.apply({}, this.consts), cfg.consts);
delete cfg.consts;
}
PCG.apply(this, cfg);
this._update = this._update.bind(this);
this.resize = this.resize.bind(this);
this.init();
};
PCG.apply = function(a,b) {
for(var k in b){
a[k] = b[k];
}
return a;
};
PCG.ZOOM = {
PIE: 1,
CUSTOM: 2,
LOAD: 3
};
\ No newline at end of file
public/js/view/base.js
const D = PCG.D;
const {div, span} = D;
const view = {
page: {},
cmp: {}
};
\ No newline at end of file
public/js/view/cmp/menu.jsx deleted 100644 → 0
D.declare('view.cmp.Menu',({title, id, key, cls}) =>
<div cls={_ => store.equal(key, id,active => _( 'main-menu-item', cls,
'main-menu-item__'+D.escapeCls(id),
{'main-menu-item__active': active}
))}
onclick={()=> store.set(key, id)}>{title}</div>
);
\ No newline at end of file
public/js/view/page/components.js deleted 100644 → 0
view.page.Components = function(){
let componentTable;
this.dom = div( { cls: 'content-component' },
div({cls: 'product-filter__area title-gradient'},
div({cls: 'product-filter'},
div({cls: 'product-filter__title'},'Фильтр'),
D.input({
attr: {
value: (update)=>store.sub('componentFilterText', (val)=>update(val))},
cls: 'product-filter__input',
on: {input: (e)=>store.set('componentFilterText', e.target.value)}})
)
),
componentTable = new view.cmp.Table( {
sorters: [ { id: 'title', type: String } ],
sort: [ { name: 'asc' } ],
filterFn: function( text, me ){
return !text || textFilterMatched( this.name, text )
},
afterFilter: ( items ) => store.set( 'componentFilteredCount', items.length ),
itemTpl: ( item, me, bonus ) => {
const dom = div( { cls: 'table-item table-item__component' },
span( {
cls: 'component-title',
on: { click: tableAction },
attr: { 'data-action': 'toggle:' + item.id }
}, me.highlight( item.name ), ' ≡' )
);
return dom;
},
items: dP.componentsList
} )
);
const tableAction = componentTable.getActionDelegate();
store.sub([
'componentFilterText'
], function(text) {
componentTable.filter(text.trim().toLowerCase());
componentTable.updateChildren();
});
};
\ No newline at end of file
public/js/view/page/export.jsx deleted 100644 → 0
//import f from './exp.js';
//console.log(f)
D.declare('view.page.Export', function(){
return <div cls="export-panel">
<div cls="title-gradient">
<div cls="export-sub-menu">
<div cls={_=>_("export-sub-menu", 'olo')}>
<view.cmp.Menu title='Тэги' id='tags' key='exportData'/>
<view.cmp.Menu title='Связи' id='connections' key='exportData'/>
</div>
<div cls="export-sub-menu">
{view.cmp.Menu( { title: 'CSV', id: 'csv', key: 'exportFormat' } )}
{view.cmp.Menu( { title: 'JSON', id: 'json', key: 'exportFormat' } )}
{view.cmp.Menu( { title: 'YAML', id: 'yaml', key: 'exportFormat' } )}
{view.cmp.Menu( { title: 'SQL', id: 'sql', key: 'exportFormat' } )}
</div>
</div>
</div>
{exportLogic( <textarea cls='export-data'/>)}
<div cls="export-comment">Connetction type{'<Enum>'}: 0 — продукт, 1 — компонент`</div>
<button onclick={e => console.log( e )}>btn1</button>
</div>
});
public/js/view/page/export.old.js deleted 100644 → 0
view.page.Export = function() {
this.dom =
div({cls: 'export-panel'},
div({cls: 'title-gradient'},
div({cls: 'export-sub-menu'},
div({cls: 'export-sub-menu'},
view.cmp.Menu({title: 'Тэги', id: 'tags', key: 'exportData'}),
view.cmp.Menu({title: 'Связи', id: 'connections', key: 'exportData'})
),
div({cls: 'export-sub-menu'},
view.cmp.Menu({title: 'CSV', id: 'csv', key: 'exportFormat'}),
view.cmp.Menu({title: 'JSON', id: 'json', key: 'exportFormat'}),
view.cmp.Menu({title: 'YAML', id: 'yaml', key: 'exportFormat'}),
view.cmp.Menu({title: 'SQL', id: 'sql', key: 'exportFormat'}),
)
)
),
exportLogic(D.textarea({cls: 'export-data'})),
div({cls: 'export-comment'}, `Connetction type<Enum>: 0 — продукт, 1 — компонент`)
);
};
\ No newline at end of file
public/js/view/page/generate.jsx deleted 100644 → 0
view.cmp.Answer = function(answer, type) {
return (
<label cls={D.cls('quiz-answer-label', 'quiz-answer-label__'+type)}>
<input type={type} checked={answer.correct}/>{answer.text}
</label>
)
};
view.page.Generate = function() {
const update = function() {
const photo = store.get('generatePhoto') === 'photo',
type = store.get('generateType'),
category = store.get('generateCategory');
try{
seedInput.value = Math.random.seeded.getStringSeed();
const result = category === 'product' ? quizGenerator( type, photo ) : standardGenerator(({length})=>rand(0,length-1));
title.innerHTML = textFormat( result.question, true );
image.innerHTML = result.image ? `<img src="${result.image}" alt="img"/>` : '';
image.style.display = result.image ? 'block': 'none';
debug.value = result.log.join( '\n' )
D.removeChildren( answers );
D.appendChild( answers, result.answers.map( ( a ) => view.cmp.Answer( a, type ) ) );
}catch( e ){
debug.value = quizGenerator.log.join( '\n' )
console.error(e)
}
};
let title, answers, debug, seedInput, image;
this.dom =
<div cls='generate-panel'>
<div cls='title-gradient'>
<div cls='generate-sub-menu'>
<div cls='generate-sub-menu'>
{view.cmp.Menu({title: 'Продукты', id: 'product', key: 'generateCategory'})}
{view.cmp.Menu({title: 'Стандарты', id: 'standard', key: 'generateCategory'})}
</div>
{view.cmp.Switch({key: 'generateCategory'}, {
product: <div cls='generate-sub-menu'>
<div cls='generate-sub-menu'>
{view.cmp.Menu({title: 'Единственный', id: 'radio', key: 'generateType'})}
{view.cmp.Menu({title: 'Множественный', id: 'checkbox', key: 'generateType'})}
</div>
<div cls='generate-sub-menu'>
{view.cmp.Menu({title: 'С фото', id: 'photo', key: 'generatePhoto'})}
{view.cmp.Menu({title: 'Без фото', id: 'noPhoto', key: 'generatePhoto'})}
</div>
</div>
})}
</div>
</div>
<div cls='generate-controls'>
<input type='button' value='F5' onclick={update}/>
<span cls='generate-seed-label'>Seed:</span>
{seedInput = <input
cls='seed'
type='input' value='' placeholder='seed'
oninput={function() {
var val = seedInput.value;
Math.random.seeded.setStringSeed(val);
update()
}}/>
}
</div>
<div cls='generate-example'>
{title = <div cls='generate-title'/>}
{image = <div cls='generate-image'/>}
{answers = <div cls='generate-answers'/>}
{debug = <textarea cls='generate-debug'/>}
</div>
</div>;
store.sub(['generateType', 'generatePhoto', 'generateCategory'], update);
};
\ No newline at end of file
public/js/view/page/generate.old.js deleted 100644 → 0
view.cmp.Answer = function(answer, type) {
return D.label({cls: D.cls('quiz-answer-label', 'quiz-answer-label__'+type)},
D.input({
attr: {type, checked: answer.correct}
}),
answer.text
)
};
view.page.Generate = function() {
const update = function() {
const photo = store.get('generatePhoto') === 'photo',
type = store.get('generateType'),
category = store.get('generateCategory');
try{
seedInput.value = Math.random.seeded.getStringSeed();
const result = category === 'product' ? quizGenerator( type, photo ) : standardGenerator(({length})=>rand(0,length-1));
title.innerHTML = textFormat( result.question, true );
image.innerHTML = result.image ? `<img src="${result.image}" alt="img"/>` : '';
image.style.display = result.image ? 'block': 'none';
debug.value = result.log.join( '\n' )
D.removeChildren( answers );
D.appendChild( answers, result.answers.map( ( a ) => view.cmp.Answer( a, type ) ) );
}catch( e ){
debug.value = quizGenerator.log.join( '\n' )
console.error(e)
}
};
let title, answers, debug, seedInput, image;
this.dom =
div({cls: 'generate-panel'},
div({cls: 'title-gradient'},
div({cls: 'generate-sub-menu'},
div({cls: 'generate-sub-menu'},
view.cmp.Menu({title: 'Продукты', id: 'product', key: 'generateCategory'}),
view.cmp.Menu({title: 'Стандарты', id: 'standard', key: 'generateCategory'})
),
view.cmp.Switch({key: 'generateCategory'}, {
product: div({cls: 'generate-sub-menu'},
div({cls: 'generate-sub-menu'},
view.cmp.Menu({title: 'Единственный', id: 'radio', key: 'generateType'}),
view.cmp.Menu({title: 'Множественный', id: 'checkbox', key: 'generateType'})
),
div({cls: 'generate-sub-menu'},
view.cmp.Menu({title: 'С фото', id: 'photo', key: 'generatePhoto'}),
view.cmp.Menu({title: 'Без фото', id: 'noPhoto', key: 'generatePhoto'})
)
)
})
)
),
div({cls: 'generate-controls'},
D.input({
attr: {type: 'button', value: 'F5'},
on: {click: update}}),
span({cls: 'generate-seed-label'}, 'Seed:'),
seedInput = D.input({
cls: 'seed',
attr: {type: 'input', value: '', placeholder: 'seed'},
on: {input: function() {
var val = seedInput.value
Math.random.seeded.setStringSeed(val);
update()
//Math.random.seeded.setStringSeed(val);
}}}),
),
div({cls: 'generate-example'},
title = div({cls: 'generate-title'}),
image = div({cls: 'generate-image'}),
answers = div({cls: 'generate-answers'}),
debug = D.textarea({cls: 'generate-debug'})
)
);
store.sub(['generateType', 'generatePhoto', 'generateCategory'], update);
};
\ No newline at end of file
public/js/view/page/products.js deleted 100644 → 0
view.page.Products = function() {
let productTable, productFilterByTitle, productFilterByComponent, productFilterByTag, productFilterText,
tagField;
this.dom = div({cls: 'content-products'},
div({cls: 'product-filter__area title-gradient'},
div({cls: 'product-filter'},
div({cls: 'product-filter__title'},'Фильтр'),
D.input({
attr: {
value: (update)=>store.sub('productFilterText', (val)=>update(val))},
cls: 'product-filter__input',
on: {input: (e)=>store.set('productFilterText', e.target.value)}})
),
div({cls: 'product-filter'},
span({cls: 'product-filter__hint'},'Область фильтрации:'),
D.label({cls: 'product-filter__label'},
D.input({
attr:{
type: 'checkbox',
checked: (update)=>store.sub('productFilterByTitle', (val)=>update(val))},
on: {change: (e)=>{store.set('productFilterByTitle', e.target.checked)}}
}), 'Название'
),
D.label({cls: 'product-filter__label'},
D.input({
attr:{
type: 'checkbox',
checked: (update)=>store.sub('productFilterByComponent', (val)=>update(val))},
on: {change: (e)=>{store.set('productFilterByComponent', e.target.checked)}}
}), 'Ингредиенты'
),
D.label({cls: 'product-filter__label'},
D.input({
attr:{
type: 'checkbox',
checked: (update)=>store.sub('productFilterByTag', (val)=>update(val))},
on: {change: (e)=>{store.set('productFilterByTag', e.target.checked)}}
}), 'Тэги'
)
)
),
div({cls: 'tag-manipulations'},
D.input({attr:{type: 'button', value: 'Удалить тэг'}, on: {
click: ()=> {
var val = tagField.getValue().trim();
if(val!==''){
var tag = dP.Tag.getByName(val);
if(!tag)
return;
productTable.getSelected().forEach(function(item) {
dP.Tag.disconnectFromProduct(dP.Product.getByID(item.id), tag);
productTable.updateChildByData(item);
});
store.set('lastUpdate', +new Date())
}
}}}),
tagField = new view.cmp.TagField(),
D.input({
cls: update =>
store.sub('productFilteredCount', count =>
update(D.cls('tag-manipulations-add-tag', {
'tag-manipulations__not-active': count === 0 || count > 30}))),
attr:{type: 'button', value: 'Добавить тэг'},
on: {
click: ()=> {
var val = tagField.getValue().trim();
if(val==='')
return;
const tag = dP.Tag.getOrCreate(val);
productTable.getSelected().forEach(function(item) {
dP.Tag.connectToProduct(dP.Product.getByID(item.id), tag);
productTable.updateChildByData(item);
});
store.set('lastUpdate', +new Date())
}
}
}),
D.span({cls: 'tag-manipulations-add-tag__comment'},
_=> store.sub('productFilteredCount', count =>
_(
'Найдено: '+count,
count === 0 ? D.span({}, 'Надо больше результатов!') : (count > 30 ? D.span({}, 'Не цепляй тэг на всё сразу!') : null)
)))
),
productTable = new view.cmp.Table({
sorters: [{id: 'title', type: String}],
sort: [{title: 'asc'}],
filterBy: {title: true, tag: true, component: true},
filterFn: function(text, me) {
return !text ||
(me.filterBy.title && textFilterMatched(this._titleFilter, text)) ||
(me.filterBy.tag && textFilterMatched(this._tagsFilter,text)) ||
(me.filterBy.component && textFilterMatched(this._componentsFilter,text))
},
afterFilter: (items)=>store.set('productFilteredCount', items.length),
itemTpl: (item, me, bonus) => {
const dom = div({cls: 'table-item table-item__product'},
div( {
cls: 'table-item-action table-item-collapse',
attr: { title: 'Скрыть', 'data-action': 'hide:' + item.id },
on: { click: tableAction }
}, '←' ),
span( {
cls: 'product-title',
on: { click: tableAction },
attr:{ 'data-action': 'toggle:'+ item.id}
}, me.highlight( item.title ),' ≡' ),
( item.tags || [] ).map( t => me.highlight( dP.tagsHash[ t ].name ) ).map( view.cmp.Tag ),
bonus.full && D.html( { cls: 'product-description' }, textFormat(item.description, true) ),
div(
{ cls: 'table-item__product-components' },
D.join( ( dP.componentsListHashByProduct[ item.id ] || [] ).map( a => D.span( { cls: 'product-cmp' }, me.highlight( a.name ) ) ), ', ' )
)
);
if(bonus.hidden){
if(bonus.hiddenFull){
dom.classList.add( 'table-item__hidden-full' );
}else{
setTimeout( () => {
dom.classList.add( 'table-item__hidden' );
}, 1 )
setTimeout( () => {
bonus.hiddenFull = true;
dom.classList.add( 'table-item__hidden-full' );
}, 300 )
}
}
return dom;
},
items: dP.slice.productTable.getItems()
})
);
const tableAction = productTable.getActionDelegate();
store.sub([
'productFilterText',
'productFilterByTitle',
'productFilterByComponent',
'productFilterByTag'
], function(text, title, component, tag) {
Object.assign(productTable.filterBy, {title, component, tag});
productTable.filter(text.trim().toLowerCase());
productTable.updateChildren();
});
};
\ No newline at end of file
public/js/pcg-dom-util.js → src/core/DOM.js
(function(PCG, glob){
var svgNS = 'http://www.w3.org/2000/svg';
var NS = window['NS'] = function(cfg) {
if(cfg.consts){
this.consts = NS.apply(NS.apply({}, this.consts), cfg.consts);
delete cfg.consts;
}
NS.apply(this, cfg);
this._update = this._update.bind(this);
this.resize = this.resize.bind(this);
this.init();
};
NS.apply = function(a,b) {
for(var k in b){
a[k] = b[k];
}
return a;
};
// I am too lazy to do DOM manually / anyway this solution is optimal enough
(function(NS, glob){
var svgNS = 'http://www.w3.org/2000/svg';
var setters = {
cls: function(el) {
......@@ -70,12 +85,10 @@
}else{
setters.cls(el)(cls);
}
//if(el.className !== cls)debugger
//cls.split( ' ' ).forEach( function( clsItem ){ classList.add( clsItem ); });
}
if( style ){
PCG.apply( el.style, style );
NS.apply( el.style, style );
}
for( i in attr ){
......@@ -108,7 +121,7 @@
return el;
};
var D = PCG.D = {
var D = NS.D = {
svg: null,
label: null,
div: null,
......@@ -215,13 +228,13 @@
return (cls+'').replace(/[^a-zA-Z0-9\-_]/g,'');
};
var _construct = function(ctor, cfg) {
var _construct = function(ctor, cfg, p) {
//if it is not an arrow function
if('prototype' in ctor && ctor.prototype.constructor === ctor){
var cls = new ctor(cfg);
var cls = new ctor(cfg || {}, p);
return 'dom' in cls ? cls.dom : cls;
}else{
return ctor(cfg);
return ctor(cfg || {}, p);
}
};
......@@ -250,7 +263,7 @@
uses = usage[ name ].instances;
for( var i = 0, _i = uses.length; i < _i; i++ ){
var u = uses[ i ], d = u.dom;
u.dom = _construct(ctor, u.cfg);
u.dom = _construct(ctor, u.cfg, u.p);
if(d.parentNode){
d.parentNode.replaceChild( u.dom, d )
}
......@@ -259,14 +272,22 @@
console.log(`${name} declared`)
uses = (usage[ name ] = {ctor: ctor, instances: []}).instances;
}
return populate(name, function construct (cfg) {
var dom = _construct(ctor, cfg);
uses.push({dom: dom, cfg: cfg});
return populate(name, function construct (cfg, p) {
var dom = _construct(ctor, cfg, p);
uses.push({dom: dom, cfg: cfg, p: p});
return dom;
});
}
})(window['PCG'], typeof window !== "undefined" ? window :
})(window['NS'], typeof window !== "undefined" ? window :
typeof WorkerGlobalScope !== "undefined" ? self :
typeof global !== "undefined" ? global :
typeof GLOBAL !== "undefined" ? GLOBAL :
Function("return this;")());
var D = NS.D,
div = D.div,
span = D.span,
view = {
page: {},
cmp: {}
};
\ No newline at end of file
public/controller/path.js → src/core/Path.js
// It is mostly node.js posix path.
window.__Path = (function(){
var splitPathRe =
......
public/js/helpers/rand.js → src/core/Random.Seeded.js
......@@ -4,7 +4,7 @@ function mulberry32(a) {
t = Math.imul(t ^ t >>> 15, t | 1);
t ^= t + Math.imul(t ^ t >>> 7, t | 61);
return ((t ^ t >>> 14) >>> 0) / 4294967296;
}
};
out.getSeed = function() {
return a;
......
src/index.html
......@@ -3,64 +3,28 @@
<head>
<title>Category mapper</title>
<meta charset="utf-8" />
<script src="controller/path.js"></script>
<script src="controller/require.js"></script>
<script src="livest-reloading.js"></script>
<script src="core/Path.js"></script>
<script src="core/Require.js"></script>
<script src="core/LivestReloading.js"></script>
<script src="js/releasable-observer.js"></script>
<script src="js/pcg-base.js"></script>
<script src="js/pcg-dom-util.js"></script>
<script src="core/Observer.js"></script>
<script src="core/DOM.js"></script>
<script src="js/csv.js"></script>
<script src="core/Random.Seeded.js"></script>
<script src="js/helpers/rand.js"></script>
<script src="js/model/store.js"></script>
<script src="js/model/data.js"></script>
<script src="core/data/store/Store.js"></script>
<script src="model/Store.js"></script>
<script src="js/model/provider.js"></script>
<script src="js/model/slice/productTable.js"></script>
<script src="js/model/tag.js"></script>
<script src="js/model/product.js"></script>
<script src="js/helpers/textFilter.js"></script>
<script src="js/helpers/answer.js"></script>
<script src="js/view/base.js"></script>
<script src="js/view/cmp/base.js"></script>
<script src="js/view/cmp/menu.jsx"></script>
<script src="js/view/cmp/switch.js"></script>
<script src="js/view/cmp/table.js"></script>
<script src="js/view/cmp/tag.js"></script>
<script src="js/view/cmp/tagfield.js"></script>
<script src="js/view/page/products.js"></script>
<script src="js/view/page/export.jsx"></script>
<script src="js/view/page/generate.jsx"></script>
<script src="js/view/page/components.js"></script>
<script src="js/controller/exportLogic.js"></script>
<script src="js/controller/quizBits/main.js"></script>
<script src="js/controller/quizGenerator.js"></script>
<script src="js/controller/quizBits/checkbox.js"></script>
<script src="js/controller/quizBits/checkboxPhoto.js"></script>
<script src="js/controller/quizBits/radio.js"></script>
<script src="js/controller/quizBits/radioPhoto.js"></script>
$BUNDLE$
<!--
<script src="../src/main.jsx"></script>
<link type="text/css" rel="stylesheet" href="src/main.css">-->
</head>
<body>
<script>
initDataProvider($DATA$);
define('begin', ['main.jsx'], function(main) {
define('start', ['main.jsx'], function(main) {
main.default();
});
</script>
......
src/main.jsx
import './main.scss';
import {Button} from '/view/cmp/button.jsx'
import './view/page/login/Login.jsx';
import './view/page/account/Account.jsx';
import './view/cmp/switch/Switch.jsx';
export default function() {
let tagField, exportEl;
div({
renderTo: document.body,
cls: 'content'
},
div({
cls: 'main-menu'
},
view.cmp.Menu({title: 'Продукты', id: 'products', key: 'mainMenuActive'}),
view.cmp.Menu({title: 'Ингредиенты', id: 'components', key: 'mainMenuActive'}),
view.cmp.Menu({title: 'Генерируем', id: 'generate', key: 'mainMenuActive'}),
view.cmp.Menu({title: 'Export', id: 'export', key: 'mainMenuActive', cls: 'menu-item-export'}),
),
view.cmp.Switch({cls: 'content-area', key: 'mainMenuActive'}, {
products: new view.page.Products(),
components: new view.page.Components(),
'export': <view.page.Export/>,
generate: new view.page.Generate()
})
);
let dom = <div renderTo={document.body} cls="content">
{view.cmp.Switch({cls: 'content-area', key: 'navigation.current'}, {
login: new view.page.Login(),
main: new view.page.Account(),
})}
</div>;
};
public/js/model/data.js → src/model/Store.js
const store = new Store({
mainMenuActive: 'products',
exportFormat: 'yaml',
exportData: 'tags',
exportTableName: 'SOMETABLE',
productFilterText: '',
componentFilterText: '',
'productFilterByTitle': true,
'productFilterByComponent': true,
'productFilterByTag': true,
'generateType': 'radio',
'generatePhoto': false,
generateCategory: 'product'
'navigation.current': 'login'
});
......
public/js/helpers/textFilter.js → src/text/String.Typography.js
var textCache = {};
const textFilterMatched = function(where, what) {
var prepared = textCache[what];
if(!prepared){
var tokens = what.split(/\s/)
textCache[what] = prepared = tokens.map(token => token[0] === '-' ? {has: false, text: token.substr(1)}: {has: true, text: token});
}
var yep = true;
for( var i = 0, _i = prepared.length; i < _i; i++ ){
var preparedElement = prepared[ i ];
if(preparedElement.text === '')
continue;
var matched = where.indexOf(preparedElement.text)>-1;
if(preparedElement.has === false && matched){
return false
}else if(preparedElement.has === true && !matched)
yep = false;
}
return yep;
};
const textFormat = function(text, html) {
String.Typography = function(text, cfg) {
const {html} = cfg;
if(typeof text !== 'string')
return text;
......@@ -166,3 +146,26 @@ const textFormat = function(text, html) {
return out;
};
String.Search = function(string, search) {
var prepared = textCache[search];
if(!prepared){
var tokens = search.split(/\s/)
textCache[search] = prepared = tokens
.map(token => token[0] === '-' ? {has: false, text: token.substr(1)}: {has: true, text: token});
}
var yep = true;
for( var i = 0, _i = prepared.length; i < _i; i++ ){
var preparedElement = prepared[ i ];
if(preparedElement.text === '')
continue;
var matched = string.indexOf(preparedElement.text)>-1;
if(preparedElement.has === false && matched){
return false
}else if(preparedElement.has === true && !matched)
yep = false;
}
return yep;
};
\ No newline at end of file
src/view/cmp/button.jsx
import './button.scss';
export const Button = D.declare('cmp.Button', function(cfg) {
export const Button = D.declare('view.cmp.Button', function(cfg) {
return <input type='text' {...cfg} cls='button'/>
});
\ No newline at end of file
src/view/cmp/field/LabeledField.jsx 0 → 100644
import './LabeledField.scss';
export default D.declare('view.cmp.field.LabeledField', (cfg)=>
<div class="labeled-field">
<label><span class="labeled-field__label">{cfg.label}</span>
<input class="labeled-field__input" type={'text'}/>
</label>
</div>
)
\ No newline at end of file
src/view/cmp/field/LabeledField.scss 0 → 100644
.labeled-field {
display: flex;
}
.labeled-field__label {
width: 150px;
}
\ No newline at end of file
public/js/view/cmp/table.js → src/view/cmp/list/List.js
view.cmp.Table = function(cfg){
const Table = function(cfg){
Object.assign(this, cfg);
const children = this.childrenEl = D.div({
cls: 'cmp-table__children'
......@@ -12,7 +12,7 @@ view.cmp.Table = function(cfg){
this.childrenEls = [];
setTimeout(()=>this.updateChildren(),0);
};
view.cmp.Table.prototype = {
Table.prototype = {
currentSlice: [],
childrenEls: [],
childrenEl: null,
......@@ -97,3 +97,7 @@ view.cmp.Table.prototype = {
},
};
export default D.declare('view.cmp.List', Table);
public/js/view/cmp/switch.js → src/view/cmp/switch/Switch.jsx
view.cmp.Switch = (cfg, contentHash) => {
export default D.declare('view.cmp.Switch', (cfg, contentHash) => {
const cmp = div( {
cls: update => store.sub(
cfg.key,
......@@ -16,4 +16,4 @@ view.cmp.Switch = (cfg, contentHash) => {
});
return cmp;
};
\ No newline at end of file
});
\ No newline at end of file
public/js/view/cmp/tagfield.js → src/view/cmp/tagField/TagField.js
view.cmp.TagField = (function(){
export default D.declare('view.cmp.TagField', (function(){
const TagField = function( data ){
Observable.call( this );
......@@ -88,4 +88,4 @@ view.cmp.TagField = (function(){
};
TagField.prototype = Object.assign( new Observable, TagField.prototype );
return TagField;
})();
\ No newline at end of file
})());
\ No newline at end of file
src/view/page/account/Account.jsx 0 → 100644
export default D.declare('view.page.Account', ()=>
<div>
Account Page
</div>
)
\ No newline at end of file
src/view/page/login/Login.jsx 0 → 100644
import '../../cmp/field/LabeledField.jsx'
export default D.declare('view.page.Login', ()=>
<div>
Login page
<view.cmp.field.LabeledField label={'Login'}/>
<view.cmp.field.LabeledField label={'Password'}/>
</div>
)
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment