Skip to content

remove html-minify-loader // take 2 #7972

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Oct 21, 2024
Merged

remove html-minify-loader // take 2 #7972

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
37cb976
static/webpack/npm: get rid of html-minify-loader
haraldschilly Oct 16, 2024
d90b2ee
frontend/static: hardcoding all html template files, deleting all (un…
haraldschilly Oct 21, 2024
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
6 changes: 0 additions & 6 deletions src/packages/frontend/account.html
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions src/packages/frontend/console.html
View file
Open in desktop

This file was deleted.

270 changes: 266 additions & 4 deletions src/packages/frontend/editor.html → src/packages/frontend/editor-templates.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,102 @@
<!--
This file is part of CoCalc: Copyright © 2020 Sagemath, Inc.
License: MS-RSL – see LICENSE.md for details
-->
/*
* This file is part of CoCalc: Copyright © 2024 Sagemath, Inc.
* License: MS-RSL – see LICENSE.md for details
*/

const console = `
<div id="webapp-console-templates" class="hide">
<div class="webapp-console smc-vfill webapp-console-blur">

<!-- The bar across the top -->
<!-- increase font, decrease font, refresh, paste spot, then title ... font indicator-->
<div class="webapp-console-topbar">
<div class="smc-users-viewing-document webapp-editor-chat-title">
<!--to be filled with react component for users viewing the document-->
</div>

&nbsp;&nbsp;

<div class="pull-left">
<span class="btn-group visible-xs">
<a href="#decrease-font" class="btn btn-default"><i class="fa fa-font" style="font-size:8pt"> </i> </a>
<a href="#increase-font" class="btn btn-default"><i class="fa fa-font" style="font-size:13pt"> </i></a>
<a href="#refresh" class='btn btn-default'><i class="fa fa-repeat" style="font-size:14pt"> </i></a>
</span>

<span class="hidden-xs">
<span class="btn-group">
<a href="#decrease-font" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Smaller"><i class="fa fa-font" style="font-size:7pt"> </i> </a>
<a href="#increase-font" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Bigger"><i class="fa fa-font" style="font-size:10pt"> </i> </a>
<a href="#refresh" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Reconnect"><i class="fa fa-repeat"> </i> </a>
<a href="#pause" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Pause"><i class="fa fa-pause"> </i> </a>
<a href="#paste" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="History"><i class="fa fa-paste"> </i> </a>
<a href="#initfile" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Init file"><i class="fa fa-rocket"> </i> </a>
<a href="#boot" class="btn btn-default btn-sm" data-toggle="tooltip" data-placement="right" title="Boot others"><i class="fa fa-sign-out-alt"> </i> </a>

</span>
&nbsp;&nbsp;
<span>
<span class="webapp-console-font-indicator hide"><i class="fa fa-font"> </i>
<span class="webapp-console-font-indicator-size"></span>pt
<a class="btn btn-success btn-sm" href="#font-make-default">make default</a>
</span>
</span>
</span>
</div>

<div class="webapp-console-title pull-left"></div>
&nbsp;&nbsp;
<div class="pull-right webapp-burst-indicator hide" style="background: red;color: white; padding: 5px 15px;
font-weight: bold;">
WARNING: Large burst of output! (May try to interrupt.)
</div>

<div class="webapp-console-mobile-input">

<input class="webapp-console-input-line form-control" type="text" style="width:98%" placeholder="Type input or paste here...">
<span class="btn-group">
<a class="btn webapp-console-submit-esc btn-default">esc</a>
<a class="btn webapp-console-submit-line btn-default">return</a>
<a class="btn webapp-console-submit-submit btn-default">submit</a>
<a class="btn webapp-console-submit-ctrl-b btn-default">ctrl-b</a>
<a class="btn webapp-console-submit-ctrl-c btn-default">ctrl-c</a>
<a class="btn webapp-console-submit-tab btn-default">tab</a>
<a class="btn webapp-console-submit-up btn-default"><i class="fa fa-arrow-up"></i></a>
<a class="btn webapp-console-submit-down btn-default"><i class="fa fa-arrow-down"></i></a>
<a class="btn webapp-console-submit-left btn-default"><i class="fa fa-arrow-left"></i></a>
<a class="btn webapp-console-submit-right btn-default"><i class="fa fa-arrow-right"></i></a>
</span>
</div>

<textarea class="webapp-console-textarea"></textarea>
<!--
<a class="btn btn-info webapp-console-esc hide">esc</a>
<a class="btn btn-info webapp-console-tab hide">tab</a>
<a class="btn btn-info webapp-console-control hide">control</a>
<a class="btn webapp-console-up"><i class="fa fa-arrow-up"></i></a>
<a class="btn webapp-console-down"><i class="fa fa-arrow-down"></i></a>
-->
</div>

<!-- The actual terminal -->
<!-- I tried autocomplete="false" in the textarea, but this is not valid HTML, and I think didn't work anyways.
Jason Grout suggests: autocapitalize="off" autocorrect="off" autocomplete="off"
-->
<div class="smc-vfill" style="position:relative">
<textarea class="webapp-console-for-mobile hide"></textarea>
<div style="flex:1; display:flex; overflow:hidden" class="webapp-console-terminal-container">
<div style="flex:1; position:relative">
<div class="smc-vfill webapp-console-terminal"></div>
</div>
<div class="webapp-console-scrollbar"></div>
</div>
</div>
</div>
</div>

`;

const editor = `
<div id="webapp-editor-templates" class="hide">
<!-- Template for the entire editor, both tabs and the actual content -->
<div class="webapp-editor">
Expand Down Expand Up @@ -1555,3 +1649,171 @@ <h3><i class="fa fa-bolt"> </i> Goto Line</h3>
</div>
</div>
</div>

`;

const sagews_interact = `
<div class="webapp-interact-templates hide">

<!-- Interact -->
<div class="webapp-interact-container container-fluid">
</div>

<!-- Interact: input-box -->
<div class="webapp-interact-control-input-box">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right"></span>
</div>
<div class="col-sm-8">
<input type="text" class="hide webapp-interact-input-box-font form-control">
<textarea class="hide webapp-interact-input-box-font" spellcheck="false"></textarea>
<span class="webapp-interact-control-input-box-submit-button hide">
<a class="btn btn-default">Submit</a>
<br><br>
</span>
</div>
</div>
</div>


<!-- Interact: checkbox -->
<div class="webapp-interact-control-checkbox">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right" style=" padding-top: 2px;"></span>
</div>
<div class="col-sm-8">
<input type="checkbox">
</div>
</div>
</div>

<!-- Interact: selector -->
<div class="webapp-interact-control-selector">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right"></span>
</div>
<div class="col-sm-8">
<div class="webapp-interact-control-content"></div>
</div>
</div>
</div>

<!-- Interact: button -->
<div class="webapp-interact-control-button">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right"></span>
</div>
<div class="col-sm-8">
<a class="btn btn-default"><i class="fa">&nbsp;&nbsp;</i> <span></span></a>
</div>
</div>
</div>

<!-- Interact: text -->
<div class="webapp-interact-control-text">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right"></span>
</div>
<div class="col-sm-8">
<span class="webapp-interact-control-content"></span>
</div>
</div>
</div>

<!-- Interact: color-selector -->
<div class="webapp-interact-control-color-selector">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right"></span>
</div>
<div class="col-sm-8">
<div class="input-group color" data-color-format="rgb">
<input type="text" value="" style="font-family:monospace" class="form-control">
<span class="input-group-addon"><i class="fa" style="height: 16px; width: 16px"></i></span>
</div>
</div>
</div>
</div>

<!-- Interact: slider -->
<div class="webapp-interact-control-slider">
<div class=" webapp-interact-control-content">
<div class="row">
<div class="col-sm-4">
<div class="webapp-interact-label pull-right"></div>
</div>
<div class="pull-left col-sm-6">
<div class="webapp-interact-control-slider"></div>
</div>
<div class="col-sm-2">
<div class="webapp-interact-control-value"></div>
</div>
</div>
</div>
</div>


<!-- Interact: range-slider -->
<div class="webapp-interact-control-range-slider">
<div class="webapp-interact-control-content">
<div class="row">
<div class="col-sm-4">
<div class="webapp-interact-label pull-right"></div>
</div>
<div class="pull-left col-sm-6">
<div class="webapp-interact-control-slider"></div>
</div>
<div class="col-sm-2">
<div class="webapp-interact-control-value"></div>
</div>
</div>
</div>
</div>

<!-- Interact: input_grid -->
<div class="webapp-interact-control-input-grid">
<div class="row">
<div class="col-sm-4">
<span class="webapp-interact-label pull-right"></span>
</div>
<div class="col-sm-8">
<span class="webapp-interact-control-grid well"></span>
<a class="btn btn-success btn-sm"><i class="fa fa-check"> </i><span></span></a>
</div>
</div>
</div>

</div>
`;

const sagews_3d = `
<div class="webapp-3d-templates hide">
<span class="webapp-3d-loading">
<i class="fa fa-cube fa-spin" style="font-size:16pt"></i>
Loading 3D scene...
</span>
<span class="webapp-3d-viewer">
<span class="webapp-3d-note hide">
Evaluate to see 3d plot.
</span>
<span class="webapp-3d-canvas">
</span>
<span class="webapp-3d-canvas-warning lighten hide" style="margin-top: -1em" data-toggle="tooltip" data-placement="top" title="WARNING: using slow non-WebGL canvas renderer">canvas</span>
</span>
</div>
`;

const sagews_d3 = `
<div class="webapp-d3-templates hide">
<span class="webapp-d3-graph-viewer">
</span>
</div>
`;

export const TEMPLATES_HTML =
console + editor + sagews_interact + sagews_3d + sagews_d3;
10 changes: 3 additions & 7 deletions src/packages/frontend/editor.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,9 @@ $ = window.$

# Do this first, before any templates are initialized (e.g., elsewhere too).

templates_html = \
require("./console.html").default +
require("./editor.html").default +
require("./sagews/interact.html").default +
require("./sagews/3d.html").default +
require("./sagews/d3.html").default;
$("body").append(templates_html);
{TEMPLATES_HTML} = require("./editor-templates")

$("body").append(TEMPLATES_HTML);

templates = $("#webapp-editor-templates")

Expand Down
Loading