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

new_writing <- main #6

Merged
merged 118 commits into from
Jan 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
118 commits
Select commit Hold shift + click to select a range
3691407
Merge pull request #3 from alanmmckay/new_writing
alanmmckay Feb 3, 2023
029663c
Attempt at making the safety writing responsive; WIP
alanmmckay Feb 3, 2023
b83a947
Further address of responsive issues. Altered source link text as well.
alanmmckay Feb 3, 2023
abbce19
Drilled down to discover responsive issues related to how UL tags are…
alanmmckay Dec 8, 2023
8f57ef2
Added 'has' selector to ensure text in anchored figures don't have an…
alanmmckay Dec 8, 2023
99da17d
Moving safety article to a new projects folder
alanmmckay Dec 8, 2023
49c27b3
Made meta-data changes to the safety article to reflect directory cha…
alanmmckay Dec 9, 2023
18bcd03
Update to homepage to include a link to project index.
alanmmckay Dec 9, 2023
644aa33
Starting of new project page explaining my hexagron grid project. Som…
alanmmckay Dec 9, 2023
8302b80
Code refactor to keep the hex-grid object self-contained as opposed t…
alanmmckay Dec 9, 2023
db14280
Code cleanup; need to provide arguments to some of the specific funct…
alanmmckay Dec 9, 2023
615daf2
Parameterized key features of the grid producer
alanmmckay Dec 9, 2023
1ed279c
Added preface text for hexgrid project page. Need to do some spellche…
alanmmckay Dec 9, 2023
e5bda51
Form control and canvas interface added.
alanmmckay Dec 9, 2023
bdb504a
Text editing for flow with spelling corrections
alanmmckay Dec 9, 2023
c909d96
Introduction of basic inline styling for grid control. Next step is t…
alanmmckay Dec 9, 2023
2929e9c
Grid controls are now reasonably responsive
alanmmckay Dec 9, 2023
60f3018
Preliminary writing of article about development of the cup-of-joe we…
alanmmckay Dec 13, 2023
b093159
Added hyperlinks to projects/cup/index.php. Initial file creation for…
alanmmckay Dec 13, 2023
7b820e9
Added images for control usage slideshow. Also introduced logic and s…
alanmmckay Dec 14, 2023
08ec152
Added javascript logic to factor differing sizes of the fig caption t…
alanmmckay Dec 14, 2023
a84fff9
Added styling to help inform the user slideshow controls
alanmmckay Dec 14, 2023
a0d29f0
Aside element showing mobile version of coj website made responsive f…
alanmmckay Dec 14, 2023
0689ec6
Some finishing touches on responsive design for projects/cup. This in…
alanmmckay Dec 15, 2023
357fc58
Forgot to close a tag!
alanmmckay Dec 15, 2023
4fd5ca5
More progress on responsive front for projects/cup. Currently am unsu…
alanmmckay Dec 15, 2023
1d56597
Initial commit involving a projects page writing about the research I…
alanmmckay Dec 15, 2023
33fac39
Integrated diagrams and added new styling for aside images
alanmmckay Dec 17, 2023
046c43e
Converted presentation of model declarations from UL to code tags as …
alanmmckay Dec 17, 2023
836fca0
Added hyperlinks to references and added an introductory paragraph wh…
alanmmckay Dec 17, 2023
02a6b07
Exclusion of reference to a figure C
alanmmckay Dec 18, 2023
d174955
Initial push regarding a project piece discussing work done in transl…
alanmmckay Dec 18, 2023
5ed9253
Added preface text.
alanmmckay Dec 18, 2023
e75fc06
Primed the specification sections to be displayed then disabled throu…
alanmmckay Dec 18, 2023
7ee7013
Added simple style to keep page header from animating on directory pa…
alanmmckay Dec 19, 2023
06afbdd
Progress on integrating progress check text. Need to proof-read.
alanmmckay Dec 19, 2023
312e41f
Remaining phases included; still need to proof-read
alanmmckay Dec 19, 2023
c79a768
Added hover styling for expandable headers. Also eliminated justified…
alanmmckay Dec 19, 2023
e3c0327
Proof-read major components and renamed some of the headers.
alanmmckay Dec 19, 2023
e6189d9
Added concluding notes.
alanmmckay Dec 19, 2023
16da90c
Undid a new first-child style implemented in a recent commit pertaini…
alanmmckay Dec 19, 2023
fb544cf
Added completion dates for the project phases
alanmmckay Dec 21, 2023
d9e5018
Initial template of an article discussing my work teaching computer o…
alanmmckay Dec 22, 2023
b924a46
Bold styling fix for project article. Added new blockquote styling to…
alanmmckay Dec 22, 2023
66362e9
Added concluding notes text
alanmmckay Dec 26, 2023
d00fd0b
Proof read edits. Added a code tag; considering adding code examples …
alanmmckay Dec 28, 2023
97a2fe9
Added code examples to shore up the loops section
alanmmckay Dec 29, 2023
598347d
Proof read edits and anchor tag tab opening.
alanmmckay Dec 29, 2023
e7fbe1b
Inclusion of anchor tag directing to an archive version of the cup of…
alanmmckay Dec 29, 2023
08f61ce
Addition of attributes for anchor tabs to force opening in new tabs.
alanmmckay Dec 29, 2023
3ef99cb
Initial plug of project discussing social computers and network science
alanmmckay Dec 30, 2023
bb8242c
Images for projects/social
alanmmckay Dec 30, 2023
a1129ca
Replaced javascript window-size script with a working css fix
alanmmckay Dec 30, 2023
07ac944
Cleaned up cup_control_04.png while altering the order of drawning el…
alanmmckay Dec 30, 2023
eddfe72
Links now open in new tabs
alanmmckay Dec 30, 2023
e9fcc35
Modifications to image layout for projects/social
alanmmckay Dec 30, 2023
381aa75
Fixed janky width formatting related to <code> directory </code>
alanmmckay Dec 30, 2023
b3ded84
Minor responsive fixes
alanmmckay Dec 31, 2023
6066ac1
Inclusion of MIPs code as a sum example.
alanmmckay Jan 1, 2024
8c952b7
Typo fix
alanmmckay Jan 2, 2024
7e52c3c
Creation of projects index. Need to fill meta description tag.
alanmmckay Jan 2, 2024
93af210
Inclusion of preface text for projects/social
alanmmckay Jan 3, 2024
fe2afc4
Moved URLs to anchor tags
alanmmckay Jan 3, 2024
b56f7d6
Inclusion of concluding notes text
alanmmckay Jan 3, 2024
73fa4c2
Shuffled text around into a concluding notes section to make the pref…
alanmmckay Jan 3, 2024
3f31f02
Python file containing examples used in the writing for projects/orga…
alanmmckay Jan 3, 2024
8f0c5f7
Merge branch 'main' of github.com:alanmmckay/alanmmckay.github.io int…
alanmmckay Jan 3, 2024
017b17a
Typo fix
alanmmckay Jan 3, 2024
27fc499
Minor fixes to algorithms
alanmmckay Jan 3, 2024
691f411
Update to sitemap to include /projects/ pages.
alanmmckay Jan 4, 2024
d5de181
Updated projects icon on main page.
alanmmckay Jan 4, 2024
73cd6bb
Meta tag updates for using https
alanmmckay Jan 4, 2024
0ee5b63
New icon for projects index
alanmmckay Jan 5, 2024
065fc74
Other misc icons for potential use
alanmmckay Jan 5, 2024
ad82b8c
Switching projects icon.
alanmmckay Jan 5, 2024
ab8a96b
Inclusion of meta descriptions.
alanmmckay Jan 7, 2024
7224624
Inclusion of alt property for images
alanmmckay Jan 7, 2024
d0f13fc
Updated remaining http links to https
alanmmckay Jan 7, 2024
bf5becc
Adding a favicon
alanmmckay Jan 7, 2024
f801c02
Directory fix for use with grabbing an icon.
alanmmckay Jan 7, 2024
0e91326
Change to files which adds a relative path string to allow access to …
alanmmckay Jan 7, 2024
f2490d7
Initial push for a writeup about the aquatint image processor
alanmmckay Jan 9, 2024
e034360
Added first section of text to the main body of the Aquatint project …
alanmmckay Jan 13, 2024
9f5b1ff
A bucket of images used to display parameter variance in the processor.
alanmmckay Jan 13, 2024
3e24884
Image sliders in working condition.
alanmmckay Jan 13, 2024
6a9fb83
Initial set of text associated with describing the web app and image …
alanmmckay Jan 13, 2024
5227ed6
Progress on writeup for projects/aquatint
alanmmckay Jan 13, 2024
e44cac5
Added code snippets. Also inclusion of reveal function to expand and …
alanmmckay Jan 14, 2024
e1fc0de
Initial progress on text for section describing providing feedback to…
alanmmckay Jan 14, 2024
a167e58
Explanation of progress feedback finished. This includes the inclusio…
alanmmckay Jan 15, 2024
32aa6b1
Proof read edits
alanmmckay Jan 15, 2024
734fee5
Inclusion of images in projects/aquatint/
alanmmckay Jan 15, 2024
e7d4304
Changed accent color of input sliders to conform with aesthetic of th…
alanmmckay Jan 15, 2024
cdb09ed
Added logic to prevent loading in javascript relevant material for th…
alanmmckay Jan 15, 2024
a9e6ebf
Refactored reveal to only rely on one mapping.
alanmmckay Jan 15, 2024
47b48eb
Introducing uniformity to code block styling
alanmmckay Jan 15, 2024
ca944c4
Inclusion of Aquatint article listing in index.
alanmmckay Jan 15, 2024
dde0ab7
Update to meta descriptions.
alanmmckay Jan 15, 2024
3a9f4a0
Proof-read edits.
alanmmckay Jan 15, 2024
c294cec
Introduction of styles to handle blockquotes at lower resolutions. Ge…
alanmmckay Jan 16, 2024
9a5e9ae
Added mobile resonsiveness to the dynamid figure and input controls.
alanmmckay Jan 16, 2024
3dad4a6
Added another event listener for screen orientation changes
alanmmckay Jan 16, 2024
96489df
Added more context to the orientation resize
alanmmckay Jan 16, 2024
2e82f6d
Added another eventlistner for the size setter upon window load.
alanmmckay Jan 16, 2024
b5a4249
Finetuned scrolling function to have more interesting feedback for th…
alanmmckay Jan 18, 2024
4f04b6c
Moved relevant javascript to a script in the js folder with in root. …
alanmmckay Jan 18, 2024
8a93af1
Generalized the index functions. Need to more closely consider variab…
alanmmckay Jan 18, 2024
1340e99
Removed old javascript code which would resize code containers; somet…
alanmmckay Jan 18, 2024
348f311
Moved image reframing function to root/js. Slight generalization with…
alanmmckay Jan 18, 2024
8da8d99
Generalized the function that was called reveal. Moved it to js/proje…
alanmmckay Jan 19, 2024
dc27ddb
Created a conditional branch to handle the case where a browser doesn…
alanmmckay Jan 19, 2024
883a6fa
Work on trying to prevent the onscrollend event being superceded by o…
alanmmckay Jan 19, 2024
4db7203
Currently have a solution implemented that just arbitrarily applies t…
alanmmckay Jan 19, 2024
fb79be4
Removed debugging output and set the correct flag within the onscroll…
alanmmckay Jan 19, 2024
443cdef
Sectioned up javascript functions and added comments in preparation f…
alanmmckay Jan 19, 2024
124ca45
Generalized setDyanmicFigureStyle() and moved it to the relevant js f…
alanmmckay Jan 19, 2024
37bcb6c
Forgot to reassign the screen_status object onload.
alanmmckay Jan 20, 2024
80f724d
Merge pull request #5 from alanmmckay/javascript_refactor
alanmmckay Jan 20, 2024
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
11 changes: 8 additions & 3 deletions header.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
}

