Skip to content

Commit 2720f0c

Browse files
committed
Remove node-scss, add recommender overlay
Signed-off-by: Jay Wang <[email protected]>
1 parent b38af49 commit 2720f0c

21 files changed

+50
-39
lines changed

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@
2727
"dependencies": {
2828
"as-console": "^5.0.3",
2929
"d3": "^6.7.0",
30-
"node-sass": "^6.0.0",
3130
"sass": "^1.32.13",
3231
"sirv-cli": "^1.0.0",
33-
"svelte-preprocess": "^4.7.3"
32+
"svelte-preprocess": "^5.0.4"
3433
}
3534
}

src/App.svelte

+13-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.9.1/css/bulma.min.css"
33
integrity="sha512-ZRv40llEogRmoWgZwnsqke3HNzJ0kiI0+pcMgiz2bxO6Ew1DVBtWjVn0qjrXdT3+u+pSN36gLgmJiiQ3cQtyzA=="
44
crossorigin="anonymous" />
5+
6+
<script
7+
type="module"
8+
src="https://unpkg.com/recommender-overlay/dist/recommender-overlay.es.js"
9+
></script>
510
</svelte:head>
611

712
<script>
@@ -10,7 +15,7 @@
1015
// import Article from './ArticleAnon.svelte';
1116
</script>
1217

