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

Modal function #184

Closed
wants to merge 25 commits into from
Closed
Changes from all 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
2 changes: 1 addition & 1 deletion bin/bot.js
Original file line number Diff line number Diff line change
@@ -75,7 +75,7 @@ async function startBot() {
const name = process.env.BOT_NAME;

// base64 encoded token
let token = process.env.BOT_API_KEY;
let token = 'xoxb-248266143441-zgzDCId1tMbBG7GKaToXsUi2' //process.env.BOT_API_KEY;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing semicolon. (semi)
Expected exception block, space or tab after '//' in comment. (spaced-comment)

if (token.length > 42) token = atob(token);

const obj = new Parse.Object(DB.BOT.CALL);
Binary file added data/dumbledore.db
Binary file not shown.
Binary file added data/dumbledore_sample.db
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/dumbledore.js
Original file line number Diff line number Diff line change
@@ -155,4 +155,4 @@ class Dumbledore {
}
}

module.exports = Dumbledore;
module.exports = Dumbledore;

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Newline required at end of file but not found. (eol-last)

18 changes: 18 additions & 0 deletions package.json.rej
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
diff a/package.json b/package.json (rejected hunks)
@@ -17,5 +17,16 @@
"random-js": "^1.0.8",
"slackbots": "^1.1.0",
"sqlite3": "^3.1.13"
+ },
+ "bin": {
+ "dumbledore": "bot.js"
+ },
+ "devDependencies": {},
+ "keywords": []
+ /*
+ "repository" : {
+ "type": "git",
+ "url" : "https://github.com/LeeYeEun2/Dumbledore.git"
}
+ */
}
45 changes: 45 additions & 0 deletions page/src/components/NavBar.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
html, body{height : 100%}
#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_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;
}

#bot_name {
position: relative;
left : 8%;
height: 33px;
}

#bot_pw {
position: relative;
left : 8.6%;
height: 33px;
}