Skip to content

Commit 3f00994

Browse files
gideonairexCMCDragonkai
authored andcommitted
chore: update UI
1 parent 6f43ea4 commit 3f00994

File tree

21 files changed

+672
-38186
lines changed

21 files changed

+672
-38186
lines changed

package-lock.json

Lines changed: 0 additions & 37453 deletions
This file was deleted.

package.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@
7979
"npm-run-all": "^4.1.5",
8080
"prettier": "^1.19.1",
8181
"rimraf": "^3.0.2",
82-
"sass": "^1.26.10",
83-
"sass-loader": "^8.0.2",
8482
"serve": "^11.3.2",
8583
"storybook": "^5.3.19",
8684
"ts-loader": "^8.0.7",

shell.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ in
1313
nodePackages.node2nix
1414
electron_9
1515
unzip
16-
wine
17-
p7zip # Insecure package but needed for electron-builder
16+
#wine
17+
#p7zip # Insecure package but needed for electron-builder
1818
] ++ (lib.attrByPath [ "nativeBuildInputs" ] [] attrs);
1919
shellHook = ''
2020
echo 'Entering ${attrs.name}'

src/index.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
body {
22
margin: 0 !important;
3+
}
4+
5+
.app-content {
6+
height: 100vh;
37
}

src/renderer/App.vue

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,14 @@
22
<div style="background: LightGrey;">
33
<div class="demo-container">
44
<!-- Drawer -->
5-
<ui-drawer type="modal" nav-id="demo-menu">
6-
<ui-drawer-header>
7-
<ui-drawer-title>Title</ui-drawer-title>
8-
<ui-drawer-subtitle>Subtitle</ui-drawer-subtitle>
9-
</ui-drawer-header>
10-
<ui-drawer-content>
11-
<ui-nav>
12-
<ui-nav-item href="javascript:void(0)" active>Item {{ 0 }}</ui-nav-item>
13-
<ui-nav-item v-for="i in 12" :key="i" href="javascript:void(0)"><ui-icon :size="18">face</ui-icon> Item {{ i }}</ui-nav-item>
14-
</ui-nav>
15-
</ui-drawer-content>
16-
</ui-drawer>
17-
<ui-drawer-backdrop></ui-drawer-backdrop>
5+
<Drawer />
186
<!-- Content -->
19-
<div class="demo-content">
7+
<div class="content">
208
<!-- App bar -->
21-
<ui-top-app-bar fixed class="demo-app-bar" content-selector=".demo-app-content" nav-id="demo-menu">
22-
Title
23-
</ui-top-app-bar>
9+
<AppBar />
2410
<!-- App content -->
25-
<div class="demo-app-content">
26-
<p v-for="i in 24" :key="i">Main Content {{ i }}</p>
11+
<div class="app-content">
12+
<router-view />
2713
</div>
2814
</div>
2915
</div>
@@ -35,7 +21,7 @@
3521
* Chore:
3622
* 1. Login not used yet
3723
*/
38-
import { defineComponent } from 'vue';
24+
import { defineComponent } from 'vue'
3925
import Alert from './components/alerts/Alert.vue';
4026
import AppBar from './components/navigation/AppBar.vue';
4127
import Drawer from './components/navigation/Drawer.vue';
@@ -47,9 +33,9 @@ export default defineComponent({
4733
components: {
4834
Alert,
4935
AppBar,
50-
Drawer,
36+
Drawer
5137
// Footer
5238
// Login
53-
},
54-
});
39+
}
40+
})
5541
</script>

src/renderer/components/HelloWorld.vue

Lines changed: 0 additions & 116 deletions
This file was deleted.

src/renderer/components/keys/KeyInformation.vue

Lines changed: 44 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
<v-row>
77
<v-col>
88
<v-list outlined>
9-
<v-textarea
9+
<ui-textfield
1010
v-model="selectedKeyContent"
1111
label="Secret Content"
1212
required
1313
:disabled="!edit"
1414
outlined
1515
style="padding-left: 10px; padding-right: 10px"
1616
placeholder="Enter the content of the secret"
17-
></v-textarea>
17+
></ui-textfield>
1818
</v-list>
1919
</v-col>
2020
</v-row>
@@ -25,51 +25,54 @@
2525
</template>
2626

