Browse Source

Updating...

Arin Turpin 6 years ago
parent
commit
58182432da

BIN
.DS_Store View File


+ 3
- 2
ZipCoinRedIonicClient/ionic.config.json View File

@@ -1,5 +1,6 @@
1 1
 {
2 2
   "name": "ZipCoinRed",
3 3
   "integrations": {},
4
-  "type": "ionic-angular"
5
-}
4
+  "type": "ionic-angular",
5
+  "app_id": ""
6
+}

+ 6
- 6
ZipCoinRedIonicClient/www/build/main.js View File

@@ -34,7 +34,7 @@ var Tab4Page = /** @class */ (function () {
34 34
     };
35 35
     Tab4Page = __decorate([
36 36
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
37
-            selector: 'page-tab4',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
37
+            selector: 'page-tab4',template:/*ion-inline-start:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/'<!--\n  Generated template for the Tab4Page page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>tab4</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tab4/tab4.html"*/,
38 38
         }),
39 39
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */]])
40 40
     ], Tab4Page);
@@ -89,7 +89,7 @@ var TransactionPage = /** @class */ (function () {
89 89
     };
90 90
     TransactionPage = __decorate([
91 91
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
92
-            selector: 'page-transaction',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ block.recipient }}</div>\n                  <div>Amount: {{ block.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
92
+            selector: 'page-transaction',template:/*ion-inline-start:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/'<!--\n  Generated template for the TransactionPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Transaction</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n    <ion-list>\n        <ion-item-sliding *ngFor="let transaction of transactions">\n          <ion-item>\n            <ion-card>\n                <ion-card-header>\n                  Transaction #: {{transaction.transactionId}}\n                </ion-card-header>\n                <ion-card-content>\n                  <div>Sender: {{ transaction.sender }}</div>\n                  <div>Recipient: {{ block.recipient }}</div>\n                  <div>Amount: {{ block.amount }}</div>\n                </ion-card-content>\n            </ion-card>\n          </ion-item>\n        </ion-item-sliding>\n      </ion-list>\n\n</ion-content>\n'/*ion-inline-end:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/transaction/transaction.html"*/,
93 93
         }),
94 94
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */],
95 95
             __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
@@ -134,7 +134,7 @@ var TabsPage = /** @class */ (function () {
134 134
     }
135 135
     TabsPage = __decorate([
136 136
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
137
-            selector: 'page-tabs',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
137
+            selector: 'page-tabs',template:/*ion-inline-start:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/'<ion-tabs>\n  <ion-tab [root]="homePage" tabTitle="ZipCoin-BlockChain" tabIcon="link"></ion-tab>\n  <ion-tab [root]="walletPage" tabTitle="ZipCoin Wallet" tabIcon="cash"></ion-tab>\n  <ion-tab [root]="transactionPage" tabTitle="ZipCoin Transactions" tabIcon="contacts"></ion-tab>\n  <ion-tab [root]="tab4" tabTitle="Ziptab" tabIcon="star"></ion-tab>\n\n</ion-tabs>'/*ion-inline-end:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/tabs/tabs.html"*/,
138 138
         }),
139 139
         __metadata("design:paramtypes", [])
140 140
     ], TabsPage);
