Skip to content

Commit

Permalink
remove redundant code
Browse files Browse the repository at this point in the history
  • Loading branch information
solderq35 committed Sep 5, 2023
1 parent 4f1333c commit d521db7
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 77 deletions.
21 changes: 10 additions & 11 deletions backend/tests/data_layer.spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
/*
* Filename: data_layer.spec.js
* Description: Unit tests for API endpoints associated with
* the data_layer (or data_store) VueX module
*/
* Filename: data_layer.spec.js
* Description: Unit tests for API endpoints associated with
* the data_layer (or data_store) VueX module
*/

// CORS testing utility requires
const testConfig = require('./assertedData/test_config.json')
Expand All @@ -17,11 +17,11 @@ const MOCK_REQUEST_EVENT = {
origin: `${client.scheme}://${client.host}`
},
queryStringParameters: {
'id': 9,
'point': 'accumulated_real',
'startDate': 1603854900,
'endDate': 1613618100,
'meterClass': 48
id: 9,
point: 'accumulated_real',
startDate: 1603854900,
endDate: 1613618100,
meterClass: 48
}
}

Expand Down Expand Up @@ -102,11 +102,10 @@ describe('Testing data_layer related API endpoints...', () => {
expect(jsonData['data'].length).toBe(2)
expect(jsonData['data'][0]['readings'].length).toBeGreaterThan(10)
expect(jsonData['data'][1]['readings'].length).toBeGreaterThan(10)

})

// TODO maybe: fix solar meter upload test below
/*
/*
const meter_id = 'M' + '007c9349-72ba-450c-aa1f-4e5a77b68f79'.replace(/-/g, 'M')
it('mock solar data upload...', async () => {
process.env.ACQUISUITE_PASS = 'test_pwd'
Expand Down
2 changes: 1 addition & 1 deletion src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ body {
@import '@/assets/style-variables.scss';
/* Media query for mobile devices */
@media only screen and (max-width: 844px) {
@media only screen and (max-width: 600px) {
body {
max-width: 100%;
overflow-x: hidden; /* Hide horizontal scrollbar */
Expand Down
21 changes: 1 addition & 20 deletions src/components/map/map.vue
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,7 @@ $sideMenu-width: 250px;
width: calc(100% - #{$sideMenu-width});
}
@media only screen and (max-width: 844px) {
@media only screen and (max-width: 600px) {
.stage {
padding: 0;
position: absolute;
Expand Down Expand Up @@ -584,25 +584,6 @@ $sideMenu-width: 250px;
}
}
@media only screen and (min-width: 845px) {
.hideMenuButton {
font-family: 'Helvetica Neue', Helvetica, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', '微软雅黑', Arial,
sans-serif;
display: flex;
align-items: center;
position: absolute;
top: 7em;
left: 10px;
background-color: white;
border: 2px solid rgba(0, 0, 0, 0.2);
background-clip: padding-box;
border-radius: 4.5px;
opacity: 1;
justify-content: center;
z-index: 500;
}
}
.side-enter-active,
.side-leave-active {
transition: all 1s;
Expand Down
45 changes: 0 additions & 45 deletions src/components/navBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,49 +80,4 @@ i {
margin-top: 10px;
font-size: 16px;
}
// Mobile version - hidden hamburger menu
@media screen and (max-width: 599px) {
.nav-menu {
padding-left: -200;
padding-bottom: -20;
top: -20px;
position: absolute;
width: 100%;
background-color: $--color-primary !important;
}
.open-menu {
opacity: 1;
height: 180px;
}
.closed-menu {
opacity: 0;
height: 0px;
padding: 0;
}
.nav-content {
flex-direction: column;
z-index: 500;
position: relative;
transition: all 0.2s ease-out;
left: calc(8.5%);
width: 150px;
align-items: start;
top: -25px;
padding-bottom: 5vh;
padding-left: 5px;
}
.nav-items {
flex-direction: column;
align-items: left;
padding-top: 0px;
margin-left: -40px;
}
i {
display: block;
text-align: left;
padding-left: 10px;
padding-top: 23px;
}
}
</style>

0 comments on commit d521db7

Please sign in to comment.