Skip to content

Commit

Permalink
build
Browse files Browse the repository at this point in the history
  • Loading branch information
samsep committed Nov 30, 2015
2 parents 84fb889 + 86cd3e1 commit 2d93c05
Show file tree
Hide file tree
Showing 21 changed files with 223 additions and 264 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "ngSubmitWork",
"name": "appirio-tech-ng-submit-work",
"version": "0.0.1",
"description": "Appiro Work Platform",
"main": "./dist/main.js",
Expand Down
94 changes: 53 additions & 41 deletions dist/main.css

Large diffs are not rendered by default.

35 changes: 20 additions & 15 deletions dist/main.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions example/css-files.jade
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ link(href="styles/main.css", rel="stylesheet")
// build:css lib.css
= "\n"
link(href="bower_components/appirio-tech-ng-ui-components/dist/main.css", rel="stylesheet")
link(href="bower_components/appirio-tech-ng-file-upload/dist/main.css", rel="stylesheet")
link(href="bower_components/appirio-tech-ng-work-layout/dist/main.css", rel="stylesheet")
= "\n"
// endbuild
Expand Down
1 change: 0 additions & 1 deletion example/js-files.jade
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ end
- bowers.push('angular-ui-router/release/angular-ui-router')
- bowers.push('appirio-tech-ng-work-layout/dist/main')
- bowers.push('appirio-tech-ng-api-services/dist/main')
- bowers.push('appirio-tech-ng-messaging/dist/main')
- bowers.push('appirio-tech-ng-ui-components/dist/main')
- bowers.push('appirio-tech-ng-auth/dist/main')
- bowers.push('appirio-tech-ng-file-upload/dist/main')
Expand Down
8 changes: 6 additions & 2 deletions src/scripts/controllers/visual.controller.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