13-
<style type='text/scss'>
18+
<style lang='scss'>
1419
.stand-alone-page {
1520
color: #333;
1621
box-sizing: border-box;
@@ -30,5 +35,12 @@
3035

3136
<div class='stand-alone-page'>
3237
<!-- <Main /> -->
38+
<recommender-overlay
39+
my-brand="GAM Changer"
40+
recommended-brands="GAM Coach, WebSHAP, TimberTrek, StickyLand"
41+
position-left="20"
42+
display-delay="30000"
43+
homepage-url=""
44+
/>
3345
<Article />
3446
</div>

src/Article.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
125125
</script>
126126

127-
<style type='text/scss'>
127+
<style lang='scss'>
128128
129129
@import 'define';
130130
@import 'article';

src/ArticleAnon.svelte

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,11 +131,11 @@
131131
132132
</script>
133133

134-
<style type='text/scss'>
134+
<style lang='scss'>
135135
136136
@import 'define';
137137
@import 'article';
138-
138+
139139
.page {
140140
display: flex;
141141
flex-direction: column;
@@ -649,7 +649,7 @@
649649
<div class='footer-main'>
650650
Thanks for reviewing GAM Changer!
651651
</div>
652-
652+
653653
</div>
654654

655655
</div>

src/GAM.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -671,7 +671,7 @@
671671
672672
</script>
673673

674-
<style type='text/scss'>
674+
<style lang='scss'>
675675
676676
@import 'define';
677677

src/Header.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script>
22
</script>
33

4-
<style type='text/scss'>
4+
<style lang='scss'>
55
@import 'define';
66
77
#header {

src/Main.svelte

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
1313
</script>
1414

15-
<style type='text/scss'>
15+
<style lang='scss'>
1616
1717
@import 'define';
18-
18+
1919
.main-standalone {
2020
display: flex;
2121
flex-direction: column;
@@ -56,6 +56,6 @@
5656
<GAM />
5757

5858
</div>
59-
59+
6060

6161
</div>

src/NotebookWidget.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ onMount(() => {
6868
6969
</script>
7070

71-
<style type='text/scss'>
71+
<style lang='scss'>
7272
@import 'define';
7373
7474
.stand-alone-page {
@@ -173,7 +173,7 @@ onMount(() => {
173173
<div class='stand-alone-page' bind:this={component}>
174174
<div class='page'>
175175
<Tooltip bind:this={tooltip}/>
176-
176+
177177
<div class='gam-changer'>
178178
<div class='widget-wrapper'>
179179
<div class='notebook-header'>

src/components/ContextMenu.svelte

+5-5
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@
264264
265265
componentSelect.select('.items')
266266
.style('overflow', 'visible');
267-
267+
268268
componentSelect.select(`.sub-item-${option}`)
269269
.classed('hidden', false);
270270
}, delay);
@@ -276,7 +276,7 @@
276276
277277
componentSelect.select('.items')
278278
.style('overflow', 'hidden');
279-
279+
280280
componentSelect.select(`.sub-item-${option}`)
281281
.classed('hidden', true);
282282
};
@@ -348,7 +348,7 @@
348348
349349
</script>
350350

351-
<style type='text/scss'>
351+
<style lang='scss'>
352352
@import '../define';
353353
354354
$secondary-color: hsl(0, 0%, 40%);
@@ -556,7 +556,7 @@
556556
557557
&.selected {
558558
border: 2px solid change-color($blue-reg, $lightness: 70%);
559-
559+
560560
.sub-item-child .svg-icon {
561561
color: $blue-reg;
562562
@@ -681,7 +681,7 @@
681681
on:mouseleave={mouseleaveHandler}
682682
>
683683
<div class='svg-icon icon-increasing'></div>
684-
684+
685685
<div class='sub-item sub-item-increasing hidden'>
686686
<!-- Check button -->
687687
<div class='item sub-item-child show-tooltip' on:click={subItemCheckClicked}

src/components/Dropzone.svelte

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
6666
const readJSON = (file) => {
6767
return new Promise((resolve, reject) => {
68-
let fr = new FileReader();
68+
let fr = new FileReader();
6969
fr.onload = () => {
7070
resolve(JSON.parse(fr.result));
7171
};
@@ -174,7 +174,7 @@
174174
175175
</script>
176176

177-
<style type='text/scss'>
177+
<style lang='scss'>
178178
179179
@import '../define';
180180
@@ -269,7 +269,7 @@
269269
{:else}
270270
<div class='svg-icon icon-two'></div>
271271
{/if}
272-
272+
273273
<div class='drop-message'>
274274
{#if dataType === 'modelData'}
275275
Drop a <u>model file</u> (.json) or a <u>GAM Changer document</u> (.gamchanger) here to start

src/components/ToggleSwitch.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
8686
</script>
8787

88-
<style type='text/scss'>
88+
<style lang='scss'>
8989
@import '../define';
9090
9191
$secondary-color: hsl(0, 0%, 40%);
@@ -111,7 +111,7 @@
111111
112112
.toggle {
113113
display: none;
114-
114+
115115
&:checked + .toggle-button .dot {
116116
left: 50%;
117117
}

src/global-explanation/CatFeature.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1381,7 +1381,7 @@
13811381
13821382
</script>
13831383

1384-
<style type='text/scss'>
1384+
<style lang='scss'>
13851385
@import '../define';
13861386
@import './common.scss';
13871387

src/global-explanation/ContFeature.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -1796,7 +1796,7 @@
17961796
17971797
</script>
17981798

1799-
<style type='text/scss'>
1799+
<style lang='scss'>
18001800
@import '../define';
18011801
@import './common.scss';
18021802

src/global-explanation/InterCatCatFeature.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -468,7 +468,7 @@
468468
469469
</script>
470470

471-
<style type='text/scss'>
471+
<style lang='scss'>
472472
@import '../define';
473473
@import './common.scss';
474474

src/global-explanation/InterContCatFeature.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@
510510
511511
</script>
512512

513-
<style type='text/scss'>
513+
<style lang='scss'>
514514
@import '../define';
515515
@import './common.scss';
516516

src/global-explanation/InterContContFeature.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@
366366
367367
</script>
368368

369-
<style type='text/scss'>
369+
<style lang='scss'>
370370
@import '../define';
371371
@import './common.scss';
372372

src/sidebar/ClassificationMetrics.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@
312312
313313
</script>
314314

315-
<style type='text/scss'>
315+
<style lang='scss'>
316316
317317
@import '../define';
318318

src/sidebar/Feature.svelte

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
$: curTabHeight = tabHeights[selectedTab];
1515
let featureInitialized = false;
1616
let waitingToDrawDIV = false;
17-
17+
1818
let height = 0;
1919
2020
const svgHeight = 40;
@@ -37,7 +37,7 @@
3737
let instance = d3.select(component)
3838
.select('.feature-list')
3939
.node();
40-
40+
4141
let scrollBarWidth = instance.offsetWidth - instance.clientWidth;
4242
4343
console.log(`effect tab: [${width}, ${height}, ${scrollBarWidth}]`);
@@ -129,7 +129,7 @@
129129
} else {
130130
sortedCatFeatures = tempSortedCatFeatures;
131131
}
132-
132+
133133
sidebarInfo.curGroup = '';
134134
sidebarStore.set(sidebarInfo);
135135
}
@@ -138,7 +138,7 @@
138138
139139
</script>
140140

141-
<style type='text/scss'>
141+
<style lang='scss'>
142142
143143
@import '../define';
144144

src/sidebar/History.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import { quadInOut, expoInOut, cubicInOut } from 'svelte/easing';
66
import { round, shuffle } from '../utils/utils';
77
import { bindInlineSVG } from '../utils/svg-icon-binding';
8-
8+
99
export let sidebarStore;
1010
export let historyStore;
1111
export let ebm;
@@ -202,7 +202,7 @@
202202
203203
</script>
204204

205-
<style type='text/scss'>
205+
<style lang='scss'>
206206
207207
@import '../define';
208208

src/sidebar/RegressionMetrics.svelte

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
33
</script>
44

5-
<style type='text/scss'>
5+
<style lang='scss'>
66
77
@import '../define';
88

src/sidebar/Sidebar.svelte

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
2626
</script>
2727

28-
<style type='text/scss'>
28+
<style lang='scss'>
2929
3030
@import '../define';
3131
@@ -170,7 +170,7 @@
170170
<div class='tab' class:hidden={sidebarInfo.selectedTab !== 'history'}>
171171
<History sidebarStore={sidebarStore} historyStore={historyStore} ebm={ebm}/>
172172
</div>
173-
173+
174174
</div>
175175

176176
</div>

0 commit comments

Comments
 (0)