Skip to content

Commit 33a1a86

Browse files
authored
feat(venue): Revert optimizer toaster and update venues (#4124)
* Revert "Add Optimiser Beta toaster (#4105)" This reverts commit 2408d87. * Update venue * Add venue
1 parent 2408d87 commit 33a1a86

File tree

7 files changed

+31
-181
lines changed

7 files changed

+31
-181
lines changed

website/src/data/venues.json

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4716,11 +4716,11 @@
47164716
}
47174717
},
47184718
"LAW_SR4-2": {
4719-
"roomName": "SR4-2",
4719+
"roomName": "Seminar Room 4-2",
47204720
"floor": 1,
47214721
"location": {
4722-
"x": 103.77344760878614,
4723-
"y": 1.2965116754860795
4722+
"x": 103.81670773029329,
4723+
"y": 1.3188084341295705
47244724
}
47254725
},
47264726
"SDE3-LT424": {
@@ -4859,6 +4859,22 @@
48594859
"y": 1.296721
48604860
}
48614861
},
4862+
"RC1-02-04": {
4863+
"roomName": "RC1-02-04",
4864+
"floor": 1,
4865+
"location": {
4866+
"x": 103.77302789717508,
4867+
"y": 1.2963243870479606
4868+
}
4869+
},
4870+
"RC3-01-01": {
4871+
"roomName": "RC3-01-01",
4872+
"floor": 1,
4873+
"location": {
4874+
"x": 103.77309769392015,
4875+
"y": 1.297305824106438
4876+
}
4877+
},
48624878
"S16-0208": {
48634879
"roomName": "S16-0208",
48644880
"floor": 2,
@@ -5194,5 +5210,13 @@
51945210
"x": 103.77814292907716,
51955211
"y": 1.2975203458171671
51965212
}
5213+
},
5214+
"DDL2-1": {
5215+
"roomName": "DDL2",
5216+
"floor": 1,
5217+
"location": {
5218+
"x": 103.77327470244661,
5219+
"y": 1.2963404761831323
5220+
}
51975221
}
5198-
}
5222+
}

website/src/storage/keys.ts

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@ export const CONTACT_INFO = 'contact-info';
2626

2727
// Used by MPE
2828
export const NUS_AUTH_TOKEN = 'nus-auth-token';
29-
30-
// Used by Beta Banner
31-
export const BETA_BANNER = 'beta-banner';

website/src/views/components/notfications/BetaBanner.scss

Lines changed: 0 additions & 101 deletions
This file was deleted.

website/src/views/components/notfications/BetaBanner.tsx

Lines changed: 0 additions & 62 deletions
This file was deleted.

website/src/views/settings/BetaToggle.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import ExternalLink from 'views/components/ExternalLink';
44
import config from 'config';
55
import styles from './SettingsContainer.scss';
66

7-
export const currentTests = ['Timetable Optimiser: build a timetable that suits your needs'];
7+
export const currentTests = ['Timetable Optimiser: find the perfect timetable for you'];
88

99
type Props = {
1010
betaTester: boolean;
@@ -23,7 +23,7 @@ const BetaToggle = memo<Props>((props) => {
2323

2424
const testDescriptions = hasTests ? (
2525
<>
26-
<h5>Current Tests</h5>
26+
<h5>Current tests</h5>
2727
<ul>
2828
{currentTests.map((test) => (
2929
<li key={test}>{test}</li>
@@ -36,9 +36,7 @@ const BetaToggle = memo<Props>((props) => {
3636

3737
return (
3838
<div>
39-
<h4 id="beta" className={styles.targetable}>
40-
NUSMods Beta
41-
</h4>
39+
<h4 id="beta">NUSMods Beta</h4>
4240

4341
<div className={styles.toggleRow}>
4442
<div className={styles.toggleDescription}>

website/src/views/settings/SettingsContainer.scss

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,6 @@
6666
}
6767
}
6868

69-
.targetable {
70-
scroll-margin-top: $navbar-height + 2rem;
71-
}
72-
7369
.betaToggle {
7470
margin-bottom: 1rem;
7571
}

website/src/views/timetable/TimetableContent.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import ErrorBoundary from 'views/errors/ErrorBoundary';
5252
import ModRegNotification from 'views/components/notfications/ModRegNotification';
5353
import { State as StoreState } from 'types/state';
5454
import { ModuleWithColor, TombstoneModule } from 'types/views';
55-
import BetaBanner from 'views/components/notfications/BetaBanner';
5655
import Timetable from './Timetable';
5756
import TimetableActions from './TimetableActions';
5857
import TimetableModulesTable from './TimetableModulesTable';
@@ -443,7 +442,6 @@ class TimetableContent extends React.Component<Props, State> {
443442
<Title>Timetable</Title>
444443

445444
<Announcements />
446-
<BetaBanner />
447445

448446
<ErrorBoundary>
449447
<ModRegNotification />

0 commit comments

Comments
 (0)