From 7810e3bf9821921aede98e258f7156a6522d7d06 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sat, 15 Aug 2015 19:18:45 -0700 Subject: [PATCH 01/14] Created a front end thing --- app/views/index.erb | 481 +++++++++++++++++++++++++++++++++++++++++++ app/views/index.html | 61 ++++++ app/views/main.css | 33 +++ app/views/test.json | 21 ++ 4 files changed, 596 insertions(+) create mode 100644 app/views/index.erb create mode 100644 app/views/index.html create mode 100644 app/views/main.css create mode 100644 app/views/test.json diff --git a/app/views/index.erb b/app/views/index.erb new file mode 100644 index 0000000..9dc9284 --- /dev/null +++ b/app/views/index.erb @@ -0,0 +1,481 @@ +Keith + + + +Drive +My Drive +NEW +Folders and views +My Drive +Shared with me +Google Photos +Recent +Starred +Trash +Name +Owner +Last modified +File size +Website +me +10:10 am +— +Sharedpics +me +Jun 29, 2015 +— +Final +me +May 29, 2015 +— +CIS 254 +me +May 24, 2015 +— +assign8 +me +May 21, 2015 +— +Shit +me +Apr 27, 2015 +— +Work +me +Mar 27, 2015 +— +Shapes +me +Mar 4, 2015 +— +Testfield +me +Feb 18, 2015 +— +Shared Resume +me +Feb 18, 2015 +— +IntegerSet +me +Feb 18, 2015 +— +assign2 +me +Feb 16, 2015 +— +CIS 114 +me +Feb 16, 2015 +— +.recommenders +me +Feb 12, 2015 +— +Rectangle +me +Feb 12, 2015 +— +Old +me +Feb 12, 2015 +— +.metadata +me +Feb 12, 2015 +— +Star Ronin +me +Feb 12, 2015 +— +Modern JavaScript Develop and Design - MG +me +Feb 5, 2015 +— +workspace +me +Jan 30, 2015 +— + +Iron Ghost.xlsm +me +Aug 8, 2015 +758 KB + +Soldier Tracker +me +Jul 1, 2015 +— + +SAM_2013_Getting_Started_Guide_Student_UPDATE.ppt +me +Jun 19, 2015 +6 MB + +Untitled document +me +Jun 16, 2015 +— + +060515 061315 Voucher doubles.pdf +me +Jun 7, 2015 +144 KB + +Final.zip +me +May 29, 2015 +88 KB + +assign8.zip +me +May 21, 2015 +568 KB + +document.pdf +me +Apr 23, 2015 +114 KB + +Durrius 2.0.pdf +me +Apr 4, 2015 +570 KB + +beefs.chum5 +me +Mar 31, 2015 +172 KB + +InternshipResume.docx +me +Mar 20, 2015 +21 KB + +ModernJSDD_CH07.pps +me +Mar 5, 2015 +433 KB + +Tracking.xlsx +me +Mar 5, 2015 +9 KB + +HoRNDIS-rel6.pkg +me +Mar 4, 2015 +114 KB + +10422980_1586144684958992_5126079436672262081_n.jpg +me +Mar 3, 2015 +33 KB + +nakasi-ktu84p-factory-76acdbe9.tgz +me +Feb 25, 2015 +363 MB + +InternshipResume.docx +me +Feb 20, 2015 +20 KB + +Cover Letter.docx +me +Feb 20, 2015 +14 KB + +assign2.zip +me +Feb 16, 2015 +163 KB + +Project2Files.zip +me +Feb 12, 2015 +4 KB + +Paul Deitel , Harvey Deitel - Java How To Program, 10th Edition (Early Objects).pdf +me +Jan 24, 2015 +15 MB +My Drive +Details +Activity +TODAY + +Youuploaded 2 items +10:10 AM +Style Sheet +main.css +HTML +index.html + +Youcreated an item in +10:10 AM +Google Drive Folder +My Drive +Google Drive Folder +Website +YESTERDAY + +Julia Ladutkoedited an item +Computer • Fri 10:38 PM +Image +IMG_2008.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:38 PM +Image +IMG_2009.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:38 PM +Image +IMG_2006.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:38 PM +Image +IMG_2005.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:38 PM +Image +IMG_2007.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:37 PM +Image +IMG_2003.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:37 PM +Image +IMG_2002.JPG + +Julia Ladutkoedited an item +Computer • Fri 10:37 PM +Image +IMG_2004.JPG +LAST WEEK + +Youuploaded an item +Aug 8 +Excel +Iron Ghost.xlsm +L +LEIGH DUGGANadded 25 items to +Aug 5 +Google Drive Folder +Sharedpics +Image +IMG_2167.JPG +Image +IMG_2176.JPG +Image +IMG_2183.JPG +Image +IMG_2163.JPG +Image +IMG_2007.JPG +Image +IMG_2172.JPG +Show all... +LAST MONTH + +Youedited an item +Jul 1 +Google Sheets +Soldier Tracker + +Youshared an item +Jul 1 +Excel +Tracking.xlsx +Can view +Anyone with the link + +Youshared an item +Jul 1 +Google Sheets +Soldier Tracker +G +Can comment +Glen Naftaniel + +Youcreated and shared an item in +Jul 1 +Google Drive Folder +My Drive +Google Sheets +Soldier Tracker +Can comment +Anyone with the link +EARLIER THIS YEAR + +Julia Ladutkocreated and shared 122 items in +Computer • Jun 30 +Google Drive Folder +Sharedpics +Image +IMG_20150628_142746.jpg +Image +IMG_20150628_143439.jpg +Image +IMG_20150628_130753.jpg +Image +IMG_20150628_143436.jpg +Image +IMG_20150628_142815.jpg +Image +IMG_20150628_130750.jpg +Show all... +L +Can edit +LEIGH DUGGAN +Can edit +Anyone with the link + +Can edit +You + +Youcreated and shared 18 items in +Mobile • Jun 30 +Google Drive Folder +Sharedpics +Image +IMG_20150626_154636.jpg +Image +IMG_20150626_154705.jpg +Image +IMG_20150626_154634.jpg +Image +IMG_20150620_195640.jpg +Image +IMG_20150628_115203.jpg +Image +IMG_20150626_155332.jpg +Show all... +L +Can edit +LEIGH DUGGAN +Can edit +Anyone with the link + +Youcreated and shared an item in +Mobile • Jun 29 +Google Drive Folder +My Drive +Google Drive Folder +Sharedpics +L +Can edit +LEIGH DUGGAN +Can edit +Anyone with the link + +Youuploaded an item +Jun 19 +PowerPoint +SAM_2013_Getting_Started_Guide_Student_UPDATE.ppt +Get Drive for PC +3 GB used (22%) +Buy more storage + +index.html +Open with + + + + + + + + + + + + +
+
+ + +
+
+ +
+
+

