Skip to content

Commit

Permalink
misc updates
Browse files Browse the repository at this point in the history
  • Loading branch information
@20manas
20manas committed Mar 4, 2019
1 parent 0048085 commit e01ad6d
Show file tree
Hide file tree
Showing 7 changed files with 171 additions and 128 deletions.
6 changes: 2 additions & 4 deletions alumni.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
width: 90vw;
}
.alumni .card .wrapper {
max-height: 90vw;
max-height: 100vw;
overflow: hidden;
}
.alumni .card .date {
Expand All @@ -204,9 +204,7 @@
.alumni .card img, .alumni .card:nth-child(odd) img {
width: 100%;
height: auto;
position: relative;
left: 50%;
transform: translate(-50%,0);
transform: initial;
margin-left: 0;
margin-bottom: 0;
float: none;
Expand Down
15 changes: 11 additions & 4 deletions css/global.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ footer a {
float: left;
font-size: 20px;
height: 20px;
text-shadow: 0 0 5px rgba(255, 255, 255, 0.2);
}
footer img {
height: 20px;
Expand All @@ -160,13 +159,16 @@ footer img {
float: left;
}
footer a:nth-child(2) {
color: rgb(255, 150, 150);
color: rgb(219, 68, 55);
text-shadow: 0 0 5px rgba(219, 68, 55, 0.5);
}
footer a:nth-child(3) {
color: rgb(150, 150, 255);
color: rgb(59, 86, 157);
text-shadow: 0 0 5px rgba(59, 86, 157, 0.5);
}
footer a:nth-child(4) {
color: rgb(255, 150, 255);
color: rgb(188, 42, 141);
text-shadow: 0 0 5px rgba(188, 42, 141, 0.5);
}
article {
margin-top: 70px; /* 50px (el: nav) + 20px (gap) */
Expand All @@ -188,4 +190,9 @@ article h1 img {
footer a {
margin-left: 10px;
}
}
@media screen and (max-width: 450px) {
footer a {
font-size: 4vw;
}
}
40 changes: 25 additions & 15 deletions events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ <h2>Contact Us</h2>
<script id="eventScript" src="js/events.js"></script>
<script>
function convertToString(json) {
var st = '';
for (var a in json) {
let st = '';
for (const a in json) {
st += (encodeURIComponent(a) + '=' + encodeURIComponent(json[a]) + "&");
}
return st;
Expand All @@ -166,21 +166,31 @@ <h2>Contact Us</h2>
document.getElementById('eventScript').addEventListener('load', getEvents);
} else {
eventList.map((ev, i) => {
var milli = ev.date.getTime();
const milli = ev.date.getTime();
ev.date = ev.date.toDateString();
var card = crEl('div', crEl('div',
[
crEl('h1', ev.name),
crEl('p', [
crEl('span', ev.date.toString()),
const card = crEl(
'div',
crEl(
'div',
[
crEl('h1', ev.name),
crEl(
'p',
[
crEl('span', ev.date.toString()),
crEl('hr'),
crEl('span', ev.venue.toString()),
],
['loc']
),
crEl('hr'),
crEl('span', ev.venue.toString()),
], ['loc']),
crEl('hr'),
crEl('p', ev.info),
crEl('a', 'View Photos', [], {'href': '/gallery.html#' + convertToString(ev)})
], ['wrapper'])
, ['card']);
crEl('p', ev.info),
crEl('a', 'View Photos', [], {'href': '/gallery.html#' + convertToString(ev)})
],
['wrapper']
),
['card']
);
if (Date.now() < milli) {
document.getElementById('upcoming').appendChild(card);
} else {
Expand Down
161 changes: 81 additions & 80 deletions gallery.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,10 @@ <h1 id="name"></h1>

</div>
</article>
<div id="cover" onclick="closeCover(event)">
<img src="/images/gallery/close.png" id="close" onclick="closeCover(event)">
<img src="/images/gallery/next.png" id="prev" class="change" onclick="prevImage()">
<img src="/images/gallery/next.png" id="next" class="change" onclick="nextImage()">
<div id="cover" onclick="gallery.closeCover(event)">
<img src="/images/gallery/close.png" id="close" onclick="gallery.closeCover(event)">
<img src="/images/gallery/next.png" id="prev" class="change" onclick="gallery.prevImage()">
<img src="/images/gallery/next.png" id="next" class="change" onclick="gallery.nextImage()">
<img id="coverImage" src="" alt="Full Screen">
</div>
<footer>
Expand All @@ -160,86 +160,87 @@ <h2>Contact Us</h2>
</a>
</footer>
<script>
var event = {};
var currentImage = 0;
function getInfo() {
var info = document.location.href.split('#', 2)[1];
if (info) {
var arr = info.split('&');
for (var i = 0; i < arr.length; i++) {
var entry = arr[i].split('=');
event[decodeURIComponent(entry[0])] = decodeURIComponent(entry[1]);
const forRange = (begin, end, fn) => {
for (let i = begin; i < end; i++) fn(i, begin, end);
}
let gallery = {
event: {
nop: null,
get numberOfPhotos() {
return this.nop;
}, set numberOfPhotos(val) {
this.nop = Number(val);
}
}
}
function setInfo(name) {
var elem = document.getElementById(name);
if (elem) elem.innerHTML = event[name];
}
function linkFromNumber(i) {
return '/images/events/' + event.folder + '/' + String(i) + '.png';
}
function initialize() {
getInfo();
for (var x in event) setInfo(x);
document.title = event.name + ' | Team TechnoJam | Galgotias University';
},
currentImage: 0,
linkFromNumber: i => '/images/events/' + gallery.event.folder + '/' + String(i) + '.png',
initialize: () => {
const getInfo = () => {
const info = document.location.href.split('#', 2)[1];
if (info) {
const arr = decodeURIComponent(info).split('&');
for (const el of arr) {
const entry = el.split('=');
gallery.event[entry[0]] = entry[1];
}
}
};
const setInfo = name => {
const elem = document.getElementById(name);
if (elem) elem.innerHTML = gallery.event[name];
};

var wrapper = document.querySelector('article > .wrapper');
for (let i = 1; i <= event.numberOfPhotos; i++) {
var img = document.createElement('img');
var link = linkFromNumber(i);
img.src = link;
img.addEventListener('click', function () {
showImage(i);
})
wrapper.appendChild(img);
}
}
initialize();
function showImage(i) {
currentImage = Number(i);
var cover = document.getElementById('cover');
if (cover.style.opacity == '1') {
var coverImage = document.getElementById('coverImage');
coverImage.classList.add('hideImage');
setTimeout(() => {
coverImage.src = linkFromNumber(i);
coverImage.classList.remove('hideImage');
}, 300);
} else {
document.getElementById('coverImage').src = linkFromNumber(i);
cover.style.opacity = '1';
cover.style.zIndex = '30';
document.body.style.overflowY = 'hidden';
}
if (i == 1) {
document.getElementById('prev').style.display = 'none';
} else {
document.getElementById('prev').style.display = 'block';
}
if (i == event.numberOfPhotos) {
document.getElementById('next').style.display = 'none';
} else {
document.getElementById('next').style.display = 'block';
}
}
function prevImage() {
showImage(currentImage - 1);
}
function nextImage() {
showImage(currentImage + 1);
}
function closeCover(e) {
var id = e.target.id;
if (id == 'cover' || id == 'close') {
var cover = document.getElementById('cover');
cover.style.opacity = '0';
setTimeout(function() {
cover.style.zIndex = '-1';
getInfo();
for (const x in gallery.event) setInfo(x);
document.title = gallery.event.name + ' | Team TechnoJam | Galgotias University';

const wrapper = document.querySelector('article > .wrapper');
forRange(1, Number(gallery.event.numberOfPhotos) + 1, i => {
const img = document.createElement('img');
const link = gallery.linkFromNumber(i);
img.src = link;
img.addEventListener('click', () => gallery.showImage(i));
wrapper.appendChild(img);
});
}, showImage: i => {
gallery.currentImage = Number(i);
const cover = document.getElementById('cover');
if (cover.style.opacity == '1') {
const coverImage = document.getElementById('coverImage');
coverImage.classList.add('hideImage');
setTimeout(() => {
coverImage.src = gallery.linkFromNumber(i);
coverImage.classList.remove('hideImage');
}, 300);
} else {
document.getElementById('coverImage').src = gallery.linkFromNumber(i);
cover.style.opacity = '1';
cover.style.zIndex = '30';
document.body.style.overflowY = 'hidden';
}
if (i === 1) {
document.getElementById('prev').style.display = 'none';
} else {
document.getElementById('prev').style.display = 'block';
}
if (i == gallery.event.numberOfPhotos) {
document.getElementById('next').style.display = 'none';
} else {
document.getElementById('next').style.display = 'block';
}
}, prevImage: () => gallery.showImage(gallery.currentImage - 1),
nextImage: () => gallery.showImage(gallery.currentImage + 1),
closeCover: e => {
const id = e.target.id;
if (id === 'cover' || id === 'close') {
const cover = document.getElementById('cover');
cover.style.opacity = '0';
document.body.style.overflowY = 'initial';
}, 750);
setTimeout(() => cover.style.zIndex = '-1', 750);
}
}
}
};
gallery.initialize();
</script>
<script src="/js/global.js"></script>
</body>
Expand Down
12 changes: 6 additions & 6 deletions js/global.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ function navigator_menu(e){
}
if (gebi('logo')) gebi('logo').addEventListener('click',navigator_menu)

var handleFooterPos = () => {
const handleFooterPos = () => {
function tagHeight(s) {
return document.getElementsByTagName(s)[0].getBoundingClientRect().height;
}
Expand All @@ -15,7 +15,7 @@ var handleFooterPos = () => {
}
}
const gebtn = tag => document.getElementsByTagName(tag);
var handleNavScroll = () => {
const handleNavScroll = () => {
if (window.scrollY > 50) {
gebtn('nav')[0].classList.remove('navTransparent');
} else {
Expand All @@ -27,16 +27,16 @@ window.addEventListener('resize', handleFooterPos);
handleNavScroll();
window.addEventListener('scroll', handleNavScroll);

var crEl = (typ, content, classes, attrib) => {
var ret = document.createElement(typ);
const crEl = (typ, content, classes, attrib) => {
const ret = document.createElement(typ);
if (classes) {
classes.map(c => ret.classList.add(c));
}
if (attrib) {
for (a in attrib) ret.setAttribute(a, attrib[a]);
for (const a in attrib) ret.setAttribute(a, attrib[a]);
}
if (content) {
if (typeof content == 'string') {
if (typeof content === 'string') {
ret.appendChild(document.createTextNode(content));
} else {
if (Array.isArray(content)) {
Expand Down
12 changes: 6 additions & 6 deletions js/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,18 @@ class CarouselManager{
}
const prev=()=>{
this.pause()
this.change((this.curr == 0 ? this.elements.length: this.curr) - 1)
this.change((this.curr === 0 ? this.elements.length: this.curr) - 1)
}
if(this.prevButton)this.prevButton.addEventListener('click', prev)
if(this.nextButton)this.nextButton.addEventListener('click', next)
const __internal_step=async ()=>{
if(this.play_state==1){
if(this.play_state===1){
this.change(this.nextIndex())
await wait(this.delay)
this.anim=window.requestAnimationFrame(__internal_step)
}
}
if(this.play_state==0||this.play_state==2){
if(this.play_state===0||this.play_state===2){
this.play_state=1
this.anim=window.requestAnimationFrame(__internal_step)
}
Expand All @@ -86,17 +86,17 @@ class CarouselManager{
window.cancelAnimationFrame(this.anim)
}
pause(){
if(this.play_state==1){
if(this.play_state===1){
this.play_state=2
window.cancelAnimationFrame(this.anim)
}
}
resume(){
if(this.play_state==2||this.play_state==0)
if(this.play_state===2||this.play_state===0)
wait(this.delay).then(this.start())
}
}
let carmgr=new CarouselManager(gebi('heroCarousel'),(carousel_item,pagination_item)=>{
const carmgr=new CarouselManager(gebi('heroCarousel'),(carousel_item,pagination_item)=>{
carousel_item.classList.add('test_cls')
pagination_item.classList.add('line')
},3575,
Expand Down
Loading

0 comments on commit e01ad6d

Please sign in to comment.