Skip to content

Lab 33 #102

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 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
c85ce24
added entry.js
npisciotti1 Mar 28, 2017
0d774ba
added auth-service.js
npisciotti1 Mar 28, 2017
b968587
added final scaffold and route config
npisciotti1 Mar 29, 2017
6fb6b70
got the app to work yeehaw
npisciotti1 Mar 29, 2017
aeca33c
got my signup route to work, signin still needs some work
npisciotti1 Mar 29, 2017
bd6abb7
had to change my .get to and use my config param differently, it hel…
npisciotti1 Mar 29, 2017
087c87d
got my gallery-service methods to work properly with my own backend
npisciotti1 Mar 29, 2017
4130766
fixed logout button issue
npisciotti1 Mar 29, 2017
1caa845
started adding styles
npisciotti1 Mar 30, 2017
145e9af
got my styles looking good
npisciotti1 Mar 30, 2017
0fb55dd
styled sign in and sign up, known issue with sign in page, could be e…
npisciotti1 Mar 30, 2017
9b48a70
fixed navbar outline
npisciotti1 Mar 30, 2017
351c59e
fixed footer outline
npisciotti1 Mar 30, 2017
bfbd312
sign in title fix
npisciotti1 Mar 30, 2017
817a963
got my PUT and DELETE routesfor gallery working with backend
npisciotti1 Mar 31, 2017
e6ceb3a
got my PUT and DELETE routes for gallery working with backend
npisciotti1 Mar 31, 2017
14551c3
added gallery-item styles
npisciotti1 Apr 4, 2017
b918432
added styles and pic component
npisciotti1 Apr 4, 2017
1c4f1fc
added styles and pic component
npisciotti1 Apr 4, 2017
0de1e75
got my initial 3 tests to pass
npisciotti1 Apr 4, 2017
3a99c9a
got my tests to pass, need to add DELETE functionality
npisciotti1 Apr 5, 2017
f6623c0
added component tests
npisciotti1 Apr 6, 2017
e5e8d13
added ui-bootstrap and modal test to landing page
npisciotti1 Apr 10, 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"]
}
Empty file added .eslintignore
Empty file.
22 changes: 22 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"rules": {
"no-console": "off",
"indent": [ "error", 2 ],
"quotes": [ "error", "single" ],
"semi": ["error", "always"],
"linebreak-style": [ "error", "unix" ],
"no-unused-vars": [2, {"vars": "local", "args": "after-used"}]
},
"env": {
"es6": true,
"node": true,
"mocha": true,
"jasmine": true
},
"ecmaFeatures": {
"modules": true,
"experimentalObjectRestSpread": true,
"impliedStrict": true
},
"extends": "eslint:recommended"
}
120 changes: 120 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@

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

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

#Test-Data
/data

#Node
/node_modules

# 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/node,osx,windows
41 changes: 41 additions & 0 deletions app/component/gallery/create-gallery/_create-gallery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
//:::: Create Gallery Styles :::://

.create-gallery {
margin: 0 auto;

h2 {
font-size: 3vw;
margin-top: 6%;

};

input {
width: 97%;
margin: 2% 0;
border: 1px solid;
border-color: #727272;
height: 4vw;
border-radius: 8px;
padding-left: 2vw;
font-size: 1.35vw;
}

button {
float: right;
border-radius: 10px;
background-color: #4a4a4a;
border: none;
color: #e6e6e6;
width: 18vw;
height: 4.5vw;
font-size: 1.75vw;
padding: 0 3vw;
margin-bottom: 10%;
}
}

.clearfix {
width: 100%;
height: 0%;
clear: both;
}
27 changes: 27 additions & 0 deletions app/component/gallery/create-gallery/create-gallery.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<section class="create-gallery">
<h2>Create a new gallery.</h2>

<div class="clearfix"></div>

<form name="createGalleryForm"
class="gallery-form"
ng-submit="createGalleryCtrl.createGallery()">

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

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

<button type="submit" class="button-std">create gallery</button>
<div class="clearfix"></div>
</form>
</section>
25 changes: 25 additions & 0 deletions app/component/gallery/create-gallery/create-gallery.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
'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.description = null;
});
};


}
42 changes: 42 additions & 0 deletions app/component/gallery/edit-gallery/_edit-gallery.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.edit-gallery {

.gallery-form {
background-color: #9b9b9b;
border-radius: 10px;
padding: 1.25vw 1.25vw;
line-height: 5vw;
margin: 2.5vw 0vw;
font-size: 2.5vw;

input {
border-radius: 7px;
background-color: #b2b2b2;
border: 2px #4a4a4a solid;
height: 3vw;
width: 75vw;
box-sizing: border-box;
font-size: 2vw;
padding: 1.75vw 1vw
}

input[name="description"] {
width: 68.8vw;
}

.label {
font-weight: bold;
}

button[name="update"] {
float: right;
margin-top: 5%;
margin-right: -1.5%;
}
}
}

.clearfix {
width: 100%;
height: 0%;
clear: both;
}
23 changes: 23 additions & 0 deletions 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-gallery">
<form class="gallery-form"
name="editGallery"
ng-submit="editGalleryCtrl.updateGallery()"
novalidate>

<fieldset>
<span class="label">name:</span>
<input name="name" class="input-std" type="text"
ng-model="editGalleryCtrl.gallery.name">
</fieldset>

<fieldset>
<span class="label">description:</span>
<input name="description" type="text"
ng-model="editGalleryCtrl.gallery.description">
</fieldset>

<div class="clearfix"></div>
<button name="update" type="submit">update</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('editGalleryCtrl.updateGallery');
galleryService.updateGalleries(this.gallery._id, this.gallery);
};
}
42 changes: 42 additions & 0 deletions app/component/gallery/gallery-item/_gallery-item.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
.gallery-item {

.current-item {
background-color: #9b9b9b;
border-radius: 10px;
padding: 1.25vw 1.25vw;
line-height: 5vw;
margin: 2.5vw 0vw;

span {
font-size: 2.5vw;
}

.label {
font-weight: bold;
}
}

button {
float: right;
border-radius: 10px;
background-color: #4a4a4a;
border: none;
color: #e6e6e6;
width: 15vw;
height: 4.5vw;
font-size: 1.75vw;
padding: 0 3vw;
margin-bottom: 10%;
margin-left: 2vw;
}

.btn-grey {
background-color: #9b9b9b;
}
}

.clearfix {
width: 100%;
height: 0%;
clear: both;
}
Loading