From 9ab295aedbe55d722553e753a82b734a58c39a46 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 17 Nov 2019 16:01:11 +0000 Subject: [PATCH 1/6] ACCOUNT PAGE LAYOUT Identified the layout which will be used No changes have been made yet --- views/account.handlebars | 64 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 views/account.handlebars diff --git a/views/account.handlebars b/views/account.handlebars new file mode 100644 index 0000000..95c6315 --- /dev/null +++ b/views/account.handlebars @@ -0,0 +1,64 @@ + + + + + + + + + Accounts page + + + + + +
+
+

Account

+ +
+

Name:

+ + +

Email Address:

+ + +

+

:

+ +
    +
  1. +
  2. +
  3. +
+

+

+ + +
+ + + + \ No newline at end of file From ec5985c8295919a8308a910eef0e1d492e8d9cc3 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 25 Nov 2019 17:40:17 +0000 Subject: [PATCH 2/6] layout --- index.js | 8 +++++++- views/account.handlebars | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/index.js b/index.js index a0c6fdc..6e2ff51 100644 --- a/index.js +++ b/index.js @@ -103,7 +103,13 @@ router.post('/login', async ctx => { await ctx.render('error', {message: err.message}) } }) - +router.post('/account', async ctx => { + try { + + } catch(err) { + + } +}) router.get('/logout', async ctx => { ctx.session.authorised = null ctx.redirect('/?msg=you are now logged out') diff --git a/views/account.handlebars b/views/account.handlebars index 95c6315..1e4df89 100644 --- a/views/account.handlebars +++ b/views/account.handlebars @@ -39,14 +39,14 @@

Account

-

Name:

+

Username:

-

Email Address:

+

Password:

-

-

:

+

Email address:

+

Profile Picture:

  1. From 7d8980884ca842c710d6b57f4058ee692bbf48de Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 29 Nov 2019 23:19:51 +0000 Subject: [PATCH 3/6] Finished account Displays current users info using userhash to search the database and present data --- index.js | 35 ++++++++++++++++++-- modules/user.js | 1 + views/account.handlebars | 70 ++++++++++------------------------------ 3 files changed, 50 insertions(+), 56 deletions(-) diff --git a/index.js b/index.js index b3ce2f8..48b0248 100644 --- a/index.js +++ b/index.js @@ -172,13 +172,42 @@ router.post('/login', async ctx => { await ctx.render('error', {message: err.message}) } }) -router.post('/account', async ctx => { + +router.get('/account', async ctx => { + try { + let sql = 'SELECT id, user, userHash, pass FROM users' + // if(ctx.session.authorised !== true) return ctx.redirect('/login?msg=You need to log in') + // const user = await new User(dbName) + // await user + // console.log(user) + // const data = `SELECT id, user, userHash, pass FROM users` + // await ctx.render('account',{user:data}) - } catch(err) { - + const db = await + Database.open(dbName) + const data = await db.all(sql) + await db.close() + + await ctx.render('account',{user:data}) + +} catch (err) { + await ctx.render('error', {message: err.message}) } }) + +router.post('/account', koaBody, async ctx => { + try { + const user = await new User(dbName) + //const data = {} + await user + + } catch (err) { + await ctx.render('error', { message: err.message }) + } +}) + + router.get('/logout', async ctx => { ctx.session.authorised = null ctx.redirect('/') diff --git a/modules/user.js b/modules/user.js index 614af59..6faef04 100644 --- a/modules/user.js +++ b/modules/user.js @@ -95,6 +95,7 @@ module.exports = class User { } catch (err) { await ctx.render('error', { message: err.message }) } + } diff --git a/views/account.handlebars b/views/account.handlebars index 1e4df89..1848cf8 100644 --- a/views/account.handlebars +++ b/views/account.handlebars @@ -1,63 +1,27 @@ - - - - - + Accounts page - + - - -
    -
    -

    Account

    - -
    -

    Username:

    - - -

    Password:

    - - -

    Email address:

    -

    Profile Picture:

    - -
      -
    1. -
    2. -
    3. -
    -

    -

    - - +

    Account

    + + {{#each user}} +
    +

    UserID: {{this.id}}

    +

    Username: {{this.user}}

    +

    User Hash: {{this.userHash}}

    +

    User password: {{this.pass}}

    + {{/each}} + From ac87bbb116c7d89eb551ff809a39257002016804 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 30 Nov 2019 00:19:23 +0000 Subject: [PATCH 4/6] Added css code and accessed the database --- index.js | 12 +- modules/user.js | 1 - public/account.css | 470 +++++++++++++++++++++++++++++++++++++ views/AboutUs.handlebars | 1 + views/ContactUs.handlebars | 1 + views/account.handlebars | 52 +++- views/download.handlebars | 1 + views/home.handlebars | 1 + views/myfiles.handlebars | 1 + views/transfer.handlebars | 1 + 10 files changed, 524 insertions(+), 17 deletions(-) create mode 100644 public/account.css diff --git a/index.js b/index.js index 48b0248..736ff1a 100644 --- a/index.js +++ b/index.js @@ -176,22 +176,22 @@ router.post('/login', async ctx => { router.get('/account', async ctx => { try { - let sql = 'SELECT id, user, userHash, pass FROM users' + const userName = ctx.session.userName + const sql = `SELECT id, user, userHash, pass FROM users WHERE userHash = "${userName}"` // if(ctx.session.authorised !== true) return ctx.redirect('/login?msg=You need to log in') // const user = await new User(dbName) // await user // console.log(user) // const data = `SELECT id, user, userHash, pass FROM users` // await ctx.render('account',{user:data}) - const db = await Database.open(dbName) const data = await db.all(sql) - await db.close() + await db.close() + + await ctx.render('account',{user: data}) - await ctx.render('account',{user:data}) - -} catch (err) { + } catch (err) { await ctx.render('error', {message: err.message}) } }) diff --git a/modules/user.js b/modules/user.js index 6faef04..614af59 100644 --- a/modules/user.js +++ b/modules/user.js @@ -95,7 +95,6 @@ module.exports = class User { } catch (err) { await ctx.render('error', { message: err.message }) } - } diff --git a/public/account.css b/public/account.css new file mode 100644 index 0000000..d18ae1b --- /dev/null +++ b/public/account.css @@ -0,0 +1,470 @@ +@charset "UTF-8"; +@import url('https://fonts.googleapis.com/css?family=Inconsolata:700'); + +*{ + margin:0; + padding:0; +} +/* hello */ +html, body, input[name='fileName'] { + /* font-family: Avantgarde, Arial, sans-serif; */ + font-family: 'Public Sans', sans-serif; + height: 100%; + position: relative; + color: black; + font-size: 20px; + font-weight: bold; + /* background: #062641; */ + background: white; + /* width: 100%; */ + /* display: inline-block; */ + +} + +body { + min-width: 800px; + width: auto; +} + + header { + position: relative; + /* min-width: 800px; */ + width: 100%; + height: 130px; + /* border: 3px solid black; */ + } + + #logo { + position: absolute; + /* top: 50%; */ + left: 30px; + /* margin-top: -80px; */ + height: 125px; + width: auto; + /* margin-left: 40px */ +} + +.avatar { + + border-radius: 200px; + box-sizing: border-box; + padding: 5px; + background-color: rgb(230, 230, 230); + /* border: 3px solid #9da6aa; */ + width: 50px; + height: auto; +} + +#nav1{ + position: absolute; + top: 50%; + right: 3%; + margin-top: -25px; +} + + +#nav1 a { + color: white; + vertical-align: middle; + font-size: 14px; + text-decoration: none; +} + + +#nav1 span { + vertical-align: middle; + margin-left: 5px; + +} + +#nav1Top { + border-bottom: 1px solid white; +} + +#nav1 ul { + width: 95px; + margin: 0; + padding: 0; + position: absolute; + top: 110%; + left: 50%; + margin-left: -55px; + transition: all 0.3s; + visibility: hidden; + opacity: 0; + background-color: #11B8FF; + /* background-color: rgb(230, 230, 230); */ + border-radius: 10px 10px 10px 10px; + padding: 0 5px 0 5px; + z-index: 1; + +} + +#nav1 ul li { + list-style-type: none; + padding: 15px 5px 15px 5px; + + /* border-bottom: 2px solid #9da6aa; */ + + +} + +#nav1:hover ul{ + opacity: 1; + visibility: visible; + +} + +.navImg { + height: 20px; + width: auto; + color: white; + float: left; + vertical-align: middle; +} + +.search{ + position: absolute; + top:50%; + left:50%; + display: block; + transform: translate(-50%,-50%); + background: rgb(230, 230, 230); + height:40px; + border-radius: 40px; + padding: 10px; + +} + +.search:hover > .search-txt, .search-txt:not(:placeholder-shown), .search-txt:focus-within { + width:300px; + padding: 2px; +} + + +.search-btn{ + width: 38px; + height:38px; + border-radius: 100%; + vertical-align: middle; + position: relative; + top: 2px; + left: 2px; + +} + +.search-txt{ + border:none; + background:none; + outline:none; + float:left; + padding:0; + color:black; + font-size:16px; + transition:0.4s; + line-height: 38px; + width:0px; +} + +#nav2 { + font-size: 22px; + float: left; + border-radius: 0 70px 0 0; + width: 250px; + height: inherit; + background:#11B8FF; +} + +#nav2 ul { + margin: 35px 0 0 35px; + padding: 0; + list-style-type: none; + +} + + + +#nav2 a { + color: rgb(0, 127, 182); + text-decoration: none; +} + +#nav2 a.active { + color: white; +} + +#nav2 li { + padding: 20px 0 20px 0; +} + +#info { + font-size: 15px; + text-align: center; +} + +#UserInformation { + overflow: hidden; + height: inherit; + padding: 40px 80px 0 80px; + /* display: block; */ + /* margin-left: 370px; */ + /* left: 25%; */ +} + +#tableHead { + display: inline-block; + position: relative; + /* min-width: 380px; */ + width: 100%; +} + +#tableHead h1 { + font-size: 30px; + float: left; +} + +table, th, td { + /* border: 1px solid black; */ +} + +table { + margin-top: 30px; + border-collapse: collapse; + width: 100%; + min-width: 380px; + text-align: left; + vertical-align: middle; + /* height: 100%; */ +} + +#headRow th{ + color: rgb(202, 202, 202); +} + +#headRow { + border-bottom: 0px; + +} + +table tr { + height: 30px; + /* border-bottom: 1px solid gray; */ +} + +table tr td { + padding: 20px 0 20px 0; +} + +.UserName { + width: 10%; +} + +.UserID { + width: 5%; +} + +.UserHash { + width: 45%; +} + +.UserPassword { + width: 5%; +} + +#bigButton { + margin-left: 30px; +} + +#bigButton img { + margin-right: 5px; +} + +#bigButton span{ + vertical-align: middle; + position: relative; + top: 1px; +} + +#twoButtons { + float: right; +} + +.smlImg { + + height: 15px; + width: auto; + vertical-align: middle; + padding-right: 1px; + margin: 2px +} + +#twoButtons button { + margin-left: 4px; +} + +/* #fileTree form { + width: 60%; +} */ + +#uploadForm { + position: relative; + margin-left: 50px; + float:left; +} + +#uploadForm label{ + /* margin: 30px 0 25px 0; */ + /* display: inline-block; */ + cursor: pointer; + width: 300px; +} + +#uploadForm label p { + margin-top: 7px; + margin-left: 10px; + float: left; +} + +#uploadForm input { + float: left; +} + +#uploadForm + input:required .confirmButton { + color: black; +} + + +#confirmButton { + display: none; +} + +.bigButton { + cursor: pointer; + color: white; + float: left; + margin-top: 4px; + font-size: 20px; + background-color: #11B8FF; + width: 100px; + border-radius: 10px; + margin-left: 30px; + border: 0px; + padding: 2px 10px 2px 10px; + transition-duration: 0.3s; +} + +.inputUpload { + height: 0.1px; + width: 0.1px; + overflow: hidden; + z-index: -1; + opacity: 0; + position: absolute; +} + +/* .inputUpload + label{ + /* float: left; */ + +.inputUpload:focus label:hover img, +.inputUpload + label:hover img, +.confirmButton:hover, #transferButton:hover, +.button:hover, +.bigButton:hover { + background-color: rgb(0, 134, 192); + transition-duration: 0.3s; +} + +.inputUpload + label > img { + width: 35px; + height: 35px; + padding-left: 0.5px; + background-color: #11B8FF; + transition-duration: 0.3s; + float: left; + border-radius: 200px; +} + +.inputInfo input, .inputInfo textarea { + width: 60%; + padding: 10px 2px 10px 4px; + margin: 10px 0px 30px 0px; + max-width: 350px; + min-width: 200px; + border: 0px; + /* border-bottom: 1px solid rgb(230, 230, 230); */ + font-size: 17px; + font-style: italic; + font-family: 'Public Sans', sans-serif; + background-color: rgb(230, 230, 230); + border-radius: 4px; + +} + +.inputInfo input:focus, .inputInfo textarea:focus { + outline: none +} +.inputInfo textarea { + padding-bottom: 50px; + padding-top: 5px; +} + +#msg { + float: left; + opacity: 1; + margin-top: 6px; + margin-left: 20%; + transition: 1s; +} + +#filename { + margin: 40px 0 20px 0; +} + +#fileTree a { + text-decoration: none; +} + +button { + cursor: pointer; +} + +#transferButton { + width: 60%; + margin-top: 4px; + background-color: #11B8FF; + border-radius: 10px; + + +} + +form[action="/transfer"] { + margin-top: 30px; +} + +#transfered { + margin-top: 60px; + position: absolute; + float: left; +} + +input[name='fileName']:placeholder-shown { + display: none; +} + +input[name='fileName'] { + background-color: white; + font-size: 25px; +} + +#visibleFile { + padding: 30px 0 30px 0; +} + +#fileBox { + margin-top: 40px; +} + +#downloadButton { + margin-left: 0; + padding-right: 5px; +} \ No newline at end of file diff --git a/views/AboutUs.handlebars b/views/AboutUs.handlebars index f94f6f4..8fae926 100644 --- a/views/AboutUs.handlebars +++ b/views/AboutUs.handlebars @@ -24,6 +24,7 @@
  2. Files
  3. Contact Us
  4. Logout
    5. +
  5. Account
    6. \ No newline at end of file diff --git a/views/ContactUs.handlebars b/views/ContactUs.handlebars index b513aeb..6674822 100644 --- a/views/ContactUs.handlebars +++ b/views/ContactUs.handlebars @@ -23,6 +23,7 @@
  6. Files
  7. About Us
  8. Logout
    9. +
  9. Account
    10. \ No newline at end of file diff --git a/views/account.handlebars b/views/account.handlebars index 1848cf8..5935137 100644 --- a/views/account.handlebars +++ b/views/account.handlebars @@ -3,24 +3,56 @@ Accounts page - + -

    Account

    - - {{#each user}} +
    + + +
    + + {{!-- {{#each user}}

    UserID: {{this.id}}

    Username: {{this.user}}

    User Hash: {{this.userHash}}

    User password: {{this.pass}}

    - {{/each}} + {{/each}} --}} + +
    +
    +

    My Files

    + + + + + + + + {{#each user}} + + + + + + + {{/each}} +
    UsernameIDUser hashPassword (hashed)
    {{this.user}}{{this.id}}{{this.userHash}}{{this.pass}}KB
    +
    diff --git a/views/download.handlebars b/views/download.handlebars index 9cb83a2..ec76c4b 100644 --- a/views/download.handlebars +++ b/views/download.handlebars @@ -21,6 +21,7 @@ diff --git a/views/home.handlebars b/views/home.handlebars index f92790e..875566e 100644 --- a/views/home.handlebars +++ b/views/home.handlebars @@ -21,6 +21,7 @@
  10. My Files
  11. About
  12. Contact Us
    13. +
  13. Account
    14. {{!-- TODO: Change this button to Sign Out when user is logged in --}} diff --git a/views/myfiles.handlebars b/views/myfiles.handlebars index 4797ac1..d1f53d0 100644 --- a/views/myfiles.handlebars +++ b/views/myfiles.handlebars @@ -42,6 +42,7 @@ diff --git a/views/transfer.handlebars b/views/transfer.handlebars index b52b8e6..f5bbe83 100644 --- a/views/transfer.handlebars +++ b/views/transfer.handlebars @@ -35,6 +35,7 @@ From 5d336e283e6e4a744ea8fa0d9287a29d7f1c1a79 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 30 Nov 2019 00:32:27 +0000 Subject: [PATCH 5/6] Added css code and accessed the database Made the page easier for users By creating css file to give better layout --- index.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/index.js b/index.js index ffa277c..39a8e11 100644 --- a/index.js +++ b/index.js @@ -188,12 +188,6 @@ router.get('/account', async ctx => { try { const userName = ctx.session.userName const sql = `SELECT id, user, userHash, pass FROM users WHERE userHash = "${userName}"` - // if(ctx.session.authorised !== true) return ctx.redirect('/login?msg=You need to log in') - // const user = await new User(dbName) - // await user - // console.log(user) - // const data = `SELECT id, user, userHash, pass FROM users` - // await ctx.render('account',{user:data}) const db = await Database.open(dbName) const data = await db.all(sql) From 1444f05125891f8d97464f070e0e609c977a03b5 Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 30 Nov 2019 00:49:17 +0000 Subject: [PATCH 6/6] Cleaned up files To make code more readable Went into css and html file and removed unused code --- index.js | 2 - public/account.css | 269 --------------------------------------- views/account.handlebars | 15 +-- 3 files changed, 1 insertion(+), 285 deletions(-) diff --git a/index.js b/index.js index 39a8e11..59fbe01 100644 --- a/index.js +++ b/index.js @@ -192,7 +192,6 @@ router.get('/account', async ctx => { Database.open(dbName) const data = await db.all(sql) await db.close() - await ctx.render('account',{user: data}) } catch (err) { @@ -203,7 +202,6 @@ router.get('/account', async ctx => { router.post('/account', koaBody, async ctx => { try { const user = await new User(dbName) - //const data = {} await user } catch (err) { diff --git a/public/account.css b/public/account.css index d18ae1b..88fe566 100644 --- a/public/account.css +++ b/public/account.css @@ -7,18 +7,13 @@ } /* hello */ html, body, input[name='fileName'] { - /* font-family: Avantgarde, Arial, sans-serif; */ font-family: 'Public Sans', sans-serif; height: 100%; position: relative; color: black; font-size: 20px; font-weight: bold; - /* background: #062641; */ background: white; - /* width: 100%; */ - /* display: inline-block; */ - } body { @@ -28,29 +23,22 @@ body { header { position: relative; - /* min-width: 800px; */ width: 100%; height: 130px; - /* border: 3px solid black; */ } #logo { position: absolute; - /* top: 50%; */ left: 30px; - /* margin-top: -80px; */ height: 125px; width: auto; - /* margin-left: 40px */ } .avatar { - border-radius: 200px; box-sizing: border-box; padding: 5px; background-color: rgb(230, 230, 230); - /* border: 3px solid #9da6aa; */ width: 50px; height: auto; } @@ -62,7 +50,6 @@ body { margin-top: -25px; } - #nav1 a { color: white; vertical-align: middle; @@ -70,7 +57,6 @@ body { text-decoration: none; } - #nav1 span { vertical-align: middle; margin-left: 5px; @@ -97,16 +83,11 @@ body { border-radius: 10px 10px 10px 10px; padding: 0 5px 0 5px; z-index: 1; - } #nav1 ul li { list-style-type: none; padding: 15px 5px 15px 5px; - - /* border-bottom: 2px solid #9da6aa; */ - - } #nav1:hover ul{ @@ -123,49 +104,6 @@ body { vertical-align: middle; } -.search{ - position: absolute; - top:50%; - left:50%; - display: block; - transform: translate(-50%,-50%); - background: rgb(230, 230, 230); - height:40px; - border-radius: 40px; - padding: 10px; - -} - -.search:hover > .search-txt, .search-txt:not(:placeholder-shown), .search-txt:focus-within { - width:300px; - padding: 2px; -} - - -.search-btn{ - width: 38px; - height:38px; - border-radius: 100%; - vertical-align: middle; - position: relative; - top: 2px; - left: 2px; - -} - -.search-txt{ - border:none; - background:none; - outline:none; - float:left; - padding:0; - color:black; - font-size:16px; - transition:0.4s; - line-height: 38px; - width:0px; -} - #nav2 { font-size: 22px; float: left; @@ -182,8 +120,6 @@ body { } - - #nav2 a { color: rgb(0, 127, 182); text-decoration: none; @@ -206,9 +142,6 @@ body { overflow: hidden; height: inherit; padding: 40px 80px 0 80px; - /* display: block; */ - /* margin-left: 370px; */ - /* left: 25%; */ } #tableHead { @@ -223,10 +156,6 @@ body { float: left; } -table, th, td { - /* border: 1px solid black; */ -} - table { margin-top: 30px; border-collapse: collapse; @@ -269,202 +198,4 @@ table tr td { .UserPassword { width: 5%; -} - -#bigButton { - margin-left: 30px; -} - -#bigButton img { - margin-right: 5px; -} - -#bigButton span{ - vertical-align: middle; - position: relative; - top: 1px; -} - -#twoButtons { - float: right; -} - -.smlImg { - - height: 15px; - width: auto; - vertical-align: middle; - padding-right: 1px; - margin: 2px -} - -#twoButtons button { - margin-left: 4px; -} - -/* #fileTree form { - width: 60%; -} */ - -#uploadForm { - position: relative; - margin-left: 50px; - float:left; -} - -#uploadForm label{ - /* margin: 30px 0 25px 0; */ - /* display: inline-block; */ - cursor: pointer; - width: 300px; -} - -#uploadForm label p { - margin-top: 7px; - margin-left: 10px; - float: left; -} - -#uploadForm input { - float: left; -} - -#uploadForm + input:required .confirmButton { - color: black; -} - - -#confirmButton { - display: none; -} - -.bigButton { - cursor: pointer; - color: white; - float: left; - margin-top: 4px; - font-size: 20px; - background-color: #11B8FF; - width: 100px; - border-radius: 10px; - margin-left: 30px; - border: 0px; - padding: 2px 10px 2px 10px; - transition-duration: 0.3s; -} - -.inputUpload { - height: 0.1px; - width: 0.1px; - overflow: hidden; - z-index: -1; - opacity: 0; - position: absolute; -} - -/* .inputUpload + label{ - /* float: left; */ - -.inputUpload:focus label:hover img, -.inputUpload + label:hover img, -.confirmButton:hover, #transferButton:hover, -.button:hover, -.bigButton:hover { - background-color: rgb(0, 134, 192); - transition-duration: 0.3s; -} - -.inputUpload + label > img { - width: 35px; - height: 35px; - padding-left: 0.5px; - background-color: #11B8FF; - transition-duration: 0.3s; - float: left; - border-radius: 200px; -} - -.inputInfo input, .inputInfo textarea { - width: 60%; - padding: 10px 2px 10px 4px; - margin: 10px 0px 30px 0px; - max-width: 350px; - min-width: 200px; - border: 0px; - /* border-bottom: 1px solid rgb(230, 230, 230); */ - font-size: 17px; - font-style: italic; - font-family: 'Public Sans', sans-serif; - background-color: rgb(230, 230, 230); - border-radius: 4px; - -} - -.inputInfo input:focus, .inputInfo textarea:focus { - outline: none -} -.inputInfo textarea { - padding-bottom: 50px; - padding-top: 5px; -} - -#msg { - float: left; - opacity: 1; - margin-top: 6px; - margin-left: 20%; - transition: 1s; -} - -#filename { - margin: 40px 0 20px 0; -} - -#fileTree a { - text-decoration: none; -} - -button { - cursor: pointer; -} - -#transferButton { - width: 60%; - margin-top: 4px; - background-color: #11B8FF; - border-radius: 10px; - - -} - -form[action="/transfer"] { - margin-top: 30px; -} - -#transfered { - margin-top: 60px; - position: absolute; - float: left; -} - -input[name='fileName']:placeholder-shown { - display: none; -} - -input[name='fileName'] { - background-color: white; - font-size: 25px; -} - -#visibleFile { - padding: 30px 0 30px 0; -} - -#fileBox { - margin-top: 40px; -} - -#downloadButton { - margin-left: 0; - padding-right: 5px; } \ No newline at end of file diff --git a/views/account.handlebars b/views/account.handlebars index 5935137..15020cf 100644 --- a/views/account.handlebars +++ b/views/account.handlebars @@ -21,18 +21,8 @@
  14. My Files
  15. About
  16. Contact Us
    17. - {{!-- TODO: Change this button to Sign Out when user is logged in --}} - {{!-- {{#each user}} -
    -

    UserID: {{this.id}}

    -

    Username: {{this.user}}

    -

    User Hash: {{this.userHash}}

    -

    User password: {{this.pass}}

    -
    - {{/each}} --}} -

    My Files

    @@ -52,9 +42,6 @@ {{/each}} -
    - - +
    - \ No newline at end of file