Skip to content

Commit c1d2f02

Browse files
authored
Merge branch 'master' into fix_19.05.2020
2 parents 8ee3bc7 + 882c8ff commit c1d2f02

File tree

11 files changed

+42
-66
lines changed

11 files changed

+42
-66
lines changed

index.html

Lines changed: 29 additions & 54 deletions
Large diffs are not rendered by default.

logo.svg

Lines changed: 1 addition & 0 deletions
Loading

src/assets/providers/MPDS.png

-713 Bytes
Loading

src/components/JSON/Editor.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</script>
77

88
<script lang="ts">
9-
export let code: string = '';
9+
export let code: string = 'Paste Optimade JSON here';
1010
</script>
1111

1212
<style lang="scss" global>

src/config.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ export const providersUrl = 'https://providers.optimade.org/providers.json';
22
export const corsProxyUrl = 'https://cors.optimade.science';
33
export const supportedModulesUrl = 'https://optimade.science/supported-modules.json';
44
export const moduleGroups = {
5-
builtin: 'Built-in modules',
6-
local: 'Local modules',
5+
builtin: 'Built-in apps',
6+
local: 'Local apps',
77
};
88
export const lsProviderKey = 'optimade-providers';
99
export const lsModulesKey = 'optimade-modules';
10-
export const searchDelay = 1500;
10+
export const searchDelay = 1250;

src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<meta charset="utf-8" />
1313
<meta name="viewport"
1414
content="width=device-width,user-scalable=no,initial-scale=1.0,minimum-scale=1.0,maximum-scale=1.0" />
15-
<title>Aggregated Search for Materials</title>
15+
<title>Aggregated Optimade Materials Search</title>
1616
<link rel="icon" type="image/svg" href="/logo.svg" />
1717
</head>
1818

src/views/Header.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</div>
99
<nav slot="right">
1010
<Modal bind:open>
11-
<Button on:click={() => (open = true)} variant="primary">My modules</Button>
11+
<Button on:click={() => (open = true)} variant="primary">Optimade apps</Button>
1212
<div slot="content">
1313
<Result />
1414
</div>
@@ -31,5 +31,5 @@
3131

3232
<script lang="ts">
3333
let open = false;
34-
const steps = [{ label: 'Optimade JSON' }, { label: 'Optimade module' }];
34+
const steps = [{ label: 'Optimade JSON' }, { label: 'Optimade app' }];
3535
</script>

src/views/ModuleSelect/ModuleSelect.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{#await $modules then predefined}
2-
<Autocomplete {groupBy} {predefined} bind:selected creatable placeholder="Select module or enter module URL" empty="No modules added" />
2+
<Autocomplete {groupBy} {predefined} bind:selected creatable placeholder="Select app or enter app URL" empty="No apps added" />
33
{/await}
44

55
<script lang="ts" context="module">

src/views/Providers.svelte

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{#each items as item}
77
<Col col={$media.sm ? '' : 1}>
88
<Popover side="bottom">
9-
<label class="text-center">
9+
<label class="text-center mb-2">
1010
<input
1111
name="providers"
1212
id={item.id}

src/views/Result.svelte

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<br />
1919
<Hero size="sm" bg={$darkTheme ? 'dark' : 'gray'}>
2020
<div class="module">
21-
<iframe name="visualisationFrame" bind:this={iframe} src={module} title="Module window" />
21+
<iframe name="visualisationFrame" bind:this={iframe} src={module} title="App window" />
2222
</div>
2323
</Hero>
2424
</Col>
@@ -34,7 +34,7 @@
3434
3535
import { media } from '@/stores/media';
3636
37-
const steps = [{ label: 'Optimade JSON' }, { label: 'Optimade module' }];
37+
const steps = [{ label: 'Optimade JSON' }, { label: 'Optimade app' }];
3838
</script>
3939

4040
<script lang="ts">

0 commit comments

Comments
 (0)