Skip to content

Use LoginMenu from multinet-components #255

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
JackWilb merged 4 commits into from
Sep 23, 2022
Merged

Use LoginMenu from multinet-components #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec26384
Use login menu from multinet-components
JackWilb Aug 26, 2022
e6d1b52
Fix some missing icons and passthrough the store to the template
JackWilb Aug 26, 2022
80eea7a
Use mdi-icons the same way we do in the other client applications
JackWilb Aug 26, 2022
f94a914
Merge branch 'main' into use-multinet-components-login-page
JackWilb Sep 23, 2022
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"dayjs": "^1.9.1",
"direct-vuex": "^0.10.4",
"lodash": "^4.17.21",
"material-design-icons-iconfont": "^5.0.1",
"multinet": "0.21.7",
"multinet-components": "^0.0.1",
"papaparse": "^5.3.0",
"vue": "^2.7.0",
"vue-gtag": "^1.2.1",
Expand Down
1 change: 1 addition & 0 deletions public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@mdi/font@latest/css/materialdesignicons.min.css">
<title>MultiNet – Visualizing Networks with Attributes</title>
</head>
<body>
Expand Down
2 changes: 2 additions & 0 deletions src/App.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ import { defineComponent } from 'vue';
import Sidebar from '@/components/Sidebar.vue';
import apps from '@/assets/appregistry.json';

import 'multinet-components/dist/style.css';

export default defineComponent({
name: 'App',

Expand Down
2 changes: 1 addition & 1 deletion src/components/AboutDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
v-on="on"
>
<v-icon size="18">
help
mdi-help-circle
</v-icon>
</v-btn>
</template>
Expand Down
2 changes: 1 addition & 1 deletion src/components/DeleteNetworkDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
color="red accent-3"
size="20px"
>
delete_sweep
mdi-delete-sweep
</v-icon>
</v-btn>
</v-scroll-x-transition>
Expand Down
2 changes: 1 addition & 1 deletion src/components/DeleteTableDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
color="red accent-3"
size="20px"
>
delete_sweep
mdi-delete-sweep
</v-icon>
</v-btn>
</v-scroll-x-transition>
Expand Down
2 changes: 1 addition & 1 deletion src/components/DeleteWorkspaceDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<v-icon
right
>
delete_sweep
mdi-delete-sweep
</v-icon>
</v-btn>
</v-fade-transition>
Expand Down
4 changes: 2 additions & 2 deletions src/components/DownloadDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
color="primary"
size="20px"
>
save_alt
mdi-tray-arrow-down
</v-icon>
</v-btn>
</v-scroll-x-transition>
Expand Down Expand Up @@ -51,7 +51,7 @@
color="green accent-4"
size="18"
>
check
mdi-check
</v-icon>
</v-list-item-icon>
{{ item }}
Expand Down
164 changes: 0 additions & 164 deletions src/components/LoginMenu.vue
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions src/components/NetworkDialog.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
v-on="on"
>
<v-icon dark>
library_add
mdi-plus-box-multiple
</v-icon>
</v-btn>
</template>
Expand All @@ -37,7 +37,7 @@
v-on="on"
>
<v-icon dark>
add_circle
mdi-plus-circle
</v-icon>
</v-btn>
</template>
Expand Down
14 changes: 7 additions & 7 deletions src/components/NetworkMultiCSVUploadForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<v-card>
<v-card-title>Create from Existing Tables</v-card-title>
<v-card-subtitle>
Link edge tables with node tables by clicking the <v-icon>link</v-icon> icon on
Link edge tables with node tables by clicking the <v-icon>mdi-link</v-icon> icon on
the desired edge table, and selecting the node table column that you'd like to link it to.
</v-card-subtitle>
<v-progress-linear
Expand Down Expand Up @@ -124,15 +124,15 @@
dark
@click="excludedMap[sample.table.name][col] = true"
>
check_box
mdi-checkbox-marked
</v-icon>
<v-icon
v-else
dark
:disabled="checkboxDisabled(sample.table, col)"
@click="excludedMap[sample.table.name][col] = false"
>
check_box_outline_blank
mdi-checkbox-blank-outline
</v-icon>

<!-- Column name -->
Expand All @@ -151,7 +151,7 @@
:class="{'disable-events': linkDisabled(sample.table)}"
v-on="on"
>
link
mdi-link
</v-icon>
</template>
<v-card max-height="30vh">
Expand Down Expand Up @@ -200,7 +200,7 @@
right
@click.stop="removeColumnLink(sample.table, col)"
>
<v-icon>close</v-icon>
<v-icon>mdi-close</v-icon>
</v-btn>
</v-list-item>
</template>
Expand Down Expand Up @@ -230,7 +230,7 @@
dark
v-on="on"
>
call_merge
mdi-call-merge
</v-icon>
</template>
<v-card max-height="30vh">
Expand All @@ -256,7 +256,7 @@
right
@click.stop="removeColumnLink(sample.table, col, true)"
>
<v-icon>close</v-icon>
<v-icon>mdi-close</v-icon>
</v-btn>
</v-list-item>
</template>
Expand Down
4 changes: 2 additions & 2 deletions src/components/NetworkPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
class="ws-detail-empty-list"
>
<v-icon color="blue lighten-1">
info
mdi-information
</v-icon> There's nothing here yet...
</div>

Expand All @@ -70,7 +70,7 @@
v-if="!hover && !checkbox[item.name]"
class="item-icon"
>
timeline
mdi-chart-timeline-variant
</v-icon>

<v-checkbox
Expand Down
2 changes: 1 addition & 1 deletion src/components/NetworkUploadForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
label="Select network file"
outlined
prepend-icon=""
prepend-inner-icon="attach_file"
prepend-inner-icon="mdi-paperclip"
single-line
@change="handleFileInput"
/>
Expand Down
Loading