Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update discord.js and electron & prettier code #231

Merged
merged 9 commits into from
Apr 19, 2023
Merged
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions css/channelList.css
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ limitations under the License. */
transform: rotate(180deg);
}

.news {
.GuildNews {
height: 18px !important;
width: 18px !important;
padding: 1px;
Expand All @@ -98,7 +98,7 @@ limitations under the License. */
margin: 2px 0 0 -5px;
}

.voice {
.GuildVoice {
user-select: none;
margin-left: -5px;
}
Expand Down
3 changes: 1 addition & 2 deletions css/fonts.css
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
@font-face {
font-family: UniSans-bold;
src: url("../resources/fonts/UniSans-SemiBold.otf");

}

@font-face {
Expand All @@ -24,4 +23,4 @@
@font-face {
font-family: UniSans;
src: url(../resources/fonts/UniSans-Heavy.ttf);
}
}
1 change: 0 additions & 1 deletion css/master.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */


div > * {
user-select: text;
}
Expand Down
12 changes: 4 additions & 8 deletions css/messageBar.css
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ limitations under the License. */
height: 40px;
padding-bottom: 10px;
z-index: 2;

}

#sendmsg::before {
Expand All @@ -44,7 +43,7 @@ limitations under the License. */
border-radius: 5px;
padding: 0 10px 0 0;
display: flex;

/* display: table; */
}

Expand All @@ -62,7 +61,7 @@ limitations under the License. */
resize: none;
display: inline-block;
padding: 10px;
width:100%;
width: 100%;
}

.messageBoxText {
Expand All @@ -78,17 +77,15 @@ limitations under the License. */
/* display: table-row; */
}


/* Additional message bar icons */
#msgMisc {
display: block;
height: 100%;
float: right;
margin-top:4px;
margin-top: 4px;
display: grid;
grid-auto-flow: column;
grid-column-gap: 4px;

}

#msgMisc img {
Expand All @@ -104,7 +101,6 @@ limitations under the License. */
opacity: 1;
}


/* Typing Indicator */
#typingIndicator {
font-size: 14px;
Expand Down Expand Up @@ -173,4 +169,4 @@ limitations under the License. */
}
}

/* */
/* */
48 changes: 30 additions & 18 deletions css/miscs.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License. */


@charset "UTF-8";
/**
*
Expand All @@ -26,7 +25,6 @@ limitations under the License. */
*
*/


.dot-bricks {
position: relative;
top: 8px;
Expand All @@ -36,48 +34,62 @@ limitations under the License. */
border-radius: 5px;
background-color: #9880ff;
color: #9880ff;
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff;
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff,
10007px 0 0 0 #9880ff;
animation: dotBricks 2s infinite ease;
}

@keyframes dotBricks {
0% {
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff;
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff,
10007px 0 0 0 #9880ff;
}
8.333% {
box-shadow: 10007px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff;
box-shadow: 10007px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff,
10007px 0 0 0 #9880ff;
}
16.667% {
box-shadow: 10007px -16px 0 0 #9880ff, 9991px -16px 0 0 #9880ff, 10007px 0 0 0 #9880ff;
box-shadow: 10007px -16px 0 0 #9880ff, 9991px -16px 0 0 #9880ff,
10007px 0 0 0 #9880ff;
}
25% {
box-shadow: 10007px -16px 0 0 #9880ff, 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff;
box-shadow: 10007px -16px 0 0 #9880ff, 9991px -16px 0 0 #9880ff,
9991px 0 0 0 #9880ff;
}
33.333% {
box-shadow: 10007px 0 0 0 #9880ff, 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff;
box-shadow: 10007px 0 0 0 #9880ff, 9991px -16px 0 0 #9880ff,
9991px 0 0 0 #9880ff;
}
41.667% {
box-shadow: 10007px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff;
box-shadow: 10007px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff,
9991px 0 0 0 #9880ff;
}
50% {
box-shadow: 10007px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff, 9991px -16px 0 0 #9880ff;
box-shadow: 10007px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff,
9991px -16px 0 0 #9880ff;
}
58.333% {
box-shadow: 9991px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff, 9991px -16px 0 0 #9880ff;
box-shadow: 9991px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff,
9991px -16px 0 0 #9880ff;
}
66.666% {
box-shadow: 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff, 9991px -16px 0 0 #9880ff;
box-shadow: 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff,
9991px -16px 0 0 #9880ff;
}
75% {
box-shadow: 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff;
box-shadow: 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff,
10007px -16px 0 0 #9880ff;
}
83.333% {
box-shadow: 9991px -16px 0 0 #9880ff, 10007px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff;
box-shadow: 9991px -16px 0 0 #9880ff, 10007px 0 0 0 #9880ff,
10007px -16px 0 0 #9880ff;
}
91.667% {
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff, 10007px -16px 0 0 #9880ff;
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff,
10007px -16px 0 0 #9880ff;
}
100% {
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff, 10007px 0 0 0 #9880ff;
box-shadow: 9991px -16px 0 0 #9880ff, 9991px 0 0 0 #9880ff,
10007px 0 0 0 #9880ff;
}
}
}
4 changes: 2 additions & 2 deletions css/splashScreen.css
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ limitations under the License. */
#stuckLoadingCont {
min-height: 20px;
width: 150px;
background-color: rgba(0,0,0,0);
background-color: rgba(0, 0, 0, 0);
position: relative;
float: right;
right: 10px;
Expand Down Expand Up @@ -377,4 +377,4 @@ p {

.greenText {
color: #00ff96;
}
}
2 changes: 1 addition & 1 deletion css/titlebar.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,4 @@
.titleButton img {
margin-left: 50%;
transform: translate(calc(-50% - 1px));
}
}
54 changes: 36 additions & 18 deletions dontOpenMe.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@
<title>LiveBot</title>
<!-- Javascript -->
<script type="text/javascript">
if (typeof process === 'undefined') {
alert("This isn't going to work. Please follow the instructions on LiveBot's github page in the readme.md file. This app is based on NodeJS and it's modules and is not made to work in a browser.")
if (typeof process === "undefined") {
alert(
"This isn't going to work. Please follow the instructions on LiveBot's github page in the readme.md file. This app is based on NodeJS and it's modules and is not made to work in a browser."
);
}

// "Fixes" a deprecation in the electron source code
// https://developer.chrome.com/blog/enabling-shared-array-buffer/
if (!crossOriginIsolated) SharedArrayBuffer = ArrayBuffer;
Expand Down Expand Up @@ -58,9 +60,9 @@
<script src="js/embedMenu.js" charset="utf-8"></script>

<!-- CSS -->
<link rel="stylesheet" href="css/fonts.css">
<link rel="stylesheet" href="css/fonts.css" />
<link rel="stylesheet" href="css/master.css" />
<link rel="stylesheet" href="css/titlebar.css">
<link rel="stylesheet" href="css/titlebar.css" />
<link rel="stylesheet" href="css/embeds.css" />
<link rel="stylesheet" href="css/memberList.css" />
<link rel="stylesheet" href="css/userSettings.css" />
Expand All @@ -79,13 +81,25 @@
<div id="titlebar">
<span>LiveBot</span>
<div class="titleButton" id="exit">
<img src="resources/icons/closeWindow.svg" alt="close" width="10px">
<img
src="resources/icons/closeWindow.svg"
alt="close"
width="10px"
/>
</div>
<div class="titleButton" id="screenSnap">
<img src="resources/icons/snapWindowSize.svg" alt="snap" width="10px">
<img
src="resources/icons/snapWindowSize.svg"
alt="snap"
width="10px"
/>
</div>
<div class="titleButton" id="minimize">
<img src="resources/icons/minimizeWindow.svg" alt="min" width="10px">
<img
src="resources/icons/minimizeWindow.svg"
alt="min"
width="10px"
/>
</div>
</div>

Expand All @@ -96,30 +110,30 @@
<div id="splashScreen">
<div id="stuckLoadingCont">
<h2>Stuck Loading?</h2>

<div id="faqMenu">
<p>There are a few common issues that can occur in the loading screen. If you're having an issue, follow these steps to resolve any issues. If you're still having problems after that, join the <a target="_blank" href="https://discord.gg/NG4rgqSgzx">support server</a>.</p>
<hr>
<hr />

<h3>Is your firewall blocking LiveBot?</h3>
<p>Try disabling your Windows Defender firewall temporarily, then restarting LiveBot, to see if that fixes your issue. You can also then choose to enable LiveBot through your firewall if that solves the problem.</p>
<hr>
<hr />

<h3>Is the bot in any servers?</h3>
<p>Your bot will need to be in at least 1 server for LiveBot to get past the loading screen. Try making a temporary testing server, and invite the bot to it, then restart LiveBot.</p>
<hr>
<hr />

<h3>Are the gateway intents enabled?</h3>
<p>LiveBot requires both gateway intents to be enabled.</p>
<img src="https://cdn.honeybeeks.net/IGB0f3qF0y.png">
<hr>
<img src="https://cdn.honeybeeks.net/IGB0f3qF0y.png" />
<hr />

<h3>Clearing the cache.</h3>
<p>If the loading screen is stuck saying "Logging into the bot", then you may need to clear the local storage cache. To do that easily, click the button below, then restart livebot.</p>
<p>If the loading screen is stuck saying "Logging into the bot", then you may need to clear the local storage cache. To do that easily, click the button below, then restart LiveBot.</p>
<div>
<button id="clearCache">Clear Local Storage</button>
</div>
<br><br>
<br /><br />
</div>
</div>
<div id="splashLoading">
Expand Down Expand Up @@ -318,7 +332,11 @@ <h5 id="guildName">LiveBot</h5>
rows="1"
></textarea>
<div id="msgMisc">
<img id="embedBuilderIcon" src="resources/icons/embedIcon.svg" alt="embedIcon">
<img
id="embedBuilderIcon"
src="resources/icons/embedIcon.svg"
alt="embedIcon"
/>
<!--<img src="resources/icons/newsChannel.svg" alt="testIcon2"> -->
</div>
</div>
Expand Down
Loading