Skip to content

Commit 18c4597

Browse files
committed
temp
1 parent e07539a commit 18c4597

File tree

5 files changed

+66
-2
lines changed

5 files changed

+66
-2
lines changed

default.nix.2nix

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
description = "Template for a direnv shell";
3+
4+
inputs = {
5+
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
6+
};
7+
8+
outputs = {
9+
self,
10+
nixpkgs,
11+
}: let
12+
system = "x86_64-linux";
13+
pkgs = nixpkgs.legacyPackages.${system};
14+
in {
15+
packages.${system} = {
16+
default = pkgs.callPackage (import ./default.nix) {};
17+
};
18+
};
19+
}

src/commons/application/Application.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import React from 'react';
22
import { useDispatch } from 'react-redux';
3-
import { Outlet } from 'react-router-dom';
3+
import { Outlet, useNavigate } from 'react-router-dom';
44
import Messages, {
55
MessageType,
66
MessageTypeNames,
@@ -18,6 +18,7 @@ import VscodeActions from './actions/VscodeActions';
1818
const Application: React.FC = () => {
1919
const dispatch = useDispatch();
2020
const { isLoggedIn } = useSession();
21+
const navigate = useNavigate();
2122

2223
// Used in the mobile/PWA experience (e.g. separate handling of orientation changes on Andriod & iOS due to unique browser behaviours)
2324
const isMobile = /iPhone|iPad|Android/.test(navigator.userAgent);
@@ -123,6 +124,8 @@ const Application: React.FC = () => {
123124
case MessageTypeNames.EvalEditor:
124125
dispatch(WorkspaceActions.evalEditor(message.workspaceLocation));
125126
break;
127+
case MessageTypeNames.Navigate:
128+
navigate(message.route);
126129
}
127130
});
128131
// eslint-disable-next-line react-hooks/exhaustive-deps

src/commons/assessment/Assessment.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ import {
2020
import { IconNames } from '@blueprintjs/icons';
2121
import classNames from 'classnames';
2222
import { sortBy } from 'lodash';
23-
import React, { useMemo, useState } from 'react';
23+
import React, { useEffect, useMemo, useState } from 'react';
2424
import { useDispatch } from 'react-redux';
2525
import { Navigate, useLoaderData, useParams } from 'react-router';
2626
import { NavLink } from 'react-router-dom';
2727
import { numberRegExp } from 'src/features/academy/AcademyTypes';
28+
import Messages, { sendToWebview } from 'src/features/vscode/messages';
2829
import classes from 'src/styles/Academy.module.scss';
2930

3031
import defaultCoverImage from '../../assets/default_cover_image.jpg';
@@ -61,6 +62,24 @@ const Assessment: React.FC = () => {
6162
const { courseId, role, assessmentOverviews: assessmentOverviewsUnfiltered } = useSession();
6263
const dispatch = useDispatch();
6364

65+
useEffect(() => {
66+
console.log('Iam in Assessment');
67+
console.log(assessmentOverviewsUnfiltered);
68+
if (assessmentOverviewsUnfiltered) {
69+
sendToWebview(
70+
Messages.NotifyAssessmentsOverview(
71+
assessmentOverviewsUnfiltered.map(oa => ({
72+
type: oa.type,
73+
closeAt: oa.closeAt,
74+
id: oa.id,
75+
isPublished: oa.isPublished,
76+
title: oa.title
77+
}))
78+
)
79+
);
80+
}
81+
}, [assessmentOverviewsUnfiltered]);
82+
6483
const toggleClosedAssessments = () => setShowClosedAssessments(!showClosedAssessments);
6584
const toggleOpenAssessments = () => setShowOpenedAssessments(!showOpenedAssessments);
6685
const toggleUpcomingAssessments = () => setShowUpcomingAssessments(!showUpcomingAssessments);

src/features/vscode/messages.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,14 @@ const VscWorkspaceLocationArray = ['assessment', 'playground'];
77
export const isVscWorkspaceLocation = (s: any) => VscWorkspaceLocationArray.includes(s);
88
export type VscWorkspaceLocation = 'assessment' | 'playground';
99

10+
export type VscAssessmentOverview = {
11+
type: string;
12+
closeAt: string;
13+
id: number;
14+
isPublished?: boolean;
15+
title: string;
16+
};
17+
1018
// ================================================================================
1119
// Message type definitions
1220
// ================================================================================
@@ -38,6 +46,12 @@ const Messages = createMessages({
3846
}),
3947
EvalEditor: (workspaceLocation: VscWorkspaceLocation) => ({
4048
workspaceLocation: workspaceLocation
49+
}),
50+
NotifyAssessmentsOverview: (assessmentOverviews: VscAssessmentOverview[]) => ({
51+
assessmentOverviews
52+
}),
53+
Navigate: (route: string) => ({
54+
route
4155
})
4256
});
4357

src/styles/_global.scss

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,3 +43,12 @@ $achievement-assets: 'https://source-academy-assets.s3-ap-southeast-1.amazonaws.
4343
}
4444
}
4545
}
46+
47+
// canvas {
48+
// width: 60% !important;
49+
// height: 60% !important;
50+
// }
51+
52+
// img[alt="Mosaic Reference Image"] {
53+
// width: 30% !important;
54+
// }

0 commit comments

Comments
 (0)