Kate Moore 5 年 前
コミット
8f18756c9d

+ 1
- 2
src/main/resources/config/application-dev.yml ファイルの表示

@@ -49,10 +49,9 @@ spring:
49 49
         password:
50 50
         hikari:
51 51
             auto-commit: false
52
-        platform: h2
53 52
     h2:
54 53
         console:
55
-            enabled: true
54
+            enabled: false
56 55
     jpa:
57 56
         database-platform: io.github.jhipster.domain.util.FixedH2Dialect
58 57
         database: H2

+ 4
- 0
src/main/resources/config/application.yml ファイルの表示

@@ -66,6 +66,10 @@ spring:
66 66
         properties:
67 67
             hibernate.jdbc.time_zone: UTC
68 68
         hibernate:
69
+<<<<<<< HEAD
70
+=======
71
+            ddl-auto: none
72
+>>>>>>> e643360c0b2a6c07e30a791e98c6c624e8cc0a81
69 73
             naming:
70 74
                 physical-strategy: org.springframework.boot.orm.jpa.hibernate.SpringPhysicalNamingStrategy
71 75
                 implicit-strategy: org.springframework.boot.orm.jpa.hibernate.SpringImplicitNamingStrategy

+ 38
- 0
src/main/resources/config/liquibase/changelog/20181221232626_populate_tables.xml ファイルの表示

@@ -0,0 +1,38 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<databaseChangeLog
3
+    xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
4
+    xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext"
5
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6
+    xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd
7
+                        http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd">
8
+
9
+    <property name="now" value="now()" dbms="h2"/>
10
+
11
+    <property name="now" value="now()" dbms="mysql"/>
12
+    <property name="autoIncrement" value="true"/>
13
+
14
+    <property name="floatType" value="float4" dbms="postgresql, h2"/>
15
+    <property name="floatType" value="float" dbms="mysql, oracle, mssql"/>
16
+
17
+    <changeSet id="LOADDATA" author="lauren">
18
+        <loadData encoding="UTF-8"
19
+                  file="config/liquibase/employer.csv"
20
+                  separator=","
21
+                  tableName="employer">
22
+        </loadData>
23
+
24
+        <loadData encoding="UTF-8"
25
+                  file="config/liquibase/user_profile.csv"
26
+                  separator=","
27
+                  tableName="user_profile">
28
+        </loadData>
29
+
30
+        <loadData encoding="UTF-8"
31
+                  file="config/liquibase/cohort.csv"
32
+                  separator=","
33
+                  tableName="cohort">
34
+        </loadData>
35
+
36
+    </changeSet>
37
+
38
+</databaseChangeLog>

+ 11
- 0
src/main/resources/config/liquibase/cohort.csv ファイルの表示

@@ -0,0 +1,11 @@
1
+id,grad_date
2
+1,6/30/2016
3
+2,9/13/2015
4
+3,1/27/2016
5
+4,5/8/2016
6
+5,6/27/2015
7
+6,10/9/2016
8
+7,1/6/2015
9
+8,10/1/2018
10
+9,9/21/2017
11
+10,7/3/2016

+ 21
- 0
src/main/resources/config/liquibase/employer.csv ファイルの表示

@@ -0,0 +1,21 @@
1
+id,company_name,city,state
2
+1,Babbleblab,Washington,District of Columbia
3
+2,Thoughtblab,Indianapolis,Indiana
4
+3,Geba,Atlanta,Georgia
5
+4,Bubblebox,Miami,Florida
6
+5,Livepath,San Jose,California
7
+6,Edgewire,New Haven,Connecticut
8
+7,Browsebug,Atlanta,Georgia
9
+8,Devcast,Atlanta,Georgia
10
+9,Plambee,Charleston,South Carolina
11
+10,Wordware,Tacoma,Washington
12
+11,Twimbo,Washington,District of Columbia
13
+12,Muxo,Corpus Christi,Texas
14
+13,Quatz,Colorado Springs,Colorado
15
+14,Livetube,Stamford,Connecticut
16
+15,Realbuzz,Boston,Massachusetts
17
+16,Twimm,Tallahassee,Florida
18
+17,Fivebridge,Hartford,Connecticut
19
+18,Lajo,Naperville,Illinois
20
+19,Brainsphere,Pittsburgh,Pennsylvania
21
+20,Thoughtmix,Phoenix,Arizona

+ 2
- 0
src/main/resources/config/liquibase/master.xml ファイルの表示

