sigonasr2
/
dev-osan.github.io
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: sigonasr2:master
Branches Tags
sigonasr2:carousel-branch
sigonasr2:collapsibleMenu
sigonasr2:collapsibleMenu-branch
sigonasr2:dev
sigonasr2:dynamicLogo
sigonasr2:dynamicLogo-branch
sigonasr2:linkModifications
sigonasr2:linkModifications-branch
sigonasr2:master
sigonasr2:matt
sigonasr2:patch-1
sigonasr2:questions-branch
sigonasr2:revert-14-shadowText-branch
sigonasr2:revert-6-dynamicLogo
sigonasr2:shadowText
sigonasr2:shadowText-branch
..
compare: sigonasr2:shadowText
Branches Tags
sigonasr2:carousel-branch
sigonasr2:collapsibleMenu
sigonasr2:collapsibleMenu-branch
sigonasr2:dev
sigonasr2:dynamicLogo
sigonasr2:dynamicLogo-branch
sigonasr2:linkModifications
sigonasr2:linkModifications-branch
sigonasr2:master
sigonasr2:matt
sigonasr2:patch-1
sigonasr2:questions-branch
sigonasr2:revert-14-shadowText-branch
sigonasr2:revert-6-dynamicLogo
sigonasr2:shadowText
sigonasr2:shadowText-branch

2 Commits
master ... shadowText

Author SHA1 Message Date
Joshua Sigona 8e1787d790 Fix earlier modifications with stylesheet
6 years ago
Joshua Sigona db3d2ea3aa Add in shadowing to make devOsan title stand out and readable.
6 years ago
8 changed files with 34 additions and 224 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats
  1. 1
      CNAME
  2. 28
      additionalScripts.js
  3. 76
      index.html
  4. 80
      sig-ask-devOsan.js
  5. 23
      sig-ask-devosan/index.php
  6. 3
      sig-ask-devosan/popularquestions.php
  7. 25
      sig-ask-devosan/requests/requests.php
  8. 22
      styles.css

1
CNAME
Unescape View File

@ -1 +0,0 @@
devosan.com

28
additionalScripts.js
Unescape View File

@ -1,28 +0,0 @@
var vals = [
`<h1 class="devOsan"">
<span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan
</h1>
<h4 class="devOsan">Software Development Club</h4>`, //Original
`<h1 class="devOsan" style="text-shadow: 2px 2px 6px #AAFFAA;">
<span style="color: #696035;">{</span>dev<span style="color: #696035;">}</span>Osan
</h1>
<h4 class="devOsan">Software Development Club</h4>`, //By Sig
];
var vals2 = [
`<span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan`, //Original
`<span style="color:black;text-shadow: 0px 0px 2px #AAFFAA;"><span style="color: #696035;">{</span>dev<span style="color: #696035">}</span>Osan</span>`, //By Sig
];
window.onload=generateLogo(Math.floor(Math.random()*vals.length));
function generateLogo(numb) {
document.getElementById("devOsanLogo-dynamic").innerHTML=vals[numb];
document.getElementById("devOsanMiniLogo-dynamic").innerHTML=vals2[numb];
}
$(function(){
var navMain = $(".navbar-collapse");
navMain.on("click","a:not([data-toggle])",null,function(){navMain.collapse('hide');});
});

76
index.html
Unescape View File

