Merge pull request #8 from jbelelieu/develop

v0.5.0-beta

assets/alternatve_view.css → assets/alternative_view.css

@@ -494,8 +494,13 @@ footer {
     line-height: 1.3em;
 }
 
+p.pullUp {
+    margin-top: -2px;
+}
+
 p.deAdHeading {
     margin-top: 0px !important;
+    margin-bottom: 0px;
 }
 
 input.paid {
@@ -538,7 +543,11 @@ input.paid {
 }
 
 .pad {
-    padding: 32px 16px;
+    padding: 22px 22px 18px 22px;
+}
+
+.padNoTop {
+    padding: 0px 22px 0px 22px;
 }
 
 .padLess {
@@ -730,9 +739,9 @@ blockquote:after {
 .columns2575 {
     display: grid;
     grid-template-rows: 1fr;
-    grid-column-gap: 40px;
+    grid-column-gap: 0px;
     grid-row-gap: 0px;
-    grid-template-columns: 190px 1fr;
+    grid-template-columns: 220px 1fr;
 }
 
 .columns2575 table:first-child {

assets/style.css

@@ -28,7 +28,7 @@ html {
 *,
 *:before,
 *:after {
-    box-sizing: inherit;
+    box-sizing: border-box;
 }
 
 /* Sections
@@ -41,8 +41,11 @@ html {
 body {
     margin: 0;
     overflow-x: hidden;
+    /* width: 100vw; */
 }
 
+#container {}
+
 /**
  * Render the `main` element consistently in IE.
  */
@@ -576,21 +579,6 @@ input.paid {
     border-left: 1px solid #f1f1f1;
 }
 
-table td:last-child a {
-    width: 18px;
-    height: 18px;
-}
-
-table td:first-child,
-table th:first-child {
-    padding-left: 0px;
-}
-
-table td:last-child,
-table th:last-child {
-    padding-right: 0px;
-}
-
 .borderSection {
     position: relative;
 }
@@ -691,7 +679,7 @@ h4.sectionHeader {
     border-radius: 12px;
     text-align: center;
     color: #111;
-    display: inline-block;
+    /* display: inline-block; */
     padding: 2px 9px;
     line-height: 30px !important;
     font-weight: bold;
@@ -721,6 +709,11 @@ h4.sectionHeader {
     margin: 42px auto;
 }
 
+.holderFixed {
+    width: 800px;
+    margin: 12px auto 12px auto;
+}
+
 .underTableSubmit {
     margin-top: 12px;
 }
@@ -762,8 +755,8 @@ select {
 
 textarea {
     width: 100%;
-    min-width: 300px;
-    min-height: 100px;
+    /* min-width: 300px; */
+    /* min-height: 100px; */
 }
 
 .formBox h1 {
@@ -852,6 +845,10 @@ img.clientLogo {
     margin-left: 12px;
 }
 
+#collections .divHolder {
+    font-size: 16px;
+}
+
 .marginTop {
     margin-top: 42px;
 }
@@ -860,6 +857,10 @@ img.clientLogo {
     margin-top: 12px;
 }
 
+.marginTopLessLess {
+    margin-top: 6px;
+}
+
 button[type="submit"] {
     font-size: 1em;
     background-color: #111;
@@ -901,6 +902,10 @@ button:hover:not(.createNew) {
     display: block;
 }
 
+.noMarginTop {
+    margin-top: 0px;
+}
+
 .projectTopColumns,
 .twoColumns,
 .threeColumns,
@@ -1009,19 +1014,69 @@ table {
     font-size: 0.95em;
 }
 
+table td.label {
+    padding-right: 0px;
+    padding-left: 0px;
+    text-align: center;
+}
+
+table td.checkbox {
+    padding-right: 0px;
+    padding-left: 0px;
+    padding-top: 10px;
+    text-align: center;
+}
+
+table tr:hover:not(.noHighlight) {
+    background: #f5f5f5;
+}
+
+table td:last-child a {
+    width: 18px;
+    height: 18px;
+}
+
+table td:first-child,
+table th:first-child {
+    padding-left: 0px;
+}
+
+table td:last-child,
+table th:last-child {
+    padding-right: 0px;
+}
+
+.taskBottom {
+    /* border-bottom: 1px solid #111; */
+}
+
 table th {
     border-bottom: 1px solid #e5e5e5;
     text-align: left;
     font-size: 85%;
     color: #555;
 }
 
-table tr:not(:last-child):not(.noBorder) {
+table.lessPad tr:not(:last-child):not(.noBorder) {
     border-bottom: 1px dotted #e5e5e5;
 }
 
+table.lessPad tr:first-child {
+    border-bottom: none !important;
+}
+
 table td.borderTop {
-    border-bottom: 1px dotted #e5e5e5;
+    /* border-bottom: 1px dotted #e5e5e5; */
+}
+
+.taskInput {
+    padding-top: 0px;
+    padding-left: 0px;
+    padding-bottom: 32px;
+}
+
+tr.taskTopLine td {
+    padding-bottom: 0px;
 }
 
 table td,
@@ -1030,6 +1085,11 @@ table th {
     padding: 6px 16px;
 }
 
+table.lessPad td,
+table.lessPad th {
+    padding: 3px;
+}
+
 table td input {
     margin-top: 0px;
     padding: 0px 4px;
@@ -1090,11 +1150,19 @@ table td.summary {
 
 /*  */
 
+.noTopPad {
+    padding-top: 0px !important;
+}
+
 .iconHolder {
     display: inline-block;
     font-size: 22px;
 }
 
+#collections .iconHolder {
+    font-size: 14px !important;
+}
+
 /*  */
 
 .invoiceFooter {
@@ -1211,4 +1279,15 @@ nav.strong a:not(:last-child):after {
 
 /*  */
 
-@media only screen and (max-device-width: 700px) {}
+@media only screen and (max-device-width: 700px) {
+    .headerColumns {
+        grid-template-columns: 1fr 1fr;
+        grid-template-areas: ". .";
+    }
+
+    #nav {
+        text-align: left;
+        width: 100%;
+        grid-column: 1 / -1;
+    }
+}

db/migrations.sql

@@ -55,16 +55,6 @@ CREATE TABLE `story_status` (
   `emoji` varchar(10)
 );
 
-CREATE TABLE `story_note` (
-  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
-  `story_id` INTEGER,
-  `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
-  `resolved_at` timestamp,
-  `is_resolved` boolean DEFAULT 0,
-  `note` text,
-  CONSTRAINT fk_story_id FOREIGN KEY(story_id) REFERENCES story(id) ON DELETE CASCADE
-);
-
 CREATE TABLE `story_collection` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
@@ -93,6 +83,16 @@ CREATE TABLE `story` (
   CONSTRAINT fk_rate_type FOREIGN KEY(rate_type) REFERENCES story_hour_type(id)
 );
 
+CREATE TABLE `story_note` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+  `story_id` INTEGER,
+  `title` varchar(200),
+  `note` text,
+  `is_public` BOOLEAN DEFAULT "0",
+  CONSTRAINT fk_story_note_story_id FOREIGN KEY(story_id) REFERENCES story(id)
+);
+
 CREATE TABLE `invoice` (
   `id` INTEGER PRIMARY KEY AUTOINCREMENT,
   `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
@@ -135,16 +135,26 @@ CREATE TABLE `tax_adjustment` (
   CONSTRAINT fk_tax_a_year FOREIGN KEY(year) REFERENCES tax(year) ON DELETE CASCADE
 );
 
+CREATE TABLE `tax_aside` (
+  `id` INTEGER PRIMARY KEY AUTOINCREMENT,
+  `created_at` timestamp DEFAULT CURRENT_TIMESTAMP,
+  `year` INTEGER,
+  `title` varchar(255),
+  `amount` INTEGER,
+  `group` varchar(100),
+  CONSTRAINT fk_tax_aside_tax_a_year FOREIGN KEY(year) REFERENCES tax(year) ON DELETE CASCADE
+);
+
 INSERT INTO story_type (id, title) VALUES (1, 'Task'), (2, 'Chore'), (3, 'Meeting'), (4, 'Hand Off Item');
 
 -- The primary items should not be removed and need
 -- to remain in this order!
 INSERT INTO story_status (id, title, emoji, color, is_complete_state, is_billable_state) VALUES
-(1, 'Open', 'folder-open', '#111111', 0, 0),
+(1, 'Open', 'folder-open', '#e5e5e5', 0, 0),
 (2, 'Complete', 'money', '#47F43E', 1, 1),
 (3, 'Shipped', 'checked', '#3fcce8', 1, 0),
 (4, 'Closed', 'close-circled', '#b82a36', 1, 0),
-(5, 'Unpaid', 'broken', '#ccc', 1, 0);
+(5, 'Unpaid', 'broken', '#cccccc', 1, 0);
 
 -- This is in dollar cents, so $50 = 5000.
 INSERT INTO story_hour_type (id, title, rate, is_hidden) VALUES (1, 'Standard Rate', '5000', 0);

docs/companies.md

@@ -0,0 +1,8 @@
+# Companies
+
+Companies are used to manage two (2) different types of entities:
+
+- **Clients**: the clients who are paying you,
+- **Contracted Parties**: companies you represent and are building a project as
+
+Effectively they are the same, but you will need at least one of each to create a project.