@@ -185,7 +185,7 @@ var WalletPage = /** @class */ (function () {
185 185
     };
186 186
     WalletPage = __decorate([
187 187
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
188
-            selector: 'page-wallet',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="navya">navya</ion-option>\n        <ion-option value="aleena">aleena</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="navya">navya</ion-option>\n            <ion-option value="aleena">aleena</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="navya">navya</ion-option>\n              <ion-option value="aleena">aleena</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
188
+            selector: 'page-wallet',template:/*ion-inline-start:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/'<!--\n  Generated template for the WalletPage page.\n\n  See http://ionicframework.com/docs/components/#navigation for more info on\n  Ionic pages and navigation.\n-->\n<ion-header>\n\n  <ion-navbar>\n    <ion-title>Wallet</ion-title>\n  </ion-navbar>\n\n</ion-header>\n\n\n<ion-content padding>\n\n\n  \n  <ion-item>\n      <ion-label>Name</ion-label>\n      <ion-select [(ngModel)]="name">\n        <ion-option value="navya">navya</ion-option>\n        <ion-option value="aleena">aleena</ion-option>\n      </ion-select>\n     </ion-item>\n     <ion-item>\n        <ion-label>current balance</ion-label>\n        <ion-input></ion-input>\n      </ion-item>\n      <ion-item>\n          <ion-label>Public Key</ion-label>\n          <ion-input></ion-input>\n        </ion-item>\n      <br>\n      <br>\n      <div class = "bar bar-subheader bar-assertive">\n          <h2 class = "title">Payment</h2>\n       </div>\n       <ion-item>\n          <ion-label>From</ion-label>\n          <ion-select [(ngModel)]="name">\n            <ion-option value="navya">navya</ion-option>\n            <ion-option value="aleena">aleena</ion-option>\n          </ion-select>\n         </ion-item>\n         <ion-item>\n            <ion-label>To</ion-label>\n            <ion-select [(ngModel)]="to">\n              <ion-option value="navya">navya</ion-option>\n              <ion-option value="aleena">aleena</ion-option>\n            </ion-select>\n           </ion-item>\n      \n          <ion-item>\n              <ion-label>Amount</ion-label>\n              <ion-input></ion-input>\n            </ion-item>\n            <br>\n            <button ion-button>Pay</button>\n</ion-content>\n'/*ion-inline-end:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/wallet/wallet.html"*/,
189 189
         }),
190 190
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_1_ionic_angular__["f" /* NavParams */], __WEBPACK_IMPORTED_MODULE_2__providers_transaction_service__["a" /* TransactionService */]])
191 191
     ], WalletPage);
@@ -297,7 +297,7 @@ var HomePage = /** @class */ (function () {
297 297
     };
298 298
     HomePage = __decorate([
299 299
         Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({
300
-            selector: 'page-home',template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
300
+            selector: 'page-home',template:/*ion-inline-start:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/'<ion-header>\n  <ion-navbar>\n    <ion-title>\n      ZipCoin BlockChain\n    </ion-title>\n  </ion-navbar>\n</ion-header>\n\n<ion-content padding>\n\n  <ion-list>\n    <ion-item-sliding *ngFor="let block of blocks">\n      <ion-item>\n        <ion-card>\n            <ion-card-header>\n              Block #: {{block.blockNumber}}\n            </ion-card-header>\n            <ion-card-content>\n              <div>Nonce: {{ block.nonce }}</div>\n              <div>Data: {{ block.transactionList }}</div>\n              <div>Previous Hash: {{ block.previousHash }}</div>\n              <div>Current Hash: {{ block.currentHash }}</div>\n              <button ion-button (click)="getMinedBlock(block.id)">Mine</button>\n            </ion-card-content>\n        </ion-card>\n      </ion-item>\n    </ion-item-sliding>\n  </ion-list>\n\n</ion-content>'/*ion-inline-end:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/pages/home/home.html"*/
301 301
         }),
302 302
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["e" /* NavController */], __WEBPACK_IMPORTED_MODULE_2__providers_block_service__["a" /* BlockService */]])
303 303
     ], HomePage);
@@ -496,7 +496,7 @@ var MyApp = /** @class */ (function () {
496 496
         });
497 497
     }
498 498
     MyApp = __decorate([
499
-        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/ericf/ZCWProjects/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
499
+        Object(__WEBPACK_IMPORTED_MODULE_0__angular_core__["m" /* Component */])({template:/*ion-inline-start:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/'<ion-nav [root]="rootPage"></ion-nav>\n'/*ion-inline-end:"/Users/ArinT/ZipCoin-RED/ZipCoinRedIonicClient/src/app/app.html"*/
500 500
         }),
501 501
         __metadata("design:paramtypes", [__WEBPACK_IMPORTED_MODULE_1_ionic_angular__["g" /* Platform */], __WEBPACK_IMPORTED_MODULE_2__ionic_native_status_bar__["a" /* StatusBar */], __WEBPACK_IMPORTED_MODULE_3__ionic_native_splash_screen__["a" /* SplashScreen */]])
502 502
     ], MyApp);

+ 1
- 1
ZipCoinRedIonicClient/www/build/vendor.js.map
File diff suppressed because it is too large
View File


+ 514
- 0
ZipCoinRedJavaServer/.idea/workspace.xml View File

