소스 검색

Revert "fixed urls for frontend. Removed '/#'"

Guénaël Muller 7 년 전
부모
커밋
1e31c58eea
4개의 변경된 파일22개의 추가작업 그리고 22개의 파일을 삭제
  1. 6 6
      tracim/models/applications.py
  2. 2 2
      tracim/models/workspace_menu_entries.py
  3. 7 7
      tracim/tests/functional/test_user.py
  4. 7 7
      tracim/tests/functional/test_workspaces.py

+ 6 - 6
tracim/models/applications.py 파일 보기

26
         @param main_route: the route of the frontend "home" screen of
26
         @param main_route: the route of the frontend "home" screen of
27
         the application. For exemple, if you have an application
27
         the application. For exemple, if you have an application
28
         called "calendar", the main route will be something
28
         called "calendar", the main route will be something
29
-        like /workspace/{wid}/calendar.
29
+        like /#/workspace/{wid}/calendar.
30
         """
30
         """
31
         self.label = label
31
         self.label = label
32
         self.slug = slug
32
         self.slug = slug
45
     hexcolor='#757575',
45
     hexcolor='#757575',
46
     is_active=True,
46
     is_active=True,
47
     config={},
47
     config={},
48
-    main_route='/workspaces/{workspace_id}/calendar',
48
+    main_route='/#/workspaces/{workspace_id}/calendar',
49
 )
49
 )
50
 
50
 
51
 thread = Application(
51
 thread = Application(
55
     hexcolor='#ad4cf9',
55
     hexcolor='#ad4cf9',
56
     is_active=True,
56
     is_active=True,
57
     config={},
57
     config={},
58
-    main_route='/workspaces/{workspace_id}/contents?type=thread',
58
+    main_route='/#/workspaces/{workspace_id}/contents?type=thread',
59
 
59
 
60
 )
60
 )
61
 
61
 
66
     hexcolor='#FF9900',
66
     hexcolor='#FF9900',
67
     is_active=True,
67
     is_active=True,
68
     config={},
68
     config={},
69
-    main_route='/workspaces/{workspace_id}/contents?type=file',
69
+    main_route='/#/workspaces/{workspace_id}/contents?type=file',
70
 )
70
 )
71
 
71
 
72
 markdownpluspage = Application(
72
 markdownpluspage = Application(
76
     hexcolor='#f12d2d',
76
     hexcolor='#f12d2d',
77
     is_active=True,
77
     is_active=True,
78
     config={},
78
     config={},
79
-    main_route='/workspaces/{workspace_id}/contents?type=markdownpluspage',
79
+    main_route='/#/workspaces/{workspace_id}/contents?type=markdownpluspage',
80
 )
80
 )
81
 
81
 
82
 html_documents = Application(
82
 html_documents = Application(
86
     hexcolor='#3f52e3',
86
     hexcolor='#3f52e3',
87
     is_active=True,
87
     is_active=True,
88
     config={},
88
     config={},
89
-    main_route='/workspaces/{workspace_id}/contents?type=html-documents',
89
+    main_route='/#/workspaces/{workspace_id}/contents?type=html-documents',
90
 )
90
 )
91
 # TODO - G.M - 08-06-2018 - This is hardcoded lists of app, make this dynamic.
91
 # TODO - G.M - 08-06-2018 - This is hardcoded lists of app, make this dynamic.
92
 # List of applications
92
 # List of applications

+ 2 - 2
tracim/models/workspace_menu_entries.py 파일 보기

27
 dashboard_menu_entry = WorkspaceMenuEntry(
27
 dashboard_menu_entry = WorkspaceMenuEntry(
28
   slug='dashboard',
28
   slug='dashboard',
29
   label='Dashboard',
29
   label='Dashboard',
30
-  route='/workspaces/{workspace_id}/dashboard',
30
+  route='/#/workspaces/{workspace_id}/dashboard',
31
   hexcolor='#252525',
31
   hexcolor='#252525',
32
   fa_icon="",
32
   fa_icon="",
33
 )
33
 )
