Skip to content

Commit

Permalink
Merge branch 'public'
Browse files Browse the repository at this point in the history
  • Loading branch information
vickkie committed Mar 15, 2024
2 parents 0bc34fb + ae96913 commit 31cdc20
Show file tree
Hide file tree
Showing 30 changed files with 869 additions and 158 deletions.
15 changes: 14 additions & 1 deletion App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ class App extends React.Component {
this.state = {
isDrawerOpen: false,
selectedProject: null,
windowWidth: window.innerWidth,
drawerKey: 0,
};
}

Expand All @@ -23,15 +25,26 @@ class App extends React.Component {
media: mediaUrls,
};
// console.log("Project data:", projectData);

this.setState({ isDrawerOpen: true, selectedProject: projectData });
});
});
window.addEventListener("resize", this.handleResize);
}

handleResize = () => {
// simple counter as the key
this.setState((prevState) => ({
windowWidth: window.innerWidth,
drawerKey: prevState.drawerKey + 1, // Increment the key
}));
};

componentWillUnmount() {
document.querySelectorAll(".work-tile").forEach((button) => {
button.removeEventListener("click");
});
window.removeEventListener("resize", this.handleResize);
}

toggleDrawer = () => {
Expand All @@ -40,7 +53,7 @@ class App extends React.Component {

render() {
return (
<div className={this.state.isDrawerOpen ? "work-drawer open" : "work-drawer"}>
<div key={this.state.drawerKey} className={this.state.isDrawerOpen ? "work-drawer open" : "work-drawer"}>
<div className="drawer-wrapper" id="drawer-wrapper">
<div id="close" className="closeDrawer" onClick={this.toggleDrawer}>
{
Expand Down
84 changes: 42 additions & 42 deletions assets/svg/64c7eb8a8ef33041ae86f19b_barcodesvg.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 31 additions & 2 deletions css/services.css
Original file line number Diff line number Diff line change
@@ -1,16 +1,31 @@
.hero-services {
display: grid;
grid-template-columns: 1fr;
grid-template-areas:
"..."
"hero-service";
grid-template-rows: 40% 60%;
grid-template-columns: 1fr;
grid-template-rows: 30% 50% 20%;
min-height: 100vh;
overflow: hidden;
}

.inner-service2:nth-last-of-type(3):before {
background-image: url(../assets/images/0775.webp);
background-position: 50% 43%;
background-repeat: no-repeat;
background-size: 81%;
content: "";
height: 100%;
left: 0;
position: absolute;
top: 0;
width: 100%;
z-index: -1;
}

.hero-service {
grid-area: hero-service;
text-align: center;
padding: 0;
font-size: calc(8vw + 10px);
font-family: unset;
Expand Down Expand Up @@ -803,3 +818,17 @@ figure {
grid-template-columns: 1fr 1fr;
justify-items: end;
}

.scroll-service-down {
align-items: center;
display: grid;
grid-column: 1 / 2;
grid-row: 3 / 4;
justify-content: center;
z-index: 3;
grid-template-columns: 1fr auto 1fr;
gap: 20px;
}
.scroll-service-down span {
width: fit-content;
}
Empty file added css/studio.css
Empty file.
9 changes: 1 addition & 8 deletions css/works.css
Original file line number Diff line number Diff line change
Expand Up @@ -326,13 +326,6 @@ video {
overflow: hidden;
}

@font-face {
font-family: "Uzi";
src: url("https://raw.githubusercontent.com/vickkie/uzitrake/main/fonts/MonumentExtended-Regular.woff") format("woff");
font-weight: normal;
font-style: normal;
}

.sw-partner-marquee {
display: -webkit-box;
display: -webkit-flex;
Expand Down Expand Up @@ -524,7 +517,7 @@ video {
.display-expla {
font-size: 70px;
color: white;
font-family: Uzi;
font-family: inherit;
}

.works-exit {
Expand Down
2 changes: 1 addition & 1 deletion js/main/404.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const NotFound = () => {
<div className="tr__page404__lion"></div>
<span>4</span>
</h1>
<p className="delay">Page not found. You are lost in the jungle.</p>
<p className="delay">Page not found. You are lost in Kenyan jungle.</p>
<br />
<br />
<a href="index" className="prj_btn" style={{ width: "fit-content", gap: "10px" }}>
Expand Down
15 changes: 15 additions & 0 deletions js/main/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -233,3 +233,18 @@ document.addEventListener("DOMContentLoaded", () => {
});
});
});

gsap.registerPlugin(SplitText);

const herolargelogo = select(".hero-largelogo");

let herotext = new SplitText(".innerservice", { type: "chars", charsClass: "inner-service2" });

// const splitchars = selectAll(".split-chars");

// splitchars.forEach((splitchar) => {
// new SplitText(splitchar, {
// type: "chars",
// charsClass: "otherchars",
// });
// });
Loading

0 comments on commit 31cdc20

Please sign in to comment.