@@ -1,6 +1,195 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="25573ae1-8204-4c03-b4e6-a7f8d3a9f173" name="Default" comment="" />
5
+    <ignored path="$PROJECT_DIR$/target/" />
6
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
7
+    <option name="TRACKING_ENABLED" value="true" />
8
+    <option name="SHOW_DIALOG" value="false" />
9
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
10
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
11
+    <option name="LAST_RESOLUTION" value="IGNORE" />
12
+  </component>
13
+  <component name="FileEditorManager">
14
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
15
+      <file leaf-file-name="Miner.java" pinned="false" current-in-tab="false">
16
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/Miner.java">
17
+          <provider selected="true" editor-type-id="text-editor">
18
+            <state relative-caret-position="375">
19
+              <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
20
+            </state>
21
+          </provider>
22
+        </entry>
23
+      </file>
24
+      <file leaf-file-name="Transaction.java" pinned="false" current-in-tab="true">
25
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
26
+          <provider selected="true" editor-type-id="text-editor">
27
+            <state relative-caret-position="15">
28
+              <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
29
+            </state>
30
+          </provider>
31
+        </entry>
32
+      </file>
33
+      <file leaf-file-name="BlockController.java" pinned="false" current-in-tab="false">
34
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
35
+          <provider selected="true" editor-type-id="text-editor">
36
+            <state relative-caret-position="111">
37
+              <caret line="51" column="29" selection-start-line="51" selection-start-column="29" selection-end-line="51" selection-end-column="29" />
38
+            </state>
39
+          </provider>
40
+        </entry>
41
+      </file>
42
+      <file leaf-file-name="WalletLoader.java" pinned="false" current-in-tab="false">
43
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
44
+          <provider selected="true" editor-type-id="text-editor">
45
+            <state relative-caret-position="75">
46
+              <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
47
+            </state>
48
+          </provider>
49
+        </entry>
50
+      </file>
51
+      <file leaf-file-name="BlockLoader.java" pinned="false" current-in-tab="false">
52
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
53
+          <provider selected="true" editor-type-id="text-editor">
54
+            <state relative-caret-position="285">
55
+              <caret line="24" selection-start-line="24" selection-end-line="24" />
56
+            </state>
57
+          </provider>
58
+        </entry>
59
+      </file>
60
+      <file leaf-file-name="TransactionLoader.java" pinned="false" current-in-tab="false">
61
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
62
+          <provider selected="true" editor-type-id="text-editor">
63
+            <state relative-caret-position="75">
64
+              <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
65
+            </state>
66
+          </provider>
67
+        </entry>
68
+      </file>
69
+      <file leaf-file-name="TransactionController.java" pinned="false" current-in-tab="false">
70
+        <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
71
+          <provider selected="true" editor-type-id="text-editor">
72
+            <state relative-caret-position="-290">
73
+              <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
74
+            </state>
75
+          </provider>
76
+        </entry>
77
+      </file>
78
+    </leaf>
79
+  </component>
80
+  <component name="IdeDocumentHistory">
81
+    <option name="CHANGED_PATHS">
82
+      <list>
83
+        <option value="$PROJECT_DIR$/src/main/resources/application.properties" />
84
+        <option value="$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java" />
85
+      </list>
86
+    </option>
87
+  </component>
88
+  <component name="MavenProjectNavigator">
89
+    <treeState>
90
+      <expand>
91
+        <path>
92
+          <item name="" type="16c1761:MavenProjectsStructure$RootNode" />
93
+          <item name="zip-coin" type="9519ce18:MavenProjectsStructure$ProjectNode" />
94
+        </path>
95
+      </expand>
96
+      <select />
97
+    </treeState>
98
+  </component>
99
+  <component name="ProjectFrameBounds" extendedState="6">
100
+    <option name="y" value="22" />
101
+    <option name="width" value="1280" />
102
+    <option name="height" value="695" />
103
+  </component>
104
+  <component name="ProjectView">
105
+    <navigator proportions="" version="1">
106
+      <foldersAlwaysOnTop value="true" />
107
+    </navigator>
108
+    <panes>
109
+      <pane id="ProjectPane">
110
+        <subPane>
111
+          <expand>
112
+            <path>
113
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
114
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
115
+            </path>
116
+            <path>
117
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
118
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
119
+              <item name="src" type="462c0819:PsiDirectoryNode" />
120
+            </path>
121
+            <path>
122
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
123
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
124
+              <item name="src" type="462c0819:PsiDirectoryNode" />
125
+              <item name="main" type="462c0819:PsiDirectoryNode" />
126
+            </path>
127
+            <path>
128
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
129
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
130
+              <item name="src" type="462c0819:PsiDirectoryNode" />
131
+              <item name="main" type="462c0819:PsiDirectoryNode" />
132
+              <item name="java" type="462c0819:PsiDirectoryNode" />
133
+            </path>
134
+            <path>
135
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
136
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
137
+              <item name="src" type="462c0819:PsiDirectoryNode" />
138
+              <item name="main" type="462c0819:PsiDirectoryNode" />
139
+              <item name="java" type="462c0819:PsiDirectoryNode" />
140
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
141
+            </path>
142
+            <path>
143
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
144
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
145
+              <item name="src" type="462c0819:PsiDirectoryNode" />
146
+              <item name="main" type="462c0819:PsiDirectoryNode" />
147
+              <item name="java" type="462c0819:PsiDirectoryNode" />
148
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
149
+              <item name="controller" type="462c0819:PsiDirectoryNode" />
150
+            </path>
151
+            <path>
152
+              <item name="ZipCoin-RED" type="b2602c69:ProjectViewProjectNode" />
153
+              <item name="ZipCoinRedJavaServer" type="462c0819:PsiDirectoryNode" />
154
+              <item name="src" type="462c0819:PsiDirectoryNode" />
155
+              <item name="main" type="462c0819:PsiDirectoryNode" />
156
+              <item name="java" type="462c0819:PsiDirectoryNode" />
157
+              <item name="zipcoin" type="462c0819:PsiDirectoryNode" />
158
+              <item name="model" type="462c0819:PsiDirectoryNode" />
159
+            </path>
160
+          </expand>
161
+          <select />
162
+        </subPane>
163
+      </pane>
164
+      <pane id="Scope" />
165
+      <pane id="AndroidView" />
166
+      <pane id="PackagesPane" />
167
+    </panes>
168
+  </component>
169
+  <component name="RunDashboard">
170
+    <option name="ruleStates">
171
+      <list>
172
+        <RuleState>
173
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
174
+        </RuleState>
175
+        <RuleState>
176
+          <option name="name" value="StatusDashboardGroupingRule" />
177
+        </RuleState>
178
+      </list>
179
+    </option>
180
+  </component>
3 181
   <component name="RunManager">
