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 #16

Merged
merged 69 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
497f302
Merge pull request #9 from alanmmckay/new_writing
alanmmckay Feb 9, 2024
04c528b
Initial template for an image gallery. Includes algorithmic descripti…
alanmmckay Feb 17, 2024
e5c1e13
Have basic display logic down for the image gallery. Moving on to imp…
alanmmckay Feb 20, 2024
4763064
Progress on implementation of gallery with gradient loading. Currentl…
alanmmckay Feb 20, 2024
71324ef
Found the problem discussed in the last commit message. Fixed the con…
alanmmckay Feb 20, 2024
5a14894
Minor tweaks in preparation for thinking of an idea to balance out im…
alanmmckay Feb 20, 2024
e474e2a
The manifest json file that was built using personal VSCO data retrei…
alanmmckay Feb 20, 2024
d41e7f4
An attempt at loading in images based on the column lengths. Seems th…
alanmmckay Feb 20, 2024
52955be
Added upper boundary to force a threshold of buffered images to be lo…
alanmmckay Feb 20, 2024
bd69c7c
Added program comments to grid_load_agent to help sort out the logic …
alanmmckay Feb 21, 2024
8e2134a
Starting progress towards column resize logic; nothing substantial is…
alanmmckay Feb 22, 2024
4d0b988
Am currently leaning into prepopulating grids of different column siz…
alanmmckay Feb 23, 2024
8798758
Added new program comments to help make sense of hoisted variables. A…
alanmmckay Feb 25, 2024
49a171d
Minor code edits for cleanup
alanmmckay Feb 26, 2024
6ee7e10
A global column height map is now being used to determine where to pa…
alanmmckay Feb 26, 2024
2d9b4e8
Minor change to column_heights; using a list as opposed to an associa…
alanmmckay Feb 26, 2024
a7c77ef
grid_load_agent and grid_display_agent have been refactored such that…
alanmmckay Feb 26, 2024
5fe4399
The height:0px;overflow:scroll; hack seems to work well in this case …
alanmmckay Feb 27, 2024
4bb1dc9
Removing test images from images folder
alanmmckay Feb 27, 2024
cad2416
Added window.resize event in preparation for column resize logic. Ref…
alanmmckay Feb 27, 2024
ae7588b
Changed the grid agent functions to be asynchronous to prevent too la…
alanmmckay Feb 27, 2024
ce59d51
The grid div's are now dynamically being generated based on the max_c…
alanmmckay Feb 27, 2024
d96ffc8
Resizing column logic now works. Seems the error where too many batch…
alanmmckay Feb 28, 2024
4bb7d13
Removal of console.logs; Fixed logical error onload.
alanmmckay Feb 28, 2024
017138a
The removal of Math.random seems to prevent the batch loading error; …
alanmmckay Feb 28, 2024
9644603
Merge pull request #10 from alanmmckay/image_gallery_balanced_load
alanmmckay Feb 29, 2024
1fb5d34
Minor code cleanup
alanmmckay Feb 29, 2024
18c1ce0
Added logic checking if a mobile device is use. This will then determ…
alanmmckay Feb 29, 2024
ec50735
Starting process of converting images to webp format and setting a th…
alanmmckay Mar 1, 2024
d93cccd
Currently using a script tag to load in the manifest. This tag refers…
alanmmckay Mar 1, 2024
e1b885b
Fixed logical error with figure placement. Also added a timeout mecha…
alanmmckay Mar 2, 2024
348a9d3
Added introductory text. Changed timing to be dependent on the size o…
alanmmckay Mar 2, 2024
16163d3
Wrapped up the figures into anchors. Also removed an image from the m…
alanmmckay Mar 2, 2024
e5a1aba
Merge pull request #11 from alanmmckay/image_gallery
alanmmckay Mar 2, 2024
ee5ec67
Commented-out references to column_heights
alanmmckay Mar 4, 2024
c512307
Initial progress on creating a paginated version of the gallery.
alanmmckay Mar 4, 2024
0d5d0b1
Progress on making balance load consistent. This has involved trimmin…
alanmmckay Mar 5, 2024
7b81b4b
Intuition noted in prior commit proved to be true. Have leveraged a n…
alanmmckay Mar 5, 2024
d7af9f6
Proper handling of variable declarations and scope
alanmmckay Mar 5, 2024
47149e8
Removed static query for images loaded in via php
alanmmckay Mar 6, 2024
289dd04
Introduction of static gallery controls; still needs to have css appl…
alanmmckay Mar 6, 2024
e22d5aa
Changed width required to view two columns to capture a range of mobi…
alanmmckay Mar 6, 2024
4a08fc4
Added css styles for the form control.
alanmmckay Mar 6, 2024
7d76cf4
Stylesheet update; should have been included in prior commit.
alanmmckay Mar 6, 2024
4ac88bc
Updated main index to point to the photography page. Still need to ad…
alanmmckay Mar 6, 2024
877e433
Removed functionality of anchor differing to new tab.
alanmmckay Mar 6, 2024
a3d6d87
New style to keep the longer 'photography' label in check
alanmmckay Mar 6, 2024
bc5f4e1
More changes to keep the longer 'photography' phrase in check in term…
alanmmckay Mar 6, 2024
01ad3e3
Updated sitemap; added robots.txt; other minor updates.
alanmmckay Mar 6, 2024
efceb4a
Merge pull request #12 from alanmmckay/image_gallery
alanmmckay Mar 6, 2024
4ba7496
Merge pull request #13 from alanmmckay/main
alanmmckay Mar 6, 2024
fff5616
Added new bulletpoints to readme.
alanmmckay Mar 6, 2024
4ce7f06
Added logic to handle the first batch of images to be loaded in. The …
alanmmckay Mar 12, 2024
4ac7d7c
Minor comment cleanup. Set preload images to have an initial opacity …
alanmmckay Mar 13, 2024
1f6e6bb
Removed old_evals array; was redundant in terms of the fact its conte…
alanmmckay Mar 17, 2024
8b840be
Merge pull request #14 from alanmmckay/image_gallery
alanmmckay Mar 18, 2024
025afaf
Code dry-out related to readjust_columns
alanmmckay Mar 19, 2024
4889fbe
General code cleanup.
alanmmckay Mar 19, 2024
629971a
PhP code cleanup which introduces a less confusing pagination display.
alanmmckay Mar 19, 2024
1a7ba5e
New script tags within static javascript grid to remove the grid shou…
alanmmckay Mar 20, 2024
d8a2238
Lazy loading wrangling and added loading prompt
alanmmckay Mar 29, 2024
45c70d5
Added logic to ensure a figure's reveal doesn't occur until the image…
alanmmckay Mar 29, 2024
185a72e
Removed manifest trackers: load_counts was covering the same metric. …
alanmmckay Mar 29, 2024
c49d953
Forgot to undo a testing change.
alanmmckay Mar 29, 2024
a41adbb
General variable name cleanup. Also implemented a workaround to ensur…
alanmmckay Mar 30, 2024
4f6b9e0
More throttling in place to prevent excessive requests of images.
alanmmckay Mar 30, 2024
b6733de
Timing tweaks
alanmmckay Mar 30, 2024
8c5a132
General cleanup. Inclusion of cleanup subroutine to ensure all images…
alanmmckay Apr 1, 2024
d9c9a6d
Merge pull request #15 from alanmmckay/general_edits
alanmmckay Apr 1, 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
9 changes: 9 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ This readme file will act as a progress checklist for items I would like to deve

