Skip to content

Commit

Permalink
Pubsite Rewrite 2019 -- Jekyll this time! (#206)
Browse files Browse the repository at this point in the history
* Transfer code from CSHPublicSiteV2 repo

* Remove local CSH Boostrap

* Update footer with social media links + how to apply

* Update sponsor image order, display, and alt text

* Update and add alumni company logos, tweak descriptive text

* Update eboard member names, update some images

* Fix nav condensing, update welcome back photo, fix some wording

* Add donation link to nav, update camping & holiday dinner pics

* Tweak footer, put nav in .contaner, remove accidental file

* Remove unused eboard photo js

* Update eboard photos

* Add Blog page, a few posts, and unique coloring for posts w/ no images

* Update tour slideshow images

* Update formatting, add Recent Posts section to homepage

* Update footer and nav content, tweak slider styles

* Update copy, replace some placeholder images

* Position footer absolutely at bottom of content

* Update copy, add images

* Update README, add GPLv3.0 license

* Update Jenkinsfile and config for staging URL

* Update footer spacing

* Add meta tags, remove placeholders, add links to Membership

* Fix nav links, remove unused directory

* Add WEBP files, functionality for many large images

* Add more alumni companies to list, update old logos

* Add page detailing the introductory process

* Tweak various styles

* Update nav, accessbility, copy

* Remove old files

* Update copy, html formatting

* Update arcade machine photos

* Update image for Collin's blog post

* Add FAQ page

* Move all images to S3

* Set max-height on homepage slider

* Bold Computer Science House in homepage about text

* Tweak slider CSS

* Move Tour page to About section

* Adding Firebase CI (#1)

* Fix minor readme typo
  • Loading branch information
RamZallan authored and devinmatte committed Aug 15, 2019
1 parent 7324415 commit d215a75
Show file tree
Hide file tree
Showing 277 changed files with 3,503 additions and 19,147 deletions.
5 changes: 5 additions & 0 deletions .firebaserc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"projects": {
"default": "csh-public-site"
}
}
178 changes: 8 additions & 170 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,170 +1,8 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath
resources/php/key.php

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath

potential_photos/

#################
## Jetbrains IDEs
#################

.idea

#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results
[Dd]ebug/
[Rr]elease/
*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.vspscc
.builds
*.dotCover

## TODO: If you have NuGet Package Restore enabled, uncomment this
#packages/

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf

# Visual Studio profiler
*.psess
*.vsp

# ReSharper is a .NET coding add-in
_ReSharper*

# Installshield output folder
[Ee]xpress

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish

# Others
[Bb]in
[Oo]bj
sql
TestResults
*.Cache
ClientBin
stylecop.*
~$*
*.dbmdl
Generated_Code #added for RIA/Silverlight projects

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML



############
## Windows
############

# Windows image file caches
Thumbs.db

# Folder config file
Desktop.ini


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist
build
eggs
parts
bin
var
sdist
develop-eggs
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg

# Mac crap
.DS_Store
vendor/
_site
.sass-cache
.jekyll-metadata
npm-debug.log
.bundle/
node_modules/
.firebase/
16 changes: 16 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
language: node_js
node_js:
- "12.6"
before_install:
- rvm install 2.6.3
install:
- gem install bundler
- npm install
before_script:
- bundle install
- npm install -g firebase-tools
script:
- bundle exec jekyll build
after_success:
- firebase deploy --token $FIREBASE_TOKEN --non-interactive
- npm run lh --perf=85 --a11y=85 --bp=85 --seo=85 https://csh-public-site.web.app
50 changes: 12 additions & 38 deletions 404.html
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1,40 +1,14 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>CSH | 404</title>
<include file="resources/templates/_header.html"></include>
</head>
<body>
<include file="resources/templates/_navbar.html"></include>
<!-- Main jumbotron for a primary marketing message or call to action -->
<div class="jumbotron csh-page-header">
<div class="container">
<div class="row">
<div class="col-xs-12 col-sm-12 col-md-12 vcenter">
<div class="csh-header-text">
Page Not Found
</div>
</div>
</div>
---
layout: page
title: "Error 404"
---
<div class="gray-wrapper">
<div class="container spaced">
<div class="row">
<div class="col">
<h2>Page not found :(</h2>
<p>The requested page could not be found.</p>
</div>
</div>
<div class="container csh-body">
<!-- Insert Page Content In this Area -->
<div class="row">
<div class="col-xs-12 col-sm-6 col-md-6 vcenter">
<div class="embed-responsive embed-responsive-16by9 csh-404-video">
<iframe class="embed-responsive-item" src="https://www.youtube.com/embed/t3otBjVZzT0?autoplay=1" frameborder="0" allowfullscreen></iframe>
</div>
</div><!----><div class="col-xs-12 col-sm-6 col-md-6 vcenter">
<img src="/resources/images/jr-purple.svg" class="img-responsive" style="margin:auto">
<br>
</div>
</div>
<!-- End Page Content Here -->
</div>
<include file="resources/templates/_footer.html"></include>
<!-- Bootstrap core JavaScript
================================================== -->
<include file="resources/templates/_coreJS.html"></include>
</body>
</html>
</div>
</div>
34 changes: 34 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
source "https://rubygems.org"

# Hello! This is where you manage which Jekyll version is used to run.
# When you want to use a different version, change it below, save the
# file and run `bundle install`. Run Jekyll with `bundle exec`, like so:
#
# bundle exec jekyll serve
#
# This will help ensure the proper Jekyll version is running.
# Happy Jekylling!
gem "jekyll", "~> 3.8.3"

# This is the default theme for new Jekyll sites. You may change this to anything you like.
gem "minima", "~> 2.0"

# If you want to use GitHub Pages, remove the "gem "jekyll"" above and
# uncomment the line below. To upgrade, run `bundle update github-pages`.
# gem "github-pages", group: :jekyll_plugins

# If you have any plugins, put them here!
group :jekyll_plugins do
gem "jekyll-feed", "~> 0.6"
gem "liquid-md5"
gem "jekyll-regex-replace"
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]

# Performance-booster for watching directories on Windows
gem "wdm", "~> 0.1.0" if Gem.win_platform?


gem "rake", "~> 12.3"
81 changes: 81 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
GEM
remote: https://rubygems.org/
specs:
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
colorator (1.1.0)
concurrent-ruby (1.0.5)
em-websocket (0.5.1)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
ffi (1.9.25)
forwardable-extended (2.6.0)
http_parser.rb (0.6.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
jekyll (3.8.3)
addressable (~> 2.4)
colorator (~> 1.0)
em-websocket (~> 0.5)
i18n (~> 0.7)
jekyll-sass-converter (~> 1.0)
jekyll-watch (~> 2.0)
kramdown (~> 1.14)
liquid (~> 4.0)
mercenary (~> 0.3.3)
pathutil (~> 0.9)
rouge (>= 1.7, < 4)
safe_yaml (~> 1.0)
jekyll-feed (0.10.0)
jekyll (~> 3.3)
jekyll-regex-replace (1.1.0)
jekyll-sass-converter (1.5.2)
sass (~> 3.4)
jekyll-seo-tag (2.5.0)
jekyll (~> 3.3)
jekyll-watch (2.0.0)
listen (~> 3.0)
kramdown (1.17.0)
liquid (4.0.0)
liquid-md5 (0.0.3)
liquid (>= 2.5, < 5.0)
listen (3.1.5)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)
ruby_dep (~> 1.2)
mercenary (0.3.6)
minima (2.5.0)
jekyll (~> 3.5)
jekyll-feed (~> 0.9)
jekyll-seo-tag (~> 2.1)
pathutil (0.16.1)
forwardable-extended (~> 2.6)
public_suffix (3.0.2)
rake (12.3.2)
rb-fsevent (0.10.3)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
rouge (3.1.1)
ruby_dep (1.5.0)
safe_yaml (1.0.4)
sass (3.5.7)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
rb-inotify (~> 0.9, >= 0.9.7)

PLATFORMS
ruby

DEPENDENCIES
jekyll (~> 3.8.3)
jekyll-feed (~> 0.6)
jekyll-regex-replace
liquid-md5
minima (~> 2.0)
rake (~> 12.3)
tzinfo-data

BUNDLED WITH
1.16.3
17 changes: 17 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
node('jenkins-slave-ruby-centos7') {
stage('Build') {
git url: "https://github.com/ramzallan/CSHPublicSite.git"
sh "bundle install"
sh "bundle exec rake build:production"
}

/*
stage('Test') {
sh "bundle exec rake test"
}
*/

stage('Build Image') {
sh "oc start-build pubsite --from-dir=_site"
}
}
Loading

0 comments on commit d215a75

Please sign in to comment.