@@ -10,6 +10,8 @@
10 10
     <include file="config/liquibase/changelog/20181217184614_added_entity_Employer.xml" relativeToChangelogFile="false"/>
11 11
     <include file="config/liquibase/changelog/20181217184615_added_entity_Post.xml" relativeToChangelogFile="false"/>
12 12
     <include file="config/liquibase/changelog/20181217184616_added_entity_Privacy.xml" relativeToChangelogFile="false"/>
13
+    <include file="config/liquibase/changelog/20181221232626_populate_tables.xml" relativeToChangelogFile="false"/>
14
+
13 15
     <!-- jhipster-needle-liquibase-add-changelog - JHipster will add liquibase changelogs here -->
14 16
     <include file="config/liquibase/changelog/20181217184612_added_entity_constraints_UserProfile.xml" relativeToChangelogFile="false"/>
15 17
     <include file="config/liquibase/changelog/20181217184615_added_entity_constraints_Post.xml" relativeToChangelogFile="false"/>

+ 101
- 0
src/main/resources/config/liquibase/user_profile.csv ファイルの表示

@@ -0,0 +1,101 @@
1
+id,first_name,last_name,user_stack,user_id,employer_id,cohort_id
2
+1,Axel,Argont,Go,null,15,2
3
+2,Staci,Proudler,Ruby,null,5,8
4
+3,Carmen,Mattisssen,Ruby,null,6,2
5
+4,Clotilda,Giovannazzi,Java,null,1,7
6
+5,Riobard,Mattheis,JavaScript,null,6,8
7
+6,Belicia,Masey,Ruby,null,18,10
8
+7,Riane,Folkard,JavaScript,null,9,6
9
+8,Eugenia,Venables,C#,null,14,5
10
+9,Cyrill,Gallen,JavaScript,null,7,2
11
+10,Britt,Danihel,Go,null,9,2
12
+11,Craggie,Chritchlow,Ruby,null,15,2
13
+12,Dennison,Ismay,Go,null,16,3
14
+13,Horatio,Veitch,JavaScript,null,19,5
15
+14,Dorey,Hearson,Go,null,12,7
16
+15,Mitchael,Hrus,Go,null,3,9
17
+16,Kelci,MacCafferky,Go,null,9,8
18
+17,Hal,Necrews,,null,5,8
19
+18,Sula,Tripp,Go,null,19,7
20
+19,Jard,Krysiak,Java,null,3,10
21
+20,Swen,Canning,Ruby,null,14,8
22
+21,Wallis,Joskowitz,JavaScript,null,12,8
23
+22,Jay,Epsly,C#,null,11,8
24
+23,Britney,Bruckenthal,JavaScript,null,3,3
25
+24,Seline,Ashingden,Go,null,19,2
26
+25,Roxine,Brimley,Ruby,null,1,2
27
+26,Urbano,Drury,C#,null,19,7
28
+27,Brittne,Foxton,Ruby,null,13,9
29
+28,Isis,Yannoni,C#,null,18,10
30
+29,Isa,Pudsall,C#,null,2,4
31
+30,Roderich,Seccombe,Go,null,18,6
32
+31,Mendie,Ciobutaro,JavaScript,null,15,2
33
+32,Waring,Pibworth,JavaScript,null,8,10
34
+33,Morley,Sainteau,Ruby,null,9,8
35
+34,Thurstan,Heakins,Ruby,null,4,4
36
+35,Amberly,Britney,JavaScript,null,5,5
37
+36,Heath,Darridon,Go,null,14,10
38
+37,Creigh,Warriner,Go,null,1,7
39
+38,Brittani,Byrnes,Go,null,20,4
40
+39,Barny,Devonald,Java,null,9,4
41
+40,Tarrah,Messenbird,Ruby,null,3,4
42
+41,Lewiss,Dudenie,Java,null,13,8
43
+42,Arlette,Corington,Ruby,null,12,4
44
+43,Kendrick,Lyford,Ruby,null,13,7
45
+44,Greggory,Coghlin,Java,null,4,9
46
+45,Anetta,Reddecliffe,Java,null,3,9
47
+46,Andrey,Orrom,Java,null,11,6
48
+47,Zandra,Rounds,Go,null,3,6
49
+48,Saba,Spalding,C#,null,1,5
50
+49,Editha,MacManus,Java,null,13,7
51
+50,Dilan,Fairtlough,Ruby,null,9,8
52
+51,Onofredo,Manning,,null,13,5
53
+52,Jdavie,Osmond,Go,null,5,8
54
+53,Ddene,Spain-Gower,JavaScript,null,15,10
55
+54,Norean,McGrann,Ruby,null,9,1
56
+55,Shane,McGowan,Go,null,14,3
57
+56,Ruthe,Ionesco,C#,null,14,8
58
+57,Adriane,Varne,JavaScript,null,17,7
59
+58,Sharai,Butterworth,Java,null,9,5
60
+59,Giffer,Sears,Go,null,9,6
61
+60,Cati,Glassman,Ruby,null,10,3
62
+61,Linzy,Ridgewell,Ruby,null,7,9
63
+62,Yule,Elecum,Java,null,9,6
64
+63,Garey,Wickham,Ruby,null,12,1
65
+64,Christiane,Brigden,JavaScript,null,7,6
66
+65,Artemus,Mityashin,C#,null,14,3
67
+66,Royall,Bernardi,JavaScript,null,5,3
68
+67,Manon,Junkinson,Ruby,null,16,6
69
+68,Dana,Gobel,Java,null,15,10
70
+69,Jaymie,Deegin,Ruby,null,1,3
71
+70,Kristen,Butterfill,Java,null,7,3
72
+71,Arv,Byfield,JavaScript,null,14,3
73
+72,Norina,Swinnard,Ruby,null,10,1
74
+73,Sosanna,Kovacs,Ruby,null,6,9
75
+74,Ransom,Nielson,Go,null,11,2
76
+75,Cherry,Hann,Java,null,19,3
77
+76,Carlene,Grancher,C#,null,7,5
78
+77,Lotti,Hynd,JavaScript,null,20,7
79
+78,Lu,Bengtson,JavaScript,null,15,5
80
+79,Kirk,Port,C#,null,7,7
81
+80,Roxanne,Childerhouse,C#,null,20,8
82
+81,Dorthea,Petti,Ruby,null,8,2
83
+82,Johnathan,Dark,JavaScript,null,5,9
84
+83,Nefen,Timeby,Ruby,null,14,1
85
+84,Salvidor,Smails,Java,null,15,7
86
+85,Pauly,Cometson,Ruby,null,15,8
87
+86,Benito,Jenkin,JavaScript,null,12,9
88
+87,Nathalie,Blackader,JavaScript,null,13,1
89
+88,Jeramey,Rucklesse,Ruby,null,18,1
90
+89,Joceline,O' Hern,Ruby,null,8,6
91
+90,Merry,Wakeling,,null,14,8
92
+91,Felicia,Forcer,Ruby,null,17,8
93
+92,Brinna,Glasbey,C#,null,16,2
94
+93,Zeb,Greally,Ruby,null,9,8
95
+94,Chane,Richold,JavaScript,null,15,2
96
+95,Mayer,Marlen,JavaScript,null,16,7
97
+96,Kermie,Corbishley,C#,null,19,7
98
+97,Erda,Damper,Go,null,5,4
99
+98,Edd,Hannis,C#,null,10,2
100
+99,Torey,Marjanski,JavaScript,null,13,5
101
+100,Alisa,Byass,JavaScript,null,1,6