2727
<script lang="ts">
28-
import { Component, Vue, Prop } from "vue-property-decorator";
29-
import { namespace } from "vuex-class";
30-
import { polykeyClient } from "@/store";
28+
import { defineComponent } from 'vue'
3129
32-
const keys = namespace('Keys');
30+
export default defineComponent({})
31+
// import { Component, Vue, Prop } from "vue-property-decorator";
32+
// import { namespace } from "vuex-class";
33+
// import { polykeyClient } from "@/store";
3334
34-
const namingRule = name =>
35-
/^\b[\w]+(?:['-]?[\w]+)*\b$/.test(name) ||
36-
!name ||
37-
"Name must only contain letters, numbers and hyphens";
35+
// const keys = namespace('Keys');
3836
39-
@Component({
40-
})
41-
export default class KeyInformation extends Vue {
42-
@keys.State
43-
public selectedKeyName!: string;
37+
// const namingRule = name =>
38+
// /^\b[\w]+(?:['-]?[\w]+)*\b$/.test(name) ||
39+
// !name ||
40+
// "Name must only contain letters, numbers and hyphens";
4441
45-
@keys.State
46-
public selectedKeyContent!: string;
42+
// @Component({
43+
// })
44+
// export default class KeyInformation extends Vue {
45+
// @keys.State
46+
// public selectedKeyName!: string;
4747
48-
edit: boolean = false
49-
editSecret() {
50-
this.edit = true
51-
}
52-
saveSecret() {
53-
this.edit = false
54-
}
55-
cancel() {
56-
this.edit = false
57-
}
48+
// @keys.State
49+
// public selectedKeyContent!: string;
5850
59-
valid: boolean = false;
60-
secretNameRules = [namingRule];
51+
// edit: boolean = false
52+
// editSecret() {
53+
// this.edit = true
54+
// }
55+
// saveSecret() {
56+
// this.edit = false
57+
// }
58+
// cancel() {
59+
// this.edit = false
60+
// }
6161
62-
validate(): boolean {
63-
return (<any>this.$refs.newVaultForm).validate();
64-
}
65-
reset() {
66-
(<any>this.$refs.newVaultForm).reset();
67-
}
68-
resetValidation() {
69-
this.reset();
70-
}
62+
// valid: boolean = false;
63+
// secretNameRules = [namingRule];
7164
72-
back() {
73-
}
74-
}
65+
// validate(): boolean {
66+
// return (<any>this.$refs.newVaultForm).validate();
67+
// }
68+
// reset() {
69+
// (<any>this.$refs.newVaultForm).reset();
70+
// }
71+
// resetValidation() {
72+
// this.reset();
73+
// }
74+
75+
// back() {
76+
// }
77+
// }
7578
</script>

src/renderer/components/keys/KeyPairInformation.vue

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<v-row>
66
<v-col>
77
<v-list outlined>
8-
<v-textarea
8+
<ui-textfield
99
v-model="publicKey"
1010
label="Public Key"
1111
readonly
1212
outlined
1313
style="padding-left: 10px; padding-right: 10px"
1414
/>
15-
<v-textarea
15+
<ui-textfield
1616
v-model="privateKey"
1717
label="Private Key"
1818
readonly
@@ -28,32 +28,35 @@
2828
</template>
2929

3030
<script lang="ts">
31-
import { Component, Vue, Prop } from 'vue-property-decorator';
32-
import { namespace } from 'vuex-class';
33-
import { polykeyClient } from '@/store';
31+
import { defineComponent } from 'vue'
3432
35-
const keys = namespace('Keys');
33+
export default defineComponent({})
34+
// import { Component, Vue, Prop } from 'vue-property-decorator';
35+
// import { namespace } from 'vuex-class';
36+
// import { polykeyClient } from '@/store';
3637
37-
@Component({})
38-
export default class KeyInformation extends Vue {
39-
@keys.State
40-
public publicKey!: string;
38+
// const keys = namespace('Keys');
4139
42-
@keys.State
43-
public privateKey!: string;
40+
// @Component({})
41+
// export default class KeyInformation extends Vue {
42+
// @keys.State
43+
// public publicKey!: string;
4444
45-
edit = false;
45+
// @keys.State
46+
// public privateKey!: string;
4647
47-
editSecret() {
48-
this.edit = true;
49-
}
48+
// edit = false;
5049
51-
saveSecret() {
52-
this.edit = false;
53-
}
50+
// editSecret() {
51+
// this.edit = true;
52+
// }
5453
55-
cancel() {
56-
this.edit = false;
57-
}
58-
}
54+
// saveSecret() {
55+
// this.edit = false;
56+
// }
57+
58+
// cancel() {
59+
// this.edit = false;
60+
// }
61+
// }
5962
</script>

0 commit comments

Comments
 (0)