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

Our Umbraco: High five feed #277

Open
wants to merge 80 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
d9d78b3
Initial check-in of high five markup
hartvig May 20, 2018
5fd599c
starting API and data work
crgrieve May 20, 2018
2ae0c48
Add initial member search endpoint
MMasey May 20, 2018
03f85a8
Update search to groupedand.
MMasey May 20, 2018
8f7ef68
updates for categories API and feed
crgrieve May 20, 2018
00a26ff
Moved scripts into a single script file, added functionality for disp…
cssquirrel May 20, 2018
b4c7232
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
16568f3
merge after conflict
crgrieve May 21, 2018
c56e76a
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
15180b5
fixing merge
crgrieve May 21, 2018
6b69dc2
Added periodic polling to keep the high fives up to date.
cssquirrel May 21, 2018
52fb221
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
c16fb58
Load categories, typeahead member search
hartvig May 21, 2018
4f4978f
Replaced OrcAjax and other functionality with jQuery and lodash funct…
cssquirrel May 21, 2018
0afb1e8
Re-inserted accidentally removed scripts.
cssquirrel May 21, 2018
f108b1e
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
hartvig May 21, 2018
03ec949
This merge won't go well, I'll fix in a sec
hartvig May 21, 2018
9f96122
adding migration and updating api
crgrieve May 21, 2018
5583efa
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
d3b54c2
merge fix
hartvig May 21, 2018
9ca6651
Fixed lodash unique array merge for the highFives list.
cssquirrel May 21, 2018
1b7b374
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
0835fca
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
hartvig May 21, 2018
ff90e27
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
hartvig May 21, 2018
f3ea271
updating API
crgrieve May 21, 2018
b3e9601
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
9856a39
fixing merge issues on api
crgrieve May 21, 2018
d9266b6
Reworking umbrcians search.
MMasey May 21, 2018
651f667
Populate category dropdown with category info from API endpoint (and …
cssquirrel May 21, 2018
f79c9d9
Removed duplicate code, removed hard-wired categories, added suggesti…
cssquirrel May 21, 2018
362d7d3
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
67fb069
Post-merge cleanup of script, markup for form.
cssquirrel May 21, 2018
2f9725d
Set up functionality and mock API response for getting the suggested …
cssquirrel May 21, 2018
0fa6267
Add update to people service and highfive controller.
MMasey May 21, 2018
44396f0
retrieve feed logic
crgrieve May 21, 2018
405a860
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
3dd6e36
Add get random people endpoint.
MMasey May 21, 2018
378bc82
Styling high five items
hartvig May 21, 2018
f412cbd
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
hartvig May 21, 2018
3bb3fc1
Bound functionality for selecting a member to track the member updated.
cssquirrel May 21, 2018
35e4636
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
2dbf6e3
database schema change and api work
crgrieve May 21, 2018
5f6bda6
Integrated design changes to markup for the activity list for high fi…
cssquirrel May 21, 2018
e3a0ae5
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
cd17e2f
API feed updates
crgrieve May 21, 2018
016c5d5
Added in functionality to get random members for placeholder from API.
cssquirrel May 21, 2018
ba8c416
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
4e822b5
Added submit form functionality and mock.
cssquirrel May 21, 2018
748f422
Switched off mock API.
cssquirrel May 21, 2018
8b30bb9
removing fromid
crgrieve May 21, 2018
c4a67c7
Fixed to highfives.js
MMasey May 21, 2018
1be9ea9
Polyfill for unionBy functionality due to version of lodash being too…
cssquirrel May 21, 2018
cbd737a
Fix hight five feed bugs.
MMasey May 21, 2018
ef72dbb
fixing categories
crgrieve May 21, 2018
3495ef9
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
75e1142
Randomized compliments and re-load high fives after submission.
cssquirrel May 21, 2018
973c749
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
04247c3
Remove logged in user from results.
MMasey May 21, 2018
e82a3cd
Added more compliments.
cssquirrel May 21, 2018
eb1c7cc
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
cssquirrel May 21, 2018
70cb32a
DB Id migration update
crgrieve May 21, 2018
bc47adc
Merge branch 'temp-high-five' of https://github.com/crgrieve/OurUmbra…
crgrieve May 21, 2018
8482769
avatar checks
crgrieve May 22, 2018
8729eb4
fixing null check
crgrieve May 22, 2018
351347d
Add a little FE love.
MMasey May 23, 2018
f538b71
Refactoring to service to be reusable
crgrieve May 28, 2018
6d5dad9
fixing profile high five feed
crgrieve May 29, 2018
b556c43
Adding title tag for high five link.
crgrieve May 30, 2018
5edeae2
Tidy up css & markup. Begin work for updated member suggestion controls.
MMasey May 31, 2018
0985e25
Remove unionBy logic for the time being. Fix bug where feed wasn't up…
MMasey May 31, 2018
6fb1281
paging logic for sql query
crgrieve Jun 3, 2018
320ad84
adding dynamic preview box
crgrieve Jun 9, 2018
3a941ad
fixing preview high five styles
crgrieve Jun 10, 2018
d0dadb4
show relevant profile in preview
crgrieve Jun 10, 2018
a1bb8ed
fix for non http urls
crgrieve Jun 10, 2018
4928053
high fives for members update
crgrieve Jun 16, 2018
1ef9f63
Add whatInput library. It is used to help display the focus ring when…
MMasey Jun 16, 2018
441ce22
Refactor HighFive FE & BE, add WIF for preview, add basic validation …
MMasey Jun 16, 2018
c348162
refactoring & comments.
crgrieve Jul 8, 2018
e18b4ec
reset preview after submit.
crgrieve Jul 8, 2018
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
14 changes: 7 additions & 7 deletions OurUmbraco.Client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

172 changes: 86 additions & 86 deletions OurUmbraco.Client/src/js/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,96 +7,96 @@ _.templateSettings = {

jQuery(document).ready(function (){

// Quick menu
var bodyVar = $('body'),
searchAll = $('.search-all');

$( ".user, .close" ).click(function(e) {
e.preventDefault();
e.stopPropagation();
bodyVar.toggleClass( "quickmenu" );
});

$('.wrapper').on('click', function () {
bodyVar.removeClass('quickmenu');
});


// Mobile navigation
$("#toggle").click(function(e) {
e.preventDefault();
$(".cross").toggleClass("open");
$("nav").toggleClass("open");
$("body").toggleClass("navopen");
});

$('.pm-nuget').on('click', '.nuget', function(){
$(this).focus();
$(this).select();
});

// Tab
$('.tabs li').click(function(){
var tab_id = $(this).attr('data-tab');

$('.tabs li').removeClass('current');
$('.tab-content').removeClass('current');

$(this).addClass('current');
$("#"+tab_id).addClass('current');
});

// Click effect
var ink, d, x, y;
$(".button, .inked").click(function(e){

if($(this).find(".ink").length === 0){
$(this).prepend("<div class='ink'></div>");
}

ink = $(this).find(".ink");
ink.removeClass("animate");

if(!ink.height() && !ink.width()){
d = Math.max($(this).outerWidth(), $(this).outerHeight());
ink.css({height: d, width: d});
}

x = e.pageX - $(this).offset().left - ink.width()/2;
y = e.pageY - $(this).offset().top - ink.height()/2;

ink.css({top: y+'px', left: x+'px'}).addClass("animate");
});
// Quick menu
var bodyVar = $('body'),
searchAll = $('.search-all');

$( ".user, .close" ).click(function(e) {
e.preventDefault();
e.stopPropagation();
bodyVar.toggleClass( "quickmenu" );
});

var classOnScrollObject = function (selector, className, scrollDistance) {
this.item = $(selector);
this.itemClass = className;
this.scrollDistance = scrollDistance;
this.classApplied = false;
this.scrollContainer = $(window);
this.fromTop = this.scrollContainer.scrollTop();
};

classOnScrollObject.prototype.applyClass = function() {
this.fromTop = this.scrollContainer.scrollTop();
$('.wrapper').on('click', function () {
bodyVar.removeClass('quickmenu');
});


// Mobile navigation
$("#toggle").click(function(e) {
e.preventDefault();
$(".cross").toggleClass("open");
$("nav").toggleClass("open");
$("body").toggleClass("navopen");
});

$('.pm-nuget').on('click', '.nuget', function(){
$(this).focus();
$(this).select();
});

// Tab
$('.tabs li').click(function(){
var tab_id = $(this).attr('data-tab');

$('.tabs li').removeClass('current');
$('.tab-content').removeClass('current');

$(this).addClass('current');
$("#"+tab_id).addClass('current');
});

// Click effect
var ink, d, x, y;
$(".button, .inked").click(function(e){

if($(this).find(".ink").length === 0){
$(this).prepend("<div class='ink'></div>");
}

ink = $(this).find(".ink");
ink.removeClass("animate");

if(!ink.height() && !ink.width()){
d = Math.max($(this).outerWidth(), $(this).outerHeight());
ink.css({height: d, width: d});
}

x = e.pageX - $(this).offset().left - ink.width()/2;
y = e.pageY - $(this).offset().top - ink.height()/2;

if (this.fromTop > this.scrollDistance && this.classApplied === false) {
this.classApplied = true;
this.item.addClass(this.itemClass);
} else if (this.fromTop < this.scrollDistance && this.classApplied === true) {
this.classApplied = false;
this.item.removeClass(this.itemClass);
}
};
ink.css({top: y+'px', left: x+'px'}).addClass("animate");
});
});

var classOnScrollObject = function (selector, className, scrollDistance) {
this.item = $(selector);
this.itemClass = className;
this.scrollDistance = scrollDistance;
this.classApplied = false;
this.scrollContainer = $(window);
this.fromTop = this.scrollContainer.scrollTop();
};

classOnScrollObject.prototype.applyClass = function() {
this.fromTop = this.scrollContainer.scrollTop();

if (this.fromTop > this.scrollDistance && this.classApplied === false) {
this.classApplied = true;
this.item.addClass(this.itemClass);
} else if (this.fromTop < this.scrollDistance && this.classApplied === true) {
this.classApplied = false;
this.item.removeClass(this.itemClass);
}
};

function classOnScroll (selector, className, scrollDistance) {
var newClassOnScroll = new classOnScrollObject(selector, className, scrollDistance);
function classOnScroll (selector, className, scrollDistance) {
var newClassOnScroll = new classOnScrollObject(selector, className, scrollDistance);

newClassOnScroll.applyClass();
newClassOnScroll.applyClass();

newClassOnScroll.scrollContainer.scroll(function () {
newClassOnScroll.applyClass();
});
newClassOnScroll.scrollContainer.scroll(function () {
newClassOnScroll.applyClass();
});

}
}
7 changes: 7 additions & 0 deletions OurUmbraco.Client/src/js/vendor/whatInput.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions OurUmbraco.Client/src/scss/elements/_audio-only.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// Hides an element, but keeps it accessable to screen readers.
.audio-only {
position: absolute;
overflow: hidden;
padding: 0;
width: 1px;
height: 1px;
margin: -1px;
border: 0;
clip: rect(0, 0, 0, 0);
}
Loading