Skip to content
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

Jump to bottom

Use LoginMenu from multinet-components #326

Merged
merged 1 commit into from
Aug 26, 2022
Merged

Use LoginMenu from multinet-components #326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ dist/

# General config
.env

yarn-error.log
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"d3-selection": "^2.0.0",
"direct-vuex": "^0.12.0",
"eslint-plugin-vuetify": "^1.0.0-beta.7",
"multinet-components": "^0.0.1",
"multinet": "^0.21.4",
"vue": "^2.7.0",
"vuetify": "^2.1.0",
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 @@ -7,6 +7,8 @@ import ControlPanel from '@/components/ControlPanel.vue';
import MultiLink from '@/components/MultiLink.vue';
import ProvVis from '@/components/ProvVis.vue';

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

const urlVars = getUrlVars(); // Takes workspace and network
store.dispatch.fetchNetwork({
workspaceName: urlVars.workspace,
Expand Down
11 changes: 9 additions & 2 deletions src/components/ControlPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
<script setup lang="ts">
import LegendPanel from '@/components/LegendPanel.vue';
import AboutDialog from '@/components/AboutDialog.vue';
import LoginMenu from '@/components/LoginMenu.vue';
import { LoginMenu } from 'multinet-components';

import store from '@/store';
import { internalFieldNames } from '@/types';
import oauthClient from '@/oauth';
import { computed, Ref, ref } from 'vue';

const searchTerm = ref('');
Expand Down Expand Up @@ -157,6 +158,8 @@ function updateSliderProv(value: number, type: 'markerSize' | 'fontSize' | 'edge
store.commit.setEdgeLength({ edgeLength: value, updateProv: true });
}
}

const userInfo = computed(() => store.state.userInfo);
</script>

<template>
Expand Down Expand Up @@ -195,7 +198,11 @@ function updateSliderProv(value: number, type: 'markerSize' | 'fontSize' | 'edge
</div>
</v-toolbar-title>
<v-spacer />
<login-menu />
<login-menu
:store="store"
:oauth-client="oauthClient"
:user-info="userInfo"
/>
</v-toolbar>

<!-- control panel content -->
Expand Down
145 changes: 0 additions & 145 deletions src/components/LoginMenu.vue
View file
Open in desktop

This file was deleted.

27 changes: 16 additions & 11 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4285,10 +4285,10 @@
semver "^7.3.4"
strip-ansi "^6.0.0"

"@vue/compiler-sfc@2.7.4":
version "2.7.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.4.tgz#41cb520a3ea65f7081194e79c0de412c75bda236"
integrity sha512-WCaF33mlKLSvHDKvOD6FzTa5CI2FlMTeJf3MxJsNP0KDgRoI6RdXhHo9dtvCqV4Sywf9Owm17wTLT1Ymu/WsOQ==
"@vue/compiler-sfc@2.7.10":
version "2.7.10"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-2.7.10.tgz#3fe08e780053a3bbf41328c65ae5dfdee0385206"
integrity sha512-55Shns6WPxlYsz4WX7q9ZJBL77sKE1ZAYNYStLs6GbhIOMrNtjMvzcob6gu3cGlfpCR4bT7NXgyJ3tly2+Hx8Q==
dependencies:
"@babel/parser" "^7.18.4"
postcss "^8.4.14"
Expand Down Expand Up @@ -12146,6 +12146,11 @@ multicast-dns@^6.0.1:
dns-packet "^1.3.1"
thunky "^1.0.2"

multinet-components@^0.0.1:
version "0.0.1"
resolved "https://registry.yarnpkg.com/multinet-components/-/multinet-components-0.0.1.tgz#41c2e4c2e716ed37f9b54a6dc0ba03899c16d8e3"
integrity sha512-M8FSfeZetigiHbHz6bT0OTKT6aV3gzfNJODZGEBoVNp/axRk3aHTLfSJ86/KMxbl5guUvlj+z3n1lXc7yRSC4g==

multinet@^0.21.4:
version "0.21.4"
resolved "https://registry.yarnpkg.com/multinet/-/multinet-0.21.4.tgz#9b9015fdeebd245800833db21b8f8e6d81aa351d"
Expand Down Expand Up @@ -16535,9 +16540,9 @@ vue-style-loader@^4.1.0, vue-style-loader@^4.1.2:
loader-utils "^1.0.2"

vue-template-compiler@^2.7.0:
version "2.7.4"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.4.tgz#5c21ff12dbd8f53ac14b42a6d89e77b55a1c5dd7"
integrity sha512-FgaeXI80FzhtDEsixq3WBrHLWpU2gzLb2DFusm62TrmCQyETsnUp0kTLpbExrTUw7g5YOnRf+xkh73nuEX+jGQ==
version "2.7.10"
resolved "https://registry.yarnpkg.com/vue-template-compiler/-/vue-template-compiler-2.7.10.tgz#9e20f35b2fdccacacf732dd7dedb49bf65f4556b"
integrity sha512-QO+8R9YRq1Gudm8ZMdo/lImZLJVUIAM8c07Vp84ojdDAf8HmPJc7XB556PcXV218k2AkKznsRz6xB5uOjAC4EQ==
dependencies:
de-indent "^1.0.2"
he "^1.2.0"
Expand All @@ -16548,11 +16553,11 @@ vue-template-es2015-compiler@^1.6.0, vue-template-es2015-compiler@^1.9.0:
integrity sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==

vue@^2.7.0:
version "2.7.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.4.tgz#f5578bd47f0cef8d4f3eb4c6bbebad47341d11fb"
integrity sha512-8KGyyzFSj/FrKj1y7jyEpv8J4osgZx6Lk1lVzh1aP4BqsXZhATH1r0gdJNz00MMyBhK0/m2cNoPuOZ1NzeiUEw==
version "2.7.10"
resolved "https://registry.yarnpkg.com/vue/-/vue-2.7.10.tgz#ae516cc6c88e1c424754468844218fdd5e280f40"
integrity sha512-HmFC70qarSHPXcKtW8U8fgIkF6JGvjEmDiVInTkKZP0gIlEPhlVlcJJLkdGIDiNkIeA2zJPQTWJUI4iWe+AVfg==
dependencies:
"@vue/compiler-sfc" "2.7.4"
"@vue/compiler-sfc" "2.7.10"
csstype "^3.1.0"

vuetify-loader@^1.3.0:
Expand Down