- [ ] Implement a project page discussing research done pertaining to chat-gpt and stack-overflow comparison.
- [ ] Implement a project page discussing my experience as a university adjunct teaching data structures.
- [x] Implement a project page discussing research scaffold of a privacy audit framework.
- [x] Implement a project page discussing the implementation of the image gallery for `/photography/`.
- [ ] Javascript refactor to DRY out the scripts currently in use:
- [x] Mobile scrolling logic used in index pages.
- `primeClassTransitions()`
Expand All @@ -21,3 +23,10 @@ This readme file will act as a progress checklist for items I would like to deve
- [ ] Functionality that repositions a figure with a set of javascript controls.
- `setDynamicFigureStyle()`
- [ ] Implement webmentions.
- [x] Implement an image gallery as an alternative to VSCO.
- [ ] Optimize image placement algorithm.
- [ ] Fine-tune column readjustment algorithm.
- [ ] Generate caption study.
- [ ] Reorganize image placement.
- [ ] Change format of images to something more portable (webp).
- [ ] Add meta tag management for PHP template.
1 change: 1 addition & 0 deletions images/camera-shutter.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/shutter-cut.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 7 additions & 7 deletions index.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
<nav>
<a href='writings/'>
<img src='images/text-logo-grey.png' alt='Icon for blog link'>
Writings
<span style='margin-left:10px;'>Writings</span>
</a>
<a href='projects/'>
<img src='images/description.svg' alt='Icon for projects link'>
Projects
<span style='margin-left:10px;'>Projects</span>
</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
<a href='photography/' style='overflow-wrap: break-word;hyphens: manual;'>
<img src='images/shutter-cut.png' alt='Icon for a camera shutter'>
<span style='margin-left:10px;'>Photo&shy;graphy</span>
</a>
<a href='https://github.com/alanmmckay' target="_blank" rel="noopener noreferrer">
<img src='images/github-logo-grey.png' alt='Icon for Github Link'>
GitHub
<span style='margin-left:10px;'>GitHub</span>
</a>
<a href='https://www.linkedin.com/in/alan-mckay-701b4a1b8/' target="_blank" rel="noopener noreferrer">
<img src='images/linkedin-logo-grey.png' alt='Icon for linked-in Link'>
LinkedIn
<span style='margin-left:10px;'>LinkedIn</span>
</a>
</nav>
</div>
Expand Down
518 changes: 518 additions & 0 deletions photography/index.php

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions photography/manifest.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions photography/manifest.json

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions photography/manifest_bak.json

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions photography/thumbnails/.htaccess
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
Order deny,allow
Deny from all