if(!isset($canonical)){
$canonical = 'http://alanmckay.blog';
$canonical = 'https://alanmckay.blog';
}

if(!isset($title)){
Expand Down Expand Up @@ -39,7 +39,11 @@
}

if(!isset($meta['url'])){
$meta['url'] = 'http://alanmckay.blog/';
$meta['url'] = 'https://alanmckay.blog/';
}

if(!isset($relative_path)){
$relative_path = "";
}

?>
Expand All @@ -50,6 +54,7 @@
<link rel='stylesheet' href='<?php echo $normalize;?>' />
<link rel='stylesheet' href='<?php echo $style;?>' />
<link rel='canonical' href='<?php echo $canonical;?>'/>
<link rel='icon' type='image/x-icon' href='<?php echo $relative_path; ?>images/text-logo-grey.ico'/>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0' />
<title><?php echo $title;?></title>
<meta name="author" content="Alan McKay" />
Expand All @@ -62,4 +67,4 @@
<meta property='og:url' content='<?php echo $meta['url'];?>' />
<meta name='keywords' content='Alan McKay, Iowa, Iowa City, Cedar Falls, University of Iowa, University of Northern Iowa, UofI, UNI, Computer Science' />
</head>
<body>
<body>
13 changes: 13 additions & 0 deletions images/address-book-new.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions images/code-class.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions images/code-function.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions images/code-variable.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_control_01.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_control_02.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_control_03.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_control_04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_control_05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_events.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_events_red.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_music.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_story_desktop.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_story_mobile.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cup_story_tablet.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cycle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/cycle_AT.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions images/description.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/dist-degree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/dist-indeg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/dist-outdeg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 22 additions & 0 deletions images/insert-endnote.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/ngr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pldist-degree.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pldist-indeg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/pldist-outdeg.png
Binary file added images/plrdist-degree.png
Binary file added images/pn.png
Binary file added images/pp_A.png
Binary file added images/pp_B.png
Binary file added images/pp_C.png
Binary file added images/project-archive-arrow.png
Binary file added images/project-archive.png
Binary file added images/rdist-degree.png
Binary file added images/rdist-indeg.png
Binary file added images/rdist-outdeg.png
Binary file added images/rdist2-outdeg.png
Binary file added images/rdist3-outdeg.png
Binary file added images/rdist4-outdeg.png
Binary file added images/rdist5-outdeg.png
Binary file added images/rnet-vis.png
Binary file added images/sf-outliers.png
Binary file added images/sfnet-vis.png
Binary file added images/sr.png
Binary file added images/text-logo-grey.ico
Binary file not shown.
6 changes: 5 additions & 1 deletion index.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<img src='images/text-logo-grey.png' alt='Icon for blog link'>
Writings
</a>
<a href='projects/'>
<img src='images/description.svg' alt='Icon for projects link'>
Projects
</a>
<a href='https://vsco.co/alanmckay/gallery' target="_blank" rel="noopener noreferrer">
<img src='images/vsco-logo-grey.png' alt='Icon for VSCO link'>
VSCO
Expand All @@ -32,4 +36,4 @@
</nav>
</div>
</body>
</html>
</html>
30 changes: 30 additions & 0 deletions js/index_functions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
function primeClassTransitions(class_name, css_property, initial_value, transition_time, transition_switch){
elements = document.getElementsByClassName(class_name);
for (i = 0; i < elements.length; i++){
element = elements[i];
if (transition_switch == true){
element.style['transition'] = css_property + ' ' + transition_time;
}else{
element.style['transition'] = css_property + ' 0s';
}
element.style[css_property] = initial_value;
}
}


