Skip to content

Commit

Permalink
2.0.2
Browse files Browse the repository at this point in the history
  • Loading branch information
JiLiZART committed Feb 15, 2024
1 parent 51cde5c commit 82fa808
Show file tree
Hide file tree
Showing 20 changed files with 670 additions and 19 deletions.
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sirus-next",
"private": true,
"version": "1.3.1",
"version": "2.0.4",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -10,14 +10,15 @@
"tauri": "tauri"
},
"dependencies": {
"vue": "^3.3.4",
"@tauri-apps/api": "^1.5.2"
"@iconify/vue": "^4.1.1",
"@tauri-apps/api": "^1.5.2",
"vue": "^3.3.4"
},
"devDependencies": {
"@tauri-apps/cli": "^1.5.8",
"@vitejs/plugin-vue": "^4.2.3",
"typescript": "^5.0.2",
"vite": "^5.0.0",
"vue-tsc": "^1.8.5",
"@tauri-apps/cli": "^1.5.8"
"vue-tsc": "^1.8.5"
}
}
16 changes: 16 additions & 0 deletions pnpm-lock.yaml

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

Binary file added screenshots/SCR-20240215-ecpv.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/SCR-20240215-ecyv.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added screenshots/SCR-20240215-edbw.jpeg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

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

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "sirus-next"
version = "1.3.1"
version = "2.0.4"
description = "Sirus Next Launcher"
authors = ["Nikolay Kost <jilizart@gmail.com>"]
edition = "2021"
Expand Down
4 changes: 3 additions & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
"resizable": false,
"title": "sirus-next",
"width": 1366,
"height": 900,
"height": 768,
"maxWidth": 1366,
"maxHeight": 768,
"minWidth": 1366,
"minHeight": 600,
"center": true,
Expand Down
48 changes: 41 additions & 7 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import Layout from "./components/Layout.vue";
import ProgressBar from "./components/ProgressBar.vue";
import ServerStatus from "./components/ServerStatus.vue";
import Button from "./components/Button.vue";
import Addons from "./components/Addons.vue";
import UsersIcon from "./components/UsersIcon.vue";
import DropdownMenu from "./components/DropdownMenu.vue";
import AccountOutline from "./components/AccountOutline.vue";
import AccountOutlineIcon from "./components/AccountOutlineIcon.vue";
import ChevronDown from "./components/ChevronDown.vue";
import Link from "./components/Link.vue";
import { Icon } from "@iconify/vue";
import { getVersion } from "@tauri-apps/api/app";
Expand Down Expand Up @@ -69,10 +71,10 @@ onMounted(async () => {

<template>
<Layout>
<template v-slot:header>
<template #header>
<na class="primary-nav">
<Button variant="nav" href="#">Community</Button>
<Button variant="nav" href="#">News</Button>
<Button variant="nav" href="#">Addons</Button>
<DropdownMenu open-on="hover">
<Button variant="nav"> Game Info </Button>
<template #primary>
Expand All @@ -99,7 +101,7 @@ onMounted(async () => {
</DropdownMenu>
<DropdownMenu open-on="hover">
<Button variant="nav">
<AccountOutline /> Account <ChevronDown />
<AccountOutlineIcon />&nbsp;Account <ChevronDown />
</Button>
<template #primary>
<div class="dropdown-login">
Expand All @@ -117,10 +119,11 @@ onMounted(async () => {
</aside>
</template>

<Addons />
<CardFull v-if="cardItem" :item="cardItem" @back="hideCard" />
<CardList v-else :items="items" @show="showCard" />

<template v-slot:aside>
<template #aside>
<div id="logo"></div>
<div class="users-online">
<UsersIcon /> {{ online }} <span class="users-online-meta">online</span>
Expand All @@ -140,9 +143,20 @@ onMounted(async () => {

<ServerStatus :items="statusRealms" />
</template>
<template v-slot:footer>
<template #footer>
<section class="footer-content">
<Button variant="play">Play</Button>
<div class="play-button">
<Button class="play-button-run" variant="play"> Play </Button>
<Button class="play-button-edit" variant="play">
<Icon
icon="mdi:settings"
width="1.5rem"
height="1.5rem"
color="white"
/>
</Button>
</div>

<ProgressBar />
<div class="meta">Version: {{ version }}</div>
</section>
Expand All @@ -151,6 +165,26 @@ onMounted(async () => {
</template>

<style scoped>
.play-button {
position: relative;
display: flex;
flex-direction: row;
}
button.play-button-run {
border-top-right-radius: 0;
border-bottom-right-radius: 0;
min-width: 200px;
}
.play-button-edit {
border-left: 1px solid hsl(15, 100%, 40%);
border-top-left-radius: 0;
border-bottom-left-radius: 0;
min-width: 40px;
padding: 0 4px;
}
.primary-nav,
.aside-nav {
display: flex;
Expand Down
10 changes: 10 additions & 0 deletions src/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,16 @@ export type StatusResponse = {

export type StatusRealm = StatusResponse["realms"][0];

export type AddonItem = {
id: number;
name: string;
version: string;
category: number;
downloads: number;
repo_updated_at: string;
repository: string;
};

export function httpGet<T>(url: string) {
return fetch<T>(url, {
method: "GET",
Expand Down
File renamed without changes.
Loading

0 comments on commit 82fa808

Please sign in to comment.