Skip to content

lab-regan-uiBootstrap #110

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.

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
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
56b30d8
structure complete
reganoneill Mar 29, 2017
7ed2898
webpack hates svg
reganoneill Mar 29, 2017
c85e205
layout complete
reganoneill Mar 29, 2017
08728bf
submitlab
reganoneill Mar 29, 2017
b53441d
log config and gallery service built
reganoneill Mar 29, 2017
8593b67
markdown and js mostly complete
reganoneill Mar 29, 2017
7d1ccb8
mvp met
reganoneill Mar 29, 2017
fdac0d6
landing refactor complete
reganoneill Mar 29, 2017
a2898c7
minor revisions and additions needed
reganoneill Mar 30, 2017
8b526c8
core functionality
reganoneill Mar 31, 2017
34974f1
fixed page load issue
reganoneill Mar 31, 2017
b970d72
angular dom manipulation
reganoneill Mar 31, 2017
d263391
submission
reganoneill Mar 31, 2017
d409ee3
cleaned up home view
reganoneill Apr 2, 2017
05eadab
basic image ups functionality
reganoneill Apr 3, 2017
73123fc
local deploy image upload working
reganoneill Apr 3, 2017
9b6ad29
committing for submission
reganoneill Apr 4, 2017
4f16d59
basic test structure
reganoneill Apr 4, 2017
9e07f68
delete pic working
reganoneill Apr 5, 2017
a4740f1
submission
reganoneill Apr 5, 2017
229f429
update test works
reganoneill Apr 6, 2017
ee46c88
completed tests
reganoneill Apr 6, 2017
a8a1b48
icons, custom directive, filter
reganoneill Apr 7, 2017
31b8010
reformatted and resized sprite sheet content
reganoneill Apr 7, 2017
82be9cc
added native filter in thumbnail cont
reganoneill Apr 7, 2017
02f2477
improved formatting
reganoneill Apr 7, 2017
f885325
submission
reganoneill Apr 7, 2017
756ad5c
footer links active
reganoneill Apr 10, 2017
ed6f44a
updated styles for bootstrap implementation
reganoneill Apr 10, 2017
e7332c1
implemented bootstrap ui and further styling
reganoneill Apr 10, 2017
f285d9b
further improvements with uib
reganoneill Apr 10, 2017
345eb93
bootstrap ui buttons and hover actions
reganoneill Apr 10, 2017
f87d5cf
added more form validation and ngMessages
reganoneill Apr 11, 2017
32b567d
super badass accordion view functionality
reganoneill Apr 11, 2017
9dd024b
deletion improvements and ui tweaks
reganoneill Apr 11, 2017
63bf7e3
cleaned up delete
reganoneill Apr 11, 2017
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
3 changes: 3 additions & 0 deletions lab-regan/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015"]
}
24 changes: 24 additions & 0 deletions lab-regan/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"rules": {
"no-console": "off",
"indent": [ "error", 2 ],
"quotes": [ "error", "single" ],
"semi": ["error", "always"],
"linebreak-style": [ "error", "unix" ]
},
"env": {
"es6": true,
"node": true,

Error: Parse error on line 11:
... "node": true, }, "ecmaFeatures":
----------------------^
Expecting 'STRING'
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
132 changes: 132 additions & 0 deletions lab-regan/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@

# Created by https://www.gitignore.io/api/osx,node,linux,windows

### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

###Local Files###
build

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env


### OSX ###
*.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon


# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.gitignore.io/api/osx,node,linux,windows
Binary file added lab-regan/app/assets/cfLogo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions lab-regan/app/assets/cfLogo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added lab-regan/app/assets/labicons9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
.create-gallery{
margin-bottom: 2.5em;
h2{
margin-top: 0;
padding-left: 10%;
margin-bottom: -0.5em;
padding-top: 1.5em;
}
form {
width: 90%;
margin: auto;
input {
width: 100%;
}
.btn-std {
width: 10%;
}
}
}
19 changes: 19 additions & 0 deletions lab-regan/app/component/gallery/create-gallery/create-gallery.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<section class="create-gallery">
<h2>Create a new gallery</h2>
<form name="createGalleryForm"
class="galleryForm"
ng-submit="createGalleryCtrl.createGallery()">