@ -34,9 +34,9 @@
<!-- Header information, above the fold -->
<div class="above-the-fold">
<nav class="navbar navbar-expand-lg navbar-dark bg-dark fixed-top">
<a class="navbar-brand" href="#" id="devOsanMiniLogo-dynamic">
<span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan
</a>
<a class="devOsan" href="#" >
<span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan
</a>
<button
class="navbar-toggler"
type="button"
@ -49,7 +49,6 @@
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNav">
<hr />
<ul class="navbar-nav">
<li class="nav-item">
<a class="nav-link" href="#club-info">Club Info</a>
@ -61,7 +60,9 @@
<a class="nav-link" href="#projects">Projects</a>
</li>
<li class="nav-item">
<a class="nav-link" href="#learning-resources">Learning Resources</a>
<a class="nav-link" href="#learning-resources"
>Learning Resources</a
>
</li>
<li class="nav-item">
<a class="nav-link" href="#faq">FAQs</a>
@ -76,8 +77,8 @@
<div class="container">
<div class="row">
<div class="col">
<div class="card mb-3" style="max-width: 540px; margin-top: 5%;">
<a href="https://pitchandprototype.com/" id="announcement-card-link">
<a href="" id="announcement-card-link">
<div class="card mb-3" style="max-width: 540px; margin-top: 5%;">
<div class="row no-gutters">
<div class="col-4">
<img
@ -98,19 +99,16 @@
</div>
</div>
</div>
</a>
</div>
</div>
</a>
</div>
</div>
<div class="row name-slogan">
<div class="col col-md-6 offset-md-6" id="devOsanLogo-dynamic">
<h1>
<span style="color: #696035">{</span>dev<span
style="color: #696035"
>}</span
>Osan
<div class="col col-md-6 offset-md-6">
<h1 class="devOsan">
<span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan
</h1>
<h4>Software Development Club</h4>
<h4 class="devOsan">Software Development Club</h4>
</div>
</div>
</div>
@ -136,11 +134,6 @@
<p>Osan Air Base, South Korea</p>
</div>
</div>
<div class="row">
<div class="col col-md-8 offset-md-2">
<iframe src="https://docs.google.com/presentation/d/e/2PACX-1vSGDZERSWpev1AnjFeM2_Nl3tQzm8ETDQMZMp6D1OGqZfVLl7bjIJpqbQRREBzqmR5TTEmDE4VWa99B/embed?start=true&loop=true&delayms=5000" frameborder="0" width="100%" height="299" allowfullscreen="true" mozallowfullscreen="true" webkitallowfullscreen="true"></iframe>
</div>
</div>
</div>
<!-- Events and Projects -->
@ -155,30 +148,9 @@
<div class="col-sm-6" id="projects">
<h3><i class="fas fa-code-branch"></i><br />Projects</h3>
<br />
<div id="projectCarousel" class="carousel slide" data-ride="carousel">
<div class="carousel-inner">
<div class="carousel-item active" data-interval="10000">
<h3>Bus GPS</h3>
<p>Kevin Falting</p>
</div>
<div class="carousel-item" data-interval="10000">
<h3>{dev}Osan Website</h3>
<p>{dev}Osan Club</p>
</div>
<div class="carousel-item" data-interval="10000">
<h3>Pending Game Engine</h3>
<p>Joshua Sigona</p>
</div>
</div>
<a class="carousel-control-prev" href="#projectCarousel" role="button" data-slide="prev">
<span class="carousel-control-prev-icon" aria-hidden="true"></span>
<span class="sr-only">Previous</span>
</a>
<a class="carousel-control-next" href="#projectCarousel" role="button" data-slide="next">
<span class="carousel-control-next-icon" aria-hidden="true"></span>
<span class="sr-only">Next</span>
</a>
</div>
<p>Bus GPS</p>
<p>{dev}Osan Website</p>
<p>Pending Game Engine</p>
</div>
</div>
</div>
@ -199,27 +171,18 @@
<div class="answer">
Absolutely not, just a desire to hang out with software developers.
</div>
<div class="sig-ask-devosan">
</div>
</div>
</div>
</div>
<!-- Footer and Contact Us -->
<div class="container-fluid" id="contact">
<div class="row" style="padding: 25px 10px 25px 10px;">
<div class="row">
<div class="col">
<h3>Contact Us</h3>
<p>
<a href="mailto:kevinfalting@gmail.com">kevinfalting@gmail.com</a>
</p>
<p>
<a href="https://www.facebook.com/groups/256151891980498/"><i class="fab fa-facebook-square"></i></a>
</p>
<p>
<a href="https://github.com/dev-osan"><i class="fab fa-github-square"></i></a>
</p>
</div>
</div>
</div>
@ -241,7 +204,6 @@
integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM"
crossorigin="anonymous"
></script>
<script src="additionalScripts.js"></script>
<script src="sig-ask-devOsan.js"></script>
<script src="additionalScripts.js"></script>
</body>
</html>

80
sig-ask-devOsan.js
Unescape View File

