Skip to content
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

JW Dropdown-Bootstrap #112

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
3544358
scaffolding done
jtwalters25 Mar 29, 2017
3ac1e4b
entry.js completed
jtwalters25 Mar 29, 2017
666e0e0
view folder added
jtwalters25 Mar 29, 2017
30bbaf8
scss scaffolding
jtwalters25 Mar 29, 2017
4fb8e05
karma installed with other dev dependencies
jtwalters25 Mar 29, 2017
f10f716
main.scss
jtwalters25 Mar 29, 2017
5c29d3e
css work
jtwalters25 Mar 29, 2017
889483a
working on scss
jtwalters25 Mar 29, 2017
f811cb4
scss wireframe
jtwalters25 Mar 29, 2017
9acfbe8
navbar folder and files done
jtwalters25 Mar 29, 2017
3dfce28
component added
jtwalters25 Mar 30, 2017
75147aa
working
jtwalters25 Mar 30, 2017
8de7319
signup
jtwalters25 Mar 30, 2017
137ddf7
edit gallery
jtwalters25 Mar 30, 2017
461520b
service gallery item
jtwalters25 Mar 30, 2017
08ba9cf
required scss theme
jtwalters25 Mar 30, 2017
23f214e
day 3
jtwalters25 Mar 31, 2017
9a02030
css almost finished.
jtwalters25 Apr 1, 2017
0d7196f
spacing with multiple galleries adjusted
jtwalters25 Apr 1, 2017
362e41c
login functionality fixed
jtwalters25 Apr 3, 2017
2c6f03d
logout and delete buttons styled
jtwalters25 Apr 3, 2017
a79de7a
edited edit-gallery
jtwalters25 Apr 3, 2017
d03273e
picture upload not quite working
jtwalters25 Apr 4, 2017
f03f4cd
upload and delete working
jtwalters25 Apr 4, 2017
a2ce3a6
test
jtwalters25 Apr 5, 2017
7402921
delete test done
jtwalters25 Apr 5, 2017
64f07dd
styles thumbnail container & thumbnail
jtwalters25 Apr 5, 2017
fc50c33
4 test passing
jtwalters25 Apr 6, 2017
9105915
fuzzy filter added
jtwalters25 Apr 7, 2017
1ee150d
fuzzy filter, social icons
jtwalters25 Apr 7, 2017
64654ec
dropdown done and styled
jtwalters25 Apr 11, 2017
a16c488
dropdown
jtwalters25 Apr 11, 2017
250efdc
tooltip added
jtwalters25 Apr 11, 2017
cc7f9a3
travis file added
jtwalters25 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 .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["es2015"]
}
21 changes: 21 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"rules": {
"no-console": "off",
"indent": [ "error", 2 ],
"quotes": [ "error", "single" ],
"semi": ["error", "always"],
"linebreak-style": [ "error", "unix" ]
},
"env": {
"es6": true,
"node": true,
"mocha": true,
"jasmine": true
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
94 changes: 94 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
# Created by https://www.gitignore.io/api/node,osx,windows,linux
### 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*
### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
# Runtime data
pids
*.pid
build/
*.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/node,osx,windows,linux
17 changes: 17 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
```language: node_js
node_js:
- 'stable'
dist: trusty
sudo: required
addons:
apt:
sources:
- google-chrome
packages:
- google-chrome-stable
before_script:
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- sleep 3
script:
- npm run test```
Empty file.
Empty file.
Empty file.
6 changes: 6 additions & 0 deletions app/component/gallery/create-gallery/_create-gallery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
@import '../../../scss/lib/theme/vars';

h3{
font-size: 2vw;
color:rgb(93, 93, 93);
}
20 changes: 20 additions & 0 deletions app/component/gallery/create-gallery/create-gallery.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<section class="create-gallery">
<form name="createGalleryForm"
class="gallery-form"
ng-submit="createGalleryCtrl.createGallery()">
<h3>Create a New Gallery</h3>
<fieldset>
<label for="name"></label>
<input placeholder="name" class="input-std" type="text"
ng-model="createGalleryCtrl.gallery.name" required>
</fieldset>

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

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

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

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;
});
};
}
5 changes: 5 additions & 0 deletions app/component/gallery/edit-gallery/_edit-gallery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
@import '../../../scss/lib/theme/vars';

