Skip to content

Alumini to Alumni change all across project #20

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.

Sign up for GitHub

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

Open
srushtipai wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Alumini to Alumni change all across project #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,13 @@ app.get('/stuart', (req, res) => {
}
});

app.get('/alumini', (req, res) => {
app.get('/alumni', (req, res) => {
req.session.requestedPath = req.originalUrl;
if (req.session.userid !== process.env.ADMINU || req.session.password !== process.env.ADMINP) {
req.flash('error', 'Please login');
res.redirect('/login');
} else {
res.render('alumini');
res.render('alumni');
}
});

Expand Down
4 changes: 2 additions & 2 deletions public/scripts/landing.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ $(document).ready(function() {
let building = $('#inputBuilding').find(':selected').text();
if (building === 'Stuart Building') {
window.location.href = '/stuart';
} else if (building === 'Alumini Building') {
window.location.href = '/alumini';
} else if (building === 'Alumni Building') {
window.location.href = '/alumni';
} else if (building === 'Idea Shop') {
window.location.href = '/ideashop';
} else if (building === 'Kaplan Institute'){
Expand Down
6 changes: 3 additions & 3 deletions public/scripts/maps.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ $(document).ready(function() {
var data2 = e.params.data;
if (data2.text === 'Stuart') {
window.location.href = '/stuart';
} else if (data2.text === 'Alumini') {
window.location.href = '/alumini';
} else if (data2.text === 'Alumni') {
window.location.href = '/alumni';
} else if (data2.text === 'Idea Shop') {
window.location.href = '/ideashop';
} else if (data2.text === 'Kaplan') {
Expand Down Expand Up @@ -308,7 +308,7 @@ function parseToJSON(serializeArray){
}

function mapBuildingNameToId (buildingName) {
if (buildingName === 'Alumini') {
if (buildingName === 'Alumni') {
return 4;
} else if (buildingName === 'Stuart') {
return 31;
Expand Down
4 changes: 2 additions & 2 deletions public/stylesheets/maps.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ ul {
background-color: black;
margin-left: 10%;
}
#aluminiSvg, #ideaShopSvg {
#alumniSvg, #ideaShopSvg {
padding: 0 51px;
}
#kaplanSvg {
Expand All @@ -49,7 +49,7 @@ ul {
padding: 36px;
}

#aluminiSvg {
#alumniSvg {
padding: 17px 47px;
}

Expand Down
4 changes: 2 additions & 2 deletions views/alumini.ejs → views/alumni.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
</li>
</ul>
<select id='building' style='width: 27%;'>
<option selected='true'>Alumini</option>
<option selected='true'>Alumni</option>
<option>Stuart</option>
<option>Idea Shop</option>
<option>Kaplan</option>
Expand All @@ -117,7 +117,7 @@
</div>
</div>
</nav>
<div class='svgContainer' id='aluminiSvg'></div>
<div class='svgContainer' id='alumniSvg'></div>
</div>

<div class="modal fade" id="beaconForm" tabindex="-1" role="dialog" aria-labelledby="beaconFormLabel" aria-hidden="true">
Expand Down
2 changes: 1 addition & 1 deletion views/kaplan.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
</ul>
<select id='building' style='width: 27%;'>
<option selected='true'>Kaplan</option>
<option>Alumini</option>
<option>Alumni</option>
<option>Stuart</option>
<option>Idea Shop</option>
</select>
Expand Down
2 changes: 1 addition & 1 deletion views/landing.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
<select class="form-control" id="inputBuilding">
<option selected="selected">Select Building</option>
<option>Stuart Building</option>
<option>Alumini Building</option>
<option>Alumni Building</option>
<option>Idea Shop</option>
<option>Kaplan Institute</option>
</select>
Expand Down
2 changes: 1 addition & 1 deletion views/stuart.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
</ul>
<select id='building' style='width: 27%;'>
<option selected='true'>Stuart</option>
<option>Alumini</option>
<option>Alumni</option>
<option>Idea Shop</option>
<option>Kaplan</option>
</select>
Expand Down