34
 all_content_menu_entry = WorkspaceMenuEntry(
34
 all_content_menu_entry = WorkspaceMenuEntry(
35
   slug="contents/all",
35
   slug="contents/all",
36
   label="All Contents",
36
   label="All Contents",
37
-  route="/workspaces/{workspace_id}/contents",
37
+  route="/#/workspaces/{workspace_id}/contents",
38
   hexcolor="#fdfdfd",
38
   hexcolor="#fdfdfd",
39
   fa_icon="",
39
   fa_icon="",
40
 )
40
 )

+ 7 - 7
tracim/tests/functional/test_user.py 파일 보기

36
         sidebar_entry = workspace['sidebar_entries'][0]
36
         sidebar_entry = workspace['sidebar_entries'][0]
37
         assert sidebar_entry['slug'] == 'dashboard'
37
         assert sidebar_entry['slug'] == 'dashboard'
38
         assert sidebar_entry['label'] == 'Dashboard'
38
         assert sidebar_entry['label'] == 'Dashboard'
39
-        assert sidebar_entry['route'] == '/workspaces/1/dashboard'  # nopep8
39
+        assert sidebar_entry['route'] == '/#/workspaces/1/dashboard'  # nopep8
40
         assert sidebar_entry['hexcolor'] == "#252525"
40
         assert sidebar_entry['hexcolor'] == "#252525"
41
         assert sidebar_entry['fa_icon'] == ""
41
         assert sidebar_entry['fa_icon'] == ""
42
 
42
 
43
         sidebar_entry = workspace['sidebar_entries'][1]
43
         sidebar_entry = workspace['sidebar_entries'][1]
44
         assert sidebar_entry['slug'] == 'contents/all'
44
         assert sidebar_entry['slug'] == 'contents/all'
45
         assert sidebar_entry['label'] == 'All Contents'
45
         assert sidebar_entry['label'] == 'All Contents'
46
-        assert sidebar_entry['route'] == "/workspaces/1/contents"  # nopep8
46
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents"  # nopep8
47
         assert sidebar_entry['hexcolor'] == "#fdfdfd"
47
         assert sidebar_entry['hexcolor'] == "#fdfdfd"
48
         assert sidebar_entry['fa_icon'] == ""
48
         assert sidebar_entry['fa_icon'] == ""
49
 
49
 
50
         sidebar_entry = workspace['sidebar_entries'][2]
50
         sidebar_entry = workspace['sidebar_entries'][2]
51
         assert sidebar_entry['slug'] == 'contents/html-documents'
51
         assert sidebar_entry['slug'] == 'contents/html-documents'
52
         assert sidebar_entry['label'] == 'Text Documents'
52
         assert sidebar_entry['label'] == 'Text Documents'
53
-        assert sidebar_entry['route'] == '/workspaces/1/contents?type=html-documents'  # nopep8
53
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
54
         assert sidebar_entry['hexcolor'] == "#3f52e3"
54
         assert sidebar_entry['hexcolor'] == "#3f52e3"
55
         assert sidebar_entry['fa_icon'] == "file-text-o"
55
         assert sidebar_entry['fa_icon'] == "file-text-o"
56
 
56
 
57
         sidebar_entry = workspace['sidebar_entries'][3]
57
         sidebar_entry = workspace['sidebar_entries'][3]
58
         assert sidebar_entry['slug'] == 'contents/markdownpluspage'
58
         assert sidebar_entry['slug'] == 'contents/markdownpluspage'
59
         assert sidebar_entry['label'] == 'Markdown Plus Documents'
59
         assert sidebar_entry['label'] == 'Markdown Plus Documents'
60
-        assert sidebar_entry['route'] == "/workspaces/1/contents?type=markdownpluspage"    # nopep8
60
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
61
         assert sidebar_entry['hexcolor'] == "#f12d2d"
61
         assert sidebar_entry['hexcolor'] == "#f12d2d"
62
         assert sidebar_entry['fa_icon'] == "file-code"
62
         assert sidebar_entry['fa_icon'] == "file-code"
63
 
63
 
64
         sidebar_entry = workspace['sidebar_entries'][4]
64
         sidebar_entry = workspace['sidebar_entries'][4]
65
         assert sidebar_entry['slug'] == 'contents/files'
