Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump googleapis from 36.0.0 to 59.0.0 #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ flexi.iml
.assets/
.idea/
functions/
certificates/
todo.txt
package-lock.json
.firebaserc
Expand Down
43 changes: 43 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{

"editor.tokenColorCustomizations": {
//"textMateRules": [],
//"[Solarized Dark]": {
"textMateRules": [
{
"scope": "storage",
"settings": {
"foreground": "#FF0000"
}
},
{
"scope": "keyword",
"settings": {
"foreground": "#FF0000"
}
},
{
"scope": "string",
"settings": {
"foreground": "#00FF00"
}
},
{
"scope": "entity.name.type",
"settings": {
"foreground": "#ff0000",

"fontStyle": "italic",
}
},
{
"scope": "variable.other.constant.property.tsx",
"settings": {

"foreground": "#ffd000"
}
},
]
//}
}
}
90 changes: 55 additions & 35 deletions dist/flexi.css
Original file line number Diff line number Diff line change
@@ -1,26 +1,44 @@
:root {
--th-blue: #003C62;
}
/*:root {
--th-bg-col: #003C62;
--nodef-bg-col: #004C62;
--table-border-col: #004C62;
--cell-caption-bg: rgba(149, 51, 0, .7);
--editable-hover-bg-col: #004C62;
--header-bg-col: rgba(139, 56, 1, .80);
--header-selected-bg-col: rgba(51, 51, 51, 1);
--input-text-col: #FFF;
--input-text-col-05: rgba(255,255,255,0.5);
--input-bg-0135: rgba(255,255,255,0.135);
--upload-block-bg-col: rgba(0,0,0,.5);

}*/


@import url('/flexi.theme.default.css');