182
+    <configuration name="ZipCoinApp" type="Application" factoryName="Application" temporary="true" nameIsGenerated="true">
183
+      <option name="MAIN_CLASS_NAME" value="com.zipcoin.ZipCoinApp" />
184
+      <module name="ZipCoin-RED" />
185
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
186
+      <extension name="coverage">
187
+        <pattern>
188
+          <option name="PATTERN" value="com.zipcoin.*" />
189
+          <option name="ENABLED" value="true" />
190
+        </pattern>
191
+      </extension>
192
+    </configuration>
4 193
     <configuration default="true" type="Application" factoryName="Application">
5 194
       <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
6 195
     </configuration>
@@ -42,5 +231,330 @@
42 231
       <properties />
43 232
       <listeners />
44 233
     </configuration>
234
+    <recent_temporary>
235
+      <list>
236
+        <item itemvalue="Application.ZipCoinApp" />
237
+      </list>
238
+    </recent_temporary>
239
+  </component>
240
+  <component name="SvnConfiguration">
241
+    <configuration />
242
+  </component>
243
+  <component name="TaskManager">
244
+    <task active="true" id="Default" summary="Default task">
245
+      <changelist id="25573ae1-8204-4c03-b4e6-a7f8d3a9f173" name="Default" comment="" />
246
+      <created>1532706486704</created>
247
+      <option name="number" value="Default" />
248
+      <option name="presentableId" value="Default" />
249
+      <updated>1532706486704</updated>
250
+    </task>
251
+    <servers />
252
+  </component>
253
+  <component name="ToolWindowManager">
254
+    <frame x="0" y="22" width="1280" height="699" extended-state="6" />
255
+    <layout>
256
+      <window_info anchor="right" id="Palette" order="3" />
257
+      <window_info anchor="bottom" id="TODO" order="6" />
258
+      <window_info anchor="right" id="Palette&#9;" order="3" />
259
+      <window_info id="Image Layers" order="2" />
260
+      <window_info anchor="right" id="Capture Analysis" order="3" />
261
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
262
+      <window_info anchor="right" id="Maven Projects" order="3" />
263
+      <window_info anchor="bottom" id="Run" order="2" />
264
+      <window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
265
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.22757475" />
266
+      <window_info id="Capture Tool" order="2" />
267
+      <window_info id="Designer" order="2" />
268
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.24071082" />
269
+      <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
270
+      <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
271
+      <window_info id="UI Designer" order="2" />
272
+      <window_info anchor="right" id="Theme Preview" order="3" />
273
+      <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
274
+      <window_info id="Favorites" order="2" side_tool="true" />
275
+      <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
276
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
277
+      <window_info anchor="bottom" id="Messages" order="7" />
278
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
279
+      <window_info anchor="bottom" id="Message" order="0" />
280
+      <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
281
+      <window_info anchor="bottom" id="Find" order="1" />
282
+    </layout>
283
+  </component>
284
+  <component name="VcsContentAnnotationSettings">
285
+    <option name="myLimit" value="2678400000" />
286
+  </component>
287
+  <component name="XDebuggerManager">
288
+    <breakpoint-manager>
289
+      <option name="time" value="1" />
290
+    </breakpoint-manager>
291
+  </component>
292
+  <component name="editorHistoryManager">
293
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/Miner.java">
294
+      <provider selected="true" editor-type-id="text-editor">
295
+        <state relative-caret-position="375">
296
+          <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
297
+        </state>
298
+      </provider>
299
+    </entry>
300
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
301
+      <provider selected="true" editor-type-id="text-editor">
302
+        <state relative-caret-position="75">
303
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
304
+        </state>
305
+      </provider>
306
+    </entry>
307
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
308
+      <provider selected="true" editor-type-id="text-editor">
309
+        <state relative-caret-position="285">
310
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
311
+        </state>
312
+      </provider>
313
+    </entry>
314
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
315
+      <provider selected="true" editor-type-id="text-editor">
316
+        <state relative-caret-position="75">
317
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
318
+        </state>
319
+      </provider>
320
+    </entry>
321
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
322
+      <provider selected="true" editor-type-id="text-editor">
323
+        <state relative-caret-position="660">
324
+          <caret line="51" column="29" lean-forward="true" selection-start-line="51" selection-start-column="29" selection-end-line="51" selection-end-column="29" />
325
+        </state>
326
+      </provider>
327
+    </entry>
328
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/StringUtil.java">
329
+      <provider selected="true" editor-type-id="text-editor">
330
+        <state relative-caret-position="60">
331
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
332
+        </state>
333
+      </provider>
334
+    </entry>
335
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Wallet.java">
336
+      <provider selected="true" editor-type-id="text-editor">
337
+        <state relative-caret-position="75">
338
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
339
+        </state>
340
+      </provider>
341
+    </entry>
342
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
343
+      <provider selected="true" editor-type-id="text-editor">
344
+        <state relative-caret-position="255">
345
+          <caret line="19" lean-forward="true" selection-start-line="19" selection-end-line="19" />
346
+        </state>
347
+      </provider>
348
+    </entry>
349
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
350
+      <provider selected="true" editor-type-id="text-editor">
351
+        <state relative-caret-position="75">
352
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
353
+        </state>
354
+      </provider>
355
+    </entry>
356
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
357
+      <provider selected="true" editor-type-id="text-editor">
358
+        <state relative-caret-position="105">
359
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
360
+        </state>
361
+      </provider>
362
+    </entry>
363
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
364
+      <provider selected="true" editor-type-id="text-editor">
365
+        <state relative-caret-position="180">
366
+          <caret line="14" lean-forward="true" selection-start-line="14" selection-end-line="14" />
367
+        </state>
368
+      </provider>
369
+    </entry>
370
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
371
+      <provider selected="true" editor-type-id="text-editor">
372
+        <state relative-caret-position="90">
373
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
374
+        </state>
375
+      </provider>
376
+    </entry>
377
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/Miner.java">
378
+      <provider selected="true" editor-type-id="text-editor">
379
+        <state relative-caret-position="345">
380
+          <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
381
+        </state>
382
+      </provider>
383
+    </entry>
384
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
385
+      <provider selected="true" editor-type-id="text-editor">
386
+        <state relative-caret-position="60">
387
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
388
+        </state>
389
+      </provider>
390
+    </entry>
391
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
392
+      <provider selected="true" editor-type-id="text-editor">
393
+        <state relative-caret-position="75">
394
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
395
+        </state>
396
+      </provider>
397
+    </entry>
398
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
399
+      <provider selected="true" editor-type-id="text-editor">
400
+        <state relative-caret-position="465">
401
+          <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
402
+        </state>
403
+      </provider>
404
+    </entry>
405
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/Miner.java">
406
+      <provider selected="true" editor-type-id="text-editor">
407
+        <state relative-caret-position="345">
408
+          <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
409
+        </state>
410
+      </provider>
411
+    </entry>
412
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
413
+      <provider selected="true" editor-type-id="text-editor">
414
+        <state relative-caret-position="75">
415
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
416
+        </state>
417
+      </provider>
418
+    </entry>
419
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
420
+      <provider selected="true" editor-type-id="text-editor">
421
+        <state relative-caret-position="60">
422
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
423
+        </state>
424
+      </provider>
425
+    </entry>
426
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
427
+      <provider selected="true" editor-type-id="text-editor">
428
+        <state relative-caret-position="60">
429
+          <caret line="4" lean-forward="true" selection-start-line="4" selection-end-line="4" />
430
+        </state>
431
+      </provider>
432
+    </entry>
433
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/Miner.java">
434
+      <provider selected="true" editor-type-id="text-editor">
435
+        <state relative-caret-position="345">
436
+          <caret line="23" column="16" selection-start-line="23" selection-start-column="16" selection-end-line="23" selection-end-column="16" />
437
+        </state>
438
+      </provider>
439
+    </entry>
440
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
441
+      <provider selected="true" editor-type-id="text-editor">
442
+        <state relative-caret-position="60">
443
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
444
+        </state>
445
+      </provider>
446
+    </entry>
447
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
448
+      <provider selected="true" editor-type-id="text-editor">
449
+        <state relative-caret-position="75">
450
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
451
+        </state>
452
+      </provider>
453
+    </entry>
454
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
455
+      <provider selected="true" editor-type-id="text-editor">
456
+        <state relative-caret-position="465">
457
+          <caret line="36" lean-forward="true" selection-start-line="36" selection-end-line="36" />
458
+        </state>
459
+      </provider>
460
+    </entry>
461
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/repository/BlockRepository.java">
462
+      <provider selected="true" editor-type-id="text-editor">
463
+        <state relative-caret-position="60">
464
+          <caret line="5" column="17" selection-start-line="5" selection-start-column="17" selection-end-line="5" selection-end-column="17" />
465
+        </state>
466
+      </provider>
467
+    </entry>
468
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/ZipCoinApp.java">
469
+      <provider selected="true" editor-type-id="text-editor">
470
+        <state relative-caret-position="27">
471
+          <caret line="9" selection-start-line="9" selection-end-line="9" />
472
+        </state>
473
+      </provider>
474
+    </entry>
475
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/boot/spring-boot/1.3.1.RELEASE/spring-boot-1.3.1.RELEASE.jar!/org/springframework/boot/SpringApplication.class">
476
+      <provider selected="true" editor-type-id="text-editor">
477
+        <state relative-caret-position="371">
478
+          <caret line="679" column="41" lean-forward="true" selection-start-line="679" selection-start-column="41" selection-end-line="679" selection-end-column="41" />
479
+        </state>
480
+      </provider>
481
+    </entry>
482
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/StringUtil.java">
483
+      <provider selected="true" editor-type-id="text-editor">
484
+        <state relative-caret-position="60">
485
+          <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" />
486
+        </state>
487
+      </provider>
488
+    </entry>
489
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Wallet.java">
490
+      <provider selected="true" editor-type-id="text-editor">
491
+        <state relative-caret-position="75">
492
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
493
+        </state>
494
+      </provider>
495
+    </entry>
496
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Block.java">
497
+      <provider selected="true" editor-type-id="text-editor">
498
+        <state relative-caret-position="255">
499
+          <caret line="19" selection-start-line="19" selection-end-line="19" />
500
+        </state>
501
+      </provider>
502
+    </entry>
503
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/WalletLoader.java">
504
+      <provider selected="true" editor-type-id="text-editor">
505
+        <state relative-caret-position="75">
506
+          <caret line="7" column="13" selection-start-line="7" selection-start-column="13" selection-end-line="7" selection-end-column="13" />
507
+        </state>
508
+      </provider>
509
+    </entry>
510
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/TransactionLoader.java">
511
+      <provider selected="true" editor-type-id="text-editor">
512
+        <state relative-caret-position="75">
513
+          <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
514
+        </state>
515
+      </provider>
516
+    </entry>
517
+    <entry file="file://$PROJECT_DIR$/src/main/resources/application.properties">
518
+      <provider selected="true" editor-type-id="text-editor">
519
+        <state relative-caret-position="45">
520
+          <caret line="3" column="31" lean-forward="true" selection-start-line="3" selection-start-column="31" selection-end-line="3" selection-end-column="31" />
521
+        </state>
522
+      </provider>
523
+    </entry>
524
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/config/BlockLoader.java">
525
+      <provider selected="true" editor-type-id="text-editor">
526
+        <state relative-caret-position="285">
527
+          <caret line="24" selection-start-line="24" selection-end-line="24" />
528
+        </state>
529
+      </provider>
530
+    </entry>
531
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/utilities/Miner.java">
532
+      <provider selected="true" editor-type-id="text-editor">
533
+        <state relative-caret-position="375">
534
+          <caret line="25" column="1" selection-start-line="25" selection-start-column="1" selection-end-line="25" selection-end-column="1" />
535
+        </state>
536
+      </provider>
537
+    </entry>
538
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/BlockController.java">
539
+      <provider selected="true" editor-type-id="text-editor">
540
+        <state relative-caret-position="111">
541
+          <caret line="51" column="29" selection-start-line="51" selection-start-column="29" selection-end-line="51" selection-end-column="29" />
542
+        </state>
543
+      </provider>
544
+    </entry>
545
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/controller/TransactionController.java">
546
+      <provider selected="true" editor-type-id="text-editor">
547
+        <state relative-caret-position="-290">
548
+          <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" />
549
+        </state>
550
+      </provider>
551
+    </entry>
552
+    <entry file="file://$PROJECT_DIR$/src/main/java/com/zipcoin/model/Transaction.java">
553
+      <provider selected="true" editor-type-id="text-editor">
554
+        <state relative-caret-position="15">
555
+          <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" />
556
+        </state>
557
+      </provider>
558
+    </entry>
45 559
   </component>
