Skip to content

Commit

Permalink
Merge pull request #1 from winstonkim/gh-pages
Browse files Browse the repository at this point in the history
SISRP-6547 - Campus Solutions splash page
  • Loading branch information
christianvuerings committed Sep 16, 2015
2 parents 609b49f + 9b62908 commit f2ce05d
Show file tree
Hide file tree
Showing 13 changed files with 788 additions and 6 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
; editorconfig.org
root = true

[*]
charset = utf-8
end_of_line = lf
insert_final_newline = true
indent_style = space
indent_size = 2
trim_trailing_whitespace = true
23 changes: 23 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.

# Tempfiles
/tmp

# .DS_Store files on Mac
.DS_Store

# Files that might appear on external disks
.Spotlight-V100
.Trashes

# SASS cache
.sass-cache

# Node modules
/node_modules

# Npm log
npm-debug.log

# Server perm file (used for https)
server.pem
22 changes: 22 additions & 0 deletions .scss-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
exclude:
- 'node_modules/**'
- 'dist/**'
- 'src/css/**'

linters:
IdSelector:
exclude: 'src/css/cs/items/_mainheader.scss'
ImportantRule:
enabled: false
NameFormat:
allow_leading_underscore: false
NestingDepth:
max_depth: 7
SelectorDepth:
enabled: false
StringQuotes:
enabled: false
QualifyingElement:
enabled: false
UrlFormat:
enabled: false
6 changes: 2 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ node_js:
# https://github.com/sass/node-sass/issues/490
# - "0.11"
- "0.10"
before_script:
- gem install scss-lint
- npm install -g gulp
script: gulp
before_script: "./script/front-end-test.sh"
script: gulp test
# See https://github.com/travis-ci/travis-core/pull/137
branches:
only:
Expand Down
11 changes: 11 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Copyright 2014 - 2015, Regents of the University of California
Licensed under the Educational Community License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.

You may obtain a copy of the License at: http://opensource.org/licenses/ECL-2.0

Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an "AS IS"
BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
or implied. See the License for the specific language governing
permissions and limitations under the License.
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# The SIS Splash Page
This is the splash page for PeopleSoft consultants, staff, and faculty to log in to Campus Solutions. Users can access the log in portal through the splash page in addition to links to useful resources that a consultant might need.
## Build
This page uses Gulp to convert the SCSS files into inline CSS. Run the following command to compile the splash page:

## Example

```bash
gulp
```
## Screenshot
![SIS Splash Page Screenshot](http://s21.postimg.org/6akk8gnt3/splashpagescreenshot.png)
43 changes: 43 additions & 0 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
// Include gulp
var gulp = require('gulp');

// Include Our Plugins
var sass = require('gulp-sass');
var concat = require('gulp-concat');
var uglify = require('gulp-uglify');
var rename = require('gulp-rename');
var inlinesource = require('gulp-inline-source');
var autoprefixer = require('gulp-autoprefixer');

// Compile Our Sass
gulp.task('sass', function() {
return gulp.src('src/scss/*.scss')
.pipe(sass())
.pipe(autoprefixer({
browsers: ['last 2 versions'],
cascade: false
}))
.pipe(gulp.dest('src/css'));
});

gulp.task('inlinesource', ['sass'], function() {
return gulp.src('./src/index.html')
.pipe(inlinesource())
.pipe(gulp.dest('./out'));
});

// Watch Files For Changes
gulp.task('watch', function() {
gulp.watch('src/scss/*.scss', ['inlinesource']);
});

// Exit for Travis
gulp.task('exit', ['sass', 'inlinesource'], function() {
process.exit(0);
});

// Default Task
gulp.task('default', ['sass', 'watch', 'inlinesource']);

// Test Task
gulp.task('test', ['sass', 'inlinesource', 'exit']);
81 changes: 81 additions & 0 deletions out/index.html

Large diffs are not rendered by default.

25 changes: 25 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"name": "sis-splash-main",
"version": "1.0.0",
"description": "Splash log in page to Campus Solutions for PeopleSoft consultants, staff, and faculty",
"main": "index.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/ucberkeley/sis-splash-main"
},
"author": "Winston Kim",
"license": "ECL-2.0",
"devDependencies": {
"gulp": "^3.9.0",
"gulp-autoprefixer": "^2.3.1",
"gulp-concat": "^2.6.0",
"gulp-inline-source": "^2.1.0",
"gulp-jshint": "^1.11.2",
"gulp-rename": "^1.2.2",
"gulp-sass": "^2.0.4",
"gulp-uglify": "^1.2.0"
}
}
4 changes: 4 additions & 0 deletions script/front-end-test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
gem install scss-lint
scss-lint .
[[ $? -ne 0 ]] && echo 'scss-lint failed' && exit 1 || echo 'scss-lint was successful'
npm install -g gulp
206 changes: 206 additions & 0 deletions src/css/splash.css

