Skip to content

Commit 2dc0ff9

Browse files
sudo-maysudo-may
authored
Merge pull request #45 from NationalSecurityAgency/upgrade-ui
Upgrade UI
2 parents 01c5d36 + cd63419 commit 2dc0ff9

23 files changed

+698
-812
lines changed

‎.github/workflows/build-and-test.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ jobs:
2828
runs-on: ubuntu-latest
2929

3030
steps:
31-
- uses: actions/checkout@v2
31+
- uses: actions/checkout@v4
3232

33-
- uses: actions/setup-node@v2-beta
33+
- uses: actions/setup-node@v4
3434
with:
35-
node-version: '14'
35+
node-version: '20.11.0'
3636

37-
- uses: actions/setup-java@v1
37+
- uses: actions/setup-java@v4
3838
with:
39+
distribution: 'temurin'
3940
java-version: '19' # The JDK version to make available on the path.
4041

4142
- name: Print Versions
@@ -75,8 +76,9 @@ jobs:
7576

7677
- name: upload result artifacts
7778
if: ${{ always() }}
78-
uses: actions/upload-artifact@v2
79+
uses: actions/upload-artifact@v4
7980
with:
8081
name: CI result artifacts
8182
path: |
82-
./target/*.jar
83+
./backend/target/*.jar
84+
./frontend/target/*.jar

‎frontend/public/favicon.ico‎ renamed to ‎frontend/favicon.ico‎

File renamed without changes.

‎frontend/public/index.html‎ renamed to ‎frontend/index.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@
1919
<meta charset="utf-8">
2020
<meta http-equiv="X-UA-Compatible" content="IE=edge">
2121
<meta name="viewport" content="width=device-width,initial-scale=1.0">
22-
<link rel="icon" href="<%= BASE_URL %>favicon.ico">
22+
<link rel="icon" href="/favicon.ico">
2323
<title>Stress Tests | SkillTree</title>
24+
<script type="module" src="/src/main.js"></script>
2425
</head>
2526
<body>
2627
<noscript>

‎frontend/package.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,36 @@
99
"licenseHeaderCheck": "license-check-and-add check -f '../license-add/license-add-config.json'",
1010
"licenseHeaderAdd": "license-check-and-add add -f ../license-add/license-add-config.json",
1111
"licenseCheck": "npm run licenseHeaderCheck && npm run licenseDepCheck",
12-
"serve": "vue-cli-service serve",
13-
"build": "npm run licenseCheck && vue-cli-service build",
12+
"serve": "vite preview",
13+
"dev": "vite",
14+
"build": "vite build",
1415
"lint": "vue-cli-service lint"
1516
},
1617
"dependencies": {
18+
"@primevue/themes": "4.0.7",
19+
"@vue/compat": "3.5.6",
20+
"@vue/compiler-sfc": "3.5.6",
1721
"apexcharts": "3.32.0",
18-
"axios": "1.6.0",
19-
"bootstrap": "4.6.1",
20-
"bootstrap-vue": "2.21.2",
22+
"axios": "1.7.4",
2123
"core-js": "3.19.3",
2224
"moment": "2.29.4",
2325
"numeral": "2.0.6",
24-
"vue": "2.6.14",
26+
"primeflex": "3.3.1",
27+
"primeicons": "7.0.0",
28+
"primevue": "4.0.7",
29+
"vue": "^3.5.6",
2530
"vue-apexcharts": "1.6.2",
26-
"vue-router": "3.5.3"
31+
"vue-router": "4.4.5",
32+
"vue3-apexcharts": "1.6.0"
2733
},
2834
"devDependencies": {
29-
"@vue/cli-plugin-babel": "4.5.15",
30-
"@vue/cli-plugin-eslint": "4.5.15",
31-
"@vue/cli-service": "4.5.15",
35+
"@vitejs/plugin-vue": "5.1.4",
3236
"babel-eslint": "10.1.0",
3337
"eslint": "7.22.0",
3438
"eslint-plugin-vue": "7.7.0",
3539
"license-check-and-add": "4.0.3",
3640
"license-checker": "25.0.1",
37-
"vue-template-compiler": "2.6.14"
41+
"vite": "5.4.7"
3842
},
3943
"eslintConfig": {
4044
"root": true,
@@ -50,11 +54,6 @@
5054
"parser": "babel-eslint"
5155
}
5256
},
53-
"postcss": {
54-
"plugins": {
55-
"autoprefixer": {}
56-
}
57-
},
5857
"browserslist": [
5958
"> 1%",
6059
"last 2 versions"

‎frontend/src/App.vue‎

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,33 +13,24 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16+
<script setup>
17+
import HeaderNav from "@/components/HeaderNav.vue";
18+
19+
</script>
20+
1621
<template>
17-
<div id="app">
18-
<!-- <img alt="Vue logo" src="./assets/logo.png">-->
19-
<!-- <HelloWorld msg="Welcome to Your Vue.js App"/>-->
20-
<header-nav/>
21-
<div class="container my-3">
22-
<router-view/>
22+
<div>
23+
<HeaderNav />
24+
<div style="left: 20%; right: 20%;" class="absolute" >
25+
<router-view />
2326
</div>
2427
</div>
2528
</template>
26-
27-
<script>
28-
import HeaderNav from "@/components/HeaderNav";
29-
export default {
30-
name: 'App',
31-
components: {
32-
HeaderNav,
33-
},
34-
}
35-
</script>
36-
3729
<style>
38-
#app {
30+
body {
3931
font-family: 'Avenir', Helvetica, Arial, sans-serif;
4032
-webkit-font-smoothing: antialiased;
4133
-moz-osx-font-smoothing: grayscale;
42-
text-align: center;
4334
color: #2c3e50;
4435
}
4536
</style>

‎frontend/src/components/HeaderNav.vue‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,22 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1313
See the License for the specific language governing permissions and
1414
limitations under the License.
1515
*/
16+
<script setup>
17+
18+
</script>
19+
1620
<template>
17-
<div>
18-
<b-navbar toggleable="lg" type="dark" variant="info">
19-
<b-navbar-brand>
20-
<router-link to="/" class="text-white"><b-icon icon="hammer" class="mr-1" />SkillTree Stress Tests</router-link>
21-
</b-navbar-brand>
22-
<b-collapse id="nav-collapse" is-nav>
23-
<b-navbar-nav>
24-
<b-nav-item>
25-
<router-link to="/errors" class="text-white">Errors</router-link>
26-
</b-nav-item>
27-
</b-navbar-nav>
28-
</b-collapse>
29-
</b-navbar>
21+
<div class="flex gap-4 header p-3">
22+
<router-link to="/" class="text-white text-2xl">
23+
<i class="pi pi-hammer" style="font-size: 1rem"></i>
24+
SkillTree Stress Tests
25+
</router-link>
26+
<router-link to="/errors" class="text-white text-xl">Errors</router-link>
3027
</div>
3128
</template>
3229

33-
<script>
34-
export default {
35-
name: "HeaderNav",
36-
}
37-
</script>
38-
3930
<style scoped>
40-
31+
.header {
32+
background-color: #17a2b8 !important
33+
}
4134
</style>

‎frontend/src/components/ProfilerResult.vue‎

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

0 commit comments

Comments
 (0)