changes to back and frontend
This commit is contained in:
177
.idea/workspace.xml
generated
177
.idea/workspace.xml
generated
@@ -2,21 +2,8 @@
|
||||
<project version="4">
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="ac3f393f-3d74-4757-a67c-1612144a423b" name="Default Changelist" comment="">
|
||||
<change afterPath="$PROJECT_DIR$/backend/models/recorder_model.py" afterDir="false" />
|
||||
<change afterPath="$PROJECT_DIR$/backend/models/room_model.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/vue_ts_test.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vue_ts_test.iml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/backend" beforeDir="false" afterPath="$PROJECT_DIR$/backend" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/backend/api/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/backend/api/__init__.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/backend/api/auth_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/backend/api/auth_api.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/backend/api/group_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/backend/api/group_api.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/backend/api/user_api.py" beforeDir="false" afterPath="$PROJECT_DIR$/backend/api/user_api.py" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend" beforeDir="false" afterPath="$PROJECT_DIR$/frontend" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/src/api/Repository.js" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/Repository.js" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/src/api/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/api/index.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/src/components/User.vue" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/components/User.vue" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/src/main.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/main.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/frontend/src/store.ts" beforeDir="false" afterPath="$PROJECT_DIR$/frontend/src/store.ts" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/backend/migrations/versions/6f980d1e7ac5_.py" beforeDir="false" />
|
||||
</list>
|
||||
<ignored path="$PROJECT_DIR$/node_modules/" />
|
||||
<ignored path="$PROJECT_DIR$/.tmp/" />
|
||||
@@ -33,7 +20,7 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Login.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="369">
|
||||
<state relative-caret-position="1260">
|
||||
<caret line="70" column="25" selection-start-line="70" selection-start-column="21" selection-end-line="70" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -42,7 +29,7 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/node_modules/vuex/types/index.d.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="211">
|
||||
<state relative-caret-position="702">
|
||||
<caret line="41" column="2" selection-start-line="41" selection-start-column="2" selection-end-line="41" selection-end-column="2" />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -51,11 +38,10 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Group.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="168">
|
||||
<state relative-caret-position="756">
|
||||
<caret line="42" column="84" selection-start-line="33" selection-start-column="20" selection-end-line="42" selection-end-column="84" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#p#2;n#div#0;n#div#0;n#section#0;n#div#0;n#template#0;n#!!top" expanded="true" />
|
||||
<element signature="e#3232#3266#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -64,7 +50,7 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/User.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1440">
|
||||
<state relative-caret-position="1692">
|
||||
<caret line="96" column="20" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="e#1926#1961#0" expanded="true" />
|
||||
@@ -76,8 +62,8 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/main.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="39" column="26" lean-forward="true" selection-start-line="39" selection-start-column="26" selection-end-line="39" selection-end-column="26" />
|
||||
<state relative-caret-position="522">
|
||||
<caret line="39" column="26" selection-start-line="39" selection-start-column="26" selection-end-line="39" selection-end-column="26" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
</folding>
|
||||
@@ -88,7 +74,7 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/HelloWorld.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="356">
|
||||
<state relative-caret-position="864">
|
||||
<caret line="48" column="20" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -97,7 +83,7 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/api/index.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="328">
|
||||
<state relative-caret-position="864">
|
||||
<caret line="49" column="1" selection-start-line="49" selection-start-column="1" selection-end-line="49" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
@@ -105,16 +91,14 @@
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Profile.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-284" />
|
||||
</provider>
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
</file>
|
||||
<file pinned="false" current-in-tab="true">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/api/Repository.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="230">
|
||||
<caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
|
||||
<state relative-caret-position="738">
|
||||
<caret line="41" column="56" selection-start-line="41" selection-start-column="56" selection-end-line="41" selection-end-column="56" />
|
||||
<folding>
|
||||
<element signature="e#18#40#0" expanded="true" />
|
||||
</folding>
|
||||
@@ -125,11 +109,10 @@
|
||||
<file pinned="false" current-in-tab="false">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/store.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<state relative-caret-position="3870">
|
||||
<caret line="228" column="4" selection-start-line="228" selection-start-column="4" selection-end-line="228" selection-end-column="4" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
<element signature="e#146#339#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
@@ -228,9 +211,11 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectFrameBounds" fullScreen="true">
|
||||
<option name="width" value="1680" />
|
||||
<option name="height" value="1050" />
|
||||
<component name="ProjectFrameBounds">
|
||||
<option name="x" value="3848" />
|
||||
<option name="y" value="154" />
|
||||
<option name="width" value="1184" />
|
||||
<option name="height" value="1878" />
|
||||
</component>
|
||||
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
||||
<component name="ProjectView">
|
||||
@@ -238,61 +223,19 @@
|
||||
<foldersAlwaysOnTop value="true" />
|
||||
</navigator>
|
||||
<panes>
|
||||
<pane id="ProjectPane">
|
||||
<subPane>
|
||||
<expand>
|
||||
<path>
|
||||
<item name="vue_ts_test" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="vue_ts_test" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="vue_ts_test" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="vue_ts_test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="frontend" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="vue_ts_test" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="vue_ts_test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="frontend" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="vue_ts_test" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="vue_ts_test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="frontend" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="api" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="vue_ts_test" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="vue_ts_test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="frontend" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="components" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
<path>
|
||||
<item name="vue_ts_test" type="b2602c69:ProjectViewProjectNode" />
|
||||
<item name="vue_ts_test" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="frontend" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="src" type="462c0819:PsiDirectoryNode" />
|
||||
<item name="views" type="462c0819:PsiDirectoryNode" />
|
||||
</path>
|
||||
</expand>
|
||||
<select />
|
||||
</subPane>
|
||||
</pane>
|
||||
<pane id="ProjectPane" />
|
||||
<pane id="Scope" />
|
||||
</panes>
|
||||
</component>
|
||||
<component name="PropertiesComponent">
|
||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/frontend/src/api" />
|
||||
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
|
||||
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
|
||||
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
|
||||
<property name="nodejs_package_manager_path" value="npm" />
|
||||
<property name="prettierjs.PrettierConfiguration.Package" value="C:\Users\tkurz\WebstormProjects\vue_ts_test\node_modules\prettier" />
|
||||
<property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
|
||||
<property name="settings.editor.selected.configurable" value="copyright.filetypes.Vue.js" />
|
||||
<property name="ts.external.directory.path" value="$PROJECT_DIR$/frontend/node_modules/typescript/lib" />
|
||||
</component>
|
||||
<component name="RecentsManager">
|
||||
@@ -380,17 +323,17 @@
|
||||
<workItem from="1554361628943" duration="70000" />
|
||||
<workItem from="1554361884220" duration="14603000" />
|
||||
<workItem from="1554658665526" duration="24418000" />
|
||||
<workItem from="1555409379258" duration="499000" />
|
||||
</task>
|
||||
<servers />
|
||||
</component>
|
||||
<component name="TimeTrackingManager">
|
||||
<option name="totallyTimeSpent" value="75310000" />
|
||||
<option name="totallyTimeSpent" value="75809000" />
|
||||
</component>
|
||||
<component name="ToolWindowManager">
|
||||
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
|
||||
<editor active="true" />
|
||||
<frame x="4023" y="430" width="835" height="1326" extended-state="0" />
|
||||
<layout>
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49853373" visible="true" weight="0.24894515" />
|
||||
<window_info active="true" content_ui="combo" id="Project" order="0" sideWeight="0.49853373" visible="true" weight="0.4305211" />
|
||||
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
||||
<window_info id="npm" order="2" sideWeight="0.5014663" side_tool="true" visible="true" weight="0.24973656" />
|
||||
<window_info id="Favorites" order="3" side_tool="true" />
|
||||
@@ -584,46 +527,33 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Group.vue">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Login.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="168">
|
||||
<caret line="42" column="84" selection-start-line="33" selection-start-column="20" selection-end-line="42" selection-end-column="84" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#p#2;n#div#0;n#div#0;n#section#0;n#div#0;n#template#0;n#!!top" expanded="true" />
|
||||
<element signature="e#3232#3266#0" expanded="true" />
|
||||
</folding>
|
||||
<state relative-caret-position="1260">
|
||||
<caret line="70" column="25" selection-start-line="70" selection-start-column="21" selection-end-line="70" selection-end-column="25" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/node_modules/vuex/types/index.d.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="211">
|
||||
<state relative-caret-position="702">
|
||||
<caret line="41" column="2" selection-start-line="41" selection-start-column="2" selection-end-line="41" selection-end-column="2" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Login.vue">
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Group.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="369">
|
||||
<caret line="70" column="25" selection-start-line="70" selection-start-column="21" selection-end-line="70" selection-end-column="25" />
|
||||
<state relative-caret-position="756">
|
||||
<caret line="42" column="84" selection-start-line="33" selection-start-column="20" selection-end-line="42" selection-end-column="84" />
|
||||
<folding>
|
||||
<element signature="n#style#0;n#p#2;n#div#0;n#div#0;n#section#0;n#div#0;n#template#0;n#!!top" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/HelloWorld.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="356">
|
||||
<caret line="48" column="20" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Profile.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="-284" />
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/User.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="1440">
|
||||
<state relative-caret-position="1692">
|
||||
<caret line="96" column="20" selection-start-line="96" selection-start-column="20" selection-end-line="96" selection-end-column="20" />
|
||||
<folding>
|
||||
<element signature="e#1926#1961#0" expanded="true" />
|
||||
@@ -631,38 +561,47 @@
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/api/index.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="328">
|
||||
<caret line="49" column="1" selection-start-line="49" selection-start-column="1" selection-end-line="49" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/main.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="435">
|
||||
<caret line="39" column="26" lean-forward="true" selection-start-line="39" selection-start-column="26" selection-end-line="39" selection-end-column="26" />
|
||||
<state relative-caret-position="522">
|
||||
<caret line="39" column="26" selection-start-line="39" selection-start-column="26" selection-end-line="39" selection-end-column="26" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/HelloWorld.vue">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="864">
|
||||
<caret line="48" column="20" selection-start-line="48" selection-start-column="20" selection-end-line="48" selection-end-column="20" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/api/index.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="864">
|
||||
<caret line="49" column="1" selection-start-line="49" selection-start-column="1" selection-end-line="49" selection-end-column="1" />
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/components/Profile.vue">
|
||||
<provider selected="true" editor-type-id="text-editor" />
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/store.ts">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="221">
|
||||
<state relative-caret-position="3870">
|
||||
<caret line="228" column="4" selection-start-line="228" selection-start-column="4" selection-end-line="228" selection-end-column="4" />
|
||||
<folding>
|
||||
<element signature="e#0#22#0" expanded="true" />
|
||||
<element signature="e#146#339#0" expanded="true" />
|
||||
</folding>
|
||||
</state>
|
||||
</provider>
|
||||
</entry>
|
||||
<entry file="file://$PROJECT_DIR$/frontend/src/api/Repository.js">
|
||||
<provider selected="true" editor-type-id="text-editor">
|
||||
<state relative-caret-position="230">
|
||||
<caret line="23" column="61" selection-start-line="23" selection-start-column="61" selection-end-line="23" selection-end-column="61" />
|
||||
<state relative-caret-position="738">
|
||||
<caret line="41" column="56" selection-start-line="41" selection-start-column="56" selection-end-line="41" selection-end-column="56" />
|
||||
<folding>
|
||||
<element signature="e#18#40#0" expanded="true" />
|
||||
</folding>
|
||||
|
||||
Reference in New Issue
Block a user