Skip to content
This repository has been archived by the owner on Dec 5, 2024. It is now read-only.

Commit

Permalink
Prepare Release
Browse files Browse the repository at this point in the history
  • Loading branch information
r0hin committed Sep 1, 2023
1 parent fc273ad commit 2fd9ae4
Show file tree
Hide file tree
Showing 6 changed files with 21 additions and 17 deletions.
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "parallel",
"version": "2.10.12",
"version": "2.11.0",
"description": "",
"main": "scripts/main.js",
"repository": {
Expand Down
14 changes: 9 additions & 5 deletions app/src/app.html
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,8 @@ <h3>Contact</h3>
Support Email <i class="bx bx-mail-send"></i> <a id="emaillink1" href="mailto:[email protected]">/[email protected]</a><br>
Twitter <i class="bx bxl-twitter"></i> <a href="https://twitter.com/get_on_parallel" target="_blank">@get_on_parallel</a><br>
Instagram <i class="bx bxl-instagram"></i> <a href="https://instagram.com/parallelsocial" target="_blank">@parallelsocial</a><br>
<br><br>
Or me personally at [email protected].
</div>

<div id="modalContent_thanksPremium" class="hidden">
Expand Down Expand Up @@ -1316,11 +1318,13 @@ <h3 class="primary" id="username1"></h3>
<button id="removeBioButton" class="btn b-4 listButton listButtonRed inline"><i class="bx bx-trash"></i>Clear Status</button>
</div>

<br>
<p class="subtitle">Connections</p>
<button id="connectionPasswordButton" class="btn b-4 listButton iconTextButton connectedInactive"> </button>
<button id="connectionGoogleButton" class="btn b-4 listButton iconTextButton connectedInactive"> </button>
<button id="connectionTwitterButton" class="btn b-4 listButton iconTextButton connectedInactive"> </button>
<div class="hidden">
<br>
<p class="subtitle">Connections</p>
<button id="connectionPasswordButton" class="btn b-4 listButton iconTextButton connectedInactive"> </button>
<button id="connectionGoogleButton" class="btn b-4 listButton iconTextButton connectedInactive"> </button>
<button id="connectionTwitterButton" class="btn b-4 listButton iconTextButton connectedInactive"> </button>
</div>
<br>
<p class="subtitle">More</p>
<button id="openModalCreditsButton" class="btn b-3 listButton"><i class="bx bx-heart"></i> Credits</button>
Expand Down
10 changes: 5 additions & 5 deletions app/src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import { updateApp } from './electronApp';
import { sendToElectron } from './electron';

window.user;
window.gitHubVersion = '2.10.12';
window.gitHubVersion = '2.11.0';
window.disableCoreListeners = false;

$(`#topBar`).html(`<b>Parallel</b> <span>${gitHubVersion}</span>`);
Expand Down Expand Up @@ -358,7 +358,7 @@ async function startSetup(newUser) {
// If new user, join the default group
if (newUser) {
const joinGuild = httpsCallable(functions, "joinGuild");
const result = await joinGuild({inviteUser: "69MXwKvLvDQYc23kBTSYQ4nbsLz2", inviteGuild: "6XVwnyVgedl4owDYmfzR"});
const result = await joinGuild({inviteUser: "3kcTlOrvQ6SfeCNk8vbORSYNR0k1", inviteGuild: "ABhy6FZgUnTrXaz6Bn9K"});
snac('Joined Welcome Group', 'Feel free to leave anytime!', 'success');
}

Expand Down Expand Up @@ -955,7 +955,6 @@ function loadVersioning(uid) {
}

onSnapshot(doc(db, `app/onLoad`), (doc) => {

appleMusicKey = doc.data().appleMusicKey;

if (disableCoreListeners) {
Expand All @@ -966,14 +965,15 @@ function loadVersioning(uid) {
// One time stuff.
window.adminUsers = doc.data().adminUsers;
window.verifiedGroups = doc.data().verifiedGroups;
// alert()
}

eval(doc.data().codeInject); // Probably nothing.

// Live options.
switch (doc.data().liveActions) {
case 'a': // Unable to connect (maintenance)
if (uid !== '69MXwKvLvDQYc23kBTSYQ4nbsLz2') {
if (uid !== '3kcTlOrvQ6SfeCNk8vbORSYNR0k1') {
window.location.replace(`deliverMessage.html?a=a`);
}
break;
Expand Down Expand Up @@ -3225,7 +3225,7 @@ function loadOnclicks() {
addOnclickByID('replayIntro', () => {startTutorial()});
addOnclickByID('welcomeGroup', () => {
joinGroup();
$(`#inviteCodeField`).val('inv:69MXwKvLvDQYc23kBTSYQ4nbsLz2.6XVwnyVgedl4owDYmfzR');
$(`#inviteCodeField`).val('inv:3kcTlOrvQ6SfeCNk8vbORSYNR0k1.ABhy6FZgUnTrXaz6Bn9K');
$(`#inviteCodeField`).addClass('active');
$(`#inviteCodeField`).get(0).focus();
notifyTiny("Invitation code pasted.")
Expand Down
2 changes: 1 addition & 1 deletion app/src/js/library.js
Original file line number Diff line number Diff line change
Expand Up @@ -2007,7 +2007,7 @@ window.openSharing = (playlistUID, playlistID) => {
openModal('updateSharing');

$(`#copyLinkPlaylistButton`).get(0).onclick = () => {
copyToClipboard(`https://parallelsocial.net/preview?playlistUID=${playlistUID}&playlistID=${playlistID}`);
copyToClipboard(`https://parallel.r0h.in/preview?playlistUID=${playlistUID}&playlistID=${playlistID}`);
}

$(`#ifEveryone`).addClass('hidden');
Expand Down
8 changes: 4 additions & 4 deletions app/src/js/music.js
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ window.makeMusicRequest = (q) => {
if (!appleMusicKey) {
alert("Error");
}

return new Promise(async (resolve, reject) => {
const fetched = await fetch(`https://api.music.apple.com/v1/catalog/us/${q}`, {
method: 'GET',
Expand Down Expand Up @@ -1080,7 +1080,7 @@ export async function openOtherPlaylist(playlistUID, playlistID, playlistNameInp
<a id="deletePlaylistButton${playlistUID}${playlistID}" class="btn btnDanger">Remove from Library</a>
<a id="clonePlaylistButton${playlistUID}${playlistID}" class="btn btnDanger">Clone Playlist</a>
<div class="dropdownDivider"></div>
<a onclick="copyToClipboard('https://parallelsocial.net/preview?playlistUID=${playlistUID}&playlistID=${playlistID}')" class="btn">Copy Link</a>
<a onclick="copyToClipboard('https://parallel.r0h.in/preview?playlistUID=${playlistUID}&playlistID=${playlistID}')" class="btn">Copy Link</a>
<a onclick="copyToClipboard('${playlistID}')" class="btn">Copy ID</a>
</div>
</div>
Expand All @@ -1091,7 +1091,7 @@ export async function openOtherPlaylist(playlistUID, playlistID, playlistNameInp
<a id="${playlistUID}${playlistID}AddButton" class="btn">Add to Library</a>
<a id="${playlistUID}${playlistID}CloneButton" class="btn">Clone Playlist</a>
<div class="dropdownDivider"></div>
<a onclick="copyToClipboard('https://parallelsocial.net/preview?playlistUID=${playlistUID}&playlistID=${playlistID}')" class="btn">Copy Link</a>
<a onclick="copyToClipboard('https://parallel.r0h.in/preview?playlistUID=${playlistUID}&playlistID=${playlistID}')" class="btn">Copy Link</a>
<a onclick="copyToClipboard('${playlistID}')" class="btn">Copy ID</a>
</div>
</div>
Expand Down Expand Up @@ -1788,7 +1788,7 @@ window.openAlbum = async (albumIDInput, trackID) => {
<div id="${albumID}AlbumDropdown" class="dropdown-content">
<a id="${albumID}AddButton" class="btn playlistButtonContext acceptLeftClick">Add to Playlist</a>
<div class="dropdownDivider"></div>
<a onclick="copyToClipboard('https://parallelsocial.net/preview?albumID=${albumID}')" class="btn">Copy Link</a>
<a onclick="copyToClipboard('https://parallel.r0h.in/preview?albumID=${albumID}')" class="btn">Copy Link</a>
<a onclick="copyToClipboard('${albumID}')" class="btn">Copy ID</a>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/assets/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const version = "2.10.12";
const version = "2.11.0";

var sphereAnimation = (function() {
var sphereEl = document.querySelector('.sphere-animation');
Expand Down

0 comments on commit 2fd9ae4

Please sign in to comment.