SubmitWorkVisualController = ($scope, $rootScope, $state, SubmitWorkService, SubmitWorkUploaderService, RequirementService) ->
SubmitWorkVisualController = ($scope, $rootScope, $state, $document, SubmitWorkService, SubmitWorkUploaderService, RequirementService) ->
if $scope.workId
localStorageKey = "recentSubmitWorkSection-#{$scope.workId}"
localStorage[localStorageKey] = 'visuals'
Expand All @@ -23,6 +23,10 @@ SubmitWorkVisualController = ($scope, $rootScope, $state, SubmitWorkService, Sub
vm.styleModals = ['fonts', 'colors', 'icons']
vm.urlRegEx = /^(http(s?):\/\/)?(www\.)?[a-zA-Z0-9\.\-\_]+(\.[a-zA-Z]{2,3})+(\/[a-zA-Z0-9\_\-\s\.\/\?\%\#\&\=]*)?$/

vm.scrollTo = (id) ->
element = angular.element document.getElementById id
$document.scrollToElementAnimated element

vm.showChooseStyles = ->
vm.showPaths = false
vm.showChooseStylesModal = true
Expand Down Expand Up @@ -167,6 +171,6 @@ SubmitWorkVisualController = ($scope, $rootScope, $state, SubmitWorkService, Sub

activate()

SubmitWorkVisualController.$inject = ['$scope', '$rootScope', '$state', 'SubmitWorkService', 'SubmitWorkUploaderService', 'RequirementService']
SubmitWorkVisualController.$inject = ['$scope', '$rootScope', '$state', '$document', 'SubmitWorkService', 'SubmitWorkUploaderService', 'RequirementService']

angular.module('appirio-tech-ng-submit-work').controller 'SubmitWorkVisualController', SubmitWorkVisualController
14 changes: 7 additions & 7 deletions src/scripts/services/requirement.service.coffee
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

srv = () ->
srv = ->
service = {}

service.projectTypes = [
Expand Down Expand Up @@ -259,13 +259,13 @@ srv = () ->

service.fonts = [
name: 'Serif'
description: 'Classic design, good legiblity for large and small text.'
description: 'Classic font families that work well for stylized headlines, as well as paragraphs of text.'
id: 'SERIF'
selected: false
,
name: 'Sans Serif'
id: 'SANS_SERIF'
description: 'Modern design, good for headers and body text.'
description: 'Modern font families known for their versatility.'
selected: false
]

Expand All @@ -292,20 +292,20 @@ srv = () ->
]

service.icons = [
name: 'Flat Colors'
description: 'Lorem ipsum dolor sit amet'
name: 'Flat Color'
description: 'A one dimensional, modern and colorful icon style.'
id: 'FLAT_COLORS'
selected: false
img: 'flat-colors'
,
name: 'Thin Line'
description: 'Lorem ipsum dolor sit amet'
description: 'A lighter weight and modern icon style.'
id: 'THIN_LINE'
selected: false
img: 'thin-line'
,
name: 'Solid Line'
description: 'Lorem ipsum dolor sit amet'
description: 'A bold and visually powerful icon style.'
id: 'SOLID_LINE'
selected: false
img: 'solid-line'
Expand Down
3 changes: 2 additions & 1 deletion src/styles/complete.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ submit-work-complete {
}

p {
font-size: $font-size;
font-size: 16px;
max-width: 400px;
}

.app-name {
Expand Down
4 changes: 0 additions & 4 deletions src/styles/development.scss
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ submit-work-development {
display: block;
text-align: center;

.save {
margin-top: $margin;
}

.security img {
height: 80px;
}
Expand Down
35 changes: 19 additions & 16 deletions src/styles/submit-work.scss
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,16 @@ submit-work-complete {
}
}

a.button.continue, button.continue, > button.action {
margin: $margin auto;
.continue-buttons {
padding: 32px;

button {
margin-left: $margin-small;

&:first-child {
margin-left: 0;
}
}
}

.app-name {
Expand Down Expand Up @@ -84,17 +92,17 @@ submit-work-complete {
}
}

progress {
display : block;
width : 400px;
margin : 0 auto;
margin-top: $margin-smallest;
}

> header {
background-color: $black;
padding : 20px;

progress {
display : block;
width : 400px;
margin : 0 auto;
margin-top: $margin-smallest;
}

a {
color: $white;
}
Expand Down Expand Up @@ -177,7 +185,7 @@ submit-work-complete {
.upload-documents, .enter-url {
background-color: $white;

img {
.upload-icon {
height: 100px;
}

Expand All @@ -200,13 +208,8 @@ submit-work-complete {
margin-top: $margin;
}

input {
margin: 0 auto;
margin-top: $margin;
}

p, button {
margin-top: $margin-small;
}
}
}
}
9 changes: 7 additions & 2 deletions src/styles/type.scss
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,16 @@ submit-work-type {
padding-bottom: 0;
margin-top: $margin;

li {
max-width: 433px;
}

.house {
width : 433px;
height : 195px;
margin-top : $margin-small;
background-color: #e6e7e8;
margin-left : auto;
margin-right : auto;
background-color: $neutral-color-light;
padding : $padding;

.active {
Expand Down
10 changes: 0 additions & 10 deletions src/styles/visuals.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,6 @@
$card-max-width: 180px;

submit-work-visuals {
.design-buttons {
button {
margin-left: $margin-small;

&:first-child {
margin-left: 0;
}
}
}

p.error {
@include block-center();

Expand Down
6 changes: 3 additions & 3 deletions src/views/submit-work-complete.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ modal.full(show="vm.show")
.icon-house
.icon.biggest.checkmark-white

h1 Awesome!
h1 Project submitted!

h6 Your <span class="app-name">{{vm.appName}}</span> app has been submitted
p Your project has been submitted for review. A copilot from our community will look over your requirements and be in touch shortly with updates or questions. Please keep an eye out for an email.

button.action.wider(ui-sref="view-work-multiple" ng-click="vm.show = false") go to dashboard
button.action.wider(ui-sref="view-work-multiple" ng-click="vm.show = false") Go to your dashboard

55 changes: 28 additions & 27 deletions src/views/submit-work-development.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,9 @@ header

img(src="/images/development-active.svg")

h1 Development
h1 Let's build your app!

p Help us understand the technical requirements of your app.

modal.upload-documents(show="vm.showUploadSpecs" background-click-close=true)
.upload
img(src="/images/upload.svg")

h2 Upload your <strong>Development specs</strong>

p Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.

ap-uploader(
config="vm.uploaderConfig"
uploading="vm.uploaderUploading"
has-errors="vm.uploaderHasErrors"
has-files="vm.uploaderHasFiles"
)
p Help define the technical requirements for your app

.flush-height.flex.column(flush-height="lock")
ul.dark-bg.flex.center.middle.flex-grow.selectable-choices
Expand All @@ -40,13 +25,16 @@ modal.upload-documents(show="vm.showUploadSpecs" background-click-close=true)

img.icon.biggest(ng-if="vm.uploaderHasFiles && !vm.uploaderHasErrors && !vm.uploaderUploading" src="/images/upload-selected.svg")

h4 Upload development specs
h4 Upload Requirements

p Please upload any technical requirements.

button.action.wide(ng-click="vm.uploadSpecs()") select

button.continue.wider.save(ng-click="vm.save(true, false)") save
.continue-buttons
button.wider.save(ng-click="vm.save(true, false)") save

button.continue.wider.kick-off.action(ng-click="vm.save(true, true)") kick off project
button.wider.kick-off.action(ng-click="vm.save(true, true)") kick off project

modal.full.define-development(show="vm.showDefineSpecsModal" background-click-close=true)
ul.nav
Expand All @@ -71,7 +59,7 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
.icon.arrow.smallest.right

main.dark-bg.flex.column.center.flex-grow(ng-show= "vm.activeDevelopmentModal == 'offlineAccess'")
h2 Do you require users to have <strong>offline access to data</strong>?
h2 Does your application need offline access?

p Do your users need to be able to interact with the application when they are unable to connect to the internet (over the air or via wifi)?

Expand All @@ -85,7 +73,7 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
type="button"
)

p Users will need to interact with the app even when offline. This feature increases complexity and costs.
p Users will need to use the app even when they’re offline. This feature increases complexity and cost.

li.or
.house OR
Expand All @@ -99,12 +87,12 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
type="button"
)

p The application will gracefully present a message to the user to please connect to the internet.
p The application will gracefully present a message to users to please connect to the internet.

main.dark-bg.flex.column.center.flex-grow(ng-show= "vm.activeDevelopmentModal == 'personalInformation'")
h2 Personal information

p Is there any level of personal information? (stored or transmitted)
p Is there any personal user information that is stored or transmitted?

ul.or-choices.flex.center
li
Expand All @@ -116,7 +104,7 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
type="button"
)

p Storing and/or transmitting personal information increases security and encryption needs which adds complexity and cost.
p Storing or transmitting personal information requires security and encryption, adding complexity and cost.

li.or
.house OR
Expand All @@ -133,7 +121,7 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
p The app is not transferring or storing personal information.

main.dark-bg.security.flex.column.center.flex-grow(ng-show= "vm.activeDevelopmentModal == 'security'")
h2 What level of <strong>security do you need</strong>?
h2 What level of security do you need?

ul.selectable-choices.flex.center
li
Expand Down Expand Up @@ -166,7 +154,7 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
main.dark-bg.third-party-integrations.flex.column.center.flex-grow(ng-show= "vm.activeDevelopmentModal == 'thirdPartyIntegrations'")
h2 How many 3rd party integrations</strong>?

p Enter the number of 3rd party integrations so we can estimate effort involved.
p Enter the number of required 3rd party integrations. Examples include: Facebook, Twitter, Yelp, Google Maps, and Docusign.

input(type="number" min=1 max=6 ng-model="vm.work.numberOfApiIntegrations")

Expand All @@ -176,3 +164,16 @@ modal.full.define-development(show="vm.showDefineSpecsModal" background-click-cl
button.action.action.wider(ng-hide="vm.nextButtonDisabled" ng-click="vm.viewNext()") next

button.action.wider(ng-show="vm.showFinishDevelopmentButton" ng-click="vm.save()") Save

modal.upload-documents(show="vm.showUploadSpecs" background-click-close=true)
.upload
img.upload-icon(src="/images/upload.svg")

h2 Upload documents

ap-uploader(
config="vm.uploaderConfig"
uploading="vm.uploaderUploading"
has-errors="vm.uploaderHasErrors"
has-files="vm.uploaderHasFiles"
)
1 change: 0 additions & 1 deletion src/views/submit-work-features-define.jade
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ modal.full.define-features(show="vm.showFeaturesModal" ng-if="vm.showFeaturesMod
features="vm.features"
activate-feature="vm.activateFeature(feature)"
)

li
button.widest.clean(ng-click="vm.toggleDefineFeatures()")
span Define a new feature
Expand Down
4 changes: 4 additions & 0 deletions src/views/submit-work-features.directive.jade
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,7 @@ header
include submit-work-features-define

include submit-work-features-upload

include submit-work-features-define

include submit-work-features-upload
Loading

0 comments on commit 2d93c05

Please sign in to comment.