Large diffs are not rendered by default.

81 changes: 81 additions & 0 deletions src/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8" />
<title>UC Berkeley Campus Solutions - Sign In</title>

<!-- Set the viewport width to device width for mobile -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimal-ui" />

<link rel="stylesheet" type="text/css" href="css/splash.css" inline>
</head>
<body>
<div class="section section-0">
<div class="container">
<a title="To SIS Project Home" href="http://sisproject.berkeley.edu/">
<div class="logo"></div>
</a>
</div>
</div>
<div class="section section-1">
<div class="container">
<div class="square-container">
<div class="gray-blue square"></div>
<div class="navy square md-screen"></div>
<div class="gray square"></div>
<div class="light-blue square md-screen"></div>
<div class="gray square lg-screen"></div>
<div class="gray-blue square lg-screen"></div>
</div>
<div class="sign-in-container">
<div class="padding-50">
<h1>UC Berkeley <br>Campus Solutions</h1>
<hr>
<p>Sign in with your CalNet ID and passphrase.</p>
<p><a href="https://calnet.berkeley.edu/">Need a CalNet ID?</a></p>
<!-- Sign in link varies depending on environment -->
<a href="https://bcs-web-dev-03.is.berkeley.edu:8443/bcsdev/signon.html" class="sign-in-link">Sign in to Campus Solutions</a>
</div>
</div>
</div>
</div>
<div class="section section-2">
<div class="container">
<div class="links-container">
<div class="padding-lr-30">
<div class="quick-links">
<h2>Quick Links</h2>
<ul>
<li>
<a href="https://calshare.berkeley.edu/_login/default.aspx?ReturnUrl=%2fsites%2fsait%2fsis%2f_layouts%2f15%2fAuthenticate.aspx%3fSource%3d%252Fsites%252Fsait%252Fsis%252F%255Flayouts%252F15%252FMySubs%252Easpx&Source=%2Fsites%2Fsait%2Fsis%2F%5Flayouts%2F15%2FMySubs%2Easpx">CalShare</a>
</li>
<li>
<a href="http://bdrive.berkeley.edu/">bDrive</a>
</li>
<li>
<a href="http://jira.berkeley.edu/">JIRA</a>
</li>
<li>
<a href="https://calshare.berkeley.edu/sites/sait/sis/_layouts/15/WopiFrame.aspx?sourcedoc=/sites/sait/sis/Docs/ProjectEnvironmentsInfo.docx&action=default">SIS Environments</a>
</li>
</ul>
</div>
<a href="http://sis-staff.berkeley.edu/timeline-links">
<img alt="Highlevel Timeline" class="timeline-banner" src="http://sis-staff.berkeley.edu/sites/default/files/intranet-timeline-button.jpg">
</a>
</div>
</div>
<div class="video-container">
<div class="padding-30">
<div class="iframe-container">
<iframe src="https://www.youtube.com/embed/RSfV9mD2gwE" frameborder="0" allowfullscreen></iframe>
</div>
</div>
</div>
</div>
</div>
<footer>
&copy; 2015 UC Regents. All Rights Reserved.
</footer>
</body>
</html>
Loading

0 comments on commit f2ce05d

Please sign in to comment.