nogafam
/
fedilove-ui
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Added "Matches" page 

Matches page will show the follows/followers and both following as:
 People matched me / I matched people / We matched together
For this feature to work we have to make sure the Mastodon account is private,
 because we will use the "accept friend request" as a "both match"

Fixes:
* Improved chat painting intervals
* Added matches intl and new pages
* Fixed Toast UI
* Fixed a bug where home will not display correctly when before login
* Removed notification options from settings
* Improved code stability
* Added "myAccountId" fediloveData, which contains the user account id
* Replaced localStorage.userAccountId for fediloveData.myAccountId
* Improved path URL handling for /settings and /accounts
This commit is contained in:
Bofh 2021-01-07 01:25:04 +01:00
parent 4681c5a3e3
commit c1cb2f212e
8 changed files with 110 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/intl/en-US.js
View File

@ -61,6 +61,7 @@ export default {
home: 'Home',
meet: 'Meet!',
notifications: 'Notifications',
matches: 'Matches',
mutedUsers: 'Muted users',
pinnedStatuses: 'Pinned toots',
followRequests: 'Follow requests',

1
src/routes/_components/toast/Toast.html
View File

@ -25,7 +25,6 @@
display: flex;
flex-direction: column;
align-items: center;
border: 2px solid var(--toast-border);
background: var(--toast-bg);
border-radius: 5px;
margin: 0 40px;

20
src/routes/_pages/matches/index.html Normal file
View File

@ -0,0 +1,20 @@
<DynamicPageBanner title="{intl.follows}" />
<AccountsListPage {accountsFetcher} />
<script>
import { getFollows } from '../../_api/followsAndFollowers'
import AccountsListPage from '../../_components/AccountsListPage.html'
import { store } from '../../_store/store'
import DynamicPageBanner from '../../_components/DynamicPageBanner.html'
export default {
computed: {
accountId: ({ params }) => params.accountId,
accountsFetcher: ({ $currentInstance, $accessToken, accountId }) => () => getFollows($currentInstance, $accessToken, accountId)
},
store: () => store,
components: {
AccountsListPage,
DynamicPageBanner
}
}
</script>

14
src/routes/_pages/settings/instances/[instanceName].html
View File

@ -4,12 +4,6 @@
{#if verifyCredentials}
<h2>{intl.loggedInAs}</h2>
<InstanceUserProfile {verifyCredentials} />
<h2>{intl.homeTimelineFilters}</h2>
<HomeTimelineFilterSettings {instanceName} />
<h2>{intl.notificationFilters}</h2>
<NotificationFilterSettings {instanceName} />
<h2>{intl.pushNotifications}</h2>
<PushNotificationSettings {instanceName} />
<InstanceActions {instanceName} />
{/if}
@ -25,9 +19,6 @@
import { store } from '../../../_store/store'
import SettingsLayout from '../../../_components/settings/SettingsLayout.html'
import InstanceUserProfile from '../../../_components/settings/instance/InstanceUserProfile.html'
import HomeTimelineFilterSettings from '../../../_components/settings/instance/HomeTimelineFilterSettings.html'
import NotificationFilterSettings from '../../../_components/settings/instance/NotificationFilterSettings.html'
import PushNotificationSettings from '../../../_components/settings/instance/PushNotificationSettings.html'
import InstanceActions from '../../../_components/settings/instance/InstanceActions.html'
import { updateVerifyCredentialsForInstance } from '../../../_actions/instances'
@ -44,10 +35,7 @@
components: {
SettingsLayout,
InstanceUserProfile,
PushNotificationSettings,
InstanceActions,
HomeTimelineFilterSettings,
NotificationFilterSettings
InstanceActions
}
}
</script>

4
src/routes/_store/computations/navComputations.js
View File

@ -74,9 +74,9 @@ export function navComputations (store) {
},
{
name: 'notifications',
href: '/notifications',
href: '/matches',
svg: '#fa-asterisk',
label: 'intl.notifications'
label: 'intl.matches'
},
{
name: 'direct',

19
src/routes/matches/index.html Normal file
View File

@ -0,0 +1,19 @@
<Title name="{intl.follows}" />
<LazyPage {pageComponent} {params} />
<script>
import Title from '../_components/Title.html'
import LazyPage from '../_components/LazyPage.html'
import pageComponent from '../_pages/matches/index.html'
export default {
components: {
Title,
LazyPage
},
data: () => ({
pageComponent
})
}
</script>

1
src/scss/themes/ozark.scss
View File

@ -59,6 +59,7 @@ $deemphasized-text-color: #939393;
--article-bg: #{$article-bg};
--focus-outline: #{$button-primary-hover};
--focus-width: 1px;
--toast-text: #{$main-text-color};
--deemphasized-text-color: #{$deemphasized-text-color};
--very-deemphasized-text-color: #{$deemphasized-text-color};
}

64
static/fedilove-no-react.js
View File

@ -9,12 +9,17 @@ function mastodon_get(path, payload, callbk) { return mastodon_request('GET',
function mastodon_post(path, payload, callbk) { return mastodon_request('POST', path, payload, callbk); }
function mastodon_request(method, path, payload, callbk) {
payload = payload || null;
var url = 'https://'+fediloveApi.getCurrentInstance()+path;
var oReq = new XMLHttpRequest();
const ACCESS_TOKEN = window.fediloveApi.getAccessToken();
if (ACCESS_TOKEN === undefined)
return callbk(undefined);
const API_URL = 'https://'+fediloveApi.getCurrentInstance()+path;
const oReq = new XMLHttpRequest();
oReq.addEventListener("load", function() { callbk(this.responseText); });
oReq.open(method, url);
oReq.setRequestHeader('Authorization', 'Bearer '+fediloveApi.getAccessToken());
oReq.open(method, API_URL);
oReq.setRequestHeader('Authorization', 'Bearer '+ACCESS_TOKEN);
oReq.send(payload);
}
@ -240,10 +245,14 @@ var fediloveApi = {
return andUuid? { id: parts[parts.length-1], uuid: lastUuid } : parts[parts.length-1];
},
getAccessToken: function() {
var instance = fediloveApi.getCurrentInstance();
const instance = fediloveApi.getCurrentInstance();
if (instance === undefined)
return undefined;
return JSON.parse(localStorage.store_loggedInInstances)[instance].access_token;
},
getCurrentInstance: function() {
if (localStorage.store_currentInstance === undefined)
return undefined;
return JSON.parse(localStorage.store_currentInstance);
}
};
@ -265,6 +274,7 @@ var fediloveData = {
chatAvatarCache: undefined,
meetAccountCurrentImg: 0,
meetAccountImageLocked: false,
myAccountId: undefined,
currentAccount: null,
currentAccountIsEmpty: false,
gotEmojifyTextFunction: false,
@ -298,7 +308,7 @@ var fediloveEvents = {
if (data) {
// if the message is mine, search which account is doing it for,
// and do the same with the party's data
if (localStorage.store_userAccountId == data.account.id) {
if (fediloveData.myAccountId == data.account.id) {
var account_id = data.in_reply_to_account_id;
if (account_id === null && data.mentions.length > 0) {
account_id = data.mentions[0].id;
@ -340,7 +350,7 @@ function fedilove_customization() {
document.body.classList = '';
document.getElementById('sapper').style = '';
if (localStorage.store_currentInstance === "undefined") {
if ([undefined,"undefined"].includes(localStorage.store_currentInstance)) {
$('body').addClass('not-logged-in');
if (window.location.pathname == '/') {
$('body').addClass('home');
@ -348,6 +358,17 @@ function fedilove_customization() {
return;
}
// get the userAccountId to check against the href /account/NUM on the messages
// so we can apply different style to my messages
if (fediloveData.myAccountId === undefined) {
mastodon_get('/api/v1/accounts/verify_credentials', {}, function(data) {
const json = JSON.parse(data);
if (json !== undefined) {
fediloveData.myAccountId = json.id;
}
});
}
if (document.querySelector('#main-nav > div#dummy-nav') != null) {
document.querySelector('#main-nav > div#dummy-nav').remove();
document.querySelector('#main-nav > ul.main-nav-ul').style = '';
@ -432,24 +453,26 @@ function fedilove_customization() {
// this function changes the css class on articles (messages)
// that match the given account_id
var makeMessageUIModifications = function(account_id) {
var theint = 150;
var theint = 100;
const _this = setInterval(function()
{
// interval auto-destroyer
if (!window.location.pathname.startsWith('/statuses/')) {
clearInterval(_this);
return;
}
// paint MY messages as mine
if (fediloveData.myAccountId !== undefined) {
$('div.main-content.chat article.status-article').each(function(i) {
if ($(this).find('a.status-author-name').attr('href').endsWith(`/accounts/${account_id}`)) {
if ($(this).find('a.status-author-name').attr('href').endsWith(`/accounts/${fediloveData.myAccountId}`)) {
$(this).addClass('mymsg');
theint = 250;
} else {
$(this).addClass('partymsg');
}
});
}
// paint LIKES
$('a.status-favs-reblogs.status-favs').each(function(i) {
@ -473,31 +496,20 @@ function fedilove_customization() {
});
}, theint);
};
// get the userAccountId to check against the href /account/NUM on the messages
// so we can apply different style to my messages
if (localStorage.store_userAccountId === undefined) {
mastodon_get('/api/v1/accounts/verify_credentials', {}, function(data) {
var json = JSON.parse(data);
if (json !== undefined) {
localStorage.store_userAccountId = json.id;
makeMessageUIModifications(json.id);
}
});
} else {
makeMessageUIModifications(localStorage.store_userAccountId);
}
else if (window.location.pathname == '/matches') {
console.log('matches');
}
else if (window.location.pathname == '/direct') {
$('div.main-content').addClass('direct');
$('body').addClass('direct');
$('nav#main-nav li.main-nav-li svg')[2].classList += ' active';
}
else if (window.location.pathname == '/settings') {
else if (window.location.pathname.startsWith('/settings')) {
$('nav#main-nav li.main-nav-li svg')[3].classList += ' active';
}
else if (window.location.pathname.startsWith('/accounts/'))
else if (window.location.pathname.startsWith('/accounts/') &&
window.location.pathname.match(/^\/accounts\/\d+$/) !== null)
{
$('div.main-content').addClass('account');
$('body').addClass('account');