Skip to content
This repository has been archived by the owner on Feb 9, 2022. It is now read-only.

Commit

Permalink
Moved all vendor files locally.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggirelli
ggirelli committed Jun 7, 2019
1 parent 2a9fc76 commit 133dd3f
Show file tree
Hide file tree
Showing 31 changed files with 39,453 additions and 25 deletions.
1 change: 1 addition & 0 deletions spectrascope-app/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
}
},
"dependencies": {
"d3": "^5.9.2",
"electron-squirrel-startup": "^1.0.0",
"jquery": "^3.4.1"
},
Expand Down
0 ...cope-app/src/css/bootstrap.v4.3.1.min.css → ...p/src/css/vendor/bootstrap.v4.3.1.min.css
View file
File renamed without changes.
0 .../src/css/bootstrap4-toggle.v3.4.0.min.css → ...s/vendor/bootstrap4-toggle.v3.4.0.min.css
View file
File renamed without changes.
0 ...s/fonts/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2 → ...r/fonts/KFOlCnqEu92Fr1MmSU5fABc4EsA.woff2
View file
File renamed without changes.
0 .../css/fonts/KFOlCnqEu92Fr1MmSU5fBBc4.woff2 → ...ndor/fonts/KFOlCnqEu92Fr1MmSU5fBBc4.woff2
View file
File renamed without changes.
0 ...s/fonts/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2 → ...r/fonts/KFOlCnqEu92Fr1MmSU5fBxc4EsA.woff2
View file
File renamed without changes.
0 ...s/fonts/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2 → ...r/fonts/KFOlCnqEu92Fr1MmSU5fCBc4EsA.woff2
View file
File renamed without changes.
0 ...s/fonts/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2 → ...r/fonts/KFOlCnqEu92Fr1MmSU5fCRc4EsA.woff2
View file
File renamed without changes.
0 ...s/fonts/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2 → ...r/fonts/KFOlCnqEu92Fr1MmSU5fChc4EsA.woff2
View file
File renamed without changes.
0 ...s/fonts/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2 → ...r/fonts/KFOlCnqEu92Fr1MmSU5fCxc4EsA.woff2
View file
File renamed without changes.
0 .../fonts/ZgNWjP5GM7bCUdmXgWyVvG3OMrCO.woff2 → .../fonts/ZgNWjP5GM7bCUdmXgWyVvG3OMrCO.woff2
View file
File renamed without changes.
0 ...ss/fonts/ZgNWjP5GM7bCUdmXgWyVvGLOMg.woff2 → ...or/fonts/ZgNWjP5GM7bCUdmXgWyVvGLOMg.woff2
View file
File renamed without changes.
0 .../fonts/ZgNWjP5GM7bCUdmXgWyVvGzOMrCO.woff2 → .../fonts/ZgNWjP5GM7bCUdmXgWyVvGzOMrCO.woff2
View file
File renamed without changes.
0 .../fonts/ZgNWjP5GM7bCUdmXgWyVvHnOMrCO.woff2 → .../fonts/ZgNWjP5GM7bCUdmXgWyVvHnOMrCO.woff2
View file
File renamed without changes.
0 spectrascope-app/src/css/google-fonts.css → ...scope-app/src/css/vendor/google-fonts.css
View file
File renamed without changes.
16 changes: 8 additions & 8 deletions spectrascope-app/src/index-model.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<html>
<head>
<script>window.$ = window.jQuery = require('jquery');</script>
<link rel="stylesheet" href="./css/bootstrap.v4.3.1.min.css" rel="stylesheet" />
<script src="./js/popper.v1.14.7.min.js"></script>
<script src="./js/bootstrap.v4.3.1.min.js"></script>
<link href="./css/bootstrap4-toggle.v3.4.0.min.css" rel="stylesheet" />
<script src="./js/bootstrap4-toggle.v3.4.0.min.js"></script>
<script defer src="./js/fontawesome.v5.8.2.js"></script>
<script src="./js/d3.v5.min.js"></script>
<link href="./css/google-fonts.css" rel="stylesheet" />
<link rel="stylesheet" href="./css/vendor/bootstrap.v4.3.1.min.css" rel="stylesheet" />
<script src="./js/vendor/popper.v1.14.7.min.js"></script>
<script src="./js/vendor/bootstrap.v4.3.1.min.js"></script>
<link href="./css/vendor/bootstrap4-toggle.v3.4.0.min.css" rel="stylesheet" />
<script src="./js/vendor/bootstrap4-toggle.v3.4.0.min.js"></script>
<script defer src="./js/vendor/fontawesome.v5.8.2.js"></script>
<script src="./js/vendor/d3.v5.min.js"></script>
<link href="./css/vendor/google-fonts.css" rel="stylesheet" />
<link href="./css/main.css" rel="stylesheet">
<script src="./js/get_color.js"></script>
<script src="./js/model.js"></script>
Expand Down
20 changes: 10 additions & 10 deletions spectrascope-app/src/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html>
<head>
<script>window.$ = window.jQuery = require('jquery');</script>
<link rel="stylesheet" href="./css/bootstrap.v4.3.1.min.css" rel="stylesheet" />
<script src="./js/popper.v1.14.7.min.js"></script>
<script src="./js/bootstrap.v4.3.1.min.js"></script>
<script defer src="./js/fontawesome.v5.8.2.js"></script>
<script src="./js/d3.v5.min.js"></script>
<link href="./css/google-fonts.css" rel="stylesheet" />
<meta http-equiv="Content-Security-Policy" content="default-src 'self' 'unsafe-eval'; style-src 'self' 'unsafe-inline'" />
<script src="./js/startup.js"></script>
<link rel="stylesheet" href="./css/vendor/bootstrap.v4.3.1.min.css" rel="stylesheet" />
<script src="./js/vendor/popper.v1.14.7.min.js"></script>
<script src="./js/vendor/bootstrap.v4.3.1.min.js"></script>
<script defer src="./js/vendor/fontawesome.v5.8.2.js"></script>
<link href="./css/vendor/google-fonts.css" rel="stylesheet" />
<link href="./css/main.css" rel="stylesheet">
<script src="./js/get_color.js"></script>
<script src="./js/home.js"></script>
Expand All @@ -20,7 +20,7 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas

