Przeglądaj źródła

setting up on public git

Chad 6 lat temu
rodzic
commit
1a87c931e6

+ 8
- 32
Fantasy_Fantasy_Project/.idea/workspace.xml Wyświetl plik

@@ -2,25 +2,7 @@
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
4 4
     <list default="true" id="b55c2c0c-1cd3-45e5-9b3b-a0a97a1a43a0" name="Default" comment="">
5
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/437bf759-f4a7-473f-9a99-c3492d685736.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/437bf759-f4a7-473f-9a99-c3492d685736.xml" afterDir="false" />
6
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/437bf759-f4a7-473f-9a99-c3492d685736/storage_v2/_src_/database/d8g2b4jo1d30rg.-1a7gg/schema/public.abK9xQ.meta" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/437bf759-f4a7-473f-9a99-c3492d685736/storage_v2/_src_/database/d8g2b4jo1d30rg.-1a7gg/schema/public.abK9xQ.meta" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/pom.xml" beforeDir="false" afterPath="$PROJECT_DIR$/pom.xml" afterDir="false" />
9 5
       <change beforePath="$PROJECT_DIR$/src/main/java/com/fantasy_fantasy/Season/Season.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/fantasy_fantasy/Season/Season.java" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/Season/Season.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/Season/Season.class" afterDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/ShowCharacter/ShowCharacter.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/ShowCharacter/ShowCharacter.class" afterDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/Team/Team.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/Team/Team.class" afterDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/Team/TeamController.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/fantasy_fantasy/Team/TeamController.class" afterDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/app/app.module.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/app/app.module.ts" afterDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/home/home.html" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/home/home.html" afterDir="false" />
16
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/home/home.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/home/home.ts" afterDir="false" />
17
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/login/login.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/login/login.ts" afterDir="false" />
18
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/myteam/myteam.html" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/myteam/myteam.html" afterDir="false" />
19
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/myteam/myteam.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/myteam/myteam.ts" afterDir="false" />
20
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/teammatch/teammatch.html" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/teammatch/teammatch.html" afterDir="false" />
21
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/teammatch/teammatch.scss" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/teammatch/teammatch.scss" afterDir="false" />
22
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/teammatch/teammatch.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/pages/teammatch/teammatch.ts" afterDir="false" />
23
-      <change beforePath="$PROJECT_DIR$/../fantasyfantasyui/src/providers/rest/rest.ts" beforeDir="false" afterPath="$PROJECT_DIR$/../fantasyfantasyui/src/providers/rest/rest.ts" afterDir="false" />
24 6
     </list>
25 7
     <ignored path="$PROJECT_DIR$/out/" />
26 8
     <ignored path="$PROJECT_DIR$/target/" />
@@ -90,11 +72,8 @@
90 72
       <file leaf-file-name="Season.java" pinned="false" current-in-tab="true">
91 73
         <entry file="file://$PROJECT_DIR$/src/main/java/com/fantasy_fantasy/Season/Season.java">
92 74
           <provider selected="true" editor-type-id="text-editor">
93
-            <state relative-caret-position="105">
94
-              <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
95
-              <folding>
96
-                <element signature="imports" expanded="true" />
97
-              </folding>
75
+            <state relative-caret-position="75">
76
+              <caret line="5" column="27" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="27" />
98 77
             </state>
99 78
           </provider>
100 79
         </entry>
@@ -197,7 +176,7 @@
197 176
   <component name="NodePackageJsonFileManager">
198 177
     <packageJsonPaths />
199 178
   </component>
200
-  <component name="ProjectFrameBounds" extendedState="1">
179
+  <component name="ProjectFrameBounds">
201 180
     <option name="y" value="23" />
202 181
     <option name="width" value="1280" />
203 182
     <option name="height" value="709" />
@@ -504,7 +483,7 @@
504 483
       <workItem from="1531937093419" duration="29000" />
505 484
       <workItem from="1531937173181" duration="14836000" />
506 485
       <workItem from="1532097651864" duration="58246000" />
507
-      <workItem from="1533404618889" duration="27493000" />
486
+      <workItem from="1533404618889" duration="27607000" />
508 487
     </task>
509 488
     <servers />
510 489
   </component>
@@ -520,10 +499,10 @@
520 499
     </history-entry>
521 500
   </component>
522 501
   <component name="TimeTrackingManager">
523
-    <option name="totallyTimeSpent" value="172667000" />
502
+    <option name="totallyTimeSpent" value="172781000" />
524 503
   </component>
525 504
   <component name="ToolWindowManager">
526
-    <frame x="0" y="23" width="1280" height="709" extended-state="1" />
505
+    <frame x="0" y="23" width="1280" height="709" extended-state="0" />
527 506
     <editor active="true" />
528 507
     <layout>
529 508
       <window_info anchor="right" id="Palette" order="3" />
@@ -1003,11 +982,8 @@
1003 982
     </entry>
1004 983
     <entry file="file://$PROJECT_DIR$/src/main/java/com/fantasy_fantasy/Season/Season.java">
1005 984
       <provider selected="true" editor-type-id="text-editor">
1006
-        <state relative-caret-position="105">
1007
-          <caret line="7" column="21" lean-forward="true" selection-start-line="7" selection-start-column="21" selection-end-line="7" selection-end-column="21" />
1008
-          <folding>
1009
-            <element signature="imports" expanded="true" />
1010
-          </folding>
985
+        <state relative-caret-position="75">
986
+          <caret line="5" column="27" selection-start-line="5" selection-start-column="27" selection-end-line="5" selection-end-column="27" />
1011 987
         </state>
1012 988
       </provider>
1013 989
     </entry>

+ 0
- 1
Fantasy_Fantasy_Project/src/main/java/com/fantasy_fantasy/Season/Season.java Wyświetl plik

@@ -4,7 +4,6 @@ import com.fantasy_fantasy.Episode.Episode;
4 4
 import com.fantasy_fantasy.TVShow.TVShow;
5 5
 
6 6
 import javax.persistence.*;
7
-import java.util.Arrays;
8 7
 import java.util.Set;
9 8
 
10 9