From ac1396dd781d490e33f2e16eb2da1cc2998d8d5f Mon Sep 17 00:00:00 2001 From: JoshuaSaikali Date: Tue, 30 Nov 2021 21:53:46 -0500 Subject: [PATCH 1/4] Labs page for dynamic questions --- client/src/App.svelte | 4 ++ .../CourseNavbar/CourseNavbar.svelte | 2 +- client/src/pages/Labs.svelte | 46 +++++++++++++++++++ client/src/pages/index.js | 1 + 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 client/src/pages/Labs.svelte diff --git a/client/src/App.svelte b/client/src/App.svelte index 34954eb2..20e92910 100644 --- a/client/src/App.svelte +++ b/client/src/App.svelte @@ -7,6 +7,7 @@ Home, COMP1805Home, COMP2804Home, + Labs, NotFound, Test } from './pages'; @@ -33,6 +34,9 @@ // Test path '/sessions/:id': CourseSession, + // Labs path + '/labs': Labs, + // Catch-all '*': NotFound }; diff --git a/client/src/components/CourseNavbar/CourseNavbar.svelte b/client/src/components/CourseNavbar/CourseNavbar.svelte index e806f338..d1071867 100644 --- a/client/src/components/CourseNavbar/CourseNavbar.svelte +++ b/client/src/components/CourseNavbar/CourseNavbar.svelte @@ -31,7 +31,7 @@ - + diff --git a/client/src/pages/Labs.svelte b/client/src/pages/Labs.svelte new file mode 100644 index 00000000..71cc4889 --- /dev/null +++ b/client/src/pages/Labs.svelte @@ -0,0 +1,46 @@ + + + +
+ {#if $response.loading} +
+ {/if} + + {#if $response.error} +
ERROR: {$response.error.message}
+ {/if} + + {#if !$response.loading && $response} +
+ {#each $response.data.dynamicRoutes as routes} + + + + {/each} +
+ {/if} +
+ + diff --git a/client/src/pages/index.js b/client/src/pages/index.js index dc10a8e2..60812ba6 100644 --- a/client/src/pages/index.js +++ b/client/src/pages/index.js @@ -1,5 +1,6 @@ export {default as About} from './About.svelte'; export {default as Course} from './Course.svelte'; +export {default as Labs} from './Labs.svelte'; export {default as CourseSession} from './CourseSession.svelte'; export {default as Home} from './Home.svelte'; export {default as NotFound} from './NotFound.svelte'; From 030ca2ae31b8b06bef4459e2ef7d7c5a6e057e9a Mon Sep 17 00:00:00 2001 From: JoshuaSaikali Date: Tue, 30 Nov 2021 23:14:31 -0500 Subject: [PATCH 2/4] Error: {#each} only iterates over array-like objects. --- client/src/pages/Labs.svelte | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client/src/pages/Labs.svelte b/client/src/pages/Labs.svelte index 71cc4889..f61a483f 100644 --- a/client/src/pages/Labs.svelte +++ b/client/src/pages/Labs.svelte @@ -3,6 +3,7 @@ import {ContentCard, CourseNavbar as Navbar, Loading} from '../components'; import {getRoutes} from '../data'; const response = getRoutes(); + console.log($response.data.dynamicRoutes.options) @@ -17,11 +18,12 @@ {#if !$response.loading && $response}
- {#each $response.data.dynamicRoutes as routes} + + {#each $response.data.dynamicRoutes.options as routes, i} From 9ff4285bf9ff294f6a4909f844fe9acf7850491f Mon Sep 17 00:00:00 2001 From: JoshuaSaikali Date: Tue, 30 Nov 2021 23:19:15 -0500 Subject: [PATCH 3/4] quick fix on unused variable --- client/src/pages/Labs.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/pages/Labs.svelte b/client/src/pages/Labs.svelte index f61a483f..b07bb7ca 100644 --- a/client/src/pages/Labs.svelte +++ b/client/src/pages/Labs.svelte @@ -19,7 +19,7 @@ {#if !$response.loading && $response}
- {#each $response.data.dynamicRoutes.options as routes, i} + {#each $response.data.dynamicRoutes.options as routes} Date: Fri, 3 Dec 2021 12:44:23 -0500 Subject: [PATCH 4/4] Added labs page --- .../types/dynamic_topic_option_type.rb | 1 + api/app/services/fetch_dynamic_routes.rb | 2 +- .../components/ContentCard/ContentCard.svelte | 6 +- .../queries/DynamicRoutes/Routes.example.js | 9 ++- .../queries/DynamicRoutes/Routes.query.js | 1 + client/src/pages/Labs.svelte | 12 ++-- dynamic/router.py | 65 +++++++++++++------ 7 files changed, 62 insertions(+), 34 deletions(-) diff --git a/api/app/graphql/types/dynamic_topic_option_type.rb b/api/app/graphql/types/dynamic_topic_option_type.rb index c5303bfa..bfdea759 100644 --- a/api/app/graphql/types/dynamic_topic_option_type.rb +++ b/api/app/graphql/types/dynamic_topic_option_type.rb @@ -3,5 +3,6 @@ class DynamicTopicOptionType < Types::BaseObject description 'A type that represents a options for generating a dynamic question.' field :name, String, null: false field :route, String, null: false + field :display_name, String, null: false end end diff --git a/api/app/services/fetch_dynamic_routes.rb b/api/app/services/fetch_dynamic_routes.rb index 2343a439..56d79f9f 100644 --- a/api/app/services/fetch_dynamic_routes.rb +++ b/api/app/services/fetch_dynamic_routes.rb @@ -8,7 +8,7 @@ def call(path = 'http://127.0.0.1:8000/api/') topics = [] data.each_key do |key| question_routes = data[key.to_s] - questions_list = question_routes.map { |k, v| OpenStruct.new(name: k, route: v) } + questions_list = question_routes.map { |k, v| OpenStruct.new(name: k, route: v['route'], display_name: v['display_name']) } topics << OpenStruct.new(name: key, options: questions_list) end topics diff --git a/client/src/components/ContentCard/ContentCard.svelte b/client/src/components/ContentCard/ContentCard.svelte index bd0dc0f3..f83c4234 100644 --- a/client/src/components/ContentCard/ContentCard.svelte +++ b/client/src/components/ContentCard/ContentCard.svelte @@ -13,7 +13,8 @@ faClipboard, //Test faPencilAlt, //Midterm faPenAlt, //Exam - faUser // Person + faUser, // Person + faVial // Test Tube } from '@fortawesome/free-solid-svg-icons'; const tagIcons = { @@ -30,7 +31,8 @@ Test: faQuestion, Midterm: faQuestion, Exam: faQuestion, - User: faUser + User: faUser, + Vial: faVial }; diff --git a/client/src/data/queries/DynamicRoutes/Routes.example.js b/client/src/data/queries/DynamicRoutes/Routes.example.js index dcbcd03d..2c322c63 100644 --- a/client/src/data/queries/DynamicRoutes/Routes.example.js +++ b/client/src/data/queries/DynamicRoutes/Routes.example.js @@ -16,15 +16,18 @@ const ROUTES_EXAMPLE_DATA = { options: [ { name: 'bitstrings-of-length', - route: '/comp2804/bitstrings-of-length' + route: '/comp2804/bitstrings-of-length', + displayName: 'Bitstrings of Length' }, { name: 'set-theory-question', - route: '/comp2804/set-theory' + route: '/comp2804/set-theory', + displayName: 'Set Theory' }, { name: 'num-of-functions', - route: '/comp2804/num-of-functions' + route: '/comp2804/num-of-functions', + displayName: 'Number of Functions' } ] } diff --git a/client/src/data/queries/DynamicRoutes/Routes.query.js b/client/src/data/queries/DynamicRoutes/Routes.query.js index 13800a84..a0cc4549 100644 --- a/client/src/data/queries/DynamicRoutes/Routes.query.js +++ b/client/src/data/queries/DynamicRoutes/Routes.query.js @@ -7,6 +7,7 @@ const ROUTES = gql` options { name route + displayName } } } diff --git a/client/src/pages/Labs.svelte b/client/src/pages/Labs.svelte index b07bb7ca..d165c767 100644 --- a/client/src/pages/Labs.svelte +++ b/client/src/pages/Labs.svelte @@ -3,7 +3,6 @@ import {ContentCard, CourseNavbar as Navbar, Loading} from '../components'; import {getRoutes} from '../data'; const response = getRoutes(); - console.log($response.data.dynamicRoutes.options) @@ -18,14 +17,13 @@ {#if !$response.loading && $response}
- - {#each $response.data.dynamicRoutes.options as routes} + {#each $response.data.dynamicRoutes[1].options as routes} {/each} diff --git a/dynamic/router.py b/dynamic/router.py index 325b36ea..36a82e8f 100644 --- a/dynamic/router.py +++ b/dynamic/router.py @@ -15,18 +15,44 @@ ) routes = { - "demo": {"graph_theory": "/demo/graph-theory"}, - "books_shelves": { - "books_shelves_0": "/books_shelves/books_shelves_0", - "books_shelves_1": "/books_shelves/books_shelves_1", - "books_shelves_2": "/books_shelves/books_shelves_2", - "books_shelves_3": "/books_shelves/books_shelves_3", + 'books_shelves': { + "books_shelves_0": { + 'display_name': "Book Shelves", + 'route': "/books_shelves/books_shelves_0" + }, + "books_shelves_1": { + 'display_name': "Book Shelve", + 'route': "/books_shelves/books_shelves_1" + }, + "books_shelves_2": { + 'display_name': "Book Shelve", + 'route': "/books_shelves/books_shelves_2" + }, + "books_shelves_3": { + 'display_name': "Book Shelve", + 'route': "/books_shelves/books_shelves_3" + }, }, - "comp2804": { - "bitstrings-of-length": "/comp2804/bitstrings-of-length", - "set-theory-question": "/comp2804/set-theory", - "num-of-functions": "/comp2804/num-of-functions", + 'demo': { + 'graph_theory': { + 'display_name': "Graph Theory", + 'route': "/demo/graph-theory" + } }, + 'comp2804': { + 'bitstrings-of-length': { + 'display_name': "Bitstrings of Length", + 'route': "/comp2804/bitstrings-of-length" + }, + 'set-theory-question': { + 'display_name': "Set Theory", + 'route': "/comp2804/set-theory" + }, + 'num-of-functions': { + 'display_name': "Number of Functions", + 'route': "/comp2804/num-of-functions" + } + } } @@ -35,47 +61,44 @@ async def get_generators(): return routes -@router.get(routes["demo"]["graph_theory"]) +@router.get(routes['demo']['graph_theory']['route']) async def generate_graph_theory_question(): return graph_theory_question_generator.call() ############___Books_Shelves_Questions___############ -@router.get(routes["books_shelves"]["books_shelves_0"]) +@router.get(routes["books_shelves"]["books_shelves_0"]['route']) async def generate_books_shelves_0_question(): return books_shelves_0_generator.call() -@router.get(routes["books_shelves"]["books_shelves_1"]) +@router.get(routes["books_shelves"]["books_shelves_1"]['route']) async def generate_books_shelves_1_question(): return books_shelves_1_generator.call() -@router.get(routes["books_shelves"]["books_shelves_2"]) +@router.get(routes["books_shelves"]["books_shelves_2"]['route']) async def generate_books_shelves_2_question(): return books_shelves_2_generator.call() -@router.get(routes["books_shelves"]["books_shelves_3"]) +@router.get(routes["books_shelves"]["books_shelves_3"]['route']) async def generate_books_shelves_3_question(): return books_shelves_3_generator.call() -###################################################### - - -@router.get(routes["comp2804"]["set-theory-question"]) +@router.get(routes['comp2804']['set-theory-question']['route']) async def generate_set_theory_question(): return set_theory_question_generator.call() -@router.get(routes["comp2804"]["num-of-functions"]) +@router.get(routes['comp2804']['num-of-functions']['route']) async def generate_num_of_functions_question( lower_range: int = 0, upper_range: int = 10 ): return num_of_functions_generator.call(lower_range, upper_range) -@router.get(routes["comp2804"]["bitstrings-of-length"]) +@router.get(routes['comp2804']['bitstrings-of-length']['route']) async def bitstrings_of_length_question(): return bitstrings_of_length_generator.call()