Merge branch 'master' of github.com:hackersanddesigners/chatty-pub
This commit is contained in:
commit
0a2e17521b
9 changed files with 84 additions and 13 deletions
2
front/.gitignore
vendored
2
front/.gitignore
vendored
|
|
@ -26,4 +26,4 @@ zuliprc
|
||||||
|
|
||||||
upload.sh
|
upload.sh
|
||||||
|
|
||||||
dist
|
|
||||||
|
|
|
||||||
1
front/dist/css/app.29fe73fd.css
vendored
Normal file
1
front/dist/css/app.29fe73fd.css
vendored
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
:root{--back:#fff}#app,body,html{padding:0;margin:0;background:var(--back)}#app,body,html{height:100%;width:100%}#app{display:flex;flex-direction:column;font-size:11pt}#app,header{position:relative}header{box-sizing:border-box;font-size:9pt}main{height:100%;width:100%}main,section{position:relative;display:flex;flex-direction:column}section{box-sizing:border-box;padding:1em}section p{margin-bottom:0;margin-top:0}div[data-v-1af39708]{padding:.5em}div .selected[data-v-1af39708]{background:#f792f7}div p[data-v-1af39708]{margin:0}.streams[data-v-4514be34]{min-width:10em;padding:0;margin-bottom:1em}.message-outer{position:relative;display:block}.message-outer:hover .reactions{display:flex;position:absolute;top:0;left:0;width:100%;height:100%;align-items:center;justify-content:center;background-color:hsla(0,0%,100%,.5);font-size:3rem;pointer-events:none}.reactions,.reactions:after,.reactions:before{all:revert;display:none}.reactions span{pointer-events:auto}.message-data{display:flex;border-bottom:1px solid #666}.message-data>div{flex-grow:1}.message-data .from:after{content:":"}.message-data .time{text-align:right}.message-data-reactions{margin-bottom:1em}.header[data-v-30f46307]{cursor:pointer}@media print{.title[data-v-30f46307]{display:none}}.index[data-v-37f18a26]{page-break-after:always}.rule[data-v-080e408c]{margin:1em 0;position:relative}.rule p[data-v-080e408c]{margin:0}.rule.type-font[data-v-080e408c],.rule.type-raw[data-v-080e408c]{background-color:#333;color:#fff;padding:10px;border-radius:10px;border:1px solid #000;position:relative}.rule.type-font[data-v-080e408c]:after,.rule.type-raw[data-v-080e408c]:after{all:revert;content:"raw css";background-color:#333;border-radius:10px;position:absolute;bottom:-.5em;left:50%;transform:translateX(-50%);padding:5px 10px;font-family:sans-serif;font-size:.8rem;box-shadow:0 0 5px 5px rgba(255,255,0,.7)}.rule.type-font[data-v-080e408c]:after{content:"generated font rule"}.rule.type-font .instructions[data-v-080e408c]{display:none;position:absolute;top:10px;left:10px;padding:10px;width:calc(100% - 40px);height:calc(100% - 40px);align-content:center;justify-content:center;align-items:center;font-family:initial;background-color:hsla(0,0%,100%,.9);color:#000;border-radius:10px;box-shadow:0 0 5px 5px #fff}.rule.type-font:hover .instructions[data-v-080e408c]{display:flex}.rules[data-v-16b43aee]{max-width:unset}@media print{.rules[data-v-16b43aee]{display:none}}#home{position:relative;box-sizing:border-box;height:100%;width:100%;display:flex}.controls-pane{background-color:#aaa}.splitpanes--vertical .splitpanes__pane{overflow-y:scroll}.splitpanes.default-theme .splitpanes__pane{background-color:unset}.pane-wrapper{height:100vh}.controls{display:flex;flex-direction:column;padding:1em}.print .pane-wrapper{height:auto}.print .splitpanes__pane{overflow:initial}.print .content iframe{width:100%;height:100%}.print section{display:block!important}.body{page-break-after:always}.body img{max-width:100%}.float-btn{position:fixed;z-index:1000}@media print{.ui{display:none!important}}.docs[data-v-32f02ba2]{padding:1em;max-width:800px;width:100%;margin:1em auto}
|
||||||
1
front/dist/css/chunk-vendors.fa36ffc8.css
vendored
Normal file
1
front/dist/css/chunk-vendors.fa36ffc8.css
vendored
Normal file
File diff suppressed because one or more lines are too long
2
front/dist/index.html
vendored
2
front/dist/index.html
vendored
|
|
@ -1 +1 @@
|
||||||
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>ChattyPub</title><link href="/css/app.141fb685.css" rel="preload" as="style"><link href="/css/chunk-vendors.fa36ffc8.css" rel="preload" as="style"><link href="/js/app.bb16d12e.js" rel="preload" as="script"><link href="/js/chunk-vendors.d11bbf9b.js" rel="preload" as="script"><link href="/css/chunk-vendors.fa36ffc8.css" rel="stylesheet"><link href="/css/app.141fb685.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Chattypub doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.d11bbf9b.js"></script><script src="/js/app.bb16d12e.js"></script></body></html>
|
<!DOCTYPE html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><title>ChattyPub</title><link href="/css/app.29fe73fd.css" rel="preload" as="style"><link href="/css/chunk-vendors.fa36ffc8.css" rel="preload" as="style"><link href="/js/app.080ffb9e.js" rel="preload" as="script"><link href="/js/chunk-vendors.97da1489.js" rel="preload" as="script"><link href="/css/chunk-vendors.fa36ffc8.css" rel="stylesheet"><link href="/css/app.29fe73fd.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but Chattypub doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div><script src="/js/chunk-vendors.97da1489.js"></script><script src="/js/app.080ffb9e.js"></script></body></html>
|
||||||
2
front/dist/js/app.080ffb9e.js
vendored
Normal file
2
front/dist/js/app.080ffb9e.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
front/dist/js/app.080ffb9e.js.map
vendored
Normal file
1
front/dist/js/app.080ffb9e.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
70
front/dist/js/chunk-vendors.97da1489.js
vendored
Normal file
70
front/dist/js/chunk-vendors.97da1489.js
vendored
Normal file
File diff suppressed because one or more lines are too long
1
front/dist/js/chunk-vendors.97da1489.js.map
vendored
Normal file
1
front/dist/js/chunk-vendors.97da1489.js.map
vendored
Normal file
File diff suppressed because one or more lines are too long
|
|
@ -6,14 +6,13 @@ import { createStore } from 'vuex'
|
||||||
import emoji from "../mixins/emoji"
|
import emoji from "../mixins/emoji"
|
||||||
import { stripHtml } from "string-strip-html"
|
import { stripHtml } from "string-strip-html"
|
||||||
|
|
||||||
|
/*
|
||||||
|
|
||||||
// var EmojiConvertor = require('emoji-js');
|
TODO: fix this frankenfunction. Its not pretty but it works, so I am leaving it for now.
|
||||||
// var emojiConv = new EmojiConvertor();
|
|
||||||
|
|
||||||
// let emojis = require('emojis');
|
|
||||||
|
|
||||||
|
|
||||||
|
Does various conversion and parsing to turn a message in the rules channel into an object we can use in the rules and style component
|
||||||
|
|
||||||
|
*/
|
||||||
let toCSS = (message, currentStream) => {
|
let toCSS = (message, currentStream) => {
|
||||||
let content = stripHtml(message.content).result;
|
let content = stripHtml(message.content).result;
|
||||||
let className = "",
|
let className = "",
|
||||||
|
|
@ -23,9 +22,8 @@ let toCSS = (message, currentStream) => {
|
||||||
id = message.id,
|
id = message.id,
|
||||||
is_codeblock = message.content.includes("<code>") || message.content.startsWith("```"),
|
is_codeblock = message.content.includes("<code>") || message.content.startsWith("```"),
|
||||||
is_font = /<p><a href=".+?\.(ttf|otf|woff)/gm.test(message.content);
|
is_font = /<p><a href=".+?\.(ttf|otf|woff)/gm.test(message.content);
|
||||||
// let regex = /[/s]?(?<selector>.+)\s*\n?{\n?(?<prop>[\s\w.~:>-]+\s*:\s*.+;?\n?)*\n?}/gm
|
|
||||||
console.log(message);
|
let type = is_codeblock ? "raw" : is_font ? "font" : "rule";
|
||||||
let type = is_codeblock ? "raw" : is_font ? "font" : "rule"; // okay okay okay, i know this is ugly :)
|
|
||||||
|
|
||||||
let regex = /\s?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm
|
let regex = /\s?(?<selector>.+)\s*\n?{\n?(?<props>(.*;\n?)+)}/gm
|
||||||
let results = content.matchAll(regex);
|
let results = content.matchAll(regex);
|
||||||
|
|
@ -38,12 +36,9 @@ let toCSS = (message, currentStream) => {
|
||||||
} else if (is_codeblock) {
|
} else if (is_codeblock) {
|
||||||
return { className: '', emoji_code: '', rules: [], parentClassName: '', id: id, content: content, type: type }
|
return { className: '', emoji_code: '', rules: [], parentClassName: '', id: id, content: content, type: type }
|
||||||
} else if (results.length > 0) { // rule and raw
|
} else if (results.length > 0) { // rule and raw
|
||||||
// className = emojiConv.replace_colons(results[0]['groups']['selector']);
|
|
||||||
className = emoji.methods.shortcodeToEmoji(results[0]['groups']['selector']);
|
className = emoji.methods.shortcodeToEmoji(results[0]['groups']['selector']);
|
||||||
console.log(className)
|
|
||||||
if (emoji.methods.containsEmoji(className)) {
|
if (emoji.methods.containsEmoji(className)) {
|
||||||
emoji_code = emoji.methods.toEmojiCode(className);
|
emoji_code = emoji.methods.toEmojiCode(className);
|
||||||
console.log("??",className, emoji_code);
|
|
||||||
}
|
}
|
||||||
rules = results[0]['groups']['props'].split("\n");
|
rules = results[0]['groups']['props'].split("\n");
|
||||||
rules = rules.filter((rule) => validateRule(rule))
|
rules = rules.filter((rule) => validateRule(rule))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue