forked from BenC14/Dumbledore
-
Notifications
You must be signed in to change notification settings - Fork 29
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
. #190
Closed
Closed
. #190
Changes from all commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
70dabd3
.
Simhyunjeong16 c0d29af
Revert "."
Simhyunjeong16 56caa55
.
Simhyunjeong16 b66f2e2
Merge remote-tracking branch '_kosslab/master' into _kosslab_master
Simhyunjeong16 8f115b4
Merge branch '_kosslab_master'
Simhyunjeong16 7f45d09
.
Simhyunjeong16 22d88b1
Merge branch 'o'
Simhyunjeong16 ff7ee11
..
Simhyunjeong16 0556ac2
..
Simhyunjeong16 703a554
.
Simhyunjeong16 2949fa0
..
Simhyunjeong16 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -72,10 +72,10 @@ async function startBot() { | |
const botCount = await query.count(); | ||
|
||
if (!botCount) { | ||
const name = process.env.BOT_NAME; | ||
const name = 'bot1';//process.env.BOT_NAME; | ||
|
||
// base64 encoded token | ||
let token = process.env.BOT_API_KEY; | ||
let token = 'xoxb-248266143441-zgzDCId1tMbBG7GKaToXsUi2' //process.env.BOT_API_KEY; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Missing semicolon. (semi) |
||
if (token.length > 42) token = atob(token); | ||
|
||
const obj = new Parse.Object(DB.BOT.CALL); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
#navbar { | ||
background-color: black; | ||
padding: 1% 1.5%; | ||
display: flex; | ||
box-sizing: border-box; | ||
align-items: center; | ||
height: 6%; | ||
color: white; | ||
font-size: 1.3rem; | ||
} | ||
|
||
#login { | ||
margin-left: auto; | ||
} | ||
|
||
#login_key { | ||
position: relative; | ||
left : 15%; | ||
height: 33px; | ||
} | ||
|
||
#login_pw { | ||
position: relative; | ||
left : 6.7%; | ||
height: 33px; | ||
} | ||
|
||
#modal-size{ | ||
position: relative; | ||
left : 0%; | ||
width: 30%; | ||
margin: auto; | ||
-webkit-box-sizing: border-box; | ||
-moz-box-sizing: border-box; | ||
box-sizing: border-box; | ||
} | ||
|
||
#botRegister { | ||
margin-left: 80%; | ||
} | ||
|
||
#bot_name { | ||
position: relative; | ||
left : 8%; | ||
height: 33px; | ||
} | ||
|
||
#bot_pw { | ||
position: relative; | ||
left : 8.6%; | ||
height: 33px; | ||
} | ||
|
||
#bot_email { | ||
position: relative; | ||
left : 23%; | ||
height: 33px; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
diff a/page/src/components/NavBar.css b/page/src/components/NavBar.css (rejected hunks) | ||
@@ -36,7 +36,6 @@ | ||
} | ||
|
||
#botRegister { | ||
- margin-left: 83%; | ||
margin-left: 80%; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Expected exception block, space or tab after '//' in comment. (spaced-comment)