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.

Sign up for GitHub

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

Jump to bottom

Issue 14 add from cms #62

Merged
merged 22 commits into from
Jan 2, 2018
Merged

Issue 14 add from cms #62

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
2e8989a
[AT] - WIP initial commit - add from cms working.
andrew-c-tran Dec 8, 2017
c204047
[AT] - WIP initial commit - add from cms working.
andrew-c-tran Dec 8, 2017
7e2cb1e
[AT] - WIP - updated add flow
andrew-c-tran Dec 12, 2017
dd1f72c
[AT] - WIP - restored accidentally removed spinner
andrew-c-tran Dec 12, 2017
cea41fe
[AT] - visual updates to accordions
andrew-c-tran Dec 14, 2017
b3d71d3
[AT] - added JSDOC comments to functions
andrew-c-tran Dec 15, 2017
48de384
[AT] - added full tests
andrew-c-tran Dec 16, 2017
942d1ea
[AT] - wip - pull notes fix
andrew-c-tran Dec 18, 2017
fcfd443
[AT] - added handling for tarball missing error, unpacked files to ro…
andrew-c-tran Dec 18, 2017
9f83ba0
[AT] - updated completion messaging
andrew-c-tran Dec 18, 2017
0cb990e
[AT] - updated error screen styles, added support for no router running
andrew-c-tran Dec 20, 2017
dbc04d0
[AT] - updated error screen styles, added support for no router running
andrew-c-tran Dec 20, 2017
d11941e
[AT] - removed inline styles, moved modals from static markup in inde…
andrew-c-tran Dec 26, 2017
f4a89e6
[AT] - flattened "promise pyramid"
andrew-c-tran Dec 26, 2017
38654f5
[AT] - updated no sites detection
andrew-c-tran Dec 26, 2017
da57ba9
[AT] - updated to use fs.mkdir for cross platform compatability
andrew-c-tran Dec 26, 2017
56f581f
[AT] - added JSDOC documentation to ddev-shell.js and added dev-env d…
andrew-c-tran Dec 27, 2017
4b1ffc0
[AT] - module extraction, added JSDOC comments for ALL code, made lif…
andrew-c-tran Dec 27, 2017
40bd0b1
[AT] - updated comment and company name
andrew-c-tran Dec 27, 2017
468da71
[AT] - updated test comments
andrew-c-tran Dec 28, 2017
7ccbdf6
[AT] - addressed several feedback changes
andrew-c-tran Dec 28, 2017
d6f61aa
[AT] - fixed tests
andrew-c-tran Dec 28, 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
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,19 +67,18 @@ all: darwin linux windows

linux: npminstall
@echo "Building $@"
PATH=$$PATH:./node_modules/.bin electron-builder --linux --x64
npm run build-linux

darwin: npminstall
@echo "Building $@"
PATH=$$PATH:./node_modules/.bin electron-builder --mac
npm run build-darwin

windows: npminstall
@echo "Building $@"
PATH=$$PATH:./node_modules/.bin electron-builder --win
npm run build-windows

npminstall: package.json
npm install --no-optional
npm install electron-builder@$(ELECTRON_BUILDER_VERSION)

clean:
rm -rf dist node_modules
Expand Down
Binary file modified build/background.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
51 changes: 48 additions & 3 deletions css/overrides.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

body {
font-family: 'Montserrat', sans-serif;
background-color: #c5c5c5;
}

h1, h2, h3 {
Expand Down Expand Up @@ -98,9 +99,6 @@ h3 {
padding: 0 20px;
width: 50%;
}
.add {
float: right;
}
.directory-select {
display: none;
}
Expand Down Expand Up @@ -133,4 +131,51 @@ h3 {
position: absolute;
bottom: 0;
width: 100%;
background-color: rgba(100,100,100,0.3);
}
.loading-overlay, .error-overlay {
display: none;
z-index: 3;
margin-top: -15px;
margin-left: -15px;
position: absolute;
height: 100%;
width: 100%;
background-color: rgba(100,100,100,0.8);
align-items: center;
justify-content: center
}
.loading-spinner {
font-size: 150px !important;
color: #28bde4;
}
.error-icon {
color: #d80000;
}
.loading-text {
width: 55%;
margin-left: 20px;
color: #28bde4;
font-weight: bold;
font-size: 20px;
}
.error-text {
width: 55%;
margin-left: 20px;
color: #d80000;
font-weight: bold;
font-size: 20px;
}
.start-button-option-container {
display: inline-block;
height: 100px;
width: 100px;
line-height: 100px;
}
.option-container {
text-align: center;
}

.second-option {
border-left: 1px solid #878787;
}
Binary file modified img/ddev_logo_white.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 35 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
<body>
<nav class="navbar navbar-toggleable-md navbar-inverse fixed-top bg-inverse">
<img src="img/ddev_last.png" class="ddev-logo" />
<div class="btn btn-primary add"><i class="fa fa-plus" aria-hidden="true"></i></div>
<input class='directory-select' type="file"
webkitdirectory />
</nav>
Expand All @@ -26,7 +25,6 @@
</div>

<footer class="footer">
<div class="router-status">DDEV Router Status: <span class="router-status-text">RUNNING</span></div>
</footer>
<script src="js/ui.js"></script>
<script>
Expand All @@ -50,6 +48,29 @@ <h2 class="modal-title" id="modalLabel">Modal title</h2>
</div>
</div>

<div class="modal fade" id="addOptionsDialog" tabindex="-1" role="dialog" aria-labelledby="addOptionsDialog" aria-hidden="true">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess I would expect this to be in the js application and not in the index.html?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed modals and created a createModal template that programmatically generates and injects modals into the DOM.

<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<h2 class="modal-title" id="addOptionsDialogTitle">Choose A Starting Point</h2>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body add-modal-body">
<div class="row">
<div class="option-container second-option column col-lg-12 col-md-12 col-sm-12 start-from-template">
<div class="btn btn-primary start-button-option-container">
<i class="fa fa-file-archive-o" style="font-size: 50px"></i>
</div>
<div>Start fresh from a CMS template</div>
</div>
</div>
</div>
</div>
</div>
</div>

<div class="modal fade" id="distroModal" tabindex="-1" role="dialog" aria-labelledby="mainDistroModal" aria-hidden="true">
<div class="modal-dialog" role="document">
<div class="modal-content">
Expand All @@ -60,6 +81,18 @@ <h2 class="modal-title" id="distroModalLabel">Create a New Site</h2>
</button>
</div>
<div class="modal-body">
<div class="loading-overlay">
<div>
<i class="fa fa-spinner fa-spin loading-spinner" style="font-size:150px"></i>
</div>
<div class="loading-text">Working...</div>
</div>
<div class="error-overlay">
<div>
<i class="fa fa-exclamation-triangle error-icon" style="font-size:150px"></i>
</div>
<div class="error-text">Something Went Wrong</div>
</div>
<h3 class="add-modal-section-header">Application Type</h3>
<div class="tile-container">
<div class="tile">
Expand Down
Loading