65
         assert sidebar_entry['slug'] == 'contents/files'
66
         assert sidebar_entry['label'] == 'Files'
66
         assert sidebar_entry['label'] == 'Files'
67
-        assert sidebar_entry['route'] == "/workspaces/1/contents?type=file"  # nopep8
67
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
68
         assert sidebar_entry['hexcolor'] == "#FF9900"
68
         assert sidebar_entry['hexcolor'] == "#FF9900"
69
         assert sidebar_entry['fa_icon'] == "paperclip"
69
         assert sidebar_entry['fa_icon'] == "paperclip"
70
 
70
 
71
         sidebar_entry = workspace['sidebar_entries'][5]
71
         sidebar_entry = workspace['sidebar_entries'][5]
72
         assert sidebar_entry['slug'] == 'contents/threads'
72
         assert sidebar_entry['slug'] == 'contents/threads'
73
         assert sidebar_entry['label'] == 'Threads'
73
         assert sidebar_entry['label'] == 'Threads'
74
-        assert sidebar_entry['route'] == "/workspaces/1/contents?type=thread"  # nopep8
74
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
75
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
75
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
76
         assert sidebar_entry['fa_icon'] == "comments-o"
76
         assert sidebar_entry['fa_icon'] == "comments-o"
77
 
77
 
78
         sidebar_entry = workspace['sidebar_entries'][6]
78
         sidebar_entry = workspace['sidebar_entries'][6]
79
         assert sidebar_entry['slug'] == 'calendar'
79
         assert sidebar_entry['slug'] == 'calendar'
80
         assert sidebar_entry['label'] == 'Calendar'
80
         assert sidebar_entry['label'] == 'Calendar'
81
-        assert sidebar_entry['route'] == "/workspaces/1/calendar"  # nopep8
81
+        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
82
         assert sidebar_entry['hexcolor'] == "#757575"
82
         assert sidebar_entry['hexcolor'] == "#757575"
83
         assert sidebar_entry['fa_icon'] == "calendar-alt"
83
         assert sidebar_entry['fa_icon'] == "calendar-alt"
84
 
84
 

+ 7 - 7
tracim/tests/functional/test_workspaces.py 파일 보기

37
         sidebar_entry = workspace['sidebar_entries'][0]
37
         sidebar_entry = workspace['sidebar_entries'][0]
38
         assert sidebar_entry['slug'] == 'dashboard'
38
         assert sidebar_entry['slug'] == 'dashboard'
39
         assert sidebar_entry['label'] == 'Dashboard'
39
         assert sidebar_entry['label'] == 'Dashboard'
40
-        assert sidebar_entry['route'] == '/workspaces/1/dashboard'  # nopep8
40
+        assert sidebar_entry['route'] == '/#/workspaces/1/dashboard'  # nopep8
41
         assert sidebar_entry['hexcolor'] == "#252525"
41
         assert sidebar_entry['hexcolor'] == "#252525"
42
         assert sidebar_entry['fa_icon'] == ""
42
         assert sidebar_entry['fa_icon'] == ""
43
 
43
 
44
         sidebar_entry = workspace['sidebar_entries'][1]
44
         sidebar_entry = workspace['sidebar_entries'][1]
45
         assert sidebar_entry['slug'] == 'contents/all'
45
         assert sidebar_entry['slug'] == 'contents/all'
46
         assert sidebar_entry['label'] == 'All Contents'
46
         assert sidebar_entry['label'] == 'All Contents'
47
-        assert sidebar_entry['route'] == "/workspaces/1/contents"  # nopep8
47
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents"  # nopep8
48
         assert sidebar_entry['hexcolor'] == "#fdfdfd"
48
         assert sidebar_entry['hexcolor'] == "#fdfdfd"
49
         assert sidebar_entry['fa_icon'] == ""
49
         assert sidebar_entry['fa_icon'] == ""
50
 
50
 
51
         sidebar_entry = workspace['sidebar_entries'][2]
51
         sidebar_entry = workspace['sidebar_entries'][2]
52
         assert sidebar_entry['slug'] == 'contents/html-documents'
52
         assert sidebar_entry['slug'] == 'contents/html-documents'