<Files *.webp>
Allow from all
</Files>
43 changes: 43 additions & 0 deletions robots.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
User-agent: GPTBot
Disallow: /

User-agent: ChatGPT-User
Disallow: /

User-agent: Google-Extended
Disallow: /

User-agent: CCBot
Disallow: /

User-agent: FacebookBot
Disallow: /

User-agent: Twitterbot
Disallow: /

User-agent: Googlebot-Image
Disallow: /

User-agent: Pinterestbot
Disallow: /

User-agent: Omgilibot
Disallow: /

User-agent: Omgili
Disallow: /

User-agent: cohere-ai
Disallow: /

User-agent: anthropic-ai
Disallow: /

User-agent: Bytespider
Disallow: /

User-agent: ImagesiftBot
Disallow: /

Sitemap: https://alanmckay.blog/sitemap.xml
12 changes: 11 additions & 1 deletion sitemap.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</loc>

<lastmod>
2024-01-21
2024-03-06
</lastmod>

<priority>
Expand All @@ -24,6 +24,16 @@
</lastmod>
</url>

<url>
<loc>
https://alanmckay.blog/photography/
</loc>

<lastmod>
2024-03-06
</lastmod>
</url>

<url>
<loc>
https://alanmckay.blog/writings/bench/
Expand Down
67 changes: 67 additions & 0 deletions style.css
Original file line number Diff line number Diff line change
Expand Up @@ -383,6 +383,69 @@ code pre.info-code{
float:right;
}

div.image-col figure{
transition:border-top 1.5s, opacity 4s;
}

#static-gallery-control ul{
display:flex;
justify-content:center;
margin-left:0px;
padding-left:0px;
margin:auto;
}

#static-gallery-control ul li{
white-space:nowrap;
display:block;
padding:3%;
font-size:85%;
}

#static-gallery-control ul li ul li{
display:inline-block;
padding:5%;
}

#sf1{
color:white;
animation-name:fadein1;
animation-duration:3s;
animation-iteration-count: infinite;
}

#sf2{
color:white;
animation-name:fadein2;
animation-duration:3s;
animation-iteration-count: infinite;
}

#sf3{
color:white;
animation-name:fadein3;
animation-duration:3s;
animation-iteration-count: infinite;
}

@keyframes fadein1 {
0%{color:white}
15%{color:#474d52}
75%{color:#474d52}
95%{color:white}
}
@keyframes fadein2 {
0%{color:white}
55%{color:#474d52}
75%{color:#474d52}
95%{color:white}
}
@keyframes fadein3 {
0%{color:white}
75%{color:#474d52}
95%{color:white}
}

@media screen and (min-width:800px){
#writingsWrapper .fig-col{
overflow:auto;
Expand Down Expand Up @@ -606,6 +669,10 @@ code pre.info-code{
min-width:300px;
}

#homeWrapper nav a{
font-size:24px;
}

#writingsWrapper{
justify-content:inherit;
/*min-width:300px;*/
Expand Down