Welcome to Eastman.

+

The most adequate web developer you've ever seen.

+ Learn More +
+
+
+
+
  • Java
    • +
  • Javascript
    • +
  • PhP
    • +
  • Android
    • +
    +
    +
    +

    Neighborhood Guides

    +

    Not sure where to stay? We've created neighborhood guides for cities all around the world'

    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    Travel

    +

    From apartments and rooms to treehouses and boats: stay in unique spaces in 192 countries.

    +

    See how to travel on Airbnb

    +
    +
    +

    Host

    +

    Renting out your unused space could pay your bills or fund your next vacation.

    +

    Learn more about hosting

    +
    +
    +

    Trust and Safety

    +

    From Verified ID to our worldwide customer support team, we've got your back.

    +

    Learn about trust at Airbnb

    +
    +
    +
    +
    + + \ No newline at end of file diff --git a/app/views/index.html b/app/views/index.html new file mode 100644 index 0000000..8b9cc58 --- /dev/null +++ b/app/views/index.html @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + +
    +
    + +
    +
    + +
    +
    +

    Results for $query

    +
    +
    +
    +
    +
    +
      + + +
        +
      • Resource 1
        • +
        10
        + + + + + + + +
      • Author
        • +
        + +

        Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...

        + Read More +
      +
      +
      + + \ No newline at end of file diff --git a/app/views/main.css b/app/views/main.css new file mode 100644 index 0000000..b3a7dbf --- /dev/null +++ b/app/views/main.css @@ -0,0 +1,33 @@ +.glyphicon-thumbs-up{ + color: green; +} + +.glyphicon-thumbs-down{ + color: red; +} + +.tally{ + color: #8AB800; + margin-bottom: 0px; + font-size: 20pt; +} + +.thumb{ + position: relative; + margin-bottom: 10px; + padding-top: 0px; +} + +.title { + display: inline; + color: black; + font-size: 30px; + padding-top: 5 px; +} + +ul{ + list-style-type: none; +} +.authorName{ + font-size: 18px; +} diff --git a/app/views/test.json b/app/views/test.json new file mode 100644 index 0000000..e16afbb --- /dev/null +++ b/app/views/test.json @@ -0,0 +1,21 @@ +[ + +{ +"title": "title1", +"description": "description1", +"author": "Raplph author", +"votes": 10 +}, +{ +"title": "title2", +"description": "description2", +"author": "Raplph author", +"votes": 10 +}, +{ +"title": "title3", +"description": "description3", +"author": "Raplph author", +"votes": 10 +} +] \ No newline at end of file From 07b44102e10f7fea9654f06f30f928042d1e9791 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sat, 15 Aug 2015 19:29:37 -0700 Subject: [PATCH 02/14] Updating things .slice(255) is probably bad code --- app/views/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/index.html b/app/views/index.html index 8b9cc58..1252734 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -33,7 +33,7 @@

      Results for $query

      $(document).ready(function() { $.getJSON( "test.json", function( data ) { $.each( data, function( key, val ) { - $('#list').append("
    • " + val.title +"
      "+ val.description+"
      • " ); + $('#list').append("
    • " + val.title +"
      "+ val.description.slice(255)+"
      • " ); }); }); }); From 3681f9b039826e9e4a6fcc56a8295b9fdcdb9020 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 11:03:53 -0700 Subject: [PATCH 03/14] Right sided upvotes Moved upvotes to right. Author is losing formatting. --- app/views/index.html | 12 +++++++++--- app/views/main.css | 4 ++++ app/views/test.json | 12 ++++++------ 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index 1252734..680423e 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -33,13 +33,19 @@

      Results for $query

      $(document).ready(function() { $.getJSON( "test.json", function( data ) { $.each( data, function( key, val ) { - $('#list').append("
    • " + val.title +"
      "+ val.description.slice(255)+"
      • " ); + $('#list').append( + '

    • ' + val.title +'


      '+val.author+'

      '+ + '
      ' + val.votes + + '
      '+ + '' + + '
      '+ '

      '+val.description.slice(0,255)+'...Read More

      ' + + '
      • '); }); }); }); -
        +
      diff --git a/app/views/main.css b/app/views/main.css index b3a7dbf..5c3db88 100644 --- a/app/views/main.css +++ b/app/views/main.css @@ -31,3 +31,7 @@ ul{ .authorName{ font-size: 18px; } + +.desc { + text-align: left; +} \ No newline at end of file diff --git a/app/views/test.json b/app/views/test.json index e16afbb..79ceeeb 100644 --- a/app/views/test.json +++ b/app/views/test.json @@ -1,20 +1,20 @@ [ { -"title": "title1", -"description": "description1", +"title": "title title title1", +"description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", "votes": 10 }, { -"title": "title2", -"description": "description2", +"title": "title title title2", +"description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", "votes": 10 }, { -"title": "title3", -"description": "description3", +"title": "title title title3", +"description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", "votes": 10 } From c6a03f566a650182723863b30483fdcaab318662 Mon Sep 17 00:00:00 2001 From: calvwng Date: Sun, 16 Aug 2015 11:34:33 -0700 Subject: [PATCH 04/14] Fixed authorname alignment issue in narrow screen style --- app/views/index.html | 14 +++++++------- app/views/main.css | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index 680423e..bd5c2bd 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -8,7 +8,7 @@ - + @@ -22,7 +22,7 @@
      -

      Results for $query

      +

      NoteSter

      @@ -30,7 +30,7 @@

      Results for $query

        - +
        - \ No newline at end of file + diff --git a/app/views/main.css b/app/views/main.css index 5c3db88..ebbde2a 100644 --- a/app/views/main.css +++ b/app/views/main.css @@ -28,6 +28,10 @@ ul{ list-style-type: none; } + +li{ + height: 120px; +} .authorName{ font-size: 18px; } From d1b63a31bcc385f2a697be2138f7b001a115e70d Mon Sep 17 00:00:00 2001 From: calvwng Date: Sun, 16 Aug 2015 12:17:19 -0700 Subject: [PATCH 05/14] Cleaning up Resource template for easier future reference --- app/views/index.html | 85 ++++++++++++++++++++++++-------------------- 1 file changed, 47 insertions(+), 38 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index bd5c2bd..32cd722 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -3,12 +3,11 @@ - - + + - @@ -25,43 +24,53 @@

        NoteSter

        -
        -
        -
        -
          - - -
          -
          + + + + + + +
        • Author
          • +
          + +

          Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...

          + Read More + --> + + + From 5265e6b8954b5cfc92e3973cf19aebdbf9251586 Mon Sep 17 00:00:00 2001 From: calvwng Date: Sun, 16 Aug 2015 13:58:45 -0700 Subject: [PATCH 06/14] Put Resource contents into cards Card implementation through "panel" class --- app/views/index.html | 54 ++++++++++++++++++++++++++++++++------------ app/views/main.css | 22 +++++++++++++++--- 2 files changed, 58 insertions(+), 18 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index 32cd722..6f56817 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -33,21 +33,45 @@

          NoteSter

          $(document).ready(function() { $.getJSON( "test.json", function( data ) { $.each( data, function( key, val ) { - $('#list').append( - '
        • ' + - '

          ' + val.title +'


          ' + - '

          '+val.author+'

          '+ - '
          ' + - '
          ' + val.votes + '
          ' + - '' + - ''+ - '' + - '' + - '' + - '' + - '
          ' + - '

          '+val.description.slice(0,255)+'...Read More

          ' + - '
          • '); + $('#list').append( + '
        • \ +
          \ +
          \ +
          \ +

          ' + val.title + '

          \ +
          ' + val.author + '
          \ +
          \ +
          \ +
          ' + val.votes + '
          \ + ' + + '\ + \ + \ + \ + \ +
          \ +
          \ +
          \ +

          '+ val.description.slice(0,255) +'...Read More

          \ +
          \ +
          \ +
          • ' + ); + // $('#list').append( + // '
        • ' + + // '

          ' + val.title +'


          ' + + // '

          '+val.author+'

          '+ + // '
          ' + + // '
          ' + val.votes + '
          ' + + // '' + + // ''+ + // '' + + // '' + + // '' + + // '' + + // '
          ' + + // '

          '+val.description.slice(0,255)+'...Read More

          ' + + // '
          • '); }); }); }); diff --git a/app/views/main.css b/app/views/main.css index ebbde2a..9198fe2 100644 --- a/app/views/main.css +++ b/app/views/main.css @@ -7,7 +7,7 @@ } .tally{ - color: #8AB800; +/* color: #8AB800; */ margin-bottom: 0px; font-size: 20pt; } @@ -30,12 +30,28 @@ ul{ } li{ - height: 120px; + margin-bottom: 50px; + margin-top: 30px; } + +.panel{ +/* border: 1px solid black; */ + box-shadow: 1px 1px 10px grey; +} + +.panel-body{ + height: 150px; +} + +.panel-heading{ + background-color: gold; + height: 88px; +} + .authorName{ font-size: 18px; } .desc { text-align: left; -} \ No newline at end of file +} From b6a3bd45af064ab67d2fe30db06d3bc84feeef1c Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 14:19:57 -0700 Subject: [PATCH 07/14] Merged card implementation --- app/views/images/NoteStrIcon.png | Bin 0 -> 3641 bytes app/views/index.html | 19 ++++++++------- app/views/main.css | 39 +++++++++++++++++++++++++++++++ app/views/main.js | 14 +++++++++++ app/views/test.json | 4 ++-- 5 files changed, 65 insertions(+), 11 deletions(-) create mode 100644 app/views/images/NoteStrIcon.png create mode 100644 app/views/main.js diff --git a/app/views/images/NoteStrIcon.png b/app/views/images/NoteStrIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..75df1272d576f2dffb60867b2c95e1bc870edcf3 GIT binary patch literal 3641 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 - -
          +
          -
          @@ -24,10 +28,7 @@

          NoteSter

          -
          -
          -
            diff --git a/app/views/main.css b/app/views/main.css index 9198fe2..ee69e0b 100644 --- a/app/views/main.css +++ b/app/views/main.css @@ -12,6 +12,45 @@ font-size: 20pt; } +.nav{ + padding-top:10px; +} + + +.nav li { + display: inline; +} + +.jumbotron{ +background-color:#3399cc !important; +color: #fff !important; +border: 0px solid #3399cc; +border-radius: 10px; +} + +.logo-img{ + width:10%; + height:10%; + display: inline-block; +} +.btn{ + font-weight:bold; + color:#fff; + background-color: #3399cc; + overflow: hidden; + height:42px; +} + +.input-box{ + padding: 9px; + border: 2px solid #3399cc; + border-radius: 5px; + width: 700px; + font-size:14px; + display: inline-block; + overflow: hidden; +} + .thumb{ position: relative; margin-bottom: 10px; diff --git a/app/views/main.js b/app/views/main.js new file mode 100644 index 0000000..0892535 --- /dev/null +++ b/app/views/main.js @@ -0,0 +1,14 @@ +$(document).ready(function() { + $.getJSON( "test.json", function( data ) { + $.each( data, function( key, val ) { + $('#list').append( + '

          • ' + val.title +'


            '+val.author+'

            '+ + '
            ' + val.votes + + '
            '+ + '' + + '
            '+ '

            '+val.description.slice(0,255)+'...Read More

            ' + + '
            • '); + }); + }); + }); + diff --git a/app/views/test.json b/app/views/test.json index 79ceeeb..66321b9 100644 --- a/app/views/test.json +++ b/app/views/test.json @@ -10,12 +10,12 @@ "title": "title title title2", "description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", -"votes": 10 +"votes": 2 }, { "title": "title title title3", "description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", -"votes": 10 +"votes": -1 } ] \ No newline at end of file From a4fe8e7b639f6f513920b465bab23e812b8efc85 Mon Sep 17 00:00:00 2001 From: calvwng Date: Sun, 16 Aug 2015 14:28:47 -0700 Subject: [PATCH 08/14] Moving getJSON to main.js --- app/views/index.html | 56 +++-------------------------------------- app/views/main.js | 59 +++++++++++++++++++++++++++++++++----------- 2 files changed, 49 insertions(+), 66 deletions(-) diff --git a/app/views/index.html b/app/views/index.html index 9374b38..0679c0a 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -16,10 +16,10 @@
            • - - + + - +
            @@ -30,54 +30,6 @@

            NoteSter

              - -
              - + diff --git a/app/views/main.js b/app/views/main.js index 0892535..76155b3 100644 --- a/app/views/main.js +++ b/app/views/main.js @@ -1,14 +1,45 @@ -$(document).ready(function() { - $.getJSON( "test.json", function( data ) { - $.each( data, function( key, val ) { - $('#list').append( - '

            • ' + val.title +'


              '+val.author+'

              '+ - '
              ' + val.votes + - '
              '+ - '' - + '
              '+ '

              '+val.description.slice(0,255)+'...Read More

              ' + - '
              • '); - }); - }); - }); - +$(document).ready(function() { + $.getJSON( "test.json", function( data ) { + $.each( data, function( key, val ) { + $('#list').append( + '
            • \ +
              \ +
              \ +
              \ +

              ' + val.title + '

              \ +
              ' + val.author + '
              \ +
              \ +
              \ +
              ' + val.votes + '
              \ + ' + + '\ + \ + \ + \ + \ +
              \ +
              \ +
              \ +

              '+ val.description.slice(0,255) +'...Read More

              \ +
              \ +
              \ +
              • ' + ); + // $('#list').append( + // '
            • ' + + // '

              ' + val.title +'


              ' + + // '

              '+val.author+'

              '+ + // '
              ' + + // '
              ' + val.votes + '
              ' + + // '' + + // ''+ + // '' + + // '' + + // '' + + // '' + + // '
              ' + + // '

              '+val.description.slice(0,255)+'...Read More

              ' + + // '
              • '); + }); + }); +}); From 33236fe441eed5cf39bcfab80b10962cec074b68 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 14:30:28 -0700 Subject: [PATCH 09/14] Updated color of cards and logo --- app/views/images/NoteStrIcon.png | Bin 3641 -> 3524 bytes app/views/main.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/images/NoteStrIcon.png b/app/views/images/NoteStrIcon.png index 75df1272d576f2dffb60867b2c95e1bc870edcf3..39fe04d76129ba50481d3486a6289705f8dcc5cc 100644 GIT binary patch delta 3453 zcmZXWdpy&N|Hp}wsoZbLrG}bYlcLL**x5AXRxy{kY|2#B+;2_p zxyx-B#B^Zw^mF5MtSG5}l*kb1ZLhZd=(ZsN_7 zO#?u|)51De6)|X@fM5VtaBrXe~1WF7TlBuY1$yVpq6|3)GG|Zh}+C1WX zmn{VUvTntj{pDuVrvyV|?{@-c4=-|SInL@_*vV^NNMW(|Hg|US0z!IPR)RMd7unit z)oazoTIMBbg$w}u^s|w;c(UEJJvKzxLYMqw`5ohtG+AhO=3DgGYRBUS7xD5gYA+Vd&C*-4}844 zX8bLJEP@mmahxtt{#EERev#4nvY|IUO{Ed_NuVyjW5l@bDh-B4jqE6}Lcyev^rQKM zG;6dfJUpJ6fKZraF30A!590uEeWFz9_pesvG}2}{uN!SCh1X6+nNE!g@Uu*Q z`GHXsKencnWqxV)S8ncLX-H4mOl0U6u@O0AIT#MrEvcpF36d+lK!KJ-&2qq|MuWN( zFC&^u?jv|Mdyu6xy@v)-Z<>6D4B9q_dLK*8p z3;J4x+-&wtSI)*ija@0x`y+wa0mM;%+u$byAyXsfSwGmpVsF}=h+~^oBM0Y~YUwSw zlbzSsoiBY|`M68-3;3WU% zGERmrE)6579hc9%9QQy=ZTBpU+%cKqAw)5zOj>64rn$Eir-S?Zd`ugL2C;DO6}?W8 zNq%_p{_w*@GhCkQp2UWa?m2-Cc4Q1|IGgLXXniYCA>71hg_y2$@2r4-azoaX%AUV1-RWFW8+wi?-f8f=4K2}Hi= zK&=GGA*65}&Ytz9+pERP(??K;p_Hr+;>3$=o{ep`>E{>|m=a;;M5~YEbkbK2{W0{+ zJfKl#F6)G-d+HS}CZ9EDm;zNF5vR`{VRU4VpZOW_IWosvphRLx@?g5&4v6&qx?4P> z7)mgUr?qjKHJoy#ev(nRq*D?1h8XY6>`s53g_@dX}QT+5t?E?@{~5{NT9LV(|5^UMc07mLY`15$3?JT`EA`_5dF zJ0WL&Vt{6@MOI;n(Y(S%OCI zF*<|eicg#G5zB$>+thyN(A&5+{0-?3Igahx7z-s~MvGR!Cu3sXC}GCPBeIf1!W)h8 z8Wjuhw$^o!8(Qox5+2iMqJ}|F9G$DxO41k3wh#~c=5HuG+fUe*M-3ob0xN7D78o;% z+GO%vE?$j_dsR~$-w-t~=Hm*6Dg1i#yw&jFhxdaZSx=yGw{^fJs zjGpsmFTke>AIy(vb9bNPCKTI2G1-mn-WJmd>DqKjVVy|F`>6DWmW6N6Fc%!W9Yt`y zueO<82W0Ka?GdQk)L%u_7)xEn8#NsfzEzHc>rP1jYREV6`A1hn*tcOPAAa{qI_o~y zp1|Dr7-=>!fy+3bzkie7cT|Dcw;&< z89+(y{J)=F=L?#U-ntiD?|1&)x{pkT2*}i_tzj4sFR) z^Lj1>svBxo&JRB_obQp23QyGbE-E@Gmi)C)y&Ui)*R@Tt9@Ig$sa=ojBn`65b?W#{1*$Ld0R<|dh_p` z>|T4=Iyn0n%P!<^hm?FA9uyB1eSZIt)N}GtKH&eAl-~{IU+fS4rw9=0+8;7z{{W7j zEl~Ok{5q6&!OsIs_?h6|Q~z>w{R}QTrt%AMGgX&D6TX%0_HDmpt_~rd&K^xvtsnNtUge??yU!1I7%Dc<;77zvr z4dA|4)!9K6MvR5NwKvw?dR+^t&4KSK7y55qcRne}p0t3-@HTK|INLS9kuvT5D&L?u zp0!qSlP3%%ak`)1yOMssD=lQkQDeJbS0gZ%-h{r}wdBZp#VaK7-Op*dau?r0=NgOlkf`SA0GG5SSl3$IXpx7#01DLER(Q739MjgF3H6R6F_JjK{yUy~*q-vR=l>%U~rxr&=RmPxCPjit4;& z_^{i1vVBEg?x;G!LP?_9208&Bf%uuoZK`T=+;&0#hTUC}7_uy>KMsGQz^x2&tZ0sa zR)dwBHPYIOTcu5{wRH?2rzBf6(_V|zQTP+ul7?*!{oj6luia@SS4mb?Rjp{N5w1^M b1vn3L>~`(rYIC&(Iew1;$^@B*a18q&2OPRw delta 3578 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%0A&m-xDcBD5$G Date: Sun, 16 Aug 2015 15:14:19 -0700 Subject: [PATCH 10/14] Changed thumbs Changed thumbs to buttons and changed css for votecount and buttons --- app/views/main.css | 9 +++++++++ app/views/main.js | 32 ++++++++++---------------------- 2 files changed, 19 insertions(+), 22 deletions(-) diff --git a/app/views/main.css b/app/views/main.css index d3b6461..7905130 100644 --- a/app/views/main.css +++ b/app/views/main.css @@ -78,6 +78,10 @@ li{ box-shadow: 1px 1px 10px grey; } +.panel #voteCount{ + text-align: center; +} + .panel-body{ height: 150px; } @@ -91,6 +95,11 @@ li{ font-size: 18px; } +.panel button{ + background: transparent; + border: none; +} + .desc { text-align: left; } diff --git a/app/views/main.js b/app/views/main.js index 76155b3..4a237ee 100644 --- a/app/views/main.js +++ b/app/views/main.js @@ -3,7 +3,7 @@ $(document).ready(function() { $.each( data, function( key, val ) { $('#list').append( '
            • \ -
              \ +
              \
              \
              \

              ' + val.title + '

              \ @@ -11,35 +11,23 @@ $(document).ready(function() {
              \
              \
              ' + val.votes + '
              \ - ' + + \ + \
              \
              \
              \ -

              '+ val.description.slice(0,255) +'...Read More

              \ +

              '+ val.description.slice(0,255) +'...Read More

              \
              \
              \
              • ' ); - // $('#list').append( - // '
            • ' + - // '

              ' + val.title +'


              ' + - // '

              '+val.author+'

              '+ - // '
              ' + - // '
              ' + val.votes + '
              ' + - // '' + - // ''+ - // '' + - // '' + - // '' + - // '' + - // '
              ' + - // '

              '+val.description.slice(0,255)+'...Read More

              ' + - // '
              • '); + //begin event handler + $("#card" + val.id).find("voteCount") }); }); + }); From 82a0df8b029950507ac7e7de5e1eb82f0daa8054 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 16:21:20 -0700 Subject: [PATCH 11/14] initialVoteClickHandler --- app/views/main.css | 5 +++++ app/views/main.js | 45 ++++++++++++++++++++++++++++++++++++++++++--- app/views/test.json | 3 +++ 3 files changed, 50 insertions(+), 3 deletions(-) diff --git a/app/views/main.css b/app/views/main.css index 7905130..caf2e58 100644 --- a/app/views/main.css +++ b/app/views/main.css @@ -41,6 +41,11 @@ border-radius: 10px; height:42px; } +.btn:hover{ +color:#fff; +background-color: #1f698d; +} + .input-box{ padding: 9px; border: 2px solid #3399cc; diff --git a/app/views/main.js b/app/views/main.js index 4a237ee..f3b6f64 100644 --- a/app/views/main.js +++ b/app/views/main.js @@ -3,7 +3,7 @@ $(document).ready(function() { $.each( data, function( key, val ) { $('#list').append( '
            • \ -
              \ +
              \
              \
              \

              ' + val.title + '

              \ @@ -14,7 +14,7 @@ $(document).ready(function() { \ - \
              \ @@ -25,8 +25,47 @@ $(document).ready(function() {
              \
              • ' ); + + //begin event handler - $("#card" + val.id).find("voteCount") + var voteContainer = $("#card" + val.id).find(".upDownVote"); + + //var isUp = false; + //var isDown = false; + + voteContainer.find("#upVoteButton").click(function(evt){ + var btn = evt.currentTarget; // the clicked button + console.log("up:" + evt.currentTarget); + + /* + if(!isUp){ + val.votes++; + isUp = true; + } + else{ + val.votes--; + isUp = false; + } + $("#voteCount").text(val.votes); + */ + }); + + voteContainer.find("#downVoteButton").click(function(evt){ + var btn = evt.currentTarget; // the clicked button + console.log("down:" + evt.currentTarget); + + /* + if(!isDown){ + val.votes--; + isDown = true; + } + else{ + val.votes++; + isDown = false; + } + $("#voteCount").text(val.votes); + */ + }); }); }); diff --git a/app/views/test.json b/app/views/test.json index 66321b9..9a2f655 100644 --- a/app/views/test.json +++ b/app/views/test.json @@ -1,18 +1,21 @@ [ { +"id": 1, "title": "title title title1", "description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", "votes": 10 }, { +"id": 2, "title": "title title title2", "description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", "votes": 2 }, { +"id": 3, "title": "title title title3", "description": "Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Aavi eiqvqn eqivqjqe. Thoenqv eiqnd eqoov qqkedas wqow, winvqo! fwqifqncqei qcieqncqi qicq cqirpq cowq cwoq. Sure would be rad if you read the rest of this resource...", "author": "Raplph author", From dbaa261439f16ea9d16ed1e398da48b8e6289b73 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 16:29:15 -0700 Subject: [PATCH 12/14] Changed name to resultlist.html --- app/views/index.html | 2 +- app/views/resultlist.html | 53 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 app/views/resultlist.html diff --git a/app/views/index.html b/app/views/index.html index 0679c0a..d029896 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -15,7 +15,7 @@
                • -
                • +
              diff --git a/app/views/resultlist.html b/app/views/resultlist.html new file mode 100644 index 0000000..d029896 --- /dev/null +++ b/app/views/resultlist.html @@ -0,0 +1,53 @@ + + + + + + + + + + + + +
              +
              +
                +
                • +
                • +
                • + + +
              + +
              +
              + +
              +
              +

              NoteSter

              +
              +
              +
              +
                + +
                + + + + From e6def9cb1204915eeea6f21bb1e871733d8aad22 Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 16:36:58 -0700 Subject: [PATCH 13/14] Commit final front end --- app/views/index.html | 53 --------------------------------------- app/views/resultlist.html | 2 +- 2 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 app/views/index.html diff --git a/app/views/index.html b/app/views/index.html deleted file mode 100644 index d029896..0000000 --- a/app/views/index.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - -
                -
                -
                  -
                  • -
                  • -
                  • - - -
                - -
                -
                - -
                -
                -

                NoteSter

                -
                -
                -
                -
                  - -
                  - - - - diff --git a/app/views/resultlist.html b/app/views/resultlist.html index d029896..828959c 100644 --- a/app/views/resultlist.html +++ b/app/views/resultlist.html @@ -15,7 +15,7 @@
                    • -
                    • +
                  From fb9a084e74572a79384e35b1ce49b32466ff22ef Mon Sep 17 00:00:00 2001 From: Eastae Date: Sun, 16 Aug 2015 17:15:58 -0700 Subject: [PATCH 14/14] Updated for preso --- app/views/{ => css}/main.css | 0 app/views/{ => js}/main.js | 2 +- app/views/{ => js}/test.json | 0 app/views/resultlist.html | 6 +++--- 4 files changed, 4 insertions(+), 4 deletions(-) rename app/views/{ => css}/main.css (100%) rename app/views/{ => js}/main.js (97%) rename app/views/{ => js}/test.json (100%) diff --git a/app/views/main.css b/app/views/css/main.css similarity index 100% rename from app/views/main.css rename to app/views/css/main.css diff --git a/app/views/main.js b/app/views/js/main.js similarity index 97% rename from app/views/main.js rename to app/views/js/main.js index f3b6f64..97fddd8 100644 --- a/app/views/main.js +++ b/app/views/js/main.js @@ -1,5 +1,5 @@ $(document).ready(function() { - $.getJSON( "test.json", function( data ) { + $.getJSON( "js/test.json", function( data ) { $.each( data, function( key, val ) { $('#list').append( '
                • \ diff --git a/app/views/test.json b/app/views/js/test.json similarity index 100% rename from app/views/test.json rename to app/views/js/test.json diff --git a/app/views/resultlist.html b/app/views/resultlist.html index 828959c..3e82928 100644 --- a/app/views/resultlist.html +++ b/app/views/resultlist.html @@ -6,7 +6,7 @@ - + @@ -25,7 +25,7 @@
                  -

                  NoteSter

                  +

                  Search Results

                  @@ -48,6 +48,6 @@

                  NoteSter

                  -->
                  - +