Skip to content

Commit dad6801

Browse files
committed
Fixed issues after rebase
- DownloadModule.ts duplicate action - Splash.vue formatting - Profiles.vue unused imports
1 parent b3b0928 commit dad6801

File tree

3 files changed

+14
-23
lines changed

3 files changed

+14
-23
lines changed

src/pages/Profiles.vue

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,16 @@
6666

6767
<script lang='ts' setup>
6868
import { Hero } from '../components/all';
69-
7069
import R2Error from '../model/errors/R2Error';
7170
import ManagerSettings from '../r2mm/manager/ManagerSettings';
72-
73-
import GameDirectoryResolverProvider from '../providers/ror2/game/GameDirectoryResolverProvider';
7471
import DeleteProfileModal from '../components/profiles-modals/DeleteProfileModal.vue';
7572
import RenameProfileModal from '../components/profiles-modals/RenameProfileModal.vue';
7673
import CreateProfileModal from '../components/profiles-modals/CreateProfileModal.vue';
7774
import ImportProfileModal from '../components/profiles-modals/ImportProfileModal.vue';
78-
import { computed, getCurrentInstance, onMounted } from 'vue';
75+
import { computed, onMounted } from 'vue';
7976
import { getStore } from '../providers/generic/store/StoreProvider';
8077
import { State } from '../store';
81-
import VueRouter, { useRouter } from 'vue-router';
78+
import { useRouter } from 'vue-router';
8279
8380
const store = getStore<State>();
8481
const router = useRouter();

src/pages/Splash.vue

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
</div>
3636
<div class='container' v-if="view === 'main'">
3737
<p>
38-
<span class='icon margin-right margin-right--half-width'>
39-
<i class='fas fa-info-circle' />
40-
</span>
38+
<span class='icon margin-right margin-right--half-width'>
39+
<i class='fas fa-info-circle' />
40+
</span>
4141
<strong>Did you know?</strong>
4242
</p>
4343
<ul class='margin-right'>
@@ -57,9 +57,9 @@
5757
</li>
5858
</ul>
5959
<p>
60-
<span class='icon margin-right margin-right--half-width'>
61-
<i class='fas fa-question-circle' />
62-
</span>
60+
<span class='icon margin-right margin-right--half-width'>
61+
<i class='fas fa-question-circle' />
62+
</span>
6363
<strong>Having trouble?</strong>
6464
</p>
6565
<p>
@@ -70,9 +70,9 @@
7070
</div>
7171
<div class='container' v-else-if="view === 'about'">
7272
<p>
73-
<span class='icon margin-right margin-right--half-width'>
74-
<i class='fas fa-address-card' />
75-
</span>
73+
<span class='icon margin-right margin-right--half-width'>
74+
<i class='fas fa-address-card' />
75+
</span>
7676
<strong>About r2modman</strong>
7777
</p>
7878
<p>It's created by Ebkr, using Quasar.</p>
@@ -86,9 +86,9 @@
8686
</div>
8787
<div class='container' v-else-if="view === 'faq'">
8888
<p>
89-
<span class='icon margin-right margin-right--half-width'>
90-
<i class='fas fa-question-circle' />
91-
</span>
89+
<span class='icon margin-right margin-right--half-width'>
90+
<i class='fas fa-question-circle' />
91+
</span>
9292
<strong>FAQ</strong>
9393
</p>
9494
<ul>

src/store/modules/DownloadModule.ts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,6 @@ export const DownloadModule = {
288288
addDownload(state: State, download: DownloadProgress) {
289289
state.allDownloads = [...state.allDownloads, download];
290290
},
291-
setDone(state: State, downloadId: number) {
292-
state.allDownloads = updateDownloadStatus(state.allDownloads, downloadId, DownloadStatusEnum.DONE);
293-
},
294291
setFailed(state: State, downloadId: number) {
295292
state.allDownloads = updateDownloadStatus(state.allDownloads, downloadId, DownloadStatusEnum.FAILED);
296293
},
@@ -300,9 +297,6 @@ export const DownloadModule = {
300297
setInstalled(state: State, downloadId: number) {
301298
state.allDownloads = updateDownloadStatus(state.allDownloads, downloadId, DownloadStatusEnum.INSTALLED);
302299
},
303-
setFailed(state: State, downloadId: number) {
304-
state.allDownloads = updateDownloadStatus(state.allDownloads, downloadId, DownloadStatusEnum.FAILED);
305-
},
306300
// Use actions.toggleIngoreCache to store the setting persistently.
307301
setIgnoreCacheVuexOnly(state: State, ignoreCache: boolean) {
308302
state.ignoreCache = ignoreCache;

0 commit comments

Comments
 (0)