Skip to content

Commit

Permalink
Community requested enhancements (#556)
Browse files Browse the repository at this point in the history
* Make images lazy and fix #198

* Fix console spam

* Fix bug with bad pagination impl

* Fixes #232

* Finalize more bug fixes

* run lint

* Improve minecraft sign in, improve onboarding

* Linter

* Added back button

* Implement #530

* run linter

* Address changes

* Bump version + run fmt

---------

Co-authored-by: Jai A <[email protected]>
  • Loading branch information
CodexAdrian and Geometrically committed Aug 14, 2023
1 parent d6ee1ff commit 49bfb06
Show file tree
Hide file tree
Showing 32 changed files with 569 additions and 340 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,3 +110,5 @@ fabric.properties
# MSVC Windows builds of rustc generate these, which store debugging information
*.pdb

theseus.iml

6 changes: 3 additions & 3 deletions Cargo.lock

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

11 changes: 11 additions & 0 deletions theseus.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/theseus/library" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
2 changes: 1 addition & 1 deletion theseus/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "theseus"
version = "0.5.0"
version = "0.5.1"
authors = ["Jai A <[email protected]>"]
edition = "2018"

Expand Down
13 changes: 6 additions & 7 deletions theseus/src/state/children.rs
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,11 @@ impl Children {
.signed_duration_since(last_updated_playtime)
.num_seconds();
if diff >= 60 {
if let Err(e) =
profile::edit(&associated_profile, |mut prof| {
prof.metadata.recent_time_played += diff as u64;
async { Ok(()) }
})
.await
if let Err(e) = profile::edit(&associated_profile, |prof| {
prof.metadata.recent_time_played += diff as u64;
async { Ok(()) }
})
.await
{
tracing::warn!(
"Failed to update playtime for profile {}: {}",
Expand All @@ -181,7 +180,7 @@ impl Children {
let diff = Utc::now()
.signed_duration_since(last_updated_playtime)
.num_seconds();
if let Err(e) = profile::edit(&associated_profile, |mut prof| {
if let Err(e) = profile::edit(&associated_profile, |prof| {
prof.metadata.recent_time_played += diff as u64;
async { Ok(()) }
})
Expand Down
2 changes: 1 addition & 1 deletion theseus_cli/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "theseus_cli"
version = "0.5.0"
version = "0.5.1"
authors = ["Jai A <[email protected]>"]
edition = "2018"

Expand Down
4 changes: 2 additions & 2 deletions theseus_gui/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "theseus_gui",
"private": true,
"version": "0.5.0",
"version": "0.5.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand All @@ -18,7 +18,7 @@
"floating-vue": "^2.0.0-beta.20",
"mixpanel-browser": "^2.47.0",
"ofetch": "^1.0.1",
"omorphia": "^0.4.35",
"omorphia": "^0.4.38",
"pinia": "^2.1.3",
"qrcode.vue": "^3.4.0",
"tauri-plugin-window-state-api": "github:tauri-apps/tauri-plugin-window-state#v1",
Expand Down
8 changes: 4 additions & 4 deletions theseus_gui/pnpm-lock.yaml

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

2 changes: 1 addition & 1 deletion theseus_gui/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "theseus_gui"
version = "0.5.0"
version = "0.5.1"
description = "A Tauri App"
authors = ["you"]
license = ""
Expand Down
2 changes: 1 addition & 1 deletion theseus_gui/src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "Modrinth App",
"version": "0.5.0"
"version": "0.5.1"
},
"tauri": {
"allowlist": {
Expand Down
12 changes: 7 additions & 5 deletions theseus_gui/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,11 @@ command_listener((e) => {
<AccountsCard ref="accounts" mode="small" />
</suspense>
<div class="pages-list">
<RouterLink to="/" class="btn icon-only collapsed-button">
<RouterLink v-tooltip="'Home'" to="/" class="btn icon-only collapsed-button">
<HomeIcon />
</RouterLink>
<RouterLink
v-tooltip="'Browse'"
to="/browse/modpack"
class="btn icon-only collapsed-button"
:class="{
Expand All @@ -230,7 +231,7 @@ command_listener((e) => {
>
<SearchIcon />
</RouterLink>
<RouterLink to="/library" class="btn icon-only collapsed-button">
<RouterLink v-tooltip="'Library'" to="/library" class="btn icon-only collapsed-button">
<LibraryIcon />
</RouterLink>
<Suspense>
Expand All @@ -240,14 +241,15 @@ command_listener((e) => {
</div>
<div class="settings pages-list">
<Button
v-tooltip="'Create profile'"
class="sleek-primary collapsed-button"
icon-only
:disabled="offline"
@click="() => $refs.installationModal.show()"
>
<PlusIcon />
</Button>
<RouterLink to="/settings" class="btn icon-only collapsed-button">
<RouterLink v-tooltip="'Settings'" to="/settings" class="btn icon-only collapsed-button">
<SettingsIcon />
</RouterLink>
</div>
Expand All @@ -260,7 +262,7 @@ command_listener((e) => {
</section>
<section class="mod-stats">
<Suspense>
<RunningAppBar data-tauri-drag-region />
<RunningAppBar />
</Suspense>
</section>
</div>
Expand Down Expand Up @@ -290,7 +292,7 @@ command_listener((e) => {
offset-height="var(--appbar-height)"
offset-width="var(--sidebar-width)"
/>
<RouterView v-slot="{ Component }" class="main-view">
<RouterView v-slot="{ Component }">
<template v-if="Component">
<Suspense @pending="loading.startLoading()" @resolve="loading.stopLoading()">
<component :is="Component"></component>
Expand Down
1 change: 1 addition & 0 deletions theseus_gui/src/assets/icons/bug.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions theseus_gui/src/assets/icons/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ export { default as TextInputIcon } from './text-cursor-input.svg'
export { default as AddProjectImage } from './add-project.svg'
export { default as NewInstanceImage } from './new-instance.svg'
export { default as MenuIcon } from './menu.svg'
export { default as BugIcon } from './bug.svg'
export { default as ChatIcon } from './messages-square.svg'
1 change: 1 addition & 0 deletions theseus_gui/src/assets/icons/messages-square.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions theseus_gui/src/components/GridDisplay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ const filteredResults = computed(() => {
<DropdownSelect
v-model="sortBy"
class="sort-dropdown"
name="Sort Dropdown"
:options="['Name', 'Last played', 'Date created', 'Date modified', 'Game version']"
placeholder="Select..."
/>
Expand All @@ -254,6 +255,7 @@ const filteredResults = computed(() => {
<DropdownSelect
v-model="filters"
class="filter-dropdown"
name="Filter Dropdown"
:options="['All profiles', 'Custom instances', 'Downloaded modpacks']"
placeholder="Select..."
/>
Expand All @@ -263,6 +265,7 @@ const filteredResults = computed(() => {
<DropdownSelect
v-model="group"
class="group-dropdown"
name="Group Dropdown"
:options="['Category', 'Loader', 'Game version', 'None']"
placeholder="Select..."
/>
Expand Down
Loading

0 comments on commit 49bfb06

Please sign in to comment.