Skip to content

Commit 2428bb2

Browse files
committed
added continue instr
1 parent 459cc7b commit 2428bb2

File tree

11 files changed

+81
-74
lines changed

11 files changed

+81
-74
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ env:
1515
concurrency:
1616
group: ${{ github.workflow }}-${{ github.ref }}
1717
cancel-in-progress: true
18-
18+
1919
jobs:
2020
lint:
2121
if: github.event.pull_request.draft == false

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ To start contributing, create a fork from our repo and send a PR. Refer to [this
1616

1717
The frontend comes with an extensive test suite. To run the tests after you made your modifications, run
1818
`yarn test`. Regression tests are run automatically when you want to push changes to this repository.
19-
The regression tests are generated using `jest` and stored as snapshots in `src/\_\_tests\_\_`. After modifying the frontend, carefully inspect any failing regression tests reported in red in the command line. If you are convinced that the regression tests and not your changes are at fault, you can update the regression tests by running:
19+
The regression tests are generated using `jest` and stored as snapshots in `src/\_\_tests\_\_`. After modifying the frontend, carefully inspect any failing regression tests reported in red in the command line. If you are convinced that the regression tests and not your changes are at fault, you can update the regression tests by running:
2020

2121
```bash
2222
yarn test --updateSnapshot

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ The Source Academy (<https://sourceacademy.org/>) is an immersive online experie
2424

2525
1. Clone this repository and navigate to it using your command line
2626

27-
1. Install the version of `yarn` as specified in `package.json`, `packageManager`.
27+
1. Install the version of `yarn` as specified in `package.json`, `packageManager`.
2828

2929
> We recommend using `corepack` to manage the version of `yarn`, you may simply run `corepack enable` to complete this step.
3030

_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
theme: jekyll-theme-cayman
1+
theme: jekyll-theme-cayman

craco.config.js

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,17 @@ const cracoConfig = {
4040
// Polyfill Node.js core modules.
4141
// An empty implementation (false) is provided when there is no browser equivalent.
4242
webpackConfig.resolve.fallback = {
43-
'child_process': false,
44-
'constants': require.resolve('constants-browserify'),
45-
'fs': false,
46-
'http': require.resolve('stream-http'),
47-
'https': require.resolve('https-browserify'),
48-
'os': require.resolve('os-browserify/browser'),
43+
child_process: false,
44+
constants: require.resolve('constants-browserify'),
45+
fs: false,
46+
http: require.resolve('stream-http'),
47+
https: require.resolve('https-browserify'),
48+
os: require.resolve('os-browserify/browser'),
4949
'path/posix': require.resolve('path-browserify'),
5050
'process/browser': require.resolve('process/browser'),
51-
'stream': require.resolve('stream-browserify'),
52-
'timers': require.resolve('timers-browserify'),
53-
'url': require.resolve('url/'),
51+
stream: require.resolve('stream-browserify'),
52+
timers: require.resolve('timers-browserify'),
53+
url: require.resolve('url/')
5454
};
5555

5656
// workaround .mjs files by Acorn
@@ -60,31 +60,34 @@ const cracoConfig = {
6060
type: 'javascript/auto',
6161
resolve: {
6262
fullySpecified: false
63-
},
63+
}
6464
});
6565

66-
webpackConfig.ignoreWarnings = [{
67-
// Ignore warnings for dependencies that do not ship with a source map.
68-
// This is because we cannot do anything about our dependencies.
69-
module: /node_modules/,
70-
message: /Failed to parse source map/
71-
}, {
72-
// Ignore the warnings that occur because js-slang uses dynamic imports
73-
// to load Source modules
74-
module: /js-slang\/dist\/modules\/loader\/loaders.js/,
75-
message: /Critical dependency: the request of a dependency is an expression/
76-
}];
66+
webpackConfig.ignoreWarnings = [
67+
{
68+
// Ignore warnings for dependencies that do not ship with a source map.
69+
// This is because we cannot do anything about our dependencies.
70+
module: /node_modules/,
71+
message: /Failed to parse source map/
72+
},
73+
{
74+
// Ignore the warnings that occur because js-slang uses dynamic imports
75+
// to load Source modules
76+
module: /js-slang\/dist\/modules\/loader\/loaders.js/,
77+
message: /Critical dependency: the request of a dependency is an expression/
78+
}
79+
];
7780

7881
webpackConfig.plugins = [
7982
...webpackConfig.plugins,
8083
// Make environment variables available in the browser by polyfilling the 'process' Node.js module.
8184
new webpack.ProvidePlugin({
82-
process: 'process/browser',
85+
process: 'process/browser'
8386
}),
8487
// Make the 'buffer' Node.js module available in the browser.
8588
new webpack.ProvidePlugin({
86-
Buffer: ['buffer', 'Buffer'],
87-
}),
89+
Buffer: ['buffer', 'Buffer']
90+
})
8891
];
8992

9093
// Workaround to suppress warnings caused by ts-morph in js-slang
@@ -156,16 +159,14 @@ const cracoConfig = {
156159
jestConfig.setupFiles = [
157160
...jestConfig.setupFiles,
158161
'./src/i18n/i18n.ts' // Setup i18next configuration
159-
]
162+
];
160163
return jestConfig;
161164
}
162165
},
163166
babel: {
164-
presets: [
165-
['@babel/preset-typescript']
166-
]
167+
presets: [['@babel/preset-typescript']]
167168
}
168-
}
169+
};
169170

170171
const ignoreModulePaths = (...paths) => {
171172
const moduleRoot = replaceSlashes('/node_modules/');

eslint.config.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import { config, configs } from 'typescript-eslint';
55
import reactPlugin from 'eslint-plugin-react';
66
import reactHooksPlugin from 'eslint-plugin-react-hooks';
7-
import simpleImportSort from 'eslint-plugin-simple-import-sort'
7+
import simpleImportSort from 'eslint-plugin-simple-import-sort';
88
// import reactRefresh from 'eslint-plugin-react-refresh';
99

1010
export default config(
@@ -24,7 +24,7 @@ export default config(
2424
files: ['**/*.ts*'],
2525
plugins: {
2626
'react-hooks': reactHooksPlugin,
27-
'react': reactPlugin,
27+
react: reactPlugin,
2828
'simple-import-sort': simpleImportSort
2929
},
3030
rules: {

public/externalLibs/sound/soundToneMatrix.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ var timeout_matrix;
3636
// for coloring the matrix accordingly while it's being played
3737
var timeout_color;
3838

39-
var timeout_objects = new Array();
39+
var timeout_objects = [];
4040

4141
// vector_to_list returns a list that contains the elements of the argument vector
4242
// in the given order.
@@ -54,7 +54,7 @@ function vector_to_list(vector) {
5454
function x_y_to_row_column(x, y) {
5555
var row = Math.floor((y - margin_length) / (square_side_length + distance_between_squares));
5656
var column = Math.floor((x - margin_length) / (square_side_length + distance_between_squares));
57-
return Array(row, column);
57+
return [row, column];
5858
}
5959

6060
// given the row number of a square, return the leftmost coordinate
@@ -365,5 +365,5 @@ function clear_all_timeout() {
365365
clearTimeout(timeout_objects[i]);
366366
}
367367

368-
timeout_objects = new Array();
368+
timeout_objects = [];
369369
}

public/index.html

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,30 @@
1-
<!DOCTYPE html>
1+
<!doctype html>
22
<html lang="en">
3-
4-
<head>
5-
<meta charset="utf-8" />
6-
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
7-
<meta name="theme-color" content="#000000" />
8-
<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/2.0.0/TweenMax.min.js"></script>
9-
<script src="%PUBLIC_URL%/externalLibs/index.js"></script>
10-
<script type="text/javascript" src="https://apis.google.com/js/api.js"></script>
11-
<script type="text/javascript" src="https://apis.google.com/js/client.js"></script>
12-
<!--
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
6+
<meta name="theme-color" content="#000000" />
7+
<script src="https://cdnjs.cloudflare.com/ajax/libs/gsap/2.0.0/TweenMax.min.js"></script>
8+
<script src="%PUBLIC_URL%/externalLibs/index.js"></script>
9+
<script type="text/javascript" src="https://apis.google.com/js/api.js"></script>
10+
<script type="text/javascript" src="https://apis.google.com/js/client.js"></script>
11+
<!--
1312
manifest.json provides metadata used when your web app is added to the
1413
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
1514
-->
16-
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
17-
<link rel="shortcut icon" href="%PUBLIC_URL%/icons/favicon.ico?pr225" />
18-
<link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/icons/apple-touch-icon.png">
19-
<link rel="stylesheet" type="text/css" href="https://fonts.googleapis.com/css?family=Inconsolata&display=block" />
20-
<!--
15+
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
16+
<link rel="shortcut icon" href="%PUBLIC_URL%/icons/favicon.ico?pr225" />
17+
<link
18+
rel="apple-touch-icon"
19+
sizes="180x180"
20+
href="%PUBLIC_URL%/icons/apple-touch-icon.png"
21+
/>
22+
<link
23+
rel="stylesheet"
24+
type="text/css"
25+
href="https://fonts.googleapis.com/css?family=Inconsolata&display=block"
26+
/>
27+
<!--
2128
Notice the use of %PUBLIC_URL% in the tags above.
2229
It will be replaced with the URL of the `public` folder during the build.
2330
Only files inside the `public` folder can be referenced from the HTML.
@@ -26,16 +33,17 @@
2633
work correctly both with client-side routing and a non-root public URL.
2734
Learn how to configure a non-root public URL by running `npm run build`.
2835
-->
29-
<title>Source Academy</title>
30-
<meta name="description" content="Immersive experiential environment for learning programming, developed in the School of Computing at the National University of Singapore." />
31-
</head>
36+
<title>Source Academy</title>
37+
<meta
38+
name="description"
39+
content="Immersive experiential environment for learning programming, developed in the School of Computing at the National University of Singapore."
40+
/>
41+
</head>
3242

33-
<body>
34-
<noscript>
35-
You need to enable JavaScript to run this app.
36-
</noscript>
37-
<div id="root"></div>
38-
<!--
43+
<body>
44+
<noscript> You need to enable JavaScript to run this app. </noscript>
45+
<div id="root"></div>
46+
<!--
3947
This HTML file is a template.
4048
If you open it directly in the browser, you will see an empty page.
4149
@@ -44,7 +52,5 @@
4452
4553
To begin the development, run `npm start` or `yarn start`.
4654
To create a production bundle, use `npm run build` or `yarn build`.
47-
-->
48-
</body>
49-
55+
--></body>
5056
</html>

public/manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,16 +13,16 @@
1313
"type": "image/png"
1414
},
1515
{
16-
"src": "icons/android-chrome-256x256.png",
17-
"sizes": "256x256",
18-
"type": "image/png"
16+
"src": "icons/android-chrome-256x256.png",
17+
"sizes": "256x256",
18+
"type": "image/png"
1919
},
2020
{
2121
"src": "icons/maskable.png",
2222
"sizes": "196x196",
2323
"type": "image/png",
2424
"purpose": "maskable"
25-
}
25+
}
2626
],
2727
"start_url": "./",
2828
"display": "standalone",

src/i18n/locales/en/login.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"Logging In": "Logging In...",
3-
"Log in with": "Log in with {{name}}"
2+
"Logging In": "Logging In...",
3+
"Log in with": "Log in with {{name}}"
44
}

0 commit comments

Comments
 (0)