fieldset{
width:100%;
}
22 changes: 22 additions & 0 deletions app/component/gallery/edit-gallery/edit-gallery.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<section class="edit">
<form class="edit-gallery"
name="editGallery"
ng-submit="editGalleryCtrl.updateGallery()"
novalidate=>

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

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

<button class="btn-std">update gallery</button>

</form>
</section>
21 changes: 21 additions & 0 deletions 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',
bindings: {
gallery: '<'
}
};

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

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

.current-item{
background-color:grey;
padding:20px;
margin-top:120px;
/* margin-left:30px; */
margin-bottom:30px;
border-radius: 10px 10px 10px;

.item-label{
font-size: 3.5vw;
color:rgb(57, 56, 56);
}
span:nth-child(2){
font-size:2.5vw;
color:lightgrey;
}

}

h3{
font-size: 4vw;
color:rgb(34, 33, 33);
padding: 30px;
}

.delete-btn-std{

width: unset;
padding: 0 $gutter-std*2.5;
background-color: $primarycolor / 1.2;
color: $black;
font-size: x-large;
font-weight: lighter;
height:70px;
float:right;
margin-right:0px;
border-radius: 10px 10px 10px
}
22 changes: 22 additions & 0 deletions app/component/gallery/gallery-item/gallery-item.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<li class="gallery-item">
<div class="current-item" ng-if="!galleryItemCtrl.showEditGallery">

<div>
<span class="item-label">name:</span>
<span>{{ galleryItemCtrl.gallery.name }}</span>
</div>
<div>
<span class="item-label">description:</span>
<span>{{ galleryItemCtrl.gallery.desc }}</span>
</div>
</div>


<edit-gallery ng-if="galleryItemCtrl.showEditGallery" gallery="galleryItemCtrl.gallery"></edit-gallery>


<button type="button" class="delete-btn-std" name="button" ng-click="galleryItemCtrl.deleteGallery()">delete</button>

<button type="button" name="button" class="btn-std" ng-click="galleryItemCtrl.showEditGallery = !galleryItemCtrl.showEditGallery" >edit</button>

</li>
22 changes: 22 additions & 0 deletions app/component/gallery/gallery-item/gallery-item.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
'use strict';

require('./_gallery-item.scss');

module.exports = {
template: require('./gallery-item.html'),
controller: ['$log', 'galleryService', GalleryItemController],
controllerAs: 'galleryItemCtrl',
bindings: {
gallery: '<'
}
};

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

this.showEditGallery = false;

this.deleteGallery = function(){
galleryService.deleteGallery(this.gallery._id);
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
@import '../../../scss/lib/theme/vars';

.thumbnail-container{
background-color:grey;
padding:20px;
margin-top:120px;
margin-left:30px;
margin-bottom:30px;
border-radius: 10px 10px 10px;

h3{
font-size: 3.5vw;
color:rgb(57, 56, 56);
}
span:nth-child(2){
font-size:2.5vw;
color:lightgrey;
}

}
/*
h3{
font-size:2vw;
margin: 2px;
} */
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<div class="thumbnail-container">
<h3>{{ thumbnailContainerCtrl.gallery.name }}</h3>
<upload-pic gallery="thumbnailContainerCtrl.gallery"></upload-pic>

<div class="thumbs">
<thumbnail ng-repeat="item in thumbnailContainerCtrl.gallery.pics" pic="item" gallery="thumbnailContainerCtrl.gallery"></thumbnail>
</div>
</div>
11 changes: 11 additions & 0 deletions app/component/gallery/thumbnail-container/thumbnail-container.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
'use strict';

require('./_thumbnail-container.scss');

module.exports = {
template: require('./thumbnail-container.html'),
controllerAs: 'thumbnailContainerCtrl',
bindings: {
gallery: '<'
}
};
20 changes: 20 additions & 0 deletions app/component/gallery/thumbnail/_thumbnail.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
@import '../../../scss/lib/theme/vars';

.thumbnail{
background-color:grey;
padding:20px;
margin-top:120px;
margin-left:30px;
margin-bottom:30px;
border-radius: 10px 10px 10px;

.item-label{
font-size: 3.5vw;
color:rgb(57, 56, 56);
}
span:nth-child(2){
font-size:2.5vw;
color:lightgrey;
}

}
Loading