53
         assert sidebar_entry['label'] == 'Text Documents'
53
         assert sidebar_entry['label'] == 'Text Documents'
54
-        assert sidebar_entry['route'] == '/workspaces/1/contents?type=html-documents'  # nopep8
54
+        assert sidebar_entry['route'] == '/#/workspaces/1/contents?type=html-documents'  # nopep8
55
         assert sidebar_entry['hexcolor'] == "#3f52e3"
55
         assert sidebar_entry['hexcolor'] == "#3f52e3"
56
         assert sidebar_entry['fa_icon'] == "file-text-o"
56
         assert sidebar_entry['fa_icon'] == "file-text-o"
57
 
57
 
58
         sidebar_entry = workspace['sidebar_entries'][3]
58
         sidebar_entry = workspace['sidebar_entries'][3]
59
         assert sidebar_entry['slug'] == 'contents/markdownpluspage'
59
         assert sidebar_entry['slug'] == 'contents/markdownpluspage'
60
         assert sidebar_entry['label'] == 'Markdown Plus Documents'
60
         assert sidebar_entry['label'] == 'Markdown Plus Documents'
61
-        assert sidebar_entry['route'] == "/workspaces/1/contents?type=markdownpluspage"    # nopep8
61
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=markdownpluspage"    # nopep8
62
         assert sidebar_entry['hexcolor'] == "#f12d2d"
62
         assert sidebar_entry['hexcolor'] == "#f12d2d"
63
         assert sidebar_entry['fa_icon'] == "file-code"
63
         assert sidebar_entry['fa_icon'] == "file-code"
64
 
64
 
65
         sidebar_entry = workspace['sidebar_entries'][4]
65
         sidebar_entry = workspace['sidebar_entries'][4]
66
         assert sidebar_entry['slug'] == 'contents/files'
66
         assert sidebar_entry['slug'] == 'contents/files'
67
         assert sidebar_entry['label'] == 'Files'
67
         assert sidebar_entry['label'] == 'Files'
68
-        assert sidebar_entry['route'] == "/workspaces/1/contents?type=file"  # nopep8
68
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=file"  # nopep8
69
         assert sidebar_entry['hexcolor'] == "#FF9900"
69
         assert sidebar_entry['hexcolor'] == "#FF9900"
70
         assert sidebar_entry['fa_icon'] == "paperclip"
70
         assert sidebar_entry['fa_icon'] == "paperclip"
71
 
71
 
72
         sidebar_entry = workspace['sidebar_entries'][5]
72
         sidebar_entry = workspace['sidebar_entries'][5]
73
         assert sidebar_entry['slug'] == 'contents/threads'
73
         assert sidebar_entry['slug'] == 'contents/threads'
74
         assert sidebar_entry['label'] == 'Threads'
74
         assert sidebar_entry['label'] == 'Threads'
75
-        assert sidebar_entry['route'] == "/workspaces/1/contents?type=thread"  # nopep8
75
+        assert sidebar_entry['route'] == "/#/workspaces/1/contents?type=thread"  # nopep8
76
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
76
         assert sidebar_entry['hexcolor'] == "#ad4cf9"
77
         assert sidebar_entry['fa_icon'] == "comments-o"
77
         assert sidebar_entry['fa_icon'] == "comments-o"
78
 
78
 
79
         sidebar_entry = workspace['sidebar_entries'][6]
79
         sidebar_entry = workspace['sidebar_entries'][6]
80
         assert sidebar_entry['slug'] == 'calendar'
80
         assert sidebar_entry['slug'] == 'calendar'
81
         assert sidebar_entry['label'] == 'Calendar'
81
         assert sidebar_entry['label'] == 'Calendar'
82
-        assert sidebar_entry['route'] == "/workspaces/1/calendar"  # nopep8
82
+        assert sidebar_entry['route'] == "/#/workspaces/1/calendar"  # nopep8
83
         assert sidebar_entry['hexcolor'] == "#757575"
83
         assert sidebar_entry['hexcolor'] == "#757575"
84
         assert sidebar_entry['fa_icon'] == "calendar-alt"
84
         assert sidebar_entry['fa_icon'] == "calendar-alt"
85
 
85