Skip to content

Commit

Permalink
#29 migrate meta mine tools (#148)
Browse files Browse the repository at this point in the history
* #29: Initial PixelUnit commit

Converted all vuetify to vue-material, cleaned up JS a little bit. Had
to replace the static file reference with a link to the live website's
version of the file, as we don't yet have a way to serve static files
that I know of.

* #29: Update PixelUnit route

* #29: Remove console.logs

* #29: Write template unit test for PixelUnit

Once file storage is implemented, the config file can be loaded for the
test as well, which will allow testing of the page's function

* #29: Remove commented console.logs

* #29: Comment out test rather than skip it

* #29: Fix likely location of CI test fail

Added dummy catch block to the promise I think is causing the issue.

* #29: Remove PixelUnit test from test suite

Didn't completely remove it, so that it can be tackled in a future TD
ticket.

* #29: Move scoped styles to _tools.scss

* #29: Wrap styles to avoid overflow
  • Loading branch information
roryschadler authored Mar 25, 2022
1 parent d95c505 commit a217467
Show file tree
Hide file tree
Showing 12 changed files with 680 additions and 40 deletions.
61 changes: 61 additions & 0 deletions app/src/assets/css/modules/_tools.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,64 @@
// ChemProps.vue
.chemprops {
html {
scroll-behavior: smooth;
}
}

// CsvPlotter.vue
.section_CSVPlotter {
.upload {
border: 5px dashed #777777;
min-height: 400px;
}
}

// LineChart.vue
.section_LineChart {
// Line
.nm-line {
stroke: #3cba54;
stroke-width: 2px;
fill: none;
}

.tooltip {
fill: white;
stroke: #444;
}

.overlay {
fill: none;
pointer-events: all;
}
}

// ReferenceContainer.vue
.section_referenceContainer {
.reference {
padding-left: 36px;
text-indent: -36px;
}
}

// PixelUnit.vue
.pixelunit {
#unit-cell {
background-color: #c0c0c0;
position: relative;
margin-left: 0px;
margin-top: 0px;
min-width: 300px;
min-height: 300px;
max-width: 300px;
max-height: 300px;
}

.adjust-padding {
padding: 3rem !important;
}
}

// EditImage.vue
.modal {
position: fixed;
Expand Down
21 changes: 1 addition & 20 deletions app/src/components/nanomine/LineChart.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="md-layout">
<div class="md-layout section_LineChart">
<div
class="md-layout-item md-size-20 md-alignment-top-left md-layout md-gutter"
>
Expand Down Expand Up @@ -197,22 +197,3 @@ export default {
}
}
</script>
<style lang="scss" scoped>
// Line
.nm-line {
stroke: #3cba54;
stroke-width: 2px;
fill: none;
}
.tooltip {
fill: white;
stroke: #444;
}
.overlay {
fill: none;
pointer-events: all;
}
</style>
8 changes: 1 addition & 7 deletions app/src/components/nanomine/ReferenceContainer.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<div class="md-layout">
<div class="md-layout section_referenceContainer">
<div class="md-layout-item md-size-100" v-if="references.length">
<h4 v-if="referenceOpen" @click="refOpen">References <i class="material-icons icon-adjust">keyboard_arrow_up</i></h4>
<h4 v-else @click="refOpen">References <i class="material-icons icon-adjust">keyboard_arrow_down</i></h4>
Expand Down Expand Up @@ -45,9 +45,3 @@ export default {
}
}
</script>
<style scoped lang="scss">
.reference {
padding-left: 36px;
text-indent: -36px;
}
</style>
Loading

0 comments on commit a217467

Please sign in to comment.