body, html {height:100%;padding:0;margin:0;min-height:100%;}
h1, h2, h3, h4 {padding:0;margin:0;}
body {position:relative;color:#FFF;background-color:#333;font-family:'Roboto',sans-serif;cursor:default;}
#body-wrap {display:table;height:100%;width:100%;background-image:linear-gradient(rgba(0, 0, 0,0.3), rgba(0, 0, 0,0) 12%);}
body {position:relative;color:var(--page-color);background-color:var(--page-bg);font-family:'Roboto',sans-serif;cursor:default;}
#body-wrap {display:table;height:100%;width:100%; /*background-image:linear-gradient(rgba(0, 0, 0,0.3), rgba(0, 0, 0,0) 12%);*/}

td, th {border:1px solid #004C62;}
table {border-collapse: collapse; background-color:#001F33;border-spacing:0px;}
td, th {border:1px solid var(--td-border-col); background-color: var(--td-bg-col);}
table {border-collapse: collapse; background-color:#001F33;border-spacing:0;}
tbody {
display:table;
width:100%;
}

td {/*background-color:rgba(255,255,255,.1); */font-size:90%;}
td > div {text-overflow: ellipsis;}
th {background-color:var(--th-blue);padding:6px;}
th {color:var(--th-color);background-color:var(--th-bg-col);padding:6px;}
tr,td,th,table,tbody {height:100%;}

a {color: rgba(255, 97, 0, .8);}
a:hover {color:rgba(255, 97, 0, 1);/*transform:scale(1.2,1.2);*/}
a {color: var(--a-color); transition: color 100ms ease-in-out; text-decoration:underline;/*text-shadow: 1px 1px rgba(0,0,0,0.5);*/}
a:hover {color: var(--a-color-hover); text-decoration:underline; background-color:var(--a-color-hover-bg);}
a.material-icons {text-decoration:none;}

.editable a {background-color: var(--a-color-bg);}
/*a:active {transform:scale(0.8,0.8);}*/
button {
border: 1px solid #5ca941;padding:4px 8px; border-radius: 3px;
Expand All @@ -36,15 +54,16 @@ button.white {
}
button.transparent {
background:none;
color: white;
border: 1px solid rgba(255,255,255,0.25);
color: var(--page-color);
border: 1px solid var(--page-color);
}
button:hover {border-color:white;background-image: linear-gradient(green, green);color:white;}
button:active {border-color:transparent;}
td select {margin:5px;}
fieldset {border: 2px solid rgba(255,255,255,0.15);background-color:rgba(255,255,255,0.05);}
.editable label {cursor:pointer;}
.editable label:hover {text-decoration:underline;}
.viewContent {background-color:black; padding:2px 4px;}

.jsOBJhtmlized .str { color: #a5ff00;}
.jsOBJhtmlized .keyArr { opacity:0.3;font-weight:bold;font-style:italic;font-size:70%;}
Expand All @@ -65,9 +84,9 @@ fieldset {border: 2px solid rgba(255,255,255,0.15);background-color:rgba(255,255
#appWarningContainer .log {padding:2px;background:rgba(0,0,0,0.2); border:1px solid rgba(255,255,255,1);}
.devToggle {background-color:rgba(0,0,0,0.025);}
.prev-arrow {font-weight:bold;}
.cell-col-bg {background-color:var(--th-blue);}
.cell-col-bg {background-color:var(--th-bg-col);}
.category-depth-cell {text-align:right;border:0;/*border:1px solid var(--th-blue);*/padding:0}
.category-depth-cell-bar {background-color:var(--th-blue);height:100%;display:inline-block;border:0px solid lime;
.category-depth-cell-bar {background-color:var(--th-bg-col);height:100%;display:inline-block;border:0px solid lime;
vertical-align:middle;padding:15px 10px;text-align:left;}

.pageContainer a {padding:6px 4px;text-decoration:none;color:white;display:inline-block;font-size:90%;}
Expand All @@ -76,10 +95,10 @@ fieldset {border: 2px solid rgba(255,255,255,0.15);background-color:rgba(255,255

.cellContWrap {height:100%;padding:5px 5px 5px 5px;}
.cellContWrap .cellInfoType {display:inline-block;font-style: italic;padding:5px;border-bottom-left-radius: 5px;
position:absolute;right:0;top:0;background-color:var(--th-blue);}
position:absolute;right:0;top:0;background-color:var(--th-bg-col);}
.editable, .cellCont {position:relative;}
.editable {}
.editable:hover {background-color:#004C62;}
.editable:hover {background-color: var(--editable-hover-bg-col);}

.sticky, .sticky-colnames {position:sticky;top:-2px;z-index:100;}
.cell-caption-sticky {/*position:sticky;top:20px;*/}
Expand Down Expand Up @@ -151,22 +170,23 @@ fieldset {border: 2px solid rgba(255,255,255,0.15);background-color:rgba(255,255
.json-boolean { color: #99c794; }
.json-number { color: #FF9933; }

#header { position:relative;background-color:rgba(139, 56, 1, .80); padding:4px 0 0 0;/*display:flex;*/
background-image:linear-gradient(rgba(0, 0, 0,0.1), rgba(139, 56, 1, .80));}
#header { position:relative;background-color: var(--header-bg-col); padding:4px 0 0 0;/*display:flex;*/
/*background-image:linear-gradient(rgba(0, 0, 0,0.1), rgba(139, 56, 1, .80));*/}
#header ul {flex-basis:auto;justify-content:space-between;}
#header ul , #header li { margin: 0; padding: 0;}
#header ul {display:inline-block;}
#header li.selected {background-color:rgba(51, 51, 51, 1);/*border-top-left-radius: 8px; border-top-right-radius: 8px;*/border-right:none;}
#header li.selected {color: #FFF;background-color: var(--header-selected-bg-col);/*border-top-left-radius: 8px; border-top-right-radius: 8px;*/border-right:none;}
#header li.selected a {color:#FFF;}
#header .tableList li { display:inline-block; font-weight:bold; border-right: 2px solid rgba(51,51,51,.2);}
/*#header .tableList li:aer {content:'|';opacity:0.3;}*/
#header .tableList li:last-child {border-right:none;}

#header a {color:#FFF;padding:10px;text-decoration:none;}
#header a { color:var(--header-a-color);padding:10px;text-decoration:none;}
#header a {display:inline-block;}
#header > span {padding:6px;display:inline-block;/*;flex-grow:1;*/text-align:right;}
#header a:hover {background-color:rgba(255, 97, 0, .6);}
/*#header li:hover {background-color:rgba(255,255,255,.2);}*/

.auth-email {font-weight:var(--auth-font-weight); opacity: var(--auth-email-opacity)}

#root {display:table-cell;}
#footer-box {
Expand All @@ -184,40 +204,40 @@ fieldset {border: 2px solid rgba(255,255,255,0.15);background-color:rgba(255,255
position:absolute;right:0;
font-size:200px;font-family: 'Material Icons';content:'\e2bd';
}*/
.tableWrap {padding:10px;}
.tableWrap table {border: 2px solid #004C62; /*border-radius:17px;*//*border-top-left-radius: 7px; border-top-right-radius: 7px;*/}
.tableWrap .editable a { color: rgba(00, 255, 0, 1); background-color:rgba(0, 31, 51, 0.2); }
.tableWrap .editable a:hover { color: rgba(0, 31, 51, 1); background-color:rgba(0, 255, 0, 1); }
.tableWrap {padding:10px; background-color: var(--table-wrap-bg-col);}
.tableWrap table {border: 2px solid var(--table-border-col)#004C62; /*border-radius:17px;*//*border-top-left-radius: 7px; border-top-right-radius: 7px;*/}
/*.tableWrap .editable a { color: rgba(00, 255, 0, 1); background-color:rgba(0, 31, 51, 0.2); }
.tableWrap .editable a:hover { color: rgba(0, 31, 51, 1); background-color:rgba(0, 255, 0, 1); }*/

.table-style-vertical {/*display:inline-block;*/margin:0;border:0 !important;width:100% !important;}
.table-style-vertical {margin:0;border:0 !important;width:100% !important;}

.table-style-vertical tr, .table-style-vertical > tbody {width:100% !important;}
.table-style-vertical th {border-left:none !important;}

.table-style-0 {}

.table-style-1 {margin-left:6px;display:inline-block;}
/*.table-style-1 {margin-left:6px; display:inline-block;}
.table-style-1 th {background-color:#00623B;}
.table-style-1 td, .table-style-1 th {padding:6px;border:1px solid #2B6E14;}
.table-style-1 td, .table-style-1 th {padding:6px; border:1px solid #2B6E14;}*/


.cell-no-def {background-color:#004C62;}
.cell-no-def:hover {background-color:var(--th-blue)}
th.cell-caption {background-color:rgba(149, 51, 0, .7);}
.cell-no-def {background-color:var(--nodef-bg-col);}
.cell-no-def:hover {background-color:var(--th-bg-col);}
th.cell-caption {background-color: var(--cell-caption-bg);}

.cell-caption input[type="text"] {
border-radius:4px; padding:3px;color:white;border:0px solid rgba(255,255,255,0.3);
background-color:rgba(255,255,255,0.135);}
border-radius:4px; padding:3px; color:var(--input-text-col);border:0 solid rgba(255,255,255,0.3);
background-color: var(--input-bg-0135);}
.cell-caption input.search[value="<search>"], .cell-caption input.addCol[value='<add column>']
, .cell-caption input.goto-page[value='goto#'] {
color: rgba(255,255,255,0.5); font-style: italic;
color: var(--input-text-col-05); font-style: italic;
}
.not-found {background-color:transparent;}
.glue-below td, .glue-below th {border-bottom:none;}
.glue-above td, .glue-above th {border-top:none;}

.uploadBlock {
max-width:150px;background: rgba(0,0,0,.5); margin:1px;/*display:inline-block; margin: 0 5px 5px 0;*/
max-width:150px; background: var(--upload-block-bg-col); margin:1px;/*display:inline-block; margin: 0 5px 5px 0;*/
border:2px solid transparent;
user-select: none;
-webkit-user-select: none; /* Chrome all / Safari all */
Expand Down
28 changes: 28 additions & 0 deletions dist/flexi.theme.default.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
:root {
--page-bg: #333;
--page-color: #FFF;
--a-color: rgba(255, 97, 0, .8);
--a-color-bg: rgba(0, 0, 0, .1);
--a-color-hover: rgba(255, 255, 255, 0.7);
--a-color-hover-bg: rgba(0, 0, 0, 1);


--th-bg-col: #003C62;
--td-border-col: #004C62;

--header-a-color: #FFF;
--header-bg-col: rgba(139, 56, 1, .80);
--header-selected-bg-col: rgba(51, 51, 51, 1);
--auth-email-opacity: 0.7;
--auth-font-weight: normal;

--nodef-bg-col: #004C62;
--table-border-col: #004C62;
--cell-caption-bg: rgba(149, 51, 0, .7);
--editable-hover-bg-col: #004C62;

--input-text-col: #FFF;
--input-text-col-05: rgba(255, 255, 255, 0.5);
--input-bg-0135: rgba(255, 255, 255, 0.135);
--upload-block-bg-col: rgba(0, 0, 0, .5);
}
27 changes: 27 additions & 0 deletions dist/flexi.theme.lightaz.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
:root {
--input-text-col: #000;
--input-text-col-05: rgba(0, 0, 0, 0.5);
--input-bg-0135: rgba(0, 0, 0, 0.135);
--upload-block-bg-col: rgba(0, 0, 0, .2);

--header-selected-bg-col: #FF5B57;
--header-bg-col: #1A2229;
--header-a-color: #a8acb1;

--auth-email-opacity: 1;
--auth-font-weight: bold;

--editable-hover-bg-col: #EEE;
--nodef-bg-col: #EEE;
--table-border-col: #D9E0E7;
--cell-caption-bg: #CCC;
--page-bg: #D9E0E7;
--page-color: #707478;
--a-color: #337ab7;
--a-color-hover: #23527c;
--table-wrap-bg-col: #FFF;
--td-border-col: #D9E0E7;
--td-bg-col: #FFF;
--th-bg-col: #EEE;
--th-color: #000;
}
5 changes: 3 additions & 2 deletions dist/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="shortcut icon" href="favicon.ico" />
<title>FlexieCMS</title>

<style></style>
<link rel="stylesheet" type="text/css" href="/flexi.css">
<!--<link rel="stylesheet" type="text/css" href="/prettify.datk.css">-->
<!--<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">-->
Expand Down Expand Up @@ -37,7 +37,8 @@
<div class="row"><div id="footer-box">
<span id="slogan"><span style="opacity:0.05">FlexieCMS</span>
<a class="github" target="_blank" href="https://github.com/normonds/flexiecms">
<img width="60" height="60" src="/github.svg" /></a></span>
<img width="60" height="60" src="/github.svg" /></a>
</span>
<i class="material-icons" style="font-size:60px;opacity:0.016;">cloud</i>
<i class="material-icons" style="font-size:120px;opacity:0.02;">cloud</i>
<i class="material-icons" style="font-size:200px;opacity:0.03;">cloud</i></div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"bootstrap": "4.3.1",
"bson": "^4.0.1",
"eventemitter3": "3.1.0",
"googleapis": "36.0.0",
"googleapis": "59.0.0",
"immutability-helper": "2.8.1",
"json-pretty-html": "1.1.6",
"mongodb-stitch-browser-sdk": "4.2.0",
Expand Down
13 changes: 12 additions & 1 deletion src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ import { DBType, eCookie, iFlexiCell, iFlexiTable, iFlexiTableConfField, iFlexiT
const BSON = require('bson');
const ObjectID = BSON.ObjectId;



export class App {
static configTableName = '__flexi_conf';
static STORE : iSTORE;
Expand All @@ -28,14 +30,23 @@ export class App {
static FIELD_ROW_ID : string = '_id';
static categoriesUseBarColumn :boolean = false;
static mouseIsDown : boolean = false;

static obje:Object = {};
//lala : string ='12312';
static errorClear (id : string) {
App.STORE.warnings.delete(id);
App.update();
}
erro () {
let app = new App();
app.erro();
//app.lala = '123';
App.errorClearAll(null);
App.emiter.removeAllListeners();
}
static errorClearAll (id : string) {
App.STORE.warnings.clear();
App.update();
//let pp:App = new App();
}
static log (warning: any, warnLevel = WarningLevel.LOG) {
console.error(warning);
Expand Down
2 changes: 1 addition & 1 deletion src/components/Auth.react.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ render () {
let notLoggedIn = <React.Fragment>
<button onClick={this.login.bind(this)}>Login with Google account</button> {anonLogin}
</React.Fragment>;
let loggedIn = <React.Fragment><span style={{opacity:0.5}}>{this.props.store.authorizedName}</span>&nbsp;&nbsp;
let loggedIn = <React.Fragment><span className="auth-email">{this.props.store.authorizedName}</span>&nbsp;&nbsp;
<button onClick={this.logout.bind(this)}>Log out</button></React.Fragment>
let link = this.props.store.authorizedName ? loggedIn : notLoggedIn;
return <span>{link}</span>;
Expand Down
2 changes: 1 addition & 1 deletion src/components/FlexiTableCell.react.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ render () { let _:FlexiTableCellReact<P> = this;
} else {
let outTypeof = typeof out;

if (outTypeof == 'string' && /<[a-z][\s\S]*>/i.test(out)) addViewAsHTML = <React.Fragment><a
if (outTypeof == 'string' && /<[a-z][\s\S]*>/i.test(out)) addViewAsHTML = <React.Fragment>&nbsp;<a
href={ this.linkToCell()} className="viewContent" onClick={this.onClickViewContent.bind(this, this.linkToCell())}
>view&nbsp;as&nbsp;html&nbsp;<i className="material-icons" style={{fontSize: '14px'}}>open_in_new</i>
</a></React.Fragment>;
Expand Down