@ -1,80 +0,0 @@
window.onload=init();
function init() {
var defaultText=`
<h3 style="margin-top:24px;">Ask <span style="color: #696035">{</span>dev<span style="color: #696035">}</span>Osan</h3>
<!--<input type="text" style="width:85%" name="question" value="What would you like to know?"><input type="submit">-->
<form name="q" "action="#formanchor" onsubmit="submitQuestion(); return false;">
<div class="input-group input-group-lg">
<div class="input-group-prepend">
<span class="input-group-text" id="inputGroup-sizing-lg">Q</span>
</div>
<input type="text" class="form-control" placeholder="What would you like to know?" aria-label="Question" aria-describedby="inputGroup-sizing-lg" name="question" required>
</div>
<br>
<div class="container">
<div class="row">
<div class="col-5">
<div class="input-group input-group-sm">
<input type="text" id="name" class="form-control" placeholder="Name (Optional)" aria-describedby="namehelp">
</div>
<small id="namehelp" class="form-text text-muted">
Your name will be displayed next to the question.
</small>
</div>
<div class="col-7">
<div class="input-group input-group-sm">
<input type="text" id="email" class="form-control" placeholder="Email (Optional)" aria-describedby="namehelp">
</div>
<small id="namehelp" class="form-text text-muted">
Providing an email will send you a notification when your question has been answered.
</small>
</div>
<button class="btn btn-primary col-3 m-2" type="submit">Submit</button>
</div>
</div>
</form>
<hr>
<div class="sig-ask-devosan-popular">Fetching data...</div>
`;
document.getElementsByClassName("sig-ask-devosan")[0].innerHTML=`
<div class="sig-ask-devosan1"></div>
<div class="sig-ask-devosan2"></div>
`;
document.getElementsByClassName("sig-ask-devosan1")[0].style.display="block";
document.getElementsByClassName("sig-ask-devosan1")[0].innerHTML=defaultText;
document.getElementsByClassName("sig-ask-devosan2")[0].style.display="none";
var req = new XMLHttpRequest();
req.onreadystatechange = function() {
if (this.readyState==4 && this.status==200) {
document.getElementsByClassName("sig-ask-devosan-popular")[0].innerHTML=this.responseText;
}
}
req.open("POST","http://45.33.13.215/projects/dev-osan/dev-osan.github.io/sig-ask-devosan/popularquestions.php",true)
req.send();
document.getElementsByClassName("sig-ask-devosan-popular")[0].innerHTML=`
Fetch data...
`;
}
function submitQuestion() {
document.getElementsByClassName("sig-ask-devosan1")[0].style.display="none";
document.getElementsByClassName("sig-ask-devosan2")[0].style.display="block";
document.getElementsByClassName("sig-ask-devosan2")[0].innerHTML=`<hr>
<button class="btn btn-primary m-2" type="button" disabled>
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
Submitting Question...
</button>
`;
var req = new XMLHttpRequest();
req.onreadystatechange = function() {
if (this.readyState==4 && this.status==200) {
document.getElementsByClassName("sig-ask-devosan2")[0].innerHTML=this.responseText;
}
}
req.open("POST","http://45.33.13.215/projects/dev-osan/dev-osan.github.io/sig-ask-devosan/index.php",true)
req.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
req.send(`question=${document.forms["q"]["question"].value}&name=${document.forms["q"]["name"].value}&email=${document.forms["q"]["email"].value}`);
}

23
sig-ask-devosan/index.php
Unescape View File

@ -1,23 +0,0 @@
<?php
if (strlen($_POST['question'])>0) {
$question = $_POST['question'];
$name = $_POST['name'];
$email = $_POST['email'];
//echo "Posted Question: <b>".$_POST['question']."</b><br>";
if (strlen($_POST['name'])>0) {
//echo "Posted Name: <b>".$_POST['name']."</b><br>";
}
if (strlen($_POST['email'])>0) {
//echo "Posted Email: <b>".$_POST['email']."</b><br>";
}
//Submit the question to a polling list.
$file = fopen("./requests/requests.php","a");
fwrite($file,$question."
".$name."
".$email."
");
} else {
echo "-1";
}
?>

3
sig-ask-devosan/popularquestions.php
Unescape View File

@ -1,3 +0,0 @@
<?php
echo "ping!";
?>

25
sig-ask-devosan/requests/requests.php
Unescape View File

@ -1,25 +0,0 @@
<?php
fdasfdsafdasvdaserq
I am trying to make sure this thing is working. Can you confirm?
Sig
It appears it is working! Great!
Sig
sigonasr2@gmail.com
One final test.
Joshua
sigonasr2@gmail.comActual final test.
Sig
sigonasr2@gmail.com
Sig<HTML><Test>
sig
Yes
fe1rf1feasvdzdz
fdafdasgfreqw
ffe1rfe3qwadafdasfdqa
?<>>?>

22
styles.css
Unescape View File

@ -1,5 +1,5 @@
.above-the-fold {
min-height: 100vh;
min-height: 95vh;
background-image: url("img/devOsan_noLogo.png");
background-size: cover;
background-repeat: no-repeat;
@ -7,11 +7,6 @@
padding-top: 3em;
}
.navbar-collapse hr {
background: #e3e3e3;
opacity: 0.3;
}
#announcement-card-link {
text-decoration: none;
color: black;
@ -63,6 +58,19 @@ h1 {
font-size: 5em;
}
h1.devOsan{
text-shadow: 2px 2px 6px #AAFFAA;
}
a.devOsan{
text-shadow: 0px 0px 2px #AAFFAA;
color:black;
}
h4.devOsan{
text-shadow: 1px 1px 3px white;
}
h4 {
font-size: 1.8em;
}
@ -107,4 +115,4 @@ h4 {
.answer {
margin-left: 10px;
}
}
Write Preview
Loading…
Cancel
Save