Skip to content

Commit

Permalink
Improve isMobile detection, Update styles
Browse files Browse the repository at this point in the history
  • Loading branch information
matejhocevar committed Dec 5, 2023
1 parent b56a4bc commit ad9d765
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 31 deletions.
73 changes: 45 additions & 28 deletions assets/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { render3dModel } from "./render_3d_model.js";
export const toggleContent = async (sectionId, animationTarget) => {
render3dModel.zoomTo(animationTarget);

const allSections = document.querySelectorAll("section");
const activeSection = document.getElementById(sectionId);

if (!activeSection) {
Expand Down Expand Up @@ -31,39 +30,57 @@ export const toggleContent = async (sectionId, animationTarget) => {

window.toggleContent = toggleContent;

console.log(
`
export const printDeveloperMessage = () => {
console.clear();
console.log(
`
%cHey again!
%cIt looks like you are curious about how this is made. 🕵️‍♂️
This website is done with the following technologies:
- %cHTML & CSS%c > basic layout and content structure,
- %cVanilla JS%c > basic accordion animation, model render,
- %cBlender%c > 3d model,
- %cthree.js%c > Blender loader and render,
- %cShaders%c > post-processing effects,
- %cGSAP%c > animation tweening.
You can dive deep into the source code at %chttps://github.com/matejhocevar/matejhocevar.github.io%c.
%cHave fun! 👨‍🚀 🚀
`,
"font-size: 24px; font-weight: bold; color: white; padding-bottom: 8px;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"font-size: 14px; color: white;",
"color: white;",
"font-size: 18px; color: #ffd45a; font-weight: bold;"
);
You can dive deep into the source code at %chttps://github.com/matejhocevar/matejhocevar.github.io%c.
%cHave fun! 👨‍🚀 🚀
`,
"font-size: 24px; font-weight: bold; color: white;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"color: #ffd45a; font-weight: bold;",
"color: white;",
"font-size: 14px; color: white;",
"color: white;",
"font-size: 18px; color: #ffd45a; font-weight: bold;"
);
};

export const isMobile = (function () {
let check = false;
(function (a) {
if (
/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(
a
) ||
/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(
a.substr(0, 4)
)
)
check = true;
})(navigator.userAgent || navigator.vendor || window.opera);
return check;
})();
6 changes: 4 additions & 2 deletions assets/render_3d_model.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import { RenderPass } from "three/addons/postprocessing/RenderPass.js";
import { FilmPass } from "three/addons/postprocessing/FilmPass.js";
import { GUI } from "three/addons/libs/lil-gui.module.min.js";
import { gsap } from "gsap";
import { printDeveloperMessage, isMobile } from "./main.js";

const canvasElement = document.querySelector("#canvas");

const isMobile = innerWidth < 768;
const isDebug = false;

class Render3dModel {
Expand Down Expand Up @@ -211,7 +211,9 @@ class Render3dModel {
this.startRotation();
this._animateInitialZoomIn();
},
(_) => {},
(_) => {
printDeveloperMessage();
},
(error) => {
console.error(error);
}
Expand Down
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ <h3>Stack</h3>
<h3>Projects</h3>
</header>

<div class="more" data-height="555px">
<div class="more" data-height="570px">
<ul>
<li><a href="">Personal website matox.si</a> (JavaScript, three.js, GLSL), 2023</li>
<li><a href="https://olaf.sh">Olaf.sh</a> (Angular, TypeScript), 2023</li>
Expand Down

0 comments on commit ad9d765

Please sign in to comment.