Skip to content

Commit

Permalink
Small fixes and changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Natsumi-sama committed May 28, 2024
1 parent 1810171 commit fff33bf
Show file tree
Hide file tree
Showing 7 changed files with 52 additions and 86 deletions.
7 changes: 6 additions & 1 deletion Dotnet/AppApi/AppApi.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,15 @@ public void RestartVR()
VRCXVR.Instance.Restart();
}

public void SetZoom(int zoomLevel)
public void SetZoom(double zoomLevel)
{
MainForm.Instance.Browser.SetZoomLevel(zoomLevel);
}

public async Task<double> GetZoom()
{
return await MainForm.Instance.Browser.GetZoomLevelAsync();
}

/// <summary>
/// Retrieves an image from the VRChat API and caches it for future use. The function will return the cached image if it already exists.
Expand Down
102 changes: 35 additions & 67 deletions html/package-lock.json

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

4 changes: 2 additions & 2 deletions html/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"normalize.css": "^8.0.1",
"noty": "^3.2.0-beta-deprecated",
"prettier": "^3.2.2",
"pug": "^3.0.2",
"pug": "^3.0.3",
"pug-plain-loader": "^1.1.0",
"raw-loader": "^4.0.2",
"sass": "^1.69.7",
Expand All @@ -50,7 +50,7 @@
"vue-data-tables": "^3.4.5",
"vue-i18n": "^8.28.2",
"vue-lazyload": "^1.3.4",
"vue-markdown": "^2.2.4",
"vue-markdown": "^2.1.3",
"vue-marquee-text-component": "^1.2.0",
"webpack": "^5.89.0",
"webpack-cli": "^5.1.4",
Expand Down
14 changes: 2 additions & 12 deletions html/src/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ speechSynthesis.getVoices();
status === 401 &&
data.error.message === '"Missing Credentials"'
) {
if (endpoint.substring(0, 9) === 'auth/user') {
if (endpoint === 'auth/user') {
this.$emit('AUTOLOGIN');
}
throw new Error('401: Missing Credentials');
Expand Down Expand Up @@ -10006,7 +10006,7 @@ speechSynthesis.getVoices();
this.feedTable.loading = true;
var vipList = [];
if (this.feedTable.vip) {
vipList = this.getUserVipList();
vipList = Array.from(this.localFavoriteFriends.values());
}
this.feedTable.data = await database.lookupFeedDatabase(
this.feedTable.search,
Expand All @@ -10016,16 +10016,6 @@ speechSynthesis.getVoices();
this.feedTable.loading = false;
};

$app.methods.getUserVipList = function () {
var vipList = [];
API.cachedFavorites.forEach((favorite) => {
if (favorite.type === 'friend') {
vipList.push(favorite.favoriteId);
}
});
return vipList;
};

API.$on('LOGIN', async function (args) {
$app.friendLog = new Map();
$app.feedTable.data = [];
Expand Down
5 changes: 3 additions & 2 deletions html/src/localization/en/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -429,9 +429,10 @@
"avatar_database_provider": "Avatar Database Provider"
},
"youtube_api": {
"header": "Youtube API",
"header": "YouTube API",
"enable": "Enable",
"youtube_api_key": "Youtube API Key"
"youtube_api_key": "YouTube API Key",
"enable_tooltip": "Fetches video titles for use with gameLog and duration for overlay progress bar"
},
"video_progress_pie": {
"header": "Progress pie overlay for videos",
Expand Down
4 changes: 2 additions & 2 deletions html/src/masks/askme.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 html/src/mixins/tabs/settings.pug
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,8 @@ mixin settingsTab()
span.header {{ $t('view.settings.advanced.advanced.youtube_api.header') }}
div.options-container-item
span.name {{ $t('view.settings.advanced.advanced.youtube_api.enable') }}
el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.youtube_api.enable_tooltip')")
i.el-icon-info
el-switch(v-model="youTubeApi" @change="changeYouTubeApi")
div.options-container-item
el-button(size="small" icon="el-icon-caret-right" @click="showYouTubeApiDialog") {{ $t('view.settings.advanced.advanced.youtube_api.youtube_api_key') }}
Expand Down

0 comments on commit fff33bf

Please sign in to comment.