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

Bump vue from 2.7.14 to 3.3.4 #1045

Merged
merged 4 commits into from
Jun 26, 2023
Merged

Bump vue from 2.7.14 to 3.3.4 #1045

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
87da4f3
Bump vue from 2.7.14 to 3.3.4
dependabot[bot] Jun 14, 2023
0702df3
feat: update to vue 3
berviantoleo Jun 26, 2023
3207bef
fix: add version 20.x
berviantoleo Jun 26, 2023
271c47b
fix: remove 20.x
berviantoleo Jun 26, 2023
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
19 changes: 9 additions & 10 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
"lint": "vue-cli-service lint"
},
"dependencies": {
"buefy": "^0.9.23",
"@oruga-ui/oruga-next": "0.6.0",
"@oruga-ui/theme-bulma": "^0.2.11",
"core-js": "^3.31.0",
"crypto-js": "^4.1.1",
"vue": "^2.7.14",
"vue-class-component": "^7.2.6",
"vue-property-decorator": "^9.1.2",
"vue-router": "^3.6.5",
"vuex": "^3.6.2"
"vue": "^3.3.4",
"vue-router": "^4.2.2",
"vuex": "^4.1.0"
},
"devDependencies": {
"@babel/core": "^7.22.5",
Expand All @@ -37,10 +36,11 @@
"@vue/cli-plugin-typescript": "^5.0.8",
"@vue/cli-plugin-unit-jest": "^5.0.8",
"@vue/cli-service": "^5.0.8",
"@vue/compiler-sfc": "^3.3.4",
"@vue/eslint-config-airbnb": "^7.0.0",
"@vue/eslint-config-typescript": "^11.0.3",
"@vue/test-utils": "1.3.6",
"@vue/vue2-jest": "^29.2.4",
"@vue/test-utils": "2.4.0",
"@vue/vue3-jest": "^29.2.4",
"babel-jest": "^29.5.0",
"babel-loader": "^9.1.2",
"cypress": "^12.14.0",
Expand All @@ -53,8 +53,7 @@
"sass": "^1.63.4",
"sass-loader": "^13.3.2",
"ts-jest": "^29.1.0",
"typescript": "^5.1.3",
"vue-template-compiler": "^2.7.14"
"typescript": "^5.1.3"
},
"categories": [
"Other"
Expand Down
2 changes: 1 addition & 1 deletion public/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<html lang="en" class="has-navbar-fixed-top">

<head>
<meta charset="utf-8">
Expand Down
4 changes: 2 additions & 2 deletions src/App.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Vue from 'vue';
import { defineComponent } from 'vue';
import BaseFooter from '@/components/BaseFooter.vue';
import BaseHeader from '@/components/BaseHeader.vue';

export default Vue.extend({
export default defineComponent({
name: 'app',
components: {
BaseFooter,
Expand Down
4 changes: 2 additions & 2 deletions src/components/BaseFooter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Vue from 'vue';
import { defineComponent } from 'vue';

export default Vue.extend({
export default defineComponent({
name: 'base-footer',
});
15 changes: 13 additions & 2 deletions src/components/BaseHeader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
import Vue from 'vue';
import { defineComponent } from 'vue';

export default Vue.extend({
export default defineComponent({
name: 'base-header',
data() {
return {
activator: false,
};
},
methods: {
makeBurger() {
this.activator = !this.activator;
return this.activator;
},
},
});
61 changes: 36 additions & 25 deletions src/components/BaseHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,42 @@
<template>
<b-navbar type="is-light" fixed-top wrapper-class="container">
<template slot="brand">
<b-navbar-item tag="router-link" to="/">
<nav class="navbar is-fixed-top">
<div class="navbar-brand">
<router-link class="navbar-item" to="/">
<img src="@/assets/logo.png" alt="logo" />
</b-navbar-item>
</template>
<template slot="start">
<b-navbar-item tag="router-link" to="/">Home</b-navbar-item>
<b-navbar-dropdown label="Menu" hoverable>
<b-navbar-item tag="router-link" to="/encrypt">Encrypt</b-navbar-item>
<b-navbar-item tag="router-link" to="/decrypt">Decrypt</b-navbar-item>
</b-navbar-dropdown>
<b-navbar-item tag="router-link" to="/about">About</b-navbar-item>
</template>
<template slot="end">
<b-navbar-item tag="div">
<div class="buttons">
<b-button
icon-pack="mdi"
icon-left="github"
type="is-dark"
>Github</b-button
>
</router-link>

<button @click="makeBurger" type="button" class="button navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbarBasicExample" v-bind:class="{ 'is-active': activator }">
<span aria-hidden="true" />
<span aria-hidden="true" />
<span aria-hidden="true" />
</button>
</div>

<div id="navbarBasicExample" class="navbar-menu" v-bind:class="{ 'is-active': activator }">
<div class="navbar-start">
<router-link class="navbar-item" to="/">
Home
</router-link>

<router-link class="navbar-item" to="/encrypt">
Encrypt
</router-link>

<router-link class="navbar-item" to="/decrypt">
Decrypt
</router-link>
</div>

<div class="navbar-end">
<div class="navbar-item">
<div class="buttons">
<o-button icon-pack="mdi" icon-left="github" variant="dark">Github</o-button>
</div>
</div>
</b-navbar-item>
</template>
</b-navbar>
</div>
</div>

</nav>
</template>

<script lang="ts" src="./BaseHeader.ts">
Expand Down
20 changes: 10 additions & 10 deletions src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import Vue from 'vue';
import Buefy from 'buefy';
import { createApp } from 'vue';
import Oruga from '@oruga-ui/oruga-next';
import { bulmaConfig } from '@oruga-ui/theme-bulma';
import App from './App.vue';
import router from './router';
import store from './store';
import 'buefy/dist/buefy.css';
import '@oruga-ui/theme-bulma/dist/bulma.css';

Vue.config.productionTip = false;
Vue.use(Buefy);
const app = createApp(App);

new Vue({
router,
store,
render: (h) => h(App),
}).$mount('#app');
app.use(router);
app.use(store);
app.use(Oruga, bulmaConfig);

app.mount('#app');
10 changes: 5 additions & 5 deletions src/router.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
import Vue from 'vue';
import Router from 'vue-router';
import { createRouter, createWebHashHistory } from 'vue-router';
import Home from './views/HomePage.vue';
import About from './views/AboutPage.vue';

Vue.use(Router);

export default new Router({
const router = createRouter({
history: createWebHashHistory(),
routes: [
{
path: '/',
Expand Down Expand Up @@ -35,3 +33,5 @@ export default new Router({
},
],
});

export default router;
13 changes: 0 additions & 13 deletions src/shims-tsx.d.ts
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions src/shims-vue.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
declare module '*.vue' {
import Vue from 'vue';

export default Vue;
import type { DefineComponent } from 'vue';
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const component: DefineComponent<object, object, any>;
export default component;
}
7 changes: 2 additions & 5 deletions src/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import Vue from 'vue';
import Vuex from 'vuex';
import { createStore } from 'vuex';

Vue.use(Vuex);

export default new Vuex.Store({
export default createStore({
state: {

},
Expand Down
23 changes: 16 additions & 7 deletions src/views/Decryption.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
import Vue from 'vue';
import { defineComponent } from 'vue';
import { useProgrammatic } from '@oruga-ui/oruga-next';
import AES from 'crypto-js/aes';
import Utf8 from 'crypto-js/enc-utf8';

export default Vue.extend({
export default defineComponent({
setup() {
const { oruga } = useProgrammatic();
function danger() {
oruga.notification.open({
message: 'Please fill all form',
position: 'bottom-right',
variant: 'danger',
closable: true,
});
}
return { danger };
},
data() {
return {
content: '',
Expand All @@ -17,11 +30,7 @@ export default Vue.extend({
const plain = resultChiper.toString(Utf8);
this.result = plain;
} else {
this.$buefy.toast.open({
message: 'Please fill all form',
type: 'is-danger',
position: 'is-bottom',
});
this.danger();
}
},
},
Expand Down
22 changes: 11 additions & 11 deletions src/views/DecryptionPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
<div class="card">
<div class="card-content">
<h1 class="title has-text-centered">Decryption</h1>
<b-field label="Content">
<b-input type="textarea" v-model="content" required />
</b-field>
<b-field label="Key">
<b-input type="password" v-model="key" min="5" required password-reveal />
</b-field>
<o-field label="Content">
<o-input type="textarea" v-model="content" required />
</o-field>
<o-field label="Key">
<o-input type="password" v-model="key" min="5" required password-reveal />
</o-field>
<div class="has-text-centered">
<b-button type="is-success" size="is-large" @click="decryptNow">Decrypt</b-button>
<o-button variant="success" size="large" @click="decryptNow">Decrypt</o-button>
</div>
<b-field label="Result">
<o-field label="Result">
<div class="card">
<div class="card-content">{{result}}</div>
</div>
</b-field>
</o-field>
<div class="buttons has-addons is-centered">
<b-button tag="router-link" type="is-outlined is-danger" to="/">Home</b-button>
<b-button tag="router-link" type="is-outlined is-link" to="/encrypt">Encrypt</b-button>
<o-button tag="router-link" variant="danger" outlined to="/">Home</o-button>
<o-button tag="router-link" variant="link" outlined to="/encrypt">Encrypt</o-button>
</div>
</div>
</div>
Expand Down
26 changes: 18 additions & 8 deletions src/views/Encryption.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,35 @@
import Vue from 'vue';
import { defineComponent, ref } from 'vue';
import { useProgrammatic } from '@oruga-ui/oruga-next';
import AES from 'crypto-js/aes';

export default Vue.extend({
export default defineComponent({
setup() {
const { oruga } = useProgrammatic();
const result = ref('');
function danger() {
oruga.notification.open({
message: 'Please fill all form',
position: 'bottom-right',
variant: 'danger',
closable: true,
});
}
return { danger, result };
},
data() {
return {
content: '',
key: '',
result: '',
};
},
methods: {
encryptNow() {
console.log(this.content, this.key);
if (this.content && this.key) {
const resultChiper = AES.encrypt(this.content, this.key);
this.result = resultChiper.toString();
} else {
this.$buefy.toast.open({
message: 'Please fill all form',
type: 'is-danger',
position: 'is-bottom',
});
this.danger();
}
},
},
Expand Down
28 changes: 14 additions & 14 deletions src/views/EncryptionPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,27 @@
<div class="card">
<div class="card-content">
<h1 class="title has-text-centered">Encryption</h1>
<b-field label="Content">
<b-input type="textarea" v-model="content" required />
</b-field>
<b-field label="Key">
<b-input type="password" v-model="key" min="5" required password-reveal />
</b-field>
<o-field label="Content">
<o-input type="textarea" v-model="content" required />
</o-field>
<o-field label="Key">
<o-input type="password" v-model="key" min="5" required password-reveal />
</o-field>
<div class="has-text-centered">
<b-button
<o-button
id="encrypt-button"
type="is-success"
size="is-large"
@click="encryptNow">Encrypt</b-button>
variant="success"
size="large"
@click="encryptNow">Encrypt</o-button>
</div>
<b-field label="Result">
<o-field label="Result">
<div class="card">
<div class="card-content">{{result}}</div>
</div>
</b-field>
</o-field>
<div class="buttons has-addons is-centered">
<b-button tag="router-link" type="is-outlined is-danger" to="/">Home</b-button>
<b-button tag="router-link" type="is-outlined is-link" to="/decrypt">Decrypt</b-button>
<o-button tag="router-link" variant="danger" outlined to="/">Home</o-button>
<o-button tag="router-link" variant="link" outlined to="/decrypt">Decrypt</o-button>
</div>
</div>
</div>
Expand Down
Loading