<fieldset>
<input type="text" name="name" placeholder="gallery name" class="input-std"
ng-model="createGalleryCtrl.gallery.name" required>
</fieldset>

<fieldset>
<input type="text" name="desc" placeholder="gallery description" class="input-std"
ng-model="createGalleryCtrl.gallery.desc" required>
</fieldset>

<input class="btn-std" type="submit">
</form>
</section>
20 changes: 20 additions & 0 deletions lab-regan/app/component/gallery/create-gallery/create-gallery.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
'use strict';

module.exports = {
template: require('./create-gallery.html'),
controller:['$log', 'galleryService', CreateGalleryController],
controllerAs: 'createGalleryCtrl'
};

function CreateGalleryController($log, galleryService){
$log.debug('CreateGalleryController');

this.gallery = {};
this.createGallery= function(){
galleryService.createGallery(this.gallery)
.then( () => {
this.gallery.name = null;
this.gallery.desc = null;
});
};
};
45 changes: 45 additions & 0 deletions lab-regan/app/component/gallery/edit-gallery/_edit-gallery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
@import "../../../scss/lib/theme/vars";

.edit {
form{
width: 80%;
margin: 0 auto;
padding: 0.75em;
border-radius: 8px;
color: $site-primary;
div {
&:first-child{
background: $site-secondary;
border-radius: 6px;
},
&:nth-child(2){
text-align: right;
}
.btn-std{
margin-right: 0;
}
}
fieldset{
margin: 0.75em 0;
padding: 0.5em;
span{
margin-top: 0.75em;
float: left;
&:first-child{
font-weight: bold;
}
}
input{
// float: left;
display: inline-block;
&:first-child {
border: 1px red dotted;
margin-left: 4%;
}
}
}
}
}
// & > span {
// margin: 1em 0;
// }
23 changes: 23 additions & 0 deletions lab-regan/app/component/gallery/edit-gallery/edit-gallery.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<section class="edit">
<form class="edit-gallery"
name="edit-gallery"
ng-submit="editGalleryCtrl.updateGallery()"
novalidate>
<div class="fieldsetHolder">
<fieldset>
<span class="item-label">name:</span>
<input type="text" class="" name="name"
ng-model="editGalleryCtrl.gallery.name">
</fieldset>

<fieldset>
<span class="item-label">description:</span>
<input type="text" class="" name="desc"
ng-model="editGalleryCtrl.gallery.desc">
</fieldset>
</div>
<div>
<button class="btn-std" name="update" type="submit">update</button>
</div>
</form>
</section>
21 changes: 21 additions & 0 deletions lab-regan/app/component/gallery/edit-gallery/edit-gallery.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
'use strict';

require('./_edit-gallery.scss');

module.exports = {
template: require('./edit-gallery.html'),
controller: ['$log', 'galleryService', EditGalleryController],
controllerAs: 'editGalleryCtrl',
//this is a reserved property name
bindings: {
gallery: '<'
}
};

function EditGalleryController($log, galleryService){
$log.debug('EditGalleryController');

this.updateGallery = function(){
galleryService.updateGallery(this.gallery._id, this.gallery);
};
};
56 changes: 56 additions & 0 deletions lab-regan/app/component/gallery/gallery-item/_gallery-item.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
@import "../../../scss/lib/theme/vars";

.gallery-item {
.current-item {
width: 90%;
margin: 0 auto;
background: $site-secondary;
padding: 0.75em;
border-radius: 8px;
color: $site-primary;
div{
margin: 0.75em 0;

span{
&:first-child{
font-weight: bold;
}
}
}
& > span {
margin: 1em 0;
}
}
.edit-container {
width: 100%;
div{
width: 90%;
margin: auto;
margin-top: 0.25em;
text-align: right;
button {
display: inline-block;
background: $site-primary;
color: $white;
padding: 0.25em 2em;
border-radius: 8px;
margin: 0.5em 0;
margin-bottom: 1.5em;
&:first-child{
&:hover{
background: $white;
color: $black;
}
}
&:last-child{
background: $site-tertiary;
color: $black;
&:hover{
background: $black;
color: $white;
}
}
}
}
}
}
Loading