+ 12
- 1
src/main/webapp/app/app.module.ts ファイルの表示

@@ -20,6 +20,8 @@ import { ZipConnectEntityModule } from './entities/entity.module';
20 20
 import * as moment from 'moment';
21 21
 // jhipster-needle-angular-add-module-import JHipster will add new module here
22 22
 import { JhiMainComponent, NavbarComponent, FooterComponent, PageRibbonComponent, ActiveMenuDirective, ErrorComponent } from './layouts';
23
+import { CardComponent } from './card/card.component';
24
+import { CardInputComponent } from './card-input/card-input.component';
23 25
 
24 26
 @NgModule({
25 27
     imports: [
@@ -40,7 +42,16 @@ import { JhiMainComponent, NavbarComponent, FooterComponent, PageRibbonComponent
40 42
         // jhipster-needle-angular-add-module JHipster will add new module here
41 43
         ZipConnectEntityModule
42 44
     ],
43
-    declarations: [JhiMainComponent, NavbarComponent, ErrorComponent, PageRibbonComponent, ActiveMenuDirective, FooterComponent],
45
+    declarations: [
46
+        JhiMainComponent,
47
+        NavbarComponent,
48
+        ErrorComponent,
49
+        PageRibbonComponent,
50
+        ActiveMenuDirective,
51
+        FooterComponent,
52
+        CardComponent,
53
+        CardInputComponent
54
+    ],
44 55
     providers: [
45 56
         {
46 57
             provide: HTTP_INTERCEPTORS,