Skip to content
This repository has been archived by the owner on Jul 4, 2024. It is now read-only.

Commit

Permalink
Merge pull request #31 from Hilfstelefon-WirVsVirus/remove_vue_fragment
Browse files Browse the repository at this point in the history
Remove vue-fragment
  • Loading branch information
markus-willems authored Mar 22, 2020
2 parents 48d4562 + d84f952 commit 76e25f0
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 17 deletions.
5 changes: 0 additions & 5 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"core-js": "^3.6.4",
"register-service-worker": "^1.6.2",
"vue": "^2.6.11",
"vue-fragment": "^1.5.1",
"vue-i18n": "^8.0.0",
"vue-router": "^3.1.5",
"vuex": "^3.1.2",
Expand Down
3 changes: 2 additions & 1 deletion src/components/Card.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export default {
padding: 30px 20px;
margin: 0 5px;
text-align: center;
height: 400px;
min-height: 400px;
@include shadow(30);
position: relative;
}
</style>
2 changes: 1 addition & 1 deletion src/components/IssueCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<script>
import WaveSurfer from 'wavesurfer.js';
import { mapActions } from 'vuex';
import cardStates from '../utils/cardStates';
import cardStates from '../utils/states';
export default {
name: 'IssueCard',
Expand Down
5 changes: 4 additions & 1 deletion src/components/Navigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<nav class="navigation">
<ul class="navigation__list">
<li class="navigation__list-item">
<router-link to="/impress">{{ $t('navigation.imprint') }}</router-link>
<router-link to="/imprint">{{ $t('navigation.imprint') }}</router-link>
</li>
<li class="navigation__list-item">
<a href="//wirvsvirushackathon.org/" class="navigation__link">
Expand Down Expand Up @@ -31,6 +31,9 @@ export default {
display: flex;
justify-content: center;
margin-top: 50px;
position: absolute;
width: 100%;
bottom: 20px;
@media #{$mobile} {
font-size: 24px;
Expand Down
2 changes: 1 addition & 1 deletion src/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"questions": "Fragen",
"support": "Unterstüzung"
},
"impress": {
"imprint": {
"intro": "Intro"
}
}
9 changes: 4 additions & 5 deletions src/router/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import Vue from 'vue';
import VueRouter from 'vue-router';
import Home from '../views/Home.vue';
import Dashboard from '../views/Dashboard.vue';
import MyTasks from '../views/MyTasks.vue';
import AllTasks from '../views/AllTasks.vue';
import EditTask from '../views/EditTask.vue';
Expand All @@ -17,7 +16,7 @@ const routes = [
{
path: '/dashboard',
name: 'Dashboard',
component: Dashboard,
component: () => import(/* webpackChunkName: "dashboard" */ '../views/Dashboard.vue'),
children: [
{
path: '',
Expand All @@ -34,9 +33,9 @@ const routes = [
],
},
{
path: '/impress',
name: 'Impress',
component: () => import(/* webpackChunkName: "impress" */ '../views/Impress.vue'),
path: '/imprint',
name: 'Imprint',
component: () => import(/* webpackChunkName: "imprint" */ '../views/Imprint.vue'),
},
];

Expand Down
2 changes: 1 addition & 1 deletion src/store/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Vue from 'vue';
import Vuex from 'vuex';
import cardStates from '../utils/cardStates';
import cardStates from '../utils/states';

Vue.use(Vuex);

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/views/Impress.vue → src/views/Imprint.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<div class="content__logo logo">
<img class="logo__image" src="/img/icons/landing_graphic.svg" :alt="$t('meta.title')"/>
</div>
<div class="content__text">{{ $t('impress.intro') }}</div>
<div class="content__text">{{ $t('imprint.intro') }}</div>
</div>
<Card>
<div class="users">
Expand Down

0 comments on commit 76e25f0

Please sign in to comment.