function applyClassTransitionEffects(class_name, css_property, thresh_in_value, thresh_in_time, thresh_out_value, thresh_out_time, screen_threshold) {
height = screen.height;
elements = document.getElementsByClassName(class_name);
for (i = 0; i < elements.length; i++){
element = elements[i];
bound = element.getBoundingClientRect();
if (bound.y < height - screen_threshold){
element.style['transition'] = css_property + ' ' + thresh_in_time;
element.style[css_property] = thresh_in_value;
}
if ((bound.y < 0) || (bound.y > height - screen_threshold)){
element.style['transition'] = css_property + ' ' + thresh_out_time;
element.style[css_property] = thresh_out_value;
}
}
}
88 changes: 88 additions & 0 deletions js/project_functions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
/* ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- */

function toggleCollapsible(body_id, header_id, expand_str, collapse_str, collapsed_attribute){
header = document.getElementById(header_id);
if(header.getAttribute(collapsed_attribute) == 'false'){
new_status_bool = true;
header.setAttribute(collapsed_attribute,true);
}else{
new_status_bool = false;
header.setAttribute(collapsed_attribute,false);
}
old_header_str = header.innerHTML;
if(new_status_bool == true){
document.getElementById(body_id).style.display = "block";
new_header_str = collapse_str + old_header_str.slice(expand_str.length,old_header_str.length);
}else{
document.getElementById(body_id).style.display = "none";
new_header_str = expand_str + old_header_str.slice(collapse_str.length,old_header_str.length);
}
document.getElementById(header_id).innerHTML = new_header_str;
}

/* ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- */

// This solves the problem of proportional scaling with respect to
// height and an image's width being scaled on window resize;
// Something that native css can't handle as far as I know.
function setDynamicFigureStyle(event_type, screen_state,element,old_ele_height,class_id){

screen_height = window.outerHeight;
shrinking = screen_state['shrinking'];
growing = screen_state['growing'];
flex_switch = screen_state['flex_switch'];
old_screen_height = screen_state['old_screen_height'];
old_orientation = screen_state['old_orientation'];

// Conditional considers prior values of shrinking and growing:
if(!(shrinking == true && growing == true)){
// Determine if screen is currently shrinking or growing:
if(old_screen_height < screen_height){
shrinking = false;
growing = true;
}else if(old_screen_height > screen_height){
shrinking = true;
growing = false;
}else{
shrinking = false;
growing = false;
// Factors the change in the x-axis causing the fig to be bigger:
if(element_height > screen_height){
shrinking = true;
}
// Contingent Redundancy:
old_ele_height = element.getBoundingClientRect().height;
}
}else{
shrinking = true;
growing = false;
}
// Get the height of the figure as a whole (not the window):
element_height = element.getBoundingClientRect().height;
if(shrinking == true){
if(element_height >= screen_height){
if(flex_switch == false){
old_ele_height = element.getBoundingClientRect().height;
flex_switch = true;
}
element.classList.add(class_id);
element.style.display = 'flex';
}
}
if(growing == true){
if(old_ele_height < screen_height){
element.classList.remove(class_id);
element.style.display = 'inherit';
flex_switch = false;
}
}
old_screen_height = screen_height;
return [{"old_screen_height": old_screen_height,
"shrinking": shrinking,
"growing": growing,
"old_orientation": old_orientation,
"flex_switch": flex_switch
},old_ele_height];
}

/* ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- ----- */
11 changes: 11 additions & 0 deletions js/writing_functions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
//Abstract this function to include range parameters
function reframeImage(elementID,inPosition,outPosition, threshold){
element = document.getElementById(elementID);
bounding = element.getBoundingClientRect();
if ( (threshold - bounding.top > 0) && (bounding.top > 0) )
{
element.style['object-position'] = inPosition;
} else{
element.style['object-position'] = outPosition;
}
}
Loading