46 560
 </project>

+ 0
- 1
ZipCoinRedJavaServer/ZipCoin-RED.iml View File

@@ -1,6 +1,5 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
3
-  <component name="ExternalSystem" externalSystem="Maven" />
4 3
   <component name="FacetManager">
5 4
     <facet type="Spring" name="Spring">
6 5
       <configuration />

+ 8
- 6
ZipCoinRedJavaServer/src/main/java/com/zipcoin/config/BlockLoader.java View File

@@ -16,12 +16,14 @@ import org.springframework.stereotype.Component;
16 16
             this.block = block;
17 17
         }
18 18
 
19
-//Testing merge...
20
-//
21
-        //
22
-        //
23
-        //
24
-        //
19
+        /*
20
+        Testing merge
21
+
22
+
23
+
24
+
25
+
26
+         */
25 27
 
26 28
         public void run(ApplicationArguments args) {
27 29
 

BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/config/BlockLoader.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/BlockController.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/HomeController.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/controller/WalletController.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Block.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Chain.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/model/Wallet.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/BlockRepository.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/repository/WalletRepository.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/Miner.class View File


BIN
ZipCoinRedJavaServer/target/classes/com/zipcoin/utilities/StringUtil.class View File


+ 0
- 16
ZipCoinRedJavaServer/target/classes/db/migration/V2__create_block.sql View File

@@ -1,30 +0,0 @@
1
-<<<<<<< HEAD
2
-CREATE TABLE BLOCK(
3
-	ID INT AUTO_INCREMENT,
4
-	BLOCK_NUMBER INT,
5
-	PREVIOUS_HASH VARCHAR(255),
6
-	NONCE INT,
7
-	CURRENT_HASH VARCHAR(255),
8
-	TRANSACTION_LIST VARCHAR(2000)
9
-);
10
-
11
-CREATE TABLE WALLET(
12
-  ID INT AUTO_INCREMENT,
13
-);
14
-=======
15
---
16
->>>>>>> dev