<ul class="nav justify-content-end">
<li class="nav-item"><a class="nav-link disabled" href=""><i class="fas fa-home"></i> Home</a></li>
<li class="nav-item"><a class="nav-link" href="./index-model.html"><i class="fas fa-wave-square"></i> Model</a></li>
<!--<li class="nav-item"><a class="nav-link" href="./index-model.html"><i class="fas fa-wave-square"></i> Model</a></li>-->
<li class="nav-item"><a class="nav-link" href="#"><i class="fas fa-cog"></i> Settings</a></li>
</ul>
</header>
Expand Down Expand Up @@ -54,7 +54,7 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas

<div id="sidebar-left" class="col-12 col-lg-6 mb-4">
<div class="card">
<div class="card-header"><i class="fas fa-greater-than"></i> Input <small style="float: right;"><a href="#" id="expand-all"><i class="far fa-plus-square"></i> expand all</a></small></div>
<div class="card-header"><i class="fas fa-greater-than"></i> Input <small class="float-right"><a href="#" id="expand-all"><i class="far fa-plus-square"></i> expand all</a></small></div>
<div class="card-body">

<div class="accordion" id="accordion-settings">
Expand Down Expand Up @@ -116,7 +116,7 @@ <h1 class="text-center"><i class="fas fa-ghost"></i> SpectraScope <i class="fas

<div id="sidebar-right" class="col-12 col-lg-6 mb-4">
<div class="card">
<div class="card-header text-right"><small style="float: left;"><a href="#" id="collapse-all"><i class="far fa-minus-square"></i> collapse all</a></small> Selected <i class="far fa-hand-pointer"></i></div>
<div class="card-header text-right"><small class="float-left"><a href="#" id="collapse-all"><i class="far fa-minus-square"></i> collapse all</a></small> Selected <i class="far fa-hand-pointer"></i></div>
<div class="card-body">

<div class="accordion" id="accordion-selection">
Expand Down
14 changes: 7 additions & 7 deletions spectrascope-app/src/js/home.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ var plotSpectrum = function(data1, name, color, dashed = false) {
}

var plotFluorophore = function(name, color) {
d3.tsv("data/fluorophore-spectra/"+name+"_ex.tsv").then(function(data1) {
d3.tsv("./data/fluorophore-spectra/"+name+"_ex.tsv").then(function(data1) {
plotSpectrum(data1, name+"_ex", color, true)
});
d3.tsv("data/fluorophore-spectra/"+name+"_em.tsv").then(function(data1) {
d3.tsv("./data/fluorophore-spectra/"+name+"_em.tsv").then(function(data1) {
plotSpectrum(data1, name+"_em", color)
});
}

var initFluorophoreList = function() {
return(d3.tsv("data/fluorophores.tsv").then(function(data) {
return(d3.tsv("./data/fluorophores.tsv").then(function(data) {
var listAddWrap = $("#fluorophores .option-list.settings");
listAddWrap.children().remove();
var listRmWrap = $("#fluorophores .option-list.selection");
Expand Down Expand Up @@ -154,13 +154,13 @@ var plotFilterSpectrum = function(data1, name, color) {
}

var plotFilter = function(name, color) {
d3.tsv("data/filter-spectra/"+name+".tsv").then(function(data1) {
d3.tsv("./data/filter-spectra/"+name+".tsv").then(function(data1) {
plotFilterSpectrum(data1, name, color);
});
}

var initFilterList = function(ftype) {
return(d3.tsv("data/filters.tsv").then(function(data) {
return(d3.tsv("./data/filters.tsv").then(function(data) {
var listAddWrap = $("#"+ftype+"-filters .option-list.settings");
listAddWrap.children().remove();
var listRmWrap = $("#"+ftype+"-filters .option-list.selection");
Expand Down Expand Up @@ -259,13 +259,13 @@ var plotSourceSpectrum = function(data1, name, color) {
}

var plotSource = function(name, color) {
d3.tsv("data/source-spectra/"+name+".tsv").then(function(data1) {
d3.tsv("./data/source-spectra/"+name+".tsv").then(function(data1) {
plotSourceSpectrum(data1, name, color);
});
}

var initSourceList = function() {
return(d3.tsv("data/sources.tsv").then(function(data) {
return(d3.tsv("./data/sources.tsv").then(function(data) {
var listAddWrap = $("#sources .option-list.settings");
listAddWrap.children().remove();
var listRmWrap = $("#sources .option-list.selection");
Expand Down
2 changes: 2 additions & 0 deletions spectrascope-app/src/js/startup.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
window.$ = window.jQuery = require('jquery');
window.d3 = require('d3');
0 ...ascope-app/src/js/bootstrap.v4.3.1.min.js → ...app/src/js/vendor/bootstrap.v4.3.1.min.js
View file
File renamed without changes.
0 ...pp/src/js/bootstrap4-toggle.v3.4.0.min.js → ...js/vendor/bootstrap4-toggle.v3.4.0.min.js
View file
File renamed without changes.
Loading

0 comments on commit 133dd3f

Please sign in to comment.